diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-10-15 16:18:01 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-10-15 16:18:01 +0000 |
| commit | 5a32f037639edff21f2770d499454b14eedd4403 (patch) | |
| tree | 62421c944b961b6c16bad5756ecedcd330d5bed3 /eclass | |
| parent | Removing java and company from use.mask, since it is stable now. (diff) | |
| download | historical-5a32f037639edff21f2770d499454b14eedd4403.tar.gz historical-5a32f037639edff21f2770d499454b14eedd4403.tar.bz2 historical-5a32f037639edff21f2770d499454b14eedd4403.zip | |
Updated to always depend on java-config-1, fixing bug #151459
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-vm-2.eclass | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 2acd7eec7805..b537a357fd67 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.13 2006/10/14 20:27:21 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.14 2006/10/15 16:18:01 nichoj Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -18,13 +18,8 @@ DEPEND=" =dev-java/java-config-2.0* >=sys-apps/portage-2.1" RDEPEND=" - =dev-java/java-config-2.0*" - -# If the VM supports generation-1, we need to depend on java-config-1 -if [[ ${JAVA_SUPPORTS_GENERATION_1} == 'true' ]]; then - DEPEND="${DEPEND} =dev-java/java-config-1.3*" - RDEPEND="${RDEPEND} =dev-java/java-config-1.3*" -fi + =dev-java/java-config-2.0* + =dev-java/java-config-1.3*" export WANT_JAVA_CONFIG=2 |