gentoo auto-resync : 22:11:2022 - 19:06:54

4 files changed, 15 insertions, 51 deletions

diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index 1729c04c4a16..c8c7c9fdb92d 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,6 +1,4 @@
-DIST gr-iqbal-0.38.2.tar.gz 106408 BLAKE2B 8c9eb0880f527708cb304d9b70d0ab46c1f430aecf520366f85f3b74e1e1e2b612360cebc0dc9d6431f42adf2602baaaf1ebbe3b58ad08791d30f9604c96fd6c SHA512 39ca96769c3d7910c6ca7da973fdfbab816b45ec339adb5bbf32d07d2e967fb3e7265e907f9abbdf4e2b754dc03e9eac970c0cef3df4f07470ec4ba947900cb6
 DIST gr-iqbal-0.38.2_p20210108.tar.gz 84577 BLAKE2B f12ab4965e5f896698843c9ef8907cd8263f6fba3365ea26420750ab221106a3fbbee6750cf587299a9528cecbb504c23d4f2085596683cb85eb6f6fb7ab814b SHA512 b9866f6ff3d6dba1e94428efed029356e436059fa1d6cb7f4c3da0b37842c025161f1532da6048c9b9cc5ce426eea14622ac6680176cff52f85bc0b2fda8c698
-EBUILD gr-iqbal-0.38.2.ebuild 872 BLAKE2B 0637daabebc2441668308038a6dba79bd8fe84c21c6da980ceea0232926bcdc21bbee901aece27780bbef1e36dc0b666110254f13e7c0ea3c9a5e737ebeea8d8 SHA512 7b821312faa706061cdbbd7ad290ce0c695599b272f42f2ba0552b1666e1ee16e9eac82d018172c7ca3281c55429ddf69bc4bb37dc7764492430267eb6f4ead0
 EBUILD gr-iqbal-0.38.2_p20210108.ebuild 1081 BLAKE2B 7fdf72355f2fa25edaea0bf4238695d15c4dca5633635a2fda49cf3b8f62c24c0d9e0e2980d5fffa3cdeecbfe911942f49baf365e8ecf8d21e290e93194d6842 SHA512 598ac20ce07d65d0130cf05b96fd513e689b3d191332ecd0cb7d861517e3c70d655d9f3127f66f5dbefc045f4f29c73b7ef7a491dc958572a4a86dfaf54b9322
-EBUILD gr-iqbal-9999.ebuild 872 BLAKE2B 0637daabebc2441668308038a6dba79bd8fe84c21c6da980ceea0232926bcdc21bbee901aece27780bbef1e36dc0b666110254f13e7c0ea3c9a5e737ebeea8d8 SHA512 7b821312faa706061cdbbd7ad290ce0c695599b272f42f2ba0552b1666e1ee16e9eac82d018172c7ca3281c55429ddf69bc4bb37dc7764492430267eb6f4ead0
-MISC metadata.xml 335 BLAKE2B 4a59f01a0e3aaf3293297ab368ff1438eb9d5e5bae3edfbbb1dd9f7191ccb47e9c504fa318a1a54752bbcf507f33c96d8808343f6f77a7de7a8c1fe1d84146ac SHA512 443b02d3f3aa162d3a176ffd081f6e0ff3bdd3276b48b817a03da2f43ab360b2db99add599f501ba1efcb47a12b30cf64587c5d307dc9c3583b46265150ba2d3
+EBUILD gr-iqbal-9999.ebuild 1081 BLAKE2B 7fdf72355f2fa25edaea0bf4238695d15c4dca5633635a2fda49cf3b8f62c24c0d9e0e2980d5fffa3cdeecbfe911942f49baf365e8ecf8d21e290e93194d6842 SHA512 598ac20ce07d65d0130cf05b96fd513e689b3d191332ecd0cb7d861517e3c70d655d9f3127f66f5dbefc045f4f29c73b7ef7a491dc958572a4a86dfaf54b9322
+MISC metadata.xml 417 BLAKE2B 1142ad22c64b0df721d39cb53e52c142d4988dbe625040b891d70726be8e5b9c3340424a8be2254d094352a4727d9b7a01d9fb9739244023baeec20b83d03027 SHA512 6ae068dc92865182fcffda23a5bbd58032fe0d8d944a0c53de8119b89e9f570aeb1660897514cbf35771c4829e8ea1add820f4a6e463315a3963854fbbce6fe5
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild
deleted file mode 100644
index ae04e944ba3b..000000000000
--- a/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="gnuradio I/Q balancing"
-HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
-else
-	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
-	net-libs/libosmo-dsp:=
-	dev-libs/boost:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOXYGEN="$(usex doc)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-}
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index ae04e944ba3b..b13d37508ebc 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -13,7 +13,9 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
 else
-	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	COMMIT="fbee239a6fb36dd2fb564f6e6a0d393c4bc844db"
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
@@ -22,7 +24,7 @@ SLOT="0/${PV}"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.9.0.0:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
@@ -37,5 +39,7 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
+	find  "${D}" -name '__init__.py[co]' -delete || die
 	python_optimize
+	mv "${ED}/usr/share/doc/gr-iqbalance" "${ED}/usr/share/doc/${P}"
 }
diff --git a/net-wireless/gr-iqbal/metadata.xml b/net-wireless/gr-iqbal/metadata.xml
index a8b192c43911..aedc4e1d37ae 100644
--- a/net-wireless/gr-iqbal/metadata.xml
+++ b/net-wireless/gr-iqbal/metadata.xml
@@ -2,11 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
+	<email>zerochaos@gentoo.org</email>
+	<name>Rick Farina</name>
 </maintainer>
 <maintainer type="project">
-<email>radio@gentoo.org</email>
-<name>Radio</name>
+	<email>radio@gentoo.org</email>
+	<name>Radio</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">osmocom/gr-iqbal</remote-id>
+</upstream>
 </pkgmetadata>