Security bump. #404071

Use relative path for desktop file icon. #403139
Make installation of src.zip optional as for other JDKs.
dev-java/sun-jce-bin is build only dependency.
Add ia64 tarball. Don't file keyword requests just yet. Might disapear again,
not (yet?) available for java 7.
Remove vulnerable, except current stable.

Package-Manager: portage-2.1.10.45/cvs/Linux x86_64

5 files changed, 62 insertions, 224 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index cfeef6720fdb..f8fc21b6142e 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,18 @@
 # 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.316 2012/01/20 10:20:12 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.317 2012/02/16 10:43:38 sera Exp $
+
+*sun-jdk-1.6.0.31 (16 Feb 2012)
+
+  16 Feb 2012; Ralph Sennhauser <sera@gentoo.org> -sun-jdk-1.6.0.29-r1.ebuild,
+  -sun-jdk-1.6.0.30.ebuild, +sun-jdk-1.6.0.31.ebuild, metadata.xml:
+  Security bump. #404071
+  Use relative path for desktop file icon. #403139
+  Make installation of src.zip optional as for other JDKs.
+  dev-java/sun-jce-bin is build only dependency.
+  Add ia64 tarball. Don't file keyword requests just yet. Might disapear again,
+  not (yet?) available for java 7.
+  Remove vulnerable, except current stable.
 
 *sun-jdk-1.6.0.30 (20 Jan 2012)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index de939e3442af..8dbcad246bcd 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -7,29 +7,24 @@ AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 352
 AUX sun-jdk-1.6.env-r1 1015 RMD160 07a5d39da299dd2d6e7165e9b32fe00c30e5b4c3 SHA1 2f1426a0d5a18fbbd53b81a8df94c7b64d05d911 SHA256 31302b5ed417a294ecc9c475a08aca331a07c59d2c095978a574a7347aa12f6a
 DIST jdk-6u29-linux-i586.bin 85146345 RMD160 fca7a51bf14486a81a684c91152493e8af621647 SHA1 a73580ed8ac42040f1bbcab62617719a31c6f487 SHA256 1117f4dfc45632b68ec0f4d5e61e5cafc1d85dc655ee3df5fa6f50128b8c3faf
 DIST jdk-6u29-linux-x64.bin 85411605 RMD160 7bb1433728c9d263bfe9d968595aac7d73e6c2f3 SHA1 45286e11864285c0d9d5cafd0355dbe04d272951 SHA256 a8603fa62045ce2164b26f7c04859cd548ffe0e33bfc979d9fa73df42e3b3365
-DIST jdk-6u29-solaris-i586.sh 85022791 RMD160 88595026cad4f10156c90e3df03771218ebdd4b3 SHA1 5691e34e4d26ca53f80f775359c1bced3fe9d60d SHA256 95472eb265685bfacb9cbf6a5503fc00caed7f24ef133755b74c4da109d8cede
-DIST jdk-6u29-solaris-sparc.sh 90224612 RMD160 998ec8a2bd8f2606e45f21cb7d08ab0fa4feff12 SHA1 887dc14e330832c80083c16b6550abd3304486bb SHA256 975976e41c7f92cc2945398c780282ede345a44eb079a244892dd440e601df06
-DIST jdk-6u29-solaris-sparcv9.sh 12832683 RMD160 6df1203c8b92ac0d652afe4e7bf6556bbfbf0562 SHA1 d73f3858dbf3076f8151a46c1b065e613e9f0e11 SHA256 de42908a88e0dfcda66bb2c66e1e82feeb278a5d5a74e8a71b634883c6ad7379
-DIST jdk-6u29-solaris-x64.sh 8909539 RMD160 a7ecfac24fee9139a9c5113d928625933f63ec82 SHA1 a6332aead99377f2492c8330fdc9daf923a93054 SHA256 37595a803e571056350f7c0b326cf8005e5c6e1eb9d8726d6afac46f9d140973
-DIST jdk-6u30-linux-i586.bin 85282052 RMD160 c150f624dcefcb666594eea4b62ce8fa7f4ae4e6 SHA1 f05e12dcc5128af264f26695e861ea86427464d4 SHA256 b551be83a690bc9fec0107d9aa4f828cd47e150fa54cbedbfa8f80c99e2f18b5
-DIST jdk-6u30-linux-x64.bin 85570714 RMD160 2e7aa2796c7c798c4602bb95c0d776a59c618ae9 SHA1 6ff68d74a108718ce4012e9d41b0e9bafdad7067 SHA256 928220f4e46c5dabef0440791c48023945629d8a23998e072157e04960d8a759
-DIST jdk-6u30-solaris-i586.sh 85158600 RMD160 b5366802d39e9d0b23facc60e03e82e909140ee7 SHA1 fd49db8ba608e256e9ed457d4fe0935589706544 SHA256 b63c192dc580d08911ba466f5e19673f512178a7158f44946fc982062064eb69
-DIST jdk-6u30-solaris-sparc.sh 90368229 RMD160 d33ea028c5a12ed1cc16cec3f911548dd403efa3 SHA1 f0d9bc2db3c11966391ae6eb0143a3dee84a1ae2 SHA256 f2fdb58029a7b592c571431e2b5649173488f3e0eaf9df6b796f3596556b9586
-DIST jdk-6u30-solaris-sparcv9.sh 12835286 RMD160 51a7fd247d96b4d9d4af6aa4440a97e58d0ef3a0 SHA1 ea0e9acb90d9e5f3eff5745e4c14eab99d84b791 SHA256 ec4a9e25c83853cbc579e6127b657301c4a937a8872317339c116a7605813cc0
-DIST jdk-6u30-solaris-x64.sh 8911544 RMD160 e9b9a97d3a8a95000c2a7b6e1c26c5237d9b246e SHA1 7ed8e660b705cd8aa06f12677cfa52c0d197441f SHA256 bf51af22389868bd250990f682b92b20e36fec2cfa1d08978fa8b165fa04cd7c
-EBUILD sun-jdk-1.6.0.29-r1.ebuild 5507 RMD160 401cb37822d31f70bc35588bf8b756d48eb14356 SHA1 3d94403a521c7c4031c65d3017c633b926914fa8 SHA256 76a35606e07b1bca8924c8c47e35f385e0028eeb944ccda9dd9466641a8663c3
+DIST jdk-6u31-linux-i586.bin 85292206 RMD160 a917f6233912b84e3c904220fcb0cf49399486d8 SHA1 8e404a292d85bddb1b39d63f4248094ca05ef0da SHA256 60fdd4083373db919334500b8050b326d45d78703aa2d403eda48cfa5621702b
+DIST jdk-6u31-linux-x64.bin 85581913 RMD160 c96b98671572efcde96512649f62162d46489402 SHA1 51cc34977aef629897dda480558fc78b10166cae SHA256 0219d4feeedb186e5081ab092dfcda20c290fde5463f9a707e12fd63897fd342
+DIST jdk-6u31-solaris-i586.sh 85175121 RMD160 0eacd571f5033527e02444f4ca44feb8dd09f319 SHA1 40b65bded1bbc4088fdf140955378f5fd42e6e69 SHA256 997f9934dd1b32b206c1798824a4bd9e0606bb51f149264bf28d46853f3fe069
+DIST jdk-6u31-solaris-sparc.sh 90382665 RMD160 c138a584946c5aa7ed5f631ca6fac96c4eee8ce1 SHA1 aacac3b11e4a06580e40f406b4573ea0ceec69f0 SHA256 98994aee1009f6fc3364c904bb478816be6454c9296ba4f9f95f350b5871df4a
+DIST jdk-6u31-solaris-sparcv9.sh 12835228 RMD160 74700d0737328862cd509cbcd0cd49461d19e276 SHA1 8e418cf6981f7ac221b80e91ec4faac60edff244 SHA256 67c0ba60eb37cbe8fabf4f1eb64117d82d32772fcce19b77039b8fcf9176df59
+DIST jdk-6u31-solaris-x64.sh 8911566 RMD160 b6c022bff489735747b180ac89899a5c14111b97 SHA1 47151342a06817d69262dd5ff90603b722126e6a SHA256 fbedc2e46f9e2260d876107cb6bbac08378e824f07c34966ab5a14e11f44e9ed
 EBUILD sun-jdk-1.6.0.29.ebuild 4645 RMD160 1d22065eeef6f8b1a9824c056badd9621acec098 SHA1 1099e676a61847bc4a9d8458ab7378f6cdc1ee11 SHA256 2992ec2784417e44ed67100b56de9bdd73e759b1cab63dfe24cf265fb9077e5f
-EBUILD sun-jdk-1.6.0.30.ebuild 5477 RMD160 c6c32e63aa9c8647e44226f0ab0d99bf76b19664 SHA1 309c51fdfd895e3b04547cdd7176c8a235c29548 SHA256 5d3abd0ba65f828164f26a13a57238c3a39f46cf1aabc99bf2d2cecc2dfaa147
-MISC ChangeLog 58111 RMD160 c5920992073822427daca1fa71ad8229d5e275e2 SHA1 43e5e91b7e92a7e9e36975bc43de3eeb7d445a5d SHA256 e6bc8e3ecf76faa446d26936900b2296fbed631548d50f92068e4d13ea6014f5
-MISC metadata.xml 511 RMD160 617561076c7f6a9d9a3dfad382f97c18a0c05d42 SHA1 dff37bab461826dbad9ac5c33317202843d601c4 SHA256 857a964a38492d995c329c88b5417223679f9a0d956624878f75a3caa87b0f65
+EBUILD sun-jdk-1.6.0.31.ebuild 5655 RMD160 e9a9aa9f1348b20b366c405eded2226b28415927 SHA1 b3e8e527e317d8523f79b1bd99a8b8c7293e7dd6 SHA256 90e31635e59f6fa6124bc6208c0b706900c7c53bd90fe314bac3e29936545058
+MISC ChangeLog 58635 RMD160 fc82beab833d9bbf8c932dca6c9a52b1d850acbc SHA1 9f49a51340e0818d049e25b97014d3bedfc8fca1 SHA256 9d82873c753242aea74414978cef6ffc70ff90a670fe60dd44d329822ff5a651
+MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPGT/pAAoJEIUJ+svaV163x3EH/Ah5L8dm+iBO2K1LNp5T5Fmi
-5PcSq8jpTeUbrUmvL7dSGMhmQ+QejqHPYyjo2xeTNuYfhkNMnYH6pkriUfwm03M3
-o30rrD0zSsm3SunRLq5dX59oYjuuD7MDeHGbTnZ2xZtBm5EozjDk7Qe2GTT0eOR1
-f+P+GegxRIElGcaJq8jTif92BTz5BWw074U4QYICKTpxzzIMw62CK2ZKMpNg5ATD
-0L8ACtKNIi+XL138nuuzfcmZlCn/SFLpTSR8p5DkRx9PCUPCqyzkCMIOos15U2g+
-2sBy2n1rkzpMDRlLM7EUZOsc5aJUSiCQxhL+NzmQfQUB1D4F+NNSoM/VKHONQyg=
-=NYAO
+iQEcBAEBAgAGBQJPPN3oAAoJEIUJ+svaV163eqQIAJfFKW7eGsljWjnYehmFrhDb
+rcIu705KLTRuhQDkBEq7kWlR6+45DivLqHuFITB7sXSHK6i/eO+Ymqd+rLxhGR83
++flJzutK7spsM2OUmuaRgU/UKnajIuckxdJ2KJqhOOcJ1eah3pYfncyGrDk7XzPF
+BSQ3u4j5yU4JrzCqHc933M233tgzAGl/5vO/JLLM5u0J9jr/hccF0TF7Hfv6JHX2
+5jG8B2jysGIdL4W61khllA0GMH4lL79KI3S1Oa1aQ8t+0sANtEcZ1T+5X26xDpmj
+1p25AoVhhZQ44HUukRIXM+tTcZ9BxKPj41QJtExWqwiJUCwCCL/JsB2KEUzrCDE=
+=spFx
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/metadata.xml b/dev-java/sun-jdk/metadata.xml
index 3dec7bfeb0f7..c4cf64bfe61d 100644
--- a/dev-java/sun-jdk/metadata.xml
+++ b/dev-java/sun-jdk/metadata.xml
@@ -6,6 +6,5 @@
   <use>
     <flag name="derby">Enable Installation of Bundled Derby (Java DB)</flag>
     <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
