ecurity bump. #404071

Use relative path for desktop file icon. #403139
Make installation of src.zip optional as for other JDKs.
Unzip is build only dependency.
Remove vulnerable.

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

5 files changed, 59 insertions, 394 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 8a928dc4e862..ae9ce112a17f 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.11 2012/01/27 13:01:30 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.12 2012/02/16 09:34:55 sera Exp $
+
+*oracle-jdk-bin-1.7.0.3 (16 Feb 2012)
+
+  16 Feb 2012; Ralph Sennhauser <sera@gentoo.org>
+  -oracle-jdk-bin-1.7.0.1-r1.ebuild, -oracle-jdk-bin-1.7.0.1-r2.ebuild,
+  -oracle-jdk-bin-1.7.0.2.ebuild, +oracle-jdk-bin-1.7.0.3.ebuild:
+  Security bump. #404071
+  Use relative path for desktop file icon. #403139
+  Make installation of src.zip optional as for other JDKs.
+  Unzip is build only dependency.
+  Remove vulnerable.
 
   27 Jan 2012; Ralph Sennhauser <sera@gentoo.org>
   oracle-jdk-bin-1.7.0.2.ebuild:
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 9f90ef17a46b..6f75a09bbdd1 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -4,37 +4,29 @@ Hash: SHA1
 AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
 AUX oracle-jdk-bin-1.7.env 1000 RMD160 9067112ce8a31b450755ce6bbcdd1b24d5307e12 SHA1 66d5a3df445baded9d2b16fc7f24d8fcb1c340bd SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
