Security bump. Arm and all demos missing ... #451206

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

3 files changed, 257 insertions, 11 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 034e9a68e2a1..240f67977603 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.27 2012/12/19 14:36:41 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.28 2013/01/14 06:59:45 sera Exp $
+
+*oracle-jdk-bin-1.7.0.11 (14 Jan 2013)
+
+  14 Jan 2013; Ralph Sennhauser <sera@gentoo.org>
+  +oracle-jdk-bin-1.7.0.11.ebuild:
+  Security bump. Arm and all demos missing ... #451206.
 
 *oracle-jdk-bin-1.7.0.10 (19 Dec 2012)
 
@@ -8,7 +14,7 @@
   -oracle-jdk-bin-1.7.0.5-r1.ebuild, -oracle-jdk-bin-1.7.0.5-r2.ebuild,
   -oracle-jdk-bin-1.7.0.6.ebuild, -oracle-jdk-bin-1.7.0.7.ebuild,
   +oracle-jdk-bin-1.7.0.10.ebuild:
-  Version bump (arm not available). #447248
+  Version bump. #447248
   Remove vulnerable.
 
   23 Oct 2012; Andreas Schuerch <nativemad@gentoo.org>
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 4aaeec7f1e24..3b0e4677e8a8 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -20,6 +20,12 @@ DIST jdk-7u10-solaris-sparcv9-demos.tar.gz 901123 SHA256 ade404b770eb9e90e779191
 DIST jdk-7u10-solaris-sparcv9.tar.gz 18420859 SHA256 ba304ffd6e954ebcce393ca13fdd2f52a0e24e92bcd35da7d3d8305a8fc77c09 SHA512 4d9076cd7967fd7c30c621cf1e0add9f56ce520cbd151c3a8a397d0f462fe4a9b4e8a89a8fdea6d5ff42e54f6721d19b04955960413ce88978995fe86dbf2a7f WHIRLPOOL 4a129f39a3ac07043a7711723d89dc2e20e09d8296b1ca5c4c52d2169d4e7493ecbcf17124bbaf64ff9430004810c7962d94476f1f4c86a50c7d0c4178e952bd
 DIST jdk-7u10-solaris-x64-demos.tar.gz 864557 SHA256 3fbb897476d97beb34137ecb32d3405829e6a6e7bbc5f26e9a6cebcb34520712 SHA512 4b946daa3b45760c100f6a72a7d3f5eff31cff9813b99ce4b30dbf3ad8782ec271956dc42e662db28a0f34e2be5719c690ac44f591269638245ddb2ef0935bf2 WHIRLPOOL 4a1b4d9f9bdad8d7c14ee36cf1308a5e4703ac2b050622946f8c8a3face118492915486f48af2d834893f1265e2c94e3dc0ec8faf84e190b8efde76050c2c1a7
 DIST jdk-7u10-solaris-x64.tar.gz 15751555 SHA256 50c4317a5f031e1257210dd0b2c66c2576b2889916f8c5858730e448bf748f46 SHA512 a0ead555853133c686fa4b4933175398b16ad3d2042e185355fbb8bacfabff9131600d5ed4252d45717dd0f284a2b6eb21aef1191abd03c544ee7b693f1318bf WHIRLPOOL c8d6ac251d6b80ba12b65b104d4c295eaebfd756fa99518ad5af27e96d66378c0a4c76a732084254fd4d72f7d37710dacd7078c40031a9692db3e1fe01f4ff09
+DIST jdk-7u11-linux-i586.tar.gz 97470187 SHA256 7f8efcbba7d32236a1a9858660ae4e42e32510a487cebffbcf934999deb53d35 SHA512 f7e2d360a08ca39203245c0b4ed0880b1105d86387edadcf3f240c1164a06ddcc3f44036dd0c825609c972bb5c123d836a3ff39790b36379375892a084eb799f WHIRLPOOL 6c6492e1e56abfa5acfab55cb1ca4020f75581f221a6f5ad05fe5be46af84420ebec36a69b07e58d1a726cce9ed412c10e51015f9c30ee95450e4dc461bd7f4c
+DIST jdk-7u11-linux-x64.tar.gz 96158031 SHA256 8ae77f5fd43e72dc87135af1c4ee2e294bd6debcec00778509519e0d1f8e5c35 SHA512 827123cb190e4ee356204ba82cea2fafe6e0054a1882ca860d79ddd18f08ea09d590f00b272da8de7d57c10fd332a7c3c93ba91be46186ea1ee20dc01a1a811e WHIRLPOOL b621f5c848e55b124eb0f9a52a3199b76aa56c62f0938583384b5ed545cbbdc9b94008af307c10d059214c230e1219d4d4e7bc4723bc1ea604716e0f3e8c7d69
+DIST jdk-7u11-solaris-i586.tar.gz 96387338 SHA256 54abb5f664e2a8f878f85ee1076285fb97e432a96d6bdd19cb38462b4649b40c SHA512 89f2f7fbaef358d0d26678ae61e5e058481709e809379f6e3ed184a610f58756e609a3d0584c70921d9f8e76003e75fd1de0b6c44516dd676777031a62fe13bd WHIRLPOOL 6467c0720dc5e7dc254a0ef38c2583aeadf28de3b00774773e2020d922441aed9e0a5415f32798b9d4c1d467d05f99dfa1d540275dd47195d30776911c171326
+DIST jdk-7u11-solaris-sparc.tar.gz 99873516 SHA256 7c3e87765ff00d4bcc872f67f98855492184de66e34d99af27b330a0ca406401 SHA512 389ce205eb5e4bbc8c044cadf00ebfff6dcb9227fc81c14ba01f8c14c444abaf89e876f1b1ba16fdba6c2b573976e6b34c7131b50624c46992720c95ea934dc4 WHIRLPOOL 545263677f73e7dab4422753b6df7b8740e22074b3c868dfa557804b30573cb1555a9abb9d3abb53bf43f49f9b0636ed893dbac212f411175ab0efbc2716be68
+DIST jdk-7u11-solaris-sparcv9.tar.gz 18335505 SHA256 af448282e961d32f0a47dde38c3034e84e0a2a1505c636618562cacf8bc794c9 SHA512 dbb942a45b135702d509b202acc28d781f8c3cbbbdba45c01db5472446c514e78a04cecdb8f44f921567c86d3b14a404d7fe9d1de749272c73b99d6965941b55 WHIRLPOOL db4f597092856712d56be8e2843c25c23558adbee90c6c72f4aa8a1afc25aef31caec28aadda22fbf4f06433ed30d35aed1e2bb9e7bf13af462a9adb2bb2cff4
+DIST jdk-7u11-solaris-x64.tar.gz 15674980 SHA256 fadee8ecefe37e407ac68167d797eee80ea7461eff49f437bd386b325077ed07 SHA512 29eb96b246b2f6dca43e09c9d1b5ad4ef12632f1be5ef039d3297f068e4c9261208638928e8f1c2521a26d37e08590977d42ec9d7bc00ff41ca48a4342d509e6 WHIRLPOOL 9e772a8b243e5867d748a35dac436c4b0db9551535961c9294179fe06ebe7c220ad8f5309a1fe894c4673e11d4417e8c81c8a3f3d625bb64578e7447b0517398
 DIST jdk-7u9-linux-i586-demos.tar.gz 14751397 SHA256 5aa1098fde7b22d0b8b5c8e436c39a11fa52eb37cc52a63ead3732040f3ae2c6 SHA512 1f03b8194109baa64490d840f7ef39f47f7c74c026b01a8a0f2f89cb562577ff3dbdd70ee180ee4694c4e706990ea3dc9b81d0038a7d59f895c1b8f1d1b563f0 WHIRLPOOL 69d314418ca249a23a211de5062939ec7853f187a919250a5cc5d71f3b17723920076ebc56c59e1f9883ebe0c7feb1da4a51e30bc84c1a537678b9f1447bf61c
 DIST jdk-7u9-linux-i586.tar.gz 97361259 SHA256 47e86ceb7f59c821a8d0c54f34530bca84e10c1849ed46da7f4fdb5f621bc8d6 SHA512 7353984417b91482fc4d0c1c8597c49f431d4b63502b446d0bea6f5d1080a7504ce0b8801debe75b38eb18551abc3f81264901f3df159b8f6af5e17668603122 WHIRLPOOL defb1480299e37009a95dda609e2efebf8c3a73f48c88f491983daea070459e1fd33f947fdb9ef73c96a1c832fdd6e38eac5f76627ab219e87c8ee3c16780f47
 DIST jdk-7u9-linux-x64-demos.tar.gz 14762315 SHA256 76b07b6cca4c251b344abc09cf23788621e21bab963979478d77d76cfdde604b SHA512 376a5ab162aad26e85d802295515fae2b1b8d9e85acff0dc9e4695cdecbfabdf25391f3f180f4d7c8793cfe40d48fc9ab27e7c04da5617c1b30e7bf9372b9217 WHIRLPOOL 72782a69856db15712a45ab58caf168a25d0c46feb06711e43c6ff8cb23ae48cc9ccba9a68a66ba66440c01fa80735c842dc7bb4ef81e9a679cb00fb664c61fe
@@ -33,17 +39,18 @@ DIST jdk-7u9-solaris-sparcv9.tar.gz 18356772 SHA256 d6ed5006123e35e8d9ad4d73e228
 DIST jdk-7u9-solaris-x64-demos.tar.gz 864414 SHA256 b6d9f63f3e26d04bbfe05052526989ce872f51093212d8e7faeaf6dc243ad10d SHA512 d275b7bbe870c3efdb390a30282fb8ff5a6455c7e0cf4a3b241bdf6bd32c2721062e3a23e852255ad46f6d93ef276c69099b26964184b2e3faf6758a6e41df2e WHIRLPOOL 3daee99643d61f76c42e3cf022ba8e6f6ea42786b17e249185fae493acb6ad9f71bca6bcb31398c54f2396c207411a24b53a1e9127b6e85f2d8bbe11d433fc82
 DIST jdk-7u9-solaris-x64.tar.gz 15665771 SHA256 91e0b69b10660d9003a89798ea21d39fb974478332949f0c6ecfbeb8d722cee1 SHA512 b6984b758e285a82ee291d396c52a4556f7cb59c74c05b3ec7b700f712a706be32e62f941623ab2ad911382953f27df8e8feb7e5e7e4e09ed7104050da258a4e WHIRLPOOL befcdb6c762d1dd1e83534edcd7d1dca3a056531ec41ede9b1dde1ee50dd5eb9f73df225623812965d452c4a642024efcf7fdde1b98eef072694fe80ce148867
 EBUILD oracle-jdk-bin-1.7.0.10.ebuild 7614 SHA256 17c4e648fc94df53f51f9962042fe1b9efb53901156867b9125efeb6b1d77fa7 SHA512 02557d5585c67325bc8ef685a9082d2b0f7b179d9a32ab0ced27f1a2cc6d7b215f40121afc131dac33bcaeed9fbf35a916f323008940b1694afb72a7e0240459 WHIRLPOOL c172a26fa1592f564e34488aa0eca039cd0ba645a461fcd9cce858fd6ca1e078f816d3fa449c224baff3999fc5dbb86e13cb0c1a292bc26327b93cf324e92d95
+EBUILD oracle-jdk-bin-1.7.0.11.ebuild 7636 SHA256 3aff9c1a56af3cca1b08ed55b4a48826e7531ab7c23dd753fae00d5a8fc4cfcf SHA512 190d53059ea031a84152d7668425b311f1a8730dc572874f93aab2415009c77303e5229fabb6ed2a99e81c0f5bbb497d9656eaaf541ae81eded51de7477ab88a WHIRLPOOL 601679c0bf20de081d087739482c1a96796246c7471f58a0b55bcbe57c8d212d6065f2ca56fdfa965c961e9ed6a76003d60c64e276bceca40629a41c29f357f5
 EBUILD oracle-jdk-bin-1.7.0.9.ebuild 7882 SHA256 63005bee1bc160b048ef80e87b88a7d1bb7fc34c0e04331194d7b4c37ea2e3df SHA512 d045fe3af76afec12cdea82bf908baedaa8f8f832748ad9af83f9322acae87dbf30f8ea61ac41f02a3f8b06691f53294be879dbaf32dd247064760c067357dbb WHIRLPOOL 14778813496cd0c58d624ae3a15b0ebf91e92b5e01725e585760a72cf8e8c8d7123a6d18807a2775396a3522e5d3ccbe7ecab602172c607debf1b6892de53469
