Dropped vulnerable 1.3.1* (and unused local USE-descriptions gtk2 and gtk3) for security bug #483198.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 16 insertions, 268 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index eab9f586c6fa..6cf24100d41e 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,11 @@
 # 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.37 2013/11/11 07:05:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.38 2013/12/30 17:23:46 tomwij Exp $
+
+  30 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -icedtea-web-1.3.1-r7.ebuild,
+  -icedtea-web-1.3.1.ebuild, metadata.xml:
+  Dropped vulnerable 1.3.1* (and unused local USE-descriptions gtk2 and gtk3)
+  for security bug #483198.
 
   11 Nov 2013; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.4.1.ebuild,
   metadata.xml:
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index fc110f16d53f..ea82e5c63118 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 0001-Fix-parallel-install.-BGO-440906.patch 744 SHA256 deb003bdad87e1ad00c4754fc2c42f27b6c093d80bbe227e6bc180daa85f6ab7 SHA512 33ce175b26e00585db663130d47d993d4193c3ed44e77098676d9b1128dc9329fa74c60775430444957faf57ffb45310f84fb6bf2f586b37f82e7a05c6e9143c WHIRLPOOL 1993fc4577f6b68f198dd70b97b7e372331004273ed90837b1507e24655f148994ac69050c371697d5ecc4651a597d20bafcb42bddeb22cb6d87e762dec029a3
 AUX 0002-Respect-LDFLAGS.patch 352 SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866 SHA512 83e431505808e5e8b553d17b74590eaf232f69ccc7d0c9c3753af6995105a08b4cf8cc844295edb977e5a6456c5fe3b53ba0fa565607c99cc82ac025169dd16f WHIRLPOOL ef0f6ccdd1f879940351dbe0ece62c2f1ecc333df06328f7d12e07885579255f973689545e32ec7db679cc1ec516860f2b7acb52070dc4714c2a3b78b9eeae87
 AUX README.gentoo 837 SHA256 621b0029be026356bb84c86d6062203eb90279bb95ae2516f276e4c59c42c9ac SHA512 bff6548c7ed16201838f53ebe653c04dea4843ed8ddd82325355ca2ccc30bd5fa0bfd1bba1a48d05998c87b55a2c87fdd3240ea9b528c4a5e245f467918b9da9 WHIRLPOOL 22b7655816c9a045b3fe59ce6679cb1f3c44bb5296b50052b9bd449e68fc969e961080fbbcab0c7fb53e7b6fa204f0cd198d2719f0c5a7e5ae740acacc3aeb4e
 AUX icedtea-web-1.3.2-openjdk-build-25.patch 2366 SHA256 4c5b93ea81e3527c946853490d752903d8bd2cf285941aa5c37975980f392ce6 SHA512 52aaeea5790589388bb94edb00c9181c406a3cd6899454b75cc0d9582188dc1cf48be3b3a6eb29bb762db2c2213ca5606ff4fd2bcfd0db0f162dee1308cb391b WHIRLPOOL 92cb50828a5040d204d7f613b7178d155853f7401730190d1e849a287e27489143eed94ef835b46da6865078151b3478a61fa6bed2cdf129836ea90398f15493
-DIST icedtea-web-1.3.1.tar.gz 995777 SHA256 20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56 SHA512 9e014ec1eb93868aeb5409aa79a6adcb07dbcab37f881693d4c8f9b755ed97fee1a53abc852a0483d3966fe4ea4fa0df80935b89db8703fcde8df74f04169dcf WHIRLPOOL d0a91f8b441137a92fb8e76774c5c7c43568f171084e48ef390765a7732d490ea2450c4d5338d6485745665c6228b8dffa06986b8b5441a8b117435ec9d34729
 DIST icedtea-web-1.3.2.tar.gz 1038957 SHA256 bd25d9a9565271b716e54a19ffe8e34ab339666f72c99da743155320b9ac27f0 SHA512 5bf09819c7ce855c5c05b27589afbef14a209174d9de2e7ad6d1a7c7ee90e98efe5498718becca046c9aca8525d5fea9636819ccc4b9b18f38f15103d66bcd16 WHIRLPOOL 43bb9f1532305c61c456d2f7a81f93f73e4f560bafdeada5d731627fd6c8d2435718d2571e47fa05e8420d306627f7396f59f6dd10961a88df03491032a37817
 DIST icedtea-web-1.4.1.tar.gz 1376133 SHA256 09100207396a09784e04f2ad40d65212930c1d43839e7fa63b9dffaf8567d77b SHA512 aee04dfd3f5cfdf1b956c500922c62f5b37134be4c17562e42f4368bf1a160954a57e78e5f0ce06e2af21237511c5b8d04c490db12ab11d743b5064523b76e6b WHIRLPOOL e47893f67efcda6b948ac28c443a4c2a51cf92e687ac3ca765fc87ed20e5231dd6d96b751044ac87d85ae1d03fdf608931e2e693ca026b921970a3d804eb89c6
-EBUILD icedtea-web-1.3.1-r7.ebuild 3359 SHA256 b22758b019625f3c1de779f925a7223328c90d92d044e3c6175699bc93cece74 SHA512 dbbbf5cf4c41152c5e0cd55f6288d1a8df37247437fbce728308018c7f9175d6960b93670b0f15f0c59dec47f0f86c32fc324c6c371866d59cdbed9005b4340a WHIRLPOOL aeb545ef6da54101f84f9ac3703d80395f73f2199f40ccac7c4ebdb476a6116c0993b74b8418fe8a096aaac3ce1a1d2b723a13f6df471413ad3375624502d4c3
-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 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
+MISC ChangeLog 8301 SHA256 d3212ab4935d7307be115cf67fd91ebc930544cc670d6848e3d34aabbff90e91 SHA512 0757fe4a9f1ccd1db7d48c995891d8d99b866cae7996b878f128b23310a57198420d1136b01a5e293899e9a2487559ed32718c0ea2c4d1f9e44e24caf47ad224 WHIRLPOOL 76e32f0cdd6b8d1a4d3fbdc1192fd0568b34eec99f9c9f544ffa6556aca20df047d7e8ca7fce82e79ab6c404ef32d52c4356c18fa53a6f2bf7f00f2513205194
+MISC metadata.xml 602 SHA256 075988888499fde2040ccf1c555886e1f0099d09092040581006050ad8d2b58c SHA512 7d6da92f77c0d07abd0eb63bfba536786fde518c8d97f04a5701cccfe9c55dfb211d9cad3eb8b3c718b83ed6cfb017cce7bd1cc62d557dc051c62a38a81ac572 WHIRLPOOL ad270f91bfbaa488fe35cfa9b15ae68abd05106b6ac338d16c1f20552a131a0f38873117e87553bf959a34bde8dbfbb375e570e9f2f71f1d28f28f0dc4bbad9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAlKAgegACgkQtbrAj05h3oSW7ACcDhJf5Ko3WthTAzm0pyQXa7Gl
-/TMAoJoriFNdviVqy2rI1t+JgBglZL9I
-=/pe3
+iQEcBAEBCAAGBQJSwawNAAoJEJWyH81tNOV9TrUH/A6BxO44Z2Tr0PvkbeoFaEs1
+I4xUCZUHCgH0wRzlCk38XZikKMbruEpdtwdOh7C4MP8NOFXKHB0DQESS0hV2GhML
+aYLq380XcCU2gnGVkvYraTkyI7qN+JKlHuN/mM7h+97XMGnH2hKOEWz0IWlHa2BY
+jLAQ/QfE04ARnlttmXcVOlZYrL+ROoAtkbsdpbgZwKtSKalGE/xMTj3ybxYMlKrU
+rx3RtaIqSrT2Y+KoZuNqMQKPuZ3Gjj/NvthMf2dQyJlAlBo8HB5g4nuHEql+w3RR
+4cBBlIOOoe/9nLNcTQ/EU0uyZahCHvJRgQws05vzw+vjhTJskTAJtjAEsGPpbhM=
+=+hCk
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-web/icedtea-web-1.3.1-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.3.1-r7.ebuild
deleted file mode 100644
index 2b18ad60ad56..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.3.1-r7.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.3.1-r7.ebuild,v 1.1 2012/11/14 21:59:24 caster Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="4"
-
-inherit autotools eutils 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="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="build doc gtk2 gtk3 javascript +nsplugin test"
-
-COMMON_DEP="
-	dev-java/icedtea:${SLOT}
-	nsplugin? (
-		>=dev-libs/glib-2.16
-		gtk2? (
-			!gtk3? ( >=x11-libs/gtk+-2.6:2 )
-			gtk3? ( x11-libs/gtk+:3 )
-		)
-		!gtk2? ( x11-libs/gtk+:3 )
-	)"
-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 )"
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="icedtea-${SLOT} icedtea${SLOT}"
-	JAVA_PKG_WANT_SOURCE="1.6"
-	JAVA_PKG_WANT_TARGET="1.6"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-
-	VMHANDLE="icedtea-${SLOT}"
-}
-
-src_prepare() {
-	# bug #356645
-	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
-		installdir="/opt/icedtea-web-bin-${SLOT}"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-		[[ "${vmhome}" == "${icedteadir}" ]] \
-			|| die "Unexpected install location of IcedTea ${SLOT} '${vmhome}'"
-	fi
-
-	einfo "Installing IcedTea-Web in '${installdir}'"
-	einfo "Installing IcedTea-Web for IcedTea${SLOT} in '${icedteadir}'"
-
-	local gtk_ver=3
-	use gtk2 && gtk_ver=2
-	use gtk3 && gtk_ver=3
-
-	local myconf=(
-		# we need to override all *dir variables that econf sets.
-		# man page (javaws) is installed directly to icedteadir because it's
-		# easier than symlinking, as we don't know the suffix the man page will
-		# end up compressed with, anyway
-		--prefix="${installdir}"
-		--mandir="${icedteadir}"/man
-		--infodir="${installdir}"/share/info
-		--datadir="${installdir}"/share
-		--with-jdk-home="${icedteadir}"
-		--with-gtk=${gtk_ver}
-		$(use_enable doc docs)
-		$(use_enable nsplugin plugin)
-		$(use_with javascript rhino)
-	)
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# bug #440906
-	MAKEOPTS+=" -j1" default
-
-	if use nsplugin; then
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-	fi
-}
-
-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.3.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.3.1.ebuild
deleted file mode 100644
index 3419761ef915..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.3.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.3.1.ebuild,v 1.2 2013/02/05 07:31:48 zerochaos Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="4"
-
-inherit autotools eutils 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="6"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="build doc gtk2 gtk3 javascript +nsplugin test"
-
-COMMON_DEP="
-	dev-java/icedtea:${SLOT}
-	nsplugin? (
-		>=dev-libs/glib-2.16
-		gtk2? (
-			!gtk3? ( >=x11-libs/gtk+-2.6:2 )
-			gtk3? ( x11-libs/gtk+:3 )
-		)
-		!gtk2? ( x11-libs/gtk+:3 )
-	)"
-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 )"
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="icedtea-${SLOT} icedtea${SLOT}"
-	JAVA_PKG_WANT_SOURCE="1.6"
-	JAVA_PKG_WANT_TARGET="1.6"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-
-	VMHANDLE="icedtea-${SLOT}"
-}
-
-src_prepare() {
-	# bug #356645
-	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
-		installdir="/opt/icedtea-web-bin-${SLOT}"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-		[[ "${vmhome}" == "${icedteadir}" ]] \
-			|| die "Unexpected install location of IcedTea ${SLOT} '${vmhome}'"
-	fi
-
-	einfo "Installing IcedTea-Web in '${installdir}'"
-	einfo "Installing IcedTea-Web for IcedTea${SLOT} in '${icedteadir}'"
-
-	local gtk_ver=3
-	use gtk2 && gtk_ver=2
-	use gtk3 && gtk_ver=3
-
-	local myconf=(
-		# we need to override all *dir variables that econf sets.
-		# man page (javaws) is installed directly to icedteadir because it's
-		# easier than symlinking, as we don't know the suffix the man page will
-		# end up compressed with, anyway
-		--prefix="${installdir}"
-		--mandir="${icedteadir}"/man
-		--infodir="${installdir}"/share/info
-		--datadir="${installdir}"/share
-		--with-jdk-home="${icedteadir}"
-		--with-gtk=${gtk_ver}
-		$(use_enable doc docs)
-		$(use_enable nsplugin plugin)
-		$(use_with javascript rhino)
-	)
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# bug #440906
-	MAKEOPTS+=" -j1" default
-
-	if use nsplugin; then
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-	fi
-}
-
-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/metadata.xml b/dev-java/icedtea-web/metadata.xml
index d2acb1b2f067..0f54936abfe5 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -9,7 +9,5 @@
     <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>
   </use>
 </pkgmetadata>