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

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

6 files changed, 16 insertions, 264 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