Removed affected versions for security bug #473980.

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

4 files changed, 13 insertions, 235 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index f0d08dd59880..12a8ca02e6c7 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.135 2014/01/28 12:09:12 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.136 2014/01/28 12:25:58 tomwij Exp $
+
+  28 Jan 2014; Tom Wijsman <TomWij@gentoo.org>
+  -emul-linux-x86-java-1.6.0.43.ebuild, -emul-linux-x86-java-1.6.0.45.ebuild:
+  Removed affected versions for security bug #473980.
 
   28 Jan 2014; Mikle Kolyada <zlogene@gentoo.org>
   emul-linux-x86-java-1.7.0.51.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 06534449c8cf..126e8c1f9063 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -4,20 +4,18 @@ Hash: SHA256
 AUX emul-linux-x86-java-1.6.env-r1 969 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4 SHA512 c6f257971d1ad52b1af6041f84978d7029598b7abef7bd25e3d4f7e83cf170325fc80a53eaad70085bc1f45f14af6f0dc322ac729535fd6e0c80704dedb32811 WHIRLPOOL 33d29b11ef6ebe62672cb4a483867e2e38cd73827f902ed3b4d1784a466c266446b8306447e9c7ed175d7b4e416165159aef51a73b31a14df611efdeca185fed
 AUX emul-linux-x86-java-1.7.env-r1 969 SHA256 536aaac1a5f9336cbc0fe8626fd1553af3ddddea91fc0f73ce142f60da68e029 SHA512 404b2ed452567fbc3dfcb85d55bc0d48a90ed2d81c8d214c33dbf985d2e363ef7a31e7fd28a64065648c7e18db958dba4a85129953582d908f1493da97cd0d80 WHIRLPOOL 95d52fe1f178ad62e011c13a3a88cfdcd64dd4ecf38879ef9a5f069615b4e4e7a53f554a1dcdc56751780f086638907c3168e68bb1a63d46adc037a530e97b76
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
-DIST jre-6u43-linux-i586.bin 21727684 SHA256 e6bb81281f661580ea0351726611e064ba95d929f83a7a9f9b71e5ac50d315a3 SHA512 25ca97b5d0811b430fc546c4efa5b8fbdb4cd7bb677370600f8333d8e4e70bb511a5db2b0a4fafc84b5abad099d678f64727d6dcde0fb609795db4ef2f5981b0 WHIRLPOOL 10d0549661a69c61144be9a477c77edf844ee7b1c2f8941f30230157261db6cb8297e5c4217980409b3416cc979e0289fedc330142e97a0a364ae60c9577291e
-DIST jre-6u45-linux-i586.bin 21770712 SHA256 6f6155623537162e169044454856c41c4443eab65bdc71eba0b90b242ecf0030 SHA512 5454918675dd27619989fdae2fa46b0f87367deca99632c53a5d0e47010ca5c1256384ed1ebbb504bc0ea24ea605fed518969fae73f5defae26fad7081006e82 WHIRLPOOL e294c4b308516c4117ff7f9b337f652f692fe69db37e098ece4627632e7d49b949d9d37f58be4bef7a9a3949da08d3c725356e238569190d5a184c094fea002a
 DIST jre-7u51-linux-i586.tar.gz 48333427 SHA256 f6807069ff45576ffff173a2ee4355bdf5a493e9b463bde9196b942af4f6fcdb SHA512 e5a2d841e7f924b606d3d3e94f75bad273f9952ff94b94f081d73614d0001326a9ac974412840c994e66dcc5d2bf582c193a08cb725f435f2770fb01d9546b3a WHIRLPOOL 5cf27c761ea3c2c8ad395dcb8563dc5e4933552a48d1e64e77071bf84e86bd34aa19f590859a143a9c986fda0b7594f4ef6e27d89fcaef0c52a678bd30a6eaa0
-EBUILD emul-linux-x86-java-1.6.0.43.ebuild 3461 SHA256 3e9da4a629e63687c9c07d808264825ea0287c1feaacce589f58be0c66245d92 SHA512 8ba4ec6873ac2df2db825747e5f6e292cb89720a74591a1cd57ec1331a6eed97dca6b8ba38368a8e06d6bedae9393a3ae70c5b4b33af5c5eedad7e6fd6eef304 WHIRLPOOL cf2230181c568822ed8f3411c620300364bfd3fee428be36f9b92620798520f6299fc7164171a5e8ef76b7afcb003a8a59daa5ca6c6948098b863a18e0e254f9
-EBUILD emul-linux-x86-java-1.6.0.45.ebuild 3461 SHA256 45741a2f4ca96ab97d34e6b3fbff5bec09327bea3896fcd9171b6f534b4e1921 SHA512 86b90bf991fa95417023f538580ad234b6e76da5784168f5b880346e405f38b894c2cebc7cf58ff81b3baf8029c4114f6da281b93e08681dff7f7bda09b3f3e9 WHIRLPOOL b86517b9820951d88a02c0dbc067f6b3f0501632c1fdb93d24d4800c495ca1a31681f13d834f30c066bd15cd834a758bbac781981847e99c887d721979c46d5f
 EBUILD emul-linux-x86-java-1.7.0.51.ebuild 3391 SHA256 4716c9886b168b5a036d23e8938460523f1e9f6c8444990a469ea03de0434d09 SHA512 f433b0b9d7c003e795f56f64a683a88ad38fc0862ca418d65b42bc699277ad7f5bbcb13539dc54057316a0a1244acf2cd668bd255f7c7420fd9ad89ce13f6a98 WHIRLPOOL 0fde7cbd85d0984580f3bda50d8ef91640c122038029124a70907c878b3f7d74305f496188bfdccc33d90de1b4855c50d5e39446af07c9719c69957824a5a25f
