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

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

[Sebastien Fabbro]

commit:     02a4bcaa2cb79940af4b8fc89ae31aa95bad0257
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 22:17:42 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 05:26:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a4bcaa

dev-libs/libdynd: fix the git version mangling
also add cuda sanitizing, and basic cleaning

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/libdynd/libdynd-0.7.2.ebuild | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild
index 37b608c..0ca75be 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild
@@ -6,6 +6,9 @@ EAPI=6
 
 inherit cmake-utils cuda
 
+# change each new libdynd version, to avoid git in tree dependency
+DYND_GIT_SHA1=341d6d91931fdb04ad657d27ed740cf533fc925b
+
 DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
 HOMEPAGE="http://libdynd.org"
 SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -27,7 +30,7 @@ DEPEND="${RDEPEND}
 DOCS=( README.md )
 
 src_prepare() {
-	#use cuda && cuda_src_prepare
+	use cuda && cuda_src_prepare
 	cmake-utils_src_prepare
 	cmake_comment_add_subdirectory examples
 	# fix forced cxxflags and doc installation directory
@@ -39,6 +42,15 @@ src_prepare() {
 	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' \
+		-e '/get_git_/d' \
+		-e '/git_describe/d' \
+		-e '/dirty/d' \
+		-i CMakeLists.txt || die
+	sed -e s||${DYND_SHA1_VERSION}|
 	# not tested
 	if use mkl; then
 		sed -e "s|/opt/intel/.*|$(ls -1d ${EPREFIX}/opt/intel/compilers*)|" \
@@ -48,6 +60,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DDYND_GIT_SHA1="${DYND_GIT_SHA1}"
+		-DDYND_VERSION_STRING="v${PV}"
 		-DDYND_INSTALL_LIB=ON
 		-DDYND_SHARED_LIB=ON
 		-DDYND_BUILD_BENCHMARKS=OFF
@@ -56,7 +70,7 @@ src_configure() {
 		-DDYND_BUILD_TESTS="$(usex test)"
 		-DDYND_CUDA="$(usex cuda)"
 		-DDYND_FFTW="$(usex fftw)"
-		-DFFTW_PATH="${EPREFIX}/usr"
+		-DFFTW_PATH="${EPREFIX}/usr/include"
 	)
 	cmake-utils_src_configure
 }

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

[Sebastien Fabbro]

commit:     868413cd6a9ee4e459747c67a47e806444d47da0
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 05:22:15 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 05:26:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868413cd

dev-libs/libdynd: removed bogus line

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/libdynd/libdynd-0.7.2.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild
index 0ca75be..676c881 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild
@@ -42,7 +42,6 @@ src_prepare() {
 	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' \
@@ -50,7 +49,6 @@ src_prepare() {
 		-e '/git_describe/d' \
 		-e '/dirty/d' \
 		-i CMakeLists.txt || die
-	sed -e s||${DYND_SHA1_VERSION}|
 	# not tested
 	if use mkl; then
 		sed -e "s|/opt/intel/.*|$(ls -1d ${EPREFIX}/opt/intel/compilers*)|" \

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

[Agostino Sarubbo]

commit:     82e82b03f50143acc43f45be458f49aa5b45315d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 17:21:52 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 17:21:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e82b03

dev-libs/libdynd: x86 stable wrt bug #606050

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/libdynd/libdynd-0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild
index 413a18336dd..bd2fb462f18 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc fftw mkl test"
 
 RDEPEND="

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

[Andreas Sturmlechner]

commit:     8eaad42091949478b7aa8d697fa8fb7c0842f1ce
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 00:11:42 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 00:11:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eaad420

dev-libs/libdynd: Drop no-op -DDYND_CUDA (unknown CMake variable)

It begs the question of what IUSE=cuda is actually doing here.

Closes: https://bugs.gentoo.org/659402
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/libdynd/libdynd-0.7.2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild
index 72f0e12ff77..90d8c02bb87 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild
@@ -60,7 +60,6 @@ src_configure() {
 		-DDYND_BUILD_BENCHMARKS=OFF
 		-DDYND_BUILD_DOCS="$(usex doc)"
 		-DDYND_BUILD_TESTS="$(usex test)"
-		-DDYND_CUDA="$(usex cuda)"
 		-DDYND_FFTW="$(usex fftw)"
 	)
 	use fftw && mycmakeargs+=( -DFFTW_PATH="${EPREFIX}/usr/include" )

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

[Andreas Sturmlechner]

commit:     8226c40507d4695b5774f0e52def0905700fdb8f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 00:06:04 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 00:06:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8226c405

dev-libs/libdynd: Drop no-op IUSE="mkl"

Bug: https://bugs.gentoo.org/659402
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/libdynd/libdynd-0.7.2.ebuild | 10 ++--------
 dev-libs/libdynd/metadata.xml         |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild
index 2f1c96031bd..c969b21adce 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc fftw mkl test"
+IUSE="cuda doc fftw test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -49,11 +49,6 @@ src_prepare() {
 		-e '/git_describe/d' \
 		-e '/dirty/d' \
 		-i CMakeLists.txt || die
-	# not tested
-	if use mkl; then
-		sed -e "s|/opt/intel/.*|$(ls -1d ${EPREFIX}/opt/intel/compilers*)|" \
-			-i tests/CMakeLists.txt || die
-	fi
 }
 
 src_configure() {
@@ -64,7 +59,6 @@ src_configure() {
 		-DDYND_SHARED_LIB=ON
 		-DDYND_BUILD_BENCHMARKS=OFF
 		-DDYND_BUILD_DOCS="$(usex doc)"
-		-DDYND_BUILD_PLUGIN="$(usex mkl)"
 		-DDYND_BUILD_TESTS="$(usex test)"
 		-DDYND_CUDA="$(usex cuda)"
 		-DDYND_FFTW="$(usex fftw)"

diff --git a/dev-libs/libdynd/metadata.xml b/dev-libs/libdynd/metadata.xml
index 0b3978ba39f..f5301331ec0 100644
--- a/dev-libs/libdynd/metadata.xml
+++ b/dev-libs/libdynd/metadata.xml
@@ -17,7 +17,6 @@
   </longdescription>
   <use>
     <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
-    <flag name="mkl">Enable a plugin for Intel Math Kernel Library <pkg>sci-libs/mkl</pkg></flag>
   </use>
   <upstream>
     <remote-id type="github">libdynd/libdynd</remote-id>

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

[Andreas Sturmlechner]

commit:     cdef9f4db72e0efb3854b59ee2eeaa48bee70f34
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 00:07:14 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 00:07:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdef9f4d

dev-libs/libdynd: -DFFTW_PATH is not used without IUSE="fftw"

Bug: https://bugs.gentoo.org/659402
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/libdynd/libdynd-0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild
index c969b21adce..72f0e12ff77 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild
@@ -62,8 +62,8 @@ src_configure() {
 		-DDYND_BUILD_TESTS="$(usex test)"
 		-DDYND_CUDA="$(usex cuda)"
 		-DDYND_FFTW="$(usex fftw)"
-		-DFFTW_PATH="${EPREFIX}/usr/include"
 	)
+	use fftw && mycmakeargs+=( -DFFTW_PATH="${EPREFIX}/usr/include" )
 	cmake-utils_src_configure
 }
 

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

[Sam James]

commit:     0f17e09ce54350b4b2b9417afec82feedae26e0a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 04:11:29 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=0f17e09c

dev-libs/libdynd: fix libdir

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

 dev-libs/libdynd/libdynd-0.7.2-r1.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
index 981f00aaf6a..b83206ebd45 100644
--- a/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
@@ -52,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() {

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

[Sam James]

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() {

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

[Sam James]

commit:     7d4f3fe3abc4fa4d4bc2d812ddc43aa08e3d6d28
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 16:59:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 16:59:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d4f3fe3

dev-libs/libdynd: fix EbuildReservedName

dyn substring.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libdynd/libdynd-0.7.2-r1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
index b83206ebd457..01dfa007a8b7 100644
--- a/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake cuda
 
 # change each new libdynd version, to avoid git in tree dependency
-DYND_GIT_SHA1=341d6d91931fdb04ad657d27ed740cf533fc925b
+MY_GIT_SHA1=341d6d91931fdb04ad657d27ed740cf533fc925b
 
 DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
 HOMEPAGE="http://libdynd.org"
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 RDEPEND="
-	dev-libs/c-blosc:0=
+	dev-libs/c-blosc:=
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	fftw? ( sci-libs/fftw:3.0 )
 "
@@ -59,7 +59,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDYND_GIT_SHA1="${DYND_GIT_SHA1}"
+		-DDYND_GIT_SHA1="${MY_GIT_SHA1}"
 		-DDYND_VERSION_STRING="v${PV}"
 		-DDYND_INSTALL_LIB=ON
 		-DDYND_SHARED_LIB=ON