-MISC ChangeLog 5417 SHA256 62369603628ac931432fd6b434b4e6f64abff50ff164242de5cc0fffd3251fce SHA512 11f170f40cf25a4b099cbe497563e0f4569b6ad785a9ee3b49be8809b8cb78402328c9731f2983d9bfd46b7325d78b058ab9846008f76c835089dccbe13b62a3 WHIRLPOOL 347b94d8c137a9fcfedcb581e9f666f6001a1d008e443e4055f92d863169d2e0c54e1bcf932eafb2ed0fbd6bcb24665e5c28ee379af2ce5c23e0cf3b0b3ec939
+MISC ChangeLog 5579 SHA256 3edbd737be42a7373d45e8f3cb6b9f3fe87c0293f279f269d0de306e45572804 SHA512 109c1e409e764e1946a5e58064b40e6803ff2b468e46c7123802f05a60a2732aebafba982f5f92b198273c1f1cd419b027d0824a594e83122dcd8dd57cee977b WHIRLPOOL 5f69aa980c451f792e114f43c627a8aed8a3156617e5d825cc053d06defa4bf1e470207a276312ae092c68659bedc680b66f9c976c93ee161cfe9f871a9d703e
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ0dFsAAoJELjwI6Q8XPdaybYH/2aF7bKtIt4TfvpO6KlfKVxc
-HjxK8DXrg8jb+p7Lagkb2UPvgzbcMbU7EO4OMVKi7vQWSu4+AVHWr9ZUPZWuDiab
-Xak+iCKfoangMdR+bhjz3UyCR9jtdFFnnyGbHdY6ewXmIujRChyI8DGrAYrXsaRV
-zOMt/spg8Tls/WaPLhocI8zZuQiGZHClZZPNXoMP4DbXmN87FNQwK3UOFEmym/Fr
-zz+JMj5Mrtyjq8R89ZgIhEVxUy8WyRctIabzqEtV6HkTEIhbDfdmf5mjV9ZmZ9Ii
-5ePVil7j0mt3SBDW568t5IedvDn0uReyKeCBvUa0UsdnlIOcu8Xorfw3HBYrJU8=
-=WHqw
+iQEcBAEBCAAGBQJQ8628AAoJELjwI6Q8XPdaFEgIALuUlYqGp5woYcZGEqhwojO9
+OSu9zx/Vf5NwjAoJmEoZbWXKZZf0l7B6HWG+pilR5QO2JJ/+KYbAeCzLsoO6sCnu
+iqG+cbvnYF1wZzd+qS0IiRDcGeF+9Ytj8u0j62LTkOXYtf/GbKy2jqWlGv1tjwtV
+E3BIoRacibWqwZod93bqyz0fBn/GP2sksFfmLLEP9Wfl12TUKqQrDWycCnnMISFR
+m8RsYCfAe1u0y9CS3qUgGRY5ncjZ4OvsPtWcX5RyTHGwQBKGTQ9udxpYBTSHiJKq
+FyO3SYU9sDxvxx7JXURCF4j5mChiPzuJRVnaVqE2K07TCINp21XdXoJOwnECbCE=
+=nxba
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild
new file mode 100644
index 000000000000..0bf15999da79
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2013 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.7.0.11.ebuild,v 1.1 2013/01/14 06:59:45 sera 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/jdk7-downloads-1880260.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+# 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 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+DEMOS_AVAILABLE=()
+FX_VERSION="2_2_4"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm-sfp.tar.gz"
+AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
+AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+
+FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
+
+DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-sfp-demos.tar.gz"
+DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
+DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
+DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.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}? ("
+	SRC_URI+=" $(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.7"
+KEYWORDS="-arm ~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.7 )
+	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 )
+	examples? ( kernel_linux? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}"/jdk${S_PV}
+
+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_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/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"
+	if use x86; then
+		bin/java -client -Xshare:dump || die
+	fi
+	bin/java -server -Xshare:dump || die
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.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 {,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
+		if use kernel_linux; then
+			cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
+				"${ddest}"/javafx-samples || die
+		fi
+	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 src.zip "${ddest}" || die
+	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 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
+
+	# 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}"/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
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}