-    <flag name="kernel_Solaris">Enable workaround for unpacking on Solaris</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild
deleted file mode 100644
index 0d68a1897871..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2011 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.29-r1.ebuild,v 1.3 2011/12/16 07:26:39 sera Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-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"
-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"
-
-# check the URIs when bumping, no idea about their stability yet
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-${MY_PV}-download-513648.html"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="x86? ( ${X86_AT} )
-	amd64? ( ${AMD64_AT} )
-	x86-solaris? ( ${SOL_X86_AT} )
-	x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT} )
-	sparc-solaris? ( ${SOL_SPARC_AT} )
-	sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.6"
-IUSE="X alsa derby doc examples jce kernel_Solaris nsplugin"
-
-RESTRICT="fetch strip"
-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"
-
-RDEPEND="${DEPEND}
-	doc? ( dev-java/java-sdk-docs:1.6.0 )
-	!prefix? ( sys-libs/glibc )
-	kernel_Solaris? ( app-arch/unzip )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)"
-DEPEND="jce? ( dev-java/sun-jce-bin:1.6 )"
-
-S="${WORKDIR}/jdk${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_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
-
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
-	einfo "Alternatives are switching to dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
-
-	einfo "Please download ${AT} from:"
-	einfo "${JDK_URI}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		for i in ${A}; 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}"/${A} -noregister || die "Failed to unpack"
-	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
-		"${S}"/bin/java -client -Xshare:dump || die
-	fi
-	"${S}"/bin/java -server -Xshare:dump || die
-}
-
-src_install() {
-	# 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 /opt/${P}
-	cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die
-
-	if use derby; then
-		cp -pPR db "${ED}"/opt/${P} || die
-	fi
-
-	if use examples; then
-		cp -pPR demo sample "${ED}"/opt/${P} || die
-	fi
-
-	# Remove empty dirs we might have copied
-	rmdir -v $(find "${D}" -type d -empty) || die
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	if use jce; then
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/US_export_policy.jar
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
-			/opt/${P}/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
-	# name to prevent file collision with jre and or other slots.
-	[[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die
-	sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)/" \
-		-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
-		"${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \
-		"${T}"/${VMHANDLE}.desktop
-
-	domenu "${T}"/${VMHANDLE}.desktop
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/jre/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild
index 1fc16b6a826f..cda97701b5ad 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild
@@ -1,19 +1,20 @@
 # 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.30.ebuild,v 1.1 2012/01/20 10:20:12 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild,v 1.1 2012/02/16 10:43:38 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/jdk-6u30-download-1377139.html"
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u31-download-1501634.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"
@@ -29,9 +30,10 @@ SRC_URI="x86? ( ${X86_AT} )
 	sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT} )"
 
 LICENSE="Oracle-BCLA-JavaSE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="1.6"
-IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin"
+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 +source"
 
 RESTRICT="fetch strip"
 QA_TEXTRELS_x86="
@@ -39,19 +41,19 @@ QA_TEXTRELS_x86="
 	opt/${P}/jre/lib/i386/motif21/libmawt.so
 	opt/${P}/jre/lib/i386/server/libjvm.so"
 
-RDEPEND="${DEPEND}
-	doc? ( dev-java/java-sdk-docs:1.6.0 )
-	!prefix? ( sys-libs/glibc )
-	kernel_SunOS? ( app-arch/unzip )
-	alsa? ( media-libs/alsa-lib )
+RDEPEND="
 	X? (
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/libXrender
 		x11-libs/libXtst
 		x11-libs/libX11
-	)"
-DEPEND="jce? ( dev-java/sun-jce-bin:1.6 )"
+	)
+	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 )"
 
 S="${WORKDIR}/jdk${S_PV}"
 
@@ -60,6 +62,8 @@ pkg_nofetch() {
 		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
@@ -72,7 +76,7 @@ pkg_nofetch() {
 
 	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
 	einfo "Alternatives are switching to 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}"
@@ -101,9 +105,9 @@ src_compile() {
 	# see bug #207282
 	einfo "Creating the Class Data Sharing archives"
 	if use x86; then
-		"${S}"/bin/java -client -Xshare:dump || die
+		bin/java -client -Xshare:dump || die
 	fi
-	"${S}"/bin/java -server -Xshare:dump || die
+	bin/java -server -Xshare:dump || die
 }
 
 src_install() {
@@ -123,7 +127,7 @@ src_install() {
 	fi
 
 	dodir /opt/${P}
-	cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die
+	cp -pPR bin include jre lib man "${ED}"/opt/${P} || die
 
 	if use derby; then
 		cp -pPR db "${ED}"/opt/${P} || die
@@ -155,16 +159,21 @@ src_install() {
 		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
 	fi
 
-	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
-	# name to prevent file collision with jre and or other slots.
-	[[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die
-	sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)/" \
-		-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
-		"${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \
-		"${T}"/${VMHANDLE}.desktop
+	if use source; then
+		cp src.zip "${ED}"/opt/${P} || die
+	fi
 
-	domenu "${T}"/${VMHANDLE}.desktop
+	# 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
 
 	# bug #56444
 	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die