ia64 and some demos now available, #455368

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

3 files changed, 275 insertions, 2 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index e2f54eb4fee2..e933e000201e 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.348 2013/02/03 17:02:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.349 2013/02/10 11:57:37 sera Exp $
+
+*sun-jdk-1.6.0.39-r1 (10 Feb 2013)
+
+  10 Feb 2013; Ralph Sennhauser <sera@gentoo.org> +sun-jdk-1.6.0.39-r1.ebuild:
+  ia64 and some demos now available, #455368
 
   03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> sun-jdk-1.6.0.39.ebuild:
   Stable for amd64, wrt bug #455174
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index a52438dc815c..d07be597678c 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fontconfig.Gentoo.properties-r1 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX sun-jdk-1.6.env-r1 1015 SHA256 31302b5ed417a294ecc9c475a08aca331a07c59d2c095978a574a7347aa12f6a SHA512 958c7d0ef04f30b07e8ee1ec36c3637ae2d2abc0d9f6da08b75b9bf81845caf1a7ac8e805e04ad39625cea4e8397174739cc72c33c13c57a8aa0886df3e95d3d WHIRLPOOL dbb7cbc7cc44c32011703ea9f9413a8798d922cc69f3ab67fb8af55a6914cacfad2b91a48f6a58428f1b71301f8287db07759d4d64ffaeb9c639b9a4a6debbcd
 DIST jce_policy-6.zip 9101 SHA256 d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262 SHA512 a1aa55f2ad919efcf63452aaa96303328b7449626efb342a7f8d9e7a4fe9c06ce22ce33fb89e768602b172b7d9538c432e82523addb0bbd4d1be22f934576b56 WHIRLPOOL 144a4891ca3f5f88f72c1a13283823845bd7e46b5fe941b4c192705e20e9fcbbf27819ee926577218dd3b222e41f7ee149cab6f9eea5a46febebea00ad2ed3bc
@@ -13,13 +16,29 @@ DIST jdk-6u38-solaris-sparcv9-demos.tar.Z 66913 SHA256 4dc24d49cc2dcd4e1f4afc96c
 DIST jdk-6u38-solaris-sparcv9.sh 12721403 SHA256 1caa5b1a2e901872c3fec1446aa8df1b48413b4265b9fe6a06d121782800c3da SHA512 668d99a30d5743a04dff8a3a56635332702ec18417c700948bf814c9486d672a0653bb6ea6d173a5e1216e103593350594e4b3864e8e5dfb4ff3283aa3a3b94c WHIRLPOOL 1bcc2522c312eaddbef5ca9058b05cc6934915efa5f19fcf5bf2d3875f71f47ff565531a7df797234cfdcea7a902cc782c92b001eca20e5abd5e3fb5a6334493
 DIST jdk-6u38-solaris-x64-demos.tar.Z 71907 SHA256 71fcc7b04108b8f12bdc2570d5ac2b14ea8828ac2a24b20037932d496fbb91d1 SHA512 1fc4a0e2167855373d10d66178741dc7259d02b672cd58b2bb49e954c2a1e74f26147415f5eccec9028d33d9b3643be778fd85d2460ab048259d10f51ee2f8f0 WHIRLPOOL 87f03c2e628e4a65625bdaeb22b77ec4f91c9409d56cbb537b211dc50fed1f9f72d484b5934bb1713d31fd63d119031d87bfa03f2df7c98549e8b3f4bbdf647f
 DIST jdk-6u38-solaris-x64.sh 8859356 SHA256 e7b4f09dc6c66e7aac45d155cfa8cefde15ed5b0c23e5fa6c03a45d5bbb75248 SHA512 45bd7cd382ca82bb3f84c3fdfee4ed092c90d079f2cd67627539b4ccddc833583fde3280aa50e5102a04a8e9a1e8e7274263b2b910911fd6c81742aa50221f25 WHIRLPOOL 5644176454ac8c8e1254724b73e321e959da0855326d2bdeb3fd5252c67ad86c8cb53d95627e720eb563ca1fdd2d8463e60fb5a7ba5524ead42780f9c7bb615e
+DIST jdk-6u39-linux-i586-demos.tar.gz 12073475 SHA256 8f1f3b6c89c62363a892dc310ad81afb6e6cec689274210e6efb4805d2e2f1cd SHA512 1aa2b35d31312a3ed4412550bb7262a6b217d497260d3aa2a6b09498d5f965c3c0f77bf59e80e1682ad80b1df835833bd355280afc96be12bd9118b9c60c98d3 WHIRLPOOL b137601c7afbf9d947bc9c7eed134110d4feeac58f2f15653c8ccd06dbc5994a174da8bc3a8b8d94c305a6143dc15a78c180780478174032fc58767a17efcc57
 DIST jdk-6u39-linux-i586.bin 71756435 SHA256 98211a71eef47f9e73a57b32995ca4b698d12b4282c90ffff8c533fa8b96d103 SHA512 22a001deec16c800fc9ab5efda474463a95c0b41055b181ea02a5310b39457fb6dfbb99353be5ff7572699371d613a02d81f3d129de0a94221b25a79a321052b WHIRLPOOL 21ba8f4d51fe1a544c18f4f1de666e65e8ac7d6c141fcda97fceb171173ac2af505317797f7839acd90e37e66f2bb73a3f49d72bd22042dbe263418ba8d12a0d
+DIST jdk-6u39-linux-ia64-demos.tar.gz 6858928 SHA256 9eb9f05ed043d5066485e791912ec56a1558c3b61c99250b49d525c2a2e9a701 SHA512 b02a3834356c6a464fa21e86e4aa1ecb6d671b9125d614e1a3f2433007e4abcd7c2274dc7795fd7fa629f48b20c91ffeb49f40a9f4fcd55abbc6793483133f3e WHIRLPOOL 73fc8c1118d400d247b9b8526942106cebd0f7a30d4bfa223ff1cd356d10dc3304924ca5b69162397e4c822e748cfb08544597d95a380a59d9ee4beca7d26743
+DIST jdk-6u39-linux-ia64.bin 63589118 SHA256 9c6c430a5fe68f16e41907bdd96263a0cc238719ba1c1607294a2b3f80e6a905 SHA512 410c57a8ed2122190d1cfac52ffef50cc8560a285e58a58ca45dfc452de8d88eca81e83e053c2a4dd9f0b78c61addd48ea1d5a164454b834d76a0a16228e359e WHIRLPOOL 72e1ad9ec4432121763a19c3dc353af5e4412b1f082d64e408636e6de7a0b0f936db8f10ed0ef9c3381cbf630245e553d603219f819552daaf9fe8fd23ade303
+DIST jdk-6u39-linux-x64-demos.tar.gz 12104230 SHA256 ac70e15db96a3426f7338c3425f255bc5269edc5664aca4679b75589c5c3cd62 SHA512 f6cf6bb65e23fdad6884f30de983c01a5a746247d8acc9805461e5d987408a1e228c3eae4fcb4b5b22cc03cb8a22accc0d8a00da06839409cdaa47b36554299d WHIRLPOOL 73b29c4dfc440dbdcf14c6655cf663d320dd78ffe34f9e9d37e212eb8a84352b2fd482fdaa7978b9db0583143ec0893513dd826fa68639371d6a0bbbe651e702
 DIST jdk-6u39-linux-x64.bin 72037515 SHA256 3d7ff1130d1200c087c54749f1c72856b8d384033cbff6343abb953e4c152b59 SHA512 c35dfb7968d2435dfe1262184143c482c9a49a4e65ccbde8160ea08ea146c104b0fb4cd1e5eb0bb2eeb9e750ef39a2ba057291c94bc355c268af30768970bb40 WHIRLPOOL 4e56fb814604d6146b8b7a603d43a460af4c55ee4b4fe2cde244ece31797a036350b6fee645f1a6c23b2ab2bdca8ea167854b7f4dc69f80e349c20638ae836f2
 DIST jdk-6u39-solaris-i586.sh 71664523 SHA256 7119cbea5ee877319ac5b6cab928d32db8b1ffecc809fd74d74b81f8a3e97338 SHA512 7f1977c5f846f69e8d243d618cb179e3b199ca4e46660894805b38ec015c98c4eb5017eb2f137d720801625ded73b713d4020275a552ec80192a66274e708135 WHIRLPOOL cbe3866070226ba07a2f3e60d96e6e19c23ae2a0bd216788967b064dbebcc9fcb62003fb2738629d5ec06cd11f0abc2989a43701fa722c6c5faab5601235f547
 DIST jdk-6u39-solaris-sparc.sh 76915886 SHA256 d3432bb364fed257f593297d6752128fe728ba9b1f965d2ea99cc0a8753a22a3 SHA512 1837823f9b54336ccc1f4269beddfea6c61bb025c0ce44fe5caf8fb7f027186284ed7cfea914d0d5297187623d6d1c71c433ea0dde758cf42ffbccbf8075b52b WHIRLPOOL 547bc12721ccfd0fcc149f684b96b57b6f40f177a7bfec83126075338245ca746bdea1ebfc653966968b69baa692ba320146aeb5522aa550da17e92a95c98535
 DIST jdk-6u39-solaris-sparcv9.sh 12725295 SHA256 435a9565edb36580d7cfa9a06f86b9aec91fdd434432748896eba807dbfeb2af SHA512 f4f26fe1655cc8b1273dd3cb6b8f80a40d6e0008cfddaed6b2ccfabc5548c58183175c038b7fb4929018ba637cb4b560046fa45de1e4c21c97b264b2d0ee66d6 WHIRLPOOL c10ed6684cc6c4cd8c6c38523dd20af2bcae6ece67a0256bf85a56240c095e5fd33b9ef93de2aa7e6854b49adf3c131966cb0bf507d737aae494406c77e26225
 DIST jdk-6u39-solaris-x64.sh 8861523 SHA256 161e859d2fadb045df7f69d88a72402bc04835caf646482a7e13bc04a3912a01 SHA512 8e5e886e897b6247f7347baf55a30ce8962fc117328376dc8c0e23d63d9528a8c3fb005d4eee1094cc90bb9b3c36efefa4261774bca67fa33ff52ec8cd1bc714 WHIRLPOOL ce92211ab1b0cd34fab7beb0fd82daf9a6c413207e043bc19bbeceaf8334f37cd5bc60dad5af4b64c7a013e8261fad64e72d178ef40d6d0f8c7b786918e9d904
 EBUILD sun-jdk-1.6.0.38.ebuild 7935 SHA256 20ee47d28740099db73fcd18ebf7a87eb88f2a35d47e92c6666333320bf5a3bf SHA512 6e3e3d9b9d4d1a00f26001324d98dbb77d18fcc549f9df3138f82352e48e32a3ed8328d5525df0e6d5c1edda0942e7e5a2c026d4d6b77657cc48d92e6e80511c WHIRLPOOL e09a812e05526df2021387051319008cfbb1abf7f907b86dd317f67417cbeb5442159ce06c025041b35c4cd038a5aaab652c46279d4a1acc7096e0a8eaaf6402
