commit: fc29ab72b5cf9b293ebb017c31411237da008e6b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Sep 19 08:58:59 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Sep 19 11:08:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc29ab72
sys-devel/llvm: Use eapi7-ver.eclass sys-devel/llvm/llvm-5.0.9999.ebuild | 8 ++++---- sys-devel/llvm/llvm-9999.ebuild | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-devel/llvm/llvm-5.0.9999.ebuild b/sys-devel/llvm/llvm-5.0.9999.ebuild index 10701c1ca62..14fb539b01c 100644 --- a/sys-devel/llvm/llvm-5.0.9999.ebuild +++ b/sys-devel/llvm/llvm-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 multilib-minimal pax-utils \ - python-any-r1 toolchain-funcs versionator +inherit cmake-utils eapi7-ver flag-o-matic git-r3 multilib-minimal \ + pax-utils python-any-r1 toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/"; @@ -33,7 +33,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LICENSE="UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )" -SLOT="$(get_major_version)" +SLOT="$(ver_cut 1)" KEYWORDS="" IUSE="debug +doc gold libedit +libffi ncurses test kernel_Darwin ${ALL_LLVM_TARGETS[*]}" @@ -51,7 +51,7 @@ DEPEND="${RDEPEND} ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) - kernel_Darwin? ( <sys-libs/libcxx-$(get_version_component_range 1-3).9999 ) + kernel_Darwin? ( <sys-libs/libcxx-$(ver_cut 1-3).9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index ca558e0de2c..c1fd48b6c2b 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-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 multilib-minimal pax-utils \ - python-any-r1 toolchain-funcs versionator +inherit cmake-utils eapi7-ver flag-o-matic git-r3 multilib-minimal \ + pax-utils python-any-r1 toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/"; @@ -53,7 +53,7 @@ DEPEND="${RDEPEND} ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) - kernel_Darwin? ( <sys-libs/libcxx-$(get_version_component_range 1-3).9999 ) + kernel_Darwin? ( <sys-libs/libcxx-$(ver_cut 1-3).9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig )
