Version bump. Due to DLJ bundles no longer provided by Oracle, the package changes license to Oracle-BCLA-JavaSE and is fetch restricted again.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 34 insertions, 152 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 978675702056..a27ccce7dd44 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.103 2011/06/18 11:50:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.104 2011/09/01 13:55:10 caster Exp $
+
+*emul-linux-x86-java-1.6.0.27 (01 Sep 2011)
+
+  01 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+  -emul-linux-x86-java-1.6.0.24.ebuild, -emul-linux-x86-java-1.6.0.25.ebuild,
+  +emul-linux-x86-java-1.6.0.27.ebuild:
+  Version bump. Due to DLJ bundles no longer provided by Oracle, the package
+  changes license to Oracle-BCLA-JavaSE and is fetch restricted again.
 
   18 Jun 2011; Markos Chandras <hwoarang@gentoo.org>
   emul-linux-x86-java-1.6.0.26.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 44dd35943669..82a9144761a5 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,30 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
-DIST jdk-6u24-dlj-linux-i586.bin 84988695 RMD160 82a4137288a3154a6b068caad5b47a38c1f44fce SHA1 d5b556e3b5333ec5fbe236482fa183c3635fe053 SHA256 372135d751d9daf5945cd21d5483e6bc85964aff4a9abdd90d8dff085b717b00
-DIST jdk-6u25-dlj-linux-i586.bin 85125510 RMD160 fd7f31dbbcce6f85d104691d3caf9ccbbfa78b27 SHA1 69b10f03901a344d7f61aef0e2e7753c5abebb81 SHA256 83627292f371780007a8ff891506cb61a6cd5d1938032b114337cad80b2322ef
 DIST jdk-6u26-dlj-linux-i586.bin 85214224 RMD160 dac0e73fe5cf6ea6cf9b6421f63205bc3856de50 SHA1 abd1e40bf9e51ee41c8a6863efe68e32d3c0b96e SHA256 54561b0b129c206cd6c29fe43968e8a8702fa437ed8df6debd8ffd1a2e536fae
-EBUILD emul-linux-x86-java-1.6.0.24.ebuild 3493 RMD160 3a7fe96899c3a310acc5fc9784deda2faa0f03ed SHA1 c943e90beae3df1e90911a65d05fd037904d52da SHA256 9ff99c224094728309effb1e775832dad599359f88aa9a7a49d2fbb06bb3307f
-EBUILD emul-linux-x86-java-1.6.0.25.ebuild 3494 RMD160 e0fb802e91a4ad64c80a1ae17d45f8e9b4fcc892 SHA1 35a86373d61c6e7aca4f82c77f37024ae7e295aa SHA256 98b64af6447a89fe8f181ac3012072a04fea1273c3650b64dde82beae3766e1f
+DIST jre-6u27-linux-i586.bin 21630577 RMD160 3965b5149755859e1d0a853e6dfa5d7eb408a82f SHA1 5a3d2e304d6cf62ee6a56cce322014cf3ceab2ad SHA256 1f8bb6a43373695b811aa9e16cccfcc23493860194d70c6b6a34e8b32b904780
 EBUILD emul-linux-x86-java-1.6.0.26.ebuild 3492 RMD160 77bdedb6dde29faa938af8f673a42cd5f6b208c4 SHA1 0239a7c8b95ee44adf82164d440ee27fa6881f53 SHA256 6fb905e00b5f11f006d5406674e707785d38930795b9fd77083aa3a22ccd81b0
