| 1 |
Signed-off-by: Marty E. Plummer <hanetzer@×××××××××.com> |
| 2 |
--- |
| 3 |
eclass/java-utils-2.eclass | 13 ++++++++----- |
| 4 |
1 file changed, 8 insertions(+), 5 deletions(-) |
| 5 |
|
| 6 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
| 7 |
index 473b177e539..a4c218c394e 100644 |
| 8 |
--- a/eclass/java-utils-2.eclass |
| 9 |
+++ b/eclass/java-utils-2.eclass |
| 10 |
@@ -1,4 +1,4 @@ |
| 11 |
-# Copyright 2004-2018 Gentoo Foundation |
| 12 |
+# Copyright 2004-2018 Gentoo Authors |
| 13 |
# Distributed under the terms of the GNU General Public License v2 |
| 14 |
|
| 15 |
# @ECLASS: java-utils-2.eclass |
| 16 |
@@ -15,7 +15,7 @@ |
| 17 |
# you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for packages |
| 18 |
# that have optional Java support. In addition you can inherit java-ant-2 for |
| 19 |
# Ant-based packages. |
| 20 |
-inherit eutils versionator multilib |
| 21 |
+inherit eutils multilib |
| 22 |
|
| 23 |
IUSE="elibc_FreeBSD" |
| 24 |
|
| 25 |
@@ -25,6 +25,9 @@ export WANT_JAVA_CONFIG="2" |
| 26 |
# Prefix variables are only available for EAPI>=3 |
| 27 |
has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}" |
| 28 |
|
| 29 |
+# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier eclasses. |
| 30 |
+[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver |
| 31 |
+ |
| 32 |
# @VARIABLE: JAVA_PKG_E_DEPEND |
| 33 |
# @INTERNAL |
| 34 |
# @DESCRIPTION: |
| 35 |
@@ -1518,8 +1521,8 @@ java-pkg_is-vm-version-eq() { |
| 36 |
|
| 37 |
local vm_version="$(java-pkg_get-vm-version)" |
| 38 |
|
| 39 |
- vm_version="$(get_version_component_range 1-2 "${vm_version}")" |
| 40 |
- needed_version="$(get_version_component_range 1-2 "${needed_version}")" |
| 41 |
+ vm_version="$(ver_cut 1-2 "${vm_version}")" |
| 42 |
+ needed_version="$(ver_cut 1-2 "${needed_version}")" |
| 43 |
|
| 44 |
if [[ -z "${vm_version}" ]]; then |
| 45 |
debug-print "Could not get JDK version from DEPEND" |
| 46 |
@@ -1570,7 +1573,7 @@ java-pkg_is-vm-version-ge() { |
| 47 |
debug-print "Could not get JDK version from DEPEND" |
| 48 |
return 1 |
| 49 |
else |
| 50 |
- if version_is_at_least "${needed_version}" "${vm_version}"; then |
| 51 |
+ if ver_test "${vm_version}" -ge "${needed_version}"; then |
| 52 |
debug-print "Detected a JDK(${vm_version}) >= ${needed_version}" |
| 53 |
return 0 |
| 54 |
else |
| 55 |
-- |
| 56 |
2.20.0 |
Archives