Initial s390 support thanks to Nils Reimann #129703.

(Portage version: 2.1_pre7-r5)

5 files changed, 38 insertions, 14 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 68472ffce0de..922422667cf7 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 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.53 2006/04/11 03:44:16 wormo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.54 2006/04/16 07:15:17 vapier Exp $
+
+  16 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  ibm-jdk-bin-1.4.2.04.ebuild, ibm-jdk-bin-1.5.0.ebuild:
+  Initial s390 support thanks to Nils Reimann #129703.
 
   10 Apr 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   ibm-jdk-bin-1.4.2.04.ebuild:
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
index c524711a8aa5..14caefe41123 100644
--- 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
@@ -5,4 +5,7 @@ MD5 70a215d42fb90d182830bcc7f6e51e30 IBMJava2-JAVACOMM-AMD64-142.x86_64-SR4.tgz
 MD5 46eab0423830c9e422ee3f3174287905 IBMJava2-SDK-142-SR4.tgz 58637378
 MD5 c40c6a680a7dbb59985599c4c8b6df6e IBMJava2-SDK-142.ppc-SR4.tgz 61333916
 MD5 2ddc251193cab8624723406fc7f97dfb IBMJava2-SDK-142.ppc64-SR4.tgz 58579341
+MD5 7ea90048e15c7f03da61f5144deb74c0 IBMJava2-SDK-142.s390.tgz 54803305
+RMD160 21be92177ded79836c6684ba119482000beffdbb IBMJava2-SDK-142.s390.tgz 54803305
+SHA256 5f4c98cecfcac506e1d63eb0aa9ac83d36d66f9fadb38deadc781cb777eaa09d IBMJava2-SDK-142.s390.tgz 54803305
 MD5 f50f48dbbca59d9d45f507d0baecf993 IBMJava2-SDK-AMD64-142.x86_64-SR4.tgz 51690993
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0
index 1fbbc76a1411..225bf3a2bfec 100644
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0
@@ -5,4 +5,7 @@ MD5 56e9dbed29bf8cd34bf9a5e049e096e7 ibm-java2-javacomm-50-linux-x86_64.tgz 1213
 MD5 756ee68e2f74a597ebd92b4e8a4c0e07 ibm-java2-sdk-50-linux-i386.tgz 58162719
 MD5 48be7a4f3104abc73286e0c5bab41839 ibm-java2-sdk-50-linux-ppc.tgz 65733869
 MD5 37c0f46595f1c36354befadc130c1afb ibm-java2-sdk-50-linux-ppc64.tgz 67100609
+MD5 63ddb4cd9cceff9460f0224b24e2cc02 ibm-java2-sdk-50-linux-s390.tgz 63680823
+RMD160 2b0155ee5509c99d221556c6299e11b77328aad1 ibm-java2-sdk-50-linux-s390.tgz 63680823
+SHA256 0094a287fb5f7b5c9b0e22d665540c4e560cff8953f35ae5ce6c1535dccb531b ibm-java2-sdk-50-linux-s390.tgz 63680823
 MD5 dd515ab0ee22dbc9d32f2f9b2ac1c8c1 ibm-java2-sdk-50-linux-x86_64.tgz 62861140
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
index 7c95c00f7f83..94fdaed38852 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.3 2006/04/11 03:44:16 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.04.ebuild,v 1.4 2006/04/16 07:15:17 vapier Exp $
 
 inherit java eutils
 
@@ -24,6 +24,11 @@ elif use ppc64 ; then
 	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"
+elif use s390 ; then
+	JDK_DIST="IBMJava2-SDK-142.s390.tgz"
+	JDK_DIST_GENTOO="IBMJava2-SDK-142.s390.tgz"
+	JAVACOMM_DIST="IBMJava2-SDK-142.s390.tgz"
+	JAVACOMM_DIST_GENTOO="IBMJava2-SDK-142.s390.tgz"
 fi
 
 DESCRIPTION="IBM Java Development Kit"
@@ -34,19 +39,21 @@ 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 )
+		 s390? ( IBMJava2-SDK-142.s390.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 )
 		 		   )"
+#					s390? ( IBMJava2-JAVACOMM-142.s390-SR4.tgz )
 
 LICENSE="IBM-J1.4"
 SLOT="1.4"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="X doc javacomm nsplugin"
 
-DEPEND="virtual/libc
+DEPEND="sys-libs/glibc
 		X? ( || (
 					(
 						x11-libs/libXt
@@ -65,7 +72,8 @@ DEPEND="virtual/libc
 				)
 			)"
 RDEPEND="${DEPEND}
-		 !ppc64? ( !amd64? ( sys-libs/lib-compat ) )"
+		 ppc? ( sys-libs/lib-compat )
+		 x86? ( sys-libs/lib-compat )"
 PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
 
 PROVIDE="virtual/jdk
@@ -79,6 +87,8 @@ elif use ppc64; then
 	S="${WORKDIR}/IBMJava2-ppc64-142"
 elif use amd64; then
 	S="${WORKDIR}/IBMJava2-amd64-142"
+elif use s390; then
+	S="${WORKDIR}/IBMJava2-s390-142"
 else
 	S="${WORKDIR}/IBMJava2-142"
 fi
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild
index 8188c3235bf7..71d1dcac28af 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # 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.5.0.ebuild,v 1.5 2006/03/12 13:35:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild,v 1.6 2006/04/16 07:15:17 vapier Exp $
 
 inherit java eutils
 
@@ -10,20 +10,22 @@ SRC_URI="x86? ( ibm-java2-sdk-50-linux-i386.tgz )
 	amd64? ( ibm-java2-sdk-50-linux-x86_64.tgz )
 	ppc? ( ibm-java2-sdk-50-linux-ppc.tgz )
 	ppc64? ( ibm-java2-sdk-50-linux-ppc64.tgz )
+	s390? ( ibm-java2-sdk-50-linux-s390.tgz )
 	javacomm? (
 		x86? ( ibm-java2-javacomm-50-linux-i386.tgz )
 		amd64? ( ibm-java2-javacomm-50-linux-x86_64.tgz )
 		ppc? ( ibm-java2-javacomm-50-linux-ppc.tgz )
 		ppc64? ( ibm-java2-javacomm-50-linux-ppc64.tgz )
 		)"
-PROVIDE="virtual/jdk
-	virtual/jre"
-SLOT="1.5"
+#		s390? ( ibm-java2-javacomm-50-linux-s390.tgz )
+
 LICENSE="IBM-J1.5"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+SLOT="1.5"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~s390 ~x86"
 RESTRICT="fetch"
+IUSE="X javacomm browserplugin mozilla"
 
-DEPEND="virtual/libc
+DEPEND="sys-libs/glibc
 		X? ( || (
 					(
 						x11-libs/libXt
@@ -42,8 +44,8 @@ DEPEND="virtual/libc
 				)
 			)"
 RDEPEND="${DEPEND}"
-
-IUSE="X javacomm browserplugin mozilla"
+PROVIDE="virtual/jdk
+	virtual/jre"
 
 if use x86; then
 	S="${WORKDIR}/ibm-java2-i386-50"
@@ -53,6 +55,8 @@ elif use ppc; then
 	S="${WORKDIR}/ibm-java2-ppc-50"
 elif use ppc64; then
 	S="${WORKDIR}/ibm-java2-ppc64-50"
+elif use s390; then
+	S="${WORKDIR}/ibm-java2-s390-50"
 fi