- Use JAVA_PKG_WANT_BUILD_VM to limit build VM. This now respects system VM

setting if usable and simplifies pkg_setup.
- Add JamVM for alternative archs with IcedTea 7
- Fix building against >=glib-2.31. #402481
Thanks to Marien Zwart <marienz@gentoo.org> for the patch.
- Simplify USE=jbootstrap logic for icedtea-7.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

7 files changed, 119 insertions, 158 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 539ccc7e6b3f..d14ad0d482a9 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.66 2012/02/25 06:12:50 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.67 2012/03/15 16:52:50 sera Exp $
+
+  15 Mar 2012; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.6.ebuild,
+  icedtea-6.1.11.1.ebuild, icedtea-7.2.0.1.ebuild,
+  +files/icedtea-7.2.0-explicit-gthread.patch, icedtea-7.2.1.ebuild:
+  - Use JAVA_PKG_WANT_BUILD_VM to limit build VM. This now respects system VM
+  setting if usable and simplifies pkg_setup.
+  - Add JamVM for alternative archs with IcedTea 7
+  - Fix building against >=glib-2.31. #402481
+  Thanks to Marien Zwart <marienz@gentoo.org> for the patch.
+  - Simplify USE=jbootstrap logic for icedtea-7.
 
   25 Feb 2012; Ralph Sennhauser <sera@gentoo.org>
   +files/icedtea-7.2.0_pax_kernel_support.patch:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 71eb0e4f528a..3dbfc364243c 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX fontconfig.Gentoo.properties.src 15602 RMD160 d5ae1cb403072b630c126a908d14b5b462e1514f SHA1 04af30bfae3decf6fdb51187a07bf75fb04a83f0 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
 AUX icedtea-6_pax_kernel_support.patch 4152 RMD160 a1800e5985d90db6e4827b0bea784cb034962c69 SHA1 625177d004e57cad81d522d1436aaa33dba45a6a SHA256 4a6f3462e9dd47dcc5941dd67a56bbd9ea874dca2a94566f0f38c2d241efeb74
+AUX icedtea-7.2.0-explicit-gthread.patch 696 RMD160 cda560809998da7925be2da896b34ba60f46b835 SHA1 8764b20bd736ac6c8ca7a061d48b1faac57ee26e SHA256 78e55b212004127726c8f0ab02b8a0a1c01677443237505a21fb803b38e08c55
 AUX icedtea-7.2.0_pax_kernel_support.patch 6511 RMD160 ca6ff5d7f8c1157558af28ef631ed4fd5f67f901 SHA1 538bb29bc10978ae14114cfed525c3905e808984 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e
 AUX icedtea.env 1074 RMD160 6806fd80d619c54f6ab50255c12ee2a9920ad72f SHA1 4ddbddd4464fcf11fad45426ba0430818747249d SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8
 DIST 0a76e5390e68.tar.gz 128547 RMD160 ea975ce953ec0eb5751ea2aee8d3dc98da6933ff SHA1 9fc523399df6a8736ce540f7d7f0412188eb8b51 SHA256 bb47d452a61ed154fad98fda35f93e6e0f3328632ef2cf0afa1d95cd6264071e
@@ -38,6 +39,7 @@ DIST icedtea6-1.10.6.tar.gz 6844249 RMD160 4d2c3943071e5e444afcc9e833b42fd3f17d5
 DIST icedtea6-1.11.1.tar.gz 6344427 RMD160 fdcaba8fced7ecd30b17ca351424610e254ff735 SHA1 24c8a6e3f641b626349b8d199880b0a79213a814 SHA256 bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c
 DIST icedtea6-1.11.tar.gz 6334120 RMD160 7037d10072335e1abba264c59713c378c47ba950 SHA1 ec53c683043716bd29611ecb3e9c6f2e89984e72 SHA256 e7d2bc08008de918ca54f8dcd1f8d75c7829948da6b1a9c06761c74a563c3eba
 DIST jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz 293833 RMD160 b34f4684e0c918c36d9fb9316a4ae7737b712296 SHA1 60d5782ccb9707699f9dfbfcf647a5c862ef4691 SHA256 b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
+DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 RMD160 42b79f51a4f7210436f8dc381e8cc7a8fc356822 SHA1 58965961cf1b928c675fc47599a548c084e39063 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d
 DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
 DIST jaxp144_03.zip 5964999 RMD160 3184f086991075779bcd663e55e24fec5cff1728 SHA1 28c441ccaa2883e6308cff0cf8b51c893da25ff7 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
