Remove old version. Sync 1.4 pkg_nofetch() with 1.5.

(Portage version: 2.1.2.3)

4 files changed, 8 insertions, 198 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 0aabaadc6390..ee71929c72a8 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.109 2007/04/10 07:28:15 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.110 2007/04/13 16:56:28 caster Exp $
+
+  13 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jdk-bin-1.4.2.6-r4.ebuild, ibm-jdk-bin-1.4.2.7.ebuild:
+  Remove old version. Sync 1.4 pkg_nofetch() with 1.5.
 
   10 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   ibm-jdk-bin-1.4.2.7.ebuild:
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r4 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r4
deleted file mode 100644
index 31f38b27c80f..000000000000
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r4
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 6767ba5540f2df4f75233c142f6eb1ed IBMJava2-142-ia32-SDK-1.4.2-6.0.i386.rpm 58525734
-RMD160 ee54add99e586bf8b968d57532264e553302f1b7 IBMJava2-142-ia32-SDK-1.4.2-6.0.i386.rpm 58525734
-SHA256 fdc9d0e841c85f7a11001bf95faef54d045e38f8628dd6538273838f3de096d6 IBMJava2-142-ia32-SDK-1.4.2-6.0.i386.rpm 58525734
-MD5 c3a0c5e24cf1307925ef65b5b3a2d1aa IBMJava2-142-ppc32-SDK-1.4.2-6.0.ppc.rpm 61302067
-RMD160 fe80bdad101c5fd5ecd5a618c1aaaf3a2a427c27 IBMJava2-142-ppc32-SDK-1.4.2-6.0.ppc.rpm 61302067
-SHA256 16052150d8c22bfc0906fcc81c2d11c8dbaf84a250d068e843f953e0a121cc17 IBMJava2-142-ppc32-SDK-1.4.2-6.0.ppc.rpm 61302067
-MD5 77f7981ad453b6907e78b0d9060f313e IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
-RMD160 155d132b25d990c876762474c10a0b57790a8cb9 IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
-SHA256 6393faa4becec892292192db0827c03f3984ad2e7ef09a209e801d88527366f9 IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
-MD5 baed71adec50ad711d9b29b62347c86c IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
-RMD160 ce4f51f0b2d6ce6e0a4004d78c3596bca06d4f30 IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
-SHA256 42af9a1bb57c3036ce378cba87ba20e21bef8781787c3f6c6e9a9f4875eefadb IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
-MD5 182d4c627ad26a0acc02e2abb07cfdcc IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
-RMD160 f2d1fe49a606c204dbc0b0bdd054b7ec8bb7ca63 IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
-SHA256 4bfd9461aec661fee1584920bb2d0a4274c8ac592eec612f724824cf2790d7f1 IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
-MD5 30fb5f8a56e9bc6846dc64ec28d5dbe0 IBMJava2-JAVACOMM-1.4.2-6.0.i386.rpm 121766
-RMD160 e543dac45fac2773fd0f54f6b1b516eefc24763e IBMJava2-JAVACOMM-1.4.2-6.0.i386.rpm 121766
-SHA256 749c6400a7a78e7300ef5cc9e588c490b788661b0917586cca6d07639711cebd IBMJava2-JAVACOMM-1.4.2-6.0.i386.rpm 121766
-MD5 d37aad6cd2f63fd91493ddc7423d5b96 IBMJava2-JAVACOMM-AMD64-1.4.2-6.0.x86_64.rpm 123609
-RMD160 449904345b1377568264e348ba2c71811472a61d IBMJava2-JAVACOMM-AMD64-1.4.2-6.0.x86_64.rpm 123609
-SHA256 ff13b4cb1fcfb5ef658cbab8725ef896a64da496b95bcbd05981dba1a0499f30 IBMJava2-JAVACOMM-AMD64-1.4.2-6.0.x86_64.rpm 123609
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
deleted file mode 100644
index 810d8c328b25..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
+++ /dev/null
@@ -1,173 +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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.9 2006/12/18 11:39:24 caster Exp $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 eutils versionator rpm
-
-JDK_RELEASE=$(get_version_component_range 1-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-if use x86 ; then
-	JDK_DIST="IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm"
-	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm"
-	S="${WORKDIR}/opt/IBMJava2-142"
-	LINK_ARCH="ia32"
-elif use amd64 ; then
-	JDK_DIST="IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm"
-	JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm"
-	S="${WORKDIR}/opt/IBMJava2-amd64-142"
-	LINK_ARCH="amd64"
-elif use ppc ; then
-	JDK_DIST="IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm"
-	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc.rpm"
-	S="${WORKDIR}/opt/IBMJava2-ppc-142"
-	LINK_ARCH="ip32"
-elif use ppc64 ; then
-	JDK_DIST="IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm"
-	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc64.rpm"
-	S="${WORKDIR}/opt/IBMJava2-ppc64-142"
-	LINK_ARCH="ip64"
-elif use s390 ; then
-	JDK_DIST="IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm"
-	S="${WORKDIR}/opt/IBMJava2-s390-142"
-	LINK_ARCH="s39031"
-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"
-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? ( IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm )
-		amd64? ( IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm )
-		ppc? ( IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm )
-		ppc64? ( IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm )
-		s390? ( IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm )
-		javacomm? (
-					x86? ( IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm )
-					amd64? ( IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm )
-					ppc? ( IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm )
-					ppc64? ( IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm )
-				  )"
-
-LICENSE="IBM-J1.4"
-SLOT="1.4"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-IUSE="X alsa doc javacomm nsplugin"
-
-RDEPEND="
-		=virtual/libstdc++-3.3
-		alsa? ( media-libs/alsa-lib )
-		X? (
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXp
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXmu
-		)
-		x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
-		doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-
-RESTRICT="fetch"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit22.so
-	opt/${P}/jre/bin/libjclscar_22.so"
-QA_TEXTRELS_ppc64="opt/${P}/jre/bin/classic/libjvm.so"
-QA_TEXTRELS_ppc="opt/${P}/jre/bin/libjitc.so
-	opt/${P}/jre/bin/libjaas.so"
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
-	opt/${P}/jre/bin/javaplugin.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/classic/libcore.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 "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-	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() { true; }
-
-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 ../jre/javaws/javaws /opt/${P}/bin/javaws
-		dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
-	fi
-
-	# Copy all the files to the designated directory
-	mkdir -p ${D}opt/${P}
-	cp -pR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
-
-	mkdir -p ${D}/opt/${P}/share
-	cp -pPR ${S}/{demo,src.jar} ${D}opt/${P}/share/
-
-	# setting the ppc stuff
-	if use ppc; then
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
-		insinto /etc
-		doins ${FILESDIR}/cpuinfo
-	fi
-
-	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}/jre/bin/${plugin}
-	elif use x86; then
-		rm ${D}/opt/${P}/jre/bin/libjavaplugin*.so
-	fi
-
-	if ! use alsa; then
-		rm ${D}/opt/${P}/jre/bin/libjsoundalsa.so \
-			|| eerror "${D}/opt/${P}/jre/bin/libjsoundalsa.so not found"
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/docs/COPYRIGHT
-
-	set_java_env
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		ewarn
-		ewarn "You have not enabled the X useflag.  It is possible that"
-		ewarn "you do not have an X server installed.  Please note that"
-		ewarn "some parts of the IBM JDK require an X server to properly"
-		ewarn "function.  Be careful which Java libraries you attempt to"
-		ewarn "use with your installation."
-		ewarn
-	fi
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild
index f3680c804800..4cbd3a4b6117 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild,v 1.6 2007/04/10 07:28:15 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild,v 1.7 2007/04/13 16:56:28 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator rpm
@@ -96,7 +96,7 @@ pkg_nofetch() {
 	if use javacomm ; then
 		einfo "${JAVACOMM_DIST}"
 	fi
-	einfo "Direct link:"
+	einfo "You can also use direct link to your arch download page:"
 	einfo "${DIRECT_DOWNLOAD}"
 	einfo "Place the file(s) in: ${DISTDIR}"
 	einfo "Then restart emerge: 'emerge --resume'"
@@ -104,7 +104,7 @@ pkg_nofetch() {
 	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."
+	einfo "direct link to arch download page. If it doesn't work, file a bug."
 }
 
 src_unpack() {