Remove vulnerable. #433094

Package-Manager: portage-2.1.11.13/cvs/Linux x86_64

5 files changed, 22 insertions, 501 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 9608547e76ab..e8980d8c0308 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.117 2012/09/02 18:04:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.118 2012/09/28 15:33:43 sera Exp $
+
+  28 Sep 2012; Ralph Sennhauser <sera@gentoo.org>
+  -emul-linux-x86-java-1.6.0.33.ebuild,
+  -emul-linux-x86-java-1.6.0.33-r1.ebuild,
+  -emul-linux-x86-java-1.6.0.33-r2.ebuild:
+  Remove vulnerable. #433094
 
   02 Sep 2012; Agostino Sarubbo <ago@gentoo.org>
   emul-linux-x86-java-1.6.0.35.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index a8873321def2..07fc255defd8 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX construct-1.6.sh 6799 SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 SHA512 a625b1b414f63370ce802669d569ee254f7f256a927a267629267a60bf66c5d887e1557b83d21a602008b39222499d56e20cad17b0ab5dbfc13d44e8f7b0ba69 WHIRLPOOL 69459effacb42f56d339ec8010b22e5c0ede7c7a35657f42e08ead5928039c4394031c1e210914131c86d563f8c1e7b5b23ef9b2e11233c69038b6641dfb9b48
 AUX emul-linux-x86-java-1.6.env 894 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df SHA512 5d48ae911515c8390d1ecefadd91249061ed156bcf8658139fb3437228603d2a281f27881699db7b81b7bc28e9e15e8c763e2b5f8529144c4b8876ef008da5ee WHIRLPOOL 232faadb734f1701a2363567754287c56e2bdc7824ad517c5a9b9b90b27b7e3f605d79f2a4b8803f7859da665d27eb4716199957d8202db3c6eadae7483e7119
 AUX emul-linux-x86-java-1.6.env-r1 969 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4 SHA512 c6f257971d1ad52b1af6041f84978d7029598b7abef7bd25e3d4f7e83cf170325fc80a53eaad70085bc1f45f14af6f0dc322ac729535fd6e0c80704dedb32811 WHIRLPOOL 33d29b11ef6ebe62672cb4a483867e2e38cd73827f902ed3b4d1784a466c266446b8306447e9c7ed175d7b4e416165159aef51a73b31a14df611efdeca185fed
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
-DIST jre-6u33-linux-i586.bin 21693738 SHA256 a824c38cb57110642678f21739fe995e84c876dfcbc3d64f3091ef08adacad4a SHA512 71e92b9c650234a3c0069f7c23146e78043fbac4f9e75cb37f0401b5a2d43bf5d64471f14890bd2d7680d5fa7b2a38b443321815c207e1df378ac688827226bb WHIRLPOOL 5a001c0358edb77f169972f269a68809301f777b80f85634d2c8a214ac451ab52c65fa42900e1969c2092ac37e194c0a6eaf31458d150e2a62c9e17b3c6484c1
 DIST jre-6u35-linux-i586.bin 21697122 SHA256 55959143e602cb4edf2786d0f78c288eb44e7f105836aa949f2e0081a2fbd70c SHA512 981c9177b910f3530acf9b0998e33c79c9d5e0bb6da73694d87d48be50a30ba349e088e7b32ba8bf3b3c6b48789d12948eb82477123944dfef61d2972ddf88a5 WHIRLPOOL 8313107f4aee0b877bc4ba4f4fe22738a41a0229e04af7b0b528fe23b820ec207efff6a7565c97985e8b9497ff73c1b7f4117b281ab286b49d91583f45a67835
-EBUILD emul-linux-x86-java-1.6.0.33-r1.ebuild 5035 SHA256 a7f561e07be7c09a02596c121175c43a7776c9c870c1c31a2ae850fb3ac5a7dc SHA512 7c0c1d45b5d29c779f13d2a45120bcb2d24b86ae8d26c2ff633ffaeb1783953fe5cb5f0fc198325a64021a9247ab7e3dcda1262c40b3e249bf7fcec8c47fdbaf WHIRLPOOL 04acced8b0ff012a59a7cfba172e7f67a35021ec000ba00b4318e9c995d3d6e0684a05bf16760aefbbc308e3a934dea65795632dfc8783fd2f2367f89d89cd24
-EBUILD emul-linux-x86-java-1.6.0.33-r2.ebuild 5335 SHA256 5db91079201cda687ba05212e6b26681292c5eae8b2d12aaa220cef9ba52ce4c SHA512 7fa29a0dec4d6325fcb622d9a504cb455fc243d4cafaf5f15ab85e55f43b08a1813e4368ad9e092797bed4651d19e35410b1d9b7e903beae36c9830d2c6aa24a WHIRLPOOL b47a55698938e2249a343900508717200d965574a9656296794c1dafa51ad69c0fae60459eb5a5dac427752dbb3299e3218e0039b2a5d33be3be7f92d7911e6a
-EBUILD emul-linux-x86-java-1.6.0.33.ebuild 5032 SHA256 f964d639ec69c7ba0457f04e6adc108f0a3dd6df3cdfd4f6233bf52524ac3b47 SHA512 c8a0c795e1235ea9c3f0aeda28dff86e91a3fba84f68614c5ab2647adce71d7811e6ff855fa514fc306b9ac5f1d4787d33a7ab82b2db7535cc736317aa1f262e WHIRLPOOL 3b0f8789a705a57754f456ddc4b52f5b1086d70b04d0ffb834b70c84e7855d5afa479539eff5667e41fef4caeaf8eefe41a793063931fc8f8b1524a70a1d081e
 EBUILD emul-linux-x86-java-1.6.0.35.ebuild 5333 SHA256 de4e2f9466a424530255acc5f942071bf9c2c4e0fdd02f662fbd536abb1f0301 SHA512 67e76acc742027d33ca7a507c9acdf9dae59cf87d461738167cd25fbee52b1a81736e855224ed58bccd5d589f97ff6fe357d76c3063e11a13f3cbabba8fec4e9 WHIRLPOOL cf5a9ae6c91c7c21c307567dff17c78deb56bcb3b90ae012575f0774c9b3ff028cbecf47decbdb6ba40856741c1ebe0cf1d73c4d72a14ea7b169b9445c74e9ff
-MISC ChangeLog 23706 SHA256 d008215138eb36940f18a739eb0c55c4c6080f9835b0c13bba6837f6ed1ae10e SHA512 fcd15f27ec0164c13bf97210361f60fabcf85293354816bce1ffdfe6cbb369bb9d2b476a0352dc515799a5d8a2e6b2a29be42833290bf14676fb715551924f3e WHIRLPOOL 6425261422fa41578ce153625077d82f55a3ebeeb96dbccc9e22bccce4ac8ae0fec87df698f24af9b62243d5ab07d16ee55c99ff419283ef19ba1203e81d0fdc
+MISC ChangeLog 23913 SHA256 07a8c7672a4f5e69924d53220409090c70a888c2ad8b53db1e38f65a589a5359 SHA512 832b8d2c278b51c6dd7db2e774d05b43029b7b9ec54a3766896d9cbfa991531cf89367ab1b30e49f2d4fbc403da24a90cfd6ddbcd03dfeb555b94f68e0f282c0 WHIRLPOOL 3353a370e30a1bd61d21ec81561812dff48577f3412306c40c80d3d45d4843e1d8cd302bc466f5d8a02710d1f5473173888dc96ac314df983de13005dd4b3795
 MISC metadata.xml 270 SHA256 68c40f50bd74b9038081e459c015f5786407bce5a45e2e1614566739d70cb21c SHA512 58bf7182934eb5030bae7032efde8e8b277fb4820a256d271a501904ded69b19937b1d17058ef770e3ecb7a526739bd1fae7d2163b5332fdd7e5c782cfbc647d WHIRLPOOL bf2557c8836c581b51c65a2f2488c77192072524696f36615a309d2bdb74ea7ed069f73438fe7ee0b5b83aaa7cf20162ffcdd5cbc6469411116e75805b67aeb4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQZcNlAAoJEIUJ+svaV163/UQH/jzNmPlm2h8KKejSInp581z6
