Remove old revision

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

2 files changed, 21 insertions, 28 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 090289f..0071a9e 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,6 @@
 AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8b34c86877b65b4909523bd80bf1d1a7ab86fa1676f777a49a670a456a2b4babdcbbee7063e6fd8b6a24a025b92d43632d580fa8ab329 SHA512 0d763dbbd510f273fbe937bf51a07cda2f2d9e53dcfdb64d210f3c85c51e6995223cf13d81d94b90dc7dc0fddde8fc8ea6f30d23b652edf8945fee08c494b1f0
-DIST gr-osmosdr-0.2.2.tar.gz 251425 BLAKE2B e1e29280b84139bf4b1b25ee35553f48abe7f26f9f240852c25f883ec6df406157d9b734035fd6df87e50b6d6f8ddab679ea91430558716acba05a9a64844c3d SHA512 42aef6efd35fd9184a371202398455de7cac3a88374e761359ab837a329495b653a95f5641f0a9533daeaa08c0d7fd5649b1b33359009dd4e8a3b9b24aedd2af
 DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e
-EBUILD gr-osmosdr-0.2.2.ebuild 2284 BLAKE2B cba311447b2e5666576f1d387544b70967cbed843220dcac8b3fa520c093deb20fc7d6dcb385f6619c98373f60f508aa926e1282f8e4f88c3b835755338104d7 SHA512 9c75345155becb12dcf9c3f7bef5adb9ed39106d7b57c27fb21f70a10f4dd68cbcfee9c8abf201bacf57cc0d99a4c05378b1a669ac4bb56ce7b907963b320f18
 EBUILD gr-osmosdr-0.2.3-r1.ebuild 2206 BLAKE2B 46fcc3bf34b1b684335739ae5a4d907ac92f457fb66f801ac4b1511d52660a47bf368e482935fb7468b4ce22dff96b96fd69e18c944988539ab3b5ff67781999 SHA512 fa6ece60d27178a6094d9db88a403ff451e7cbed1debc9a43d70be4be4dc9862fc56ac05bb90057da97ab6d5e7a477449488afaad195754c6d77034e291aac10
 EBUILD gr-osmosdr-0.2.3.ebuild 2171 BLAKE2B 11812df348a6467744ed86f3d4b44d2210c8617a0152b19013b3053fc3accb1b85f3b19611a3d6bd65d43e5f82690ff0a242baa169c58170940f4eaedd60c91c SHA512 9eb3b0c8a9a6bb2085d34c9c5992493b050fa12501393f93b5125c82100c224a90e4930f43d90db9c27f9d154c7101635422cfbb625a751564172fcb775a6c3d
+EBUILD gr-osmosdr-9999.ebuild 2099 BLAKE2B 74556f9fb3f38e9741cf9a65dbc07929f9549e42802a5f154d57c74043a5c12564f8e57c6fd99ab4d9f21636fd2cd1e3732a0ab6b6425cfeed1ad7abf6eeb85b SHA512 4b53c8bb13374176f4755343f7e02b873eb0a09bfe079e6da4064c6c2637ce7700c2adc55fac117a985b569cac4f16d0af14c711116eeb2f88ec49f28a7032cd
 MISC metadata.xml 1032 BLAKE2B d8453ff3429394fbbfc8ead6023b115f75f09a18540cb93683e01562d08395404077a8246f416b74c591e82910439fffcd5594eab0dc7b52b7193fd877cc5c89 SHA512 0ad24b29e42f6bd53d36474146c9d28c882597c02e179d254cbd4ef95f21bc6ec6b459fea13c111d449583f01362684a059f80cf6d748cf074d82671ae6ea632
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 73575cd..c4791b3 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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} )
 
 inherit cmake python-single-r1
 
@@ -19,49 +19,45 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy airspyhf bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/volk
+	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}] )
-	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
+	"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_prepare() {
-	cmake_src_prepare
-	sed -i "s:\${GR_DOC_DIR}/\${CMAKE_PROJECT_NAME}:\${GR_DOC_DIR}/${PF}:" CMakeLists.txt || die
-}
-
 src_configure() {
+	#-DENABLE_XTRX="$(usex xtrx ON OFF)"
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy)"
+		-DENABLE_AIRSPY="$(usex airspy ON OFF)"
 		-DENABLE_AIRSPYHF="$(usex airspyhf)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IQBALANCE="$(usex iqbalance)"
-		-DENABLE_MIRI="$(usex mirisdr)"
-		-DENABLE_PYTHON="$(usex python)"
-		-DENABLE_RTL="$(usex rtlsdr)"
-		-DENABLE_RTL_TCP="$(usex rtlsdr)"
-		-DENABLE_SOAPY="$(usex soapy)"
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_SDRPLAY="$(usex sdrplay)"
-		-DENABLE_NONFREE="$(usex sdrplay)"
+		-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=OFF
 	)
 
 	cmake_src_configure
@@ -70,10 +66,8 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	if use python; then
-		# Remove incorrectly byte-compiled Python files and replace
-		# https://github.com/gnuradio/gnuradio/issues/2944
-		find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
 		python_fix_shebang "${ED}"/usr/bin
 		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }