summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-10-18 08:02:16 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-10-18 08:02:16 +0000
commit7c32b481c7717d11e29c080cf693f97c63097af9 (patch)
tree1f1a6fdb10e1519cc15f06a2a7d0cb4fd098ff82 /dev-java
parentStable on mips, bug #67731 (diff)
downloadhistorical-7c32b481c7717d11e29c080cf693f97c63097af9.tar.gz
historical-7c32b481c7717d11e29c080cf693f97c63097af9.tar.bz2
historical-7c32b481c7717d11e29c080cf693f97c63097af9.zip
Don't try too install javaws & plugin on amd64 since they don't have it, #67965
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/sun-jre-bin/ChangeLog7
-rw-r--r--dev-java/sun-jre-bin/Manifest10
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.ebuild11
3 files changed, 20 insertions, 8 deletions
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 05ee6dc4573a..1e9d72ce3777 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/sun-jre-bin
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.11 2004/10/12 21:49:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.12 2004/10/18 08:02:16 axxo Exp $
+
+*sun-jre-bin-1.5.0 (18 Oct 2004)
+
+ 18 Oct 2004; Thomas Matthijs <axxo@gentoo.org> sun-jre-bin-1.5.0.ebuild:
+ Don't try too install javaws & plugin on amd64 since they don't have it, #67965
*sun-jre-bin-1.4.2.06 (12 Oct 2004)
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 46ffafaea9ea..df2930a88e9e 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -2,8 +2,8 @@
Hash: SHA1
MD5 2fbe937bcd6f100b6c6006430b1373dd sun-jre-bin-1.4.2.05-r1.ebuild 4807
-MD5 a03fa667b8fcf150fdc7b3ad864c4abc sun-jre-bin-1.5.0.ebuild 5170
-MD5 ed36b228d3ec0b5e3ad70f3bc3f717b8 ChangeLog 2262
+MD5 002a11680b4272876278db70b1bfe2a6 sun-jre-bin-1.5.0.ebuild 5233
+MD5 ef2b4480a4a06937e71bc962cadcabb5 ChangeLog 2454
MD5 ca35f917561afc166491d77810b71095 metadata.xml 242
MD5 7d17587f01ed6c441db2b7c0e754a144 sun-jre-bin-1.4.2.06.ebuild 4848
MD5 e769eaeb7ddf420cace1a83890d42703 files/digest-sun-jre-bin-1.4.2.06 75
@@ -15,7 +15,7 @@ MD5 6ec9cb0d5657017ab82a1e42f6e677b1 files/sun-jre-bin-1.4.2.06 439
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
-iD8DBQFBbFF//rLF9B432nYRAkhfAJ9l+POgVfh/qcRVXmAdvOd+mDZQmwCeJsBB
-x0C+e6q9Dtrt9flj5Md4aY0=
-=QjP6
+iD8DBQFBc3i1/rLF9B432nYRAqYMAKCANAQV2JP7ol0kwfQF4lXMMwIrxACfd+pP
+eiSAZ/EHLQZlAgGlQd3RvtI=
+=OFdn
-----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.ebuild
index 18a281fe7940..ca9ff89379b2 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.ebuild,v 1.1 2004/10/08 22:51:00 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.ebuild,v 1.2 2004/10/18 08:02:16 axxo Exp $
inherit java eutils
@@ -78,7 +78,14 @@ src_unpack() {
}
src_install() {
- local dirs="bin javaws lib man plugin"
+
+ if use amd64; then
+ local dirs="bin lib man"
+ else
+ local dirs="bin lib man plugin javaws"
+ fi
+
+
dodir /opt/${P}
for i in $dirs ; do