Remove old.

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

5 files changed, 7 insertions, 397 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 6ae64d2ea303..f77249cf519c 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,11 @@
 # 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.143 2014/11/01 17:00:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.144 2014/11/02 11:15:13 caster Exp $
+
+  02 Nov 2014; Vlastimil Babka <caster@gentoo.org>
+  -emul-linux-x86-java-1.7.0.51.ebuild, -emul-linux-x86-java-1.7.0.55.ebuild,
+  -emul-linux-x86-java-1.7.0.67.ebuild:
+  Remove old.
 
   01 Nov 2014; Agostino Sarubbo <ago@gentoo.org>
   emul-linux-x86-java-1.7.0.71.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 9ad02baec311..b170b072598d 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,33 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-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-7u51-linux-i586.tar.gz 48333427 SHA256 f6807069ff45576ffff173a2ee4355bdf5a493e9b463bde9196b942af4f6fcdb SHA512 e5a2d841e7f924b606d3d3e94f75bad273f9952ff94b94f081d73614d0001326a9ac974412840c994e66dcc5d2bf582c193a08cb725f435f2770fb01d9546b3a WHIRLPOOL 5cf27c761ea3c2c8ad395dcb8563dc5e4933552a48d1e64e77071bf84e86bd34aa19f590859a143a9c986fda0b7594f4ef6e27d89fcaef0c52a678bd30a6eaa0
-DIST jre-7u55-linux-i586.tar.gz 48340455 SHA256 fa674c83c25a65edeca289321c9bb1c0fe9c0eaae64dc1bf3409e2c6a5f46c80 SHA512 f365a2548ea6ff9cf263b0dd71100eb70d842a4abd72d852e7698d9d7dbee97c4da2654795035adbc4519705a3d7eb81031566f2a97eaeeadaa439ca9a8867fa WHIRLPOOL 88abacb65259fd59c89a70e72ff0a258f6b0b178afa826502eb46e7109abe586094d79762148b14c1d97dce2d1b3a9e06736a92d82c839ef2fe8c8e8310918b5
-DIST jre-7u67-linux-i586.tar.gz 48426207 SHA256 eadec83a54d3a9d09248a8d16b21c03da9afffc7317e775fb8db962620a0781d SHA512 51532bcfc0275aabbfd5f2584f023915acad61f7825c95253a4c38ea35e40fa65cffa0f49feb613ce7470e92a4dae610fcb0d77e006a975b392e478d28d01917 WHIRLPOOL 2275a20c83d32b5ae8c2178a566226a8cc95a594ae726d5a76e6a0c4000e91dd9a770c6b76a11a76f076e7689d16d7263b5e0351391922ef05fe9ed5d73c81bc
 DIST jre-7u71-linux-i586.tar.gz 48461842 SHA256 b616145b22aafd53433bef76c873d50c4557469d15fc14bd852885cc4fa2947d SHA512 6d63fbcf2601660bb57c8496c024a5186ac41ef6fe96f8eb36e089a2a80bac4c26c43e356417e8ac7568685df005bda0fa4c74033e6501718ca90277ab75137e WHIRLPOOL 804ca029a0d4d8d345eba9f8924735bb82f74d47098f0ff876a4104c005bad2b2e69ba1585f7c11ebba43e4923bea7f85a8061902ce72a04b2df6acb411d3cdf
