gentoo auto-resync : 29:08:2022 - 16:46:43

4 files changed, 108 insertions, 2 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 2e88b0a55ef1..7a1052f362e6 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,9 @@
 AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8b34c86877b65b4909523bd80bf1d1a7ab86fa1676f777a49a670a456a2b4babdcbbee7063e6fd8b6a24a025b92d43632d580fa8ab329 SHA512 0d763dbbd510f273fbe937bf51a07cda2f2d9e53dcfdb64d210f3c85c51e6995223cf13d81d94b90dc7dc0fddde8fc8ea6f30d23b652edf8945fee08c494b1f0
+AUX gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch 342 BLAKE2B fe7b93a8679eb11959560e41c8c9675d94f27578c98926327329139cab87cdab1d8556605809347a894a6cf66b44f9d585ace9c3edf51d938558cab0a7da67ef SHA512 dab43caa06b4073cc6832076b58a938f6ad0ea023870279c2f49588d88d2b208465d4788f6d0ed9d02a11a6678e21974a982a23565fcecbf72d841ea6b1a18a6
 DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e
 DIST gr-osmosdr-0.2.3_p20210128.tar.gz 257938 BLAKE2B 1bdb3b57ec6a2f942769770c34d41b4e3db5b62f8c337d724b0099f9a2fe5bdb7231bc0727dfe4bd01cd62918b4847ea2f8780208c0960bced5853c716ec6f02 SHA512 4dcb6b2c10eeb2252111ba691be179fe5b6dc9598fa7e6129a3b214ee74d43ca2d67ab5eafa73cea2abb25729c24be0592585d149e13c7285f2ce330e52a6470
 EBUILD gr-osmosdr-0.2.3.ebuild 2131 BLAKE2B baca917e56f5bfd373cfe22fc0d8295c78171066639c48684591a8c5072e9ea5dc66de15b8ce039f438ae4d544b943f842b7d2e952fefdcc66f0733b1476c938 SHA512 81de3fa634b823cb14fc69b3955b79bc1f4a59a173d21ec91cf44a85f6217a51cd749ccd1e05d3d3a2786460d09a16e75744ee6d10226a84643a5ef66fb53061
-EBUILD gr-osmosdr-0.2.3_p20210128.ebuild 2192 BLAKE2B 42cb612ff4a426fe4c87498d1e1bbc9cee0d4d1189b3f0a9938f48f4cf35adacd1dad013eac56e96c42c71b0dddfa85662b127ade03b82802a16cc5ccf81f03a SHA512 348b0bc2724a650283f1ea6272611a9cb3ed6e76f9c494be6f7a23b45e5f573683a88a6256e8f5468676ae57989d40965fbb475cbc889bd94c358fff776aaad2
+EBUILD gr-osmosdr-0.2.3_p20210128-r1.ebuild 2383 BLAKE2B 3f56685ecb142073b9a83a9ba3f91dd48337e1b184236cbc77e01d4289b53e76aaceee10d9e7cb0c70c079e88f76b147328db4b567fb7a63b7df807d94bc5eec SHA512 a8c689e66c3a749371a7c1258b5f1c6beb182b2414b6b1e0341cd669f08e73188db9a15c13b94be6d1893e234870fa9f36c1fe21fe59238ed812b5b76abba4a9
+EBUILD gr-osmosdr-0.2.3_p20210128.ebuild 2250 BLAKE2B 80c50e28d5b74690f1129495e29776c4dbef6146cb5f835d0d201bf04a5633180452551a492897f1434c6a6546cdc35e145ca3434d4090136f9b6edd912d56a3 SHA512 082d2fa670a3fae8faf3a70df1994e07dd653d28482cd7f9bd2ad710e58dcad22249c634ad55b3a1c4ddc3331cb100da9e08cd9c02789cff764b82467d45ca78
 EBUILD gr-osmosdr-9999.ebuild 2035 BLAKE2B 6a1b8ca6552f8c46ce4adbdf206623928548beae39254dc0a93ef4de6bf4dee350e484570135d3653556de1a3b35d921217f97ae90b605047180df7f24d1ad3b SHA512 991dd241d4489cd4f87ef094598ab750b79584622325f0f4d51521d5631012fcf9fb6bdf3bd08dccc6d1992de59406cd4d5ce0927310547b3b69dc7f866658aa
 MISC metadata.xml 897 BLAKE2B 9554d972990777bc9798fc121954e1cb85344926791f0a53c03934b2119698b7b7343adb8170ca7353311d717a4cedcd5d59f2e3de3339461a30b1358a52426a SHA512 10e388fa02cc40378c5f168f5b7ab52b323a3cdd8b12298193119c2afabc46353fe5adf402f6e8012a35b024828b1fdc0834c58d4b6a3aff8ae436808ebfbed5
diff --git a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch
new file mode 100644
index 000000000000..2bf79b1fe20e
--- /dev/null
+++ b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96a2c90..a3836f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,9 +187,7 @@ find_package(Doxygen)
+ 
+     # Python
+     ##########
+-
+-find_package(PythonLibs 3)
+-find_package(pybind11)
++include(GrPybind)
+ 
+ GR_REGISTER_COMPONENT("Python support" ENABLE_PYTHON
+     PYTHONLIBS_FOUND
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild
new file mode 100644
index 000000000000..93c7e4a5661e
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
+else
+	COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03"
+	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="airspy bladerf doc hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/log4cpp
+	>=net-wireless/gnuradio-3.9.0.0:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk:=
+	airspy? ( net-wireless/airspy )
+	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
+	sdrplay? ( net-wireless/sdrplay )
+	soapy? ( net-wireless/soapysdr:= )
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
+	xtrx? ( net-wireless/libxtrx )
+	"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+		$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+		doc? ( app-doc/doxygen )
+	"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-enable-python.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_FILE=ON
+		-DENABLE_AIRSPY="$(usex airspy ON OFF)"
+		-DENABLE_BLADERF="$(usex bladerf ON OFF)"
+		-DENABLE_HACKRF="$(usex hackrf ON OFF)"
+		-DENABLE_IQBALANCE="$(usex iqbalance ON OFF)"
+		-DENABLE_PYTHON="$(usex python ON OFF)"
+		-DENABLE_RTL="$(usex rtlsdr ON OFF)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
+		-DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
+		-DENABLE_NONFREE="$(usex sdrplay ON OFF)"
+		-DENABLE_SOAPY="$(usex soapy ON OFF)"
+		-DENABLE_UHD="$(usex uhd ON OFF)"
+		-DENABLE_XTRX="$(usex xtrx ON OFF)"
+		-DENABLE_DOXYGEN="$(usex doc ON OFF)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		find "${ED}" -name '*.py[oc]' -delete || die
+		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
+	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
index 518b27caa2a1..a481ca03c6f3 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
@@ -44,6 +44,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-enable-python.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
@@ -69,7 +73,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	if use python; then
-		find "${D}" -name '*.py[oc]' -delete || die
+		find "${ED}" -name '*.py[oc]' -delete || die
 		python_fix_shebang "${ED}"/usr/bin
 		python_optimize
 	fi