| 1 |
commit: 953191395f71c76cb817088e968bc109d951d7dc |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 20 20:55:02 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 20 22:34:35 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95319139 |
| 7 |
|
| 8 |
sys-devel/llvm: Bump -9999 to EAPI 7 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-devel/llvm/llvm-9999.ebuild | 15 +++++++-------- |
| 13 |
1 file changed, 7 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
| 16 |
index 556b4d9e54d..90b0e0d3850 100644 |
| 17 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
| 18 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
| 19 |
@@ -1,15 +1,15 @@ |
| 20 |
# Copyright 1999-2019 Gentoo Authors |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI=6 |
| 24 |
+EAPI=7 |
| 25 |
|
| 26 |
: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 27 |
# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
| 28 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 29 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 30 |
|
| 31 |
-inherit cmake-utils eapi7-ver flag-o-matic git-r3 multilib-minimal \ |
| 32 |
- multiprocessing pax-utils python-any-r1 toolchain-funcs |
| 33 |
+inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \ |
| 34 |
+ python-any-r1 toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="Low Level Virtual Machine" |
| 37 |
HOMEPAGE="https://llvm.org/" |
| 38 |
@@ -69,7 +69,6 @@ DEPEND="${RDEPEND} |
| 39 |
dev-python/recommonmark[${PYTHON_USEDEP}] |
| 40 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 41 |
') ) |
| 42 |
- !doc? ( ${PYTHON_DEPS} ) |
| 43 |
gold? ( sys-libs/binutils-libs ) |
| 44 |
libffi? ( virtual/pkgconfig ) |
| 45 |
!!<dev-python/configparser-3.3.0.2 |
| 46 |
@@ -259,15 +258,15 @@ src_install() { |
| 47 |
multilib-minimal_src_install |
| 48 |
|
| 49 |
# move wrapped headers back |
| 50 |
- mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die |
| 51 |
+ mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die |
| 52 |
} |
| 53 |
|
| 54 |
multilib_src_install() { |
| 55 |
cmake-utils_src_install |
| 56 |
|
| 57 |
# move headers to /usr/include for wrapping |
| 58 |
- rm -rf "${ED%/}"/usr/include || die |
| 59 |
- mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die |
| 60 |
+ rm -rf "${ED}"/usr/include || die |
| 61 |
+ mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die |
| 62 |
|
| 63 |
LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) |
| 64 |
} |
| 65 |
@@ -287,7 +286,7 @@ multilib_src_install_all() { |
| 66 |
|
| 67 |
pkg_postinst() { |
| 68 |
elog "You can find additional opt-viewer utility scripts in:" |
| 69 |
- elog " ${EROOT%/}/usr/lib/llvm/${SLOT}/share/opt-viewer" |
| 70 |
+ elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" |
| 71 |
elog "To use these scripts, you will need Python along with the following" |
| 72 |
elog "packages:" |
| 73 |
elog " dev-python/pygments (for opt-viewer)" |
Archives