Backporting changes from portage: install missing dtd to docs; code style cleanups

Package-Manager: portage-2.2.14

7 files changed, 62 insertions, 56 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 6bb2b15b..afcdd4b8 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -5,6 +5,12 @@
   01 Nov 2014; Vlastimil Babka <caster@gentoo.org> icedtea-3.9999.ebuild,
   icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.5.3.ebuild,
   icedtea-7.2.6.0_pre09.ebuild:
+  Backporting changes from portage: install missing dtd to docs; code style
+  cleanups
+
+  01 Nov 2014; Vlastimil Babka <caster@gentoo.org> icedtea-3.9999.ebuild,
+  icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.5.3.ebuild,
+  icedtea-7.2.6.0_pre09.ebuild:
   Backporting changes from portage: use multiprocessing eclass instead of
   manual MAKEOPTS parsing
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 9e958c4e..08144ea1 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -36,10 +36,10 @@ DIST icedtea7-langtools-55486a406d9f.tar.bz2 1702288 SHA256 3ef96c11ea2720b3c9e2
 DIST icedtea7-openjdk-7faf56bdd783.tar.bz2 126716 SHA256 301bcd38fa62237e62e9ec2c30a43f36b0c25ad666a8b855ff1d8b0e68d05a2f SHA512 6f605d389eb7b3b7caccdae818ab8ed4375761b842a630e78beb231e9f510f4343325a881f84375b0ce0ed2cd78e6e3ec5ab5d8c4bdde33fa0cb84cd1e76017b WHIRLPOOL bb418265d42d2a6055b6bee847c02be6886c8116bf064431a76ed0fb4acc4133d34e60bf1e7f4575b8bf94c9313d1254a5dc71f6e3da351b0e9eab00c2c12910
 DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256 ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512 3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55 WHIRLPOOL 4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f
 DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256 cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 SHA512 e3e195b069101c352ae8ed8f59558a464ba61c9966add815cb58c9151c8fefda721dd1650ebd335350af95cbebdd3fedb1b4ac2736fb2625bb83f13b94a85c8c WHIRLPOOL bcd51fe1ce52ec275ef24d03914f0d151a8765c432713a9bfef39618c01587dc7f9ff9a58b86785761c4b69130afa643964c6cf5caad13d7778baa0a346ea291