+EBUILD sun-jdk-1.6.0.39-r1.ebuild 7936 SHA256 c131321c8bf7ed1edb60edf95bbf6bd355bc4e39f9ddffafee235a20918c738a SHA512 bbcbb8cb881b2c9c760630b71c4c426c668a6c0e5d32c918c614aa879b70dfd07246933888802f680fa1586944c4f200a93f4c0c9c70a6a2ccd0ec3a8d7d3034 WHIRLPOOL 1e23b7468cdb5aeba3009ef815e3d282d2367960ae2da6d6cb22f28a42e88538051bf1a43742c5629758dac98303ec7b05bc4e517d4f40ef5283de69d0c1d553
 EBUILD sun-jdk-1.6.0.39.ebuild 8001 SHA256 e03ef139187a65ec9ccff5435d159affccc57bb51c601548de0749fbab0c383c SHA512 29a6a1ec531d133dc68f9411e342d501811134aa9757c754b59e924e1b17e804e5983477490172959c95821ceeb1765d27e5938d54839b0c78e775b6d577b207 WHIRLPOOL 8e11de707b1ba847aed579d9030403a04aefa46aa8775c472ca4673d7f30339f79f5ae5978b61d2e422c687ede13e418366b02b2bfdbd5e3e0bf6c3dd6d7c9dd
