net-wireless/gr-osmosdr: Add gr-osmosdr-0.2.3_p20210128

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

5 files changed, 22 insertions, 99 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 40b83d4..9986044 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,7 @@
 AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8b34c86877b65b4909523bd80bf1d1a7ab86fa1676f777a49a670a456a2b4babdcbbee7063e6fd8b6a24a025b92d43632d580fa8ab329 SHA512 0d763dbbd510f273fbe937bf51a07cda2f2d9e53dcfdb64d210f3c85c51e6995223cf13d81d94b90dc7dc0fddde8fc8ea6f30d23b652edf8945fee08c494b1f0
 DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e
-EBUILD gr-osmosdr-0.2.3-r1.ebuild 2206 BLAKE2B 46fcc3bf34b1b684335739ae5a4d907ac92f457fb66f801ac4b1511d52660a47bf368e482935fb7468b4ce22dff96b96fd69e18c944988539ab3b5ff67781999 SHA512 fa6ece60d27178a6094d9db88a403ff451e7cbed1debc9a43d70be4be4dc9862fc56ac05bb90057da97ab6d5e7a477449488afaad195754c6d77034e291aac10
-EBUILD gr-osmosdr-0.2.3-r2.ebuild 2207 BLAKE2B fd830fefbe1ab570983c5fc0e21603d57fa92e031f0ced364da2ee058dbe24b1b06d08ab9b5c33feb75e61baa88a999ab3213bdd4633893cafb9b134e960e59c SHA512 edee60910d055281ac33f221082025c4800d43c9c8ae383f19c1cbe6e32ff67e35319286ad47b4bd17c6bdd23baa722ae30bc25007698f40b8e29bd85850894d
-EBUILD gr-osmosdr-0.2.3.ebuild 2171 BLAKE2B 11812df348a6467744ed86f3d4b44d2210c8617a0152b19013b3053fc3accb1b85f3b19611a3d6bd65d43e5f82690ff0a242baa169c58170940f4eaedd60c91c SHA512 9eb3b0c8a9a6bb2085d34c9c5992493b050fa12501393f93b5125c82100c224a90e4930f43d90db9c27f9d154c7101635422cfbb625a751564172fcb775a6c3d
-EBUILD gr-osmosdr-9999.ebuild 2099 BLAKE2B 74556f9fb3f38e9741cf9a65dbc07929f9549e42802a5f154d57c74043a5c12564f8e57c6fd99ab4d9f21636fd2cd1e3732a0ab6b6425cfeed1ad7abf6eeb85b SHA512 4b53c8bb13374176f4755343f7e02b873eb0a09bfe079e6da4064c6c2637ce7700c2adc55fac117a985b569cac4f16d0af14c711116eeb2f88ec49f28a7032cd
+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-9999.ebuild 2126 BLAKE2B e2feee23a7aa2f128e0d7e24eb5f6c78bb724e2a5c505a0bfa0185f58bc8f67ae38c4e32715a7858a76db4f703a1571a4143f24f839baafdeaf853c2f3a6a4f7 SHA512 7c6a78f63a427a92a01c9ab7853b7303afb5ec0ea8719392fe7fb07273fb9dd2b48bc23f8234756efea95fbcc149d94fa5e1e4ad5d3745cbe9a459b7668a0a87
 MISC metadata.xml 957 BLAKE2B 7bcc1cba394e707749e5a350a7d3db16ebb2f9d7a85d5951bccdd4dc09cdd101cec7c95993cdd9d4abeef78660f81c27388faff9a032dedcd755bbb424663418 SHA512 86263cbd1eb5a9c1e4c567d535e20260df49a4fc161c4ce1e6d7289a0e3f902e6c4208f8badcb40aa26540710a96e020aa6b746c363e256a3c5211501bae7af2
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3-r2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3-r2.ebuild
deleted file mode 100644
index f6d7d62..0000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9,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
-	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/log4cpp
-	=net-wireless/gnuradio-3.8*: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}
-	dev-lang/swig
-	"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use_xtrx_open_string.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)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use python; then
-		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.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
index f6de6d7..14bccd9 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit cmake python-single-r1
 
@@ -23,6 +23,7 @@ IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd x
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
+	dev-libs/log4cpp
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	sci-libs/volk:=
 	airspy? ( net-wireless/airspy )
@@ -36,7 +37,9 @@ RDEPEND="${PYTHON_DEPS}
 	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
 	xtrx? ( net-wireless/libxtrx )
 	"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
index ceeecb0..7f3cbac 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3-r1.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
@@ -13,8 +13,10 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
 else
-	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	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"
@@ -24,7 +26,7 @@ IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd x
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	dev-libs/log4cpp
-	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	>=net-wireless/gnuradio-3.9.0.0:0=[${PYTHON_SINGLE_USEDEP}]
 	sci-libs/volk:=
 	airspy? ( net-wireless/airspy )
 	airspyhf? ( net-wireless/airspyhf )
@@ -43,10 +45,6 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-use_xtrx_open_string.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
@@ -73,6 +71,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	if use python; then
+		find "${D}" -name '*.py[oc]' -delete || die
 		python_fix_shebang "${ED}"/usr/bin
 		python_optimize
 	fi
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index c4791b3..e0d37ab 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
@@ -19,8 +19,9 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
+IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd"
 
+#xtrx? ( net-wireless/libxtrx )
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]