-EBUILD emul-linux-x86-java-1.7.0.51.ebuild 3701 SHA256 137e64495fbee5046221cd37f593432f75b1d9a6e5b20451296b283ec4e0fa2f SHA512 023e11ad150ca0440471ce3db664be0afc5b9e3a5fa71f634d1b5829709e9cdd9464c3d7ec5ba78db01b45025042a9b6e7a3695e6c6448bbc602411c2c727345 WHIRLPOOL 8ab28dcbd65e75a11a8bf5f224124cf30b2e238a50cb7458c8a1ae1368a7276476c5694a668a717035936515b16865524dfa855cbaa8ac7829e51432f1cb46f9
-EBUILD emul-linux-x86-java-1.7.0.55.ebuild 3701 SHA256 dd7fec539e98b8227b022e397c94dff9e03a372eb44ab31ae2a81287259d4eaa SHA512 b9adc3b724a87bc7e7d27479b183e87ea301e196dac853534bdffd0e9985376ed181d480ced119153759b6bc5049a8dd457c29f9a80fc550a0aea2a6019a26aa WHIRLPOOL 1cef64a0e2a7c99d6bb5c348995dc97d1510df4614299bd217073bc5b28d28fdbeb1b0ce1c55231591d9d7eaed71bc8599b32b979229d502549ac4b765be0255
-EBUILD emul-linux-x86-java-1.7.0.67.ebuild 3702 SHA256 a6b2766c3d4b4363b8797daddedc705bf604fad9f79e495effc41201e75258b5 SHA512 a438821bb57c91a7da7ae9cd3399127bcb091dd30fa3394f84ca98850ae11c4d7d3114c396194833e82863fd99560e2260054489b3720e0bee7f39cf36db7df0 WHIRLPOOL c1e60aa5df7eb6c9b51458d5c109ef55c8fdf364a742989d4a4975886012d51cf33048e867671ca94227dcc1358431b8a2b0298cbd3338ec3e44d5892e3f7280
 EBUILD emul-linux-x86-java-1.7.0.71.ebuild 4006 SHA256 9619e043fac0f732c97a938b1a5a07f49ebc47624c01d14f9cdb983db2c73b50 SHA512 84da075c26b6aff6089969fe75bdfb103f060167d7c0a525b5d0ac8c488a0cb4f4f1005973359522099126d51d7a3e497d441060e0e26e77345794d2ed2adb81 WHIRLPOOL 4220dc89f960e0821ab26f6f85d2e65ad4cd8c139f681043de054b8f8cd2c3f22e63a633f72addc6c6fbfd9a30951d59cd268924c21038a521e879cc9a9d0669
-MISC ChangeLog 28071 SHA256 a3592608d4579a7e3f828b33f9219ec003a7207f52e6830aa17dca10bac70df6 SHA512 8d4d209033fa118b3c09fd51affdc6dfd380cb165e58a57fcf57b4bb7b51491aa195ad91a9cef56ac942856fb84cae4b1bb6d558715147407e65ac3aa68c8dff WHIRLPOOL 47cbb5f5f3b751515b38eaaa7d10a7cd291d926bbec6297f7810abc462f47453adae692a7be3d044c676a1a55667fb69187df0e3ce85ab7b13c21cbeaa3962db
+MISC ChangeLog 28258 SHA256 e3261a767f82597803685b3b1ff97d9a4cf224dd9c4711881d2dd5b5288e19e9 SHA512 27db356ecc5511113837994224fb9dc0debd96ef409f85b38c58316aca80d44ca99e1ddeb38edee3fbfb162b4556d9967295089711e123f4c129f38f95ca0112 WHIRLPOOL 5f5b92c6b775159a7ad835b088f420b9a7a10b4d0c820bc121ed0950d32b1d02b2d1fc601de6043fc40bd3e16e21a11e0ff0a1809d14e9f4827c9e21d0559508
 MISC metadata.xml 243 SHA256 bec7d825ae2052459b6f40ddcf9a807c18caf8f5aa3e5844de29a9b337230536 SHA512 5a5dc347f5a2a29e3f122631df69dca812d0f649921a32ad21dfc33d57ac9757d2552c59a14c5a4275de5376c9b0f19fc0dde030eba69d47dd6682b1638536e1 WHIRLPOOL 9bdb79b376c2c7652455ab2e7117a9abd4e4110caa276c31e4b3e2ed8b0f49b4736083234b8bbc5012edc8b6ee866de055c6cfdf98794b11619cbd517ee2dd64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUVRHGAAoJELp701BxlEWfyYEQALP/G0W+qS5PFBF71s1MgT0b
-0dVkKt2PKSWHng7ed3g/HBj9/OWMAavlAjPUEqBPg9B4+83B5l/SzQvjhvwDva8t
-1UCROPVhx1QM7ymUyh4wu/CU4etkmg0+wKecOYSLFvDwyq9I1X7eiW340n+YXumV
-EgzNtWKsg6n50QIQZLtyf4ND8QgTmW/c/mVy0DsppevQNQ/eRJq7jlhVbwoXRs+/
-tnw9y8DYT9KLsP0i7Q0EiK+GtBvu58046MyrCDWcQzq4dX1Tew7cUbcdghXQ+6wb
-YbOd3b630uc8MF5nGg1zgNC5eVUpXH8TDY6ClQsEgIw/1jnlCis4HvU+B1LOd0ea
-6v8PkRaK2BIBHhDWTB9IlUiQBw8G80kJ7bHlONWp1ZH6ixfL0d5Vof4Uo9rWNZmR
-nW+xL0Y5TKkqvuNbfRIrNiBUmSZ4D2NglmClY0Eu4n32FAhwzcRnC0Pk8S1NcM1o
-ExRqWA1B0CQNrtni2jxypJatqLXHeEJ/nSPtg6NDl1/KdDmJDC+fFt+yqNkX+nQu
-TtPusONz3Nk4VhndTy8k0w5Eh4QaSaOBcFtLxt/xeSp8BJ0hfhdcVomJ4Hwq5vAK
-t9ife5T1v21JCU493iHet2vYhq5ocDu09K87d2R6d45UWikz4zwgEIdUtNgbIK7C
-5P4ANzYD9XMMN0H5k7Yr
-=1xpA
------END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.51.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.51.ebuild
deleted file mode 100644
index 236ff4135543..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.51.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 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.7.0.51.ebuild,v 1.3 2014/10/16 12:10:19 pacho 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/jre7-downloads-1880261.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.tar.gz"
-
-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.7"
-KEYWORDS="-* amd64"
-IUSE="+X alsa nsplugin pax_kernel"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	|| (
-		(
-			X? (
-				x11-libs/libXext[abi_x86_32(-)]
-				x11-libs/libXi[abi_x86_32(-)]
-				x11-libs/libXrender[abi_x86_32(-)]
-				x11-libs/libXtst[abi_x86_32(-)]
-				x11-libs/libX11[abi_x86_32(-)] )
-			alsa? (	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
-		)
-		(
-			X? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-			alsa? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
-		)
-	)
-"
-
-# 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_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.7.0.55.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.55.ebuild
deleted file mode 100644
index ccc48e675024..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.55.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 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.7.0.55.ebuild,v 1.3 2014/10/16 12:10:19 pacho 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/jre7-downloads-1880261.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.tar.gz"
-
-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.7"
-KEYWORDS="-* amd64"
-IUSE="+X alsa nsplugin pax_kernel"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	|| (
-		(
-			X? (
-				x11-libs/libXext[abi_x86_32(-)]
-				x11-libs/libXi[abi_x86_32(-)]
-				x11-libs/libXrender[abi_x86_32(-)]
-				x11-libs/libXtst[abi_x86_32(-)]
-				x11-libs/libX11[abi_x86_32(-)] )
-			alsa? (	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
-		)
-		(
-			X? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-			alsa? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
-		)
-	)
-"
-
-# 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_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.7.0.67.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.67.ebuild
deleted file mode 100644
index bd83b6216f82..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.67.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 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.7.0.67.ebuild,v 1.2 2014/10/16 12:10:19 pacho 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/jre7-downloads-1880261.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.tar.gz"
-
-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.7"
-KEYWORDS="-* ~amd64"
-IUSE="+X alsa nsplugin pax_kernel"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	|| (
-		(
-			X? (
-				x11-libs/libXext[abi_x86_32(-)]
-				x11-libs/libXi[abi_x86_32(-)]
-				x11-libs/libXrender[abi_x86_32(-)]
-				x11-libs/libXtst[abi_x86_32(-)]
-				x11-libs/libX11[abi_x86_32(-)] )
-			alsa? (	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
-		)
-		(
-			X? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-			alsa? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
-		)
-	)
-"
-
-# 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_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
-}