Version bump. Updated to use versioned RPMs for distfiles instead of annoyingly unversioned tarballs. Other minor cleanups.

Package-Manager: portage-2.1.1_pre1

4 files changed, 187 insertions, 5 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 9d10eb158f33..1819e8d9a69f 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.55 2006/06/25 18:07:17 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.56 2006/07/01 21:03:11 nichoj Exp $
+
+  01 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
+  +ibm-jdk-bin-1.4.2.5.ebuild:
+  Version bump. Updated to use versioned RPMs for distfiles instead of
+  annoyingly unversioned tarballs. Other minor cleanups.
 
   25 Jun 2006; Joshua Nichols <nichoj@gentoo.org>
   +files/ibm-jdk-bin-1.4.env, +files/ibm-jdk-bin-1.5.env:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 8ab4e31508aa..2a40171458c7 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -26,12 +26,18 @@ AUX ibm-jdk-bin-1.5.env 1125 RMD160 39e84106fd3b6a1106a99b81472936320b1585ba SHA
 MD5 04a66efa73f1153ed512e93c823f7eab files/ibm-jdk-bin-1.5.env 1125
 RMD160 39e84106fd3b6a1106a99b81472936320b1585ba files/ibm-jdk-bin-1.5.env 1125
 SHA256 215af1e5143626956a98b631b683cf1e71d4c9272edd8cd571dc763ae75e9234 files/ibm-jdk-bin-1.5.env 1125
+DIST IBMJava2-142-ia32-SDK-1.4.2-5.0.i386.rpm 58425242 RMD160 78cef52512931ef20e8df0e4068e7ce788318d49 SHA1 c64c2b700044a7da3b37a9babdb6fd6db2034908 SHA256 7e797a3e5fb2d8616d42cf4c0afd30b6b7973b2b65f654b292f78c4ce7b0a6a3
+DIST IBMJava2-142-ppc32-SDK-1.4.2-5.0.ppc.rpm 65830034 RMD160 890675ed802de7f31febf11b1d19aa6ca7ffba7d SHA1 da925e7d32c64048afa45bdaecf77d0ebc479ad5 SHA256 f4fb7cf0b691c80653e5a4f44d9d64754d3dc63fd4f510c273ec2f00d2187308
+DIST IBMJava2-142-ppc64-SDK-1.4.2-5.0.ppc64.rpm 64070481 RMD160 376c2965fe9fb3f0937ef5114f0c3c653b6c821d SHA1 3e2b81b47e5b63c9eb5a08b87149bc33dcf79bcb SHA256 e916f7dce960b3a3dfd699585eeeb3643b4f2902723e144cdf5fe3897d07d56f
+DIST IBMJava2-AMD64-142-SDK-1.4.2-5.0.x86_64.rpm 49248495 RMD160 87d6595f69cfb487f30a087f7e29103a52d13c6e SHA1 a28883abf5ed26764db5b62b0aaaaf3b1821f23d SHA256 125d73a2de395847c7abbb76b85d84d2ba71c77b83b85fdd91d5a22b865fcbd4
+DIST IBMJava2-JAVACOMM-1.4.2-5.0.i386.rpm 121771 RMD160 9de86504b7de112ff04f4aa1ecc0a954918ddf40 SHA1 5d5c4268ee683af7c9f40d706e868824b3d8de22 SHA256 0c37c4ed04e8686e776e8782ded43c45b9d383e758fbce46c79a12a446c780f3
 DIST IBMJava2-JAVACOMM-142-SR3.tgz 118043
 DIST IBMJava2-JAVACOMM-142-SR4.tgz 118021
 DIST IBMJava2-JAVACOMM-142.ppc-SR3.tgz 124333
 DIST IBMJava2-JAVACOMM-142.ppc-SR4.tgz 124312
 DIST IBMJava2-JAVACOMM-142.ppc64-SR3.tgz 126336
 DIST IBMJava2-JAVACOMM-142.ppc64-SR4.tgz 126337
