Version bump, security bug #525464.

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

3 files changed, 326 insertions, 12 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 582a3f1ea565..e703245461e4 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.72 2014/09/02 23:31:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.73 2014/10/21 12:35:39 caster Exp $
+
+*oracle-jdk-bin-1.8.0.25 (21 Oct 2014)
+
+  21 Oct 2014; Vlastimil Babka <caster@gentoo.org>
+  +oracle-jdk-bin-1.8.0.25.ebuild:
+  Version bump, security bug #525464.
 
 *oracle-jdk-bin-1.8.0.20 (02 Sep 2014)
 
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 9eab72dd8d7f..fcb448daefae 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f SHA512 3bab31d62740b959fcf028b94d5db31f682eadff2497dafbd945aed3464a6e5dd6a6ac8b5bb62cb41c901aadefc5314f9b7fb451a46449f5c2fc818d8c88fa6f WHIRLPOOL 74dccbc5c880721d4347b631b3af9368440f20112ac1e70764ff732289c1cef24e6fb4a4a7eb3ca2f5afedab83d6db4dc324c508922de47f8f435048c4884b2a
 AUX oracle-jdk-bin-1.8.env 1000 SHA256 1cc01fea09be2b333bac21b753a46458cfcaf92f08f13a685507d8331ff23027 SHA512 79ea850df8bd655b03ade0f1b068cdfa48425b58bb16f8f34013076754af19e2058a1800f17c96de51d2713b84ed326aaaacd806766d611d32edf9f7a9a9d942 WHIRLPOOL 2cdcb4c926ca342dcdcfa7765491f88f1681c0f3a4592fbe74e4c9a332faccadd20db0fbb8dcb0782bd767400515a2c5b156455358fe0c65ee58e94a9f72e3d2
@@ -75,17 +72,21 @@ DIST jdk-8u20-solaris-sparcv9-demos.tar.gz 9729357 SHA256 4ac1b0f2e4f3cbb0fa56ba
 DIST jdk-8u20-solaris-sparcv9.tar.gz 101808749 SHA256 f7f20fdbcedee02716c82235c1998837552183ba5b95fdecb7add12ba73e3f19 SHA512 8d64bc89fc48974519ac3fd33390e6e5c1016d0412b872c35d319b3d7d1002252704ade2eb41afc63f8729c6f366ee59273bc5b040acbc74a9c4e3fa3ac060bc WHIRLPOOL 7c89a78df0b2c18752cbd01d24824531c75068dd650d47583d1f5f0ff8a15b8385389ed8951edf724b19f52df68aabad3ff4a7e248bfafbf6f80801d52dc95c3
 DIST jdk-8u20-solaris-x64-demos.tar.gz 9671125 SHA256 a9869055dd491e56c2a61940685b6ff392dbfc1dd92341ab06bcdabd4661ac39 SHA512 f72d44815959ecd4949f20882d3b6ee2eafcde5ce083750f36f24be4515416a86af997c986ed1b65fceca82c778f5234a575456cf0516412628b7b65a6364a98 WHIRLPOOL 9070a22aa1e8758044f862ac26c0064d01a8a7813c5ea751840ec950551df3ee7a10da428f0abcb515f54f1b4eb0315c084a5e7bcbaa69a20709a260a8051cfd
 DIST jdk-8u20-solaris-x64.tar.gz 98792699 SHA256 155044e3bb1ff986442aecc3b61fcae963cff6d0b463bdf0daebffbe72ecbeb2 SHA512 d81355e2cc7875c857c73158ac3c38fe7d3148e3a52c9c2a38e16a616a55947bcafe7baee772c87daf89e30db28e3f36064b0b44b07f2dac0f6d8fb6f93298c1 WHIRLPOOL 4a4bcaa2fa10289b5d9c148723bf77e2209650dc38b583da62d01bfd26f8b6e8d93a6f98bedea4e9e633e8ed10965f2744e16d4d913c79525e8019fe673008ff
