Remove old versions, unify DESCRIPTION.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 17 insertions, 223 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index de24badc3161..4e5fcff91858 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.69 2009/05/10 20:12:45 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.70 2009/05/29 20:34:25 caster Exp $
+
+  29 May 2009; Vlastimil Babka <caster@gentoo.org>
+  emul-linux-x86-java-1.4.2.19.ebuild, -emul-linux-x86-java-1.5.0.17.ebuild,
+  emul-linux-x86-java-1.5.0.18.ebuild, -emul-linux-x86-java-1.6.0.12.ebuild,
+  emul-linux-x86-java-1.6.0.13.ebuild:
+  Remove old versions, unify DESCRIPTION.
 
   10 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   emul-linux-x86-java-1.4.2.19.ebuild, emul-linux-x86-java-1.5.0.18.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 6274c2218b78..f3828d780264 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -4,14 +4,10 @@ AUX emul-linux-x86-java-1.4.env 857 RMD160 65dc6da72579122d52475e5fe2c965f7aaea9
 AUX emul-linux-x86-java-1.5.env 855 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fdca0 SHA1 d989ddc315757eb44aff787ea2c70a6dc848130d SHA256 d36f364c0855d13d7ec2eb4ea3cdbaa483318f1f57b7720edfa5eb0050a12cdb
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
 DIST j2re-1_4_2_19-linux-i586.bin 14384815 RMD160 54b15f0ea03c7cb7e35b91fe8a6269e21a0d39b2 SHA1 7b230633bf6eaf3581f69d668542431c5833184a SHA256 d1d2f7cd9f0cddee9f65a0d093a0718faceb4b013b0658a92457512f84c8e973
-DIST jdk-5.0u17-dlj-linux-i586.bin 49690762 RMD160 a9baa1a26acf284b31b7b81278bd32a7dada7c38 SHA1 d9f72fbb0aed5c27d7d40671a318597906771fd9 SHA256 427a6abd1435c23bf3bc953cca13a0d3b22f3be5e1c1bb14d21ac88e898c021a
 DIST jdk-5.0u18-dlj-linux-i586.bin 49702576 RMD160 be719b111ce24d5a14b0ed8ad26a9335283866f7 SHA1 2be236e00cf95a7ba1d2a48156eecd6bd367445d SHA256 460dd267a532d9965e65aec8be8288870ff4aadc0cabe331dd4a1d4c058c53be
-DIST jdk-6u12-dlj-linux-i586.bin 80137544 RMD160 ecf3c45703950e946874b9347d9f0d2145da1d26 SHA1 bbbb8cd68fa206e85e78221f3600b41ceb306896 SHA256 97348da8b3c1d92421fffd24766127e0eba2770ab10b014855e867b4eedb680c
 DIST jdk-6u13-dlj-linux-i586.bin 80161911 RMD160 8167ed89d38722577547d4f46f5fa06cf07fedf3 SHA1 ef9177f519ad03669921876fd711c1c02f306abf SHA256 a07d48549bb48becf7a1185b2ce908797a9dcfcc834ff111e8b6d9ad19ce60d7
-EBUILD emul-linux-x86-java-1.4.2.19.ebuild 3552 RMD160 985ddadc7f035ff9c66f2751fdf119b54e68d5a4 SHA1 151112e82e89fe8bf1d08b0a72fcfffe27a24ae5 SHA256 8e56f318794e82ead56d6359db554202899e0daa90a0dab0d3f94b7ae12702b3
-EBUILD emul-linux-x86-java-1.5.0.17.ebuild 2865 RMD160 122095cd87576e4a1238de4ef437001619f8df1c SHA1 efcb8f7071c1af246c14473745f2971e6364750f SHA256 8d0085cd176d2dcf77ef8b53be0ea9b472975bcb183dec9bada7c9b4140f9067
-EBUILD emul-linux-x86-java-1.5.0.18.ebuild 2892 RMD160 73c862c4ddc88b3f8c3ae71d2cdbd3ef89a1b38d SHA1 56b39580c0849bbc40c44b4586d170e10c4c66b9 SHA256 9c4214c54c15d1759c7923c06a451ac5428ef5b13a77aa4b2645da9c5b1eb5ce
-EBUILD emul-linux-x86-java-1.6.0.12.ebuild 3224 RMD160 6b98e51eb4bceaf1eafe286b153a1a8cd4c4c126 SHA1 628eb2e1b432d1ef7e40ce9a17099a80b66a43a1 SHA256 71dc4b764fff4fce71a9e3ade9c7eb29b69ea34e6decb117473f121cf25627aa
-EBUILD emul-linux-x86-java-1.6.0.13.ebuild 3251 RMD160 0bcb5bf5533b72a85f96aca466baff64f6b968f3 SHA1 1b663423d0c1a27ed65e1d9b5e60c6e68f5ce427 SHA256 70c7dbed38f0292225a79cfdb551190103eb4fd209fcd6d7543d7d41c2a411c7
-MISC ChangeLog 14538 RMD160 6c0febb6ced4360dd0294365c099917fc09707c7 SHA1 9bcbda723da7f77b2f2d8aa81736b21c9c7452a4 SHA256 9eea46a395d07b94d9056d72103aeafbd74f5006aee2c8c939abc63325450dac
+EBUILD emul-linux-x86-java-1.4.2.19.ebuild 3574 RMD160 388fe86f06cf787092edf09423952728bb0bd90c SHA1 f7e4b280906c26a3d4b313443781ea9d8700ebe5 SHA256 7c1c2cc940a58ce0daafa531a17b8e70c880b9eaf4e8bac5992b43d80436a983
+EBUILD emul-linux-x86-java-1.5.0.18.ebuild 2887 RMD160 368079fcc2bd06fc6ee61a4ec8e4df1da0f9c968 SHA1 a2ba000eaae67fe57e7771c4095c66205ce47c95 SHA256 302cc31d503db45f1f745db582b1ccce5b1a323b75bbe7bd9ad21081f05b829c
+EBUILD emul-linux-x86-java-1.6.0.13.ebuild 3246 RMD160 3bf47aa3bb202e4d21cab7e5b90a7305daeb7b0e SHA1 4da69cf51cb414a4aedda6791169627a95eb685e SHA256 242c2f6252f129e2918ea90b822ce64fdd5b13a08b1984dae3aaad6d89a32f05
+MISC ChangeLog 14823 RMD160 a3523cef6f096a2c912c1531d015fe86b439a30f SHA1 a93c0e3ec323515cbada0d5a8895412a541bd77b SHA256 c8de649be2dac33550f935757e6bee286e420a51059eb2b43ac836bf812c73b0
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.19.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.19.ebuild
index 3ee3a71eb44b..8b2d57950fec 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.19.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.4.2.19.ebuild,v 1.3 2009/05/10 20:12:45 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.19.ebuild,v 1.4 2009/05/29 20:34:25 caster Exp $
 
 inherit multilib eutils pax-utils java-vm-2
 
@@ -9,7 +9,7 @@ MY_PV2=${PV//./_}
 MY_PN=j2re
 At="${MY_PN}-${MY_PV2}-linux-i586.bin"
 S="${WORKDIR}/j2re${MY_PV}"
-DESCRIPTION="Sun's JRE (32bit)"
+DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
 SRC_URI=${At}
 SLOT="1.4"
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.17.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.17.ebuild
deleted file mode 100644
index a0588150ad03..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.17.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2008 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.5.0.17.ebuild,v 1.2 2008/12/10 22:07:16 maekke Exp $
-
-inherit versionator pax-utils eutils java-vm-2
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
-
-At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="32bit version Sun's J2SE Runtime Environment"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="http://download.java.net/dlj/binaries/${At}"
-
-SLOT="1.5"
-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"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}"/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.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
-}
-
-src_install() {
-	dodir /opt/${P}
-	cp -pPR bin lib man javaws plugin "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-
-	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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	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
-
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-
-	echo
-	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-	elog "The epoll-based implementation of SelectorProvider is not selected by"
-	elog "default."
-	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.18.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.18.ebuild
index 68797d18ea09..5d1ab13482ca 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.18.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.5.0.18.ebuild,v 1.3 2009/05/10 20:12:45 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.18.ebuild,v 1.4 2009/05/29 20:34:25 caster Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -9,7 +9,7 @@ UPDATE="${UPDATE#0}"
 MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
 
 At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="32bit version Sun's J2SE Runtime Environment"
+DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
 HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
 SRC_URI="http://download.java.net/dlj/binaries/${At}"
 
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.12.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.12.ebuild
deleted file mode 100644
index 16087b4ac7bc..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.12.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2009 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.12.ebuild,v 1.2 2009/03/11 22:50:59 maekke 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="32bit version Sun's J2SE Runtime Environment"
-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 )
-	app-emulation/emul-linux-x86-compat"
-
-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"
-
-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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
-	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 "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
-	ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
-	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} virtual/lpr 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.13.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.13.ebuild
index daad4d133857..c6632a810951 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.13.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.13.ebuild,v 1.3 2009/05/10 20:12:45 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.13.ebuild,v 1.4 2009/05/29 20:34:25 caster Exp $
 
 inherit versionator pax-utils java-vm-2 eutils
 
@@ -9,7 +9,7 @@ UPDATE="${UPDATE#0}"
 MY_PV="$(get_version_component_range 2)u${UPDATE}"
 
 At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="32bit version Sun's J2SE Runtime Environment"
+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}"