On Mon, May 21, 2018 at 05:13:18PM -0500, Marty E. Plummer wrote:
> On Mon, May 21, 2018 at 04:47:03PM -0500, Marty E. Plummer wrote:
> > On Tue, May 08, 2018 at 11:03:47AM +0200, Ulrich Mueller wrote:
> > > You could inherit eapi7-ver instead of versionator, which would save
> > > the conditional below.
> > >
> > I didn't realize that eapi7-ver now supports 0-6 instead of just 6. I
> > will rework this and the other patch I sent in for that reason, then.
> Here we go. The eapi != 7 conditional is needed as eapi7 is 'not
> supported' by eapi7-ver because its contents are already there.
Once more, with changes suggested by [Arfrever] in #gentoo-java.
---
eclass/java-utils-2.eclass | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 25e35c33dd2..f45b29c9e32 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -15,7 +15,8 @@
# you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for
packages
# that have optional Java support. In addition you can inherit java-ant-2 for
# Ant-based packages.
-inherit eutils versionator multilib
+[[ ${EAPI:-0} == [012345] ]] && inherit multilib
+[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver eutils
IUSE="elibc_FreeBSD"
@@ -1526,8 +1527,8 @@ java-pkg_is-vm-version-eq() {
local vm_version="$(java-pkg_get-vm-version)"
- vm_version="$(get_version_component_range 1-2 "${vm_version}")"
- needed_version="$(get_version_component_range 1-2 "${needed_version}")"
+ vm_version="$(ver_cut 1-2 "${vm_version}")"
+ needed_version="$(ver_cut 1-2 "${needed_version}")"
if [[ -z "${vm_version}" ]]; then
debug-print "Could not get JDK version from DEPEND"
--
2.17.0
