Demos now available for 6u35. #431492 #434990

Add back ia64 and examples for amd64.
Add BSD to licenses for examples.
Use QA_PREBUILT instead of individual variables.
Fix desktop files for newer standard.
Add elog about the name change to oracle-jdk-bin for JDK7.

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

3 files changed, 297 insertions, 9 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 0b579d6d8504..eb22d0fc5eed 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,16 @@
 # 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.337 2012/10/15 10:23:42 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.338 2012/10/15 15:51:00 sera Exp $
+
+*sun-jdk-1.6.0.35-r1 (15 Oct 2012)
+
+  15 Oct 2012; Ralph Sennhauser <sera@gentoo.org> +sun-jdk-1.6.0.35-r1.ebuild:
+  Demos now available for 6u35. #431492 #434990
+  Add back ia64 and examples for amd64.
+  Add BSD to licenses for examples.
+  Use QA_PREBUILT instead of individual variables.
+  Fix desktop files for newer standard.
+  Add elog about the name change to oracle-jdk-bin for JDK7.
 
   15 Oct 2012; Ralph Sennhauser <sera@gentoo.org> -sun-jdk-1.6.0.33.ebuild,
   -sun-jdk-1.6.0.33-r1.ebuild, -sun-jdk-1.6.0.33-r2.ebuild,
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index b5a4620513e3..92d9e11fb1e9 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -10,23 +10,32 @@ DIST jdk-6u34-solaris-i586-demos.tar.Z 17940319 SHA256 41901e3a9e47a3f5539dea121
 DIST jdk-6u34-solaris-sparc-demos.tar.Z 17941087 SHA256 67eeed36136e9bb238c17136dffcd221275144d468b450e0264e2ca09e90e0cf SHA512 994291ab5133f53384d7bffcdfab9da52d0dc2d7989f1d6c76902d550a8935a1ee1c8952f8ee40420dbb069e0f3fd4962710346082bb4d26b8ab8e4085f44749 WHIRLPOOL 5a1991299405aa37c8cbe2afe1a05a6e094e98feafd6b2e4b8d585f76e734a6cb388b702a368ec05e81099b0e5c0fb59be0d3282ddec69ceeb8fe8b8234c0069
 DIST jdk-6u34-solaris-sparcv9-demos.tar.Z 66549 SHA256 efdb5e27bae008a9f587b557c5a341f8746d24298cf1775c9f086565832fe331 SHA512 9177d54f45452a0a1c509b55c2bd4a2cf5c2d40d354982f679019d7cf162ceb0ece219e72216d622df0d99d8d636fc7da40cc497393039eb93a63189db235689 WHIRLPOOL 394b5986797bef82d148afe412a4decb3297d5c9f9479870f3f48d0bf3b9f153ade2bd784ff1e9c1bef54140247b7a83620a37ee8ca3cb86bf60ac6b94ee6e06
 DIST jdk-6u34-solaris-x64-demos.tar.Z 71869 SHA256 7f930f5694d9fd2cb98e9578abf6a2cbd4179ba819ea9eeb2b0ea50bcf382fd9 SHA512 ed0039170c4852fe43d81b36c53118866e27ffec72ddefc825274505403306b03194c1e13e529cfb2e5027d524ac521083918cbd82b78e7508077745353cb8ca WHIRLPOOL e7ec5ff1ff5b166f2cace26b43a3b51295c3259faca1c55d65447d36970531cbbb7b2d443435d56264c12f6c42ef0f42a8ba4030c51763d1f0e425402ed1dca2
+DIST jdk-6u35-linux-i586-demos.tar.gz 12073677 SHA256 d2889e744b5dcf4b1d482fbd66a982ec188d2e59a5c0fe1f20c688e5c9c68088 SHA512 8d77094f85196b7d0c14f0f234a7d16371f1424a26ba476ff5c47ef226d31636929169ac53133c73a9878bc50452083dfdc126648110798ebe589fa25316963c WHIRLPOOL 00823609891669e8768fac1035552e7efbdce70c4432c131567e35243104f579844133412e92f486d44bb9591a28dac0b043bf08656c90a60722b440a106ddd4
 DIST jdk-6u35-linux-i586.bin 71758261 SHA256 72814cf0e87dd1e6ea65f5f2827515dc43ea97256f5c7af3cca9d86555403fbb SHA512 b53115c5422dc63ebdd9a9dda06ce0f03105777a4f7bd1c184e8a07b1f7e8d9a791e56408018e12314f0ba29bc45068ac1581342af4ce62487e8a15be9a12489 WHIRLPOOL a05d419eefdf1af5241379c7769e34de8e8ba2640148c4b9433abb4cab305d082b407c25cb13f1e49df7d7675140cc18d83504094fdb65c2192a2264f0be6fbe
