Version bump, bug #431492. USE=examples on amd64 has broken distfile, so no demos will be installed.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

3 files changed, 397 insertions, 16 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 1a10a235bdc7..bdd6ffacd90f 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.330 2012/08/03 13:53:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.331 2012/08/23 19:41:13 caster Exp $
+
+*sun-jdk-1.6.0.34 (23 Aug 2012)
+
+  23 Aug 2012; Vlastimil Babka <caster@gentoo.org> +sun-jdk-1.6.0.34.ebuild:
+  Version bump, bug #431492. USE=examples on amd64 has broken distfile, so no
+  demos will be installed.
 
   03 Aug 2012; Agostino Sarubbo <ago@gentoo.org> sun-jdk-1.6.0.33-r1.ebuild:
   Stable for amd64, wrt bug #421073
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index edb45bbc7e91..352aa88e106b 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX fontconfig.Gentoo.properties 10932 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1 SHA512 bd63d2e910fd22b398ef838a48d52314c241180ee3e29f5af5a8ae4021c78c693beee451e3ca3409fc7ba39d00a1433717257d0115947185288e3dab44983482 WHIRLPOOL fe29c889df02f8faea096adeb8bc4388aba8848227feff6205e440cc0b9b38c4db40c25cc9da9a676bd6ddc5bac77278cedabca6af58c15b960d31e7a3c05042
 AUX fontconfig.Gentoo.properties-r1 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX sun-jdk-1.6.env 940 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8 SHA512 43b598c7f3758c882a192c1e92b98dd659fc32c58ed24dad408b7a936ebeda44407e9a26f6042844ae8f6c5cebc1065b902e0d34df375f92c44f016f167705fd WHIRLPOOL cc5cd50a6bb3fedd944d7e04463258616bf1f2e06c533708e2a28098f4df30abcea1fc95948cd90715cfebba45238ee02d992c4ef65719b32bed0dd69cf7ae2b
@@ -19,19 +16,20 @@ DIST jdk-6u33-solaris-sparcv9-demos.tar.Z 67965 SHA256 1e947ed5240f917c42aafb52d
 DIST jdk-6u33-solaris-sparcv9.sh 12775334 SHA256 811211905119ec6282e4e97e1451b5bfd2611babeb605dcbfbc50f46885bb7bf SHA512 72e8561f1156a866642b1baa42717b68884b244352073314a74d3bbc8f6e028a5bb2d8be96981e2666226d7111d11ef1d954fadf3f71667de4ca782eccef2354 WHIRLPOOL 2d4762e918e06ede0eab9cde7da021fe4194b0f84ebd124cbbb9e5fe6d65000e172da48be524c0ee2356855a85322479686b6dfd31e5eebed8b80ffa4802257c
 DIST jdk-6u33-solaris-x64-demos.tar.Z 72813 SHA256 162105f32471eb493a2b0124d45e9df1255002be57edb4cc9c39ae5469ceb261 SHA512 a8e7bcdab50a677868c74a97aa40d7ffc71754532da426f167a5d38920086c0d81eb8b830be52ad719413ad5f83a2baa8617c16dbcc959fcb6d688fe2914f38c WHIRLPOOL 152e6617388bb0283f9f19a1e1cb2cc78b3ce90a27e123549233a6b419481648709dc753541cefb85d3ddcafde1bea570bc09a9fd5e3d58f6ee7f02645b1a283
 DIST jdk-6u33-solaris-x64.sh 8853398 SHA256 de96b05ebd9bd0008ad57277e70323c00c354a43cf6ba50d67d91323e3ca0e55 SHA512 850511516e1aec4e7afdfbd4d211779b97b6fd2f4dcfb23be6e9ed5551015a222d04fcd0aa6418fe0f966ea56d40d83c7473c7dbf47478ed346985e9bd0cf02c WHIRLPOOL 540e4b53114efc9c58a524db5650b8e9ad699c2bb890eb30689d4c156e66703cfad5f514350ac3f066ff689f81a9c93ca0fc907b156120f9871a5263a9a9d266
+DIST jdk-6u34-linux-i586-demos.tar.gz 12074821 SHA256 4da9460638afb9cb6ae1e48417b36a297feb455a01b9baf839cd815bca6fc2e6 SHA512 001a3b3f2cfbb963979505f4842f7796d4a1f09e6b3b9fd637f449b8b959f0ffa14a95b42a1a879c573b825e3c2d8e4e62a13b8db8c6879d1eb51f6eafdb0dad WHIRLPOOL 24e460a863a0b599deef0e0e65fd9f4ce100e7a35df614521ea4e85cf2fdda04517571a119e0687fd3a04105e07361044a0ae925a89dbd20f276294cabed5afe
+DIST jdk-6u34-linux-i586.bin 71755291 SHA256 dbdcafbb008c6585dad2ad8cb82de8b8b9d65e1da7250f1b1efd7094190c81cf SHA512 87f0f2df826d26cdc6462b0769b334f2e0b62d9c69963f03c98e501add15b7a159948aa2c959dc728c9bcfcfc76934ec48e78e55a48fa61727fc398ffefd5073 WHIRLPOOL 76dee0ab4c29b4a7b74fcb7c693574ec33dddf610d41a245e35dcef10d6e51a1216394b4872dfe9c4fbb655bb24fa31744048a8b91ec164c9792248f99252d84
+DIST jdk-6u34-linux-x64.bin 72036348 SHA256 126643eb2813b8e615dcea8ed7c710cf5f9827003ad38e06024c178a8b2b0229 SHA512 d372ed0ed8ef5427bae57ea7a3f1aca126aedff84899266fb12dbfb172233720cb1efde16b1d2d23269ebfd2ecdf2acdfdd454224c488cd04b9afe20e620731e WHIRLPOOL 41b241f5e86e95dd37015719df2260971dd5ce34b69596ba55ec0f2e43fa6191f2b00f5e10d7495d0fd90fa06c482095b9312f87bafc33978aeadc3eaa214781
+DIST jdk-6u34-solaris-i586-demos.tar.Z 17940319 SHA256 41901e3a9e47a3f5539dea121d22f9b8282a469b90ed719c0e989adfe2cffac2 SHA512 5d6740899d341655bccf4846ec2be63b782ceef005b263ae7d05ba82b7905c167a66e26aefce500a14d73b33ffaba80277c2b69390cc2f42a16ea01e246d2ca1 WHIRLPOOL 03f974eda73ea6359b6b044356e67cb4230fcab66d7d2a33e534e889e923a4233ec3fee8b285cbe20656ec39fb5d668098bd881c87d0b8eaa7f052f5b4e46863
+DIST jdk-6u34-solaris-i586.sh 71659586 SHA256 863b4ddc634af5195ec74b6d262d40aeb0c0065deda223ed03419e159da0a95c SHA512 ff741871a791d439d345ff0bd51385e57ac48d3fc122ffa5754b0ce4a3e76775deac0edabd365c85bb176a6e4f560b7f63c85c4c66a68099c55676aab0eed0cb WHIRLPOOL 02d5db76f7578cc7a8b866527a4a00020efac113dca94fce16adbbadf0827d9654f238a3de923b64e016a351746fe5294886db68cdeac5bc82b646b1ba791082
+DIST jdk-6u34-solaris-sparc-demos.tar.Z 17941087 SHA256 67eeed36136e9bb238c17136dffcd221275144d468b450e0264e2ca09e90e0cf SHA512 994291ab5133f53384d7bffcdfab9da52d0dc2d7989f1d6c76902d550a8935a1ee1c8952f8ee40420dbb069e0f3fd4962710346082bb4d26b8ab8e4085f44749 WHIRLPOOL 5a1991299405aa37c8cbe2afe1a05a6e094e98feafd6b2e4b8d585f76e734a6cb388b702a368ec05e81099b0e5c0fb59be0d3282ddec69ceeb8fe8b8234c0069
+DIST jdk-6u34-solaris-sparc.sh 76861470 SHA256 37782a5771ee55c852c8ef0cc68c94b7db21ba3204adf2462c7f175c9b40a26d SHA512 881e01625d091e493d9180576fa78c096b423183bd36df4cbcfecf688f106928aadb778e6169f332b3ab79736f932858ef79cdee98146a0d9b4781a88945ac80 WHIRLPOOL e2216e8210b690d6b02aeb45069f918014f0e331b695c330181afc2da426aa5020e65d258f1845694e879ce964a99d1b661b2e2dd6d8470bee5113549085e1be
+DIST jdk-6u34-solaris-sparcv9-demos.tar.Z 66549 SHA256 efdb5e27bae008a9f587b557c5a341f8746d24298cf1775c9f086565832fe331 SHA512 9177d54f45452a0a1c509b55c2bd4a2cf5c2d40d354982f679019d7cf162ceb0ece219e72216d622df0d99d8d636fc7da40cc497393039eb93a63189db235689 WHIRLPOOL 394b5986797bef82d148afe412a4decb3297d5c9f9479870f3f48d0bf3b9f153ade2bd784ff1e9c1bef54140247b7a83620a37ee8ca3cb86bf60ac6b94ee6e06
+DIST jdk-6u34-solaris-sparcv9.sh 12775208 SHA256 35e2b54a5ea18b9a4ad11f709aca529a55cb84143747566146b0237fcdc15766 SHA512 7c84d94818c0e173c7c931847fc44ac5abd2eede5277f252ec7f1c40c4f5f6f92670dad1059f44d6bac78aec409176c4d225a200b0cf5c34363d017fb0126722 WHIRLPOOL 0e1168933a412b45f7277502ce2c986be31ce682d043e7337fb42faa5d975080c8e8dbc29d4d13dcb5cf469a35319d0060e78120a14d2b1a4e61ea6805c9ba4c
+DIST jdk-6u34-solaris-x64-demos.tar.Z 71869 SHA256 7f930f5694d9fd2cb98e9578abf6a2cbd4179ba819ea9eeb2b0ea50bcf382fd9 SHA512 ed0039170c4852fe43d81b36c53118866e27ffec72ddefc825274505403306b03194c1e13e529cfb2e5027d524ac521083918cbd82b78e7508077745353cb8ca WHIRLPOOL e7ec5ff1ff5b166f2cace26b43a3b51295c3259faca1c55d65447d36970531cbbb7b2d443435d56264c12f6c42ef0f42a8ba4030c51763d1f0e425402ed1dca2
+DIST jdk-6u34-solaris-x64.sh 8853420 SHA256 c8ec1507b061ead492f97d6ce9d42b25d967968b7c4a40dfca304acc6605300b SHA512 862aba416abe5ccecb28e6dbc4a9c0c8bb51f2ddfd6f5804d4ba89ff7dca46ffc35538fe17b9385f1ce739dc2dd7e69c73616260529162807b1746bdfe4afe04 WHIRLPOOL 839b5820e1b9b3ba4dfd5fc4b651a78529878722417fec5b890a5be8b221b6a9f1a1fd13503d2fd2f6513032563db49802dc5f94ed66c24aa0e0d5afe6ce880e
 EBUILD sun-jdk-1.6.0.33-r1.ebuild 11623 SHA256 04f8cfbddc0171b824a282ae83fed96c8492eb45ae779a41897845cfc309a683 SHA512 967646fe4600bdac143fce9f871b2bb0c8fb8c1bf41e38d1956ce0bbe30706d1e5d8b209825ed4c09276a9b647815eb056add59607bbfe410150bf6c060abd04 WHIRLPOOL fcb21a46a310594daa2b9845df2a81d460b25ccb77b4940dd878b03ed2ac3af1ca8a115d9d964428c55e1b29f4e08d9a03fe0b003aa3b9cc50dbc854aafce7de
 EBUILD sun-jdk-1.6.0.33-r2.ebuild 11923 SHA256 2e429bc65fda0962d34e200b1726ebe62fbb9995be5f942bf420cdaa3e3aa967 SHA512 d803eae305da4be87f48021987ec210ae853343d95bfc8b175e7827d77933aef8f8ed044fe3f1dc7ecfd398856348d468e78e5753b050a55b42b4a883ce39402 WHIRLPOOL a9f28d73e7d70052db76ff521c039df1fa1e48097215822a30f007d21a719c2d176b619b80e2409c96ff52b0f868cb10c68864413b2597778853a81d60074493
 EBUILD sun-jdk-1.6.0.33.ebuild 11623 SHA256 a4d3760526e8f2ab6adee30bafb6c4317176dd9681b1287bd5a15c9b6afeff26 SHA512 2da8e287931ff5010533fcd9528aa8ad2d2ed375d020637f066f8b045a19e0430becc19c66e10ea3427bae5c825af05694d6d1c0dfb11b98d7e601b5a025fb88 WHIRLPOOL bc3bca23bf54dd71739e7cbc134cc0fde2293dbacf8f3af256ce65c935436f4d8b05c40d62f32d1e1412589d9b5be77f72305f5d0ba2a4fc207956c781b45a64
