[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdynd/

["Sam James" <sam@gentoo.org>]

commit:     1e319f80f957f684f9b2707fc3f7bd49f209d2a4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 03:59:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 04:11:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e319f80

dev-libs/libdynd: port to EAPI 7, cmake-utils -> cmake

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...{libdynd-0.7.2.ebuild => libdynd-0.7.2-r1.ebuild} | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
similarity index 90%
rename from dev-libs/libdynd/libdynd-0.7.2.ebuild
rename to dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
index 90d8c02bb87..981f00aaf6a 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils cuda
+inherit cmake cuda
 
 # change each new libdynd version, to avoid git in tree dependency
 DYND_GIT_SHA1=341d6d91931fdb04ad657d27ed740cf533fc925b
@@ -18,30 +18,33 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc fftw test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 RDEPEND="
 	dev-libs/c-blosc:0=
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	fftw? ( sci-libs/fftw:3.0 )
 "
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
+DEPEND="${RDEPEND}"
 
 DOCS=( README.md )
 
 src_prepare() {
 	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
+
+	cmake_src_prepare
 	cmake_comment_add_subdirectory examples
+
 	# fix forced cxxflags and doc installation directory
 	sed -e 's|-O3 -fomit-frame-pointer||' \
 		-e 's|-Werror||g' \
 		-e "s|docs DESTINATION docs|docs/html DESTINATION share/doc/${PF}|" \
 		-i CMakeLists.txt || die
+
 	# don't install test exec
 	sed -e 's|install(TARGETS test_libdynd||' \
 		-e 's|RUNTIME DESTINATION bin)||' \
 		-i tests/CMakeLists.txt || die
+
 	# remove the version mangling from git stuff it requires a git clone
 	# rather force set it a configure time
 	sed -e '/GetGitRev/d' \
@@ -63,7 +66,8 @@ src_configure() {
 		-DDYND_FFTW="$(usex fftw)"
 	)
 	use fftw && mycmakeargs+=( -DFFTW_PATH="${EPREFIX}/usr/include" )
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }
 
 src_test() {