Remove vulnarable #517220

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

5 files changed, 14 insertions, 570 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 91b5cdad3213..d15ea54541e3 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.62 2014/07/21 12:32:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.63 2014/07/21 19:08:39 sera Exp $
+
+  21 Jul 2014; Ralph Sennhauser <sera@gentoo.org>
+  -oracle-jre-bin-1.7.0.55.ebuild, -oracle-jre-bin-1.7.0.60.ebuild,
+  -oracle-jre-bin-1.8.0.5.ebuild:
+  Remove vulnarable #517220
 
   21 Jul 2014; Agostino Sarubbo <ago@gentoo.org> oracle-jre-bin-1.7.0.65.ebuild:
   Stable for x86, wrt bug #517220
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index f766ebdb2771..1cb7fa56070e 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -6,37 +6,22 @@ AUX oracle-jre-bin-1.7.env 1035 SHA256 fc49633539a944a9d684b2d33b8c4a25f2d6d68e8
 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-7u55-linux-i586.tar.gz 48340455 SHA256 fa674c83c25a65edeca289321c9bb1c0fe9c0eaae64dc1bf3409e2c6a5f46c80 SHA512 f365a2548ea6ff9cf263b0dd71100eb70d842a4abd72d852e7698d9d7dbee97c4da2654795035adbc4519705a3d7eb81031566f2a97eaeeadaa439ca9a8867fa WHIRLPOOL 88abacb65259fd59c89a70e72ff0a258f6b0b178afa826502eb46e7109abe586094d79762148b14c1d97dce2d1b3a9e06736a92d82c839ef2fe8c8e8310918b5
-DIST jre-7u55-linux-x64.tar.gz 46933036 SHA256 973ddefe3e1cbc435458988a8868eff196970f940b84b79383fd4a8414e0b899 SHA512 09a4076c49bd79796660e9cb223156d57bb2d9d7b7d0de9d61cd3a52e34a30e43b416adc5e71ff9ffd9cea6a1ca1e0f04c5786cf5cb9560c5e5f02f9ebd9f607 WHIRLPOOL f365561f65e3e3f9642f097c66582b9861181cf41a2d6a7fade071579cde689a377bf59fbd51e7379c2f316fc204226f46bae121cf287c336e275beb2c3680ee
-DIST jre-7u60-linux-i586.tar.gz 48420952 SHA256 76e9c4f7cdd62025fe7004221cdeceabcc3adb2f093fc3ee127d30c95df7277e SHA512 db73c3dfdd82524c2b5c5724ec014acff2c21621cdd5b0f5283d1ede63f8c4d68d474d2c9e340e39b50105fb0df6dcbb625f9ce15fdcebda62c49a8c21a718cf WHIRLPOOL 3ceef31fc5ad9f464097d5ba4054328f3e24c2bdac0fb456d402b01caa93b11110ca1ade8fa7ff5e9ee0d0c21f42023ef1f32042e9e6802964dd0840a24cd6d0
-DIST jre-7u60-linux-x64.tar.gz 46984374 SHA256 73d6d759f524320671904447f9436ff0e60aa9379cacc0838001d6259e86216d SHA512 5b788e4f6a3bf70d32206d7b2b435b0a91d94ca364dc8b1546b7a7612240f316278f21b37b7ef7c4b2e4558f887a470985c65b378e2fc0d408a63da5c9c3369a WHIRLPOOL f570253cbe057781a2f420e03088d75b3ee34f3c5d26c1077f0ca3e986401a418c0d9381351c0cb9c51c3ea6288ce1829acedafdd8a4e604fcba250930288684
 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-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-8u5-linux-i586.tar.gz 58156527 SHA256 77a81e63325af682d52875e6699d5edd5f3be668025bcc99f5d9132c46b82053 SHA512 095feaf587e5c24bb1157e9a6bfafbcc11d1e726d4b7573b82e1412932a53a3bf942721877c95f87853b7fbc92e3dca5abe83c13d6fa52eee608c4d41afe7a30 WHIRLPOOL 973ec3d2cd30f271f56c86b0097723d5aeaf7301f9a715af3189f922c767f0d31e8c613554338f8e55c7ecf6d2bb36794c3f1c84d01e22b31829e45b73cddb29