@@ -46,24 +48,24 @@ DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 RMD160 eef414a11dbcaafd2f830ca34227a
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 RMD160 d0e21619c3f287b821da114b986336e106cba16c SHA1 5d6fe1e3ef84d6699bff18eabf109e63d6c0a1c3 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
 EBUILD icedtea-6.1.10.5.ebuild 11267 RMD160 c5f2a5edb83f89fa8c4c73a0748049701f7bb9e1 SHA1 f4a94369b18c824b9b69aa2aab0a9535cff82f48 SHA256 3a3c0b6481daee7265e6a6852da0f53b2734896fb9a751191ae0a01383be106d
-EBUILD icedtea-6.1.10.6.ebuild 11267 RMD160 a31a78988c0ffc1c1af614885ffbabdcabdba903 SHA1 9e0f2a7708db90aa3ce80d62a419910a23a6a48c SHA256 0e294aa971214f7b65343e8048eb1d7bbf79b3dfce5ef969ee5d5a2e1698867b
-EBUILD icedtea-6.1.11.1.ebuild 10814 RMD160 250e8e53f119ac90c4eb26f969101c6879d9fe44 SHA1 ee5f4a13d79701a720cd65a33984613d33beb3b8 SHA256 73718559f38d9bf030066decf2b3dfef113a61e63fc1e8eb2ddd345a8726c007
+EBUILD icedtea-6.1.10.6.ebuild 10468 RMD160 0e014fc84d01ee04873b9311481ab93d150de785 SHA1 871916929f78cb01920080be13acf432a40dcfd7 SHA256 2b413e59ac75a54a755627a4c32fa39b1f0984f26e47cf32f1fec8acd6d2083d
+EBUILD icedtea-6.1.11.1.ebuild 10015 RMD160 4b278f061b6b69907b2aba25c6100ad7b3fa990a SHA1 6150b0707d7b2fc1f8437f3c3ee3355b9805a1dc SHA256 93a54a4c70a7b499d7bd45fdfcbe692437cc567110f750185f2ade393adf39e6
 EBUILD icedtea-6.1.11.ebuild 10812 RMD160 16e74219b96a5b57dff86efa9e7c2cf34433792a SHA1 82a8d0d6c63c2fbe8be05934ae03f1d71d1e7b8a SHA256 079804f185a9ea450196403c6d689cb0887ef2ee45b5780f551e92679acee0ba
 EBUILD icedtea-7.2.0-r1.ebuild 10801 RMD160 c9ff94b4bfea1a7fa93457a4be2fb90fc24c5823 SHA1 e4bf6bf1fe1d1db7eb5fd963ed3600c9725fa0c1 SHA256 eb9e2c4e0bdd19cac0d903356f3a673b7ab68cef38cbf68423cba858b534c9fa
 EBUILD icedtea-7.2.0-r2.ebuild 11502 RMD160 f610645dbe8a6c2828730cf08cc88fcb16c6755a SHA1 bfff69d1d821f4e92bb8d4996b951103d81279a2 SHA256 2fa6ff0b5bcfb0cbd4ca77dca6a8e23408f29fe41da1c45f655cc8021d47ec87
 EBUILD icedtea-7.2.0-r3.ebuild 13812 RMD160 07d5d6f9fa70f3a61b009d71c7cb9dce333ffa59 SHA1 e2b173afed251761040c9dc5570f875fd8e98bf8 SHA256 c4c8dcdb805deb035282ffbfc6b53daecf272859013d5d6a909c93779856aa49
