| 1 |
--- |
| 2 |
eclass/java-utils-2.eclass | 14 +++++++++++--- |
| 3 |
1 file changed, 11 insertions(+), 3 deletions(-) |
| 4 |
|
| 5 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
| 6 |
index 25e35c33dd2..47bbb64ffd4 100644 |
| 7 |
--- a/eclass/java-utils-2.eclass |
| 8 |
+++ b/eclass/java-utils-2.eclass |
| 9 |
@@ -15,7 +15,7 @@ |
| 10 |
# you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for packages |
| 11 |
# that have optional Java support. In addition you can inherit java-ant-2 for |
| 12 |
# Ant-based packages. |
| 13 |
-inherit eutils versionator multilib |
| 14 |
+has "${EAPI:-0}" 0 1 2 3 4 5 6 && inherit eutils versionator multilib |
| 15 |
|
| 16 |
IUSE="elibc_FreeBSD" |
| 17 |
|
| 18 |
@@ -1526,8 +1526,16 @@ java-pkg_is-vm-version-eq() { |
| 19 |
|
| 20 |
local vm_version="$(java-pkg_get-vm-version)" |
| 21 |
|
| 22 |
- vm_version="$(get_version_component_range 1-2 "${vm_version}")" |
| 23 |
- needed_version="$(get_version_component_range 1-2 "${needed_version}")" |
| 24 |
+ case ${EAPI} in |
| 25 |
+ 0|1|2|3|4|5|6) |
| 26 |
+ vm_version="$(get_version_component_range 1-2 "${vm_version}")" |
| 27 |
+ needed_version="$(get_version_component_range 1-2 "${needed_version}")" |
| 28 |
+ ;; |
| 29 |
+ 7) |
| 30 |
+ vm_version="$(ver_cut 1-2 "${vm_version}")" |
| 31 |
+ needed_version="$(ver_cut 1-2 "${needed_version}")" |
| 32 |
+ ;; |
| 33 |
+ esac |
| 34 |
|
| 35 |
if [[ -z "${vm_version}" ]]; then |
| 36 |
debug-print "Could not get JDK version from DEPEND" |
| 37 |
-- |
| 38 |
2.17.0 |
Archives