-DIST jre-8u5-linux-x64.tar.gz 57056684 SHA256 de7ba8e27b9e7352c44608969871dc11dedadd26d81865f9a42aabff8dadba2a SHA512 961a3dc49fe8ee3bb51b871c139c65c4c020431b2ff5cbe3532c0af3e2d584a094f2a3b8aee89cf1e803bd0ae2dd3447f31377af3f16c477c0150a281a3f0378 WHIRLPOOL 3503edab4be5d345c0ecb398583420a017e8c33eb6385d7d7844326e77be6962dfb1724867721ff0e96de6cf9b62d6bd0cb6ab34071add1f5e7ff5d01712b02a
-EBUILD oracle-jre-bin-1.7.0.55.ebuild 4956 SHA256 ec5a0c1801bbe6428e757d1eb4a76ab8836f783587cde44ff74a95e4cb9d40d7 SHA512 97073a55620888dd2bb4ecab5c3c5da276832b727e55ca32841cb7ce5026e40c83aca2eb41a2435dfe9016d3b8b75ded0939d4cebb44fb69373cd646d55c23ae WHIRLPOOL f326ac4d59e4a900623a377902269fabc804cc17266120b93739bdd7079b0a4c719d537505a1e2cedd38e941c75117542191bc2e1220b1e20604e2e8872d318c
-EBUILD oracle-jre-bin-1.7.0.60.ebuild 4956 SHA256 903c05cc7a1cb1b68a3da152db20aa05c76923540cd218c008e9d791dd014ec4 SHA512 f57e1058160d38354147ec7c9ee40f394963790b724fe50a358d53dbd41718f0d098d5687753f2c785e8675d8cedc2d155404065a0f2e2e27a08509c4ac052a8 WHIRLPOOL e1edd5bf193ddc8a85d161ec323c5e73f11ac7239f88889da945d0601a5021e2e3080a5bddd0397a2a0160b068eef71823a35980572792129fbaf802717e7061
 EBUILD oracle-jre-bin-1.7.0.65.ebuild 5184 SHA256 3ea2a2d54cc331b5a4a0dd7b513299748b2f955772f5904649f831c310d96eed SHA512 546107c37636fe7cbe188028ad2facddeca4a4a57172870d02c7f21a0a05fa461d9ba09abd78f140f99250999386c6b6e28f8eb08250e210e3e7b7888e8f422a WHIRLPOOL aa926cda6981df64178652ce6249d73ccd0f11c908c7d6672f9f7b54f88dc4c55c95651e351075537b955d16246ae112950dfe475eb3730f6b80d7b5985cbf2c
 EBUILD oracle-jre-bin-1.8.0.11.ebuild 5610 SHA256 b840d9cba111ee749b00144038169ed9218215f9da504572429ff96368d65be6 SHA512 9eaa3bd01ce51e8a95166d4b6eb099c4c6f3e6eec226bb5aedaf4b36f6f3b57f7561dbfc220c513f2d6017e06e605c042f149427369d54c02beae35b3885e5b2 WHIRLPOOL 1a20c131cb104452f930cb951c506ad903bf9e0d67743f7f90ff078e650305f77a149c814417bb173aa85a29cdd748dd9d74b43a8b16312ac9e46193b091261c