+DIST IBMJava2-JAVACOMM-AMD64-1.4.2-5.0.x86_64.rpm 123609 RMD160 517fcc75ab344bb62011042ba3ec03c2da50a6a6 SHA1 0e550fe356bccc3ffe8aa93e7a847b1f1bc3ef1e SHA256 02b0012ed707e52e1e12e7336c3d86166289127e11dd3b0b8ae0ef54e06e97b0
 DIST IBMJava2-JAVACOMM-AMD64-142.x86_64-SR3.tgz 120012
 DIST IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz 120023
 DIST IBMJava2-SDK-142-SR3.tgz 57073304
@@ -64,6 +70,10 @@ EBUILD ibm-jdk-bin-1.4.2.04.ebuild 4723 RMD160 cb12ef307770d708f5b5e2b89942b89cd
 MD5 56fbd63154abac579d175e1ecde9d74d ibm-jdk-bin-1.4.2.04.ebuild 4723
 RMD160 cb12ef307770d708f5b5e2b89942b89cdc7119ff ibm-jdk-bin-1.4.2.04.ebuild 4723
 SHA256 a6e30ca3b272676e0db348f4b404b07edf61cf71259d773e3d28083d29e07607 ibm-jdk-bin-1.4.2.04.ebuild 4723
+EBUILD ibm-jdk-bin-1.4.2.5.ebuild 4085 RMD160 dc8bc0255a76d3a0447be0a9eef4fc745e49cb8d SHA1 55ee8a20c1845d5555876fa06a60c69a0cce5034 SHA256 5eb853843e600c741abf64521e98f647b2aea1d0b8376e5da0cbdff0d8da0759
+MD5 add1ea241437b8786791a3072598a6cf ibm-jdk-bin-1.4.2.5.ebuild 4085
+RMD160 dc8bc0255a76d3a0447be0a9eef4fc745e49cb8d ibm-jdk-bin-1.4.2.5.ebuild 4085
+SHA256 5eb853843e600c741abf64521e98f647b2aea1d0b8376e5da0cbdff0d8da0759 ibm-jdk-bin-1.4.2.5.ebuild 4085
 EBUILD ibm-jdk-bin-1.5.0-r11.ebuild 2870 RMD160 7a52f5406afe84e7d90719c7e6ec4e11205f2c76 SHA1 79eb485d18f548f8d8c04a676ff6eb559783fbd1 SHA256 7f2dfbef12e78d7319d42c58b96cb1b9097c486157e9ea02c1b2ee7dc1a1128c
 MD5 76a25701ef92dbf6ecba4681fb161d2f ibm-jdk-bin-1.5.0-r11.ebuild 2870
 RMD160 7a52f5406afe84e7d90719c7e6ec4e11205f2c76 ibm-jdk-bin-1.5.0-r11.ebuild 2870
@@ -72,10 +82,10 @@ EBUILD ibm-jdk-bin-1.5.0.ebuild 3223 RMD160 83065acddf43c5105ab977ea72b73def3944
 MD5 1244952e6a8c0baae103669d435aae03 ibm-jdk-bin-1.5.0.ebuild 3223
 RMD160 83065acddf43c5105ab977ea72b73def3944ef89 ibm-jdk-bin-1.5.0.ebuild 3223
 SHA256 73ec3f59af9d77652515b86a9b061de91f113a5b30b6066b821f31c1650de091 ibm-jdk-bin-1.5.0.ebuild 3223
