Use JAVA_PKG_WANT_BUILD_VM for selecting VM. Obsoletes handle migration code.

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

4 files changed, 23 insertions, 53 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 6d0c6b672a90..6b9c0a357d75 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea-web
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.19 2012/03/06 09:24:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.20 2012/03/14 16:54:54 sera Exp $
+
+  14 Mar 2012; Ralph Sennhauser <sera@gentoo.org> icedtea-web-1.2.ebuild,
+  icedtea-web-1.2-r7.ebuild:
+  Use JAVA_PKG_WANT_BUILD_VM for selecting VM. Obsoletes handle migration code.
 
 *icedtea-web-1.2-r7 (06 Mar 2012)
 *icedtea-web-1.2 (06 Mar 2012)
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 392ce215cd67..f09902d175f4 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -8,18 +8,18 @@ DIST icedtea-web-1.2.tar.gz 885793 RMD160 3686b66531088050934ba25c8ac5be3fc23ff8
 EBUILD icedtea-web-1.1.4-r7.ebuild 3949 RMD160 8f1fea7e178161fd388bc000b30d70c3c6f1954f SHA1 cc4aa774b5a83f4abd642a46d50a9232a0efed00 SHA256 300f7e5e2c9d3474d23b50064da182ec99b39071ef818a583aab00d392e6e2a2
 EBUILD icedtea-web-1.1.4-r8.ebuild 4141 RMD160 7ae64b852d10bc9004691d8a4e43ae14138e6a71 SHA1 243a7ce0d99176072cc2b62f58bdeaddbf0e5801 SHA256 86fc970887ca8cf0d9fb7e8dc58cecb19ec09c1fba42732e4659d3cf58094add
 EBUILD icedtea-web-1.1.4.ebuild 3958 RMD160 faf4add9b4ee9e55f7faf4334e4db67687ad2fbe SHA1 703d9b569ccd02f1676525eaa34060b86a2308e6 SHA256 706e4c0419a3707d5618899b2c62cd6e2636e3def77b8ad7c072c3d6b968c860
-EBUILD icedtea-web-1.2-r7.ebuild 3945 RMD160 d93b593541937aca5854203e4c343ffb50c81a40 SHA1 77f54dc1e5e4fbc98c571ac8709dec1c56afe7f1 SHA256 36bc583cb09cc007baac0665d628d2351af744796fc1817661ad619323e0399e
-EBUILD icedtea-web-1.2.ebuild 3954 RMD160 7010375b66f890dd0b83a021b6d2cd33064bf562 SHA1 6f34e2a38ced11853275fc064256a12766162aec SHA256 80995d488557e330ee2f7649743350fdedd937caecbeb18893f59300b3d117a0
-MISC ChangeLog 3915 RMD160 4f21e9c88e6c03cf3d33c0522fdeb02087d29f56 SHA1 34b3b6d460bf65f5739976cd2b758e16da73894a SHA256 67c85a7a72eeefc95dfcf4e4d94a6dcdbf2e7317194e38c8e41ca3e1a52f154f
+EBUILD icedtea-web-1.2-r7.ebuild 3376 RMD160 a493224a1ab812c98c476ef154359fbd4e136540 SHA1 b0c2ee19fab94fcd1125d6c369c461d245b378a6 SHA256 9fc9cb2c027e387cc4fdb3a803dea151225d7d40b21d98716786a9efae0d3d5f
+EBUILD icedtea-web-1.2.ebuild 3385 RMD160 8a8846137160b30285ded7d628f2b917e1bd3ab1 SHA1 33a733a27f1de426981a9b4a8bbbd09222412684 SHA256 11336847350c171c8b4f232800691d8aaf6e2b2f78646b6f21732a1c68d5ad6c
+MISC ChangeLog 4099 RMD160 3839a8765ebd2c77a36192d2754b78f9e002e2a6 SHA1 e139d101818b9831bbe0450f0e026c7da8e1b993 SHA256 92df13ffbd466c6ce1d9a8b613a70892976438cd9e0a76611527878372ee74e1
 MISC metadata.xml 755 RMD160 a76b269fe8cf35dcacf9bc3dcd9714ef764d9bfb SHA1 517488bae5fe80e69a3fb6af061b813816b47364 SHA256 0589029d53503bd941089cf26f3a6eafe4b0bfe9c727e6c4a44cdc8ec03d5abc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPVdfUAAoJEIUJ+svaV163uBYIAKlC5zjXnFvW2X5JegctELem
