From b0ebd12de22226fd7b69140ccd700efda3eb5fa6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 3 Aug 2023 22:54:31 +0100
Subject: gentoo auto-resync : 03:08:2023 - 22:54:30

---
 sci-libs/Manifest.gz               | Bin 44945 -> 44946 bytes
 sci-libs/volk/Manifest             |   2 +-
 sci-libs/volk/volk-3.0.0-r1.ebuild |  57 +++++++++++++++++++++++++++++++++++++
 sci-libs/volk/volk-3.0.0.ebuild    |  47 ------------------------------
 4 files changed, 58 insertions(+), 48 deletions(-)
 create mode 100644 sci-libs/volk/volk-3.0.0-r1.ebuild
 delete mode 100644 sci-libs/volk/volk-3.0.0.ebuild

(limited to 'sci-libs')

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index af7d92b289b6..36d67104ae65 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index 8b1479502bb1..9917d88f0a05 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,5 +1,5 @@
 DIST volk-2.5.1.tar.xz 362792 BLAKE2B dfaaddb9e6910c2e7d9d493c87922cf95ae3c70fff5644c7295f02e474d5fabdc2c9f42dbcc2d9d85cc25e9b6c3ba9ec8671b580093a35af1402183fa18df93a SHA512 4946b1675293920dc6e716b0a7927ce845abd833b2a33c41542b90760c6ab6832a1faede4c783133b32e616d69a8fcf2d131ca54cd504b0596fc0a92030cd1fa
 DIST volk-3.0.0.tar.xz 394044 BLAKE2B 04e832916375610571387db521348df2a37f5460500c4bd6d223dd6af9c0a207f3b22c599fccbf9bd51b8a87ed90cb5239512c19fc6ddd02320b7aa27c3be588 SHA512 5d1ff90f28ec6ef2d21370d74025139ccc9872e5a477b271ffe6662725b7705203715ea4ffc430554ec2fec56e8d9b40a945e75186761995d3075218e1f16313
 EBUILD volk-2.5.1.ebuild 1172 BLAKE2B c3695ff0c961eeb0e3ad43d427de0c497717fe8cc623a4df415bb3f85c932de4269747f6abfb41f208044049323356ba548fc3446406d3f42f46e9feaac4bccf SHA512 530d995267064af93ea90ee9c68adc122b029bbbf785fbefd33171037f369474c7023dfc12c0c22e2b1e4a4f7ab8e9479b0cc91423bc90658fd33085940d2f35
-EBUILD volk-3.0.0.ebuild 1132 BLAKE2B 78fe183f61962720935b404fd83e04c3846a183868f8bbe4461afad67b8a366ad9c85b966dda63f6db6271a4a36501c672c08297674cae969e6d38f1cda02d9b SHA512 394316e6d16853655f1a9802c574ddc09407d9b6c53f787e8c203eb390f4f7122af8cc68a51ab3a3aa10f302f01dade6f9d8365f7098dc7a7b5c204584b0b7c8
+EBUILD volk-3.0.0-r1.ebuild 1403 BLAKE2B c8db65638b1b66110b995533538de8cc8084355a5653bfacd0e077004b8dbe80400ecccc13a786f883b1c67f397b54db73b55efb54b698064d9b49f92be5acc7 SHA512 a504c1cfe9b6635f4434dbce84704b6829a342f8940b6a6c7852e615fefd3660dae8a01e8df4ba5d4252903071ab113145a293540d4c2d96932a841ffdf690f0
 MISC metadata.xml 326 BLAKE2B add10950a24964807f5b5c4696f3852da2c19337e5db075bc1e2f9ba597812ac2b8e975b1747bf7a6a0e57420a9ea70f721d117f452c7971bb9a47765274938d SHA512 a5ce5f748eb162e852281a9a043c1bec629448da7f2f0a211f81c6671dbc10677aab06446fe9e1cd4105049ef95acbd03276d53472fbf73a8c3d608ea649787a
diff --git a/sci-libs/volk/volk-3.0.0-r1.ebuild b/sci-libs/volk/volk-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..39eb8873bba8
--- /dev/null
+++ b/sci-libs/volk/volk-3.0.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+#https://github.com/gnuradio/volk/issues/383
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1
+
+DESCRIPTION="vector optimized library of kernels"
+HOMEPAGE="http://libvolk.org"
+SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="orc test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}
+	orc? ( dev-lang/orc )"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]')"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ORC=$(usex orc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_PROFILING=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+	# https://github.com/gnuradio/volk/issues/626
+	rm -f "${ED}/usr/bin/list_cpu_features"
+	rm -rf "${ED}/usr/include/cpu_features"
+	rm -rf "${ED}/usr/$(get_libdir)/cmake/CpuFeatures"
+	rm -rf "${ED}/usr/lib64/libcpu_features.a"
+	python_optimize
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(check_lgpl)"
+	)
+	cmake_src_test
+}
diff --git a/sci-libs/volk/volk-3.0.0.ebuild b/sci-libs/volk/volk-3.0.0.ebuild
deleted file mode 100644
index 966205b0e596..000000000000
--- a/sci-libs/volk/volk-3.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-#https://github.com/gnuradio/volk/issues/383
-CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1
-
-DESCRIPTION="vector optimized library of kernels"
-HOMEPAGE="http://libvolk.org"
-SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="orc test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}
-	net-wireless/gnuradio
-	dev-libs/boost:=
-	orc? ( dev-lang/orc )"
-DEPEND="${RDEPEND}
-	$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]')"
-
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ORC=$(usex orc)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_PROFILING=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# Remove stray python files generated by the build system
-	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
-	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
-	python_optimize
-}
-- 
cgit v1.2.3