Adding metadatav21.1.5

2 files changed, 29 insertions, 21 deletions

diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
index 25c1573c07b5..9e1968b1606e 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' \
@@ -49,6 +52,9 @@ src_prepare() {
 		-e '/git_describe/d' \
 		-e '/dirty/d' \
 		-i CMakeLists.txt || die
+
+	# fix libdir, bug #701474
+	sed -i -e "s|/lib|/$(get_libdir)|" libdynd-config.in || die
 }
 
 src_configure() {
@@ -63,7 +69,8 @@ src_configure() {
 		-DDYND_FFTW="$(usex fftw)"
 	)
 	use fftw && mycmakeargs+=( -DFFTW_PATH="${EPREFIX}/usr/include" )
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/dev-libs/libdynd/metadata.xml b/dev-libs/libdynd/metadata.xml
index f5301331ec0b..74f8c28736f7 100644
--- a/dev-libs/libdynd/metadata.xml
+++ b/dev-libs/libdynd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <longdescription lang="en">
     LibDyND, a component of the Blaze project, is a C++ library for
     dynamic, multidimensional arrays. It is inspired by NumPy, the
     Python array programming library at the core of the scientific
@@ -15,10 +15,11 @@
     preview development state, and can be thought of as a sandbox where
     features are being tried and tweaked to gain experience with them.
   </longdescription>
-  <use>
-    <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">libdynd/libdynd</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">libdynd/libdynd</remote-id>
+ </upstream>
+ <use>
+  <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file