Remove vulnerable and unused versions; Add -* back to KEYWORDS for 1.5.0.11.

(Portage version: 2.1.2.7)

6 files changed, 8 insertions, 295 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 14ed834c4048..ed6e8f8e1d46 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 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.88 2007/05/13 19:38:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.89 2007/05/14 09:41:09 caster Exp $
+
+  14 May 2007; Vlastimil Babka <caster@gentoo.org>
+  -sun-jre-bin-1.5.0.10.ebuild, sun-jre-bin-1.5.0.11.ebuild,
+  -sun-jre-bin-1.6.0.ebuild:
+  Remove vulnerable and unused versions; Add -* back to KEYWORDS for 1.5.0.11.
 
   13 May 2007; Raúl Porcel <armin76@gentoo.org>
   sun-jre-bin-1.6.0-r1.ebuild:
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.10 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.10
deleted file mode 100644
index d0c6ebd39a99..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.10
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 eca3b5106aa3cb0469ea01b96dc70510 jdk-1_5_0_10-dlj-linux-amd64.bin 43906073
-RMD160 2d13d637b6d7351410f9e18d581206a05091effe jdk-1_5_0_10-dlj-linux-amd64.bin 43906073
-SHA256 5bbac3fb78db48f7f996e412d45229db3a0b759886f360504cca61c93d4b5f61 jdk-1_5_0_10-dlj-linux-amd64.bin 43906073
-MD5 baa5f71d72d1d4d7c38374d59bedfe7c jdk-1_5_0_10-dlj-linux-i586.bin 49553457
-RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 jdk-1_5_0_10-dlj-linux-i586.bin 49553457
-SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa jdk-1_5_0_10-dlj-linux-i586.bin 49553457
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0
deleted file mode 100644
index 95693b0f544e..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2e0c075c27b09aed67f99475c3a19f83 jdk-6-dlj-linux-amd64.bin 56347832
-RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e jdk-6-dlj-linux-amd64.bin 56347832
-SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3 jdk-6-dlj-linux-amd64.bin 56347832
-MD5 f4481c4e064cec06a65d7751d9105c6d jdk-6-dlj-linux-i586.bin 62718862
-RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac jdk-6-dlj-linux-i586.bin 62718862
-SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 jdk-6-dlj-linux-i586.bin 62718862
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.10.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.10.ebuild
deleted file mode 100644
index 6f0f55eddb97..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.10.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2007 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.5.0.10.ebuild,v 1.3 2007/01/23 10:38:24 beandog Exp $
-
-inherit pax-utils eutils java-vm-2
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-#S="${WORKDIR}/jdk${MY_PVL}"
-
-X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-if use x86; then
-	At=${X86_AT}
-elif use amd64; then
-	At=${AMD64_AT}
-fi
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64 x86"
-RESTRICT="nostrip"
-IUSE="X alsa nsplugin"
-
-RDEPEND="
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	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_install() {
-	local dirs="bin lib man"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables ${S}/bin/*)
-
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html
-	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
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# TODO Don't think we still needs these -nichoj
-	# create dir for system preferences
-	#dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	#touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	#touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	# 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
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		local xwarn="virtual/x11 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/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild
index dda4ed183aba..4ba1d1b7d3b7 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.5.0.11.ebuild,v 1.3 2007/05/11 15:13:23 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild,v 1.4 2007/05/14 09:41:09 caster Exp $
 
 inherit pax-utils eutils java-vm-2
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
 		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
 SLOT="1.5"
 LICENSE="dlj-1.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="nostrip"
 IUSE="X alsa nsplugin"
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.ebuild
deleted file mode 100644
index 96158e5a018f..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/12/14 00:21:12 caster Exp $
-
-inherit pax-utils eutils java-vm-2
-
-#MY_PVA=${PV//./_}
-MY_PVA=6
-#S="${WORKDIR}/jdk${PV}"
-
-X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-if use x86; then
-	At=${X86_AT}
-elif use amd64; then
-	At=${AMD64_AT}
-fi
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="nostrip"
-IUSE="X alsa nsplugin"
-
-RDEPEND="
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	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_install() {
-	local dirs="bin lib man"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables ${S}/bin/*)
-
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html
-	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
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# TODO Don't think we still needs these -nichoj
-	# create dir for system preferences
-	#dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	#touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	#touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	# 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
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		local xwarn="virtual/x11 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"
-}