diff options
| author |   Brad House <brad_mssw@gentoo.org> | 2003-10-05 03:44:49 +0000 |
|---|---|---|
| committer | Brad House <brad_mssw@gentoo.org> | 2003-10-05 03:44:49 +0000 |
| commit | 7aea911d0896958bd1ce3cfbdb5c7e57d797d4e1 (patch) | |
| tree | b8a6565df9d1a74151219836cb0908ce3ad42dc3 | |
| parent | java for amd64 (diff) | |
| download | gentoo-2-7aea911d0896958bd1ce3cfbdb5c7e57d797d4e1.tar.gz gentoo-2-7aea911d0896958bd1ce3cfbdb5c7e57d797d4e1.tar.bz2 gentoo-2-7aea911d0896958bd1ce3cfbdb5c7e57d797d4e1.zip | |
amd64 and java
| -rw-r--r-- | dev-java/blackdown-jdk/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/blackdown-jdk/Manifest | 8 | ||||
| -rw-r--r-- | dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild | 14 |
3 files changed, 18 insertions, 9 deletions
diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog index 669be2c7fa7b..7e4685b0a4ad 100644 --- a/dev-java/blackdown-jdk/ChangeLog +++ b/dev-java/blackdown-jdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/blackdown-jdk # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.38 2003/10/03 10:57:22 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.39 2003/10/05 03:44:44 brad_mssw Exp $ + + 04 Oct 2003; Brad House <brad_mssw@gentoo.org> blackdown-jdk-1.4.1.ebuild: + allow amd64 to install java 03 Oct 2003; Alexander Gabert <pappy@gentoo.org> blackdown-jdk-1.4.1.ebuild: added chpax behaviour for proper operation of blackdown under PaX kernels diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest index 85c734da69f2..8b57cac4499a 100644 --- a/dev-java/blackdown-jdk/Manifest +++ b/dev-java/blackdown-jdk/Manifest @@ -1,9 +1,9 @@ -MD5 56b513b890fb03f41c60b16d2a654cb1 blackdown-jdk-1.3.1-r9.ebuild 2253 -MD5 5e775ad400b1d5df2c493f4e4a4bc403 blackdown-jdk-1.3.1-r8.ebuild 2139 +MD5 66613f7733da87009d02b8858b840c59 ChangeLog 7355 MD5 f1391b92d8e59a114d34a269cfc3a503 blackdown-jdk-1.3.1-r10.ebuild 2356 -MD5 dec747c672851cace85252885355868c blackdown-jdk-1.4.1.ebuild 3386 -MD5 8e35c9dcc5292fdabea33ae59eaf8bb3 ChangeLog 7243 MD5 e7a8ef2d520a5ea61f264e9718b8d4c2 blackdown-jdk-1.3.1-r7.ebuild 2316 +MD5 5e775ad400b1d5df2c493f4e4a4bc403 blackdown-jdk-1.3.1-r8.ebuild 2139 +MD5 56b513b890fb03f41c60b16d2a654cb1 blackdown-jdk-1.3.1-r9.ebuild 2253 +MD5 a944e47288e19ee16b32c148e2262a79 blackdown-jdk-1.4.1.ebuild 3588 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 ac654d06ac05f2084d3eba1fdd187133 files/blackdown-jdk-1.3.1 727 MD5 e60282859f42c5eee8df3dc1fed160a0 files/blackdown-jdk-1.4.1 727 diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild index 36bfa9530779..d3465a82aace 100644 --- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild +++ b/dev-java/blackdown-jdk/blackdown-jdk-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-jdk/blackdown-jdk-1.4.1.ebuild,v 1.10 2003/10/03 10:57:22 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.11 2003/10/05 03:44:44 brad_mssw Exp $ IUSE="doc" @@ -12,7 +12,8 @@ S="${WORKDIR}/j2sdk${PV}" DESCRIPTION="Blackdown Java Development Kit ${PV}" J_URI="ftp://ftp.gwdg.de/pub/languages/java/linux/JDK-${PV}" if [ "`gcc -dumpversion | cut -f1 -d.`" -eq "3" -a "`gcc -dumpversion | cut -f2 -d.`" -ge "2" ] ; then - SRC_URI="x86? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc3.2.bin )" + SRC_URI="x86? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc3.2.bin ) + amd64? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc3.2.bin )" else SRC_URI="x86? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc2.95.bin )" fi @@ -25,11 +26,12 @@ HOMEPAGE="http://www.blackdown.org" SLOT="1.4.1" LICENSE="sun-bcla-java-vm" -KEYWORDS="x86 -ppc sparc" +KEYWORDS="x86 -ppc sparc ~amd64" DEPEND="virtual/glibc >=dev-java/java-config-0.2.6 - doc? ( =dev-java/java-sdk-docs-1.4.1* )" + doc? ( =dev-java/java-sdk-docs-1.4.1* ) + amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )" PROVIDE="virtual/jdk-1.4.1 virtual/jre-1.4.1 @@ -83,6 +85,10 @@ src_install () { PLATFORM="i386" fi + if [ "${ARCH}" = "amd64" ] ; then + PLATFORM="i386" + fi + if [ "${ARCH}" = "sparc" ] ; then PLATFORM="sparc" fi |