-MISC ChangeLog 20509 RMD160 74298605507a3dc283b6ce47870f6854de587039 SHA1 b5e63610d39e47e8577a7f9a545fdebe7fb775df SHA256 d1b2d47beaf00f1fb9cd253b2973110114d8ae50f3f1524469f590412b13f10c
+EBUILD emul-linux-x86-java-1.6.0.27.ebuild 3726 RMD160 3f29721dde0cb7d773740fa12ca1da68eded8957 SHA1 2b77c52ad345ca382f5918c073a0a795ed75dffd SHA256 30b1b97faa356c6bbea0ac454da37c8fe64a7e99f7020c2db652d1464ed84c16
+MISC ChangeLog 20870 RMD160 b8c8325d218f77118436166acab99f4071b6cc61 SHA1 6a2d60f2bf03251154d916452379cf31f4f68909 SHA256 f81ec72d5f1dbf6ea4b4acd2d6e44a38f531169ae8b29339d6f924a89e12e8c6
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN/JD9AAoJEPqDWhW0r/LCfgUQAI13X8uL4Ygkp7MaC2qgK9vF
-gsol2PaKYeBr4qezhNXwAwSHpG33LOMohgq4oA/gU8ilztuio0MENcAgLv57zyxX
-d+yr+0ezr/kJeJurBBRQEo+MP2LQ4OivrHxwP4X5rKT+j1LzA/MzQFu60gbd9Mls
-DZPNO9MkCoz+Pr5fAclsRX21ya+8qbSkzkCEMqrT5p7Vb3RR0ToqGBij7zvuRFlZ
-dg8OrPFn2dVUrAim6pgTlw9kIrCIzRzPUhyNg3ny9GEet0oQq5Kkpa6Cekbxczr7
-jTSPsOycP1kMMqxibBetQe2PA+pRrhY4AbKxlVAstJFfKnP7IyNdY8O8ht645Kz4
-TekmDGoFwCmWBMj92L3N1ONysAu3ivLHZh3ZHUpHHJx5NaK5CqnLetYZSAgmt3cV
-2yKxzk+biuKS3CG/XFwLzPlg4o40iseUfxABeGffuiG9fZo40IiVOzcvv8YOSYEn
-8SRbgQuAIWESogbuKjkVBemaaCfMh5kxCbjva/sJaX91QYiMKoeOum1e4rnXChX3
-9cPb8HI/1WIj4yylnMJ4mQbnxx1jQdc37WLGsntGjIy6/xFPdhWQYCWuHNK4uP3Q
-4YE7RuJfosM2njAIFW3q+fqsEtTIdJUVAvrJDAiccAuei0CM8XWz9k0CsqEKfKTF
-CO+0sft6WDF8lbtQeRdA
-=fLn7
------END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.24.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.24.ebuild
deleted file mode 100644
index 9200122bdaac..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.24.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.24.ebuild,v 1.3 2011/05/21 04:28:05 ssuominen Exp $
-
-inherit versionator pax-utils java-vm-2 eutils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://java.sun.com/javase/6/"
-#SRC_URI="http://download.java.net/dlj/binaries/${At}"
-SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
-
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_DT_HASH="opt/${P}/.*"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This has to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"/bin/*)
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	"${S}"/bin/java -client -Xshare:dump || die
-	"${S}"/bin/java -server -Xshare:dump || die
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-	dodir /opt/${P}/share/
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji
-	fi
-
-	# FIXME figure out how to handle the control pannel conflict with
-	# sun-jdk-bin
-
-	# install control panel for Gnome/KDE
-#	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-#		${T}/sun_java-${SLOT}.desktop
-
-#	domenu ${T}/sun_java-${SLOT}.desktop
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog
-	elog "Two variants of the nsplugin are available via eselect java-nsplugin."
-	elog "Note that starting with ${PN}-1.6.0.19 their naming and the default changed,"
-	elog "users with the old plugin set are switched to the new default automatically."
-	elog "The default ${VMHANDLE} is the new 'plugin2' which works in Firefox 3 (xulrunner-1.9)"
-	elog "and newer, the ${VMHANDLE}-old_oji is the old plugin using the OJI API"
-	elog "that was removed in Firefox 3.6 (xulrunner-1.9.2)."
-	elog "For more info see https://jdk6.dev.java.net/plugin2/"
-	elog
-
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} net-print/cups or net-print/lprng to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.25.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.27.ebuild
index d6a12d2a40fa..1d349e9c6e05 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.25.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.25.ebuild,v 1.2 2011/05/21 04:28:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.27.ebuild,v 1.1 2011/09/01 13:55:10 caster Exp $
 
 inherit versionator pax-utils java-vm-2 eutils
 
@@ -8,16 +8,17 @@ UPDATE="$(get_version_component_range 4)"
 UPDATE="${UPDATE#0}"
 MY_PV="$(get_version_component_range 2)u${UPDATE}"
 
-At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://java.sun.com/javase/6/"
-#SRC_URI="http://download.java.net/dlj/binaries/${At}"
-SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
+DOWNLOAD_LINK="http://www.oracle.com/technetwork/java/javase/downloads/jre-${MY_PV}-download-440425.html"
+X86_AT="jre-${MY_PV}-linux-i586.bin"
+
+DESCRIPTION="Oracle (formerly Sun) Java SE Runtime Environment (32bit)"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/overview/index-jsp-136246.html"
+SRC_URI="${X86_AT}"
 
 SLOT="1.6"
-LICENSE="dlj-1.1"
+LICENSE="Oracle-BCLA-JavaSE"
 KEYWORDS="-* ~amd64"
-RESTRICT="strip"
+RESTRICT="fetch strip"
 IUSE="X alsa nsplugin"
 
 JAVA_VM_NO_GENERATION1=true
@@ -33,15 +34,22 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
 	opt/${P}/lib/i386/server/libjvm.so"
 QA_DT_HASH="opt/${P}/.*"
 
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
+S="${WORKDIR}/jre$(replace_version_separator 3 _)"
+
+pkg_nofetch() {
+
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
 
-	cd ..
-	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
+	einfo "Please download ${X86_AT} from:"
+	einfo "${DOWNLOAD_LINK}"
+	einfo "and move it to ${DISTDIR}"
 }
 
+src_unpack() {
+	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
+}
+
+
 src_compile() {
 	# Set PaX markings on all JDK/JRE executables to allow code-generation on
 	# the heap by the JIT compiler. This has to be done before CDS - #215225