-MISC ChangeLog 7702 RMD160 9e49e540bac41b8e082ef79bd8b3be571cbf6331 SHA1 3edc2e109dc3029ea4bf886af86403ee709c15c6 SHA256 1adaf16b8eb220ef93323af98a62c41375c65faf521df63d878c2428b918463b
-MD5 c67cef1ab52a18c13870476fe3c61335 ChangeLog 7702
-RMD160 9e49e540bac41b8e082ef79bd8b3be571cbf6331 ChangeLog 7702
-SHA256 1adaf16b8eb220ef93323af98a62c41375c65faf521df63d878c2428b918463b ChangeLog 7702
+MISC ChangeLog 7912 RMD160 21f49e80796a5eb3ff833c3e3bd6393df9ed0fe9 SHA1 8dfa8f078a8ba1541d1136e7b9095f86595b8b06 SHA256 7703f0fb072fb9c639d9f2b6734ea2ee71d0eb6608a3a056594590cc7d4098a0
+MD5 5d2a30c72daf11099decbb9fde730e27 ChangeLog 7912
+RMD160 21f49e80796a5eb3ff833c3e3bd6393df9ed0fe9 ChangeLog 7912
+SHA256 7703f0fb072fb9c639d9f2b6734ea2ee71d0eb6608a3a056594590cc7d4098a0 ChangeLog 7912
 MISC metadata.xml 348 RMD160 2c018b6bb7a6e6751096600b2a06e485c0a692f8 SHA1 1ea26d158d2a6b0228795f4536dac3f76bef0cfa SHA256 1e5bc3ab0655be8a83c3ec76e8574ff2575e9c8e46060f3bc0ad4cf7576bc1a7
 MD5 2f88465cd5ad6adb1c76759ff3078666 metadata.xml 348
 RMD160 2c018b6bb7a6e6751096600b2a06e485c0a692f8 metadata.xml 348
@@ -89,6 +99,9 @@ SHA256 c11b0f0215f53ea9bee4638b692f395059a562422d02cec25b0e786e40039c40 files/di
 MD5 b94d6c3e50171e7fdbe7eeb6e30cec96 files/digest-ibm-jdk-bin-1.4.2.04-r10 1224
 RMD160 39202ce8080ed73cd3f8b311a9e479d10fb4beef files/digest-ibm-jdk-bin-1.4.2.04-r10 1224
 SHA256 41f36fd300d62d3c7339d2f28fd1cd5d2151ae475d0c9877c7a487e389d7010c files/digest-ibm-jdk-bin-1.4.2.04-r10 1224
