Resolving bugs #106839, #108251 with version bump; pruning unneeded file in filesdir

(Portage version: 2.0.53_rc7)

5 files changed, 164 insertions, 15 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 05b393737f33..73e4ed446cda 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.33 2005/10/18 20:21:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.34 2005/11/05 21:11:43 compnerd Exp $
+
+*ibm-jdk-bin-1.4.2.03 (06 Nov 2005)
+
+  06 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  -files/ibm-jdk-bin-1.4.1, +files/ibm-jdk-bin-1.4.2.03,
+  +ibm-jdk-bin-1.4.2.03.ebuild:
+  Updating to latest SR, with fetch restrictions, and renaming for sources.
+  This should resolve the issue with digests.  Resolves bug #106839 and bug
+  #108251 .
 
   18 Oct 2005; Aron Griffis <agriffis@gentoo.org> ibm-jdk-bin-1.4.2.ebuild:
   Warn about deprecated browserplugin useflag
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 1d2892dc52e1..87518b5db81b 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5f3711cb88c767faf16636e0c3933ff1 ChangeLog 4370
+MD5 b07caaf7fdfe8f9fa2bf5e7d57b6b6bb ChangeLog 4717
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
 MD5 cfb8abeb0f582ad72b0971269e7dee32 files/digest-ibm-jdk-bin-1.4.2 443
-MD5 2a5694754d47014cb37eae87a4758efb files/ibm-jdk-bin-1.4.1 451
+MD5 d32d7e0e95c351ef33523cb7c9477b55 files/digest-ibm-jdk-bin-1.4.2.03 626
 MD5 605642c801114b645d12bc93a5f3e911 files/ibm-jdk-bin-1.4.2 472
+MD5 389e540fe75dfc2b46b15689eea5ddc7 files/ibm-jdk-bin-1.4.2.03 368
+MD5 0e9308fd3b003e1d5ce12d2c5e6f486c ibm-jdk-bin-1.4.2.03.ebuild 4021
 MD5 052149264d14e12757fbb6d275152bc8 ibm-jdk-bin-1.4.2.ebuild 3036
 MD5 2f88465cd5ad6adb1c76759ff3078666 metadata.xml 348
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDVVlUJrHF4yAQTrARAsadAJ0fL1ZRIzIqBaqDqyhvbUmhQGFmtwCeMYFZ
-JudYilk7WZAyoFljgoyHCM8=
-=/qbd
------END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.03 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.03
new file mode 100644
index 000000000000..3cca4254c323
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.03
@@ -0,0 +1,8 @@
+MD5 3f9dedf6bdcf5ce9a1f6195396089082 IBMJava2-JAVACOMM-142-SR3.tgz 118043
+MD5 a499a18bc6ecec72b80f5078ace5f5e6 IBMJava2-JAVACOMM-142.ppc-SR3.tgz 124333
+MD5 1e6f8dfd49bf682d9142111b022a7d9b IBMJava2-JAVACOMM-142.ppc64-SR3.tgz 126336
+MD5 22b565e79621353da6b79e4fbbfabb53 IBMJava2-JAVACOMM-AMD64-142.x86_64-SR3.tgz 120012
+MD5 dbceaeb7213647be30022a30153089e1 IBMJava2-SDK-142-SR3.tgz 57073304
+MD5 9694079119ce541fc31c315b8cc10ce5 IBMJava2-SDK-142.ppc-SR3.tgz 59777026
+MD5 091a541bf707ae5f2e66060598928f1a IBMJava2-SDK-142.ppc64-SR3.tgz 57019729
+MD5 4e557128e803b86c2de48756d93d240d IBMJava2-SDK-AMD64-142.x86_64-SR3.tgz 51454405
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.1 b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.2.03
index e643b35c07d2..ad5e8016a6cd 100644
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.1
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.2.03
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.1,v 1.2 2004/07/14 21:47:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.2.03,v 1.1 2005/11/05 21:11:43 compnerd Exp $
 
 VERSION="IBM JDK @PV@"
 JAVA_HOME=/opt/@P@
 JDK_HOME=/opt/@P@
 JAVAC=${JAVA_HOME}/bin/javac
 ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib/"
+ADDLDPATH="/opt/@P@/jre/bin/:/opt/@P@/jre/bin/classic"
 
 ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.03.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.03.ebuild
