Revbump the current icedtea-web-1.4.2 to 1.4.2-r1 without change. Then remove icedtea7 USE flag and associated dependency from -r0, so it can be stabilized. Security bug #501472.

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

4 files changed, 126 insertions, 17 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index fba14cfe1515..e82b29609fa6 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/icedtea-web
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.39 2014/06/01 20:53:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.40 2014/06/27 14:39:37 caster Exp $
+
+*icedtea-web-1.4.2-r1 (27 Jun 2014)
+
+  27 Jun 2014; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.4.2.ebuild,
+  +icedtea-web-1.4.2-r1.ebuild:
+  Revbump the current icedtea-web-1.4.2 to 1.4.2-r1 without change. Then remove
+  icedtea7 USE flag and associated dependency from -r0, so it can be
+  stabilized. Security bug #501472.
 
 *icedtea-web-1.4.2 (01 Jun 2014)
 
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 150ac12299a1..3db6389f91a3 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -11,13 +11,14 @@ DIST icedtea-web-1.4.2.tar.gz 1393866 SHA256 d48de5fdbf0eb8983b857ebc5368f339291
 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 2822 SHA256 d78585f1633129e30423c3e05948742e9ebded4c47b7b683ca603b04975ad346 SHA512 ba54fb8ed114d77f72d2e631c504947e948e0661f42ca4584f15f6de136d51bd88f46b2d4776112ec6a23121b504047f4039905bf1ad5070ee5b36d45554788d WHIRLPOOL 2cae8e65feca3ee0e6fa93898534dd2ea14042632486565648d94cdeab81e9579d93c78a26ba041304ff09185820d51e65c91fad04575267a946952ae7a82aa7
-EBUILD icedtea-web-1.4.2.ebuild 2822 SHA256 abe5c1846d95e971f5d8dbb2d5bb20164e1e06964f8826f0a4b5f06f2f2e1828 SHA512 f43bda56c7dc4415d9c5414ca1a76e0fdf7433291bae99ad9bde60d96878b45f6cff44d4632b4357e30bdb4f8ca6dd57af0efa8c71f38e4b5f50779282f5fc0e WHIRLPOOL 9c359736377ae38bab59f7085b5237dd552f5d7a62fea74c346283ec2ad9c10fa3fb729c879ac267e72bf2e6d2e4fbcc37a178d7cfe8d12c4b36af589b25ee45
-MISC ChangeLog 8452 SHA256 1c2dc4179935680f2c5b5235e86beda4fe02bd8b5f169d396fbc8041345aef68 SHA512 18b6b5722864d8318225fbdcc0b742a188a372b8c65fe13289b6af5c0ee74b11a5faa042e13ab2c7ea803991a729f005ed681735f5430bbba8b40cc32b52010e WHIRLPOOL fd1cd155ede4c325520795f014d28fa65bee24701e51086f17059d2c02f537b4e3ad8e250c4322acc1a92c846209d5aa19c91669e632e144022db6f11dc16e70
+EBUILD icedtea-web-1.4.2-r1.ebuild 2825 SHA256 32c9b16f94eb8c9efed36e85d2f3a3af981c593685f42ddf60d5ab5b4de19921 SHA512 8af66b37578ba885d9ce463caacf77c2aad81d9a00602b256dbe01bf9aac2311acf0cbb574e367f0e9fceaa79396c9aeb1d489d13425851219674ebf0011cc94 WHIRLPOOL 8e328ae7031befb9fe46c462a9ac43a6ad70690ee6fd1a8639f645ceffe651fa34972e0e41807e9f38c997a267922a79c2c98317ac7478e63a9a0c6a431e9cc3
+EBUILD icedtea-web-1.4.2.ebuild 2648 SHA256 14a74f541ffd39c7a8922534feea53cd20500af835bb0f8fd1a92f3f78cd7e05 SHA512 c2552002cbc5d8fbc75a20e0a57ecdf0443f5f5ad62c37ed36e49cd23641badbcc1019ab446e8d84c09da29f8b5d5dcd259a32fd7c3231847e91088ea68ee61b WHIRLPOOL 969e3378980e8ee56eb0a39d76d58dbd24c32bfebd642706bd646d59a204d0bcd45769d18378e1734133f6e71ede39d8d972ea7070a9610d3d6a4fef1dfffaa5
+MISC ChangeLog 8784 SHA256 a9d6fb52b314236c3a96c8da081a2c99df4bce25acf9f302d481eab8e96d2269 SHA512 e79da6317fd05244fb0d5d4db994cdba6fb775a29623ca29204f996b8187908d04840f55a40453a4b162564a0707e5675ad7c26a45f6eb627865f293836cf327 WHIRLPOOL da198d7bf00f913633f9d4e6e91eebc31053413fe8b1e47d00ecfa2f21e86bf1de2d89d51231093517125e4da80be4f31cfa82f0fad33cf5fb0ac20f37b0c732
 MISC metadata.xml 602 SHA256 075988888499fde2040ccf1c555886e1f0099d09092040581006050ad8d2b58c SHA512 7d6da92f77c0d07abd0eb63bfba536786fde518c8d97f04a5701cccfe9c55dfb211d9cad3eb8b3c718b83ed6cfb017cce7bd1cc62d557dc051c62a38a81ac572 WHIRLPOOL ad270f91bfbaa488fe35cfa9b15ae68abd05106b6ac338d16c1f20552a131a0f38873117e87553bf959a34bde8dbfbb375e570e9f2f71f1d28f28f0dc4bbad9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAlOLkucACgkQtbrAj05h3oSsvgCeIMHs1WhnyvzILDsEahqf6DNZ
