| 1 |
commit: 1e319f80f957f684f9b2707fc3f7bd49f209d2a4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 27 03:59:56 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 27 04:11:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e319f80 |
| 7 |
|
| 8 |
dev-libs/libdynd: port to EAPI 7, cmake-utils -> cmake |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
...{libdynd-0.7.2.ebuild => libdynd-0.7.2-r1.ebuild} | 20 ++++++++++++-------- |
| 14 |
1 file changed, 12 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild |
| 17 |
similarity index 90% |
| 18 |
rename from dev-libs/libdynd/libdynd-0.7.2.ebuild |
| 19 |
rename to dev-libs/libdynd/libdynd-0.7.2-r1.ebuild |
| 20 |
index 90d8c02bb87..981f00aaf6a 100644 |
| 21 |
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild |
| 22 |
+++ b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild |
| 23 |
@@ -1,9 +1,9 @@ |
| 24 |
-# Copyright 1999-2020 Gentoo Authors |
| 25 |
+# Copyright 1999-2021 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=6 |
| 29 |
+EAPI=7 |
| 30 |
|
| 31 |
-inherit cmake-utils cuda |
| 32 |
+inherit cmake cuda |
| 33 |
|
| 34 |
# change each new libdynd version, to avoid git in tree dependency |
| 35 |
DYND_GIT_SHA1=341d6d91931fdb04ad657d27ed740cf533fc925b |
| 36 |
@@ -18,30 +18,33 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
| 37 |
IUSE="cuda doc fftw test" |
| 38 |
RESTRICT="!test? ( test )" |
| 39 |
|
| 40 |
+BDEPEND="doc? ( app-doc/doxygen[dot] )" |
| 41 |
RDEPEND=" |
| 42 |
dev-libs/c-blosc:0= |
| 43 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
| 44 |
fftw? ( sci-libs/fftw:3.0 ) |
| 45 |
" |
| 46 |
-DEPEND="${RDEPEND} |
| 47 |
- doc? ( app-doc/doxygen[dot] ) |
| 48 |
-" |
| 49 |
+DEPEND="${RDEPEND}" |
| 50 |
|
| 51 |
DOCS=( README.md ) |
| 52 |
|
| 53 |
src_prepare() { |
| 54 |
use cuda && cuda_src_prepare |
| 55 |
- cmake-utils_src_prepare |
| 56 |
+ |
| 57 |
+ cmake_src_prepare |
| 58 |
cmake_comment_add_subdirectory examples |
| 59 |
+ |
| 60 |
# fix forced cxxflags and doc installation directory |
| 61 |
sed -e 's|-O3 -fomit-frame-pointer||' \ |
| 62 |
-e 's|-Werror||g' \ |
| 63 |
-e "s|docs DESTINATION docs|docs/html DESTINATION share/doc/${PF}|" \ |
| 64 |
-i CMakeLists.txt || die |
| 65 |
+ |
| 66 |
# don't install test exec |
| 67 |
sed -e 's|install(TARGETS test_libdynd||' \ |
| 68 |
-e 's|RUNTIME DESTINATION bin)||' \ |
| 69 |
-i tests/CMakeLists.txt || die |
| 70 |
+ |
| 71 |
# remove the version mangling from git stuff it requires a git clone |
| 72 |
# rather force set it a configure time |
| 73 |
sed -e '/GetGitRev/d' \ |
| 74 |
@@ -63,7 +66,8 @@ src_configure() { |
| 75 |
-DDYND_FFTW="$(usex fftw)" |
| 76 |
) |
| 77 |
use fftw && mycmakeargs+=( -DFFTW_PATH="${EPREFIX}/usr/include" ) |
| 78 |
- cmake-utils_src_configure |
| 79 |
+ |
| 80 |
+ cmake_src_configure |
| 81 |
} |
| 82 |
|
| 83 |
src_test() { |
Archives