-MISC ChangeLog 63446 SHA256 eac3f1f5933c2b7aee5965c3457f2493a213a7e0026eba42259f161b264b39c3 SHA512 92d9c4cc9b694f1581830245eb239a60e3eeb18a7a34877882578621d7fcd0061987a5a08eddfa57759fbaf645977bcf1335b0c671b954c21843e170c2687092 WHIRLPOOL be643ee7b8906bacca78bc2c896dad6c62721506a48cfcbf90c1aff764d4a642b52a19d7e3a707f089fdeede5c31d852e1cb3b450fe92b10dee90ebd2f5a5c2c
+MISC ChangeLog 63608 SHA256 e809877cdaac19787b8d49b40be1d72fcb47d2885e56f4aa4b7f3e32d48d8aac SHA512 63193f5c0f20f295dd53c4fd73b24bb1e043dfb01fedc55c78948db90b6d273d61b4d3f6b37ecb035d4c10ab26b773c41496eac97eccdff6cb6dfdd277441d0e WHIRLPOOL ef52f887db9222f7c8f3ce059f75bbc2262f0da5ed347b6c33ccea9c77d2ff693d46f1dfd7e22a67e3a64e12e6fe1263e4d43a9152f6cfbba4d5be7522bc4bc7
 MISC metadata.xml 501 SHA256 08a1a9de353c1d04f91b559372baa885fba76dc04654d2543f6c723e013b12c4 SHA512 06b541c8c2e66e1237edc1b3885416aa6ab4531b9fa3f90e258718fd654837d019fa48bcd5a1220597f2fe8a2dac5c9d48d68a2076c04e423eeaaea0638fe420 WHIRLPOOL 361a32717dee2310fb2d07522428ae6fab422a34e2e97fa1fdfb8c20210946c1611a28029de663dbc39825fcc409839a2fd3a4adb977a12c1606d54b6026ca8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRF4xZAAoJELjwI6Q8XPdaB/0H/13h8jJwi7e6yOoERp+cGhQ/
+aTMloOaKEkoOEcuMRvjD0Yey1wRSvwhFtBjseB0uVGOQOpgk9gqXbxKJznqNP8z7
+UYwxouTyQi7DKPI0wXUUzXCSl+Q3fgyieNtTIcQqgWv0Uq+7f52tWP3izmBdWoyn
+yRIf8T2Lj3pqIHtA8JXXsK2pwmbcR3MZ996i0C6Cdk6BBsT/vQJ7uTXMey96pITh
+1nR+c2ljc3Vc8DqtDk8O629bFQlQTmXeMc+aBAmlQvDCtTUTGm0ToEAaP3Ho57kn
+zZydtQ/M380IB+PZ+zLmkEY0Qb3d9yu46Bk6Jdk94HxAH8iKgeCMDDCTlBzllqo=
+=FDdU
+-----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.39-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.39-r1.ebuild
new file mode 100644
index 000000000000..b6bcbb9650cc
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.39-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.39-r1.ebuild,v 1.1 2013/02/10 11:57:37 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/jdk6downloads-1902814.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html"
+# This is a list of archs supported by this update. Currently ia64 comes and goes ...
+AT_AVAILABLE=( amd64 ia64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+# somtimes the demos are missing
+DEMOS_AVAILABLE=( amd64 ia64 x86 )
+
+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.bin"
+AT_amd64="jdk-${MY_PV}-linux-x64.bin"
+AT_ia64="jdk-${MY_PV}-linux-ia64.bin"
+AT_x86_solaris="jdk-${MY_PV}-solaris-i586.sh"
+AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.sh"
+AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.sh"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.sh"
+
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_ia64="jdk-${MY_PV}-linux-ia64-demos.tar.gz"
+DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.Z"
+DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.Z"
+DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.Z"
+DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.Z"
+
+JCE_FILE="jce_policy-6.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.6"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.6.0 )
+	!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 )
+	kernel_SunOS? ( 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 "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+			einfo "has become fetch restricted again. Alternatives are switching to"
+			einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+			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() {
+	AT=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	DEMOS=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+
+	if use kernel_SunOS; then
+		for i in ${AT}; do
+			rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
+			# don't die on unzip, it always "fails"
+			unzip "${DISTDIR}"/${i}
+		done
+		for f in $(find "${S}" -name "*.pack") ; do
+			"${S}"/bin/unpack200 ${f} ${f%.pack}.jar
+			rm ${f}
+		done
+	else
+		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
+	fi
+
+	if has "${ARCH}" "${DEMOS_AVAILABLE[@]}" &&  use examples ; then
+		unpack ${DEMOS}
+		if use kernel_SunOS; then
+			mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} "${S}"/ || die
+		fi
+	fi
+
+	if use jce; then
+		unpack ${JCE_FILE}
+		mv jce "${S}"/jre/lib/security/unlimited-jce || 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
+	# limit heap size for large memory on x86 #405239
+	# this is a workaround and shouldn't be needed.
+	bin/java -server -Xmx64m -Xshare:dump || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	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/unlimited-jce/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/unlimited-jce/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} (sun-jdk)#" \
+		-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
+
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.* || die
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto "${dest}"/jre/lib/
+	doins "${T}"/fontconfig.properties
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	elog "If you want Oracles JDK 7 'emerge oracle-jdk-bin' instead."
+}