gentoo resync : 13.06.2020

4 files changed, 70 insertions, 19 deletions

diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index ad4fed5e84b7..d5240d4f0ee5 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,4 +1,6 @@
-DIST gr-iqbal-0.37.2.tar.xz 71340 BLAKE2B 1605c520a7ff0088a24ea79e181b36261cdf849438aa3ef4a499228a372297017d3bbc4c96279f9b1bceb7b690aa7b6081b6e970a337e03c766dab5149fff199 SHA512 00037a535219ebe3b5244d4a09355cc74bf17aa6a935bff135e9d7c7c7f6bc1c8b7a29edc02132dbacda2c41efa3613c09e6fdc222472e58d88c4c076736842e
-EBUILD gr-iqbal-0.37.2.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
-EBUILD gr-iqbal-9999.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
+DIST gr-iqbal-0.37.3.tar.gz 105924 BLAKE2B 25eddc718e2b6d5c679a0d6f199d9d49ff69b535502bf9449d7561ae8c172014a5058cee7ef692a36ec518408747d63d01a23c963f45a5d4b5f58175c49f5bbc SHA512 04ac24e2cc8ebf458088e4d8b005818d3f2496fdc801779dc276c21ee751520039078d5157022a886494f8d62b586d69c703e83fb0539e775ce95e3ca34cf374
+DIST gr-iqbal-0.38.1.tar.gz 106392 BLAKE2B 009f36dcf34127e80d8afa91196906a2b2dc8696dd16f9e7d6d9011d9baf2e4c2dfac78eb1acabcbe52dd88ce08b15f8da407b141585f2c60fd63549218576e0 SHA512 b2f74bba560478b746ad1b11d70202fa2d396462f4806918379543fc69a915346745b34f9ffb2914091ec677295f6f378a5b22641c26aa37c5e23092623b5cee
+EBUILD gr-iqbal-0.37.3.ebuild 708 BLAKE2B b02d0481770d6b05038a0eec9b5f69bcb02866e6436229f523cc204faace02ba17f0350e3ecff4d3827d3a10e6d3ada25a7fb16523f81ef268ec29df5002f2fe SHA512 d93be823cf734ce2a96aa0fe7ea4a25dc590c1fd90f5320caf340b9dfda90c2da1108d5b0195dd6ea3a949ca1d38b194ab32f60d6fb65147ef158d9dbf6cf1e1
+EBUILD gr-iqbal-0.38.1.ebuild 912 BLAKE2B 17d764c21c903e23d26cea4865452b10c306201eede2f0c72efa84465711da79bf9c90e9218bf8f716017e0334cb94324b43ed647d45ec16e422517e20c82278 SHA512 73a7ef378432c2b9cc7ecf738fbc3dd8460c07f67ab646b164205253ed09ace59fa06cfba0aa6ecec7c29123b2396ee6e0db79e40f28192bf44fcccc79163dc4
+EBUILD gr-iqbal-9999.ebuild 912 BLAKE2B 17d764c21c903e23d26cea4865452b10c306201eede2f0c72efa84465711da79bf9c90e9218bf8f716017e0334cb94324b43ed647d45ec16e422517e20c82278 SHA512 73a7ef378432c2b9cc7ecf738fbc3dd8460c07f67ab646b164205253ed09ace59fa06cfba0aa6ecec7c29123b2396ee6e0db79e40f28192bf44fcccc79163dc4
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
index 1ed8501d81d5..c1920c8ed5ed 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -11,11 +11,9 @@ HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/gr-iqbal"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
 else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -23,9 +21,9 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
new file mode 100644
index 000000000000..716aaa6176fc
--- /dev/null
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8})
+
+inherit cmake-utils 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 ~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-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index 1ed8501d81d5..716aaa6176fc 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8})
 
 inherit cmake-utils python-single-r1
 
@@ -11,21 +11,31 @@ HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/gr-iqbal"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
 else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE=""
+IUSE="doc"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+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}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN="$(usex doc)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}