Security bump. #438706

Package-Manager: portage-2.1.11.27/cvs/Linux x86_64
Manifest-Sign-Key: 0xDA575EB7

3 files changed, 298 insertions, 9 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index eb22d0fc5eed..1cc0da8c727e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.338 2012/10/15 15:51:00 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.339 2012/10/17 15:19:20 sera Exp $
+
+*sun-jdk-1.6.0.37 (17 Oct 2012)
+
+  17 Oct 2012; Ralph Sennhauser <sera@gentoo.org> +sun-jdk-1.6.0.37.ebuild:
+  Security bump. #438706
 
 *sun-jdk-1.6.0.35-r1 (15 Oct 2012)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 92d9e11fb1e9..6b18071ee998 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -24,18 +24,33 @@ DIST jdk-6u35-solaris-sparcv9-demos.tar.Z 66629 SHA256 566ca5ee4d4215823cc11fdcc
 DIST jdk-6u35-solaris-sparcv9.sh 12708189 SHA256 1458b517adf62221f4b53af96e2cc703cb182d8f91c3df087f4f820c6a963ee9 SHA512 a7ff22acf25d263bec075a68dfa7983f1c31bb9ba36a5c31529e3d4fa4e2f0b69ab4b90d23a8b007efd29b0c54e56ee0162ab4ed3abcfe8b6bdbdd5491eb1563 WHIRLPOOL ca22e19e6818d72f037cfa194972c4e40538056afe29843a89bffde351fba8739c89f7980850d0724e065d3f35a7b57b4634d8f76514fd2794abfd45ddaad2bb
 DIST jdk-6u35-solaris-x64-demos.tar.Z 71889 SHA256 37aa09f8f31f2f5c6136581de90e79c1e71d887b9ec3563249d5b9064842b479 SHA512 9a936aea72d8f50881581a4208845365d6da4cec73cd7c784b22d098315b6e124aef517efdd645bbecb8c6794cf37fdd797515cc9fd4b26337b9afaab91ba0a4 WHIRLPOOL d0c6615b2a82b6d91c55bff665e211975f6829207bb25152d970a9f355b477a294ad3b1adafd35407b27f83017a77501c0a5f1a58b6f605be2a7a696b9bbfab9
 DIST jdk-6u35-solaris-x64.sh 8853512 SHA256 4a2285fe277821b90eb00f7079787938b653c77e2d3a6de116a6bd765aaaf6f5 SHA512 8e217250399bfa292737d3be3472b6f5741351e4e230d82820f6dd7e9455848d7a4e90e6d131c36e736615069d9bd27ccca800882daa180a6c6494898323bb40 WHIRLPOOL 074c3f952efa12d5a1ca9bf36161b4f7e43d4abef110b018258a7c8e7f0c6c8d8a11037134bb2f33bb8840a17e90bfeeb3a9685fbe6cca40b69fa1fbc6d48cd9
