Version bump from upstream (resolves bug #121649)

(Portage version: 2.1_pre4-r1)

4 files changed, 185 insertions, 1 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index b604fc225e55..607308ae1b7c 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 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.47 2006/02/08 07:41:57 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.48 2006/02/08 08:22:04 compnerd Exp $
+
+*ibm-jdk-bin-1.4.2.04 (08 Feb 2006)
+
+  08 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +ibm-jdk-bin-1.4.2.04.ebuild:
+  Version bump from upstream
 
   08 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   ibm-jdk-bin-1.5.0.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 593d63ad0030..3995178a57e9 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -7,6 +7,9 @@ SHA256 b90ea3549103fa261cd711ecb3d11158c984bc20a020630aa3ebc3f8b402ec11 files/cp
 MD5 d32d7e0e95c351ef33523cb7c9477b55 files/digest-ibm-jdk-bin-1.4.2.03 626
 RMD160 71eda6abd64e576028eeb669b4d4f28533945cee files/digest-ibm-jdk-bin-1.4.2.03 626
 SHA256 1e6fbc4beb98763ba3485e535cba9312cd5c21f8052219c1bd3c639c8384d38b files/digest-ibm-jdk-bin-1.4.2.03 626
+MD5 c19d7ce9eec8f57d6fd010bb74ff56f8 files/digest-ibm-jdk-bin-1.4.2.04 2246
+RMD160 d12ae51ee0f0a28bb326bee1f9a028b40a2e4c31 files/digest-ibm-jdk-bin-1.4.2.04 2246
+SHA256 a5127550bd989784acfae9886629a4e1b1611b94c5f7eaab454edb05787b2aa0 files/digest-ibm-jdk-bin-1.4.2.04 2246
 MD5 9ac027f56be716fae31993669346cb7f files/digest-ibm-jdk-bin-1.5.0 640
 RMD160 53329d39173c20fe102bbd9b05b92d3129ccfa7f files/digest-ibm-jdk-bin-1.5.0 640
 SHA256 b2c85f35fd0691093465846168e52e8796c20fe691fb94f497c6947c20b0102b files/digest-ibm-jdk-bin-1.5.0 640
@@ -22,6 +25,9 @@ SHA256 87403cfbbe8ee41c0ff3622a0f20e34fec024f12dcafad158bcbce1a36168634 files/ib
 MD5 ed0a35656aeaadd78b998559dffd503f ibm-jdk-bin-1.4.2.03.ebuild 4371
 RMD160 fb74a5f6c1d1dc145dba9278500de58e1a237fc5 ibm-jdk-bin-1.4.2.03.ebuild 4371
 SHA256 8fc2b7cfbf4c473075af44ba94a698e5051eb642e24b15fdc5a0b9d8bcaab0a1 ibm-jdk-bin-1.4.2.03.ebuild 4371
+MD5 54ade72d31e2757e96e5f565199f191c ibm-jdk-bin-1.4.2.04.ebuild 4169
+RMD160 4d1fc259a24f3154e3d62c000ad2c8120bd46cb8 ibm-jdk-bin-1.4.2.04.ebuild 4169
+SHA256 4b54bc7dee937153df66349a9c43de8c348ca0fd0be2797cc89a97803023f5ba ibm-jdk-bin-1.4.2.04.ebuild 4169
 MD5 f6dcd37d71ec836a8e56f111ce0e2321 ibm-jdk-bin-1.5.0.ebuild 3074
 RMD160 b31ffe89c99719a19d197b0e143db04e3e186eed ibm-jdk-bin-1.5.0.ebuild 3074
 SHA256 820bbba1581b40dd59613fcc8467381325713b64a955d6e06f9a5c080e33accf ibm-jdk-bin-1.5.0.ebuild 3074
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.04 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.04
new file mode 100644
index 000000000000..6680b15be0ca
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.04
@@ -0,0 +1,24 @@
+MD5 f2b408a1e69c0158b85fedee17cf67f9 IBMJava2-JAVACOMM-142-SR4.tgz 118021
+RMD160 6fe71846e733ceaab2ca65eaed756dfd0d985d5d IBMJava2-JAVACOMM-142-SR4.tgz 118021
+SHA256 7e1c65421bfbd12ba14b449a4bad5d92dd6b6d977d91a824b730664bd7dea905 IBMJava2-JAVACOMM-142-SR4.tgz 118021
+MD5 f27ede4a8d679ce47ba16bec07c199c0 IBMJava2-JAVACOMM-142.ppc-SR4.tgz 124312
+RMD160 4abefe4f1f0d9e19b02a8a938614bfa8f4ebb837 IBMJava2-JAVACOMM-142.ppc-SR4.tgz 124312
+SHA256 52266b915d0b8cd0214e82bbc42a28b854c597ff342e5ea26f20b8284a90d65a IBMJava2-JAVACOMM-142.ppc-SR4.tgz 124312
+MD5 60c374985aace99185de5446fe78baa6 IBMJava2-JAVACOMM-142.ppc64-SR4.tgz 126337
+RMD160 5a1a4e41a2cb0ae687441464e6d5a321abdc5891 IBMJava2-JAVACOMM-142.ppc64-SR4.tgz 126337
+SHA256 b3b292d320ce40f247153f6dd07e8c5896efd5bc321fdf7d605eaa07db9724c4 IBMJava2-JAVACOMM-142.ppc64-SR4.tgz 126337
+MD5 70a215d42fb90d182830bcc7f6e51e30 IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz 120023
+RMD160 34f2c951395de323d76e1ef50198311080fc7b78 IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz 120023
+SHA256 6459006476e14887cdec9e18b8f850ef4fd5e5b9a2701dca8a7251a6fabc3365 IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz 120023
+MD5 46eab0423830c9e422ee3f3174287905 IBMJava2-SDK-142-SR4.tgz 58637378
+RMD160 d1d5a74061178e92b7aeb8816b3d5944a5b00eae IBMJava2-SDK-142-SR4.tgz 58637378
+SHA256 e10a12822562c4bfa38bb60ca80a395e475519ab8549f9b5060016782e9cca42 IBMJava2-SDK-142-SR4.tgz 58637378
+MD5 c40c6a680a7dbb59985599c4c8b6df6e IBMJava2-SDK-142.ppc-SR4.tgz 61333916
+RMD160 d3d54da954cc890d3106e1216245f7d9be837a7d IBMJava2-SDK-142.ppc-SR4.tgz 61333916
+SHA256 7f836e021841f92cc9fa18355ef961fa6898404802b3f398c54052b8e8e69d51 IBMJava2-SDK-142.ppc-SR4.tgz 61333916
+MD5 2ddc251193cab8624723406fc7f97dfb IBMJava2-SDK-142.ppc64-SR4.tgz 58579341
+RMD160 2d20d9c24dd365605f04be06c94df7b0087b20e0 IBMJava2-SDK-142.ppc64-SR4.tgz 58579341
+SHA256 9a7bf75b67c1601655336358f1837c096bd6db13b3dee6dd519b692190a1899f IBMJava2-SDK-142.ppc64-SR4.tgz 58579341
+MD5 f50f48dbbca59d9d45f507d0baecf993 IBMJava2-SDK-AMD64-142.x86_64-SR4.tgz 51690993
+RMD160 d6135e1460b744b9099b721b9b9885874be51688 IBMJava2-SDK-AMD64-142.x86_64-SR4.tgz 51690993
+SHA256 3bd10dd6be1ab0baeb4c33255ee299ca159b6a82ccd5975c17cab160d3f71823 IBMJava2-SDK-AMD64-142.x86_64-SR4.tgz 51690993
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild
new file mode 100644
index 000000000000..24ad392237bd
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild
@@ -0,0 +1,148 @@
+# 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.04.ebuild,v 1.1 2006/02/08 08:22:04 compnerd Exp $
+
+inherit java eutils
+
+if use x86 ; then
+	JDK_DIST="IBMJava2-SDK-142.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-142-SR4.tgz"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-142.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-JAVACOMM-142-SR4.tgz"
+elif use amd64 ; then
+	JDK_DIST="IBMJava2-SDK-AMD64-142.x86_64.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-AMD64-142.x86_64-SR4.tgz"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-142.x86_64.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz"
+elif use ppc ; then
+	JDK_DIST="IBMJava2-SDK-142.ppc.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-142.ppc-SR4.tgz"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-142.ppc.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-JAVACOMM-142.ppc-SR4.tgz"
+elif use ppc64 ; then
+	JDK_DIST="IBMJava2-SDK-142.ppc64.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-142.ppc64-SR4.tgz"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-142.ppc64.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-JAVACOMM-142.ppc64-SR4.tgz"
+fi
+
+DESCRIPTION="IBM Java Development Kit"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
+SRC_URI="x86? ( IBMJava2-SDK-142-SR4.tgz )
+		 amd64? ( IBMJava2-SDK-AMD64-142.x86_64-SR4.tgz )
+		 ppc? ( IBMJava2-SDK-142.ppc-SR4.tgz )
+		 ppc64? ( IBMJava2-SDK-142.ppc64-SR4.tgz )
+		 javacomm? (
+		 			x86? ( IBMJava2-JAVACOMM-142-SR4.tgz )
+					amd64? ( IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz )
+					ppc? ( IBMJava2-JAVACOMM-142.ppc-SR4.tgz )
+					ppc64? ( IBMJava2-JAVACOMM-142.ppc64-SR4.tgz )
+		 		   )"
+
+LICENSE="IBM-J1.4"
+SLOT="1.4"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X doc javacomm nsplugin"
+
+DEPEND="virtual/libc
+		X? ( || (
+					(
+						x11-libs/libXt
+						x11-libs/libX11
+						x11-libs/libXtst
+						x11-libs/libXp
+						x11-libs/libXext
+						x11-libs/libSM
+						x11-libs/libICE
+						x11-libs/libXau
+						x11-libs/libXdmcp
+						x11-libs/libXi
+						x11-libs/libXmu
+					)
+					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}"
+}
+
+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
+}