-DIST jdk-7u1-linux-i586.tar.gz 96648208 RMD160 7a48b5ed92c34f3253e8a87e5ee53580a8e83736 SHA1 e581d977bdb8f2f7608d48b307ab3174a55f8f48 SHA256 acbfb8912a287facbee02ff138d94457aabab409b2f1d15855714ec9608a6cd4
-DIST jdk-7u1-linux-x64.tar.gz 94972183 RMD160 fc2efecd251ec552530ad57888cbdce163e009e6 SHA1 21ef2964df4575f1e5e935205700d06ee70f33b3 SHA256 f88070cfe7fe5ed60dfda7729cf9dd110b77840e2ca8cd14a86d5d2274b09c9c
-DIST jdk-7u1-solaris-i586.tar.gz 99355541 RMD160 7754cb0429596ac2aaae8b1d837eba010a628bd5 SHA1 c8b65d96904c565c4e81c23c496054d8bc22fcb7 SHA256 1cd4d59889c51f1317ba25968c8fcc601b19fb6402877bd267b5dc2981cf4a49
-DIST jdk-7u1-solaris-sparc.tar.gz 104316010 RMD160 b767cb297e1105f6c197c799397ca155cc1ce422 SHA1 882527c5c14cf80676308cafed517a737a20c328 SHA256 b6d6e4a5c0b958c6c82464999efae0c067406d8cb8f21c01de12e44761e90c4c
-DIST jdk-7u1-solaris-sparcv9.tar.gz 12975640 RMD160 680e1235216b5748b3e0039b91a1735a9747c02b SHA1 bd7a6dadbca2f8250d4a64a6e8f265eed68c063f SHA256 a8758bcfa940d38b2053b9069d2b1f0febd2753804f61ac9cd58206b63327494
-DIST jdk-7u1-solaris-x64.tar.gz 9839985 RMD160 7608dd4fd2776b5d9158d53dbdf4a89d154f62f8 SHA1 b9ed10d8c2130350267943829b9a145aba87c577 SHA256 3e4adda9b8f6af1d59ed475bdf86f4a6db67fed82858574e4c74999c1167a3a1
-DIST jdk-7u2-linux-i586-demos.tar.gz 13992138 RMD160 673d40f2b2ca78898884c8e4c3c1b6c7422ab73c SHA1 c83796c21b1b5a904976f071f2a4d36c2baae934 SHA256 44ccdff8692c400620763b628eef95d9513c90cddc85f9cfc4b1fe88033a8c1a
-DIST jdk-7u2-linux-i586.tar.gz 82444118 RMD160 e8aae676b31e18e221d86dbe9b7fd1d3ae37a94c SHA1 adcd78670ca075e245f998232b7cc4447f7453a2 SHA256 74faad48fef2c368276dbd1fd6c02520b0e9ebdcb1621916c1af345fc3ba65d1
-DIST jdk-7u2-linux-x64-demos.tar.gz 14006484 RMD160 90ae393a286c89db16635079c0440f9c27da8d54 SHA1 ed9e73215437d6d571c686a7f32c6f3947297526 SHA256 075acfb466bf76fed783ea24948e76b9006526ba13218c3b465138fdd611a45b
-DIST jdk-7u2-linux-x64.tar.gz 81225513 RMD160 99e37d1a3b83bbce3c70abf5f9e2e9fa87c13c67 SHA1 bae2b56d2f371fc41dab437de55596c40f1bb8bf SHA256 411a204122c5e45876d6edae1a031b718c01e6175833740b406e8aafc37bc82d
-DIST jdk-7u2-solaris-i586-demos.tar.gz 13986615 RMD160 faf5b5683e7576593e9d08ead8f45f1ae59f2993 SHA1 ac0faf5b894a72fda80b2258e80ae013793d1249 SHA256 b597f08ff81584914802396bef7fd5a5757696ba0392297b6869d4dea12148f1
-DIST jdk-7u2-solaris-i586.tar.gz 85324089 RMD160 5e2fa014d705d4fcf63928aeb0a50c61226a1ade SHA1 3ff3aab44ec4c6116729f216acbe314277bbdb02 SHA256 948d707215f517662a7413e6307cab42845fd8e70c388914e3314bedc57ccba8
-DIST jdk-7u2-solaris-sparc-demos.tar.gz 14028492 RMD160 0ab1a347ad754c62fa8b6d5f1576805d884899ae SHA1 b100979b10dc2828b1bf83e8f491ed77825b4166 SHA256 a7e4493279abfd287df4f80ea59bccf9514af03e25c9d99f5afd77c89fe7fe40
-DIST jdk-7u2-solaris-sparc.tar.gz 90226316 RMD160 4d49fb48f51af35f466d53f6dbaedccba8604f78 SHA1 1c73591793e32e2a703707d6ccda3caa685ebc9f SHA256 fc5e7529819c0a18df6c282c331a547e62812b75198445a457024f5232b59abf
-DIST jdk-7u2-solaris-sparcv9-demos.tar.gz 199196 RMD160 3883993ef87b4a22497b37fffeb682d1c14d1c23 SHA1 c7e289cede87da587f138801c04cf349c2160465 SHA256 6ce24aeef80b9f65da823d5d19e67bbc3d628505463bca6235d69443283d92f4
-DIST jdk-7u2-solaris-sparcv9.tar.gz 12904127 RMD160 c9694a5a139e4d3138e0b209bd407d8e467fe620 SHA1 720ded33fa746538a62e075f12c09fc9c3052f5b SHA256 9f1a50a8221193d5f7f70314ea09ead11830632043d4b389111874f759e7e7ab
-DIST jdk-7u2-solaris-x64-demos.tar.gz 186053 RMD160 b5b87b16fb930c1b6bd163e3cbf425fee55a4c95 SHA1 fc7f4d59b6a933d81f24c76a67f634f260fc0a41 SHA256 09eef91c3319d2682ccee32d5df51dacc8ae021678731dd7725d9c5e29e4a66c
-DIST jdk-7u2-solaris-x64.tar.gz 9702243 RMD160 a280030b3b9988978b086ea2130e59f1eaa8d9d7 SHA1 4778e25b1b7df6d5d3ef0862186c7c1d9d5707f9 SHA256 2c5567c2be431a74f3bf1b19af71efa5434451880503218466dd7109523913a8
-EBUILD oracle-jdk-bin-1.7.0.1-r1.ebuild 4707 RMD160 c214537b1297d66ac07da8f16df556e8082ffcda SHA1 f3d03ffce05847d8f70f94a33287d2fc8bd30089 SHA256 f62be3481cee5bbc83df49f61c52f46820edd52de410d37ea7386857b699d138
-EBUILD oracle-jdk-bin-1.7.0.1-r2.ebuild 5403 RMD160 feae6a543f873a5696780f661573840682807c5d SHA1 9c02dcb4b8104a4978dbbb8c695d0b34525ac7e8 SHA256 289ddd63edde45bb3713dced11f128819aca0c0176f6d899fbeff4274fd1acf8
-EBUILD oracle-jdk-bin-1.7.0.2.ebuild 6517 RMD160 3f5e5ab3bbf12d4a82592b4f3514cf9d47cedb15 SHA1 006c3825d4de2d55c4bbd7c52aae9fa318d419b7 SHA256 36e12ed868805180c35452ce8378b6dea6c8f7b95d82cd83b8838141f72adbb9
-MISC ChangeLog 2177 RMD160 39fd2b88f18fa0cb1be4d26394fab95debaafd71 SHA1 216aee8ac022a3bf938f3132b75bb177e6a88d64 SHA256 77f44e25c5e292a90196d3760f6c85c8c00051ba31538a767f3b1ee7282f4c7d
+DIST jdk-7u3-linux-i586-demos.tar.gz 13978883 RMD160 3ef1288f337196592f1a7759d559887197384b22 SHA1 82d6569369c972e4b2f5b9ecbc372a05317377ac SHA256 1a273f9da4f9a8f3cd44de5715cb2621e08688dadb9bd33449c26c7e1b438486
+DIST jdk-7u3-linux-i586.tar.gz 82477042 RMD160 f951b31d576008773e803b14187d306b5dfc85f5 SHA1 15c97191c8fd58d74f36e84eb4f65371be573cf3 SHA256 798a3ea1d390358bdc01911d9aab7da1ff887157b56becc0e07e6f2c031f9ded
+DIST jdk-7u3-linux-x64-demos.tar.gz 13981665 RMD160 f907fd60708af75a99a7da1e7ae1cbc52e0e4834 SHA1 7005ec0135c709a206afb2d7e3d52336a3db3a66 SHA256 127d92ffaaf4a006870ce7fab85f2f202fddc52222b75de805f7fc8bc0d3a6ea
+DIST jdk-7u3-linux-x64.tar.gz 81056556 RMD160 4019c85f4c1b056c937ded7e2140f94668a165ea SHA1 163fdfddfb7a4d6df1181acffed17aa7aab6835b SHA256 28ff4bc3194617e0f6144013b1ca391b279804170e297faa6879963424846c2d
+DIST jdk-7u3-solaris-i586-demos.tar.gz 14008396 RMD160 717d8c23f5dfd24772dbecd385e8cfdad21a76ab SHA1 4fcfa7c4ace8b99aa6141bcb3b6ac165cf63116d SHA256 ee0950b40880b20432721e240eb11614bf958d833c715d8bf479a21218c826db
+DIST jdk-7u3-solaris-i586.tar.gz 85353101 RMD160 8ffa7c0875640793a0c714206ecf04f645bb5cc4 SHA1 3652dc7ccdc33d5e976cd72cf64cbfa3cc6ff70e SHA256 6fef2459d8dc9ebf91cb461fd9009b40806e00a06f6755af163af3ec0b06bb7e
+DIST jdk-7u3-solaris-sparc-demos.tar.gz 14050356 RMD160 dace2fb1e8585d1c990acf4efd4bdbb91ef684bf SHA1 84c0a0b28b748d0bf71e3efe13a4611bda6438dc SHA256 45d34d6127c991928e342b90d38de9f6a552841f2e34a4c020a19039844d87e0
+DIST jdk-7u3-solaris-sparc.tar.gz 90248080 RMD160 c6576a1ac596d4acdeb534bfd467c2f7969b75ed SHA1 a93d24eba0b559f1de298402765b5013c7d3234c SHA256 73367138ea28ee3ba21b2f52c0c61a7f4aa0eb9d12042bf2c5788cc7e6e4b9d2
+DIST jdk-7u3-solaris-sparcv9-demos.tar.gz 199207 RMD160 9d5aceb3d9f7fa0135175e3521202fe8fe387126 SHA1 2b9384e53eb436bed083660c415d506e829548e3 SHA256 a0bb2483d65eae0faafb5ce61dc8ff5ec8e6fabb7c5a217c0c64822abed5b517
+DIST jdk-7u3-solaris-sparcv9.tar.gz 12904146 RMD160 cf8460e1ae7d2e66a59ac757501aaa4ec4c5389f SHA1 b87af612e7dc095445a33b6692501a2210be8e43 SHA256 04811e46ece37dd99c874b9998cbc9251dd886c5ffe1536548b396b8c51f5dc9
+DIST jdk-7u3-solaris-x64-demos.tar.gz 186051 RMD160 0003fcca02d1d6a8c2970941bea64ee9ab8f2d67 SHA1 8742a6cc3fc9a0989839da1a8b862730f9047361 SHA256 063cf73e7d5b366c8de33f8af7ad01895eabf9b146458cf497c0015f4bf9faa0
+DIST jdk-7u3-solaris-x64.tar.gz 9702437 RMD160 81427666473e5491fd64d8e539e2e4c1edba6cb2 SHA1 e5903a8afa28b1b25f9bd71e1463da57fc24c163 SHA256 1021b777004c0acc9e7e7dc1006afb46379daa79d88285f95b2ff096fa527ea2
+EBUILD oracle-jdk-bin-1.7.0.3.ebuild 6604 RMD160 19d2d6a155cabe6b4f2f50b690e8e91e56d519cf SHA1 6e2b716d92a07b4326b5fbdb130fdfdd0681ed3b SHA256 151252677177270f6d88ec644f63377d3f9be4cafde8f236d045233d69294535
+MISC ChangeLog 2595 RMD160 da024bf7cf6489fc9bee84588e42738c588a7717 SHA1 232cb310d42f3867ed7f1f54704a9d4fafd1a550 SHA256 ece987c203ce71b844b4370452bfcc1b241422c0543abc138c5b2b5341f1d2d6
 MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPIqA7AAoJEIUJ+svaV1638zIIAIr/UPVJcE0yKdh20t7NH2kb
