diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
| commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
| tree | cf61513204d97974179580065e85df5c8009087c /dev-libs/libdynd | |
| parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) | |
gentoo resync : 03.03.2021
Diffstat (limited to 'dev-libs/libdynd')
| -rw-r--r-- | dev-libs/libdynd/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/libdynd/libdynd-0.7.2-r1.ebuild (renamed from dev-libs/libdynd/libdynd-0.7.2.ebuild) | 23 |
2 files changed, 16 insertions, 9 deletions
diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest index 520ecf8bb995..28befa7ca8cf 100644 --- a/dev-libs/libdynd/Manifest +++ b/dev-libs/libdynd/Manifest @@ -1,3 +1,3 @@ DIST libdynd-0.7.2.tar.gz 1342364 BLAKE2B 28617a6b01c09dd8030d376f73c6dc6ddb4cd031aaa59348283fbb1226bb401e2d7ab48385263b8abc4ca95ffd75d2ce9f3b52a417fe04c6597886f8626cdd3f SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f -EBUILD libdynd-0.7.2.ebuild 1911 BLAKE2B 5ba0be5542cbd76765c5173fa72a660f4826404651ce9abab64f54fec3391ef8d0d02b5c47ae97ad1a181b9db09d0b8a6c423dfe4b61950e1fce2fe77728237b SHA512 4ee29a9718ecb18e66daa2f6860a1cd1cc76a0e7123a37235e80af9b11b8f173e98581dcdb2d334b500580bdd23c7223dc02180e7f7a246bcbe2e1c5f8f84673 +EBUILD libdynd-0.7.2-r1.ebuild 1995 BLAKE2B 1ecd811bc47d1864a513c90033709d3ba8cb922e4c98550a991db7d8cc2db2c24912995d67024f3089e799c86eba0da4a36108d4ef69d135ffa8907730443658 SHA512 4c41cb056023f33ba5c852bdfc0c0a64301a75bc8896b99ae39c98a7e0162674d3145c7250b8c4a0f464b375e85dda555d3a8dcb733cb36b279c6f14568a61ae MISC metadata.xml 1022 BLAKE2B 5249d8465047f4f6cd62f591aeb54a274ace157f9b9889a1be17cb049ebf20deebd6459975c62f466faf37f9eea214bd454642b6783fbc4da48e28e9aab40e30 SHA512 7f8a4d5138c2103a4d74a3968dbd198eed8b92312cf52f9ae0910d06b8e9ddf08091bc6e22e92fbefd35ee1b8929e1cb8cda19a3b4c2ff5b7729c7ef23e874ac diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild index 90d8c02bb873..b83206ebd457 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() { |