-EBUILD icedtea-7.2.0.1.ebuild 11275 RMD160 09a2358884d89f42a2b4f75cfa579c310fed5758 SHA1 d17a4d5fc6816e1910fcb2d3758c843df30a155c SHA256 9dd48d63aeb1c4cf994acf13b5f19654facf16eadb2709bc3bb02798e15235d1
-EBUILD icedtea-7.2.1.ebuild 11494 RMD160 d131e3f2033833824ee78da80b8d96f8b04619b6 SHA1 c50b1a3570de3507fcf44e474d8c9f218dd79a66 SHA256 401c99aeb32ee21518415946f11b5f8ea291d6ca350d1f4bf47b1fb92bdd3104
-MISC ChangeLog 14346 RMD160 dda411f2d61053dd182b297c621e7bc21c53f442 SHA1 9e6396f97d25a42a9ed13b9adbb9c8e6bdef1560 SHA256 af05443fcdd156e217f718b7d3e463e074523e2cfea3b137b17b8fa032499af6
+EBUILD icedtea-7.2.0.1.ebuild 10625 RMD160 1c23a535714fcdf38bd2de0063c4a276bd0f99ad SHA1 e600f0ee8881f004e530b7379b4a944deb2bea13 SHA256 0fcc6cee0e993379307a43a281cdd5fd82344eb142651f57b8d7a6f18fb3421f
+EBUILD icedtea-7.2.1.ebuild 10761 RMD160 cf8ba66858acc3a10966b7f74652bb8b8471e183 SHA1 abf1632548953d79b55cabebb6ba66a1acf8dfe9 SHA256 62130918296eec33542d4981ad549b0efdd0d940167b7c1e2381d1e9a9b946d9
+MISC ChangeLog 14873 RMD160 43ca435b105ee39263ff0b110022a2ecc0a2092f SHA1 731fcdb6b97cd0ab6d09576b4e129e41df3b44a1 SHA256 c7919f97642cf98725e65e6883c1c4b74f83218bd02c0e2c6b8e5d551f94444e
 MISC metadata.xml 1527 RMD160 f4c3b81c9dbd245fe86bde62f68de8bfdce86247 SHA1 019c890e1dbac991ca55b1cde57a5c21d055d857 SHA256 dea1435f46708be4a8dda218c537c63700bd2def279f7eccae2d80cf49c90c5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPSHv4AAoJEIUJ+svaV163EYAH/0NXRqPaTpw6WspWf6AQXZkI