+DIST jdk-8u25-linux-i586-demos.tar.gz 61359482 SHA256 280e38297691ab144221032705400fc8a6f70e97ae7c126379644bff5a939915 SHA512 f8789251b4402042d6e1d92c0e73287ca213cfa7b9bd81b828f5d77fb6a043bd4274cb3a52ac5f4c2f3548f1564a8186f1d5eacd5b4755a7250f5ac62918cdc8 WHIRLPOOL 1aacd01157f2ab082bad20d51ae28b12ab45f5bb9f61fd66c8bed8665115f14bb69f0fdfd6baf6704c4e590f65c62b65c41759a42e9ee4eba850bdc11f511e10
+DIST jdk-8u25-linux-i586.tar.gz 162406866 SHA256 17f396a541db09c732032185f10f9c6eb42ac7b5776814602342de9655b2e0e2 SHA512 3579d9373ce73f41c436a054e6f4f0c2a4b3aaebe09c53285550d09d3614c48c1a5520f0bee2f2ba128dd66f1e86dcd64ae6191394e7c4c4d8a999dfc0e0dc02 WHIRLPOOL 66bc6c071737cd81b780a1ae4b49fd67dbf91d2d9d4c7208f6904dc74f349fb1f09676acfac306773246d101f265a30817db6479c64de82e979237c894cbc685
+DIST jdk-8u25-linux-x64-demos.tar.gz 61392581 SHA256 0e45b9a38437149f05bfed78a6fba7258549a8033c2a2efe38e5a056f26ea198 SHA512 ffe2079f2df35fd72ffaa8b8af435e960b90e909b23ce1020ca68ed88f76f6cffa29f136544768224643ca04c485f98961114361399e19f668a3d02c0f958ec2 WHIRLPOOL 57d9fbd52e8f6cd9c54670d9aa6f2e49d13bc2efe7a80fd816d660e555c852ff550d5d9eec01e77c4a345e3d2b34d714ae1996bbf2eef81aff4f75a9b621cf1b
+DIST jdk-8u25-linux-x64.tar.gz 160872482 SHA256 057f660799be2307d2eefa694da9d3fce8e165807948f5bcaa04f72845d2f529 SHA512 293f3f28e0f46dc15a2380016f7a3cb64f5cd7ffca191c648644fd396690ef82b034a74273e1de4bc0d2260695fa13a0785872084dd00e30ede831206931667b WHIRLPOOL 9d353ccb6c83674ec939b89564112d73b9b5706b44531333716fbec3d2a419690a68d8bb6474c91a7f15cb367a01d64903c3c1da7e9a887c907c0878001edfbe
+DIST jdk-8u25-macosx-x64.dmg 219291713 SHA256 65b18e9a081435d06c18ba8d9b19e6eb23c902204f5ac3a9f029ec5b3fe2d2a6 SHA512 ce5dd65181850a2c073dbdf9d8826fb9f2586beb8d454f8d3acf732cadc0c8bd7783cb638251889865c8865853f093497e9eb28847624064130a1cc1cf33d46f WHIRLPOOL ad4dbb20d2aeb07e7524bf7a3a3a5c89da177b0b238084fade9e07809cc4e63dca18c5fd99b41da265533d59247474b27312fac1ca7dc771abf2b6e9cda84539
+DIST jdk-8u25-macosx-x86_64-demos.zip 62097849 SHA256 78c96dd681f0672730de5c5cf2f6be3bfd03bfc1b5c7d57e78c96a09107cf728 SHA512 176db426ed68343715072e2a632d5a9f0fa88eb53aff6a7d66540b4e45c5792e742642b990c1273eb048223153564b76c0be55c93559e8cc59dc67a886850a8b WHIRLPOOL 0a4b5b5055373de88404afb7d445ee54b960a7645137a044103e06d29369f38fbc872d700bab5e5bf450d496a86f160d5671ba5eaacd418d4aaadee520da9927
+DIST jdk-8u25-solaris-sparcv9-demos.tar.gz 9728959 SHA256 e5c8257459f9c81b36b02ab64f1d4395463c28c0c69e819f859f62e9ef07478b SHA512 047e80adc158708988f5026c1336ce3eb9c064da99f364a4446531ef40f1f901f13ab59e850148ded688d819c022c65d76f63878c25fa28f2d1defc628d21693 WHIRLPOOL 127b19b4a2c4ff2798ec6d09f774695f665bb02eb206df7506e55c1ebfc9c6daf92da47a9ac398f0bfbd6a38b8bb96f8e3659f6a1928f42062b92d5e6a2340d4
+DIST jdk-8u25-solaris-sparcv9.tar.gz 101856261 SHA256 f113eb2ae36b48014532c22ab4d5c8f168482c551c8c1362f5bc127314edcc84 SHA512 5c66dccdcb364816da718cf83d0a1e429e7a7343eca04b281d6b7d171813c023a32f6c6467369dede70def91bed3b9dc5030d1969a3139a3b5a081ba6aa0a12f WHIRLPOOL 17ddecbfcf818c8ff4c5830db52bd2af44baeeaa78220dee9aa1a130dba96d664565d6161f0bc5c010792dbbf824e20dc6a74adcf55fa03b841c570c72bba83b
+DIST jdk-8u25-solaris-x64-demos.tar.gz 9673219 SHA256 276e183f5aa458eb9739ec166a09aa977f01e77750f8af75d341d9ac30e6ae75 SHA512 4ee0dd071581410715b25a31b1201075ce9c2c31f7e4dc07bbfda12b317bba3290fa41411ade68c3d0ad9e479d220afeac7e0af022e5de7107fd57d16d06b05c WHIRLPOOL f0d57d131ed031e6837ebac8b844afc1b43f6c3b47fa2ff7e00cc938befb840bc5f738db7b320a628d9d5ffdeed808b744b32654ac06ce99834d19b900c43ba3
+DIST jdk-8u25-solaris-x64.tar.gz 98821674 SHA256 84b505a841eb1e206fbe6f58dee4247ef7609c5fd639e094d01f1334ca579b21 SHA512 e2b457f47518bb23aa51a6e14864ea11766e6a1676cb9df5c5746369acdfe13154f2f945c33ad397f01325c5dea7920d04208588abffc6f0a0cbf9977b90ffc9 WHIRLPOOL 8f20c6be34e24f1acffb02b2799da2d09f633326917cbeef4dbd365a565eacf2740e018ed895d43a41927344e946905ee4617a9252acaef666c017c057a842f3
 EBUILD oracle-jdk-bin-1.7.0.60.ebuild 9910 SHA256 ba9f626a5e86a9860fa995debef6c60b5a0842d6bee5384f7bf64112026fa232 SHA512 1261a52e8dfb9112dab4e5f03b47cdb5552a99fa8929db6f527f937110320da535fc97914d4be655b78b64f82c0c477ab6bd5bb273c34e1aa27a0e289d8bcda8 WHIRLPOOL 0a3424b4d9cc3e10c5649bd3e45774b63b9acaec6cf03bf5dfabd49324487d9a3fba9dd6bb572167ccbf5495a391aeff14feb629fc448880e0315ddd91478cf8
 EBUILD oracle-jdk-bin-1.7.0.65.ebuild 10238 SHA256 2afe688118cc875bef74ea53328bf358f83b88b6091d8ef328825d3ef760d90a SHA512 d53382bb21240ccab94f9bb88aabd49f370d50c548c1ec8c2d5c8b37559e581030286f0cd3ffda6e2e7770200e7dfa307e65a725441ccb66071ebffa2c677f56 WHIRLPOOL 17c1c728d405b17fd3981120bd4fb9d2cd5734def072c4b2ea95bcdebafa47d90fabf11695c990af7d870243284f965ddac15ac609dea58e1e4b86425cda5fc1
 EBUILD oracle-jdk-bin-1.7.0.67.ebuild 10241 SHA256 3b7700bc6d5980604acd1f1b8733d5d15790a9a803962230af2403e05fea5a27 SHA512 6decde703354818dbece3e19568ca7579d05dcb34da18f63014ffb67556d91f1ad9966a41429ead6924fc889c8c7d1fce7c8d7700e9c47ce21677cfbb134cba8 WHIRLPOOL 625e29a0665ffecb897444d1b6fea6c5949a85990d345b5215366154c1b6f42dfd2a4ee38eca83118b41b9856263f365cfae7aa2c4678f7b8460d5292c54a26d
 EBUILD oracle-jdk-bin-1.8.0.11.ebuild 10063 SHA256 7857e914a1d0dba0628c1e6ac62a8e20a8600b2d076d29f467aca98d6a8230f0 SHA512 45a6b7859c7ad74b9cac0d48579cc1d7d3cfb90b90b7e54adf3443799b5ceddd475c5910bd016bfd843c92ee13bee6e8a80f1bb7d1444de7aad17aed6945d4f8 WHIRLPOOL 56562f96eafb3b2a3c1b9f830ed9502fce81d82fa9ac665d749c4cc272e50645eae34dd55fe61e9c70f97dda6c1f705acfb0a5e53a97230589a1b67b1c27adc7
 EBUILD oracle-jdk-bin-1.8.0.20.ebuild 10064 SHA256 9ceb59a67c0a7d0243892acd05e842f3b1f9ceff72881d191e057d0f8228402a SHA512 388370970e372553b58fa7d85f890fd53e07caf3e8d51f6b42375fe0f00c823bd7be2d0ad78291c68f5e5ef5ac400e428cae23e7bbaf39f01359f0098750d80e WHIRLPOOL 9c7205f4575e39fa7818c0e808bf47317dc5695e2764d73c8eb45b78a44ce8b5c5ecca4019294c1bde76e6dd8ee18cb0e457c47e436e5637ee10f16f958e9d45
