[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdynd/
commit: 7d4f3fe3abc4fa4d4bc2d812ddc43aa08e3d6d28 Author: Sam James gentoo org> AuthorDate: Sat Aug 27 16:59:34 2022 + Commit: Sam James gentoo org> CommitDate: Sat Aug 27 16:59:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d4f3fe3 dev-libs/libdynd: fix EbuildReservedName dyn substring. Signed-off-by: Sam James 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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdynd/
commit: 0f17e09ce54350b4b2b9417afec82feedae26e0a Author: Sam James gentoo org> AuthorDate: Sat Feb 27 04:11:29 2021 + Commit: Sam James gentoo org> CommitDate: Sat Feb 27 04:11:52 2021 + 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 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/
commit: 1e319f80f957f684f9b2707fc3f7bd49f209d2a4 Author: Sam James gentoo org> AuthorDate: Sat Feb 27 03:59:56 2021 + Commit: Sam James gentoo org> CommitDate: Sat Feb 27 04:11:52 2021 + 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 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/
commit: cdef9f4db72e0efb3854b59ee2eeaa48bee70f34 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 6 00:07:14 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 6 00:07:14 2020 + 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 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/
commit: 8eaad42091949478b7aa8d697fa8fb7c0842f1ce Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 6 00:11:42 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 6 00:11:42 2020 + 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 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/
commit: 8226c40507d4695b5774f0e52def0905700fdb8f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 6 00:06:04 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 6 00:06:04 2020 + 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 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 @@ Enable NVIDIA CUDA toolkit support -Enable a plugin for Intel Math Kernel Library sci-libs/mkl libdynd/libdynd
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdynd/, dev-libs/libdynd/files/
commit: 938cdd39a906aa0abb342d52e57e072a8923b510 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 3 14:21:18 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 6 14:54:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=938cdd39 dev-libs/libdynd: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libdynd/Manifest | 2 - .../files/libdynd-0.6.0-dont-install-test.patch| 15 - dev-libs/libdynd/libdynd-0.6.5.ebuild | 66 -- dev-libs/libdynd/libdynd-0.6.6.ebuild | 66 -- 4 files changed, 149 deletions(-) diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest index 772aafd8b65..52b060d4afb 100644 --- a/dev-libs/libdynd/Manifest +++ b/dev-libs/libdynd/Manifest @@ -1,3 +1 @@ -DIST libdynd-0.6.5.tar.gz 1238404 BLAKE2B be3b1c921c1d8b4d8cdc7d70ef908fea5d38f97743db9db8f4b8716ee58d633f3040c727eb0b9287701d751ea8929b78f1e5f07e7d3b9900630594ec3d81444e SHA512 ebf64b94b38300e4e471f975a51e4b014879937e855af5d72a3f759af4445fa9024e42962ab1284ebe7b2ae2ddf51ea418d106c9894e1841f0984622afbef115 -DIST libdynd-0.6.6.tar.gz 1261349 BLAKE2B 73c9eba440dfa71cd8403ecfe4c77bb1ec19530333bea8689e9d8cd8863da6a37718af878f4ab5ca278631e0acf67035df4bc00ec4e3360c4558c0184e1f33e9 SHA512 efeb52a5b5dd3154ca293f388d5b967ff983450253435572b919f7c4a1445ad3cb416def4c736f908fdb3b06cddebae881a58420e528f1ca145973a997af7a28 DIST libdynd-0.7.2.tar.gz 1342364 BLAKE2B 28617a6b01c09dd8030d376f73c6dc6ddb4cd031aaa59348283fbb1226bb401e2d7ab48385263b8abc4ca95ffd75d2ce9f3b52a417fe04c6597886f8626cdd3f SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch b/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch deleted file mode 100644 index 9659372b05e..000 --- a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch +++ /dev/null @@ -1,15 +0,0 @@ tests/CMakeLists.txt.orig 2014-02-10 14:25:18.041841087 -0800 -+++ tests/CMakeLists.txt 2014-02-10 14:25:40.224975614 -0800 -@@ -105,12 +105,6 @@ - ) - endif() - --# If installation is requested, install the program --if (DYND_INSTALL_LIB) --install(TARGETS test_libdynd --RUNTIME DESTINATION bin) --endif() -- - # Compile-time tests: test code that is supposed to produce compile errors - # I couldn't find a properly specified way to do this, so hacked together - # this function. diff --git a/dev-libs/libdynd/libdynd-0.6.5.ebuild b/dev-libs/libdynd/libdynd-0.6.5.ebuild deleted file mode 100644 index 9eb37ce666a..000 --- a/dev-libs/libdynd/libdynd-0.6.5.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils multilib cuda - -# change each release, to avoid git in tree dependency -DYND_GIT_SHA1=2e140844d4a21c436ca0fc46996bf8606ffc21d5 - -DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure" -HOMEPAGE="https://github.com/ContinuumIO/libdynd"; -SRC_URI="https://github.com/ContinuumIO/${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 test" - -RDEPEND=" - dev-libs/c-blosc:0= - cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) - fftw? ( sci-libs/fftw:3.0 ) - " -DEPEND="${RDEPEND}" - -DOCS=( README.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch -) - -src_prepare() { - cmake-utils_src_prepare - # each relase comes with a different set... - # remove forced strong flags - sed -i \ - -e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \ - -e "s|@DYND_VERSION@|${PV}|" \ - -e 's|-fomit-frame-pointer||' \ - -e 's|-Werror||g' \ - CMakeLists.txt || die -} - -src_configure() { - sed -i \ - -e '/add_subdirectory(examples)/d' \ - CMakeLists.txt || die - local mycmakeargs=( - -DDYND_SHARED_LIB=ON - -DDYND_INSTALL_LIB=ON - $(cmake-utils_use cuda DYND_CUDA) - $(cmake-utils_use test DYND_BUILD_TESTS) - ) - cmake-utils_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - ./tests/test_libdynd || die -} - -src_install() { - cmake-utils_src_install - use doc && dodoc documents/* -} diff --git a/dev-libs/libdynd/libdynd-0.6.6.ebuild b/dev-libs/libdynd/libdynd-0.6.6.ebuild deleted file mode 100644 index a122f6f3030..000 --- a/dev-libs/libdynd/libdynd-0.6.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Publi
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdynd/
commit: 82e82b03f50143acc43f45be458f49aa5b45315d Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Jun 17 17:21:52 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Jun 17 17:21:52 2017 + 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 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/files/, dev-libs/libdynd/
commit: 4c47a1156e93ea59133a4818f7d235ffa69cabcb Author: David Seifert gentoo org> AuthorDate: Tue Jan 10 11:29:11 2017 + Commit: David Seifert gentoo org> CommitDate: Tue Jan 10 11:40:13 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c47a115 Revert "dev-libs/libdynd: version bump" This reverts commit 534b09a8949b7a27832196be14f6f4ec295f3e8b. dev-libs/libdynd/Manifest | 2 + .../files/libdynd-0.6.0-dont-install-test.patch| 15 + dev-libs/libdynd/libdynd-0.6.5.ebuild | 67 ++ dev-libs/libdynd/libdynd-0.6.6.ebuild | 67 ++ 4 files changed, 151 insertions(+) diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest index b6d331f..95b32eb 100644 --- a/dev-libs/libdynd/Manifest +++ b/dev-libs/libdynd/Manifest @@ -1 +1,3 @@ +DIST libdynd-0.6.5.tar.gz 1238404 SHA256 bf2e5c88995f0da880c3d7552c2541138c0f07eb6555f0ee10c77d805f8b3f65 SHA512 ebf64b94b38300e4e471f975a51e4b014879937e855af5d72a3f759af4445fa9024e42962ab1284ebe7b2ae2ddf51ea418d106c9894e1841f0984622afbef115 WHIRLPOOL 9222608edd8382ec2f8dbd7dd85eb0392d79a527d94f959f011430b2d15bbf405ccf06954e20679e26e93cd7c356b70f7490280e097cfc833ac015612a5cfe77 +DIST libdynd-0.6.6.tar.gz 1261349 SHA256 0e05eedd6b230f122a6c92fb6306be3017b0a5c460af5eace0074640455ef17e SHA512 efeb52a5b5dd3154ca293f388d5b967ff983450253435572b919f7c4a1445ad3cb416def4c736f908fdb3b06cddebae881a58420e528f1ca145973a997af7a28 WHIRLPOOL 8479f280a883f07382280b8fb94a3c21e8ef9975b67fe31bed83a40b9ad7e5b939c48ac76c638492faeb91143e449471c0d316078066c4d9752e4b238f3cd822 DIST libdynd-0.7.2.tar.gz 1342364 SHA256 be764817ca6e72dd65a32698b0a7f64df111b732c3230b5b8a8bfc72a3b0c750 SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f WHIRLPOOL 4969f747f3b0cf1a46681aaae78d470762aa6321aea8f0cf95ef55ee061a247fb24c6d8667adff5ebf6bfdf99408dfdcf8e5cd4ed37c00fb856a5eae8127c615 diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch b/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch new file mode 100644 index ..9659372 --- /dev/null +++ b/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch @@ -0,0 +1,15 @@ +--- tests/CMakeLists.txt.orig 2014-02-10 14:25:18.041841087 -0800 tests/CMakeLists.txt 2014-02-10 14:25:40.224975614 -0800 +@@ -105,12 +105,6 @@ + ) + endif() + +-# If installation is requested, install the program +-if (DYND_INSTALL_LIB) +-install(TARGETS test_libdynd +-RUNTIME DESTINATION bin) +-endif() +- + # Compile-time tests: test code that is supposed to produce compile errors + # I couldn't find a properly specified way to do this, so hacked together + # this function. diff --git a/dev-libs/libdynd/libdynd-0.6.5.ebuild b/dev-libs/libdynd/libdynd-0.6.5.ebuild new file mode 100644 index ..49451de --- /dev/null +++ b/dev-libs/libdynd/libdynd-0.6.5.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils multilib cuda + +# change each release, to avoid git in tree dependency +DYND_GIT_SHA1=2e140844d4a21c436ca0fc46996bf8606ffc21d5 + +DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure" +HOMEPAGE="https://github.com/ContinuumIO/libdynd"; +SRC_URI="https://github.com/ContinuumIO/${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 test" + +RDEPEND=" + dev-libs/c-blosc:0= + cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) + fftw? ( sci-libs/fftw:3.0 ) + " +DEPEND="${RDEPEND}" + +DOCS=( README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch +) + +src_prepare() { + cmake-utils_src_prepare + # each relase comes with a different set... + # remove forced strong flags + sed -i \ + -e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \ + -e "s|@DYND_VERSION@|${PV}|" \ + -e 's|-fomit-frame-pointer||' \ + -e 's|-Werror||g' \ + CMakeLists.txt || die +} + +src_configure() { + sed -i \ + -e '/add_subdirectory(examples)/d' \ + CMakeLists.txt || die + local mycmakeargs=( + -DDYND_SHARED_LIB=ON + -DDYND_INSTALL_LIB=ON + $(cmake-utils_use cuda DYND_CUDA) + $(cmake-utils_use test DYND_BUILD_TESTS) + ) + cmake-utils_src_configure +} + +src_test() { + cd "${BUILD_DIR}" || die + ./tests/test_libdynd || die +} + +src_install() { + cmake-utils_src_install + use doc && dodoc documents/* +} diff --git a/dev-libs/libdynd/libdynd-0.6.6.ebuild b/dev-libs/libdynd/libdynd-0.6.6.ebuild new file
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdynd/
commit: 868413cd6a9ee4e459747c67a47e806444d47da0 Author: Sébastien Fabbro gentoo org> AuthorDate: Tue Jan 10 05:22:15 2017 + Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Jan 10 05:26:41 2017 + 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/, dev-libs/libdynd/files/
commit: 534b09a8949b7a27832196be14f6f4ec295f3e8b Author: Sébastien Fabbro gentoo org> AuthorDate: Sun Jan 8 06:47:28 2017 + Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Jan 10 05:26:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534b09a8 dev-libs/libdynd: version bump Cleaned old buggy versions. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/libdynd/Manifest | 3 +- .../files/libdynd-0.6.0-dont-install-test.patch| 15 - dev-libs/libdynd/libdynd-0.6.5.ebuild | 67 -- dev-libs/libdynd/libdynd-0.6.6.ebuild | 67 -- dev-libs/libdynd/libdynd-0.7.2.ebuild | 67 ++ dev-libs/libdynd/metadata.xml | 21 +++ 6 files changed, 79 insertions(+), 161 deletions(-) diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest index 695bfcc..b6d331f 100644 --- a/dev-libs/libdynd/Manifest +++ b/dev-libs/libdynd/Manifest @@ -1,2 +1 @@ -DIST libdynd-0.6.5.tar.gz 1238404 SHA256 bf2e5c88995f0da880c3d7552c2541138c0f07eb6555f0ee10c77d805f8b3f65 SHA512 ebf64b94b38300e4e471f975a51e4b014879937e855af5d72a3f759af4445fa9024e42962ab1284ebe7b2ae2ddf51ea418d106c9894e1841f0984622afbef115 WHIRLPOOL 9222608edd8382ec2f8dbd7dd85eb0392d79a527d94f959f011430b2d15bbf405ccf06954e20679e26e93cd7c356b70f7490280e097cfc833ac015612a5cfe77 -DIST libdynd-0.6.6.tar.gz 1261349 SHA256 0e05eedd6b230f122a6c92fb6306be3017b0a5c460af5eace0074640455ef17e SHA512 efeb52a5b5dd3154ca293f388d5b967ff983450253435572b919f7c4a1445ad3cb416def4c736f908fdb3b06cddebae881a58420e528f1ca145973a997af7a28 WHIRLPOOL 8479f280a883f07382280b8fb94a3c21e8ef9975b67fe31bed83a40b9ad7e5b939c48ac76c638492faeb91143e449471c0d316078066c4d9752e4b238f3cd822 +DIST libdynd-0.7.2.tar.gz 1342364 SHA256 be764817ca6e72dd65a32698b0a7f64df111b732c3230b5b8a8bfc72a3b0c750 SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f WHIRLPOOL 4969f747f3b0cf1a46681aaae78d470762aa6321aea8f0cf95ef55ee061a247fb24c6d8667adff5ebf6bfdf99408dfdcf8e5cd4ed37c00fb856a5eae8127c615 diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch b/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch deleted file mode 100644 index 9659372.. --- a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch +++ /dev/null @@ -1,15 +0,0 @@ tests/CMakeLists.txt.orig 2014-02-10 14:25:18.041841087 -0800 -+++ tests/CMakeLists.txt 2014-02-10 14:25:40.224975614 -0800 -@@ -105,12 +105,6 @@ - ) - endif() - --# If installation is requested, install the program --if (DYND_INSTALL_LIB) --install(TARGETS test_libdynd --RUNTIME DESTINATION bin) --endif() -- - # Compile-time tests: test code that is supposed to produce compile errors - # I couldn't find a properly specified way to do this, so hacked together - # this function. diff --git a/dev-libs/libdynd/libdynd-0.6.5.ebuild b/dev-libs/libdynd/libdynd-0.6.5.ebuild deleted file mode 100644 index 49451de.. --- a/dev-libs/libdynd/libdynd-0.6.5.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils multilib cuda - -# change each release, to avoid git in tree dependency -DYND_GIT_SHA1=2e140844d4a21c436ca0fc46996bf8606ffc21d5 - -DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure" -HOMEPAGE="https://github.com/ContinuumIO/libdynd"; -SRC_URI="https://github.com/ContinuumIO/${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 test" - -RDEPEND=" - dev-libs/c-blosc:0= - cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) - fftw? ( sci-libs/fftw:3.0 ) - " -DEPEND="${RDEPEND}" - -DOCS=( README.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch -) - -src_prepare() { - cmake-utils_src_prepare - # each relase comes with a different set... - # remove forced strong flags - sed -i \ - -e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \ - -e "s|@DYND_VERSION@|${PV}|" \ - -e 's|-fomit-frame-pointer||' \ - -e 's|-Werror||g' \ - CMakeLists.txt || die -} - -src_configure() { - sed -i \ - -e '/add_subdirectory(examples)/d' \ - CMakeLists.txt || die - local mycmakeargs=( - -DDYND_SHARED_LIB=ON - -DDYND_INSTALL_LIB=ON - $(cmake-utils_use cuda DYND_CUDA) - $(cmake-utils_use test DYND_BUILD_TESTS) - ) - cmake-utils_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - ./tests/test_libdynd || die -} - -src_instal
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdynd/
commit: 02a4bcaa2cb79940af4b8fc89ae31aa95bad0257 Author: Sébastien Fabbro gentoo org> AuthorDate: Sun Jan 8 22:17:42 2017 + Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Jan 10 05:26:40 2017 + 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/files/
commit: 1dd032e00e1cedcf7d5a3d12946965f655c3e1c9 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Sat Sep 3 16:10:53 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 4 18:57:59 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd032e0 dev-libs/libdynd: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/2234 Signed-off-by: David Seifert gentoo.org> .../files/libdynd-0.6.0-optional-cblosc.patch | 27 -- .../libdynd-0.6.0-out-of-git-versioning.patch | 14 --- .../files/libdynd-0.6.0-respect-libdir.patch | 15 .../libdynd-0.6.2-out-of-git-versioning.patch | 15 4 files changed, 71 deletions(-) diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-optional-cblosc.patch b/dev-libs/libdynd/files/libdynd-0.6.0-optional-cblosc.patch deleted file mode 100644 index d801eb6.. --- a/dev-libs/libdynd/files/libdynd-0.6.0-optional-cblosc.patch +++ /dev/null @@ -1,27 +0,0 @@ CMakeLists.txt.orig2014-02-10 14:26:48.299381259 -0800 -+++ CMakeLists.txt 2014-02-10 14:51:16.401051546 -0800 -@@ -56,8 +56,22 @@ - set(CMAKE_VERBOSE_MAKEFILE 1) - - # Embedded libraries --add_subdirectory(thirdparty/blosc) --include_directories(thirdparty/blosc/blosc) -+option(DYND_INTERNAL_CBLOSC -+ "Build and use the bundled c-blosc library" -+ OFF) -+if(DYND_INTERNAL_CBLOSC) -+ add_subdirectory(thirdparty/blosc) -+ include_directories(thirdparty/blosc/blosc) -+else() -+ find_path(CBLOSC_INCLUDE_DIR blosc.h) -+ find_library(CBLOSC_LIBRARY NAMES blosc) -+ if (CBLOSC_INCLUDE_DIR AND CBLOSC_LIBRARY) -+message(STATUS "Found c-blosc library: ${CBLOSC_LIBRARY}") -+ else () -+message(ERROR "No c-blosc found. Consider using internal sources.") -+ endif() -+endif(DYND_INTERNAL_CBLOSC) -+ - add_subdirectory(thirdparty/datetime) - include_directories(thirdparty/datetime/include) - diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-out-of-git-versioning.patch b/dev-libs/libdynd/files/libdynd-0.6.0-out-of-git-versioning.patch deleted file mode 100644 index 65c32da.. --- a/dev-libs/libdynd/files/libdynd-0.6.0-out-of-git-versioning.patch +++ /dev/null @@ -1,14 +0,0 @@ CMakeLists.txt.orig2014-02-10 14:26:48.299381259 -0800 -+++ CMakeLists.txt 2014-02-10 14:55:48.245644726 -0800 -@@ -86,9 +86,8 @@ - endif() - - # Get the git revision --include(GetGitRevisionDescriptionDyND) --get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_GIT_SHA1) --git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_VERSION_STRING --dirty --match "v[0-9]*") -+set(DYND_GIT_SHA1 "9f2e102e3b0c44da82feaa431bb89a5d71b40498") -+set(DYND_VERSION_STRING "v0.6.0") - message(STATUS "DyND version: ${DYND_VERSION_STRING}") - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/src/dynd/git_version.cpp.in" diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-respect-libdir.patch b/dev-libs/libdynd/files/libdynd-0.6.0-respect-libdir.patch deleted file mode 100644 index b363980.. --- a/dev-libs/libdynd/files/libdynd-0.6.0-respect-libdir.patch +++ /dev/null @@ -1,15 +0,0 @@ CMakeLists.txt.orig2014-02-10 14:26:48.299381259 -0800 -+++ CMakeLists.txt 2014-02-10 14:27:42.511704585 -0800 -@@ -481,9 +481,9 @@ - if (DYND_INSTALL_LIB) - # Install the libdynd binary - install(TARGETS libdynd --RUNTIME DESTINATION lib --LIBRARY DESTINATION lib --ARCHIVE DESTINATION lib/static) -+RUNTIME DESTINATION lib${LIB_SUFFIX} -+LIBRARY DESTINATION lib${LIB_SUFFIX} -+ARCHIVE DESTINATION lib${LIB_SUFFIX}/static) - # Install the libdynd headers - install(DIRECTORY "include/dynd" DESTINATION "${CMAKE_INSTALL_PREFIX}/include") - # Install the libdynd-config script diff --git a/dev-libs/libdynd/files/libdynd-0.6.2-out-of-git-versioning.patch b/dev-libs/libdynd/files/libdynd-0.6.2-out-of-git-versioning.patch deleted file mode 100644 index 92b7ec0.. --- a/dev-libs/libdynd/files/libdynd-0.6.2-out-of-git-versioning.patch +++ /dev/null @@ -1,15 +0,0 @@ CMakeLists.txt.orig2014-05-01 20:43:13.0 +0400 -+++ CMakeLists.txt 2014-05-12 13:56:55.0 +0400 -@@ -112,9 +112,9 @@ - endif() - - # Get the git revision --include(GetGitRevisionDescriptionDyND) --get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_GIT_SHA1) --git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_VERSION_STRING --dirty --always --match "v*") -+SET(DYND_GIT_SHA1 "@DYND_GIT_SHA1@") -+SET(DYND_VERSION_STRING "@DYND_VERSION@") -+ - message(STATUS "DyND version: ${DYND_VERSION_STRING}") - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/src/dynd/git_version.cpp.in"