-JXblWz2hovGjY6bqqrPRx6TN+jHXx5T+z0vqVkCGRvCWT4n+cRPBRVCVtoutxKzb
-uqKkCEDVJ94ZEM/YO3BhlnICFMSJX5SU1sJqEWPwTrny2PT3GbhRu4rGzDZlW2mV
-J8+R28t0OZzt5bJKZeBGkXOc4dQSP5G2XDTNBWMZC6+z5ReL1bK0OkFLUeDKijop
-e/NKQEzGw4Gg0M0Qz1JO8Kr9jIKnBH5CFJAxbXSlYzMqYy0FBVVrHIeghqsdmIa5
-8ZgrxC30LcI9bfstjdFeOu4vfpYyfVRLhSYsJjW04yBxzY1dj3b1ET/I1qN9uEQ=
-=nR6V
+iQEcBAEBAgAGBQJPYM1tAAoJEIUJ+svaV163PEcH/jhc/Lsxsvjov+x8X31Sa1x2
+TzBkwEXP/l5lWgM15fz8J9a38htSNmloUIDOolKCFseqPECsyWT2ClKd+oA4ZuXg
+GfWbFr9MN7M657OXVJ7xhxeJHT6G0YGN08+pTwjOtDRXcH1qB6mXvZSbExMCtVzM
+lje1muxQyRvw49QMt2KlOOI+iyt54ZMtLGpDPbTFoz10VRPdnLKeIFd/If87mKUo
+k8wOmfw5qedu6N5uM/BjArSaJ1vmV3+x6ImznWn0Vr/qRx8xN35jM9oUHqa93FOz
+KtrtNd8aIY3rSxCYXTIxapfd47dcWxrk2WaImTUIJfCVRcjrXx0hGv17CcQlKq8=
+=Mbmy
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild
index 5ef2bff1df70..269122674e5f 100644
--- a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2-r7.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-web/icedtea-web-1.2-r7.ebuild,v 1.1 2012/03/06 09:24:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild,v 1.2 2012/03/14 16:54:54 sera Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="4"
@@ -26,28 +26,11 @@ DEPEND="${RDEPEND}
 			>=net-libs/xulrunner-1.9.1 ) )
 	test? (	>=dev-java/junit-4.8:4 )"
 
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
 pkg_setup() {
-	[[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423
-
-	# 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"
-	else
-		# migration logic
-		if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then
-			JAVA_PKG_FORCE_VM="icedtea${SLOT}"
-		else
-			JAVA_PKG_FORCE_VM="icedtea-${SLOT}"
-		fi
-	fi
+	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea7"
+	JAVA_PKG_WANT_SOURCE="1.6"
+	JAVA_PKG_WANT_TARGET="1.6"
 
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }
diff --git a/dev-java/icedtea-web/icedtea-web-1.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.2.ebuild
index 614615ad12b5..ef8a381a6271 100644
--- a/dev-java/icedtea-web/icedtea-web-1.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2.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-web/icedtea-web-1.2.ebuild,v 1.1 2012/03/06 09:24:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.2.ebuild,v 1.2 2012/03/14 16:54:54 sera Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="4"
@@ -26,28 +26,11 @@ DEPEND="${RDEPEND}
 			>=net-libs/xulrunner-1.9.1 ) )
 	test? (	>=dev-java/junit-4.8:4 )"
 
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
 pkg_setup() {
-	[[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423
-
-	# 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"
-	else
-		# migration logic
-		if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then
-			JAVA_PKG_FORCE_VM="icedtea${SLOT}"
-		else
-			JAVA_PKG_FORCE_VM="icedtea-${SLOT}"
-		fi
-	fi
+	JAVA_PKG_WANT_BUILD_VM="icedtea-6 icedtea6"
+	JAVA_PKG_WANT_SOURCE="1.6"
+	JAVA_PKG_WANT_TARGET="1.6"
 
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }