Remove old versions, remove version from DESCRIPTION - bug #186276.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

6 files changed, 12 insertions, 303 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index e2dba12269be..98e574e0c771 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.257 2009/05/10 17:46:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.258 2009/05/29 20:30:58 caster Exp $
+
+  29 May 2009; Vlastimil Babka <caster@gentoo.org> sun-jdk-1.4.2.19.ebuild,
+  -sun-jdk-1.5.0.17.ebuild, sun-jdk-1.5.0.18.ebuild,
+  -sun-jdk-1.6.0.12.ebuild, sun-jdk-1.6.0.13.ebuild:
+  Remove old versions, remove version from DESCRIPTION - bug #186276.
 
   10 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   sun-jdk-1.4.2.19.ebuild, sun-jdk-1.5.0.18.ebuild, sun-jdk-1.6.0.13.ebuild:
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild
index 1c1e2faeb456..f9ce017bf0fe 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-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/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild,v 1.3 2009/05/10 17:46:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild,v 1.4 2009/05/29 20:30:58 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit pax-utils java-vm-2 eutils
@@ -14,7 +14,7 @@ At="j2sdk-${PV//./_}-linux-i586.bin"
 jce_policy="jce_policy-${MY_PVB//./_}.zip"
 
 S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Sun's J2SE Development Kit"
+DESCRIPTION="Sun's Java SE Development Kit"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
 SRC_URI="x86? ( ${At} )
 		jce? ( ${jce_policy} )"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild
deleted file mode 100644
index f18acbd35ae7..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2008 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.5.0.17.ebuild,v 1.2 2008/12/10 22:04:25 maekke Exp $
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version 1.5"
-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="strip"
-IUSE="X alsa doc examples jce nsplugin odbc"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
-
-DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? (
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXtst
-			x11-libs/libXt
-			x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-src_unpack() {
-	sh "${DISTDIR}/${A}" --accept-license --unpack || 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 needs to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	# see bug #207282
-	if use x86; then
-		einfo "Creating the Class Data Sharing archives"
-		"${S}"/bin/java -client -Xshare:dump || die
-	fi
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT README.html || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo "${D}/opt/${P}/" || die
-		cp -pPR sample "${D}/opt/${P}/" || die
-	fi
-
-	if use jce; then
-		cd "${D}"/opt/${P}/jre/lib/security || die
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
-		dosym ${jcedir}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-		dosym ${jcedir}/local_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-	fi
-
-	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}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# 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
-
-	# install control panel for Gnome/KDE
-	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-			-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			"${T}"/sun_java-${SLOT}.desktop \
-			|| die "Failed to sed .desktop file"
-
-		domenu "${T}"/sun_java-${SLOT}.desktop
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	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"
-	elog ""
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild
index 1a17dda8e2f8..78eb4358287d 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-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/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild,v 1.3 2009/05/10 17:46:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild,v 1.4 2009/05/29 20:30:58 caster Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -11,7 +11,7 @@ MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
 X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
 AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
 
-DESCRIPTION="Sun's J2SE Development Kit, version 1.5"
+DESCRIPTION="Sun's Java SE Development Kit"
 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} )"
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.12.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.12.ebuild
deleted file mode 100644
index 6ff52f0a499e..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.12.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2009 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.12.ebuild,v 1.4 2009/03/11 22:50:09 maekke Exp $
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-URL_BASE="http://download.java.net/dlj/binaries"
-SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
-		amd64? ( ${URL_BASE}/${AMD64_AT} )"
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="amd64 x86"
-RESTRICT="strip"
-IUSE="X alsa doc examples jce nsplugin odbc"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
-	opt/${P}/jre/lib/i386/libdeploy.so
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-
-DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
-RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXtst
-			amd64? ( x11-libs/libXt )
-			x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} --accept-license --unpack || 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 needs to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	# see bug #207282
-	if use x86; then
-		einfo "Creating the Class Data Sharing archives"
-		"${S}"/bin/java -client -Xshare:dump || die
-		"${S}"/bin/java -server -Xshare:dump || die
-	fi
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	dodir /opt/${P}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo sample "${D}/opt/${P}/" || die
-	fi
-
-	if use jce; then
-		cd "${D}/opt/${P}/jre/lib/security"
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${D}"/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/
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	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}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-			install_mozilla_plugin /opt/${P}/jre/lib/i386/libnpjp2.so plugin2
-		else
-			install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so
-		fi
-	fi
-
-	# 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
-
-	if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			"${T}"/sun_jdk-${SLOT}.desktop
-
-		domenu "${T}"/sun_jdk-${SLOT}.desktop
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if use x86 && use nsplugin; then
-		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
-	fi
-
-	if use amd64 && use nsplugin; then
-		elog
-		elog "This version finally brings a browser plugin for amd64"
-		elog "It is the so-called Next-Generation Plug-In (plugin2)"
-		elog "Use eselect java-nsplugin to select it (${VMHANDLE})."
-		ewarn "Note that it works only in Firefox 3 or newer browsers!"
-		elog "For more info see https://jdk6.dev.java.net/plugin2/"
-		elog
-	fi
-
-	elog "Please reinstall eclipse-sdk if you have it installed and want"
-	elog "workaround for bug #215150."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild
index af30ef74c4ab..987bc88e4d91 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-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/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild,v 1.3 2009/05/10 17:46:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild,v 1.4 2009/05/29 20:30:58 caster Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -10,7 +10,7 @@ MY_PV="$(get_version_component_range 2)u${UPDATE}"
 X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
 AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
 
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+DESCRIPTION="Sun's Java SE Development Kit"
 HOMEPAGE="http://java.sun.com/javase/6/"
 URL_BASE="http://download.java.net/dlj/binaries"
 SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )