Introduce icedtea7 USE flag, as it turns out that icedtea-web built with icedtea-6 is missing a class necessary for icedtea-7. When built with icedtea-7, it works with both versions.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4E61DE84

4 files changed, 25 insertions, 12 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index b64aa4700e54..eab9f586c6fa 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea-web
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.36 2013/11/09 11:55:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.37 2013/11/11 07:05:55 caster Exp $
+
+  11 Nov 2013; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.4.1.ebuild,
+  metadata.xml:
+  Introduce icedtea7 USE flag, as it turns out that icedtea-web built with
+  icedtea-6 is missing a class necessary for icedtea-7. When built with
+  icedtea-7, it works with both versions.
 
   09 Nov 2013; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.4.1.ebuild:
   Correct VMHANDLE to make automatic nsplugin activation work.
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 6dc497352ffc..fc110f16d53f 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -12,13 +12,13 @@ EBUILD icedtea-web-1.3.1-r7.ebuild 3359 SHA256 b22758b019625f3c1de779f925a722332
 EBUILD icedtea-web-1.3.1.ebuild 3376 SHA256 5562e8ad216bb8f4830c508d093f87cb492c9ef4d8dca9144d8048edcf90534c SHA512 b5be6848a0f1cbf843f4a9c2064b961a692107ea5b5359d27ca99f4461b731a3f0b41cc2d8ee33bcf10e07a07feadebdc7e6b51516976e8d5b88f5b43eac8116 WHIRLPOOL 85f4dbace01ac318330a2b419e42c2c27e406f76eade1725cf23bd5943d3f9a7bdf82f8d5beb1bee750b97138c955bc84e085846df91f1694d90c954f8125d6c
 EBUILD icedtea-web-1.3.2-r7.ebuild 3203 SHA256 d67cef1dd513f226eca7b11ae70c81d1bfb7ad162647349b1e723fa7a29f1757 SHA512 3f2c7a4acbeeda0aeb080affbd1c21db89acfd3184ffe076027ee8cd1a8b6ab3e0a8f950dcec1177b6324469836380aecf70f035a9a34841b99363b89804ace7 WHIRLPOOL 79f3e1e890574569db53ac1d7e3a5de27af3da3cf00af1635a2acdb8c8aef4a8b285d7c6a543c7c5d09b64ffc72e03ca490b5864719b82af123138a118474a84
 EBUILD icedtea-web-1.3.2.ebuild 3217 SHA256 6fccee8ebd946fc2cb66de0008e0785698afad5af5858ffc39e1cd6dbaa98719 SHA512 e30865ed5c61dad1691e5949b6d7772e195b6ada216931ab5d6f0434441a1b4d3c26b76eebce44223691b2400abfa5665e329229b11d4deb7bb726834e7bdfef WHIRLPOOL 8fe02f31c88b0b49664f6e510915b02a315c22c5232e0d366cc549013322642698e922345f720920c44b640160b1416f1316e3391d4826f3a2c90a5c0a82372c
-EBUILD icedtea-web-1.4.1.ebuild 2648 SHA256 9c1e98695af93b4bed6b0a54908fd00578ea3f8794f17f4735307fddf7bdd92a SHA512 c8f305169277ccb69b4fcf6a1d3323a8756a74390b486ea4ce3d8ac28417077340e67542686202baa3fb71d01063495d44b6cb04f88825b051da8ced23ba0c27 WHIRLPOOL 8fdd049d4a055261951a98cda5292ef37bc1ffa24061fde35968afe23aec5cd770d514fe5b50576f774c630cc750628060aec27db51d86f589a4eb5bdf0fbc87
-MISC ChangeLog 7791 SHA256 0c3a0f5c0f636d48444ef3846656e444f8b056bdfab2e370e4ddd7cd7465d920 SHA512 da97a53927ba890bbfa96bd4c0e139e1ccaae803ffd8132bc45e653523a3dda3e028b49bdff24407e97fdf68fd730440ecbac018d8e756d6077887f6a5645ecd WHIRLPOOL 3e509e2012199007530527acbd36876ac4208c72abe4dedfc28835462e3c376cc5ddce80f4f754d061212708f19049f837986beed0230f5ab5b68fdb6c271677
-MISC metadata.xml 621 SHA256 0f337c993e91c69308144d2faf88dcb01a9d1f0643c85da0b8a754fe3755cd5c SHA512 127598d47c60481865d0f6a807edea7b72cb1338abd97241c56c769b69477d930c741aaf853a3537db5876d50f4ba8b2160fb8d8c8aa7c767122479f56bb3e8e WHIRLPOOL edd94aac01965a8665bce18e58be3da524800fb96fdc9922ba960f08bc884bc7fe9fa0efed36f7b8edc1ae06bef2726e676e7f49dc05fe34fb840305dcd2ef8c
+EBUILD icedtea-web-1.4.1.ebuild 2822 SHA256 d78585f1633129e30423c3e05948742e9ebded4c47b7b683ca603b04975ad346 SHA512 ba54fb8ed114d77f72d2e631c504947e948e0661f42ca4584f15f6de136d51bd88f46b2d4776112ec6a23121b504047f4039905bf1ad5070ee5b36d45554788d WHIRLPOOL 2cae8e65feca3ee0e6fa93898534dd2ea14042632486565648d94cdeab81e9579d93c78a26ba041304ff09185820d51e65c91fad04575267a946952ae7a82aa7
+MISC ChangeLog 8074 SHA256 cf8a4413b99714b02499ca4aff9867b09c149640764a4d4b05d824a942d151ae SHA512 9bcaa93f36e8aaf005f34cddafde17fc50f6dee60083ba37215c4c93a9e3d6c473e0d13a8d5f770612f8e16bcfb16447bd02a49a13ff71b9bee1b6a2b5aa0f19 WHIRLPOOL 2704f0de2412d935f89f29ad320062df3ffbb93462ec11b293e2705e485d8a36cfaf36e6cbc814095e0d75093b96ab04dc99b66a8befe3ab89df604cf8714016
+MISC metadata.xml 737 SHA256 012e58b160e0c975fd640bd8aaa0a8170ff6db870fdb9c18b8c4785214ba16e9 SHA512 2350615284841a8093e8ad4f1847b2e28eeabb73b7725149fbf7e989b74cb0a2a014bc72af35b7fd1ed4158d3a5fa4efca3efe39bff70cc0f14a76e1da4b6789 WHIRLPOOL 130734bf42134841bcebeba640290c5e33100ecd3527ba4689220971e60480f87718d09cd05912b0500307c49d35ee4297b90f0b042d00c4ad3d7b23ef40ab24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAlJ+Ip4ACgkQtbrAj05h3oRE3wCgjgZ5N8q+ioPSSORN5xObn9aO
-MmsAoIiU+s89jrzYyve2v+ODv1KxwWm9
-=fmek
+iEYEAREKAAYFAlKAgegACgkQtbrAj05h3oSW7ACcDhJf5Ko3WthTAzm0pyQXa7Gl
+/TMAoJoriFNdviVqy2rI1t+JgBglZL9I
+=/pe3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild
index d79c76032cd0..f3087d133656 100644
--- a/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4.1.ebuild,v 1.2 2013/11/09 11:55:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild,v 1.3 2013/11/11 07:05:55 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="5"
@@ -15,13 +15,16 @@ LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc javascript +nsplugin test"
+IUSE="doc +icedtea7 javascript +nsplugin test"
 
 COMMON_DEP="
-	|| (
+	icedtea7? ( || (
+		dev-java/icedtea:7 dev-java/icedtea-bin:7
+	) )
+	!icedtea7? ( || (
 		dev-java/icedtea:7 dev-java/icedtea-bin:7
 		dev-java/icedtea:6 dev-java/icedtea-bin:6
-	)
+	) )
 	app-admin/eselect-java
 	nsplugin? (
 		>=dev-libs/glib-2.16
@@ -36,7 +39,10 @@ DEPEND="${COMMON_DEP}
 
 # http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011221.html
 pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7 icedtea-6 icedtea-bin-6"
+	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7"
+	if ! use icedtea7; then
+		JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6"
+	fi
 	JAVA_PKG_WANT_SOURCE="1.6"
 	JAVA_PKG_WANT_TARGET="1.6"
 
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
index 7ad86bf37b39..d2acb1b2f067 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -7,6 +7,7 @@
   </longdescription>
   <use>
     <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
+    <flag name="icedtea7">Build icedtea-7 support in addition to icedtea-6 support. Requires icedtea{-bin}-7</flag>
     <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
     <flag name="gtk2">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
     <flag name="gtk3">Use x11-libs/gtk+:3 (default)</flag>