diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2009-02-09 23:01:51 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2009-02-09 23:01:51 +0000 |
| commit | 3f6c941059efb91f97e2b35dba62cf326f1ea3e8 (patch) | |
| tree | 823e0bb8b35ef06b2cd8ac4bb5deaf5d21e52948 /eclass/java-vm-2.eclass | |
| parent | Some stylistyc changes to FBreader; thanks to pva =) (diff) | |
| download | historical-3f6c941059efb91f97e2b35dba62cf326f1ea3e8.tar.gz historical-3f6c941059efb91f97e2b35dba62cf326f1ea3e8.tar.bz2 historical-3f6c941059efb91f97e2b35dba62cf326f1ea3e8.zip | |
Pull java-config-1.3 only for VM's that support gen1, bug #176784.
Diffstat (limited to 'eclass/java-vm-2.eclass')
| -rw-r--r-- | eclass/java-vm-2.eclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 9a4561677634..7ec5a8fad38c 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.24 2009/02/08 21:42:27 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.25 2009/02/09 23:01:51 caster Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -18,8 +18,13 @@ DEPEND=" =dev-java/java-config-2* >=sys-apps/portage-2.1" RDEPEND=" - =dev-java/java-config-2* - =dev-java/java-config-1.3*" + =dev-java/java-config-2*" + +# bug #176784 +if [[ ${JAVA_SUPPORTS_GENERATION_1} == 'true' && ${JAVA_VM_NO_GENERATION1} != 'true' ]]; then + DEPEND="${DEPEND} =dev-java/java-config-1.3*" + RDEPEND="${RDEPEND} =dev-java/java-config-1.3*" +fi export WANT_JAVA_CONFIG=2 |