Damn IBM and their tomfoolery, closes #46952, #45780

6 files changed, 19 insertions, 116 deletions

diff --git a/dev-java/ibm-jdk/ChangeLog b/dev-java/ibm-jdk/ChangeLog
index 21ab276d0fd7..38a75259b450 100644
--- a/dev-java/ibm-jdk/ChangeLog
+++ b/dev-java/ibm-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ibm-jdk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.36 2004/03/20 04:16:42 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.37 2004/04/07 03:33:22 zx Exp $
+
+*ibm-jdk-1.4.1-r1 (06 Apr 2004)
+
+  06 Apr 2004; Chris Aniszczyk <zx@gentoo.org> ibm-jdk-1.4.1-r1.ebuild,
+  ibm-jdk-1.4.1.ebuild:
+  Fixing issue with digests. Clean up. Closes #46952, #45780
 
   23 Mar 2004; Chris Aniszczyk <zx@gentoo.org> :
   Fixed SRC_URI to allow for PPC's ;) Closes #45134
diff --git a/dev-java/ibm-jdk/Manifest b/dev-java/ibm-jdk/Manifest
index fb9778272cef..6b92dfb95900 100644
--- a/dev-java/ibm-jdk/Manifest
+++ b/dev-java/ibm-jdk/Manifest
@@ -1,11 +1,11 @@
+MD5 898d643d4f4a90e0e4ad4a9ca60a806d ibm-jdk-1.3.1-r3.ebuild 2655
+MD5 da202937a9d11e68f4e46b1b7c637468 ibm-jdk-1.4.1-r1.ebuild 2781
+MD5 0fd140ea52e8bb104c74c7323ff06997 ChangeLog 7007
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 56b749e9420a0b94fec3274c77657f36 ibm-jdk-1.4.1.ebuild 2830
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.1-r3 0
+MD5 ae87214352383dedb47fa43ef1cfb6ea files/digest-ibm-jdk-1.4.1-r1 138
 MD5 bc9dfaf26add7bddfe055a815f85377e files/digest-ibm-jdk-1.4.1 67
-MD5 09a665e3c2b3ff941198336fd072d096 files/ibm-jdk-1.3.1 452
-MD5 312f79f7d64e02dde4bd34cb1e786bca files/ibm-jdk-1.4.1 452
-MD5 76170b8af49a7a384d1faa62e09bd97b files/digest-ibm-jdk-1.4.1-r1 138
-MD5 36a3e20059184ad8c45846d082cbf1be ChangeLog 7008
-MD5 835459eb117fe1cfc02ece7013890c29 ibm-jdk-1.3.1-r3.ebuild 2656
-MD5 59241ff99acff57ffe4a7a33986b4ec8 ibm-jdk-1.4.1.ebuild 2831
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 c35491d5a2ec44058cafd5d7ae16ae82 ibm-jdk-1.4.1-r1.ebuild 2782
+MD5 e41560a0f177edbdbc00214571a8f556 files/ibm-jdk-1.3.1 451
+MD5 a34b15137fceef2838ab9e3f09e37815 files/ibm-jdk-1.4.1 451
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.1 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.1
deleted file mode 100644
index 34fd85e36b65..000000000000
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d74572ede16def9f9f9a8bea146b95e4 IBMJava2-SDK-141.tgz 53200748
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.1-r1 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.1-r1
index e85e6551db4a..a03f8b1e4afb 100644
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.1-r1
+++ b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.1-r1
@@ -1,2 +1,2 @@
-MD5 d74572ede16def9f9f9a8bea146b95e4 IBMJava2-SDK-141.tgz 53200748
-MD5 8bb4766b77426d450f1493963e5f40bf IBMJava2-SDK-141.ppc.tgz 56098082
+MD5 3cadd3d32817dd33888b5645e0d1987a IBMJava2-SDK-142.tgz 54177447
+MD5 fedb35c08896f5f99d4ed67885248da7 IBMJava2-SDK-141.ppc.tgz 57070530
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.4.1-r1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.4.1-r1.ebuild
index 9b07766f9e25..9951e1bbbf3b 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.4.1-r1.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.4.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.4.1-r1.ebuild,v 1.1 2004/03/20 04:16:42 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.4.1-r1.ebuild,v 1.2 2004/04/07 03:33:22 zx Exp $
 
 inherit java nsplugins
 
 DESCRIPTION="IBM Java Development Kit, version 1.4.1"
 HOMEPAGE="https://www6.software.ibm.com/dl/lxdk/lxdk-p"
-SRC_URI="x86? ( IBMJava2-SDK-141.tgz )
+SRC_URI="x86? ( IBMJava2-SDK-142.tgz )
 		ppc? ( IBMJava2-SDK-141.ppc.tgz )"
 RESTRICT="fetch"
 SLOT="1.4"
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.4.1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.4.1.ebuild
deleted file mode 100644
index 1279bafd98ae..000000000000
--- a/dev-java/ibm-jdk/ibm-jdk-1.4.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.4.1.ebuild,v 1.9 2004/03/18 06:43:35 zx Exp $
-
-IUSE="doc"
-
-inherit java nsplugins
-
-if [ `use ppc` ]; then
-	S=${WORKDIR}/IBMJava2-ppc-141
-else
-	S=${WORKDIR}/IBMJava2-141
-fi;
-
-if [ `use ppc` ]; then
-	SRC_JAVA="IBMJava2-SDK-141.ppc.tgz"
-else
-	SRC_JAVA="IBMJava2-SDK-141.tgz"
-fi;
-
-DESCRIPTION="IBM Java Development Kit, version 1.4.1"
-HOMEPAGE="https://www6.software.ibm.com/dl/lxdk/lxdk-p"
-SRC_URI="${SRC_JAVA}"
-RESTRICT="fetch"
-SLOT="1.4"
-LICENSE="IBM-ILNWP"
-KEYWORDS="x86 ppc -sparc -alpha -mips"
-
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.4.1* )
-	X? ( virtual/x11 )"
-RDEPEND="sys-libs/lib-compat"
-PROVIDE="virtual/jre-1.4.1
-	virtual/jdk-1.4.1
-	virtual/java-scheme-2"
-
-
-pkg_nofetch() {
-	einfo "Download 32-bit pSeries and iSeries for PPC."
-	einfo "Download 32-bit xSeries for x86."
-	die "Please download ${SRC_URI} from ${HOMEPAGE} to ${DISTDIR}"
-}
-
-src_compile() { :; }
-
-src_install() {
-
-	dodir /opt/${P}
-	for i in bin include jre lib ; do
-		cp -dpR $i ${D}/opt/${P}/
-	done
-
-	dodir /opt/${P}/share
-	for i in demo src.jar ; do
-		cp -dpR $i ${D}/opt/${P}/share/
-	done
-
-	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
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc docs/COPYRIGHT
-
-	inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst() {
-
-	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
-	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
-	if [ !`use X` ] ; then
-		einfo "********************************************************"
-		eerror "You're not using X so its possible that you dont have"
-		eerror "a X server installed, please read the following warn: "
-		eerror "Some parts of IBM JDK require XFree86 to be installed."
-		eerror "Be careful which Java libraries you attempt to use."
-		einfo "********************************************************"
-		echo
-	fi
-
-	einfo "******************************************************"
-	einfo " After installing ${P} this"
-	einfo " was set as the default JVM to run."
-	einfo " When finished please run the following so your"
-	einfo " enviroment gets updated."
-	eerror "    /usr/sbin/env-update && source /etc/profile"
-	einfo " Or use java-config program to set your preferred VM"
-	einfo "******************************************************"
-
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-}