Fix missing filename in fetch instructions, bug #389141. Remove old.

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

5 files changed, 10 insertions, 260 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 5912e50facab..534092a9c6a1 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,11 @@
 # 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.106 2011/11/05 10:11:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.107 2011/11/05 21:34:26 caster Exp $
+
+  05 Nov 2011; Vlastimil Babka <caster@gentoo.org>
+  -emul-linux-x86-java-1.6.0.26.ebuild, -emul-linux-x86-java-1.6.0.27.ebuild,
+  emul-linux-x86-java-1.6.0.29.ebuild:
+  Fix missing filename in fetch instructions, bug #389141. Remove old.
 
   05 Nov 2011; Markos Chandras <hwoarang@gentoo.org>
   emul-linux-x86-java-1.6.0.29.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index b1f4e5536aa9..bbca863ae6a9 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,32 +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
 AUX emul-linux-x86-java-1.6.env-r1 969 RMD160 dba3f41645b6f397d30bce6882cd34b094729f82 SHA1 e6e3901a42082c3e46542ed8fe657418ce1b9a27 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4
 AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
-DIST jdk-6u26-dlj-linux-i586.bin 85214224 RMD160 dac0e73fe5cf6ea6cf9b6421f63205bc3856de50 SHA1 abd1e40bf9e51ee41c8a6863efe68e32d3c0b96e SHA256 54561b0b129c206cd6c29fe43968e8a8702fa437ed8df6debd8ffd1a2e536fae
-DIST jre-6u27-linux-i586.bin 21630577 RMD160 3965b5149755859e1d0a853e6dfa5d7eb408a82f SHA1 5a3d2e304d6cf62ee6a56cce322014cf3ceab2ad SHA256 1f8bb6a43373695b811aa9e16cccfcc23493860194d70c6b6a34e8b32b904780
 DIST jre-6u29-linux-i586.bin 21632980 RMD160 ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a SHA1 6de26b992a9920117d2f156ff5bbddf2d5b28f77 SHA256 13bd1ce27709be7d05c07221185d4f572242b14a80cea67b557e761f5ba7e440
-EBUILD emul-linux-x86-java-1.6.0.26.ebuild 3492 RMD160 77bdedb6dde29faa938af8f673a42cd5f6b208c4 SHA1 0239a7c8b95ee44adf82164d440ee27fa6881f53 SHA256 6fb905e00b5f11f006d5406674e707785d38930795b9fd77083aa3a22ccd81b0
-EBUILD emul-linux-x86-java-1.6.0.27.ebuild 3728 RMD160 39748c3a9b35db80c898156196ba687c53bad95c SHA1 18520afdc37e6dc0bb4966430d6ee141d08fe9de SHA256 2289f6b6a52ad52c394c353fcc299d31192649a83c34e1bf86f92fec9f9cfac1
-EBUILD emul-linux-x86-java-1.6.0.29.ebuild 3438 RMD160 375cedc231e5143b723243bed52a8e03edcfa09a SHA1 fb2d4c1cd87584556164f2c79b3188f17560e83e SHA256 22ed27064737c6145d749de8f787048a9c6d6ada814eadff73e7ef26142f5068
-MISC ChangeLog 21513 RMD160 7854eb90678c0917fbe0cbe821a7ab9780a49cdd SHA1 14e0389cbdc4187111cf0b49bec9482921904873 SHA256 3be4b2208acd6a046a71f5a5f6054dd5c4673aede437c8432ceec8ddc7e27624
+EBUILD emul-linux-x86-java-1.6.0.29.ebuild 3440 RMD160 40d8e65c7178c4270ef3f4f3b931e33f5f48a47e SHA1 6e564fbe4726720c67b5f7692d174e996ad06b38 SHA256 a42ce456196823981d815c3032da62df0bf816aee4e838bf69941eed5944d1d8
+MISC ChangeLog 21751 RMD160 5d9f58535dde27d1b5f635535c93cf35193a6122 SHA1 8f19b31bfaa55ee7c17143a4f80cdbd68918a1ad SHA256 2d8aeaf828079f6547989ef7de6e6a190129580b8df12a16d337e95be5778142
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOtQvTAAoJEPqDWhW0r/LCQREP/i6/QUtiCciizNv79V/1vT09
-bNVYxaee4Elxbwno+JDaI/DSpSACLiEGJ5fljmhaGeAEzEyJUNZHH2cVD46W+vAA
-Nby/aAeLRVd1QKFulzzXaeGObgSYUnxSXevHeR0m/z3bVPfINnVCdo1JZseZU7HU
-ymso25Fe+lY4SklxgfCIvNMfhD/cIe4a4uJQU5351KMw4cQ4ludtHSLAkxjjwND9
-eo/bwmonUlZmx2Saonr7pDzoy53QoFy0QYfClNHGL3oz9OyUsqtzOxaa7IgLbn+9
-PAHFcb9LqiGcKxReCsOj50KF5EPXcZa6dE/apzRD+99rWQPizr9Y4bRygTs6vLqM
-yNbUbUwbM0ZFWBYVmIOzZghIknnxSP0KXfbAoLgAVH/dMQs0AJ5Fpzi707AjOEFa
-hsyDkLHYJxLBqA2A4iFqcJu7ulImp2kHCmcORYVeQA8QFb5y6/SmZCdozOMoUeHh
-QDOBeuTYrGSrMYIRm1z+/a8HVypSQvJstbUTgGR7ZYEgvCWkYEGWHjbkJaFL0N9p
-tU3KZ0Gp7aqjrlMLlK0Bebhvr7az9O/hZZBb2Gz8g85bIuysNe8huThYAJ4BIqvk
-Eie6jjqrs9Cq1epwGWU/Pm9evn5cv3pPp7c4ct1oHzlOo7cosFZPqPTdOJldsyO1
-1xve8rdHQvqtSHiB8ihz
-=Nshg
------END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.26.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.26.ebuild
deleted file mode 100644
index 7b4a018641cc..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.26.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.26.ebuild,v 1.2 2011/06/18 11:50:01 hwoarang 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.27.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.27.ebuild
deleted file mode 100644
index d7e6dc359335..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.27.ebuild
+++ /dev/null
@@ -1,119 +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.27.ebuild,v 1.2 2011/09/01 19:15:34 mr_bones_ 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}"
-
-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="Oracle-BCLA-JavaSE"
-KEYWORDS="-* ~amd64"
-RESTRICT="fetch 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}/.*"
-
-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."
-
-	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
-	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.29.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.29.ebuild
index 665a41ad3b31..91b2b3a3926c 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.29.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.29.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.29.ebuild,v 1.3 2011/11/05 10:11:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.29.ebuild,v 1.4 2011/11/05 21:34:26 caster Exp $
 
 EAPI="4"
 
@@ -39,7 +39,7 @@ S="${WORKDIR}/jre${S_PV}"
 pkg_nofetch() {
 	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
 
-	einfo "Please download ${AT} from:"
+	einfo "Please download ${X86_AT} from:"
 	einfo "${JRE_URI}"
 	einfo "and move it to ${DISTDIR}"
 }