diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2012-06-11 19:46:32 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2012-06-11 19:46:32 +0000 |
| commit | 778c134f05983e5034a0656d632776702b48e0ab (patch) | |
| tree | 1ba71e9f30ec06a23d58cb7a990733bb363a5aa2 | |
| parent | well that commit test did not go well ... (diff) | |
| download | historical-778c134f05983e5034a0656d632776702b48e0ab.tar.gz historical-778c134f05983e5034a0656d632776702b48e0ab.tar.bz2 historical-778c134f05983e5034a0656d632776702b48e0ab.zip | |
Add app-admin/eselect-java as preferred provider of eselect java-vm.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/java-vm-2.eclass | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1ee5a8613de5..affaf353015a 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.309 2012/06/11 14:22:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.310 2012/06/11 19:46:32 sera Exp $ + + 11 Jun 2012; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass: + Add app-admin/eselect-java as preferred provider of eselect java-vm. 11 Jun 2012; Michał Górny <mgorny@gentoo.org> vcs-snapshot.eclass: Unpack tarballs in directory matching their name rather than ${P}. This diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 2a54a81e34fd..48fb6bd03ebd 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.42 2011/12/05 07:07:44 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.43 2012/06/11 19:46:32 sera Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -14,11 +14,11 @@ inherit eutils fdo-mime multilib pax-utils prefix -DEPEND="=dev-java/java-config-2*" -has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1" - RDEPEND=" - =dev-java/java-config-2*" + =dev-java/java-config-2* + || ( app-admin/eselect-java <dev-java/java-config-2.2 )" +DEPEND="${RDEPEND}" +has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1" export WANT_JAVA_CONFIG=2 |