-EBUILD oracle-jre-bin-1.8.0.5.ebuild 5553 SHA256 63d627a6d9368c0a3e0fbb509476ca7f1f375a580bd66209751c36258206076d SHA512 796c98f024fe9799e4ae71381dfca1a8401d8ca5920bf147b00e51f4ecae4d887f35bc84c6d10bc8eb729e6721658a1773e6be0e6f7ec886edd8dd4ea75d3f74 WHIRLPOOL dc39a640546787c7d4bd3a174872f8db526d6d1e5a7e265f20f42a26534af645530532fec50040ea4bb8b27f5eb7160b0d5d809e972ab3c0e338676362295705
-MISC ChangeLog 10535 SHA256 f800cf7c368766dd92d8e8aa911f552f6958d934fb338787f2bca4db727a6316 SHA512 ce65b1b22facaf58b4c3ca32f71b8fb465d24a9b426b86eb5bc8996d2f42a5ecbdcf537313d3530c95b5a951e1324a29bece613d527ea390d20c9d1ab3321c29 WHIRLPOOL 0731f43f5c8d6a0909b35f8de9bc95c37cf0e8725fef6837731bf0eebe42de403fe13b30a77673b4e8e64a70c2b98edc3a54f657a80c9d49084162e3cafc18ac
+MISC ChangeLog 10717 SHA256 3097e19feca89ce7802ea86f4ce8dab1233fe34d5a089e28e9edeaf9162d02ec SHA512 98b39bbe531e8398224cf8456cce1600f08d99976dcdfd138047245220a447725534924977a776a40d4abf3f4be0b728d5cc705b94b24b87319fa221310e1929 WHIRLPOOL 73e24e8b03d702fa639d175b8905e121734c17766f32eb29c3992559c710b33834f35c1651f8ba4c92c77e173f0e9e419007ee9baa3f6ec8e930e919956460d7
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTzQhHAAoJELp701BxlEWfmdAP/3bq/wi3EfJ6G8JEuTEQshdq
-ufmQHEOX4QcV0WrjPPNRaVi/bVtEqOv3wOyjF475vup3Ist3vk33MeD2gDiaB1TD
-wKmHVEe7fP51hZU3bnf6TA9GLVoRO13oJgPNt0ex3BbofZkNUjdGrzrzgfTLQe1P
-xH4IlqCD0c4OgXKthFm4xWUa22lM/mtTfJ2DWp34NulujKRhnCH6nF53ZAdwGyrk
-HmECYMNvtxW9bvuij29GKbs+Nfy0Djv0LDWSN54cnGO32yz8DVtnjDych6WnFP7r
-FlJeKTIVdz+kjbLfyVzjILJI6fdwyCxjHVs+lXiV4r/7lM9OIkYg+76qE7AwVlvi
-EdSUGTajzr+loZ7wFQu/2dPnt1n2I4jatMJUNBm0e0Ks69O6AgyhO8nLJLDzh4CC
-bRHlz6PegfrBoDKlU00c3lOnbBnxAbmfd28M9gOvaD4ueelJAuy0qUuhwyf8GTm8
-Wa6FEfFwFoENt4rturTv+I5y1tytxUxPz9GBmIVoIKq8WbcwGbPxDFXFH/QrqGXU
-yZHZaPLOx2h6Jpc3NllxRMtXW7jUU8her4b61Wev/SntsvItdyuDvmIoEJcFasbS
-Wn4JHRIi/DhHlecpZSlVxCT1bCZ0i6O9gl/xCWMa4Lfy4mnCC9JHqhXT/SNTQOwk
-htT6c/9iSYEitSjqbYiV
-=R6f4
+iQEcBAEBCAAGBQJTzWVFAAoJELjwI6Q8XPdafm4H/3TyN07GagQAQAg7PFDpYWnA
+mJy41BDeidPr5pHhSXadg69Z/IH2h4lzNryjBu8fXICChiJz01C9dLE7yWJRUrLG
+A8jydEo0EHwehe+26FfmP7U5MTzgYDaPcbE5b0LGoXs95S+zADdFnt44pWldbekL
+SLx0m4prn5svrHlN6iRhNabGGOJuROzRAtH2iuvve3oj4/5bYuQc2rGzebaRw3NT
+6q7yfi44F9Ejz8KLlOegnhIv585qFGYBy4QgGQWwk7Yh0ZcYlalkDV+OAuzf8Aka
+EfWD4Bx7/BHUrZrQo3057hMvd8T6QYyYBytvHdtBZJLA+2mL4RMX9mMx07t+XEA=
+=k7Tm
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.55.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.55.ebuild
deleted file mode 100644
index 31d99c11bd44..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.55.ebuild
+++ /dev/null
@@ -1,176 +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.55.ebuild,v 1.3 2014/04/17 08:14:38 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"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	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="
-	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_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"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			bin/java -server -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || 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
-	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
-
-	# 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.7.0.60.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild
deleted file mode 100644
index 6594c547a784..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild
+++ /dev/null
@@ -1,176 +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.60.ebuild,v 1.3 2014/07/13 14:10:56 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"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	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="
-	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_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"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			bin/java -server -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || 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
-	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
-
-	# 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.5.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.5.ebuild
deleted file mode 100644
index 57d020f7d07d..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.5.ebuild
+++ /dev/null
@@ -1,194 +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.5.ebuild,v 1.2 2014/07/20 20:07:15 sera 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"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	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="
-	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_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"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || 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
-	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 -R --preserve=links,mode,ownership,timestamps,xattr \
-		bin lib man "${ddest}" || die
-
-	# 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
-}