+MD5 46e4b5d195c068785e0ef44d5b242b69 files/digest-ibm-jdk-bin-1.4.2.5 1845
+RMD160 fc7c455e8d7ded3c7b661635c0b091e8b17adabb files/digest-ibm-jdk-bin-1.4.2.5 1845
+SHA256 13639f396947b0272948688c4e520b936385577bb48faeadba181bffa5679822 files/digest-ibm-jdk-bin-1.4.2.5 1845
 MD5 8c6287c7538d650fc2638c4df2989b2e files/digest-ibm-jdk-bin-1.5.0 2568
 RMD160 73f186e6e5ae9f15af609d02f8cc61249d8d81ec files/digest-ibm-jdk-bin-1.5.0 2568
 SHA256 19d6bf4b1147a6a2a0c55d80f97cac0e2e92e44a5f35f7d6b9393f143b6d597d files/digest-ibm-jdk-bin-1.5.0 2568
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.5 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.5
new file mode 100644
index 000000000000..23f5b92565bd
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.5
@@ -0,0 +1,18 @@
+MD5 bb45b0927f0457e7a9018a23f1ea9100 IBMJava2-142-ia32-SDK-1.4.2-5.0.i386.rpm 58425242
+RMD160 78cef52512931ef20e8df0e4068e7ce788318d49 IBMJava2-142-ia32-SDK-1.4.2-5.0.i386.rpm 58425242
+SHA256 7e797a3e5fb2d8616d42cf4c0afd30b6b7973b2b65f654b292f78c4ce7b0a6a3 IBMJava2-142-ia32-SDK-1.4.2-5.0.i386.rpm 58425242
+MD5 81aafa34cba8ed15418311696d15f07f IBMJava2-142-ppc32-SDK-1.4.2-5.0.ppc.rpm 65830034
+RMD160 890675ed802de7f31febf11b1d19aa6ca7ffba7d IBMJava2-142-ppc32-SDK-1.4.2-5.0.ppc.rpm 65830034
+SHA256 f4fb7cf0b691c80653e5a4f44d9d64754d3dc63fd4f510c273ec2f00d2187308 IBMJava2-142-ppc32-SDK-1.4.2-5.0.ppc.rpm 65830034
+MD5 3dc6db2df51d650c8056c7eccfd52cd5 IBMJava2-142-ppc64-SDK-1.4.2-5.0.ppc64.rpm 64070481
+RMD160 376c2965fe9fb3f0937ef5114f0c3c653b6c821d IBMJava2-142-ppc64-SDK-1.4.2-5.0.ppc64.rpm 64070481
+SHA256 e916f7dce960b3a3dfd699585eeeb3643b4f2902723e144cdf5fe3897d07d56f IBMJava2-142-ppc64-SDK-1.4.2-5.0.ppc64.rpm 64070481
+MD5 bb1a872be9d3ce5841e1ab2cfcc0c05a IBMJava2-AMD64-142-SDK-1.4.2-5.0.x86_64.rpm 49248495
+RMD160 87d6595f69cfb487f30a087f7e29103a52d13c6e IBMJava2-AMD64-142-SDK-1.4.2-5.0.x86_64.rpm 49248495
+SHA256 125d73a2de395847c7abbb76b85d84d2ba71c77b83b85fdd91d5a22b865fcbd4 IBMJava2-AMD64-142-SDK-1.4.2-5.0.x86_64.rpm 49248495
+MD5 d70f99ae45a34b22703804d196cbfcc9 IBMJava2-JAVACOMM-1.4.2-5.0.i386.rpm 121771
+RMD160 9de86504b7de112ff04f4aa1ecc0a954918ddf40 IBMJava2-JAVACOMM-1.4.2-5.0.i386.rpm 121771
+SHA256 0c37c4ed04e8686e776e8782ded43c45b9d383e758fbce46c79a12a446c780f3 IBMJava2-JAVACOMM-1.4.2-5.0.i386.rpm 121771
+MD5 ec160d6b4274dec508e416669703c3fe IBMJava2-JAVACOMM-AMD64-1.4.2-5.0.x86_64.rpm 123609
+RMD160 517fcc75ab344bb62011042ba3ec03c2da50a6a6 IBMJava2-JAVACOMM-AMD64-1.4.2-5.0.x86_64.rpm 123609
+SHA256 02b0012ed707e52e1e12e7336c3d86166289127e11dd3b0b8ae0ef54e06e97b0 IBMJava2-JAVACOMM-AMD64-1.4.2-5.0.x86_64.rpm 123609
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.5.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.5.ebuild
new file mode 100644
index 000000000000..83f047317031
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.5.ebuild
@@ -0,0 +1,146 @@
+# 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.5.ebuild,v 1.1 2006/07/01 21:03:11 nichoj Exp $
+
+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"
+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"
+elif use ppc ; then
+	JDK_DIST="IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc.rpm"
+elif use ppc64 ; then
+	JDK_DIST="IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm"
+	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc64.rpm"
+fi
+
+DESCRIPTION="IBM Java Development Kit"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAPGE}/linux/download.html"
+# bug #125178
+ALT_HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/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 ) 
+		 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 doc javacomm nsplugin"
+
+DEPEND="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}/opt/IBMJava2-ppc-142"
+elif use ppc64; then
+	S="${WORKDIR}/opt/IBMJava2-ppc64-142"
+elif use amd64; then
+	S="${WORKDIR}/opt/IBMJava2-amd64-142"
+else
+	S="${WORKDIR}/opt/IBMJava2-142"
+fi
+
+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}:"
+	einfo "${JDK_DIST}"
+	if use javacomm ; then
+		einfo "${JAVACOMM_DIST}"
+	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
+}
+
+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
+}