-MISC ChangeLog 26695 SHA256 30b8981a507658d2a568dfaf3f8ed91c9743b6d74fa7cd2270fcd8252c77db2c SHA512 279fe3d16ebba9bf5275cf40cbd3395dc9986d0e4990060bd27223de97cc43bd5d52766d0d1b0f2219b42b14c7f769f27a47c680261c361b48662204b69693a1 WHIRLPOOL 92e61ba7848e2df056949a6b5efe5b62df9ed7ef3bd7cdaf8494b3e4c17cbbd83f3a4d988a8d389c9342e4c9241eab4054ef96162493f90915ac687a04644e25
+MISC ChangeLog 26874 SHA256 22cf6c8fe983d30ed23a4a888f1038deb4855fb95af1b5bf3c9d01a4da7c552f SHA512 e993a94825ca0b1fbc9da6dc30343705bd5106588d30f6c4844e979ba262960016c6ea329d294ccaf1a2540ff978163378f7eea3e77319aaaa71ca4a6ceed791 WHIRLPOOL 6a0532a19da4cd7d9e5f405101e9ea6bc5246848192cfb6fceb71ffbfe5d6860c7556ccb04e7a09298408fcddd10e774a706131c80da773e54b068bace53a2bb
 MISC metadata.xml 243 SHA256 bec7d825ae2052459b6f40ddcf9a807c18caf8f5aa3e5844de29a9b337230536 SHA512 5a5dc347f5a2a29e3f122631df69dca812d0f649921a32ad21dfc33d57ac9757d2552c59a14c5a4275de5376c9b0f19fc0dde030eba69d47dd6682b1638536e1 WHIRLPOOL 9bdb79b376c2c7652455ab2e7117a9abd4e4110caa276c31e4b3e2ed8b0f49b4736083234b8bbc5012edc8b6ee866de055c6cfdf98794b11619cbd517ee2dd64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlLnn0kACgkQG9wOWsQutdYjWwP/b4UEN3M+EHsa/LkRVipXLj+2
-Zz99bhkuVDazJj+/GzebumUMPhW8qplm3TcF1Fj/Mgik3R6/yk9c5cyiTYv+3G5Q
-CbED0juuE4ZXepDzj3Y0ZB1vrS8BHbY29fn3qgfn+XzxrKSMN9O+WI0bc1nTDTMD
-2sLeJigDrhwXYHhBXPc=
-=u347
+iQEcBAEBCAAGBQJS56GVAAoJEJWyH81tNOV9sJEIAMSw1xRr+tKzbqMiDpTWjtpl
+amYjdLIWNtMFZpHB6OOyrMat2+CI77QhZ7MTCgXY9aMFqNdugBmz7SIu3YIH96DB
+8iH6mNwvN6WRa0lriJaUP8EATBFabkf3H2PIMl4hmKN49DiC0yCUfdFkEbmXEuY9
++2wYsEv/5TX886P3aRlc6as7eQC3opfCl3hmIEjJmLZvHyHwrurft/5KKDKOqhUe
+c5GRxFECno6znYKRIu41meo7mI6oTLZbi3DTGTJIOZaNljQP9amHCFU/ZnmvfR8k
+sf9/H0zyjtIr+SFYm0b+m7E1GVNS2plIAjXkJu7cEGGYCllpWnk5EDE6CCekPJo=
+=0uB0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild
deleted file mode 100644
index ad90134b6ba1..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild,v 1.2 2013/03/07 18:44:46 ago Exp $
-
-EAPI="5"
-
-inherit java-vm-2 eutils prefix versionator
-
-# This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6downloads-1902815.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-X86_AT="jre-${MY_PV}-linux-i586.bin"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="${X86_AT}"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.6"
-KEYWORDS="-* amd64"
-IUSE="+X alsa nsplugin pax_kernel"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	X? ( app-emulation/emul-linux-x86-xlibs )
-	alsa? ( app-emulation/emul-linux-x86-soundlibs )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
-	einfo ""
-	einfo "Please download '${X86_AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-}
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	bin/java -client -Xshare:dump || die
-	bin/java -server -Xshare:dump || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	rm -vf lib/i386/libjavaplugin_oji.so \
-		lib/i386/libjavaplugin_nscp*.so
-	rm -vrf plugin/i386
-	# Without nsplugin flag, also remove the new plugin
-	arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir "${dest}"
-	cp -pPR bin lib man "${ddest}" || die
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use nsplugin; then
-		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-		-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-		-e "s#Application;##" \
-		-e "/Encoding/d" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto "${dest}"/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild
deleted file mode 100644
index 685cd8acecd5..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild,v 1.2 2013/04/23 09:07:41 ago Exp $
-
-EAPI="5"
-
-inherit java-vm-2 eutils prefix versionator
-
-# This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6downloads-1902815.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-X86_AT="jre-${MY_PV}-linux-i586.bin"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="${X86_AT}"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.6"
-KEYWORDS="-* amd64"
-IUSE="+X alsa nsplugin pax_kernel"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	X? ( app-emulation/emul-linux-x86-xlibs )
-	alsa? ( app-emulation/emul-linux-x86-soundlibs )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
-	einfo ""
-	einfo "Please download '${X86_AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-}
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	bin/java -client -Xshare:dump || die
-	bin/java -server -Xshare:dump || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	rm -vf lib/i386/libjavaplugin_oji.so \
-		lib/i386/libjavaplugin_nscp*.so
-	rm -vrf plugin/i386
-	# Without nsplugin flag, also remove the new plugin
-	arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir "${dest}"
-	cp -pPR bin lib man "${ddest}" || die
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use nsplugin; then
-		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-		-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-		-e "s#Application;##" \
-		-e "/Encoding/d" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto "${dest}"/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}