-MISC ChangeLog 12840 SHA256 cee34b456e221df69dc947372639186941181841f9cfae7e6c709e51b223d8b7 SHA512 ec21d9971eaabb92b7a26c3621881a3d40a3a3805ce438ea13132fcb70c368d9c2b1e253c08354c05955c33dab3450f971cdf7fea2d8bcd546ea6885408b606e WHIRLPOOL e59a197ecbafd6b72d7ce459be566a301af97704388c19f76801da5588435624a858e55e103f8f931810072025cc3094c0d1931e76a7355830824b60979f9174
+EBUILD oracle-jdk-bin-1.8.0.25.ebuild 10065 SHA256 2fd61e3f578dce3f7d897be9ecc1e798acb59f8f9088c90ba277b55d8e101ed0 SHA512 1aa63ad479d7fbea46fb8e5be77b60158b4f07decc5ad4f8debdf17d6286103702b7849440fe5cc0bbac39123563a2c102c04830c3f7001de907ed6cf1388a16 WHIRLPOOL cd69fecc1267db194e08105778f4464149762637fbafbd77acb685d3d4433bbdaa855fd00815d03ff8edae0b1562e25e09e97e203bdbbd69f98e754fb8bfdfd7
+MISC ChangeLog 13006 SHA256 a241656492be26b9b6eec76ea2518db72eb2179883aa89ab0a62a73191fd47fb SHA512 e1dd74e3031b61c772e53f44fcbba75beb50d24d0a7bfba7908ce8b1646c3360e5ada2737f67080fd54a893239d918bdd81bd71137241a340ff19a1cec580cf0 WHIRLPOOL 56671b63d0b5d011df6fc4b56fac734d706c817f803b267f8364ecee9c7682fb5d026120fa746168eeb4c699b9f778ba8da29ba4ea9aa0bbfc005823a8c78496
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlQGU+0ACgkQsAvGakAaFgBKpgCgxkoE9zgoqbpY4gqinFDqOWIt
-Lo4An162uzl2CGBi+r6Uz4cjgDzNgna4
-=joNu
------END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild
new file mode 100644
index 000000000000..992999c6571f
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.25.ebuild,v 1.1 2014/10/21 12:35:39 caster Exp $
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x86-macos x64-macos )
+
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x86-macos x64-macos )
+
+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}"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+COMMON_DEP="
+	selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
+	X? ( !aqua? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXi:0
+		x11-libs/libXrender:0
+		x11-libs/libXtst:0
+	) )
+	alsa? ( media-libs/alsa-lib:0 )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )"
+# A PaX header isn't created by scanelf, so depend on paxctl to avoid fallback
+# marking. See bug #427642.
+DEPEND="${COMMON_DEP}
+	jce? ( app-arch/unzip:0 )
+	examples? ( kernel_linux? ( app-arch/unzip:0 ) )
+	pax_kernel? ( sys-apps/paxctl:0 )"
+
+S="${WORKDIR}/jdk"
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}" ; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]] ; then
+		if [[ -z ${_check_tarballs_available_once} ]] ; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+	if use arm ; then
+		# Special case for ARM soft VS hard float.
+		#if [[ ${CHOST} == *-hardfloat-* ]] ; then
+			unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
+			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
+		#else
+		#	unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
+		#	use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
+		#fi
+		use jce && unpack ${JCE_FILE}
+	elif use x86-macos || use x64-macos ; then
+		pushd "${T}" > /dev/null
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		local update=$(get_version_component_range 4)
+		[[ ${#update} == 1 ]] && update="0${update}"
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
+		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
+		popd > /dev/null
+	else
+		default
+	fi
+
+	# 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 jdk1.8.0_05 to work.
+	mv "${WORKDIR}"/jdk* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.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 {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin ; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
+	fi
+
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	if use jce ; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	if use source ; then
+		cp -p src.zip "${ddest}" || die
+	fi
+
+	if use !x86-macos && use !x64-macos ; then
+		# 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 jre/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}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# 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/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.*
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# 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
+
+	if use x86-macos || use x64-macos ; then
+		# Fix miscellaneous install_name issues.
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+			decora_sse glass jfx{media,webkit} \
+			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
+		; do
+			lib=lib${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+
+		# TODO: This reads "jdk1{5,6}", what about "jdk1{7,8}"?
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}