summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad House <brad_mssw@gentoo.org>2003-10-05 03:41:25 +0000
committerBrad House <brad_mssw@gentoo.org>2003-10-05 03:41:25 +0000
commit612d393a78ba1bf665c71fc0eca350f69344d985 (patch)
treeff763f1750a551cd9ef2acf5830cb55c2203dda8 /dev-java
parentcoreutils workaround (diff)
downloadgentoo-2-612d393a78ba1bf665c71fc0eca350f69344d985.tar.gz
gentoo-2-612d393a78ba1bf665c71fc0eca350f69344d985.tar.bz2
gentoo-2-612d393a78ba1bf665c71fc0eca350f69344d985.zip
java for amd64
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/blackdown-jre/ChangeLog5
-rw-r--r--dev-java/blackdown-jre/Manifest6
-rw-r--r--dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild10
3 files changed, 15 insertions, 6 deletions
diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index d5d1b5954e8a..618e590a363b 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/blackdown-jre
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.23 2003/09/06 12:13:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.24 2003/10/05 03:41:21 brad_mssw Exp $
+
+ 04 Oct 2003; Brad House <brad_mssw@gentoo.org> blackdown-jre-1.4.1.ebuild:
+ Allow amd64 to use java with dependancy on emul-linux-x86-baselibs
06 Sep 2003; Hanno Boeck <hanno@gentoo.org> blackdown-jre-1.3.1-r7.ebuild,
blackdown-jre-1.3.1-r8.ebuild, blackdown-jre-1.3.1-r9.ebuild,
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index d609b78c510e..4dd74d495aca 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,12 +1,12 @@
-MD5 2ed4570019b3eee59e0d5a36795fe536 ChangeLog 3780
+MD5 34a6fd6dd97eb2215b933182c302587a ChangeLog 3931
MD5 da29fa9c1dcc4ce7e6cbb6d696c98dcb blackdown-jre-1.3.1-r7.ebuild 2036
MD5 41c62ff15d67c183114195c186bdb104 blackdown-jre-1.3.1-r8.ebuild 1866
MD5 3b35d318f63d063a9a04769f82742981 blackdown-jre-1.3.1-r9.ebuild 2081
-MD5 dacfe22dd5d3140712b2246563585d8d blackdown-jre-1.4.1.ebuild 2212
+MD5 609b17b0af54cc01471c658d0fd2e538 blackdown-jre-1.4.1.ebuild 2619
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
MD5 60f9af5767a218c44dd128c4f4d4b0ab files/blackdown-jre-1.3.1 562
+MD5 62521a51904596cc001140b1067c3ce0 files/blackdown-jre-1.4.1 562
MD5 87689b5c7a0f97a6571a10ac42cb3bac files/digest-blackdown-jre-1.3.1-r7 240
MD5 87689b5c7a0f97a6571a10ac42cb3bac files/digest-blackdown-jre-1.3.1-r8 240
MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
-MD5 62521a51904596cc001140b1067c3ce0 files/blackdown-jre-1.4.1 562
MD5 99eadcd54ca327f0dacc2d0d33db3175 files/digest-blackdown-jre-1.4.1 248
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
index 79c9547b7514..8121fe7e764b 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.5 2003/09/06 12:13:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.6 2003/10/05 03:41:21 brad_mssw Exp $
inherit java nsplugins gcc
@@ -10,22 +10,26 @@ DESCRIPTION="Blackdown Java Runtime Environment 1.4.1"
if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -ge "2" ]
then
SRC_URI="x86? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
+ amd64? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
sparc? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/sparc/01/j2re-1.4.1-01-linux-sparc-gcc3.2.bin"
else
SRC_URI="x86? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc2.95.bin
+ amd64? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
sparc? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/sparc/01/j2re-1.4.1-01-linux-sparc-gcc3.2.bin"
use sparc && RDEPEND=">=sys-devel/gcc-3.2"
+ use amd64 && RDEPEND=">=sys-devel/gcc-3.2"
fi
HOMEPAGE="http://www.blackdown.org"
DEPEND="virtual/glibc
+ amd64? ( >=app-emulation/emul-linux-x86-baselibs-1 )
>=dev-java/java-config-0.2.5"
RDEPEND="$RDEPEND $DEPEND"
PROVIDE="virtual/jre-1.4.1
virtual/java-scheme-2"
SLOT="0"
LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86 sparc"
+KEYWORDS="x86 sparc ~amd64"
src_unpack () {
tail -n +461 ${DISTDIR}/${A} | tar xjf -
@@ -43,6 +47,8 @@ src_install () {
# Install mozilla plugin
if [ "${ARCH}" == "x86" ] ; then
PLATFORM="i386"
+ elif [ "${ARCH}" == "amd64" ] ; then
+ PLATFORM="i386"
elif [ "${ARCH}" == "ppc" ] ; then
PLATFORM="ppc"
elif [ "${ARCH}" == "sparc" ] ; then