diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-02-11 16:13:38 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-02-11 16:13:38 +0000 |
| commit | 6186d6e8f0dfd7dc82eaca6681e5a965d5475194 (patch) | |
| tree | aeb186592e40be0dd8b196b1a0960b5bc9c7b891 /eclass | |
| parent | sparc stable wrt #245552 (diff) | |
| download | gentoo-2-6186d6e8f0dfd7dc82eaca6681e5a965d5475194.tar.gz gentoo-2-6186d6e8f0dfd7dc82eaca6681e5a965d5475194.tar.bz2 gentoo-2-6186d6e8f0dfd7dc82eaca6681e5a965d5475194.zip | |
Only add sys-apps/portage to dependencies with EAPI 0 or 1.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 6 | ||||
| -rw-r--r-- | eclass/java-vm-2.eclass | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 82a7ec645e37..10a0deb5c33a 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.120 2008/12/29 00:16:40 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.121 2009/02/11 16:13:38 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -61,9 +61,9 @@ export WANT_JAVA_CONFIG="2" # # The version of portage we need to function properly. Previously it was # portage with phase hooks support but now we use a version with proper env -# saving. +# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps. # ----------------------------------------------------------------------------- -JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" +hasq "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" # ----------------------------------------------------------------------------- # @variable-internal JAVA_PKG_E_DEPEND diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 7ec5a8fad38c..f222a1cb9a34 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -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/eclass/java-vm-2.eclass,v 1.25 2009/02/09 23:01:51 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.26 2009/02/11 16:13:38 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -14,9 +14,9 @@ inherit eutils fdo-mime -DEPEND=" - =dev-java/java-config-2* - >=sys-apps/portage-2.1" +DEPEND="=dev-java/java-config-2*" +hasq "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1" + RDEPEND=" =dev-java/java-config-2*" |