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.

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index cb1c1d8b1301a196aa86fa314add518f57c128bf..65e7197ef427c8785c31e5e405f0ee58d6e1b36e 100644 (file)
--- 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 0c92018c7bab0d5fbdf692f0b343b59787c711ed..8018aa8c6c970b8b919c584a9dde90e04c467f22 100644 (file)
--- 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 7a5ba834e51863d05f5eeadc0a4c924e9de7a2e3..d0de0d2950eda75bd5241b248fc5ffeb92151b8d 100644 (file)
--- 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"