-NKvAkpH0YnMprXMUClPAFlw+SQQnk6l2BFAe+aSScTh9s3qNl9/7d0FfUg6O93LT
-TkyqBCRL7dG101WKdHt8Q+HIL9WaMXugSgMm24V5H1/vP1Q9ksKD/gsaQr52F4hi
-lFZgF7jRPX29Q2AgLlMNH0Bu4yciTonp5GfVJWXVCqIzfrPWOusTv+x3NjXH0LiZ
-ii5VRm26Je8epWLxhR75tXPLghbQeWzQHejUkLlmUfZK9OCvyK0mZKdLtoYkYXv8
-hCTk3xf1jgk+HiRpTEgOWbFYn8zsr1OkbmJUEdUAQaSY2aE7ZEhTgULwPU6fw2I=
-=l4eF
+iQEcBAEBAgAGBQJPPM3OAAoJEIUJ+svaV163SrMH/0KI7Wv9tK3Xhgwv1JqQdApE
+JE2KZg/eaWurRWz6ZcpjZnBkIo/GS2Hb9DumpxXNfvKMTV/XCKwsDdEmDVdp2/47
+rBxwVB0/Sw2Jf60Sb0CBc0qpjNyHB8ycN8pgFddKrfMfkFiym2nZFxPmMNu9kQNi
+m9eRLEzUtC3bTh9wrOThdWX+w1UzVuYuZgEfedjEaJK9prsTXf3TpRWi40scFTgI
+lz9yGfa2kpoMo9DvlOOI9cVXAStQybxntILRgWYBRhKUrxgkCEQlomVRX8MU2PX4
+YRmEYm+d2ZebQ2RLiBhLJ4FvcJR4FzOhfgOfPLzfCUioJfx5mqLcHX/hH8BLJ5k=
+=8xQk
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild
deleted file mode 100644
index e51a20db6806..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild
+++ /dev/null
@@ -1,164 +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/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild,v 1.3 2011/11/21 10:28:26 sera Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
-AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
-
-# check the URIs when bumping, no idea about their stability yet
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u1-download-513651.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
-
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="x86? ( ${X86_AT} )
-	amd64? ( ${AMD64_AT} )
-	jce? ( ${JCE_FILE} )"
-SLOT="1.7"
-LICENSE="Oracle-BCLA-JavaSE"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch strip"
-IUSE="X alsa derby doc examples jce nsplugin"
-
-QA_TEXTRELS_x86="
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-
-DEPEND="jce? ( app-arch/unzip )"
-RDEPEND="${DEPEND}
-	doc? ( dev-java/java-sdk-docs:1.7 )
-	!prefix? ( sys-libs/glibc )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)"
-
-S="${WORKDIR}/jdk${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	fi
-
-	einfo "Please download ${AT} from:"
-	einfo "${JDK_URI}"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		einfo "Also download ${JCE_FILE} from:"
-		einfo ${JCE_URI}
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-src_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || 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
-		"${S}"/bin/java -client -Xshare:dump || die
-	fi
-	"${S}"/bin/java -server -Xshare:dump || die
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || 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/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			/opt/${P}/jre/lib/security/
-	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}/" \
-		-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 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/jre/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
deleted file mode 100644
index 74ce4434d0ef..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
+++ /dev/null
@@ -1,180 +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/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild,v 1.3 2011/12/15 21:03:53 grobian Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
-AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
-SOL_X86_AT="jdk-${MY_PV}-solaris-i586.tar.gz"
-SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.tar.gz"
-SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.tar.gz"
-SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-
-# check the URIs when bumping, no idea about their stability yet
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u1-download-513651.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
-
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.zip"
-
-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} )
-	jce? ( ${JCE_FILE} )"
-SLOT="1.7"
-LICENSE="Oracle-BCLA-JavaSE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="fetch strip"
-IUSE="X alsa derby doc examples jce nsplugin"
-
-QA_TEXTRELS_x86="
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-
-DEPEND="jce? ( app-arch/unzip )"
-RDEPEND="${DEPEND}
-	doc? ( dev-java/java-sdk-docs:1.7 )
-	!prefix? ( sys-libs/glibc )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)"
-
-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 "Please download ${AT} from:"
-	einfo "${JDK_URI}"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		einfo "Also download ${JCE_FILE} from:"
-		einfo ${JCE_URI}
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-src_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || 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
-		"${S}"/bin/java -client -Xshare:dump || die
-	fi
-	"${S}"/bin/java -server -Xshare:dump || die
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || 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/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			/opt/${P}/jre/lib/security/
-	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}/" \
-		-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 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/jre/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.3.ebuild
index 8263bd916a5d..c8ecf4a56a13 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.3.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild,v 1.3 2012/01/27 13:01:30 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.3.ebuild,v 1.1 2012/02/16 09:34:55 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-7u2-download-1377129.html"
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u3-download-1501626.html"
 JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
 
 UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
 MY_PV="$(get_version_component_range 2)u${UPDATE}"
 S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
 
