diff options
| author |   Marty E. Plummer <hanetzer@startmail.com> | 2018-12-17 02:01:04 -0600 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2019-03-09 21:59:33 +0100 |
| commit | bd1dfd75af01014d1ba201d01cd50ed3da4b25ce (patch) | |
| tree | a6aaa5a3fb3be1c8626e64b501c6755b218c53ca /eclass/java-utils-2.eclass | |
| parent | media-libs/gd: add workaround for rounding problem on some architectures (diff) | |
| download | gentoo-bd1dfd75af01014d1ba201d01cd50ed3da4b25ce.tar.gz gentoo-bd1dfd75af01014d1ba201d01cd50ed3da4b25ce.tar.bz2 gentoo-bd1dfd75af01014d1ba201d01cd50ed3da4b25ce.zip | |
eclass/java-utils-2: bump to EAPI 7.
Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11243
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 1ffd7a03399b..95617616fe84 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2018 Gentoo Foundation +# Copyright 2004-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -15,7 +15,10 @@ # 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 +inherit eutils multilib +# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier eclasses. +# Keep versionator inheritance in case consumers are using it implicitly. +[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver versionator IUSE="elibc_FreeBSD" @@ -1518,8 +1521,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" @@ -1570,7 +1573,7 @@ java-pkg_is-vm-version-ge() { debug-print "Could not get JDK version from DEPEND" return 1 else - if version_is_at_least "${needed_version}" "${vm_version}"; then + if ver_test "${vm_version}" -ge "${needed_version}"; then debug-print "Detected a JDK(${vm_version}) >= ${needed_version}" return 0 else |