-EBUILD icedtea-3.9999.ebuild 10745 SHA256 60ef5129eb09068143617b8efc6b5e3b91101f27c692adf7674db7f43bd32549 SHA512 7c33920feae31f86ee307ac9d3a0df88e235f750f9a46a7c2d6fb9dcefa0c19e662f3869f48871375fc2644609db8377d426a9cec0aa196e612aa6c0cd0e01e2 WHIRLPOOL 7325d35c76b7a4d7d2a26fc680d215ced33d5113122511a9b84277f3b331d04796e904ed3228139d0f1b676c0ebeef27610da678d24676218e827f223259c94e
-EBUILD icedtea-6.1.13.5-r1.ebuild 9996 SHA256 6a363563f06288e8389a0e136b97c7b584e76d4ab32befd465f5f50a2eaf6663 SHA512 ae094175fe94e3cd118f047c6ffda6e840f37c0f4d81f76ea40df1b03be20620ff60153fa3286fbb42488ea4d03c688e484855e996b9d3d607bc4ece8c863aec WHIRLPOOL 5ad6ff0c4f86feb090eec9b0b3457ce95b908136069823666a016b4c255acc8d97a28b825072a75640414b57cb3725d90ff60b2c793aa626850138494cb33c0c
-EBUILD icedtea-6.9999.ebuild 9709 SHA256 3d15e7e191a3ae6c808c5c7e24d45131c759b88a1bf408957ef9f1786af34d47 SHA512 18a8d8d9c07397401e37ed6a1cc22bd919b2af427a294f9c5ea21de58ad65ab3dc179ed731dc80e9007cb8d64b30e5637dfd29e8359f2ec5a865c1bd3d37d540 WHIRLPOOL 8bec6e4cbe56069ac33788c0d8d64a26c46b448eedefcf603c5410956000f64162146e6eae08fc8e2d446002ba48372a90bd11a5ee4c651bd400405efb11bbc1
-EBUILD icedtea-7.2.5.3.ebuild 11941 SHA256 9c102aef85ce49ea5db3e70063f8121af7cd45b70c89b30913ec836a6d54601f SHA512 ab3255eb9e3b2f8b6f2cda0824971df6ea8ec85d1b7c5ad5ffc30bde712b322f7e8219d3031ff84e25e65d5c671590bc0f66e1dd28529ea07a1a55d0c285da67 WHIRLPOOL 1304fa0ffcfdcde0053d291aaacdf8f4f91347a651c4a61366c588fac366c579e9e427b0733c1a6dac6f30827ae74d58511ede281b76dcbb77ee7667d77f5238
-EBUILD icedtea-7.2.6.0_pre09.ebuild 11875 SHA256 a3483c9ea75caff960c58473f4a97d00bd3b118721c6e8996c67682e3a9cf235 SHA512 4176663095f29e94e951e70f7867c72c09fa95e6583bb19687e4a55c0e95f7d9751096b50b5a60dab6fcf57a6e7b9a52748c6b4a3a74a1c5ef7277b3db7276a2 WHIRLPOOL 6aca4926f38690ec92d6a8de79b1df0b1590bc13543169ba8a1baa841ac7afcb76a22b9cf201a045778c6c70ae0407f54441927034a4fe7d8b6258ae1b7c4019
-MISC ChangeLog 86283 SHA256 1bfd78c0c533cefe1f4d783af26476c4531eef6cb5b03ed4dfcc3a8b5f2d9172 SHA512 25d97784437c47795f53231ebb8b547302337e17a99cc44276b29aea564ae39832a9aa00a3c80a5a9e1ab8e1082a9d3a85681057d9c6c82fb1f3920dfb63668c WHIRLPOOL 7b9b3083fd4825e210cc1cee4ee63c7e695704b79718bfc4b49bb6d89be50f3142c54a7d0e5beb86d7b86d7750d4a6621f8786020ec98df68ddd3d1efb156261
+EBUILD icedtea-3.9999.ebuild 10711 SHA256 2d8dc222afaf87340eaaee7819eb801e41a950f66588b2a9a315a2a8fc431e16 SHA512 01926338aba58abf42259166412391e29e60845733ad5b0d69bf1b16ded55e1f361caaec9cde5db915bfab1747a2b3966e499dfc034c6f498bbf06da1e5c39d3 WHIRLPOOL dcf621eb1a2353ebd31e11fc625b38df397337641b8b82b92c38513cd0a7adfd40c5dc8d0318cd59d6ab7bcee662dd4be0273d3886d5810d3934b562a996b830
+EBUILD icedtea-6.1.13.5-r1.ebuild 9969 SHA256 8c2d43fc8b4e4ce41432c8ef3a10c4d382a9cdf5daaeb7018685d8e602823e67 SHA512 2fcc61068986a55a446da4e875d091352a775bef224090ec1bce4c88b0719ef1b3dba8de7f5dfa908ee2b85b02a325599a5d52bdf28f9d4378b45f2f6c380a51 WHIRLPOOL 72e175db2495506c5243ad8494a9deb70b79f9fd8d0b76cab04573e11f9ee97bada192e7f975f2963325899461eb9df04d528d55ba1da017b0101df75baecff5
+EBUILD icedtea-6.9999.ebuild 9682 SHA256 a35513f4a6395539bfbdf7c772e26f0de4cb86bbcf21b56e4aae9d138531eb39 SHA512 5c4e52f04d8b0e98e0c6a4e367edfa74e164507ad00afc9ee98842445e630c05fa1136fac93e3ac877860e9f73f3aaee65d414346c4a96198268355312707b1c WHIRLPOOL 446a712af77eed8c51d1cd769bc47acaf37732b0f23f6137886773b4c2c41a0a0d201c25248fe248864e8493fb63962839315de932e4b48a0bac50d81bace6b0
+EBUILD icedtea-7.2.5.3.ebuild 11932 SHA256 c14baa3e16c8269609ba1abbeb9b48628bd7b21ca8ec535c6f7c0ecf4825a4dd SHA512 ccb7d6baeaa770e195156fa271da2300c169ed7b3e23d4a514b08c21121f17d010a3a4d9d371af25088351fde89859e05fade4117ff18d9880b3f2bbb958849a WHIRLPOOL d215fdce3fd627578eac0d72d84802594bfba39a103d29c46999a59d526595ed0db3e2347fa1ca81f7ba5932a770086345bd1995f330f3a5a3e5efaf67e524d2
+EBUILD icedtea-7.2.6.0_pre09.ebuild 11866 SHA256 9c0182714340db009586e4a6bc93f918c9a462fee80da81a6659fa3c798fe342 SHA512 5b8044303684bce316bdb78a6af9c1fc0009d06e30e66c4b173b1b59736a4cc7c11173be3e604225291fff20d98be793fd6a42be57e84673384c8875a743e039 WHIRLPOOL 7a23ea0a89c7d723bda69bcb1ae3eed1fe2f3e1e64ceccbebfe6ec214be38bdfa9dee8bddd4fad8e944ebfedbc8bc1750b39a4d3c87724ae6a208433e99369da
+MISC ChangeLog 86554 SHA256 a535307c51127529dda718d37a038437a74449996b6eedf369f2d4c9f69ac1ae SHA512 b00eb66e77086cb1281540f77279bc6e14d820679dc10104ac7ffeba771e1208ef3d44458a346a7c812f08c635189a391e20978152f703dff016610c2e5738f1 WHIRLPOOL 3d66956042e433e017abe63400d1577bca53390bb9cde7a5968deb20568efcd5a57d4f227ad03e8c7fcba3992df67519f1af3ac945c3dea683df3020388cd8f5
 MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild b/dev-java/icedtea/icedtea-3.9999.ebuild
