stable on x86 ; ported to mod-x deps

(Portage version: 2.1_pre4-r1)

4 files changed, 51 insertions, 17 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 22ce66b17b86..683f75630e05 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.25 2006/01/23 14:27:44 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.26 2006/02/08 08:40:33 compnerd Exp $
+
+  08 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  ibm-jre-bin-1.4.2.03.ebuild:
+  stable on x86
 
   23 Jan 2006; Joshua Nichols <nichoj@gentoo.org> ibm-jre-bin-1.4.2.ebuild,
   ibm-jre-bin-1.4.2.03.ebuild:
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 6fdc9f2be3dc..55b685ba47e9 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,18 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 14b16e785d294e1e7eeaa85373d5f387 ChangeLog 3718
+MD5 fc996a60d5fcf66dc3787d7a11c866f7 ChangeLog 3822
+RMD160 4cd18e4105c6f7957476cb12c6abf3cf71359dd7 ChangeLog 3822
+SHA256 ecea399bd1e96ad5ef894547d49a0855df9fe24ec01599da223d1cbfa2510e25 ChangeLog 3822
 MD5 2e39286179863d6cfd0686f84e4907f6 files/digest-ibm-jre-bin-1.4.2 211
-MD5 ff8386f4af589fbef49b02e720e1b8af files/digest-ibm-jre-bin-1.4.2.03 307
+RMD160 fa4e9aa4a2fca49896a14b9b58e350248ba982c2 files/digest-ibm-jre-bin-1.4.2 211
+SHA256 42ec24d0c42d41b382808683d88a767625bb197156600a2b8238db04a620bb6c files/digest-ibm-jre-bin-1.4.2 211
+MD5 0245416679d79331d7c033f5f9a0e8bf files/digest-ibm-jre-bin-1.4.2.03 1105
+RMD160 7321bb6d84092f86138a59259c1eefba00b0cd10 files/digest-ibm-jre-bin-1.4.2.03 1105
+SHA256 ca03d2127d72ba5f72151dea33836a82d8a2cab72ef71c7ee20b9d6925d136b8 files/digest-ibm-jre-bin-1.4.2.03 1105
 MD5 dbb65981559a5881a93e19de3dde0b7c files/ibm-jre-bin-1.4.2 681
+RMD160 72ca274266c37013cc8ce7b79d3cfda9322520e3 files/ibm-jre-bin-1.4.2 681
+SHA256 fefe0873cce6685684998299add6ccee8ec2dc8e04465115f804a15e62d106a0 files/ibm-jre-bin-1.4.2 681
 MD5 3936320d759d943aa19ad46d6e46b30c files/ibm-jre-bin-1.4.2.03 688
-MD5 3a088676edca8f31c87e1a0c645e7a6c ibm-jre-bin-1.4.2.03.ebuild 2869
+RMD160 9ee073f46381672c4f8800226d01a0cd4a0ab116 files/ibm-jre-bin-1.4.2.03 688
+SHA256 461205a91a985669cea68c9f70831efa7d4a374643b9eea6faf2c3280663167b files/ibm-jre-bin-1.4.2.03 688
+MD5 62228ad48460aa774c6549b3188c09a0 ibm-jre-bin-1.4.2.03.ebuild 3143
+RMD160 4e846205522123468fc54050eb32efdf25f79aae ibm-jre-bin-1.4.2.03.ebuild 3143
+SHA256 429eb44888b2256c080802443de1d3b3ec87b50ad1c8c261ebb4147873ae6544 ibm-jre-bin-1.4.2.03.ebuild 3143
 MD5 cb942fcb638c92d375eb91869a8454b9 ibm-jre-bin-1.4.2.ebuild 2177
+RMD160 f0b690a5383d6cf20f6041380f59cbc7db26edc7 ibm-jre-bin-1.4.2.ebuild 2177
+SHA256 30ab1217eb8ea9de8be4fca96b332231b85511431f07c6328d310a1f05523fd6 ibm-jre-bin-1.4.2.ebuild 2177
 MD5 fb2a9b7b6110f3fc99c228068cac96b8 metadata.xml 284
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD1YB/ndWRXhKOboURAtOrAKCo60yLkEWFdY7Qzkb6FlZeTQ1nCwCgqZHK
-G9UgaxbIwOKgE3LMbi0rd6k=
-=ppAy
------END PGP SIGNATURE-----
+RMD160 0ab71be4482c89456bfd0d9f472272a0e80c33ca metadata.xml 284
+SHA256 c0538c7a4134f6bfc29f93ebf259d53d8123b5eccdacd8f09bef9e6b18ee4bcd metadata.xml 284
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.03 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.03
index 245373b66d23..6d66c09ea9a8 100644
--- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.03
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.03
@@ -1,4 +1,12 @@
 MD5 e31831ecb1dc308f176f0bcd9d7d95ce IBMJava2-JRE-142-SR3.tgz 38733463
+RMD160 c6904d05bc612af3db8adc92e299b8cd95f6a47e IBMJava2-JRE-142-SR3.tgz 38733463
+SHA256 6c012a40f5495461677ac98fea86c453c7efa3bb4969624fb98cc4d1122d20df IBMJava2-JRE-142-SR3.tgz 38733463
 MD5 28e686f5c45d3c946edfa5ca9393dd0c IBMJava2-JRE-142.ppc-SR3.tgz 41878932
+RMD160 7f32eee25de17b1e1d23eb5fd2de57a87aee70c6 IBMJava2-JRE-142.ppc-SR3.tgz 41878932
+SHA256 be70a2126cf45bb1f09e455ccb5495ca3b16b3983bcd2ad8b26f34e7abdd85a6 IBMJava2-JRE-142.ppc-SR3.tgz 41878932
 MD5 c0895e6da29fc9836f3bb1397d067f6d IBMJava2-JRE-142.ppc64-SR3.tgz 39136112
+RMD160 d372a4bcef0c375bbbcd11a2657cbf184b21f044 IBMJava2-JRE-142.ppc64-SR3.tgz 39136112
+SHA256 912b98eee21d641068b8b6055352b306502ce8d4e56643b51dc9d16cc8411ffd IBMJava2-JRE-142.ppc64-SR3.tgz 39136112
 MD5 afd2f2b52bd6a7f335368e6d8242ddad IBMJava2-JRE-AMD64-142.x86_64-SR3.tgz 33666833
+RMD160 f13b3b937ed7724959f7347d108da5aeee5b359f IBMJava2-JRE-AMD64-142.x86_64-SR3.tgz 33666833
+SHA256 63e7a4555b9445f1accb8a435b8a2937eb6d76b739cc7508570a555479c1515d IBMJava2-JRE-AMD64-142.x86_64-SR3.tgz 33666833
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.03.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.03.ebuild
index b68364f0ab0d..26dbcbb052b3 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.03.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.03.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-jre-bin/ibm-jre-bin-1.4.2.03.ebuild,v 1.3 2006/01/23 14:27:44 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.03.ebuild,v 1.4 2006/02/08 08:40:33 compnerd Exp $
 
 inherit java eutils
 
@@ -27,11 +27,27 @@ SRC_URI="x86? ( IBMJava2-JRE-142-SR3.tgz )
 
 LICENSE="IBM-J1.4"
 SLOT="1.4"
-KEYWORDS="-* ~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="-* ~amd64 ppc ~ppc64 x86"
 IUSE="X nsplugin"
 
 DEPEND="virtual/libc
-		X? ( virtual/x11 )"
+		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 ) )"