aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-03-14 13:26:16 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-03-14 13:26:16 +0000
commit74bbb3252700ddb275973dedbc42779a95ac707b (patch)
tree620f57a26177540a894b7ef1129e02ed66aca157
parentFix building against >=glib-2.31. #402481 (diff)
downloadjava-74bbb3252700ddb275973dedbc42779a95ac707b.tar.gz
java-74bbb3252700ddb275973dedbc42779a95ac707b.tar.bz2
java-74bbb3252700ddb275973dedbc42779a95ac707b.zip
Use JAVA_PKG_WANT_BUILD_VM for selecting VM. Obsoletes handle migration code.
(Portage version: 2.1.10.49/svn/Linux x86_64, signed Manifest commit with key 0xDA575EB7) svn path=/java-overlay/; revision=9002
-rw-r--r--dev-java/icedtea-web/ChangeLog4
-rw-r--r--dev-java/icedtea-web/Manifest20
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild23
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.2.ebuild23
4 files changed, 20 insertions, 50 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 32be260b..e25673cd 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 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 9aa2d166..9372da14 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 3947 RMD160 c2ca94f363127be835030b371e23eabdf0cdfbc5 SHA1 06d72d0ac062153b4e10e224becb85af5acf123f SHA256 658a99feffd54753b9ea3718e2870aa33cb9097578775448729b8e24c0c45ec5
EBUILD icedtea-web-1.1.4-r8.ebuild 4074 RMD160 20d81aeeb1142b3c4b4b1cd258e668d737d3d0d5 SHA1 63599b3bd20407562c1506f7bde3e71f571607ed SHA256 110cb97e651d0aa2877c4dfe180695520061d127255a3380044768f6377c5a37
EBUILD icedtea-web-1.1.4.ebuild 3956 RMD160 97b5d4c531d8bd0856407a305119b28a14ef5e27 SHA1 3fd09263950f4d062bdc4b3b207545cb6c14dd05 SHA256 324335acb6270fa0e32ab905f885b828fe1e1c0964182725179f3f2df90a2cc6
-EBUILD icedtea-web-1.2-r7.ebuild 3947 RMD160 c2ca94f363127be835030b371e23eabdf0cdfbc5 SHA1 06d72d0ac062153b4e10e224becb85af5acf123f SHA256 658a99feffd54753b9ea3718e2870aa33cb9097578775448729b8e24c0c45ec5
-EBUILD icedtea-web-1.2.ebuild 3956 RMD160 97b5d4c531d8bd0856407a305119b28a14ef5e27 SHA1 3fd09263950f4d062bdc4b3b207545cb6c14dd05 SHA256 324335acb6270fa0e32ab905f885b828fe1e1c0964182725179f3f2df90a2cc6
-MISC ChangeLog 5729 RMD160 a2fee6bd5698add0a460f0dc1ec2467df7f0c363 SHA1 2ac0ac80c684c4767e56b630fa59095be4193725 SHA256 61322a1f9351911f219f65c666047cb8fedbefd16b21271d0521aa93049169f0
+EBUILD icedtea-web-1.2-r7.ebuild 3378 RMD160 561f726e27341ace8d58525f359cdeeb55b18a99 SHA1 296c476398d48976ac9d6df757e947c3c90117f0 SHA256 991495ee26e1c3d237035305457c001d57c3e7466eab2c007d83b8a577072f5d
+EBUILD icedtea-web-1.2.ebuild 3388 RMD160 c475a655300ca2d381af81f9c19416ec111a982e SHA1 29ca0b82cf0e735005e0e2ba019238ce27cca71c SHA256 cdfe09dfd3b0ff2f5a00bb30912b4b3d3965eca7726f406c87289039abd0b667
+MISC ChangeLog 5913 RMD160 9fca4be2409fb74a3c4720031e0b040cca8c9272 SHA1 00cba1080826f0f5b607948744ff41269c990e5b SHA256 b6dbc6f987f76f94b452f637c2d1cfbdf064c964e924715315c57c255786b114
MISC metadata.xml 532 RMD160 475b5d799d063ecc980d17896d8b591680ac2a7d SHA1 acf45999323b8df83b432973a11d64e2577ff022 SHA256 48eafb34adc623b7f298610feaac56f61a01f52658b83be30e4cc8d3a9b9f1d7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJPVdRzAAoJEIUJ+svaV163cqoH/0ZGfYkbGQLCWQylYbO37Wj8
-0oN/yqIEaGZz4T2NmC+4Qenou/xrqIoKRQd5KhLe+zhngH0/Ty/cN/dUYwXbIGsb
-B76rbcDZsY3UPZmilKMfvoAKBJwGsfX0xiMyydjgoWVzC69mjSbR9NGFKKSupszJ
-mQ5Fc5GV+lOyUOFLjB4x4gjjOrTMXBf2EDTqMj8xnQoPIxGVOsaaYSY4WV/Dw0U9
-mY8K/gpbdiA41eXSMTyOC3WtErDJDxhh5XvZqFC918BM5G0yxsdKhfXOeLMweFvN
-N782fEBUCX1Vp07+1qTVQtjo3m2aCku49+avXnwOzMP7L2xMDaB6yMhJBM7X2yo=
-=2a4y
+iQEcBAEBAgAGBQJPYJx0AAoJEIUJ+svaV163kOUH/A+H4bOAfF+b3cNTKSGCJwD/
+DuasYH9MZFCIhXf2q5W2D/7NwVLd4WDlI9EosGBm9ANva6tly17MR/yioNBc1xdU
+lAC1VZ7ls5n1d/zxn9eGBr+9RQToThAQ+5HIEUU4tGGOdB74lfv88B6R5Ym/TINb
+3ZYwxnP9GA1kFKpAX6u1sFzr4gnp2Sa0Itb49KmN1cbSuZzFHwEwS+QfGegTSb74
+kld1nc8B6LNeI4HXbmzCbqDf8JVgHV7JPffWNYgsPelT8pOqVbU+udsjqf356cBo
+AYcwfx3a6HiVsXdgof0nS34tWhnwDZU/J3bFNwj8IaILBbBfMkaMT4774u8NUrg=
+=tz78
-----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 6a50f0c1..5714e8b3 100644
--- a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild
@@ -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 b2666c3e..ceda08f7 100644
--- a/dev-java/icedtea-web/icedtea-web-1.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2.ebuild
@@ -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 icedtea-6"
+ 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
}