From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 29 Jun 2020 11:38:31 +0100
Subject: gentoo resync : 29.06.2020

---
 sci-libs/volk/Manifest             |  2 +-
 sci-libs/volk/volk-2.3.0-r1.ebuild | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'sci-libs/volk')

diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index b5de6e0c6ccf..aa27518e35c0 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,3 +1,3 @@
 DIST volk-2.3.0.tar.gz 344763 BLAKE2B 0f0e0cb7e6cd28086802c1618685ec30dedf5cdf67bef7ed09f3a7482f84d6e7972f4b22c096676bdef34c66c60d936ca8ab300cd4da07f6714cface1c2846ed SHA512 9e3b405b7be46b4f5ff61a4d42fa9013fc55169bc18c9cf9253e446fe23fd12dc0356adb9aa176e33dfa4cc478e4b9226bee906a2d89ef83bac3b28f52816382
-EBUILD volk-2.3.0-r1.ebuild 1111 BLAKE2B 6dd21f37fc91d0824c5edc15f1c53e7c702d46139e7e5afe4b339cdd1823f8392b1dc0c5770e4f8d079a2b0a3e52679c5eca4a63d896051d55851d8f12967edb SHA512 d834630ae84b856e8496a804a815d261b4ce46bd65f12e7994504c40a16a58308bb9a2d31795ec1fd15b846fa30a78705273589867e64b26aa8d78d2edd03b56
+EBUILD volk-2.3.0-r1.ebuild 931 BLAKE2B 669d58f3e8f8bdba23bab9b92d52a5a0694fcac5b4d88edeefe74082352e481649ab27979294bfca79f7cfbad78c098de267277c0ef95f8265242e2d48d3c671 SHA512 ba79c624b9f7faf67feb2b2d0fbbe9d856b36fbc2f319f2a3340a1d61ecf145e29712e8ce8b7e1ac3d8ce85d689f6a30926a4e797e7c9519f43ea7147109321a
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/volk-2.3.0-r1.ebuild b/sci-libs/volk/volk-2.3.0-r1.ebuild
index 31451c46050e..e8f45f0f6f9c 100644
--- a/sci-libs/volk/volk-2.3.0-r1.ebuild
+++ b/sci-libs/volk/volk-2.3.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 #https://github.com/gnuradio/volk/issues/383
-CMAKE_BUILD_TYPE="Release"
+CMAKE_BUILD_TYPE="None"
 inherit cmake python-single-r1
 
 DESCRIPTION="vector optimized library of kernels"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/gnuradio/volk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="orc"
+IUSE="orc test"
 
 RDEPEND="!<net-wireless/gnuradio-3.8
 	dev-libs/boost:=
@@ -27,19 +27,12 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
-src_prepare() {
-	#https://github.com/gnuradio/volk/issues/382
-	#Waiting for confirmation from upstream to push this fix
-	#sed -i '/_mm256_zeroupper();/d' kernels/volk/volk_32f_x2_dot_prod_32f.h || die
-	mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_ORC=$(usex orc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_PROFILING=OFF
 	)
 	cmake_src_configure
 }
-- 
cgit v1.2.3