summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-08-17 20:43:47 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-08-17 20:43:47 +0000
commit00395cdcdf2f9afda81dcacc46e89e6c179b8827 (patch)
treed05f0a82625eade4984d06357cc1d36c9531ea3c /dev-java/sun-jre-bin
parentMarked ppc (diff)
downloadhistorical-00395cdcdf2f9afda81dcacc46e89e6c179b8827.tar.gz
historical-00395cdcdf2f9afda81dcacc46e89e6c179b8827.tar.bz2
historical-00395cdcdf2f9afda81dcacc46e89e6c179b8827.zip
Fixed for amd64, ala bug #144192
Package-Manager: portage-2.1.1_pre4-r4
Diffstat (limited to 'dev-java/sun-jre-bin')
-rw-r--r--dev-java/sun-jre-bin/ChangeLog11
-rw-r--r--dev-java/sun-jre-bin/Manifest16
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild6
3 files changed, 22 insertions, 11 deletions
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index d8a6397e91e4..0aca94393053 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for dev-java/sun-jre-bin
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.52 2006/08/17 07:21:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.53 2006/08/17 20:43:47 nichoj Exp $
+
+ 17 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+ sun-jre-bin-1.5.0.08.ebuild:
+ Fixed for amd64, ala bug #144192
+
+ 17 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+ sun-jre-bin-1.5.0.08.ebuild:
+ No longer attempts to install javaws on amd64, because it isn't available
+ there.
*sun-jre-bin-1.5.0.08 (17 Aug 2006)
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 27eb9c306471..8d2ef8febc42 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -50,14 +50,14 @@ EBUILD sun-jre-bin-1.5.0.07.ebuild 5591 RMD160 f7103d57786fd1b9459cd851e1f544270
MD5 b1245b9cb2f99ac50c1e8f21d9f140c6 sun-jre-bin-1.5.0.07.ebuild 5591
RMD160 f7103d57786fd1b9459cd851e1f5442705d4fdf8 sun-jre-bin-1.5.0.07.ebuild 5591
SHA256 9ccc02375aab8983f6898ae1e56c1bc051fee1d251b6fc82edc1cd204b9a1549 sun-jre-bin-1.5.0.07.ebuild 5591
-EBUILD sun-jre-bin-1.5.0.08.ebuild 4496 RMD160 e28756b6a51659e18a9fd645a0bc5538d318bc3d SHA1 31158d9b86915a0bb87874207caca82f24cd1b44 SHA256 29c56b36e92755a374615acf0925e9e9ef3db267671370858685a994060d2bc2
-MD5 8bd7fb78736e10e81754fdfa85eeeb99 sun-jre-bin-1.5.0.08.ebuild 4496
-RMD160 e28756b6a51659e18a9fd645a0bc5538d318bc3d sun-jre-bin-1.5.0.08.ebuild 4496
-SHA256 29c56b36e92755a374615acf0925e9e9ef3db267671370858685a994060d2bc2 sun-jre-bin-1.5.0.08.ebuild 4496
-MISC ChangeLog 9865 RMD160 2422c1c10f8fdbf9e7f2f49082a6d06f89a6c07e SHA1 8c0011e59053291185267968be4db62455c9cb04 SHA256 092fd09879d1d920585b2e0356150cf0412e6253ad62534e7f01244afedc2e9c
-MD5 944fe76ae695bb25f446a2ea2532681a ChangeLog 9865
-RMD160 2422c1c10f8fdbf9e7f2f49082a6d06f89a6c07e ChangeLog 9865
-SHA256 092fd09879d1d920585b2e0356150cf0412e6253ad62534e7f01244afedc2e9c ChangeLog 9865
+EBUILD sun-jre-bin-1.5.0.08.ebuild 4561 RMD160 f76c0005b56646f76a846449ccea6ff281fc9fcb SHA1 864806b2714c0e84d42049be984dc959fdbe50e7 SHA256 ecc79e419129d65122fc203e9c2744c0a9846fa9c90c1ab82f7c19a91718a031
+MD5 a5e31bfa288f7d3e78b5680b3989a52a sun-jre-bin-1.5.0.08.ebuild 4561
+RMD160 f76c0005b56646f76a846449ccea6ff281fc9fcb sun-jre-bin-1.5.0.08.ebuild 4561
+SHA256 ecc79e419129d65122fc203e9c2744c0a9846fa9c90c1ab82f7c19a91718a031 sun-jre-bin-1.5.0.08.ebuild 4561
+MISC ChangeLog 10149 RMD160 148f06cc9a80d7b1d30058813b0d20e67a884d18 SHA1 7802e844271031a493c85b534ea81eedccc0ec06 SHA256 8318553877657cf907308e925cdb439d2c4a1e831f4d633120c98e96614d90fd
+MD5 8cbb5195a5ece303b9f79a7ba30ec301 ChangeLog 10149
+RMD160 148f06cc9a80d7b1d30058813b0d20e67a884d18 ChangeLog 10149
+SHA256 8318553877657cf907308e925cdb439d2c4a1e831f4d633120c98e96614d90fd ChangeLog 10149
MISC metadata.xml 242 RMD160 b334d6a9cb5f410f7b422482586264e8ca3d7d0f SHA1 f203abfda28c6fbc87ba71a4a53af5459ff83236 SHA256 8a5ff51f49458f906fc5b494530b268982044b68bbbd85ff646757b88c9e350d
MD5 ca35f917561afc166491d77810b71095 metadata.xml 242
RMD160 b334d6a9cb5f410f7b422482586264e8ca3d7d0f metadata.xml 242
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild
index 2cf318b83cbd..4fcd3ad01cb9 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.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/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild,v 1.1 2006/08/17 07:21:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild,v 1.2 2006/08/17 20:43:47 nichoj Exp $
inherit java-vm-2 eutils
@@ -67,7 +67,9 @@ src_unpack() {
}
src_install() {
- local dirs="bin javaws lib man plugin"
+ local dirs="bin lib man"
+ # only X86 has the plugin and javaws
+ use x86 && dirs="${dirs} javaws plugin"
dodir /opt/${P}
for i in $dirs ; do