-ULIAoI2wNRIKAgwZmLCnnNAxwIhRdJ49
-=CvQn
+iEYEAREKAAYFAlOtgi8ACgkQtbrAj05h3oTAHQCgonCHljz4dCuUgejxcNss2llF
+EoQAmQHBynFGziUTiIGpuxwgsu3gA7xG
+=Mm+f
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-web/icedtea-web-1.4.2-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..1f94ae948063
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.4.2-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 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.2-r1.ebuild,v 1.1 2014/06/27 14:39:37 caster Exp $
+# Build written by Andrew John Hughes (ahughes@redhat.com)
+
+EAPI="5"
+
+inherit autotools eutils readme.gentoo java-pkg-2 java-vm-2
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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
+	)"
+RDEPEND="${COMMON_DEP}"
+# Need system junit 4.8+. Bug #389795
+DEPEND="${COMMON_DEP}
+	virtual/pkgconfig
+	javascript? ( dev-java/rhino:1.6 )
+	nsplugin? ( net-misc/npapi-sdk )
+	test? (	>=dev-java/junit-4.8:4 )"
+
+# 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"
+	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"
+
+	java-pkg-2_pkg_setup
+	java-vm-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/0001-Fix-parallel-install.-BGO-440906.patch
+	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch # bug #356645
+	eautoreconf
+}
+
+src_configure() {
+	local config=(
+		# javaws is managed by eselect java-vm and symlinked to by icedtea so
+		# move it out of the way and symlink itweb-settings back to bin
+		--bindir="${EPREFIX}"/usr/libexec/${PN}
+		--with-jdk-home="${JAVA_HOME}"
+		$(use_enable doc docs)
+		$(use_enable nsplugin plugin)
+		$(use_with javascript rhino)
+	)
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+	econf "${config[@]}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	if use nsplugin; then
+		install_mozilla_plugin "/usr/$(get_libdir)/IcedTeaPlugin.so"
+	fi
+
+	mkdir -p "${ED}"/usr/bin || die
+	dosym /usr/libexec/${PN}/itweb-settings /usr/bin/itweb-settings || die
+
+	# Should we patch system default lookup instead?
+	mkdir -p "${ED}"/etc/.java/deployment/ || die
+	echo "deployment.jre.dir=/etc/java-config-2/current-icedtea-web-vm" \
+		> "${ED}"/etc/.java/deployment/deployment.properties || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	VMHANDLE="icedtea-web@${GENTOO_VM}" java-vm_check-nsplugin
+	java_mozilla_clean_
+	readme.gentoo_print_elog
+}
+
+pkg_prerm() {
+	# override the java-vm-2 eclass check for removing a system VM, as it
+	# doesn't make sense here.
+	:;
+}
diff --git a/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild
index 20bb3764b1c3..111e3eaf261f 100644
--- a/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.4.2.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-web/icedtea-web-1.4.2.ebuild,v 1.1 2014/06/01 20:53:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild,v 1.2 2014/06/27 14:39:37 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="5"
@@ -15,16 +15,13 @@ LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc +icedtea7 javascript +nsplugin test"
+IUSE="doc 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
@@ -39,10 +36,7 @@ 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"
-	if ! use icedtea7; then
-		JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6"
-	fi
+	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7 icedtea-6 icedtea-bin-6"
 	JAVA_PKG_WANT_SOURCE="1.6"
 	JAVA_PKG_WANT_TARGET="1.6"