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
commiteb1b973c4352c63c0d14a2827c69c51e06f06700 (patch)
tree8f66e8f9fccefb139de519f4e41d0c62de027103 /dev-java
parentAdd auth to games-strategy/freeciv (diff)
downloadgentoo-2-eb1b973c4352c63c0d14a2827c69c51e06f06700.tar.gz
gentoo-2-eb1b973c4352c63c0d14a2827c69c51e06f06700.tar.bz2
gentoo-2-eb1b973c4352c63c0d14a2827c69c51e06f06700.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.
(Portage version: 2.1.1)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ibm-jdk-bin/ChangeLog7
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r1.ebuild15
2 files changed, 14 insertions, 8 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/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}