new file mode 100644
index 000000000000..ff9c9a57b468
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.03.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 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.03.ebuild,v 1.1 2005/11/05 21:11:43 compnerd Exp $
+
+inherit java eutils
+
+if use x86 ; then
+	JDK_DIST="IBMJava2-SDK-142.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-142-SR3.tgz"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-142.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-JAVACOMM-142-SR3.tgz"
+elif use amd64 ; then
+	JDK_DIST="IBMJava2-SDK-AMD64-142.x86_64.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-AMD64-142.x86_64-SR3.tgz"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-142.x86_64.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-JAVACOMM-AMD64-142.x86_64-SR3.tgz"
+elif use ppc ; then
+	JDK_DIST="IBMJava2-SDK-142.ppc.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-142.ppc-SR3.tgz"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-142.ppc.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-JAVACOMM-142.ppc-SR3.tgz"
+elif use ppc64 ; then
+	JDK_DIST="IBMJava2-SDK-142.ppc64.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-142.ppc64-SR3.tgz"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-142.ppc64.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-JAVACOMM-142.ppc64-SR3.tgz"
+fi
+
+DESCRIPTION="IBM Java Development Kit"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
+SRC_URI="x86? ( IBMJava2-SDK-142-SR3.tgz )
+		 amd64? ( IBMJava2-SDK-AMD64-142.x86_64-SR3.tgz )
+		 ppc? ( IBMJava2-SDK-142.ppc-SR3.tgz )
+		 ppc64? ( IBMJava2-SDK-142.ppc64-SR3.tgz )
+		 javacomm? (
+		 			x86? ( IBMJava2-JAVACOMM-142-SR3.tgz )
+					amd64? ( IBMJava2-JAVACOMM-AMD64-142.x86_64-SR3.tgz )
+					ppc? ( IBMJava2-JAVACOMM-142.ppc-SR3.tgz )
+					ppc64? ( IBMJava2-JAVACOMM-142.ppc64-SR3.tgz )
+		 		   )"
+
+LICENSE="IBM-J1.4"
+SLOT="1.4"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 -*"
+IUSE="X doc javacomm nsplugin"
+
+DEPEND="virtual/libc
+		>=dev-java/java-config-0.2.5
+		X? ( virtual/x11 )"
+RDEPEND="${DEPEND}
+		 !ppc64? ( !amd64? ( sys-libs/lib-compat ) )"
+PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+PROVIDE="virtual/jdk
+		 virtual/jre"
+
+RESTRICT="fetch"
+
+if use ppc; then
+	S="${WORKDIR}/IBMJava2-ppc-142"
+elif use ppc64; then
+	S="${WORKDIR}/IBMJava2-ppc64-142"
+elif use amd64; then
+	S="${WORKDIR}/IBMJava2-amd64-142"
+else
+	S="${WORKDIR}/IBMJava2-142"
+fi
+
+pkg_nofetch() {
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	einfo "Please visit: ${HOMEPAGE}"
+	einfo "Download: ${JDK_DIST}"
+	if use javacomm ; then
+		einfo "Download: ${JAVACOMM_DIST}"
+	fi
+	einfo "Rename ${JDK_DIST} to ${JDK_DIST_GENTOO}"
+	if use javacomm ; then
+		einfo "Rename ${JAVACOMM_DIST} to ${JAVACOMM_DIST_GENTOO}"
+	fi
+	einfo "Place the file(s) in: ${DISTDIR}"
+	einfo "Then run emerge ${PN}"
+}
+
+pkg_setup() {
+	einfo "The mozilla and browserplugin useflags have been dropped from this "
+	einfo "version.  If you wish to use the browser plugin then please use the"
+	einfo "nsplugin useflag"
+	ebeep 5
+}
+
+src_compile() { :; }
+
+src_install() {
+	# The javaws execution script is 777 why?
+	chmod 0755 ${S}/jre/javaws/javaws
+
+	# 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 nsplugin && ! use ppc && ! use amd64 && ! use ppc64; 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}
+	fi
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc ${S}/docs/COPYRIGHT
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+}
+
+pkg_postinst() {
+	java_pkg_postinst
+
+	if ! use X; then
+		eerror
+		eerror "You have not enabled the X useflag.  It is possible that"
+		eerror "you do not have an X server installed.  Please note that"
+		eerror "some parts of the IBM JDK require an X server to properly"
+		eerror "function.  Be careful which Java libraries you attempt to"
+		eerror "use with your installation."
+		eerror
+	fi
+}