Version bump. #399425

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

3 files changed, 164 insertions, 3 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 9295c409139b..c395f08a7019 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jre-bin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.203 2011/11/21 12:15:02 sera Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.204 2012/01/20 10:32:10 sera Exp $
+
+*sun-jre-bin-1.6.0.30 (20 Jan 2012)
+
+  20 Jan 2012; Ralph Sennhauser <sera@gentoo.org> +sun-jre-bin-1.6.0.30.ebuild:
+  Version bump. #399425
 
   21 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
   sun-jre-bin-1.6.0.29-r1.ebuild:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 0e93caef0587..e665ec7faaaa 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 AUX fontconfig.Gentoo.properties-r1 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
@@ -5,7 +8,21 @@ AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1
 AUX sun-jre-bin-1.6.env-r1 966 RMD160 7cb6cb5c5c482aebe3da916b7b5607f15eb95962 SHA1 cfc8dc648ba2795c748ce3b342ed28deac2fe7f8 SHA256 2825f19a60ecf19c4164a27aa24312c521145236c013759c62242a7772e44efe
 DIST jre-6u29-linux-i586.bin 21632980 RMD160 ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a SHA1 6de26b992a9920117d2f156ff5bbddf2d5b28f77 SHA256 13bd1ce27709be7d05c07221185d4f572242b14a80cea67b557e761f5ba7e440
 DIST jre-6u29-linux-x64.bin 21230518 RMD160 53bb593ae6ff9f09bc1f00a94ebd6a3506260f87 SHA1 820399aed6db6c1960ba0942bc64c49a3b809b89 SHA256 624e566642ebe1dc41d07737d15e3a0ada754f36e7d27a789b4a44a2f2148e58
+DIST jre-6u30-linux-i586.bin 21686310 RMD160 f721ccaef056f4281ad6b020ec9a3c79cbfc1252 SHA1 6e2f60a3d62b73e878dc77e3a6266b03eadec31e SHA256 5bf23eddbcb0f61e9415ec2cc6432f3ca86f6a3efbc37b55ab3f48d054c1bb47
+DIST jre-6u30-linux-x64.bin 21300428 RMD160 7bf08b9330c7e299eec85a08eb25fa6d58a3f8d9 SHA1 8da1cfb1143374afed424e55e48d1f4e1c4e2183 SHA256 f35225a514efc3a56bedb92b73b188710c54715dc20a97cb9524f650e37628d5
 EBUILD sun-jre-bin-1.6.0.29-r1.ebuild 4162 RMD160 ffb9dd02b744ebf62e060eb50ff8679456298b2d SHA1 b9235ab40ecbb410038ce08e1f6ae33792c0ac4e SHA256 cee1a2bd2d7a239df1a585c5a91e954144c81b06830b03b253431091d902b6b9
 EBUILD sun-jre-bin-1.6.0.29.ebuild 4275 RMD160 605f3e0f4996c3c98ceababbe55c9e0651ce0aab SHA1 76f8220984f0b7706a918e5dd5763512b439ddb2 SHA256 76efb1ae15a38c6b1c227cb365d01364a91a479715c7018c463161d8b1163ce1
-MISC ChangeLog 35759 RMD160 d19689ea899f69b4ef04e91895bccc86abadd9fd SHA1 ec7cb8e5480404a2de898cd0504f16fe2f56328e SHA256 18a3f1f2d4ff513ac6b3b5e8483f24aa457eae1281dd854d2951fcb3540d45d9
+EBUILD sun-jre-bin-1.6.0.30.ebuild 4138 RMD160 259bb08fc3571ff8d594a78e237d49efb03cb7ec SHA1 d0d0622b73d65bb8535e2991416e5a75509b9e7e SHA256 9730033383b92b6b1d9129b20cd843316d9192794f420babe8e68a99baeaff39
+MISC ChangeLog 35901 RMD160 3c15b680201a253f7369a55d07c89aee17a58f9d SHA1 8e3f87a2256ed6615690584b0fe1f0ef7b34701b SHA256 42a47603c362afc917801faa38958b9d0f017a18f1c511aa03701023cb5ce604
 MISC metadata.xml 349 RMD160 ae6db154651b0c2b160e1e6956fb722cb52f2e8b SHA1 219312b9ae33153d205b514009927531ee14b93a SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPGUK6AAoJEIUJ+svaV163jV0H/2Dl1Sl/NasjXtw1g7oyw1p9
+dnFc0bhyC4obFNrb6ObZ6y+8AnJX5dTFvleBlFhd1WfGzN5fROuFplXJwO0jtO4P
+AyynLXqE47RgCInyPxTWHew9A9lYJ7IaCSV1Xl+RJVs/HDF0OPJbT2pk/lU40isy
+Yh4otWm1t7QwhO/aE7KFC4Igm+qTBiMHlTHSQKZ07ORkXESqLrOTot6cCdDWaoN0
+GsHVyF9SeLf2yOM4s04rPTjlhacYCBKRqlSs94TahR0kLxquTDcRzhfOqG33XBgk
+wnofn+q8Wp2YQO6F9KMlg0H2xsJhDZkzQswXWcesSn3YDU/+CNakUYgte2hWfHw=
+=qpMB
+-----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild
new file mode 100644
index 000000000000..6da380b5a182
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild,v 1.1 2012/01/20 10:32:10 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre-6u30-download-1377142.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.bin"
+AMD64_AT="jre-${MY_PV}-linux-x64.bin"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AMD64_AT} )
+	x86? ( ${X86_AT} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+KEYWORDS="~amd64 ~x86"
+SLOT="1.6"
+IUSE="X alsa jce nsplugin"
+
+RESTRICT="fetch strip"
+QA_TEXTRELS_x86="
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/server/libjvm.so"
+
+RDEPEND="${DEPEND}
+	!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
+	)"
+DEPEND="jce? ( dev-java/sun-jce-bin:1.6 )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_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 or the source-based dev-java/icedtea:6"
+
+	einfo "Please download ${AT} from:"
+	einfo "${JRE_URI}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
+}
+
+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 lib/i386/libjavaplugin_oji.so \
+			lib/i386/libjavaplugin_nscp*.so
+		rm -vrf plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir /opt/${P}
+	cp -pPR bin lib man "${ED}"/opt/${P} || die
+
+	# Remove empty dirs we might have copied
+	rmdir -v $(find "${D}" -type d -empty) || die
+
+	dodoc COPYRIGHT README
+
+	if use jce; then
+		dodir /opt/${P}/lib/security/strong-jce
+		mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
+			"${ED}"/opt/${P}/lib/security/strong-jce || die
+		mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
+			"${ED}"/opt/${P}/lib/security/strong-jce || die
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+			/opt/${P}/lib/security/US_export_policy.jar
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
+			/opt/${P}/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
+	fi
+
+	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
+	# name to prevent file collision with jdk and or other slots.
+	[[ -f "${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop ]] || die
+	sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JRE ${SLOT} (sun-jre-bin)/" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=/opt/${P}/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
+		"${ED}"/opt/${P}/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}/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}