Remove old.

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

5 files changed, 7 insertions, 593 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index e17dbf7495d6..68f4d70607a7 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.70 2014/11/02 09:20:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.71 2014/11/02 11:14:38 caster Exp $
+
+  02 Nov 2014; Vlastimil Babka <caster@gentoo.org>
+  -oracle-jre-bin-1.7.0.65.ebuild, -oracle-jre-bin-1.8.0.11.ebuild,
+  -oracle-jre-bin-1.8.0.20.ebuild:
+  Remove old.
 
   02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> oracle-jre-bin-1.7.0.71.ebuild:
   Stable for x86, wrt bug #525464
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 9478b11c70e4..ed17513a2b99 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,42 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jre-bin-1.7.env 1035 SHA256 fc49633539a944a9d684b2d33b8c4a25f2d6d68e82fe644adbf2a499c178617b SHA512 a075562804594b6a3187e0c0e58f93883ead699470dd0ff8a37e717b3af52e3d6cf0757df43d507e149e1bcb2814e53eef14388ce8d513c174d0a813524e3815 WHIRLPOOL 7d08a3bc883cc2d3de3d37d46366b24b2bed4ce35233ab2f1ac4179adfa30787cb3bc948bf074d2ba59151352ab453a08efa2436281079623066e6f8303a00bf
 AUX oracle-jre-bin-1.8.env 1035 SHA256 4ad3d79687682b76df29e4d1f5e6a1bec87fca4149b817da09f9398bc25f793b SHA512 8ebdc1100214c2707332beedd10bc665e386a0d994fe8b154b33a053f555d3064192bbcb4e664ca841d2d7d381d07d0baca3d586c66bc5317e9b99c23d4d09e6 WHIRLPOOL 16367932a4a6b484d1cdf0394511c5a47cb1c04baf44fba179dfbe471f1261345ead58af85497afc7b5d2e4f86fcb55f1514dde0b1658619e863b109d206dd41
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jre-7u65-linux-i586.tar.gz 48423426 SHA256 f39d334650464d1084dd6e40fcfa0b6f9fa52fcdc549dc9312d9e13fefc5bdcb SHA512 240fdb36cdca74e7b99a70a0600433f40bf47365c2186a4b1fddc73856898e5fd414b22336787319906e917d37ab58769f948bdbfa3eb271bf6189d86395ce64 WHIRLPOOL 53fbf65d043d970bdec9798c138c2b91c3e4499f7acfea87bda02e94a4aedb9eb07866e63640b27961552a4aea58f34f7255950572ee9888b74561f3e4e1065b
-DIST jre-7u65-linux-x64.tar.gz 47005094 SHA256 132d7770e74dc8d34039f0d452738b427501ba75e0ced8053491d31de0e6ab31 SHA512 20ec4cfe71927b47d931f19568411887015264538650925dd1662932714f051f554f44fc064ce65485579be23af3c69c992553cacfb0440a229ad62f7dfaf697 WHIRLPOOL c60b58e509229961f9be0831ac809f044a40b832bd0740e874a5957dca63e418b8f78545d454d6951be59119038bdacf81eb6efde1cef364e84714f0353625c1
 DIST jre-7u71-linux-i586.tar.gz 48461842 SHA256 b616145b22aafd53433bef76c873d50c4557469d15fc14bd852885cc4fa2947d SHA512 6d63fbcf2601660bb57c8496c024a5186ac41ef6fe96f8eb36e089a2a80bac4c26c43e356417e8ac7568685df005bda0fa4c74033e6501718ca90277ab75137e WHIRLPOOL 804ca029a0d4d8d345eba9f8924735bb82f74d47098f0ff876a4104c005bad2b2e69ba1585f7c11ebba43e4923bea7f85a8061902ce72a04b2df6acb411d3cdf
 DIST jre-7u71-linux-x64.tar.gz 47022510 SHA256 6d64e223a8da17efc098b71aa194c8d909faad432f3536a0cde57ca63b7bb017 SHA512 f8b6ecd42517e4b2b181247bd7154c9e9b4ac81e96d19ccf9d7780403179692cbf7f4ea08fa1410344c41ad3a7e7a37b1636dd9dca21fabd11eb43cfe988fc72 WHIRLPOOL cf0256007b6d0334e91517f9a0cbaad86a7d5cb4d74c6a3d61364a1b68b032d1159b31086c0a948f03c3432cc8d1f95656b368b0329558b2fa783e2cc4e36bcc
