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

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

25 files changed, 57 insertions, 1197 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 153202c2e9d6..f3d9bd9b4c3b 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.201 2009/05/01 14:20:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.202 2009/05/29 20:37:25 caster Exp $
+
+  29 May 2009; Vlastimil Babka <caster@gentoo.org>
+  ibm-jdk-bin-1.4.2.13.ebuild, -ibm-jdk-bin-1.5.0.9.ebuild,
+  ibm-jdk-bin-1.5.0.9-r1.ebuild, ibm-jdk-bin-1.6.0.0.ebuild,
+  ibm-jdk-bin-1.6.0.4.ebuild:
+  Remove old versions, remove version from DESCRIPTION - bug #186276.
 
   01 May 2009; Markus Meier <maekke@gentoo.org>
   ibm-jdk-bin-1.5.0.9-r1.ebuild:
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild
index 4596d17b39fd..a11fedf40c3e 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild,v 1.3 2009/04/04 13:54:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild,v 1.4 2009/05/29 20:37:25 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator
@@ -49,7 +49,7 @@ fi
 
 DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
 
-DESCRIPTION="IBM Java Development Kit"
+DESCRIPTION="IBM Java SE Development Kit"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 # bug #125178
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.ebuild
index bbce8977643e..a29c78d23884 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.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/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.ebuild,v 1.3 2009/05/01 14:20:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.ebuild,v 1.4 2009/05/29 20:37:25 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -50,7 +50,7 @@ fi
 DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}-ssu&S_TACT=105AGX05&S_CMP=JDK"
 
 SLOT="1.5"
-DESCRIPTION="IBM Java Development Kit ${SLOT}"
+DESCRIPTION="IBM Java SE Development Kit"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 # bug #125178
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9.ebuild
deleted file mode 100644
index 1ebc104167f2..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9.ebuild
+++ /dev/null
@@ -1,254 +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/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9.ebuild,v 1.5 2009/04/22 12:46:56 caster Exp $
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java2-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java2-javacomm-${TGZ_PV}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.old.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.old.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.old.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.old.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.old.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.old.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.old.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.old.tgz"
-
-if use x86; then
-	JDK_DIST=${X86_JDK_DIST}
-	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-i386-50"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-x86_64-50"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-ppc-50"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-ppc64-50"
-	LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.5"
-DESCRIPTION="IBM Java Development Kit ${SLOT}"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( ${X86_JDK_DIST} )
-	amd64? ( ${AMD64_JDK_DIST} )
-	ppc? ( ${PPC_JDK_DIST} )
-	ppc64? ( ${PPC64_JDK_DIST} )
-	javacomm? (
-		x86? ( ${X86_JAVACOMM_DIST} )
-		amd64? ( ${AMD64_JAVACOMM_DIST} )
-		ppc? ( ${PPC_JAVACOMM_DIST} )
-		ppc64? ( ${PPC64_JAVACOMM_DIST} )
-		)"
-LICENSE="IBM-J1.5"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc"
-
-RDEPEND="=virtual/libstdc++-3.3
-	X? (
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	nsplugin? (
-		x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
-		ppc? ( =x11-libs/gtk+-1* )
-	)
-	odbc? ( dev-db/unixODBC )"
-
-DEPEND=""
-
-QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9vrb23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9trc23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9shr23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9hookable23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9dyn23.so
-	opt/${P}/jre/bin/libj9dmp23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9bcv23.so
-	opt/${P}/jre/bin/libiverel23.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/j9vm/libjvm.so"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9jit23.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9hookable23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9dyn23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9dmp23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libiverel23.so
-	opt/${P}/jre/bin/libj9trc23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9shr23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9vrb23.so
-	opt/${P}/jre/bin/libj9bcv23.so
-	opt/${P}/jre/bin/libj9aotrt23.so
-	opt/${P}/jre/bin/classic/libjvm.so"
-
-QA_TEXTRELS_ppc="opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9aotrt23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9gcchk23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libj9jitd23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libjaas.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libjsig.so
-"
-
-QA_TEXTRELS_ppc64="opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libjsig.so
-	opt/${P}/jre/bin/libj9jitd23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9gcchk23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9jit23.so"
-
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/xawt/libmawt.so
-	opt/${P}/jre/bin/javaplugin.so
-	opt/${P}/jre/bin/motif21/libmawt.so
-	opt/${P}/jre/bin/headless/libmawt.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/lib/i386/libdeploy.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "(note that we switched to tgz format because it's now versioned)"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-
-	einfo "You can use direct link to your arch download page:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "And rename them by replacing .tgz with .old.tgz"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug #126105
-	epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/{bin,jre,lib,include,src.jar} "${D}/opt/${P}/"
-
-	dodir /opt/${P}/share
-	if use examples; then
-		cp -pPR "${S}/demo" "${D}/opt/${P}/share/"
-	fi
-
-	local x86plugin=libjavaplugin_ojigtk2.so
-	local ppcplugin=libjavaplugin_oji.so
-	local jrebindest="${D}/opt/${P}/jre/bin/"
-
-	local plugin
-	if use x86; then
-		plugin=${x86plugin}
-	elif use ppc; then
-		plugin=${ppcplugin}
-	fi
-
-	plugin=/opt/${P}/jre/bin/${plugin}
-
-	if use x86 || use ppc; then
-		if use nsplugin; then
-			install_mozilla_plugin ${plugin}
-		fi
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc "${S}/COPYRIGHT"
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
index 5ab1645805c0..96d7ded3572f 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild,v 1.6 2008/02/26 16:24:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild,v 1.7 2009/05/29 20:37:25 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -51,7 +51,7 @@ fi
 DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}&S_TACT=105AGX05&S_CMP=JDK"
 
 SLOT="1.6"
