Adding support for eventual s390 keywording

(Portage version: 2.1.1)

5 files changed, 33 insertions, 15 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 2895272f59c7..def410731a78 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 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.71 2006/09/15 04:32:47 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.72 2006/09/15 13:13:18 caster Exp $
+
+  15 Sep 2006; Vlastimil Babka <caster@gentoo.org>
+  ibm-jdk-bin-1.4.2.6-r1.ebuild, ibm-jdk-bin-1.4.2.6-r3.ebuild:
+  Adding support for eventual s390 keywording
 
   15 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
   ibm-jdk-bin-1.4.2.6-r1.ebuild:
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r1 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r1
index c4a0fa7db318..31f38b27c80f 100644
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r1
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r1
@@ -7,6 +7,9 @@ SHA256 16052150d8c22bfc0906fcc81c2d11c8dbaf84a250d068e843f953e0a121cc17 IBMJava2
 MD5 77f7981ad453b6907e78b0d9060f313e IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
 RMD160 155d132b25d990c876762474c10a0b57790a8cb9 IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
 SHA256 6393faa4becec892292192db0827c03f3984ad2e7ef09a209e801d88527366f9 IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
+MD5 baed71adec50ad711d9b29b62347c86c IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
+RMD160 ce4f51f0b2d6ce6e0a4004d78c3596bca06d4f30 IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
+SHA256 42af9a1bb57c3036ce378cba87ba20e21bef8781787c3f6c6e9a9f4875eefadb IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
 MD5 182d4c627ad26a0acc02e2abb07cfdcc IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
 RMD160 f2d1fe49a606c204dbc0b0bdd054b7ec8bb7ca63 IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
 SHA256 4bfd9461aec661fee1584920bb2d0a4274c8ac592eec612f724824cf2790d7f1 IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r3 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r3
index c4a0fa7db318..31f38b27c80f 100644
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r3
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r3
@@ -7,6 +7,9 @@ SHA256 16052150d8c22bfc0906fcc81c2d11c8dbaf84a250d068e843f953e0a121cc17 IBMJava2
 MD5 77f7981ad453b6907e78b0d9060f313e IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
 RMD160 155d132b25d990c876762474c10a0b57790a8cb9 IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
 SHA256 6393faa4becec892292192db0827c03f3984ad2e7ef09a209e801d88527366f9 IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
+MD5 baed71adec50ad711d9b29b62347c86c IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
+RMD160 ce4f51f0b2d6ce6e0a4004d78c3596bca06d4f30 IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
+SHA256 42af9a1bb57c3036ce378cba87ba20e21bef8781787c3f6c6e9a9f4875eefadb IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
 MD5 182d4c627ad26a0acc02e2abb07cfdcc IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
 RMD160 f2d1fe49a606c204dbc0b0bdd054b7ec8bb7ca63 IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
 SHA256 4bfd9461aec661fee1584920bb2d0a4274c8ac592eec612f724824cf2790d7f1 IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild
index a42f55e7ba7b..0c80853e79d8 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.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.6-r1.ebuild,v 1.3 2006/09/15 04:32:47 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild,v 1.4 2006/09/15 13:13:18 caster Exp $
 
 inherit java eutils versionator rpm
 
@@ -24,6 +24,9 @@ elif use ppc64 ; then
 	JDK_DIST="IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm"
 	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc64.rpm"
 	S="${WORKDIR}/opt/IBMJava2-ppc64-142"
+elif use s390 ; then
+	JDK_DIST="IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm"
+	S="${WORKDIR}/opt/IBMJava2-s390-142"
 fi
 
 DESCRIPTION="IBM Java Development Kit"
@@ -32,15 +35,16 @@ DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 # bug #125178
 ALT_DOWNLOADPAGE="${HOMEPAGE}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-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 )
+		s390? ( IBMJava2-142-z31-SDK-${RPM_PV}.s390.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"
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild
index 53ed85cb8a15..aa79fff075b1 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.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.6-r3.ebuild,v 1.1 2006/09/14 06:02:02 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild,v 1.2 2006/09/15 13:13:18 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator rpm
@@ -25,6 +25,9 @@ elif use ppc64 ; then
 	JDK_DIST="IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm"
 	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc64.rpm"
 	S="${WORKDIR}/opt/IBMJava2-ppc64-142"
+elif use s390 ; then
+	JDK_DIST="IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm"
+	S="${WORKDIR}/opt/IBMJava2-s390-142"
 fi
 
 DESCRIPTION="IBM Java Development Kit"
@@ -33,15 +36,16 @@ DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
 # bug #125178
 ALT_DOWNLOADPAGE="${HOMEPAGE}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-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 )
+		s390? ( IBMJava2-142-z31-SDK-${RPM_PV}.s390.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"