summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-09-15 21:48:38 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-09-15 21:48:38 +0000
commit57561959a9c3088b81dfda275253245fd8cc48ee (patch)
treeecba16f78c271854668946e45e0adfd75c663d26
parentAdd auth to games-strategy/freeciv (diff)
downloadhistorical-57561959a9c3088b81dfda275253245fd8cc48ee.tar.gz
historical-57561959a9c3088b81dfda275253245fd8cc48ee.tar.bz2
historical-57561959a9c3088b81dfda275253245fd8cc48ee.zip
Added QA_TEXTRELS for ppc64. Keyworded ppc64. Also only do chmod on javaws if its there, since it isn\'t available on all archs.
Package-Manager: portage-2.1.1
-rw-r--r--dev-java/ibm-jdk-bin/ChangeLog7
-rw-r--r--dev-java/ibm-jdk-bin/Manifest16
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild15
3 files changed, 22 insertions, 16 deletions
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index def410731a78..cb45a8fed3e4 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.72 2006/09/15 13:13:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.73 2006/09/15 21:48:38 nichoj Exp $
+
+ 15 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+ ibm-jdk-bin-1.4.2.6-r1.ebuild:
+ Added QA_TEXTRELS for ppc64. Keyworded ppc64. Also only do chmod on javaws
+ if its there, since it isn't available on all archs.
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:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index d5bab74c94c4..6347c2e8f227 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -93,10 +93,10 @@ 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.4.2.6-r1.ebuild 4505 RMD160 c41a567446b6816ad5d4e740ba3f3f0134eb49db SHA1 3fdcf0efb3446867fc445a3f3cbad0ee130a521b SHA256 009c4a67a9edadf60104c67d16d61c75e75c8dc16c5329f94dcf9932f8072162
-MD5 8f5779672c6e13fa3ee50b8a103df8dd ibm-jdk-bin-1.4.2.6-r1.ebuild 4505
-RMD160 c41a567446b6816ad5d4e740ba3f3f0134eb49db ibm-jdk-bin-1.4.2.6-r1.ebuild 4505
-SHA256 009c4a67a9edadf60104c67d16d61c75e75c8dc16c5329f94dcf9932f8072162 ibm-jdk-bin-1.4.2.6-r1.ebuild 4505
+EBUILD ibm-jdk-bin-1.4.2.6-r1.ebuild 4594 RMD160 56834c22f04d249cec26ffde785376f553646b83 SHA1 c51c630c796fb611ffaae9bb15684a56fb942bc4 SHA256 5c4e059f452d5daa44a36ffc25d29a7480545698549e4896d607a3b71b2cd36f
+MD5 5efeece4a0a07b4b704948db144363f5 ibm-jdk-bin-1.4.2.6-r1.ebuild 4594
+RMD160 56834c22f04d249cec26ffde785376f553646b83 ibm-jdk-bin-1.4.2.6-r1.ebuild 4594
+SHA256 5c4e059f452d5daa44a36ffc25d29a7480545698549e4896d607a3b71b2cd36f ibm-jdk-bin-1.4.2.6-r1.ebuild 4594
EBUILD ibm-jdk-bin-1.4.2.6-r3.ebuild 4366 RMD160 647f75640cab7ce62f4b31f3dfe007044398031d SHA1 df3f81333ee9050f65e17e05156f053732fd3cf7 SHA256 823b42648c0a2dc69fd63ba26155106ede87f767995c2349f76f34a13b859ab0
MD5 21ccd152efb172afd49656e555e49f53 ibm-jdk-bin-1.4.2.6-r3.ebuild 4366
RMD160 647f75640cab7ce62f4b31f3dfe007044398031d ibm-jdk-bin-1.4.2.6-r3.ebuild 4366
@@ -117,10 +117,10 @@ EBUILD ibm-jdk-bin-1.5.0.ebuild 3192 RMD160 4958da77c1d53998e6269c3948f5ff0a7e0c
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 11123 RMD160 c80278e65b4e6fd39a3b0cc9221a6e5fbd1c3b72 SHA1 b7966a8bbb1fad88cf819235d916d39163797d21 SHA256 76db4f9b0598fac8805230c4a34bc179686371d8f0c1e0982920992b66816d67
-MD5 c4a8e696cc22a79d89350668513a6edc ChangeLog 11123
-RMD160 c80278e65b4e6fd39a3b0cc9221a6e5fbd1c3b72 ChangeLog 11123
-SHA256 76db4f9b0598fac8805230c4a34bc179686371d8f0c1e0982920992b66816d67 ChangeLog 11123
+MISC ChangeLog 11339 RMD160 a3618d84d4701e1a1a764f4461c937f6cfeca41c SHA1 a6dd82585b8581803ca1860532b77f58a148c398 SHA256 d4748c79d0d7a4e680eedd7c652bb9708327c26e980f57f3e0405b7f1f581d04
+MD5 4495d3e70739b253164d430b423aaa69 ChangeLog 11339
+RMD160 a3618d84d4701e1a1a764f4461c937f6cfeca41c ChangeLog 11339
+SHA256 d4748c79d0d7a4e680eedd7c652bb9708327c26e980f57f3e0405b7f1f581d04 ChangeLog 11339
MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
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 0c80853e79d8..1608b52eaa13 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.4 2006/09/15 13:13:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild,v 1.5 2006/09/15 21:48:38 nichoj Exp $
inherit java eutils versionator rpm
@@ -48,7 +48,7 @@ SRC_URI="x86? ( IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm )
LICENSE="IBM-J1.4"
SLOT="1.4"
-KEYWORDS="-* amd64 ppc ~ppc64 ~x86"
+KEYWORDS="-* amd64 ppc ppc64 ~x86"
IUSE="X doc javacomm nsplugin"
RDEPEND=" !ppc64? ( !amd64? ( sys-libs/lib-compat ) )
@@ -71,14 +71,15 @@ PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
RESTRICT="fetch"
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
- opt/${P}/jre/bin/javaplugin.so
- opt/${P}/jre/bin/classic/libjvm.so
- opt/${P}/jre/bin/classic/libcore.so"
QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit22.so
opt/${P}/jre/bin/libjclscar_22.so"
+QA_TEXTRELS_ppc64="opt/${P}/jre/bin/classic/libjvm.so"
QA_TEXTRELS_ppc="opt/${P}/jre/bin/libjitc.so
opt/${P}/jre/bin/libjaas.so"
+QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
+ opt/${P}/jre/bin/javaplugin.so
+ opt/${P}/jre/bin/classic/libjvm.so
+ opt/${P}/jre/bin/classic/libcore.so"
pkg_nofetch() {
einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
@@ -100,7 +101,7 @@ src_compile() { true; }
src_install() {
# The javaws execution script is 777 why?
- chmod 0755 ${S}/jre/javaws/javaws
+ [[ -f ${S}/jre/javaws/javaws ]] && chmod 0755 ${S}/jre/javaws/javaws
# Copy all the files to the designated directory
mkdir -p ${D}opt/${P}