@@ -76,11 +75,11 @@ SRC_URI="
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.7"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X alsa derby doc examples jce nsplugin +source"
 RESTRICT="fetch strip"
-IUSE="X alsa derby doc examples jce nsplugin"
 
-DEPEND="jce? ( app-arch/unzip )"
-RDEPEND="${DEPEND}
+RDEPEND="
 	X? (
 		x11-libs/libXext
 		x11-libs/libXi
@@ -91,6 +90,8 @@ RDEPEND="${DEPEND}
 	alsa? ( media-libs/alsa-lib )
 	doc? ( dev-java/java-sdk-docs:1.7 )
 	!prefix? ( sys-libs/glibc )"
+DEPEND="
+	jce? ( app-arch/unzip )"
 
 S="${WORKDIR}/jdk${S_PV}"
 
@@ -133,13 +134,13 @@ pkg_nofetch() {
 
 	if use examples; then
 		einfo "Also download ${DEMOS} from:"
-		einfo ${JDK_URI}
+		einfo "${JDK_URI}"
 		einfo "and move it to ${DISTDIR}"
 	fi
 
 	if use jce; then
 		einfo "Also download ${JCE_FILE} from:"
-		einfo ${JCE_URI}
+		einfo "${JCE_URI}"
 		einfo "and move it to ${DISTDIR}"
 	fi
 }
@@ -157,9 +158,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
 
 	# Create files used as storage for system preferences.
 	mkdir jre/.systemPrefs || die
@@ -184,7 +185,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
@@ -216,16 +217,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}/" \
-		-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}#" \
+		-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 "${T}"/fontconfig.properties || die