+DIST jdk-6u37-linux-i586-demos.tar.gz 12073474 SHA256 5667e0143eed0cabe8d42070ada07f3b66b2dcbdb491e4f48208004c833fc322 SHA512 1a895c5e3fec2890cac77d03789def0aada9d158761595b4ec98ba5a72bb1598a245ec699c5a65b8b1e20651b597327c9eea7804a75e2f1c2a76b1840d8f02e8 WHIRLPOOL fe1170435557f540c2ca44ea112f2ac85f89fd3369ea3fd2f5b495735b75f20e3f7ce851c2bd72bfc6e5f73206b0add25bdd7ec62d07a54c73d420bfb9bde3ba
+DIST jdk-6u37-linux-i586.bin 71764073 SHA256 44cc51ed452a08a3e0b4e397922832607161642e5a6e206f256af86f8fbaae90 SHA512 d2474c57b7b282f739b96c2330ad35b28cd1130c7b04b3e672d4eea55311a74d0ddc26a602f1732864c70af3ad4e051449e400df663540b18a40c8f6141f43e2 WHIRLPOOL 15bed43c4a6d7829c17575805f47cb9f204d86a2ff6150f4305564438715b63d08125aad77c91730d41313cee0b9dbb6ad790b0c5024c4f694593040e7abca5d
+DIST jdk-6u37-linux-ia64-demos.tar.gz 6858701 SHA256 37ea27a3684e8ba0073224720c99ac4a6cf6cc91b6099417af8b7c09969fac9d SHA512 efb87048d0e21167a05644ce694af68bb597bbfd36613f87c9ea82a729c1c45a77105136501847ba18b7f39f5c87b9e062ec6bdf8a67e6c221939ea4d3f86e2e WHIRLPOOL be393e60dc6a9140b78662806eb720e0cd8270466442f740e420533f546345cdd4fcd217e8b9593dcc936f9869a145c69f79d54196a6c06cf93d1cf5d656d79f
+DIST jdk-6u37-linux-ia64.bin 63612204 SHA256 2ba64c3fc5c41f37f738ee44a14ee3a8f4d8b3a87ce255188a4934c8d8dca6d6 SHA512 bf0217317179e03815ec6cb9675ddfd2102de37883ef6b72c855a74bc58a62ef6a763f241a85e71765fc5c46191d3bbb213ab62b1961051cda8d2d5f6e3708ca WHIRLPOOL a9e6d7d9dea1800d5180f8eb407e0acfac84ab030088b8753e85a606a042e5453d150b7332fc2f138653d30a18bb91e5fae21c42b78795de3331ebc152631e97
+DIST jdk-6u37-linux-x64-demos.tar.gz 12105736 SHA256 1126ff9abd7e9177fafd4ac6c3750c8925b3e68d925a0f89f4b42a4a6a3c0aab SHA512 a38c880a995fe6a93c924ce3d1e920d9e6e7dbd9f28605d97d558d474ac2380e27a90ca0619cec65f4835c557bc2abb859f6493d0bf8321edfe79106004cb9a9 WHIRLPOOL ad673213ac247b7c1c39d4fa0e961e4c6ecdcb406328a898d0bc45ccf67d2f668a4949aaf044cd4869c2a1d3fc21b59cba848671c7aa308c4b0e53b945f98698
+DIST jdk-6u37-linux-x64.bin 72048548 SHA256 51d594cec29948bdf58918ba802a872826bc7caae3f0aada42b65eacdc14a7f4 SHA512 93780e2b29e700b7546014b066e156c94ae31056cf3a030df368d1d109021d6c949b4c0b6980d905ab70888cea612e7726b1f29f581fe3a96e50e144c9471951 WHIRLPOOL a574729d2d5b2385c0ebed2160461ffa8e48bef5edf253c7a49ba0d36c275646c8e623119af3fa823a643003b008fa37ad417db013a0f1764e221bb5e9cd3002
+DIST jdk-6u37-solaris-i586-demos.tar.Z 17939213 SHA256 78af707100eaa720d8ddb547ffbb4df71c55fcea95f354619806b97e304cf1ef SHA512 6fbd9e2accdcd87e76dab6f38e9fe63d07ac8bfadbc5d5f7180c6c7f38baa56589bd4c76aa4265cec97ea7de413704f9827747340426aea096e5d52388dc7682 WHIRLPOOL 65607dcfd54e5dc4c9104cac33fb59b78b237c58a88bc15af6e75ea08c86bbe7f02e8f2ff7bf233646d97e3f66cdc2645ca559d97512c2f3c471b8e163ad5876
+DIST jdk-6u37-solaris-i586.sh 71675046 SHA256 fce348288c2ef99d951b5bc8debb9c7acfae332681d48436809e60b0b2478810 SHA512 d4e70cca24728a9081576883b0e55d5dbfa03b330c5395209566924c2180afa35ea159f14f18824338f5f57411fcf1a2153c62d58a933fe2cf26695d401c98c2 WHIRLPOOL e7c338de1c2b66c86cf6616734803e0aa56d80b5309391a05d7fbef962d9f74da23f7eaa8ecefee35040fa00b4039a6f98a2f10716d561e5637f9bce2ea4a100
+DIST jdk-6u37-solaris-sparc-demos.tar.Z 17914591 SHA256 730271e5a9e33576ff5df3bc0f84c4550f241cd61582f8169247f15c55db5bc5 SHA512 c5e9595fbb418e4bc3f2e08e6c4d9ed0350aa4d9b86338d7e872760cc3fea37f967950c274ff4632ccbdc238ef30b5ee92f487b8ee43cf48c28d0085af563f57 WHIRLPOOL 2dd6fc51a563550b5f694a7dcddfe84882fee9b00b98d065c97183f856132fba6b5b1515ef5e1342921d5069405369e9cb15059666cad962c4c05eed1ad39db7
+DIST jdk-6u37-solaris-sparc.sh 76926483 SHA256 060ecb4ea5d88287ef3e9423650c0010ac40673169fc3b2f8b32fcf2056bcc90 SHA512 b14a0738337fd6d626c7ccce4fe000d5f9965594a5e72cdfe60e8610014d256485eb915580964869c8bf4f6d923dce0d26d5fcd28490fdda6642a09a6d333f6d WHIRLPOOL 56dffb8ba72e1301a213fbeed2a25649b16b6174621bafefa0efeb0e0cd2c040d6baac0ae3c7e65f473a7b1c8360ebfcc7f054b3ef6699d73317e1c72b1b7ea5
+DIST jdk-6u37-solaris-sparcv9-demos.tar.Z 66837 SHA256 e40fa3a6147b85e4467a63f58d9542c16fca8131bee6cfb3a1421c16bfe4c64a SHA512 316ee418edfa82b9e9e9af4953e650abc41758114504841b632b94d60a0dbf42398adb2bc560b20b3571b50cf2cdb09e241298e2a722cd07f642a4366db3de21 WHIRLPOOL 754f6ffb2d035358c32ffd386398f81f18ac7d1664bb85d155e18759527a61a6261dd37e5373685d1daa27e105ae04111b537b4f900747af80bdb7fa273baa29
+DIST jdk-6u37-solaris-sparcv9.sh 12721088 SHA256 876360d8134676600f24b13421500944453331f970164bd74d5e172300a607da SHA512 78f83d39891b4cd20911e9be27deb83d63916f7b7fd8b1254a40b97f423420a92976015c1f797b504ffcc169cd083ae15ad768fac87a1bd819e69a78e50c41b8 WHIRLPOOL 64bc97017a1243cca70f29b48549648b630d4f59ee69f4f8b2ecb18ebcb9442ad7ab3d5d25b87a1d700dc9def669da60a876c5c42f5f8274cebec4cebf29e90d
+DIST jdk-6u37-solaris-x64-demos.tar.Z 71859 SHA256 2e9bb066c52de60ca3512d5f88572a0d6b5a1756d81ce824e8ddbdc6f5bd9a76 SHA512 a98ad8f8688fa7dd7b769904a781940dfb6f39f10fc05bf6315cc8da36cc27331f95b6299fdaecf80b1a4df4f421043a009a6c9b83dcb53a190bec6af16f90d1 WHIRLPOOL 75559b69685e1cb887eb51f71dfc76fc108851f71010692ef092c3da0cb2793148d387e75deed9dca963197f8f6f326bf5311d00b8e0973681b2053e99bb728e
+DIST jdk-6u37-solaris-x64.sh 8860012 SHA256 91fd4850ca3c1dca3f2f6a9528138540f2b0ae73c70ca2077afc056403fc3d62 SHA512 d1d58db111a1023da660291b00db70934c3e1de2db42e1dc56e6f173a3f486d2dd49044598eccfbe5e4bdc247955b5b23c4305bc81a183a085ed5b70b0819330 WHIRLPOOL 7f3d0b0d035135aeda88064747fc95f1bb168a8ac726a841a4b667bd2fdb2d4e2256b9295bfa565bfd4b9ca54783014fbbcd709fcdf841cdb510c7cd019a836f
 EBUILD sun-jdk-1.6.0.35-r1.ebuild 7856 SHA256 2905cdc4940c7def8f0ef80240fdacefe4e53e54d5241cf6c669f3004121e338 SHA512 9478bc820127b5875ff252e260132792d2472336892b2a3312364b0c143ddc9259b5be867afe5c98241798209555da3d93adb802559a688324fa35d0426d0db4 WHIRLPOOL 06ac4d423fbfebe9f915d4075ef6e8202c7d80bc43335e1e322e7c0be39a4fb8acc8cb3539b6a5b845c57f63bd2eceaf8306cd41559c4709b579006e4d93427d
 EBUILD sun-jdk-1.6.0.35.ebuild 12387 SHA256 4d1ec1b6936615ba1b4b3d580ad5002fd8014ab1403558e9897afe4bc21607a8 SHA512 cb1eca5d89ef6155a99e01f89553b29541895824e65231504664441167566aacdcd3062d80321ea9abb113e9526df5572f3a7d5eca2a6d821bfbc2dd3fa85bfd WHIRLPOOL 71509f900c95be099882a764afad6bb0ed262422d8e464e198df1ec8e0815894a0c2ac20f47239b06fb2e913610331d33bd4e563d25384af5eef994661df5917
-MISC ChangeLog 62082 SHA256 4019b35821dad0a5f98ccc347fa565c6d2ef8dafa50d955ad1e4e7df8fe629ea SHA512 7baf5c24f5bf5be1534811103b171b6976c40a9493435b22a8fb659c2b4c6712c17fb98e468046de00aee0d3b2531de656cd41a6b630791dddbcab3e6064149b WHIRLPOOL 8f35c950dcc14e2b55a801a4204d936009c3d794262731a5dc7bfcf2dbb428585cbe081c7bb0ec65b41c20753466def055a26f2dc0878e50f9e92ba2a155a0e9
+EBUILD sun-jdk-1.6.0.37.ebuild 7841 SHA256 7f1857de373dd511ef87cdfecaec4e569d212a234030d8bd1732e032caa8a62d SHA512 84f9f91c935840bd03f9911c079a29a12bc4616be3d73e59e05c8f05f9b567dffb31ecffbaf09be9643ac6f27dc9dd9a776252a786585ceb88bb5c55fa132648 WHIRLPOOL d9f4460c2e92dfe507dc5ba0799d12f09865ad8d40736d83f99745822e91665f7b65be1e46454e9160bbf9e95df508c33580cf1faebeea1a5e84a6687967c347
+MISC ChangeLog 62217 SHA256 e2927d4a4c8a0812d691ebd13edc2524bb35aafad9a474e38c938ffd5433ca5d SHA512 336e1eb566bec8130d9b0efde2ed2ac43d7679a80be7105be0b493c5e0cccdfde71ee0349744728ecb2335cc167ac5da9930e71af51257fd960a56c5eecd6ce4 WHIRLPOOL d5654ff9afb036ea39d60d2852ea9a6ba3f12f830de04fb59ef180a36a3807f460afaec40468da1ba2911905f1df0b27a38b5705c8975f620d95d6930d7b9f94
 MISC metadata.xml 501 SHA256 08a1a9de353c1d04f91b559372baa885fba76dc04654d2543f6c723e013b12c4 SHA512 06b541c8c2e66e1237edc1b3885416aa6ab4531b9fa3f90e258718fd654837d019fa48bcd5a1220597f2fe8a2dac5c9d48d68a2076c04e423eeaaea0638fe420 WHIRLPOOL 361a32717dee2310fb2d07522428ae6fab422a34e2e97fa1fdfb8c20210946c1611a28029de663dbc39825fcc409839a2fd3a4adb977a12c1606d54b6026ca8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQfDDvAAoJEIUJ+svaV163iDUH/iOmmfJD+m3ujLVX77veo87h
