From e8404cf3be9d99a6ec2813b5073c6532ea0590ef Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Wed, 12 Jan 2005 22:15:27 +0000 Subject: [PATCH] migrated from amd64? to emul-linux-x86? dependency. --- dev-java/blackdown-jdk/ChangeLog | 6 +++++- dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild | 6 +++--- dev-java/blackdown-jre/ChangeLog | 6 +++++- dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild | 6 +++--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog index 762c2040de38..4e282ecf2ed1 100644 --- a/dev-java/blackdown-jdk/ChangeLog +++ b/dev-java/blackdown-jdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/blackdown-jdk # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.69 2005/01/01 18:11:00 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.70 2005/01/12 22:13:11 luckyduck Exp $ + + 12 Jan 2005; Jan Brinkmann + blackdown-jdk-1.4.1-r1.ebuild: + migrated from amd64? to emul-linux-x86? dependency. 31 Dec 2004; Jeremy Huddleston blackdown-jdk-1.4.1-r1.ebuild, blackdown-jdk-1.4.2.01-r1.ebuild, diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild index ad46f2883eb5..2d769c53b35f 100644 --- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild +++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # 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-r1.ebuild,v 1.3 2005/01/01 18:11:00 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild,v 1.4 2005/01/12 22:13:11 luckyduck Exp $ inherit java @@ -21,12 +21,12 @@ CHPAX_CONSERVATIVE_FLAGS="pemsv" LICENSE="sun-bcla-java-vm" SLOT="1.4.1" KEYWORDS="-* x86 sparc amd64" -IUSE="doc mozilla" +IUSE="doc emul-linux-x86 mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.6 doc? ( =dev-java/java-sdk-docs-1.4.1* ) - amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )" + emul-linux-x86? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )" PROVIDE="virtual/jdk-1.4.1 virtual/jre-1.4.1 virtual/java-scheme-2" diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog index b93e0415edbb..0cf84ad13f39 100644 --- a/dev-java/blackdown-jre/ChangeLog +++ b/dev-java/blackdown-jre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/blackdown-jre # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.54 2005/01/01 18:11:28 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.55 2005/01/12 22:15:27 luckyduck Exp $ + + 12 Jan 2005; Jan Brinkmann + blackdown-jre-1.4.1-r1.ebuild: + migrated from amd64? to emul-linux-x86? dependency. 31 Dec 2004; Jeremy Huddleston blackdown-jre-1.4.1-r1.ebuild, blackdown-jre-1.4.2.01.ebuild: diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild index c962c72c6924..68b7eaada673 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # 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-r1.ebuild,v 1.3 2005/01/01 18:11:28 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.4 2005/01/12 22:15:27 luckyduck Exp $ inherit java gcc @@ -21,7 +21,7 @@ SRC_URI=" HOMEPAGE="http://www.blackdown.org" DEPEND="virtual/libc - amd64? ( >=app-emulation/emul-linux-x86-baselibs-1 ) + emul-linux-x86? ( >=app-emulation/emul-linux-x86-baselibs-1 ) >=dev-java/java-config-0.2.5 >=sys-apps/sed-4" RDEPEND="${DEPEND} @@ -32,7 +32,7 @@ PROVIDE="virtual/jre-1.4.1 SLOT="0" LICENSE="sun-bcla-java-vm" KEYWORDS="x86 sparc amd64" -IUSE="mozilla" +IUSE="emul-linux-x86 mozilla" src_unpack () { typeset a want_gcc_ver -- 2.26.2