summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2006-09-02 20:10:54 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2006-09-02 20:10:54 +0000
commitcc1779cf78684af7a2f6e83c22c23d6e50ccb06f (patch)
tree60e81907483f803eec2c31d356ed7064b03e705f /dev-java/ibm-jdk-bin
parentStable on ppc64; bug #138178 (diff)
downloadhistorical-cc1779cf78684af7a2f6e83c22c23d6e50ccb06f.tar.gz
historical-cc1779cf78684af7a2f6e83c22c23d6e50ccb06f.tar.bz2
historical-cc1779cf78684af7a2f6e83c22c23d6e50ccb06f.zip
Added RDEPEND for =virtual/libstdc++-3.3. Fixes bug #117356 for everyone else than s390 users. Else moved X stuff from DEPEND to RDEPEND.
Package-Manager: portage-2.1.1_rc1-r2
Diffstat (limited to 'dev-java/ibm-jdk-bin')
-rw-r--r--dev-java/ibm-jdk-bin/ChangeLog8
-rw-r--r--dev-java/ibm-jdk-bin/Manifest42
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0-r11.ebuild3
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild7
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild6
5 files changed, 42 insertions, 24 deletions
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 8c1c3fa149df..c16e3dd9db54 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 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.64 2006/09/01 03:31:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.65 2006/09/02 20:10:54 betelgeuse Exp $
+
+ 02 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
+ ibm-jdk-bin-1.5.0.ebuild, ibm-jdk-bin-1.5.0-r11.ebuild,
+ ibm-jdk-bin-1.5.0.2.ebuild:
+ Added RDEPEND for =virtual/libstdc++-3.3. Fixes bug #117356 for everyone
+ else than s390 users. Else moved X stuff from DEPEND to RDEPEND.
01 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
ibm-jdk-bin-1.5.0.2.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 176e1f8e67f8..4844c6faddaf 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX cpuinfo 12 RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d SHA1 2c35d51e0110bd74f2c4cf9f7f063358837ea907 SHA256 b90ea3549103fa261cd711ecb3d11158c984bc20a020630aa3ebc3f8b402ec11
MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d files/cpuinfo 12
@@ -82,22 +85,22 @@ EBUILD ibm-jdk-bin-1.4.2.5.ebuild 4135 RMD160 ffb3b0910eff1ddc0e13d48574b631455f
MD5 a86fdd6bd0a433ae0ccd70831f301148 ibm-jdk-bin-1.4.2.5.ebuild 4135
RMD160 ffb3b0910eff1ddc0e13d48574b631455faba72e ibm-jdk-bin-1.4.2.5.ebuild 4135
SHA256 1e594bb98eba7e1a70c7fa29e6d918b7c4d6ae379d81cb17f42ac23f3990f17c ibm-jdk-bin-1.4.2.5.ebuild 4135
-EBUILD ibm-jdk-bin-1.5.0-r11.ebuild 2825 RMD160 fa7bea97a238a61602cc95a985d2b50f76c228b9 SHA1 fc1db4ed8bdca82f054498abc14ff010070d1e99 SHA256 1b6c0333a3e57059809f16ab96c2c3f7623aa3427d2d6f281496d9933a6c37e9
-MD5 279a6679796790afb5effbe352d8bbd2 ibm-jdk-bin-1.5.0-r11.ebuild 2825
-RMD160 fa7bea97a238a61602cc95a985d2b50f76c228b9 ibm-jdk-bin-1.5.0-r11.ebuild 2825
-SHA256 1b6c0333a3e57059809f16ab96c2c3f7623aa3427d2d6f281496d9933a6c37e9 ibm-jdk-bin-1.5.0-r11.ebuild 2825
-EBUILD ibm-jdk-bin-1.5.0.2.ebuild 3961 RMD160 c471114754207e9337ce3a1f162d0493652c042a SHA1 74b24b1ea607030fd364536e9d384aa68f5a4b9c SHA256 82c1f3edfe9f603bfb3ed495a49e0a38a3fd72e7c4011407e3239b14be4ac962
-MD5 ff8a9c0a9d55896a471b244a750f2253 ibm-jdk-bin-1.5.0.2.ebuild 3961
-RMD160 c471114754207e9337ce3a1f162d0493652c042a ibm-jdk-bin-1.5.0.2.ebuild 3961
-SHA256 82c1f3edfe9f603bfb3ed495a49e0a38a3fd72e7c4011407e3239b14be4ac962 ibm-jdk-bin-1.5.0.2.ebuild 3961
-EBUILD ibm-jdk-bin-1.5.0.ebuild 3190 RMD160 7664a0406a3d4533c9ac25e6261cce54aa3f5402 SHA1 64c5b93ee447ddbf5101e54a18ac6bf7e58698b2 SHA256 fd94dee2b15214f9da5a99527e8d3924147f5560f6a997233f0c19d34e20021f
-MD5 afd989f1ceeccd45c58291fc0e900141 ibm-jdk-bin-1.5.0.ebuild 3190
-RMD160 7664a0406a3d4533c9ac25e6261cce54aa3f5402 ibm-jdk-bin-1.5.0.ebuild 3190
-SHA256 fd94dee2b15214f9da5a99527e8d3924147f5560f6a997233f0c19d34e20021f ibm-jdk-bin-1.5.0.ebuild 3190
-MISC ChangeLog 9653 RMD160 2bd2471f7f65ed4a3e368e6f3b027abca446c915 SHA1 3b54278971b8bba72313fc0b0257043def192ba6 SHA256 b74f9831a50ab02331769b70dc54489511d9675b51e132408e5fa494bb77f814
-MD5 167a27715412cc05fba3d1faaaa6e1fe ChangeLog 9653
-RMD160 2bd2471f7f65ed4a3e368e6f3b027abca446c915 ChangeLog 9653
-SHA256 b74f9831a50ab02331769b70dc54489511d9675b51e132408e5fa494bb77f814 ChangeLog 9653
+EBUILD ibm-jdk-bin-1.5.0-r11.ebuild 2852 RMD160 dde7682d2675a302b6bf372027f8c7e3d97d199e SHA1 5b8ebb8ac5231a95851c075b7f78220c98fbb2ad SHA256 2f9b64439a8f92314b0e00d88fca7ac7a0b5f3b1c22b5ed9aaaae0292b172d7d
+MD5 04a77cdef9aaa6c0a08cdab17d9a1eb8 ibm-jdk-bin-1.5.0-r11.ebuild 2852
+RMD160 dde7682d2675a302b6bf372027f8c7e3d97d199e ibm-jdk-bin-1.5.0-r11.ebuild 2852
+SHA256 2f9b64439a8f92314b0e00d88fca7ac7a0b5f3b1c22b5ed9aaaae0292b172d7d ibm-jdk-bin-1.5.0-r11.ebuild 2852
+EBUILD ibm-jdk-bin-1.5.0.2.ebuild 3981 RMD160 bb4a886dc794badbce0bdc45eb60c776e40d5936 SHA1 478abe836b32af95ee94a7dfc6e7f6333a149bbb SHA256 532afe4e7994672e7efef6499201ea69836674ed23214b3d17edb529ecc0ef8e
+MD5 e22a716aa94211b53ae5a094ebfe422e ibm-jdk-bin-1.5.0.2.ebuild 3981
+RMD160 bb4a886dc794badbce0bdc45eb60c776e40d5936 ibm-jdk-bin-1.5.0.2.ebuild 3981
+SHA256 532afe4e7994672e7efef6499201ea69836674ed23214b3d17edb529ecc0ef8e ibm-jdk-bin-1.5.0.2.ebuild 3981
+EBUILD ibm-jdk-bin-1.5.0.ebuild 3192 RMD160 4958da77c1d53998e6269c3948f5ff0a7e0c4397 SHA1 00a7d3cd35b052871f8e67c7e766f1cd8068b356 SHA256 158268b7d3ff98d8bbccb3ccd5495888a3a814bcc4055fe09a9d84a1c9c183b6
+MD5 4780f474f1be61217982b6c8091de638 ibm-jdk-bin-1.5.0.ebuild 3192
+RMD160 4958da77c1d53998e6269c3948f5ff0a7e0c4397 ibm-jdk-bin-1.5.0.ebuild 3192
+SHA256 158268b7d3ff98d8bbccb3ccd5495888a3a814bcc4055fe09a9d84a1c9c183b6 ibm-jdk-bin-1.5.0.ebuild 3192
+MISC ChangeLog 9941 RMD160 88d05bc83789e7d96d28fe78338d8976cc7dd9ff SHA1 1d336363d7a8eba33a034a19559255e2986da214 SHA256 d69f0feb4e9f300be41f43dc965f5fb264105ab8cbafd71c2915ba88fc6cadb7
+MD5 9e539be265957e207d0ba1dc8debd924 ChangeLog 9941
+RMD160 88d05bc83789e7d96d28fe78338d8976cc7dd9ff ChangeLog 9941
+SHA256 d69f0feb4e9f300be41f43dc965f5fb264105ab8cbafd71c2915ba88fc6cadb7 ChangeLog 9941
MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
@@ -123,3 +126,10 @@ SHA256 9676717426b61804249d32ba88d841ee440d3084613b1809d5832e425abe1ac0 files/di
MD5 51e8e04e14a44502ca27a46a6fa16355 files/digest-ibm-jdk-bin-1.5.0.2 2396
RMD160 1b3fe81686391ecf0fdef07586643292b64e071f files/digest-ibm-jdk-bin-1.5.0.2 2396
SHA256 904666cd8dbe71ebed3d7c19323c840b26ff3d6390fbaa2e918cc2d9376d3485 files/digest-ibm-jdk-bin-1.5.0.2 2396
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE+eVncxLzpIGCsLQRAovyAKCZsr/tdWugKaJ2uMTRIFLABpCs5ACeOAvD
+JzKeJAZFpGCXTH9VVZ5eFns=
+=HKBw
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0-r11.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0-r11.ebuild
index 91c526e6679f..980105bbc61b 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0-r11.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0-r11.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-r11.ebuild,v 1.3 2006/07/06 11:17:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0-r11.ebuild,v 1.4 2006/09/02 20:10:54 betelgeuse Exp $
inherit java-vm-2 eutils
@@ -24,6 +24,7 @@ RESTRICT="fetch"
JAVA_VM_NO_GENERATION1=true
DEPEND="
+ =virtual/libstdc++-3.3
X? ( || (
(
x11-libs/libXt
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
index 4cbf39c80023..91f9cc7842f3 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.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.2.ebuild,v 1.2 2006/09/01 03:31:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild,v 1.3 2006/09/02 20:10:54 betelgeuse Exp $
inherit java-vm-2 versionator eutils rpm
@@ -59,7 +59,8 @@ LICENSE="IBM-J1.5"
KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
RESTRICT="fetch"
-DEPEND="
+RDEPEND="
+ =virtual/libstdc++-3.3
X? ( || (
(
x11-libs/libXt
@@ -77,7 +78,7 @@ DEPEND="
virtual/x11
)
)"
-RDEPEND="${DEPEND}"
+DEPEND=""
IUSE="X javacomm nsplugin"
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 d17cc74f19cf..f3244159b71b 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.7 2006/07/06 11:17:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.ebuild,v 1.8 2006/09/02 20:10:54 betelgeuse Exp $
inherit java eutils
@@ -25,7 +25,7 @@ KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~s390 ~x86"
RESTRICT="fetch"
IUSE="X javacomm browserplugin mozilla"
-DEPEND="sys-libs/glibc
+RDEPEND="sys-libs/glibc
X? ( || (
(
x11-libs/libXt
@@ -43,7 +43,7 @@ DEPEND="sys-libs/glibc
virtual/x11
)
)"
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}"
if use x86; then
S="${WORKDIR}/ibm-java2-i386-50"