-MISC ChangeLog 60696 SHA256 0520e60ee273b9361a3128b62825ae1a18ba0d0a412f06b7ce6b42f488fa8f5b SHA512 85edee003e8a771987bf1ba6cdce618a274c4e55fb27c5613e0e12e3de133d9a0dd1adf6c491d29c0ace52fddb2f02dff7638ced3a6d5d90a8edc5ecd1d4fcbe WHIRLPOOL 812a33bca7b4f836939abc3cfbd8971a91789582f559b203670094d822ac57ddda017a1e52fac15c81e5c3ce13a9443b96cb52aa447bbabfd50c3243ea7f91fd
+EBUILD sun-jdk-1.6.0.34.ebuild 12245 SHA256 1e0ad47755660b149d412e9d4ea76fe078e7516003fb05a1db8338d0e8480fb5 SHA512 6ec2e19eb9b0787166efbabd33c799cc84967a07db5fb24b583bd46dccef251c84e54e4a0a1436aa32b5d5f75fcce41c47da9c10e25752531fc1bcb918d8b6ec WHIRLPOOL 2b26390eab49524e077095d5d4d33266191e68e4fb6b9f71b10ef93d0b1da49f03625fc69f05624cbd3ccab9a6c494db7dd50f1133aab6ad08c3d40634399aae
+MISC ChangeLog 60915 SHA256 953362cf2f18a9122d13f6da146339894421405d196af4833657cf6f2fb44092 SHA512 a6521096b16409434f91eaba342a315f2bdc03bace78c82bd1a9e94bfdc05c77b39975f085da7b8175b923ebe7c038a06eccada080f8e2dcc365bfe79e543b85 WHIRLPOOL 1704ce80ace689b2fdea59fe2afd9ae205a1771c038514e2172d7d718fbfc8ce7de9f7680ca079485590422a7192e76c2010e603605cbf7291455895b6333c0a
 MISC metadata.xml 501 SHA256 08a1a9de353c1d04f91b559372baa885fba76dc04654d2543f6c723e013b12c4 SHA512 06b541c8c2e66e1237edc1b3885416aa6ab4531b9fa3f90e258718fd654837d019fa48bcd5a1220597f2fe8a2dac5c9d48d68a2076c04e423eeaaea0638fe420 WHIRLPOOL 361a32717dee2310fb2d07522428ae6fab422a34e2e97fa1fdfb8c20210946c1611a28029de663dbc39825fcc409839a2fd3a4adb977a12c1606d54b6026ca8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCgAGBQJQG9ffAAoJEOTDgjZ80txd+FYH/RvOVYfTQApLbsCowZsqT7yL