-Bqj+V9ShjYIbiAZLXPQgWOfCB6XL5zzhrqDLtFoUILUMBgfjeh0Fcunn6dWeQBDY
-dzFBF4Y8sGdyC27OF1kbsLpSxcaT/UKNPsF8DyJ4b5yYzjWnx5an9YfV5trkLzt1
-/OQG/WqREo55nowdD4M0fe2fr9rIhUgTAghtf4AKxEsrDQOANbY3xMYdew3IQENG
-MTPhw1G38Zz40c6fWLQC/IickHXpmoVk8k0zT9UMKsNezgdLuwrKHdehnGeljO4/
-nCw1wm6T3Z250+QI115CNd1QOr0tAK1cP/NqwkCQRFjFOwaScY3+f8tBLdDwodo=
-=rgOB
+iQEcBAEBCAAGBQJQfsyEAAoJEIUJ+svaV163SG0H+wcCH6YhugOyTnFdb1AQC/Bs
+yVkGMQd6gxEfBrvm4ZgERHpLAU8HASajQhabwIsp5h6jaFwAsKC8chxt3HKEErUj
+j0E2sXJWRrbc1TTFC1Y28txwaYFSLxWjm/5fqwndMJjxufoCdDEdQqrAC+qThFii
+5NYbxcfjgCdOl6HvLkNuZErJMhLI/8av4ehHxyADaVoTnkDrboJQFZ1NpU44ZCRM
+pNZr2721eIwdUe0NVODxIFggG1vnIrYq0bl9rFGDMaC7s+TXB/ZbQTL5qygWDqWg
+6nJdg02hZ0c2F02R3LBWcWPsaILphUZ0yEZyLh5gauqNveCGtJeLhSwH0elY9Gs=
+=4Jsz
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild
new file mode 100644
index 000000000000..347fa6ecb629
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2012 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.37.ebuild,v 1.1 2012/10/17 15:19:20 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk6u37-downloads-1859587.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+# for when oracle messes with us again.
+DEMOS_PV="${MY_PV}"
+DEMOS_S_PV="${S_PV}"
+
+X86_AT="jdk-${MY_PV}-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-linux-x64.bin"
+IA64_AT="jdk-${MY_PV}-linux-ia64.bin"
+SOL_X86_AT="jdk-${MY_PV}-solaris-i586.sh"
+SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.sh"
+SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.sh"
+SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.sh"
+
+X86_DEMOS="jdk-${DEMOS_PV}-linux-i586-demos.tar.gz"
+AMD64_DEMOS="jdk-${DEMOS_PV}-linux-x64-demos.tar.gz"
+IA64_DEMOS="jdk-${DEMOS_PV}-linux-ia64-demos.tar.gz"
+SOL_X86_DEMOS="jdk-${DEMOS_PV}-solaris-i586-demos.tar.Z"
+SOL_AMD64_DEMOS="jdk-${DEMOS_PV}-solaris-x64-demos.tar.Z"
+SOL_SPARC_DEMOS="jdk-${DEMOS_PV}-solaris-sparc-demos.tar.Z"
+SOL_SPARCv9_DEMOS="jdk-${DEMOS_PV}-solaris-sparcv9-demos.tar.Z"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	x86? ( ${X86_AT}
+		examples? ( ${X86_DEMOS} ) )
+	amd64? ( ${AMD64_AT}
+		examples? ( ${AMD64_DEMOS} ) )
+	ia64? ( ${IA64_AT}
+		examples? ( ${IA64_DEMOS} ) )
+	x86-solaris? ( ${SOL_X86_AT}
+		examples? ( ${SOL_X86_DEMOS} ) )
+	x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT}
+		examples? ( ${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS} ) )
+	sparc-solaris? ( ${SOL_SPARC_AT}
+		examples? ( ${SOL_SPARC_DEMOS} ) )
+	sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
+		examples? ( ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS} ) )"
+
+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 )
+	jce? ( dev-java/sun-jce-bin:1.6 )
+	kernel_SunOS? ( app-arch/unzip )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jdk${S_PV}"
+
+_set_at() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	elif use ia64; then
+		AT=${IA64_AT}
+	elif use x86-solaris; then
+		AT=${SOL_X86_AT}
+	elif use x64-solaris; then
+		AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
+	elif use sparc-solaris; then
+		AT=${SOL_SPARC_AT}
+	elif use sparc64-solaris; then
+		AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
+	fi
+}
+
+_set_demos() {
+	if use x86; then
+		DEMOS=${X86_DEMOS}
+	elif use amd64; then
+		DEMOS=${AMD64_DEMOS}
+	elif use ia64; then
+		DEMOS=${IA64_DEMOS}
+	elif use x86-solaris; then
+		DEMOS=${SOL_X86_DEMOS}
+	elif use x64-solaris; then
+		DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
+	elif use sparc-solaris; then
+		DEMOS=${SOL_SPARC_AT}
+	elif use sparc64-solaris; then
+		DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
+	fi
+}
+
+pkg_nofetch() {
+	_set_at
+	_set_demos
+
+	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 "Please download ${AT} from:"
+	einfo "${JDK_URI}"
+	einfo "and move it to ${DISTDIR}"
+
+	if use examples; then
+		einfo ""
+		einfo "Also download ${DEMOS} from:"
+		einfo "${JDK_URI}"
+		einfo "and move it to ${DISTDIR}"
+	fi
+}
+
+_sol_src_unpack() {
+	for i in ${AT}; do
+		[[ ${i} == "and" ]] && continue
+		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
+	if use examples ; then
+		for i in ${DEMOS}; do
+			[[ ${i} == "and" ]] && continue
+			use examples && unpack ${i}
+		done
+		mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} \
+			"${S}"/ || die
+	fi
+}
+
+src_unpack() {
+	_set_at
+	_set_demos
+	if use kernel_SunOS; then
+		_sol_src_unpack
+	else
+		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
+		use examples && unpack ${DEMOS}
+	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
+
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby; then
+		cp -pPR db "${ddest}" || die
+	fi
+
+	if use examples; then
+		cp -pPR "${WORKDIR}/jdk${DEMOS_S_PV}"/{demo,sample} "${ddest}" || die
+	fi
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	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 /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym /opt/sun-jce-bin-1.6.0/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
+
+	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."
+}