+wTmWhPvz1JYNEKTaVPRqm+L+o3wcJc+g2dlztR6CqJQCb55OxL0u9BIMd7MZwU+s
+4y/jGwshCZjDdvZlsUAZbWfe1Hf80c3ZKnB/3Mj6ngYpoL2lv/FHXXDS8jFIX10J
+ur01McUF9m6z2wrCy+4Z5Ozh7fJQHb6lpWiz5vh0gD+OGKQ2PgXdYHcn9BcmNIZ8
+egUkA0IQzGImVa3Df+/MyiSE/ddZNFjCwrmt0e4WWjcAE/IIo3GC+xUnMzXkm+PO
+cMM/DW/FAFxSvmjYuwfq5CLgrJ+IcFdyQwzKbaR/Wtk3WS5Lp21L6vJdCkS12Zc=
+=CWw3
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r1.ebuild
deleted file mode 100644
index 31b08de9a22b..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2012 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.33-r1.ebuild,v 1.2 2012/08/03 13:53:09 ago Exp $
-
-EAPI="4"
-
-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/jre6-downloads-1637595.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"
-
-RESTRICT="fetch strip"
-QA_TEXTRELS="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-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() {
-	# 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 /opt/${P}
-	cp -pPR bin lib man "${ED}"/opt/${P} || 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 /opt/${P}/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=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
-
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/i386/client/libjvm.so
-	/opt/${P}/lib/i386/headless/libmawt.so
-	/opt/${P}/lib/i386/jli/libjli.so
-	/opt/${P}/lib/i386/libawt.so
-	/opt/${P}/lib/i386/libcmm.so
-	/opt/${P}/lib/i386/libdcpr.so
-	/opt/${P}/lib/i386/libdeploy.so
-	/opt/${P}/lib/i386/libdt_socket.so
-	/opt/${P}/lib/i386/libfontmanager.so
-	/opt/${P}/lib/i386/libhprof.so
-	/opt/${P}/lib/i386/libinstrument.so
-	/opt/${P}/lib/i386/libioser12.so
-	/opt/${P}/lib/i386/libj2gss.so
-	/opt/${P}/lib/i386/libj2pcsc.so
-	/opt/${P}/lib/i386/libj2pkcs11.so
-	/opt/${P}/lib/i386/libjaas_unix.so
-	/opt/${P}/lib/i386/libjava_crw_demo.so
-	/opt/${P}/lib/i386/libjavaplugin_jni.so
-	/opt/${P}/lib/i386/libjava.so
-	/opt/${P}/lib/i386/libjawt.so
-	/opt/${P}/lib/i386/libJdbcOdbc.so
-	/opt/${P}/lib/i386/libjdwp.so
-	/opt/${P}/lib/i386/libjpeg.so
-	/opt/${P}/lib/i386/libjsig.so
-	/opt/${P}/lib/i386/libjsoundalsa.so
-	/opt/${P}/lib/i386/libjsound.so
-	/opt/${P}/lib/i386/libmanagement.so
-	/opt/${P}/lib/i386/libmlib_image.so
-	/opt/${P}/lib/i386/libnative_chmod_g.so
-	/opt/${P}/lib/i386/libnative_chmod.so
-	/opt/${P}/lib/i386/libnet.so
-	/opt/${P}/lib/i386/libnio.so
-	/opt/${P}/lib/i386/libnpjp2.so
-	/opt/${P}/lib/i386/libnpt.so
-	/opt/${P}/lib/i386/librmi.so
-	/opt/${P}/lib/i386/libsplashscreen.so
-	/opt/${P}/lib/i386/libunpack.so
-	/opt/${P}/lib/i386/libverify.so
-	/opt/${P}/lib/i386/libzip.so
-	/opt/${P}/lib/i386/motif21/libmawt.so
-	/opt/${P}/lib/i386/native_threads/libhpi.so
-	/opt/${P}/lib/i386/server/libjvm.so
-	/opt/${P}/lib/i386/xawt/libmawt.so
-	/opt/${P}/lib/jexec"
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r2.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r2.ebuild
deleted file mode 100644
index d4c55ddaa71f..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 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.33-r2.ebuild,v 1.1 2012/07/23 19:00:49 sera Exp $
-
-EAPI="4"
-
-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/jre6-downloads-1637595.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_TEXTRELS="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-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}.png#" \
-		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
-}
-
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/i386/client/libjvm.so
-	/opt/${P}/lib/i386/headless/libmawt.so
-	/opt/${P}/lib/i386/jli/libjli.so
-	/opt/${P}/lib/i386/libawt.so
-	/opt/${P}/lib/i386/libcmm.so
-	/opt/${P}/lib/i386/libdcpr.so
-	/opt/${P}/lib/i386/libdeploy.so
-	/opt/${P}/lib/i386/libdt_socket.so
-	/opt/${P}/lib/i386/libfontmanager.so
-	/opt/${P}/lib/i386/libhprof.so
-	/opt/${P}/lib/i386/libinstrument.so
-	/opt/${P}/lib/i386/libioser12.so
-	/opt/${P}/lib/i386/libj2gss.so
-	/opt/${P}/lib/i386/libj2pcsc.so
-	/opt/${P}/lib/i386/libj2pkcs11.so
-	/opt/${P}/lib/i386/libjaas_unix.so
-	/opt/${P}/lib/i386/libjava_crw_demo.so
-	/opt/${P}/lib/i386/libjavaplugin_jni.so
-	/opt/${P}/lib/i386/libjava.so
-	/opt/${P}/lib/i386/libjawt.so
-	/opt/${P}/lib/i386/libJdbcOdbc.so
-	/opt/${P}/lib/i386/libjdwp.so
-	/opt/${P}/lib/i386/libjpeg.so
-	/opt/${P}/lib/i386/libjsig.so
-	/opt/${P}/lib/i386/libjsoundalsa.so
-	/opt/${P}/lib/i386/libjsound.so
-	/opt/${P}/lib/i386/libmanagement.so
-	/opt/${P}/lib/i386/libmlib_image.so
-	/opt/${P}/lib/i386/libnative_chmod_g.so
-	/opt/${P}/lib/i386/libnative_chmod.so
-	/opt/${P}/lib/i386/libnet.so
-	/opt/${P}/lib/i386/libnio.so
-	/opt/${P}/lib/i386/libnpjp2.so
-	/opt/${P}/lib/i386/libnpt.so
-	/opt/${P}/lib/i386/librmi.so
-	/opt/${P}/lib/i386/libsplashscreen.so
-	/opt/${P}/lib/i386/libunpack.so
-	/opt/${P}/lib/i386/libverify.so
-	/opt/${P}/lib/i386/libzip.so
-	/opt/${P}/lib/i386/motif21/libmawt.so
-	/opt/${P}/lib/i386/native_threads/libhpi.so
-	/opt/${P}/lib/i386/server/libjvm.so
-	/opt/${P}/lib/i386/xawt/libmawt.so
-	/opt/${P}/lib/jexec"
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33.ebuild
deleted file mode 100644
index 1cfe4a6969a5..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2012 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.33.ebuild,v 1.2 2012/06/15 09:57:38 ago Exp $
-
-EAPI="4"
-
-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/jre6-downloads-1637595.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"
-
-RESTRICT="fetch strip"
-QA_TEXTRELS="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-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() {
-	# 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 /opt/${P}
-	cp -pPR bin lib man "${ED}"/opt/${P} || 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 /opt/${P}/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=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
-
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/i386/client/libjvm.so
-	/opt/${P}/lib/i386/headless/libmawt.so
-	/opt/${P}/lib/i386/jli/libjli.so
-	/opt/${P}/lib/i386/libawt.so
-	/opt/${P}/lib/i386/libcmm.so
-	/opt/${P}/lib/i386/libdcpr.so
-	/opt/${P}/lib/i386/libdeploy.so
-	/opt/${P}/lib/i386/libdt_socket.so
-	/opt/${P}/lib/i386/libfontmanager.so
-	/opt/${P}/lib/i386/libhprof.so
-	/opt/${P}/lib/i386/libinstrument.so
-	/opt/${P}/lib/i386/libioser12.so
-	/opt/${P}/lib/i386/libj2gss.so
-	/opt/${P}/lib/i386/libj2pcsc.so
-	/opt/${P}/lib/i386/libj2pkcs11.so
-	/opt/${P}/lib/i386/libjaas_unix.so
-	/opt/${P}/lib/i386/libjava_crw_demo.so
-	/opt/${P}/lib/i386/libjavaplugin_jni.so
-	/opt/${P}/lib/i386/libjava.so
-	/opt/${P}/lib/i386/libjawt.so
-	/opt/${P}/lib/i386/libJdbcOdbc.so
-	/opt/${P}/lib/i386/libjdwp.so
-	/opt/${P}/lib/i386/libjpeg.so
-	/opt/${P}/lib/i386/libjsig.so
-	/opt/${P}/lib/i386/libjsoundalsa.so
-	/opt/${P}/lib/i386/libjsound.so
-	/opt/${P}/lib/i386/libmanagement.so
-	/opt/${P}/lib/i386/libmlib_image.so
-	/opt/${P}/lib/i386/libnative_chmod_g.so
-	/opt/${P}/lib/i386/libnative_chmod.so
-	/opt/${P}/lib/i386/libnet.so
-	/opt/${P}/lib/i386/libnio.so
-	/opt/${P}/lib/i386/libnpjp2.so
-	/opt/${P}/lib/i386/libnpt.so
-	/opt/${P}/lib/i386/librmi.so
-	/opt/${P}/lib/i386/libsplashscreen.so
-	/opt/${P}/lib/i386/libunpack.so
-	/opt/${P}/lib/i386/libverify.so
-	/opt/${P}/lib/i386/libzip.so
-	/opt/${P}/lib/i386/motif21/libmawt.so
-	/opt/${P}/lib/i386/native_threads/libhpi.so
-	/opt/${P}/lib/i386/server/libjvm.so
-	/opt/${P}/lib/i386/xawt/libmawt.so
-	/opt/${P}/lib/jexec"