sys-devel/clang: Use eapi7-ver.eclass

diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild
index a42fcb56372af2919845c1a04d8484f6589e2cc2..82cff8b91407261bfda705673d72a5c7e40b684c 100644 (file)
--- a/sys-devel/clang/clang-5.0.9999.ebuild
+++ b/sys-devel/clang/clang-5.0.9999.ebuild
@@ -8,8 +8,8 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils flag-o-matic git-r3 llvm multilib-minimal \
-       python-single-r1 toolchain-funcs pax-utils versionator
+inherit cmake-utils eapi7-ver flag-o-matic git-r3 llvm \
+       multilib-minimal pax-utils python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -25,7 +25,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
-SLOT="$(get_major_version)"
+SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx +doc +static-analyzer
        test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
@@ -116,7 +116,7 @@ src_prepare() {
 
 multilib_src_configure() {
        local llvm_version=$(llvm-config --version) || die
-       local clang_version=$(get_version_component_range 1-3 "${llvm_version}")
+       local clang_version=$(ver_cut 1-3 "${llvm_version}")
 
        local mycmakeargs=(
                # ensure that the correct llvm-config is used
@@ -225,8 +225,8 @@ src_install() {
        # Apply CHOST and version suffix to clang tools
        # note: we use two version components here (vs 3 in runtime path)
        local llvm_version=$(llvm-config --version) || die
-       local clang_version=$(get_version_component_range 1-2 "${llvm_version}")
-       local clang_full_version=$(get_version_component_range 1-3 "${llvm_version}")
+       local clang_version=$(ver_cut 1-2 "${llvm_version}")
+       local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
        local clang_tools=( clang clang++ clang-cl clang-cpp )
        local abi i
 

diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index d7de72aa2447e6e11d2a7e05d02f4cadf15e3cc6..b64ba22305c93afdfa2bbca834fcb92fe8fef0e4 100644 (file)
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -8,8 +8,8 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils flag-o-matic git-r3 llvm multilib-minimal \
-       python-single-r1 toolchain-funcs pax-utils versionator
+inherit cmake-utils eapi7-ver flag-o-matic git-r3 llvm \
+       multilib-minimal pax-utils python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -104,7 +104,7 @@ src_unpack() {
 
 multilib_src_configure() {
        local llvm_version=$(llvm-config --version) || die
-       local clang_version=$(get_version_component_range 1-3 "${llvm_version}")
+       local clang_version=$(ver_cut 1-3 "${llvm_version}")
 
        local mycmakeargs=(
                # ensure that the correct llvm-config is used
@@ -209,8 +209,8 @@ src_install() {
        # Apply CHOST and version suffix to clang tools
        # note: we use two version components here (vs 3 in runtime path)
        local llvm_version=$(llvm-config --version) || die
-       local clang_version=$(get_version_component_range 1-2 "${llvm_version}")
-       local clang_full_version=$(get_version_component_range 1-3 "${llvm_version}")
+       local clang_version=$(ver_cut 1-2 "${llvm_version}")
+       local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
        local clang_tools=( clang clang++ clang-cl clang-cpp )
        local abi i