* [gentoo-dev] [PATCH] eclass/java-utils-2: switch to eapi7-ver
@ 2018-12-17 8:09 99% Marty E. Plummer
0 siblings, 0 replies; 1+ results
From: Marty E. Plummer @ 2018-12-17 8:09 UTC (permalink / raw
To: gentoo-dev; +Cc: Marty E. Plummer
Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
---
eclass/java-utils-2.eclass | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 473b177e539..a4c218c394e 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,7 @@
# 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
IUSE="elibc_FreeBSD"
@@ -25,6 +25,9 @@ export WANT_JAVA_CONFIG="2"
# Prefix variables are only available for EAPI>=3
has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}"
+# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier eclasses.
+[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver
+
# @VARIABLE: JAVA_PKG_E_DEPEND
# @INTERNAL
# @DESCRIPTION:
@@ -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
--
2.20.0
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2018-12-17 8:09 99% [gentoo-dev] [PATCH] eclass/java-utils-2: switch to eapi7-ver Marty E. Plummer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox