diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 13 | ||||
| -rw-r--r-- | eclass/mozconfig-v6.60.eclass | 32 |
2 files changed, 24 insertions, 21 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 diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass index 0cd728743e47..821e63b1e415 100644 --- a/eclass/mozconfig-v6.60.eclass +++ b/eclass/mozconfig-v6.60.eclass @@ -160,19 +160,19 @@ DEPEND="app-arch/zip sys-apps/findutils || ( ( - sys-devel/clang:4 - !clang? ( sys-devel/llvm:4 ) + sys-devel/clang:8 + !clang? ( sys-devel/llvm:8 ) clang? ( - =sys-devel/lld-4* - sys-devel/llvm:4[gold] + =sys-devel/lld-8* + sys-devel/llvm:8[gold] ) ) ( - sys-devel/clang:5 - !clang? ( sys-devel/llvm:5 ) + sys-devel/clang:7 + !clang? ( sys-devel/llvm:7 ) clang? ( - =sys-devel/lld-5* - sys-devel/llvm:5[gold] + =sys-devel/lld-7* + sys-devel/llvm:7[gold] ) ) ( @@ -184,19 +184,19 @@ DEPEND="app-arch/zip ) ) ( - sys-devel/clang:7 - !clang? ( sys-devel/llvm:7 ) + sys-devel/clang:5 + !clang? ( sys-devel/llvm:5 ) clang? ( - =sys-devel/lld-7* - sys-devel/llvm:7[gold] + =sys-devel/lld-5* + sys-devel/llvm:5[gold] ) ) ( - sys-devel/clang:8 - !clang? ( sys-devel/llvm:8 ) + sys-devel/clang:4 + !clang? ( sys-devel/llvm:4 ) clang? ( - =sys-devel/lld-8* - sys-devel/llvm:8[gold] + =sys-devel/lld-4* + sys-devel/llvm:4[gold] ) ) ) |