+DIST jdk-6u35-linux-ia64-demos.tar.gz 6858569 SHA256 478416f73273181539d5863071237a4d3b6331dafbe83a1b3d3d77fd72908969 SHA512 308f7a35509b370e15083ed39157196ca7b25584944ca7effe0a504961ea3e828d08d6ea7ef3999d823a581e4dd9a9484efbb000f3ea2fda5b1246213ad3267a WHIRLPOOL 8bb4b68e7e4b15f36e3c1d5e3a28b57c69b0fe7b59a090a95ffd81b4ffa399180c57aacf6f31e2c7e43fa5a18dbb17daf6775ce79d06a3e7115372d30accf5c9
+DIST jdk-6u35-linux-ia64.bin 63594259 SHA256 62b53a97b76cf14b0ce669889dd7f4b6094447116ad3fbafd1685e767ab5cc30 SHA512 71bc1b5826b5c1e3b4e92e63d6107f163b8f8fd3b473441f9d36bc6823853ea5d9617dbc1477b59dec33f199a0add51df3591520b14b9a6f4347cc3c550b5592 WHIRLPOOL ac36df7fd7028b2f43436cd07d93006708339b7432ed906c4726061a3d790bb8f1251fe2dc59cfeadb7c12d906ec9b6c9304e02c56327709a0f0e35c30bdc956
+DIST jdk-6u35-linux-x64-demos.tar.gz 12104450 SHA256 5144d91f589af03e20085fa3f801654a27a2e9555b01f1ccb3594c86402ef56f SHA512 516aa2fa887cffca497ea1f75b88a01e8f48aca3711f799a2bc74b8090b7720580cce9d07d4a92677180df15a313990266c5bac54411187f8ff57948ac0f9303 WHIRLPOOL ef8427a3381450788340d5b79edf939c659a421c17eb859ddd81197862b33bf29430f39e535271826f8ecb36fb06241f6757e35b83c05734c0448a1f924080fb
 DIST jdk-6u35-linux-x64.bin 72039455 SHA256 01dd8c70866ffd6351987bf7cb2331f077539f84d24a9c4581f230be5422a6bb SHA512 9476916a89c8e48b40933b30c345168d090697b999e505477d00d193ff1349b6c4307264bbab8d77ba4e3d13bcbf2b8d132d6800856eeb943e2b4ff7df090ef9 WHIRLPOOL 5378be4bbabb7aff118ecdb09933e84c11ae00236d9acda98d4a31c463de42536f26a61ea2f0d6f215ea5db03e314a17f17c9217eae7964d750c253dbcddfd62
+DIST jdk-6u35-solaris-i586-demos.tar.Z 17939571 SHA256 f7d512fe76b54ef2b231a92f9a859ecc29bc916ce290e6e30ef95290a36f1265 SHA512 ca79f0be6fc8886a21701808e4be6552aa78fae943598d47554bc12748735ac4750ad0400034418fab62481fd56e1225c0e1c352a1a0fe6ec059c36d1b241948 WHIRLPOOL 14089ff8bc7ec5f1a8ce49889e6c1c53e38408dc799486bf0988aa0730c5129bddb5b675f29401d1b2c9ee2769f872804924e09a3b5efe2efffdeabf6fa37ea4
 DIST jdk-6u35-solaris-i586.sh 71663533 SHA256 0db7d3bd48ae3707a94cefd1fbd3324f79c49ed9beeca21abfd40c8f0959fd69 SHA512 6f696ea49fd249e2999a9b5d0edb88838a0b5a452f96aa30a89cc0b03cf0209c1fd368c60753b606c7c2dedcd8b97e468b690e5df50002e31982c0dca9539744 WHIRLPOOL 28617d6c460e21a3f30313522b8fc645fb7dee5fc41ce1f4efcd13270b21271007f9823f60fed1ce6c47204be025c831f48d4acbdd0b1549c647d14fbf5dcc11
+DIST jdk-6u35-solaris-sparc-demos.tar.Z 17944919 SHA256 9450d576d0db56276877516bf2af49cde398bb26632750d3703066d9af780832 SHA512 6ac7e05e164210e8684b310c50a63ab35878ff387423a0d8ecc36c755707b241745e9ca202ce931638621a3194df2d2bd49215b10fb8797bf5fb40836c760dd3 WHIRLPOOL 7fcb0c890fc2055463ae115aa11ee85c4de172b439296d98f0c0fbb47944fb1156f2af641e059bbf2a300d895f5283f92c3d213a39bbb5251edb7f6608572e2c
 DIST jdk-6u35-solaris-sparc.sh 76895525 SHA256 6caeb062473e57ecfac83245e73706286285b8d5224dfda0bdef66dbd3314bab SHA512 e71a2a22b3316bb39538f130a3393cac4ad664b91ab50633028d1f9c1c610e02c6111c57cca7413f6c4fb6611986f00ec2a4d7f74589bea20f3e17a9ae063daf WHIRLPOOL b3f22d67f4719a18c1c02a7b3ebe786b39eb5201e6dcf261ac8b207bce2d85db0a0f5b95f37236881decdec04b6e52354c432b0f947dfdbd6df14c7ad39ae36f