index 27771757..bc56bd06 100644
--- a/dev-java/icedtea/icedtea-3.9999.ebuild
+++ b/dev-java/icedtea/icedtea-3.9999.ebuild
@@ -199,7 +199,7 @@ bootstrap_impossible() {
 }
 
 src_configure() {
-	local config bootstrap
+	local bootstrap config
 	local vm=$(java-pkg_get-current-vm)
 
 	# Whether to bootstrap
@@ -217,23 +217,23 @@ src_configure() {
 		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
 		bootstrap="enable"
 		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
+		config+=" --with-ecj-jar=${ecj_jar}"
 	fi
 
-	config="${config} --${bootstrap}-bootstrap"
+	config+=" --${bootstrap}-bootstrap"
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
 	# Otherwise use JamVM as it's the only possibility right now
 	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-jamvm"
+		config+=" --enable-jamvm"
 	fi
 
 	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
-		config="${config} --without-rhino"
+		config+=" --without-rhino"
 	fi
 
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
@@ -306,11 +306,11 @@ src_install() {
 
 	if use doc; then
 		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../../docs/* || die
+		java-pkg_dohtml -A dtd -r ../../docs/* || die
 	fi
 
 	if use examples; then
-		dodir "${dest}/share";
+		dodir "${dest}/share"
 		cp -vRP demo sample "${ddest}/share/" || die
 	fi
 
diff --git a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
index 23ab1e66..2dc7e208 100644
--- a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v 1.1 2014/10/19 06:46:41 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -175,7 +175,7 @@ bootstrap_impossible() {
 }
 
 src_configure() {
-	local config bootstrap enable_cacao
+	local bootstrap config enable_cacao
 	local vm=$(java-pkg_get-current-vm)
 
 	# IcedTea6 can't be built using IcedTea7; its class files are too new
@@ -195,7 +195,7 @@ src_configure() {
 		bootstrap="enable"
 	fi
 
-	config="${config} --${bootstrap}-bootstrap"
+	config+=" --${bootstrap}-bootstrap"
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
 	# Otherwise use CACAO
@@ -208,15 +208,15 @@ src_configure() {
 	fi
 
 	if [[ ${enable_cacao} ]]; then
-		config="${config} --enable-cacao"
+		config+=" --enable-cacao"
 	fi
 
 	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
-		config="${config} --without-rhino"
+		config+=" --without-rhino"
 	fi
 
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
@@ -285,11 +285,11 @@ src_install() {
 
 	if use doc; then
 		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
+		java-pkg_dohtml -A dtd -r ../docs/* || die
 	fi
 
 	if use examples; then
-		dodir "${dest}/share";
+		dodir "${dest}/share"
 		cp -vRP demo sample "${ddest}/share/" || die
 	fi
 
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild
index d180ac32..74125102 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v 1.1 2014/10/19 06:46:41 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -172,7 +172,7 @@ bootstrap_impossible() {
 }
 
 src_configure() {
-	local config bootstrap enable_cacao
+	local bootstrap config enable_cacao
 	local vm=$(java-pkg_get-current-vm)
 
 	# IcedTea6 can't be built using IcedTea7; its class files are too new
@@ -192,7 +192,7 @@ src_configure() {
 		bootstrap="enable"
 	fi
 
-	config="${config} --${bootstrap}-bootstrap"
+	config+=" --${bootstrap}-bootstrap"
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
 	# Otherwise use CACAO
@@ -205,15 +205,15 @@ src_configure() {
 	fi
 
 	if [[ ${enable_cacao} ]]; then
-		config="${config} --enable-cacao"
+		config+=" --enable-cacao"
 	fi
 
 	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
-		config="${config} --without-rhino"
+		config+=" --without-rhino"
 	fi
 
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
@@ -281,11 +281,11 @@ src_install() {
 
 	if use doc; then
 		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
+		java-pkg_dohtml -A dtd -r ../docs/* || die
 	fi
 
 	if use examples; then
-		dodir "${dest}/share";
+		dodir "${dest}/share"
 		cp -vRP demo sample "${ddest}/share/" || die
 	fi
 
diff --git a/dev-java/icedtea/icedtea-7.2.5.3.ebuild b/dev-java/icedtea/icedtea-7.2.5.3.ebuild
index 4e5a0b81..a72836a3 100644
--- a/dev-java/icedtea/icedtea-7.2.5.3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.3.ebuild
@@ -201,7 +201,7 @@ java_prepare() {
 }
 
 src_configure() {
-	local config bootstrap use_zero zero_config
+	local bootstrap cacao_config config use_cacao use_zero zero_config
 	local vm=$(java-pkg_get-current-vm)
 
 	# Whether to bootstrap
@@ -215,19 +215,19 @@ src_configure() {
 		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
 		bootstrap="enable"
 		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
+		config+=" --with-ecj-jar=${ecj_jar}"
 	fi
 
-	config="${config} --${bootstrap}-bootstrap"
+	config+=" --${bootstrap}-bootstrap"
 
 	# Use Zero if requested
 	if use zero; then
-		use_zero="yes";
+		use_zero="yes"
 	fi
 
 	# Use CACAO if requested
 	if use cacao; then
-		use_cacao="yes";
+		use_cacao="yes"
 	fi
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
@@ -235,28 +235,28 @@ src_configure() {
 	# Otherwise use CACAO
 	if ! has "${ARCH}" arm aarch64 amd64 ppc64 ppc64le sparc x86 ; then
 		if has "${ARCH}" ppc ; then
-			use_cacao="yes";
+			use_cacao="yes"
 		else
-			use_zero="yes";
+			use_zero="yes"
 		fi
 	fi
 
 	# Turn on CACAO if needed (non-HS archs) or requested
 	if test "x${use_cacao}" = "xyes"; then
-		cacao_config="--enable-cacao";
+		cacao_config="--enable-cacao"
 	fi
 
 	# Turn on Zero if needed (non-HS/CACAO archs) or requested
 	if test "x${use_zero}" = "xyes"; then
-		zero_config="--enable-zero";
+		zero_config="--enable-zero"
 	fi
 
 	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
-		config="${config} --without-rhino"
+		config+=" --without-rhino"
 	fi
 
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
@@ -335,11 +335,11 @@ src_install() {
 
 	if use doc; then
 		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
+		java-pkg_dohtml -A dtd -r ../docs/* || die
 	fi
 
 	if use examples; then
-		dodir "${dest}/share";
+		dodir "${dest}/share"
 		cp -vRP demo sample "${ddest}/share/" || die
 	fi
 
diff --git a/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild b/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild
index 25317de8..e8976c6f 100644
--- a/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild
@@ -203,7 +203,7 @@ java_prepare() {
 }
 
 src_configure() {
-	local config bootstrap use_zero zero_config
+	local bootstrap cacao_config config use_cacao use_zero zero_config
 	local vm=$(java-pkg_get-current-vm)
 
 	# Whether to bootstrap
@@ -217,19 +217,19 @@ src_configure() {
 		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
 		bootstrap="enable"
 		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
+		config+=" --with-ecj-jar=${ecj_jar}"
 	fi
 
-	config="${config} --${bootstrap}-bootstrap"
+	config+=" --${bootstrap}-bootstrap"
 
 	# Use Zero if requested
 	if use zero; then
-		use_zero="yes";
+		use_zero="yes"
 	fi
 
 	# Use CACAO if requested
 	if use cacao; then
-		use_cacao="yes";
+		use_cacao="yes"
 	fi
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
@@ -237,28 +237,28 @@ src_configure() {
 	# Otherwise use CACAO
 	if ! has "${ARCH}" arm aarch64 amd64 ppc64 ppc64le sparc x86 ; then
 		if has "${ARCH}" ppc ; then
-			use_cacao="yes";
+			use_cacao="yes"
 		else
-			use_zero="yes";
+			use_zero="yes"
 		fi
 	fi
 
 	# Turn on CACAO if needed (non-HS archs) or requested
 	if test "x${use_cacao}" = "xyes"; then
-		cacao_config="--enable-cacao";
+		cacao_config="--enable-cacao"
 	fi
 
 	# Turn on Zero if needed (non-HS/CACAO archs) or requested
 	if test "x${use_zero}" = "xyes"; then
-		zero_config="--enable-zero";
+		zero_config="--enable-zero"
 	fi
 
 	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
-		config="${config} --without-rhino"
+		config+=" --without-rhino"
 	fi
 
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
@@ -337,11 +337,11 @@ src_install() {
 
 	if use doc; then
 		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
+		java-pkg_dohtml -A dtd -r ../docs/* || die
 	fi
 
 	if use examples; then
-		dodir "${dest}/share";
+		dodir "${dest}/share"
 		cp -vRP demo sample "${ddest}/share/" || die
 	fi