From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 13 Jun 2020 10:39:22 +0100
Subject: gentoo resync : 13.06.2020

---
 dev-libs/libdynd/Manifest             |  4 ++--
 dev-libs/libdynd/libdynd-0.7.2.ebuild | 13 +++----------
 dev-libs/libdynd/metadata.xml         |  1 -
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'dev-libs/libdynd')

diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest
index bff86ffcd1b6..520ecf8bb995 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 2094 BLAKE2B 0db790781513c16d65a0456572ffa3f4339d057a29b70341f242d1aa361830e23b69e17c2abd04fbd1ae7b68aa6827ed289f8be5453578884441f41bcabb7c6a SHA512 05bfe31c1ca2fcbd10edc7a8b2924874fe673e635b46edbafee0597150444d2d9115c0bc2dadedc935f1bf9ff398bea686295094ce79a29598b979f64a9954e1
-MISC metadata.xml 1120 BLAKE2B 9b42962d156122337c1e142a67a984aa8a2537a3e14b8273d18e749a2e4887e8694623eaf2d74b8beb463ac9070c73d5d0f0bd34e6f800b735e3151e1fd8616a SHA512 ac2eb8493d3e23ec7bdac5d3d5dc2d22358e51e468456de99b5bc48326924c1db31ea4d9474300a2579203d25ebb863ac84226529b36b6b1402e1351c03b1b68
+EBUILD libdynd-0.7.2.ebuild 1911 BLAKE2B 5ba0be5542cbd76765c5173fa72a660f4826404651ce9abab64f54fec3391ef8d0d02b5c47ae97ad1a181b9db09d0b8a6c423dfe4b61950e1fce2fe77728237b SHA512 4ee29a9718ecb18e66daa2f6860a1cd1cc76a0e7123a37235e80af9b11b8f173e98581dcdb2d334b500580bdd23c7223dc02180e7f7a246bcbe2e1c5f8f84673
+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.ebuild
index 2f1c96031bd5..90d8c02bb873 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,12 +59,10 @@ 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)"
-		-DFFTW_PATH="${EPREFIX}/usr/include"
 	)
+	use fftw && mycmakeargs+=( -DFFTW_PATH="${EPREFIX}/usr/include" )
 	cmake-utils_src_configure
 }
 
diff --git a/dev-libs/libdynd/metadata.xml b/dev-libs/libdynd/metadata.xml
index 0b3978ba39fe..f5301331ec0b 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>
-- 
cgit v1.2.3