Skip to content

Commit

Permalink
java-*.eclass: Bump java-config dependency to avoid bug #580504
Browse files Browse the repository at this point in the history
People may remove java-config-wrapper without updating java-config,
leading to a broken setup.
  • Loading branch information
chewi committed Apr 19, 2016
1 parent 157e0fc commit fc3dc82
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion eclass/java-utils-2.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eclass/java-virtuals-2.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion eclass/java-vm-2.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit fc3dc82

Please sign in to comment.