-g+7kM9/Jqd6DBLQWwvL5gEW1PNXowb08/0Vs/gFvSShF4z2Wjp62yA4tEQsxqs/6
-xafl9T5+O1atOKrrpDzDYGQCst7ZJ8rQ42wtom0Yfgsm+hmmKov1rS/OL6VhbIqb
-BPSqWc0EJ1evoFMaXb/aZURI0VcxIiXX2UCFzuYwOgcTN58LQ6zXczb+SnLYU3Lo
-uEvTEZB2wjMIW7qEW3Y9pev6UTv6abEAO9WDk53HygTg7QMpm/On4awP1FjxQjbf
-IzPS96/EHhztlZA9PbX3qKHHZ3nXGbXsajXNTButLmNQsT467OgHHOz1i+3l5Cc=
-=aIJ2
+iQEcBAEBAgAGBQJPYh5xAAoJEIUJ+svaV163caIH/REqc/Gv9dE1RMPKxZ0tS7OV
+vqfoZcYijDH7RpKCh7Dz+7UNdnmi4QsBpCTYrx5W/chlTkZGtmMwPdm+ZHAZpjBp
+jBJlWpjMPwUEUaWbcQH9d++EEedQgHFLVe0kIbUDTuTkiT14MPPw4WT8XjJaf9U6
+wqn7hkf38TjoLzuZH+rlNh5TSqao377UME2XZNHLT+h3AXZhEVyCDv3mVUCWZxtU
+0RTWQ36vF4SxWA+2WbXkqNFYVDunzhQ1tpGaeD7HZB1Pa1aGevx2yNTinybC8lFN
+RkRrNiZBBOoiNQChVJ/i2ihCehdS/6QIxduLZQpIzhV2i03W/FhhjPdwx+YDbhU=
+=NMVQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch b/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch
new file mode 100644
index 000000000000..1f13e07df314
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch
@@ -0,0 +1,13 @@
+--- acinclude.m4.orig	2012-02-25 15:44:58.208371766 +0100
++++ acinclude.m4	2012-02-25 15:46:03.592027548 +0100
+@@ -2011,7 +2011,9 @@
+   AC_MSG_RESULT(${ENABLE_SYSTEM_GTK})
+   if test x"${ENABLE_SYSTEM_GTK}" = "xyes"; then
+     dnl Check for Gtk+ headers and libraries.
+-    PKG_CHECK_MODULES(GTK, gtk+-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
++    dnl Explicitly include gthread-2.0 to get g_thread_init even on glib 2.32
++    dnl where it is deprecated.
++    PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
+     if test "x${GTK_FOUND}" = xno
+     then
+       AC_MSG_ERROR([Could not find Gtk+; install Gtk+ or build with --disable-system-gtk to use the in-tree headers.])
diff --git a/dev-java/icedtea/icedtea-6.1.10.6.ebuild b/dev-java/icedtea/icedtea-6.1.10.6.ebuild
index 1b3b7d8a2b9e..afacb40a1b3c 100644
--- a/dev-java/icedtea/icedtea-6.1.10.6.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.6.ebuild,v 1.1 2012/02/24 18:43:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.6.ebuild,v 1.2 2012/03/15 16:52:50 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -128,31 +128,13 @@ PDEPEND="webstart? ( dev-java/icedtea-web:6 )
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
-JAVA_PKG_WANT_SOURCE="1.5"
-JAVA_PKG_WANT_TARGET="1.5"
-
 pkg_setup() {
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea-6"
-	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea6-bin"
-	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea-bin-6"
-	elif has_version dev-java/gcj-jdk; then
-		JAVA_PKG_FORCE_VM="gcj-jdk"
-	else
-		die "Unable to find a supported VM for building"
-	fi
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
 
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }
diff --git a/dev-java/icedtea/icedtea-6.1.11.1.ebuild b/dev-java/icedtea/icedtea-6.1.11.1.ebuild
index 226224d21db8..eb29e6901e10 100644
--- a/dev-java/icedtea/icedtea-6.1.11.1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.1.ebuild,v 1.2 2012/02/24 18:43:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.1.ebuild,v 1.3 2012/03/15 16:52:50 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -124,31 +124,13 @@ PDEPEND="webstart? ( dev-java/icedtea-web:6 )
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
-JAVA_PKG_WANT_SOURCE="1.5"
-JAVA_PKG_WANT_TARGET="1.5"
-
 pkg_setup() {
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea-6"
-	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea6-bin"
-	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea-bin-6"
-	elif has_version dev-java/gcj-jdk; then
-		JAVA_PKG_FORCE_VM="gcj-jdk"
-	else
-		die "Unable to find a supported VM for building"
-	fi
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
 
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }
diff --git a/dev-java/icedtea/icedtea-7.2.0.1.ebuild b/dev-java/icedtea/icedtea-7.2.0.1.ebuild
index d26929b44bb9..92098245aba7 100644
--- a/dev-java/icedtea/icedtea-7.2.0.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0.1.ebuild,v 1.1 2012/02/24 18:43:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0.1.ebuild,v 1.2 2012/03/15 16:52:50 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -19,6 +19,7 @@ JAXP_TARBALL="ae891cd6ba73.tar.gz"
 JAXWS_TARBALL="1107cfa36f53.tar.gz"
 JDK_TARBALL="891fb0050add.tar.gz"
 LANGTOOLS_TARBALL="f0faea84413f.tar.gz"
+JAMVM_TARBALL="jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz"
 
 DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
 HOMEPAGE="http://icedtea.classpath.org"
@@ -30,7 +31,10 @@ SRC_URI="
 	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL}
 	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL}
 	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}"
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}
+	!amd64? ( !sparc? ( !x86? (
+		http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}
+	) ) )"
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
 SLOT="7"
@@ -130,37 +134,14 @@ PDEPEND="webstart? ( dev-java/icedtea-web:7 )
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
-JAVA_PKG_WANT_SOURCE="1.5"
-JAVA_PKG_WANT_TARGET="1.5"
-
 pkg_setup() {
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	elif has_version "<=dev-java/icedtea-7.2.0:7"; then
-		JAVA_PKG_FORCE_VM="icedtea7"
-	elif has_version ">dev-java/icedtea-7.2.0:7"; then
-		JAVA_PKG_FORCE_VM="icedtea-7"
-	elif has_version "dev-java/icedtea-bin:7"; then
-		JAVA_PKG_FORCE_VM="icedtea-bin-7"
-	elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea-6"
-	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea6-bin"
-	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea-bin-6"
-	elif has_version dev-java/gcj-jdk; then
-		JAVA_PKG_FORCE_VM="gcj-jdk"
-	else
-		die "Unable to find a supported VM for building"
-	fi
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7 icedtea7
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
 
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }
@@ -177,36 +158,42 @@ java_prepare() {
 	export LANG="C" LC_ALL="C"
 
 	epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751
+	epatch "${FILESDIR}"/${PN}-7.2.0-explicit-gthread.patch #402481
 	eautoreconf
 }
 
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
 src_configure() {
 	local config bootstrap
 	local vm=$(java-pkg_get-current-vm)
 
 	# Whether to bootstrap
-	if has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
-		use jbootstrap && bootstrap=yes
-	elif has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
-		if use jbootstrap; then
-			einfo "We can't currently bootstrap with a IcedTea6 JVM :("
-			einfo "bootstrap forced off, ignoring use jbootstrap"
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
 		fi
-	elif has "${vm}" gcj-jdk; then
+	fi
+	if has "${vm}" gcj-jdk; then
 		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
-		bootstrap=yes
+		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}"
-	else
-		eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
-		die "Install a GNU Classpath JDK (gcj-jdk)"
 	fi
 
