net-wireless/gr-osmosdr: Sync up with main tree

Signed-off-by: Daniel Solano Gómez <gentoo@sattvik.com>

4 files changed, 110 insertions, 2 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 9986044..c2abe50 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 2209 BLAKE2B 013c2904d26c1773153d2b6b0e559a3d378b82527487e0c4bfd6586782dab66b33eba13f3c7ec9308a9204ce2d7c3bf349688335eea6d9b1d04420c5f6fbb02f SHA512 99d9a36d9d885d01d0d70278753c3c8cacaf04d62967502100ee23c1c78a27191621da5edafa5123536a7665a4b1e6a11d07408f3ac8c917cd865e3699e84ed6
-EBUILD gr-osmosdr-0.2.3_p20210128.ebuild 2277 BLAKE2B 2f0397bc955f4d429a0f94505b15e52b7810add816bf3485026e33b214ef1fd1103e3cc0ffba96a652e969e5858c93c8b9c0579a3756a49ca6d8e612c1461fa6 SHA512 d6929ba3ac1e620d7f2e0be689deccd63fbd6cb2d6d8453bcf21f3e0fafcc4a95867b0e7ef600baed506a6714680a77b795354306e635193e5108e1603fc6e41
+EBUILD gr-osmosdr-0.2.3_p20210128-r1.ebuild 2468 BLAKE2B 5449613ed974d0e5ed4177566376cfc75f163742ed7a871085aef0c86688815f4ad3b06e681425988c6d7a384ef315a3c115b7fbe8cacb0588925246f2a63207 SHA512 e33af1bf71048eaccfb3fe06046df83d6f00adb080f88321243501e426e45dc737c8637e08861dc87c728310b80a043b0c5aa45b451dc08a6cc2f13ec7541278
+EBUILD gr-osmosdr-0.2.3_p20210128.ebuild 2335 BLAKE2B c8c592bc1db7d07063ba24ceae8ba5279a9ca54feb9ca81d6ddbddc413b0e0097e2c56e2cd756431c2c636c778394ec87f348cc4fedfc352fdb6668c82fea6b1 SHA512 70c20dcb661e2608159ef906e10cb93bad8dcf7a8eecafefceb2bc6315381e00f90eabf371d727bb867242a4a18fed4c1df827e5c6b136ee4d2cec4ecf0df49e
 EBUILD gr-osmosdr-9999.ebuild 2126 BLAKE2B e2feee23a7aa2f128e0d7e24eb5f6c78bb724e2a5c505a0bfa0185f58bc8f67ae38c4e32715a7858a76db4f703a1571a4143f24f839baafdeaf853c2f3a6a4f7 SHA512 7c6a78f63a427a92a01c9ab7853b7303afb5ec0ea8719392fe7fb07273fb9dd2b48bc23f8234756efea95fbcc149d94fa5e1e4ad5d3745cbe9a459b7668a0a87
 MISC metadata.xml 957 BLAKE2B 7bcc1cba394e707749e5a350a7d3db16ebb2f9d7a85d5951bccdd4dc09cdd101cec7c95993cdd9d4abeef78660f81c27388faff9a032dedcd755bbb424663418 SHA512 86263cbd1eb5a9c1e4c567d535e20260df49a4fc161c4ce1e6d7289a0e3f902e6c4208f8badcb40aa26540710a96e020aa6b746c363e256a3c5211501bae7af2
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 0000000..2bf79b1
--- /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 0000000..c5759c9
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild
@@ -0,0 +1,87 @@
+# 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 airspyhf 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 )
+	airspyhf? ( net-wireless/airspyhf )
+	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_AIRSPYHF="$(usex airspyhf)"
+		-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 7f3cbac..2ac791b 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
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-enable-python.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
@@ -71,7 +75,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