commit: fc3dc8282e022cb1660fb9e59fce0c392252bf20
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 08:59:26 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 09:19:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3dc828
java-*.eclass: Bump java-config dependency to avoid bug #580504
People may remove java-config-wrapper without updating java-config,
leading to a broken setup.
eclass/java-utils-2.eclass | 2 +-
eclass/java-virtuals-2.eclass | 2 +-
eclass/java-vm-2.eclass | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index cb1c1d8..65e7197 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -37,7 +37,7 @@ has "${EAPI}" 0 1 &&
JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
# This is a convience variable to be used from the other java eclasses. This is
# the version of java-config we want to use. Usually the latest stable version
# so that ebuilds can use new features without depending on specific versions.
-JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0 ${JAVA_PKG_PORTAGE_DEP}"
+JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3 ${JAVA_PKG_PORTAGE_DEP}"
has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source?
( app-arch/zip )"
# @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass
index 0c92018..8018aa8 100644
--- a/eclass/java-virtuals-2.eclass
+++ b/eclass/java-virtuals-2.eclass
@@ -14,7 +14,7 @@
inherit java-utils-2
-DEPEND=">=dev-java/java-config-2.2.0"
+DEPEND=">=dev-java/java-config-2.2.0-r3"
RDEPEND="${DEPEND}"
S="${WORKDIR}"
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index 7a5ba83..d0de0d2 100644
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -15,7 +15,7 @@ inherit eutils fdo-mime multilib pax-utils prefix
EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm
RDEPEND="
- >=dev-java/java-config-2.2.0
+ >=dev-java/java-config-2.2.0-r3
app-eselect/eselect-java"
DEPEND="${RDEPEND}"
has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1"