-	if [[ ${bootstrap} ]]; then
-		config="${config} --enable-bootstrap"
-	else
-		config="${config} --disable-bootstrap"
+	config="${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 --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
 	fi
 
 	# OpenJDK-specific parallelism support. Bug #389791, #337827
diff --git a/dev-java/icedtea/icedtea-7.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.ebuild
index c62545357ccf..7461385078e1 100644
--- a/dev-java/icedtea/icedtea-7.2.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.ebuild,v 1.1 2012/02/24 18:43:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.ebuild,v 1.2 2012/03/15 16:52:50 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -20,6 +20,7 @@ JAXP_TARBALL="1cf75c0e2c96.tar.gz"
 JAXWS_TARBALL="7edfbfe974f2.tar.gz"
 JDK_TARBALL="50f6f276a06c.tar.gz"
 LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz"
+JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
 
 DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
 HOMEPAGE="http://icedtea.classpath.org"
@@ -31,7 +32,10 @@ SRC_URI="
 	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL}
 	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL}
 	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL}"
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL}
+	!amd64? ( !sparc? ( !x86? (
+		http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}
+	) ) )"
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
 SLOT="7"
@@ -131,37 +135,14 @@ PDEPEND="webstart? ( dev-java/icedtea-web:7 )
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
-JAVA_PKG_WANT_SOURCE="1.5"
-JAVA_PKG_WANT_TARGET="1.5"
-
 pkg_setup() {
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	elif has_version "<=dev-java/icedtea-7.2.0:7"; then
-		JAVA_PKG_FORCE_VM="icedtea7"
-	elif has_version ">dev-java/icedtea-7.2.0:7"; then
-		JAVA_PKG_FORCE_VM="icedtea-7"
-	elif has_version "dev-java/icedtea-bin:7"; then
-		JAVA_PKG_FORCE_VM="icedtea-bin-7"
-	elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea-6"
-	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea6-bin"
-	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
-		JAVA_PKG_FORCE_VM="icedtea-bin-6"
-	elif has_version dev-java/gcj-jdk; then
-		JAVA_PKG_FORCE_VM="gcj-jdk"
-	else
-		die "Unable to find a supported VM for building"
-	fi
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7 icedtea7
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
 
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }
@@ -178,39 +159,43 @@ java_prepare() {
 	export LANG="C" LC_ALL="C"
 
 	epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751
+	epatch "${FILESDIR}"/${PN}-7.2.0-explicit-gthread.patch #402481
 	eautoreconf
 }
 
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" icedtea7 icedtea-7 icedtea-bin-7 icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
 src_configure() {
 	local config bootstrap
 	local vm=$(java-pkg_get-current-vm)
 
 	# Whether to bootstrap
-	if has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
-		if use jbootstrap; then
-			einfo "We can't currently bootstrap with a IcedTea7 JVM :("
-			einfo "bootstrap forced off, ignoring use jbootstrap"
-		fi
-	elif has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
-		if use jbootstrap; then
-			einfo "We can't currently bootstrap with a IcedTea6 JVM :("
-			einfo "bootstrap forced off, ignoring use jbootstrap"
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
 		fi
-	elif has "${vm}" gcj-jdk; then
+	fi
+
+	if has "${vm}" gcj-jdk; then
 		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
-		bootstrap=yes
+		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}"
-	else
-		eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
-		die "Install a GNU Classpath JDK (gcj-jdk)"
 	fi
 
-	if [[ ${bootstrap} ]]; then
-		config="${config} --enable-bootstrap"
-	else
-		config="${config} --disable-bootstrap"
+	config="${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 --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
 	fi
 
 	# OpenJDK-specific parallelism support. Bug #389791, #337827