-DESCRIPTION="IBM Java Development Kit ${SLOT}"
+DESCRIPTION="IBM Java SE Development Kit"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 # bug #125178
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild
index 08d185b37bda..ec40af9b4d8c 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.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/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v 1.3 2009/04/22 21:37:47 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v 1.4 2009/05/29 20:37:25 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -63,7 +63,7 @@ fi
 DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
 
 SLOT="1.6"
-DESCRIPTION="IBM Java Development Kit ${SLOT}"
+DESCRIPTION="IBM Java SE Development Kit"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 # bug #125178
diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 019c8fb5b943..daa5c02352b8 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.126 2009/05/01 14:21:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.127 2009/05/29 20:39:13 caster Exp $
+
+  29 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jre-bin-1.4.2.12.ebuild, ibm-jre-bin-1.4.2.13.ebuild,
+  -ibm-jre-bin-1.5.0.9.ebuild, ibm-jre-bin-1.5.0.9-r1.ebuild,
+  ibm-jre-bin-1.6.0.4.ebuild:
+  Remove old versions, remove version from DESCRIPTION - bug #186276.
 
   01 May 2009; Markus Meier <maekke@gentoo.org>
   ibm-jre-bin-1.5.0.9-r1.ebuild:
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.12.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.12.ebuild
deleted file mode 100644
index 8c67b1f46afa..000000000000
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.12.ebuild
+++ /dev/null
@@ -1,129 +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/ibm-jre-bin/ibm-jre-bin-1.4.2.12.ebuild,v 1.3 2008/10/15 07:47:11 corsair Exp $
-
-inherit java-vm-2 eutils versionator
-
-JDK_RELEASE=$(get_version_component_range 1-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JRE_DIST_PREFIX="IBMJava2-JRE-${RPM_PV}"
-
-X86_JRE_DIST="${JRE_DIST_PREFIX}.tgz"
-# wonder why amd64 has this extra special AMD64 in its filename...
-AMD64_JRE_DIST="IBMJava2-JRE-AMD64-${RPM_PV}.x86_64.tgz"
-PPC_JRE_DIST="${JRE_DIST_PREFIX}.ppc.tgz"
-PPC64_JRE_DIST="${JRE_DIST_PREFIX}.ppc64.tgz"
-
-if use x86; then
-	JRE_DIST=${X86_JRE_DIST}
-	S="${WORKDIR}/IBMJava2-142"
-	LINK_ARCH="ia32"
-elif use amd64; then
-	JRE_DIST=${AMD64_JRE_DIST}
-	S="${WORKDIR}/IBMJava2-amd64-142"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JRE_DIST=${PPC_JRE_DIST}
-	S="${WORKDIR}/IBMJava2-ppc-142"
-	LINK_ARCH="ip32"
-elif use ppc64; then
-	JRE_DIST=${PPC64_JRE_DIST}
-	S="${WORKDIR}/IBMJava2-ppc64-142"
-	LINK_ARCH="ip64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
-
-DESCRIPTION="IBM Java Runtime Environment"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( ${X86_JRE_DIST} )
-	amd64? ( ${AMD64_JRE_DIST} )
-	ppc? ( ${PPC_JRE_DIST} )
-	ppc64? ( ${PPC64_JRE_DIST} )"
-
-LICENSE="IBM-J1.4"
-SLOT="1.4"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-IUSE="X alsa nsplugin"
-
-RDEPEND="=virtual/libstdc++-3.3
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)"
-DEPEND=""
-
-RESTRICT="fetch"
-
-QA_TEXTRELS_x86="opt/${P}/bin/lib*.so
-	opt/${P}/bin/javaplugin.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/classic/libcore.so"
-QA_TEXTRELS_amd64="
-	opt/${P}/bin/j9vm/libj9jit23.so
-	opt/${P}/bin/j9vm/libjclscar_23.so
-	opt/${P}/bin/libj9jit22.so
-	opt/${P}/bin/libjclscar_22.so
-"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "${JRE_DIST}"
-
-	einfo "Direct link:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link. If it doesn't work, file a bug."
-}
-
-src_compile() { :; }
-
-src_install() {
-	# javaws is on x86 only
-	if use x86; then
-		# The javaws execution script is 777 why?
-		chmod 0755 "${S}"/jre/javaws/javaws
-
-		# bug #147259
-		dosym ../javaws/javaws /opt/${P}/bin/javaws
-	fi
-
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/jre/* "${D}"/opt/${P}/
-
-	if use x86 && use nsplugin; then
-		local plugin="libjavaplugin_oji.so"
-
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin="libjavaplugin_ojigcc3.so"
-		fi
-
-		install_mozilla_plugin /opt/${P}/bin/${plugin}
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc "${S}"/docs/COPYRIGHT
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.13.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.13.ebuild
index cdb2af1b0ed3..6a161af992f0 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.13.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.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/ibm-jre-bin/ibm-jre-bin-1.4.2.13.ebuild,v 1.3 2009/04/22 14:29:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.13.ebuild,v 1.4 2009/05/29 20:39:13 caster Exp $
 
 inherit java-vm-2 eutils versionator
 
@@ -36,7 +36,7 @@ fi
 
 DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
 
-DESCRIPTION="IBM Java Runtime Environment"
+DESCRIPTION="IBM Java SE Runtime Environment"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9-r1.ebuild
index 9d818722b2f5..b90a0712aec7 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9-r1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9-r1.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/ibm-jre-bin/ibm-jre-bin-1.5.0.9-r1.ebuild,v 1.3 2009/05/01 14:21:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9-r1.ebuild,v 1.4 2009/05/29 20:39:13 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -38,7 +38,7 @@ fi
 DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}-ssu&S_TACT=105AGX05&S_CMP=JDK"
 
 SLOT="1.5"
-DESCRIPTION="IBM Java Runtime Environment ${SLOT}"
+DESCRIPTION="IBM Java SE Runtime Environment"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 # bug #125178
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9.ebuild
deleted file mode 100644
index 6f72388328a0..000000000000
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9.ebuild
+++ /dev/null
@@ -1,216 +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/ibm-jre-bin/ibm-jre-bin-1.5.0.9.ebuild,v 1.5 2009/04/22 12:59:21 caster Exp $
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JRE_DIST_PREFIX="ibm-java2-jre-${TGZ_PV}-linux"
-
-X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.old.tgz"
-AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.old.tgz"
-PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.old.tgz"
-PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.old.tgz"
-
-if use x86; then
-	JRE_DIST=${X86_JRE_DIST}
-	S="${WORKDIR}/ibm-java2-i386-50"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JRE_DIST=${AMD64_JRE_DIST}
-	S="${WORKDIR}/ibm-java2-x86_64-50"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JRE_DIST=${PPC_JRE_DIST}
-	S="${WORKDIR}/ibm-java2-ppc-50"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JRE_DIST=${PPC64_JRE_DIST}
-	S="${WORKDIR}/ibm-java2-ppc64-50"
-	LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.5"
-DESCRIPTION="IBM Java Runtime Environment ${SLOT}"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( ${X86_JRE_DIST} )
-	amd64? ( ${AMD64_JRE_DIST} )
-	ppc? ( ${PPC_JRE_DIST} )
-	ppc64? ( ${PPC64_JRE_DIST} )"
-LICENSE="IBM-J1.5"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa nsplugin odbc"
-
-RDEPEND="=virtual/libstdc++-3.3
-		X? (
-			x11-libs/libXext
-			x11-libs/libXft
-			x11-libs/libXi
-			x11-libs/libXmu
-			x11-libs/libXp
-			x11-libs/libXtst
-			x11-libs/libXt
-			x11-libs/libX11
-		)
-		alsa? ( media-libs/alsa-lib )
-		nsplugin? (
-			x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
-			ppc? ( =x11-libs/gtk+-1* )
-		)
-		odbc? ( dev-db/unixODBC )"
-DEPEND=""
-
-QA_EXECSTACK_amd64="opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/libj9vrb23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libj9trc23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9shr23.so
-	opt/${P}/bin/libj9prt23.so
-	opt/${P}/bin/libj9jvmti23.so
-	opt/${P}/bin/libj9jpi23.so
-	opt/${P}/bin/libj9jit23.so
-	opt/${P}/bin/libj9jextract.so
-	opt/${P}/bin/libj9hookable23.so
-	opt/${P}/bin/libj9gc23.so
-	opt/${P}/bin/libj9dyn23.so
-	opt/${P}/bin/libj9dmp23.so
-	opt/${P}/bin/libj9dbg23.so
-	opt/${P}/bin/libj9bcv23.so
-	opt/${P}/bin/libiverel23.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/j9vm/libjvm.so"
-
-QA_TEXTRELS_amd64="opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/libj9jit23.so"
-
-QA_EXECSTACK_x86="opt/${P}/bin/j9vm/libjvm.so
-	opt/${P}/bin/libj9jvmti23.so
-	opt/${P}/bin/libj9hookable23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libj9dyn23.so
-	opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/libj9jpi23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9dmp23.so
-	opt/${P}/bin/libj9prt23.so
-	opt/${P}/bin/libj9jit23.so
-	opt/${P}/bin/libiverel23.so
-	opt/${P}/bin/libj9trc23.so
-	opt/${P}/bin/libj9dbg23.so
-	opt/${P}/bin/libj9jextract.so
-	opt/${P}/bin/libj9shr23.so
-	opt/${P}/bin/libj9gc23.so
-	opt/${P}/bin/libj9vrb23.so
-	opt/${P}/bin/libj9bcv23.so
-	opt/${P}/bin/libj9aotrt23.so
-	opt/${P}/bin/classic/libjvm.so"
-
-QA_TEXTRELS_ppc="opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/j9vm/libjvm.so
-	opt/${P}/bin/libj9aotrt23.so
-	opt/${P}/bin/libj9dbg23.so
-	opt/${P}/bin/libj9gc23.so
-	opt/${P}/bin/libj9gcchk23.so
-	opt/${P}/bin/libj9jextract.so
-	opt/${P}/bin/libj9jit23.so
-	opt/${P}/bin/libj9jitd23.so
-	opt/${P}/bin/libj9jpi23.so
-	opt/${P}/bin/libj9jvmti23.so
-	opt/${P}/bin/libj9prt23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9ute23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libjaas.so
-	opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/libjsig.so
-"
-
-QA_TEXTRELS_ppc64="opt/${P}/bin/libj9jextract.so
-	opt/${P}/bin/libjsig.so
-	opt/${P}/bin/libj9jitd23.so
-	opt/${P}/bin/libj9ute23.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/libj9prt23.so
-	opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/j9vm/libjvm.so
-	opt/${P}/bin/libj9gc23.so
-	opt/${P}/bin/libj9dbg23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9jpi23.so
-	opt/${P}/bin/libj9gcchk23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libj9jit23.so"
-
-QA_TEXTRELS_x86="opt/${P}/bin/lib*.so
-	opt/${P}/bin/j9vm/libjvm.so
-	opt/${P}/bin/xawt/libmawt.so
-	opt/${P}/bin/javaplugin.so
-	opt/${P}/bin/motif21/libmawt.so
-	opt/${P}/bin/headless/libmawt.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "${JRE_DIST}"
-
-	einfo "You can use direct link to your arch download page:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/jre/* "${D}/opt/${P}/"
-
-	local x86plugin=libjavaplugin_ojigtk2.so
-	local ppcplugin=libjavaplugin_oji.so
-	local jrebindest="${D}/opt/${P}/bin/"
-
-	local plugin
-	if use x86; then
-		plugin=${x86plugin}
-	elif use ppc; then
-		plugin=${ppcplugin}
-	fi
-
-	plugin=/opt/${P}/bin/${plugin}
-
-	if use x86 || use ppc; then
-		if use nsplugin; then
-			install_mozilla_plugin ${plugin}
-		fi
-	fi
-
-	dohtml -a html,htm,HTML -r docs || die
-	dodoc "${S}/COPYRIGHT" || die
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild
index a7c32fc9d962..2ee618ee1369 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.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/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild,v 1.2 2009/03/30 15:57:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild,v 1.3 2009/05/29 20:39:13 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -37,7 +37,7 @@ fi
 DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
 
 SLOT="1.6"
-DESCRIPTION="IBM Java Runtime Environment ${SLOT}"
+DESCRIPTION="IBM Java SE Runtime Environment"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 # bug #125178
diff --git a/dev-java/jrockit-jdk-bin/Manifest b/dev-java/jrockit-jdk-bin/Manifest
index f720d4a9a40d..8736ddd1585c 100644
--- a/dev-java/jrockit-jdk-bin/Manifest
+++ b/dev-java/jrockit-jdk-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jrockit-jdk-bin-1.4.2.08 282 RMD160 b09395b85e11eb18b445184c411de14ba99c7e07 SHA1 95872c422ada1f33d76770c5dee0c7847a06c656 SHA256 fcc999eb9a13d3894b0bc954335ac56dd8b57cc96d4639320e783be32b2a67f0
 AUX jrockit-jdk-bin-1.4.env 611 RMD160 eed6a14d91f6edd5464897ccc76ff165059efb05 SHA1 caad02cbb8cdefcd9cd9845c345757e68a440951 SHA256 cda9414cd42061cbfcb380e7fc543c62683b0598af79ed685f92d28ebafd39ad
 AUX jrockit-jdk-bin-1.5.0.03 292 RMD160 3fbd9841a2b29821a5e69f7299c9e3e1073b69ac SHA1 51ad23df1fd72ab80ad2ab30f3beec69d37bce72 SHA256 00e522d74513bdbcbf1880daf5758305896e819dea356f82abe415ab6e97e333
@@ -10,17 +7,7 @@ DIST jrockit-R27.5.0-jdk1.4.2_16-linux-ipf.bin 47912636 RMD160 15f0aa5ec31ba2b57
 DIST jrockit-R27.5.0-jdk1.5.0_14-linux-ia32.bin 91689385 RMD160 322526c8dfa457359108763e708fea4f65ee98b7 SHA1 55ed2063705ea66acdb722b62a0149c78cd11396 SHA256 b8ddaa1462f0499cc614b771b2a064a73bc3ee4ad0a0fb3af1209e9f9d49a52e
 DIST jrockit-R27.5.0-jdk1.5.0_14-linux-ipf.bin 63685320 RMD160 2a447895eaf96f06737f3d6ec063d14b911fb9c4 SHA1 52eddcb5d0063d9e577b5e603568d80cafd51f2e SHA256 1a6f0815e3676a2f21c95e36e1211d0360dbfad0f18dc8b5d522da485c42282d
 DIST jrockit-R27.5.0-jdk1.5.0_14-linux-x64.bin 92430012 RMD160 4d4a89e19d22466ed9eccd27cc7008b212c04b58 SHA1 9056597caa82ec61d0ee4f3999265e95805ba42d SHA256 5c1bea3fb03f681d97c35efd10204d7dae396e119f3405e0c3fefabb5eddf82a
-DIST jrockit-jdk1.4.2_14-linux_ia32.tar.gz 68860552 RMD160 0ccce44cd91ceabc0d2329c7b245495c9ae9e297 SHA1 01f9a7f199de72405571070aba1b21d8659b35ea SHA256 f85f64b734c5eb531f7297639b17d540b52309bd133db180a61824b8abeea327
-DIST jrockit-jdk1.4.2_14-linux_ia64.tar.gz 40532197 RMD160 02d09d7c1bba8a27d9408962600782f27c0734fd SHA1 7ec48f3c5ae93afa3b2188842e25c85f30542797 SHA256 35107102676943eaefc88ede4aba0342c9c9877e60779ca74115dfa0e455a141
-EBUILD jrockit-jdk-bin-1.4.2.14_p1.ebuild 2140 RMD160 5a808c25c4baceece6b503568eb5c73d9d925677 SHA1 47e4aa81d28bb2b94715e7541b9669ff44166b0f SHA256 b4e593f7ea25448ec7eeb62a74dea117c01041106ace6fc4db1cbf9f3390e611
 EBUILD jrockit-jdk-bin-1.4.2.16.ebuild 3028 RMD160 8c48b6a6852d0828d1c70e2f25e5d4d4119450e7 SHA1 5982313c5611e85686bcbe9a4a1c4dd796f7b9d0 SHA256 e5a11b9b0b103a6b786b2f4cfafb148ed25d834e4cffc2d94abc2fe467b6dff0
 EBUILD jrockit-jdk-bin-1.5.0.14.ebuild 3094 RMD160 f20e288b93b26a233dae41ca819d212a66701364 SHA1 4bcec468607a0f10b96e054cf3d73a0c3a18e20b SHA256 b0bebd19bc1bcb251bd9c90a84763fbecb82b600ad6a69c903b1e71a28cb47b2
-MISC ChangeLog 9971 RMD160 8f34910457e09a3d0489a303e9f7eb081cd8a384 SHA1 1b5b329c6d6db960ec9de2cb903592ea156a68fb SHA256 264ca19cf187a68d109375afd275d82f649c8f40beed8c6630799549a44d75ed
+MISC ChangeLog 10072 RMD160 5dd44b0aed62ef1f8107b6dff18cacad229a2235 SHA1 2e8c0a0dc1264a779aa49b05a08c38d6767e91e3 SHA256 fd9e79a8b38b4994d94c729a142ae07c4ab00069a79b7292731511cf57290434
 MISC metadata.xml 554 RMD160 0ac4d0bc8bab37fde093b976e361be52d32e8c05 SHA1 a2e1bcf7bb8bc7261d8c3a11f13de05c16663eb3 SHA256 df88a1321bc4fd8d9b8d36696fb7147d3cc6bbb2c35a046be8a9eb89aaffb0c3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkof7tkACgkQcxLzpIGCsLS/RwCfZ2ohtnFITZw6lcrnFv8a9vaO
-h8IAmwWApNBo1BgR4Usi9JxYi5VcjKDJ
-=h0s1
------END PGP SIGNATURE-----
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} )
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 7e3008f73877..4195ee8abc2f 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre-bin
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.147 2009/04/02 21:57:22 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.148 2009/05/29 20:32:40 caster Exp $
+
+  29 May 2009; Vlastimil Babka <caster@gentoo.org>
+  sun-jre-bin-1.4.2.19.ebuild, -sun-jre-bin-1.5.0.17.ebuild,
+  sun-jre-bin-1.5.0.18.ebuild, -sun-jre-bin-1.6.0.12.ebuild,
+  sun-jre-bin-1.6.0.13.ebuild:
+  Remove old versions, remove version from DESCRIPTION - bug #186276.
 
   02 Apr 2009; Markus Meier <maekke@gentoo.org> sun-jre-bin-1.5.0.18.ebuild,
   sun-jre-bin-1.6.0.13.ebuild:
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild
index 375710f10462..ecca116ddc49 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.4.2.19.ebuild,v 1.2 2008/12/10 22:01:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild,v 1.3 2009/05/29 20:32:40 caster Exp $
 
 inherit 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 J2SE Platform"
+DESCRIPTION="Sun's Java SE Runtime Environment"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
 SRC_URI=${At}
 SLOT="1.4"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild
deleted file mode 100644
index 331edd679101..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild
+++ /dev/null
@@ -1,114 +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-jre-bin/sun-jre-bin-1.5.0.17.ebuild,v 1.2 2008/12/10 22:01:31 maekke Exp $
-
-inherit pax-utils versionator eutils java-vm-2
-
-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 Runtime Environment, version ${SLOT}"
-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 nsplugin odbc"
-
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}/${A}" --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
-	if use x86; then
-		einfo "Creating the Class Data Sharing archives"
-		"${S}"/bin/java -client -Xshare:dump || die
-	fi
-}
-
-src_install() {
-	local dirs="bin lib man"
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${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
-
-		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
-
-	# 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 || die
-
-	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"
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.18.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.18.ebuild
index 9766f8d502bf..4dd348087d2f 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.18.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-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-jre-bin/sun-jre-bin-1.5.0.18.ebuild,v 1.2 2009/04/02 21:57:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.18.ebuild,v 1.3 2009/05/29 20:32:40 caster Exp $
 
 inherit pax-utils versionator eutils java-vm-2
 
@@ -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 Runtime Environment, version ${SLOT}"
+DESCRIPTION="Sun's Java SE Runtime Environment"
 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-jre-bin/sun-jre-bin-1.6.0.12.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.12.ebuild
deleted file mode 100644
index eef2b4a4b318..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.12.ebuild
+++ /dev/null
@@ -1,141 +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-jre-bin/sun-jre-bin-1.6.0.12.ebuild,v 1.3 2009/03/11 22:49:09 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)u${UPDATE}"
-
-SUFFIX=".bin"
-X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
-
-DESCRIPTION="Sun's J2SE Runtime Environment, 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 nsplugin odbc"
-
-RDEPEND="sys-libs/glibc
-	x86? ( =virtual/libstdc++-3.3 )
-	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 )"
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-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() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}/construct-1.6.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
-	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 lib man"
-
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} 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
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-			install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
-		else
-			install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so
-		fi
-	fi
-
-	# install control panel for Gnome/KDE
-	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
-		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
-			"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
-			"${T}/sun_jre-${SLOT}.desktop" || die
-		domenu "${T}/sun_jre-${SLOT}.desktop" || die
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/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 "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.6.0.13.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.13.ebuild
index fc6f0680bba2..34d730028727 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.13.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-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-jre-bin/sun-jre-bin-1.6.0.13.ebuild,v 1.2 2009/04/02 21:57:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.13.ebuild,v 1.3 2009/05/29 20:32:40 caster Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -12,7 +12,7 @@ SUFFIX=".bin"
 X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
 AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
 
-DESCRIPTION="Sun's J2SE Runtime Environment, version ${PV}"
+DESCRIPTION="Sun's Java SE Runtime Environment"
 HOMEPAGE="http://java.sun.com/javase/6/"
 URL_BASE="http://download.java.net/dlj/binaries"
 SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )