diff options
| author | James Le Cuirot <chewi@gentoo.org> | 2016-04-19 09:59:26 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2016-04-19 10:19:38 +0100 |
| commit | fc3dc8282e022cb1660fb9e59fce0c392252bf20 (patch) | |
| tree | 080e788d9c2308885387b0dec71e66cae6b40e20 /eclass | |
| parent | 157e0fc04a8cd946b4506a85cfa0c88d716c5786 (diff) | |
| download | gentoo-fc3dc8282e022cb1660fb9e59fce0c392252bf20.tar.gz gentoo-fc3dc8282e022cb1660fb9e59fce0c392252bf20.tar.xz | |
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.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 2 | ||||
| -rw-r--r-- | eclass/java-virtuals-2.eclass | 2 | ||||
| -rw-r--r-- | 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 cb1c1d8b130..65e7197ef42 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 0c92018c7ba..8018aa8c6c9 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 7a5ba834e51..d0de0d2950e 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" |