+DIST jdk-6u35-solaris-sparcv9-demos.tar.Z 66629 SHA256 566ca5ee4d4215823cc11fdcc0ce19be1d42f0bfb8577083c7b138ad3942231a SHA512 62dd99ca2003391d1610fe86d4d34f90a8c130bb27a25001d34dee3569b0e8939e7dc6340691a64869c478a1baac5187dd0a974172bdfcc347df358f17c965ab WHIRLPOOL b78625d150f2f1d46683d0a2ca34ff26ead14d86e1bdbf31a9f01b99f839b2d2759e8ff98e4ec15ea18f0774601d1ee5d9ad01a104b2052aa64c3a483bac8597
 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
+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 61690 SHA256 2c39a0560f324183d8c5545fe4bfa79af550b65aabb90797a6d9c4e71f60ffa5 SHA512 c3abbc081510f17fcec48724089012433d6f6bc2d6b22bf35bb49daf7786413a501c8e4a4af7be3f71f834791743ffcb41703c0842747af3bc267392e5939073 WHIRLPOOL 16b44f84ec2517e632655f741bf32b862f1da2137b7a049aea944fbaab2bbcd24d1b681a9cb0ddfbc921b02ebff962fb503d2fd0c4280a68c45da462d80ed671
+MISC ChangeLog 62082 SHA256 4019b35821dad0a5f98ccc347fa565c6d2ef8dafa50d955ad1e4e7df8fe629ea SHA512 7baf5c24f5bf5be1534811103b171b6976c40a9493435b22a8fb659c2b4c6712c17fb98e468046de00aee0d3b2531de656cd41a6b630791dddbcab3e6064149b WHIRLPOOL 8f35c950dcc14e2b55a801a4204d936009c3d794262731a5dc7bfcf2dbb428585cbe081c7bb0ec65b41c20753466def055a26f2dc0878e50f9e92ba2a155a0e9
 MISC metadata.xml 501 SHA256 08a1a9de353c1d04f91b559372baa885fba76dc04654d2543f6c723e013b12c4 SHA512 06b541c8c2e66e1237edc1b3885416aa6ab4531b9fa3f90e258718fd654837d019fa48bcd5a1220597f2fe8a2dac5c9d48d68a2076c04e423eeaaea0638fe420 WHIRLPOOL 361a32717dee2310fb2d07522428ae6fab422a34e2e97fa1fdfb8c20210946c1611a28029de663dbc39825fcc409839a2fd3a4adb977a12c1606d54b6026ca8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQe+Q5AAoJEIUJ+svaV1631hEIALHorJls71XhcRx+mxh1/WcU
-fsglVTGrwF4w+4ZIlym5n99KTTndVNp/xQrxQ8X8p/+SFrgGqjxlH0KhEw3UAXQY
-ZOMPXE8jEfANZ/aFvR8/PLBslVjdZyIfuLk3WJYc4uTfLSMjzAKuwRR+cfsK3Cch
-OqwNWfb3EICjzU3mkBibfJ1FyL9d9jtq8Pw7LdjbegeVRH6HFSf2F7uAr0rnwNr0
-KDTBNQK+gQHVz/olvcBS8TSguRRcqRmLqb6MIFPtsJck4zNZSi5AbywkVMm3l/Wp
-j7GSYZYcqI36YSgTgcmitYo+AinvLQG02pwipARhUG6F4TeQ5AtSOpDHa45kcBw=
-=Rxeo
+iQEcBAEBCAAGBQJQfDDvAAoJEIUJ+svaV163iDUH/iOmmfJD+m3ujLVX77veo87h
+Bqj+V9ShjYIbiAZLXPQgWOfCB6XL5zzhrqDLtFoUILUMBgfjeh0Fcunn6dWeQBDY
+dzFBF4Y8sGdyC27OF1kbsLpSxcaT/UKNPsF8DyJ4b5yYzjWnx5an9YfV5trkLzt1
+/OQG/WqREo55nowdD4M0fe2fr9rIhUgTAghtf4AKxEsrDQOANbY3xMYdew3IQENG
+MTPhw1G38Zz40c6fWLQC/IickHXpmoVk8k0zT9UMKsNezgdLuwrKHdehnGeljO4/
+nCw1wm6T3Z250+QI115CNd1QOr0tAK1cP/NqwkCQRFjFOwaScY3+f8tBLdDwodo=
+=rgOB
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.35-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.35-r1.ebuild
new file mode 100644
index 000000000000..cc014ce0e81c
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.35-r1.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.35-r1.ebuild,v 1.1 2012/10/15 15:51:00 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/jdk6u35-downloads-1836443.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 && ! use amd64; 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 JDK7 emerge oracle-jdk-bin instead."
+}