-n6DIiF3UO2AspUml0TGouby4D9oBtAgkPp413NUQsd9vzdVNiXbIRIOwA67JfcSW
-08ENZihiP7LGi/fsAQ61ONid572WL4bDPq2r7+9oRKS2os4wwkDg56QBKjy/etbk
-rMNnSxYbx9qr7BgJG6O8o9EsIRWWBqYyzeshIyyYFD4YUM7xQe9M9uRUP452zI87
-ZsRQl+3oExYjUanGBYsLfvPWAhj6ednxQTLHurs/WiHgpQfFbfZK9lxRHhpZLylS
-D4AHTKkUYBNgbuWUF3HGCfe2o0kFvjBJMUU2rNgh2G7FyW2qWm+nHhgRQuuqWJk=
-=8Zzp
------END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild
new file mode 100644
index 000000000000..695d594e69c2
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild
@@ -0,0 +1,377 @@
+# 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.34.ebuild,v 1.1 2012/08/23 19:41:13 caster 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/jdk6-downloads-1637591.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+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-${MY_PV}-linux-i586-demos.tar.gz"
+AMD64_DEMOS="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+#IA64_DEMOS="jdk-${MY_PV}-linux-ia64-demos.tar.gz"
+SOL_X86_DEMOS="jdk-${MY_PV}-solaris-i586-demos.tar.Z"
+SOL_AMD64_DEMOS="jdk-${MY_PV}-solaris-x64-demos.tar.Z"
+SOL_SPARC_DEMOS="jdk-${MY_PV}-solaris-sparc-demos.tar.Z"
+SOL_SPARCv9_DEMOS="jdk-${MY_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} )
+	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} ) )"
+#		examples? ( ${AMD64_DEMOS} ) )
+#	ia64? ( ${IA64_AT}
+#		examples? ( ${IA64_DEMOS} ) )
+
+LICENSE="Oracle-BCLA-JavaSE"
+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"
+
+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() {
+	[[ ${PV} != 1.6.0.34 ]] && die "Check if amd64 examples distfile is available again before bumping. Chang SRC_URI and 'use examples' in src_{unpack,install}."
+	_set_at
+	_set_demos
+	if use kernel_SunOS; then
+		_sol_src_unpack
+	else
+		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
+		use examples && ! use amd64 && 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
+		if use amd64; then
+			ewarn "examples are not available in this version for amd64 due to upstream error (zero-byte distfile)"
+		else
+			cp -pPR demo sample "${ddest}" || die
+		fi
+	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}.png#" \
+		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
+}
+
+QA_TEXTRELS_x86="
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/motif21/libmawt.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+QA_FLAGS_IGNORED="
+	/opt/${P}/bin/appletviewer
+	/opt/${P}/bin/apt
+	/opt/${P}/bin/extcheck
+	/opt/${P}/bin/idlj
+	/opt/${P}/bin/jar
+	/opt/${P}/bin/jarsigner
+	/opt/${P}/bin/java
+	/opt/${P}/bin/javac
+	/opt/${P}/bin/javadoc
+	/opt/${P}/bin/javah
+	/opt/${P}/bin/javap
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/jconsole
+	/opt/${P}/bin/jdb
+	/opt/${P}/bin/jhat
+	/opt/${P}/bin/jinfo
+	/opt/${P}/bin/jmap
+	/opt/${P}/bin/jps
+	/opt/${P}/bin/jrunscript
+	/opt/${P}/bin/jsadebugd
+	/opt/${P}/bin/jstack
+	/opt/${P}/bin/jstat
+	/opt/${P}/bin/jstatd
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/native2ascii
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/rmic
+	/opt/${P}/bin/rmid
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/schemagen
+	/opt/${P}/bin/serialver
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/unpack200
+	/opt/${P}/bin/wsgen
+	/opt/${P}/bin/wsimport
+	/opt/${P}/bin/xjc
+	/opt/${P}/demo/jvmti/gctest/lib/libgctest.so
+	/opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so
+	/opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so
+	/opt/${P}/demo/jvmti/minst/lib/libminst.so
+	/opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so
+	/opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so
+	/opt/${P}/demo/jvmti/waiters/lib/libwaiters.so
+	/opt/${P}/jre/bin/java
+	/opt/${P}/jre/bin/java_vm
+	/opt/${P}/jre/bin/javaws
+	/opt/${P}/jre/bin/keytool
+	/opt/${P}/jre/bin/orbd
+	/opt/${P}/jre/bin/pack200
+	/opt/${P}/jre/bin/policytool
+	/opt/${P}/jre/bin/rmid
+	/opt/${P}/jre/bin/rmiregistry
+	/opt/${P}/jre/bin/servertool
+	/opt/${P}/jre/bin/tnameserv
+	/opt/${P}/jre/bin/unpack200
+	/opt/${P}/jre/lib/jexec
+	/opt/${P}/lib/jexec
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so"
+for java_system_arch in amd64 i386; do
+	QA_FLAGS_IGNORED+="
+		/opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
+		/opt/${P}/jre/lib/${java_system_arch}/libattach.so
+		/opt/${P}/jre/lib/${java_system_arch}/libawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libcmm.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
+		/opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
+		/opt/${P}/jre/lib/${java_system_arch}/libhprof.so
+		/opt/${P}/jre/lib/${java_system_arch}/libinstrument.so
+		/opt/${P}/jre/lib/${java_system_arch}/libioser12.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsig.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsound.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnet.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnio.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpt.so
+		/opt/${P}/jre/lib/${java_system_arch}/librmi.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
+		/opt/${P}/jre/lib/${java_system_arch}/libunpack.so
+		/opt/${P}/jre/lib/${java_system_arch}/libverify.so
+		/opt/${P}/jre/lib/${java_system_arch}/libzip.so
+		/opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
+		/opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so"
+done