-DIST jre-8u11-linux-i586.tar.gz 58188271 SHA256 b1348b4842cc23862ea9ef69f71674f49fc1197caec0a8d82502009568762442 SHA512 96b2641b95675769eb01d1a07390ed3417c1e46bd618cbf7abdaaef68e9e72050cb2efb67260602e6458d2c4f388cceda2b579262387ed6dfc82afded0a24a36 WHIRLPOOL 42710fa9c8bbcc1dad31047938ee08be7df9e51d7b89aaee2c6d52c88f3f0ed4109f2d24c83399e2a6e6117301c6aa9231176368b34876eea45226a998af2ffc
-DIST jre-8u11-linux-x64.tar.gz 57081154 SHA256 17d0d015c3bd7e535490c6ce869655b6ac4024ba3dc39dc9ed743de4376750a4 SHA512 e8d7aaa89a566e7fdabf12fddfb8eecada98dbece9163bdbfdccc42f6a0a4d52bbf94ad1e5902c194460c653c05066f980fd937d6d8ffa5cced9eeb1f4d8b9ae WHIRLPOOL 54182e5ee3a3aa111eff1314a74db6cb4179359e723782300e2616eb1b930f9e54f5581d3e19d9649da234ce9ec501036e8dd068f619585d5cb43e7041b5e455
-DIST jre-8u20-linux-i586.tar.gz 64515446 SHA256 340bb9bb882c90792439a3688e234c04378e03bf9cda39f1c9de2acbc3b159c1 SHA512 f2c6d2e2072e3f0334836976f3164cbfbeee08d5be60223a9995b19da75493b1c0a66683e20585a3cdbfedb5c896dd9d9c2b5e1f7caf58da54a35055ff6cb53a WHIRLPOOL cccede05074a49b5b7d26668353e37d480c1bce308bf2397c13974a912c7fe638569c5b7deed6b42d5b7f7ccfa2647418d917aeff6f22e87664cb5f4193ed0c0
-DIST jre-8u20-linux-x64.tar.gz 62751094 SHA256 23f149928ae7d7f97d9b93eb859f197744ffad2d4082a96fcde24021a08cab34 SHA512 598fb645372d6c940a1626f7e92af8e66d6a3da844ecbdad6ccc930138750bf6e3926ca43e30e27c21ca46d8319e851a913f92959d5c2be35f41b8c0344b95d8 WHIRLPOOL e84ea54d05f87535440775c7b77a205c9440c8face6e0668d345e3011ce1dd5e7649bb5edb74440030f7cbde18dfb702f4fa5d4a0e13fc03ce625af9662ccba8
 DIST jre-8u25-linux-i586.tar.gz 64545312 SHA256 e8e879417fb8c3b7bb63955ecd88d6f6b2467acf2c0e62c9ed2c49b628ad5669 SHA512 82fefdda537e60ff87bb2e12dc3790676395d83a94b18ad2aa29a621b30e94f039510d9b863a3095bdc9be7ae23b48238c3f544bb0575306bddbb7ffcdd5537b WHIRLPOOL 3cb698a6521ca75da430270403a6d1ea41064ba3a46ab6fc3d7b31b814064df9ce38c8566ad80a3e7df4baa591364f2bfcff35867b79699a2cac2a49c625b4f1
 DIST jre-8u25-linux-x64.tar.gz 62763875 SHA256 fbf3b9ddd4ae534ead10411bc425a0faf460118aadff480bca366888c1cf879f SHA512 423ae7ad308d49c31c37085372524c75c4c970aaa80b9c2d6072461266d5951738470adf1d90c8e0a04f0867855f3f6dfbba1aeacf047d3015b90427d4357e52 WHIRLPOOL 40e51a6bc8153104a01f0ada1359126e7fc2a6c8e2f8e5a7c631cbc01eb039cdb6127511c7e1c27435bac2adb70c15ddc1244a12097033dbfa69bed90aceba9d
-EBUILD oracle-jre-bin-1.7.0.65.ebuild 5184 SHA256 3ea2a2d54cc331b5a4a0dd7b513299748b2f955772f5904649f831c310d96eed SHA512 546107c37636fe7cbe188028ad2facddeca4a4a57172870d02c7f21a0a05fa461d9ba09abd78f140f99250999386c6b6e28f8eb08250e210e3e7b7888e8f422a WHIRLPOOL aa926cda6981df64178652ce6249d73ccd0f11c908c7d6672f9f7b54f88dc4c55c95651e351075537b955d16246ae112950dfe475eb3730f6b80d7b5985cbf2c
 EBUILD oracle-jre-bin-1.7.0.71.ebuild 5492 SHA256 59dcab3d28809549696635d10a4de36ec834d3153c99a4c9dc35c2085dc2607b SHA512 7fab52c832c6e4f3022c8fe3f3b483117b1b8227513e2abe3ad7db9c8e62f56074315114953ef3a96b54b88da83aea54de84796323de119d8ce14d302443f7cf WHIRLPOOL a373352766175b4d28b84e59369afa7ecc85ed730b74038341bc8b7e1abcd4ccd39365cfa1067b0e5207543670fc4791468df9e11e4f00e8bbf3dad565578390
-EBUILD oracle-jre-bin-1.8.0.11.ebuild 5611 SHA256 26d12bfdc039f0685fb4c97cd442aa4aa1c90c801e0e03f1f36c934ba4dcd59f SHA512 cde2a487459473fd9d6f9e9eac822543cfc512d242000e4a3b22821694757861c768fa50079cb38b755e048a49a89612fb670866da6b6fefaff312103d7d2289 WHIRLPOOL 0874ca1387784f6ce751488c08fa482979cda46a625e763a55fb7061cd23d224e170f560b67c279e371c3b917424746e4aee009eb900001ebd5509649724a7d8
-EBUILD oracle-jre-bin-1.8.0.20.ebuild 5611 SHA256 01454fa809c6b195737e67b55d5832815ebf914d5c69fa4b6784dab58e9f2ba3 SHA512 40e8ad858cedd8b48300f107b145e828acb3f03bb345d9e8cd1c5844a3b2f74e926fb8a6a09de8a29f67796732861adf8849f5abc425a9238dd6b8200afb69b7 WHIRLPOOL 2e72d7e20b66be5825530b369a6129137a06f7bf511ee4ddeb356b4e8ca63b9f97e1e17817071730640d84062e12088c657060e78eeac598a12e5aa495a93aa3
 EBUILD oracle-jre-bin-1.8.0.25.ebuild 5911 SHA256 e6524c7c2dd9dbf09eb098d0e639561ad57ceada15d4dd4a102a59b9da3f1d94 SHA512 15b288514cffa228a8895f4f94727ee8cee07a10f5d2eb300dd48215a7682ac316568158c7764535c127c4eb5de142a5590c9fa4fb33f5bac39b6aa41576eee4 WHIRLPOOL 8aa177cd67e60b9a57a92974b20ebb6ee0bee7b726aea0b410695e0440d0a1f02c07a05e7d501fad3095c3714068992ec8de57e15d303fca667480ce92900de8
