From 24ecb374615b6a96175a1209f0d845bb3d34576c Mon Sep 17 00:00:00 2001
From: Rick Farina <zerochaos@gentoo.org>
Date: Thu, 1 Sep 2022 11:36:08 -0400
Subject: net-wireless/gr-iio: bump to latest snapshot

Mostly deprecate in favor of gnuradio[iio]

Signed-off-by: Rick Farina <zerochaos@gentoo.org>
---
 net-wireless/gr-iio/Manifest                       |  2 +-
 net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild | 43 --------------------
 net-wireless/gr-iio/gr-iio-0.3_p20210726.ebuild    | 47 ++++++++++++++++++++++
 net-wireless/gr-iio/gr-iio-9999.ebuild             | 10 +++--
 4 files changed, 55 insertions(+), 47 deletions(-)
 delete mode 100644 net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
 create mode 100644 net-wireless/gr-iio/gr-iio-0.3_p20210726.ebuild

(limited to 'net-wireless/gr-iio')

diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index cd98bcee556d..9fdff3854352 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1 +1 @@
-DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c
+DIST gr-iio-0.3_p20210726.tar.gz 67948 BLAKE2B 59d72f5fb31f5166ba7eb58f6bb50fe91f1edfc0c6fbff5f2d55e3768bc70504c15d32555695f65a9356d7a10a9d4549829896bc3062e9e3992d1f8072114751 SHA512 6c8316e6d3c2711256e1463dc1b5ec00e16366069d33d26e6c502e206459be4c76cbf2aa93fa8c54b7766e06b15efdcbc41a83cc72862cdd3c5ce83d0159385e
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
deleted file mode 100644
index ded3f63256e6..000000000000
--- a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="GNU Radio IIO Blocks"
-HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
-	EGIT_BRANCH="upgrade-3.8"
-	inherit git-r3
-else
-	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
-	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~riscv ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	=net-wireless/gnuradio-3.8*:=
-	dev-libs/boost:=
-	net-libs/libiio:=
-	dev-libs/gmp
-	sci-libs/volk:=
-	net-libs/libad9361-iio:="
-
-DEPEND="${RDEPEND}
-	sys-devel/flex:=
-	sys-devel/bison:=
-	dev-util/cppunit:=
-	dev-lang/swig:0"
-
-src_install() {
-	cmake_src_install
-	python_optimize
-}
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20210726.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20210726.ebuild
new file mode 100644
index 000000000000..e36aba5be25f
--- /dev/null
+++ b/net-wireless/gr-iio/gr-iio-0.3_p20210726.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="GNU Radio IIO Blocks"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
+	EGIT_BRANCH="upgrade-3.8"
+	inherit git-r3
+else
+	COMMIT="407865f89b92daa89fec5c2b3c0e44bb422ef9d3"
+	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	!net-wireless/gnuradio[iio(-)]
+	net-wireless/gnuradio:=
+	dev-libs/boost:=
+	net-libs/libiio:=
+	dev-libs/gmp
+	sci-libs/volk:=
+	net-libs/libad9361-iio:="
+
+DEPEND="${RDEPEND}
+	sys-devel/flex:=
+	sys-devel/bison:=
+	dev-util/cppunit:=
+	dev-lang/swig:0"
+
+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
+}
diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild
index ded3f63256e6..e36aba5be25f 100644
--- a/net-wireless/gr-iio/gr-iio-9999.ebuild
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{9,10} )
 
 inherit cmake python-single-r1
 
@@ -14,7 +14,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_BRANCH="upgrade-3.8"
 	inherit git-r3
 else
-	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
+	COMMIT="407865f89b92daa89fec5c2b3c0e44bb422ef9d3"
 	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~riscv ~x86"
@@ -24,7 +24,8 @@ SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
-	=net-wireless/gnuradio-3.8*:=
+	!net-wireless/gnuradio[iio(-)]
+	net-wireless/gnuradio:=
 	dev-libs/boost:=
 	net-libs/libiio:=
 	dev-libs/gmp
@@ -39,5 +40,8 @@ DEPEND="${RDEPEND}
 
 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-65-gdbad