Version bump. #399425

Replace use flag kernel_Solaris with the correct kernel_SunOS.

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

3 files changed, 207 insertions, 3 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 4add0f1e5e4b..cfeef6720fdb 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.315 2011/12/16 07:26:39 sera Exp $
+# 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 $
+
+*sun-jdk-1.6.0.30 (20 Jan 2012)
+
+  20 Jan 2012; Ralph Sennhauser <sera@gentoo.org> +sun-jdk-1.6.0.30.ebuild:
+  Version bump. #399425
+  Replace use flag kernel_Solaris with the correct kernel_SunOS.
 
   16 Dec 2011; Ralph Sennhauser <sera@gentoo.org> sun-jdk-1.6.0.29-r1.ebuild,
   metadata.xml:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index ff7e7749b88f..de939e3442af 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 AUX fontconfig.Gentoo.properties-r1 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
 AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
@@ -8,7 +11,25 @@ DIST jdk-6u29-solaris-i586.sh 85022791 RMD160 88595026cad4f10156c90e3df03771218e
 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
 EBUILD sun-jdk-1.6.0.29.ebuild 4645 RMD160 1d22065eeef6f8b1a9824c056badd9621acec098 SHA1 1099e676a61847bc4a9d8458ab7378f6cdc1ee11 SHA256 2992ec2784417e44ed67100b56de9bdd73e759b1cab63dfe24cf265fb9077e5f
-MISC ChangeLog 57912 RMD160 ad60682caa794123cd517bf98652fbb52224da12 SHA1 b4ccc57e9074b4f5cf20d83ac384355e0f906863 SHA256 000a7cc95c77dffa58c65b59e88d0d642d55704157a4089cf2b709f9a6589fdd
+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
+-----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
+-----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild
new file mode 100644
index 000000000000..1fc16b6a826f
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild
@@ -0,0 +1,177 @@
+# 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 $
+
+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"
+
+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"
+
+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_SunOS 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_SunOS? ( 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
+}