-MISC ChangeLog 11910 SHA256 f748d95d107c55f0d2b6ac7e51665f14e5ec8b63144b8a2159e4939f7343ee75 SHA512 133aef10fa52afc79bf9fdf03936560c212d1ab857157b1e60a1d4ae2163c7f333acca3db9a8b1e3c7551d884469f8e45eb73d505b3f2263ab264688285dcc92 WHIRLPOOL 173923f3ad4eea76a11f378964961511934184f55d4d6c0652e7a4ecd8bc100d49e3c2c875de46f6ea655545b45504bf299ddc89effb848b59f2250034f6693d
+MISC ChangeLog 12082 SHA256 9ba602b17930cda1402f7f34b4789cbca9baf354979b3c50d3de43f2ca40bfc0 SHA512 01b027b1d9c9896f87431da7485d9b30fe59a24df7f011a33d9df6a88b3dd5143730f017e6e286a90f2a20adfc1e2ca638e875fa418f6d32b8e5cdf672be61eb WHIRLPOOL 75a66200dc088664841afb5bb508278bb081fe4ebefbf8f6cdc4550eeb8834f780655ea0795da6afab92ecd9c44202ec0c7e652db84c60bd7f5ea7b6a3ba9f23
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUVfd4AAoJELp701BxlEWfW+IP/iHhy4O5iWi87Ow0aiQWKwq8
-Nyi+OJQeKNWwjE4SAaR3D1i1iVwxDAO/kCyVJ2PHhMZVz/x/4Sp5lRO5YFfMx04a
-OaA7qEcdTEx5z11oZpKTBavJ0Po/nom5siwQ/uAxfADYRB1atiPmtt37vc4C/vSR
-0CESofAB9TZgullNwp+KIpnJKfiDnHjxCcXQj+nYpY9XoqAOO6khoWVYyGYnFEGT
-UM8DBakyp5OHJsKVyrmxIfXLL12VRR+IPuXs94UQkFhKNo9KgIiPjnvxpc+xA+AI
-ZPV+EVFjGS9mHbVCKNrkL24SlOMO4wkdCKwmLGAiEEkRWuK4A0+84Ilpw+a41vG+
-JwuasLqYaHmimUc0M5WsjSgYCWib8loPRp4eSr37MgTVH5i1hS4C0kxjL08/LbJu
-SRLKOuWhULIf68I+IZtesFKG8nGbE9IaBJYgt2z2i7T8x1+mvvjc4OUfnaT4wX41
-gyAakmZ70/x8W3oiE9e0qOjLTn3o33f0St0hCSjHaGvBQWyRQgZZ0mTpe3kisQA0
-yUxm3lR06QXTtf7L3wfPiXDNuC1tSWbZtAhCqeltT/V4UFDeBs3DV0mCu9kvV+wG
-USNft5+v7v7zx70DJ8Yb5Fxkdl9obJDHYzUWKuZiQzhzOpXmLbdasx1GvAzwvc7R
-t/jocYbmMkzuXS+7Q3T1
-=nwVb
------END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild
deleted file mode 100644
index 3c1222d9e313..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild,v 1.4 2014/07/21 12:32:06 ago Exp $
-
-EAPI="5"
-
-inherit java-vm-2 eutils prefix versionator
-
-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"
-AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
-
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	x86? ( ${X86_AT} )
-	amd64? ( ${AMD64_AT} )
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.7"
-KEYWORDS="amd64 x86"
-IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-COMMON_DEP="
-	selinux? ( sec-policy/selinux-java )"
-RDEPEND="${COMMON_DEP}
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)
-	alsa? ( media-libs/alsa-lib )
-	fontconfig? ( media-libs/fontconfig )
-	!prefix? ( sys-libs/glibc )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="${COMMON_DEP}
-	jce? ( app-arch/unzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	fi
-
-	einfo "Please download '${AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-
-	if use jce; then
-		einfo "Also download '${JCE_FILE}' from:"
-		einfo "'${JCE_URI}'"
-		einfo "and move it to '${DISTDIR}'"
-	fi
-}
-
-src_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf lib/i386/libjavaplugin_oji.so \
-			lib/i386/libjavaplugin_nscp*.so
-		rm -vrf plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && 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
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use jce; then
-		dodir ${dest}/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	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 JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/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
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	if ! use fontconfig; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild
deleted file mode 100644
index 5a55195490d0..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild,v 1.3 2014/11/02 08:26:09 swift Exp $
-
-EAPI="5"
-
-inherit java-vm-2 eutils prefix versionator
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
-AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	x86? ( ${X86_AT} )
-	amd64? ( ${AMD64_AT} )
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="~amd64 ~x86"
-IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-COMMON_DEP=""
-RDEPEND="${COMMON_DEP}
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)
-	alsa? ( media-libs/alsa-lib )
-	fontconfig? ( media-libs/fontconfig )
-	!prefix? ( sys-libs/glibc )
-	selinux? ( sec-policy/selinux-java )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="${COMMON_DEP}
-	jce? ( app-arch/unzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	fi
-
-	einfo "Please download '${AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-
-	if use jce; then
-		einfo "Also download '${JCE_FILE}' from:"
-		einfo "'${JCE_URI}'"
-		einfo "and move it to '${DISTDIR}'"
-	fi
-}
-
-src_unpack() {
-	default
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
-	mv "${WORKDIR}"/jre* "${S}" || die
-}
-
-src_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf lib/i386/libjavaplugin_oji.so \
-			lib/i386/libjavaplugin_nscp*.so
-		rm -vrf plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && 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
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use jce; then
-		dodir ${dest}/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	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 JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/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
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	if ! use fontconfig; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.20.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.20.ebuild
deleted file mode 100644
index 7ff12f1049cd..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.20.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.20.ebuild,v 1.2 2014/11/02 08:26:09 swift Exp $
-
-EAPI="5"
-
-inherit java-vm-2 eutils prefix versionator
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
-AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	x86? ( ${X86_AT} )
-	amd64? ( ${AMD64_AT} )
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="~amd64 ~x86"
-IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-COMMON_DEP=""
-RDEPEND="${COMMON_DEP}
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)
-	alsa? ( media-libs/alsa-lib )
-	fontconfig? ( media-libs/fontconfig )
-	!prefix? ( sys-libs/glibc )
-	selinux? ( sec-policy/selinux-java )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="${COMMON_DEP}
-	jce? ( app-arch/unzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	fi
-
-	einfo "Please download '${AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-
-	if use jce; then
-		einfo "Also download '${JCE_FILE}' from:"
-		einfo "'${JCE_URI}'"
-		einfo "and move it to '${DISTDIR}'"
-	fi
-}
-
-src_unpack() {
-	default
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
-	mv "${WORKDIR}"/jre* "${S}" || die
-}
-
-src_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf lib/i386/libjavaplugin_oji.so \
-			lib/i386/libjavaplugin_nscp*.so
-		rm -vrf plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && 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
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use jce; then
-		dodir ${dest}/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	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 JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/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
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	if ! use fontconfig; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}