gentoo resync : 13.06.2020

4 files changed, 67 insertions, 11 deletions

diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index b54aa8912b65..69cebe5eca97 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1,4 +1,6 @@
 DIST gr-iio-0.3.tar.gz 55090 BLAKE2B 3c89567a921e79261434eefb0706a53e10553aaecd4b6f913e3cadd8714b1d5a089b0ff0d66e9815825d57e21050a4a726a3d095eacda634f8434ab6e4726224 SHA512 2618790f5e1a56af2bcb045871f27d8d5ef37c8708e84dd413ce8e5094bb72d59f7b37798ab0c3ab0bc56d70baeb77bae26f5e1125e1a2d251396e84ea6cde02
-EBUILD gr-iio-0.3-r2.ebuild 789 BLAKE2B 3bfd3e8b59f16c7c68840a1fcb4741ff29e1d48e08d1ceb0f39b9f9f8ca7dcf201cceeedad2b935d2c5c4bd8516e6363a3faee350150dbc541fc014d01b556b2 SHA512 e33665008b48fc3473516ccc5682f309de134e2e3f7d76842931fbdf52990ee532fb6dbbc0c9f702f749828ade080eaedd90612e5ba8630f0c269b81b8cae50e
-EBUILD gr-iio-9999.ebuild 789 BLAKE2B 3bfd3e8b59f16c7c68840a1fcb4741ff29e1d48e08d1ceb0f39b9f9f8ca7dcf201cceeedad2b935d2c5c4bd8516e6363a3faee350150dbc541fc014d01b556b2 SHA512 e33665008b48fc3473516ccc5682f309de134e2e3f7d76842931fbdf52990ee532fb6dbbc0c9f702f749828ade080eaedd90612e5ba8630f0c269b81b8cae50e
+DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c
+EBUILD gr-iio-0.3-r3.ebuild 787 BLAKE2B 09d0be1cc71419bd6860607576addfde2c65eff09cc7f60182467dcee686d6a044fe033a653b1db27971d68eee94a6ba7c4f6f7827ecc08191798a0f50a89938 SHA512 688f3b54237474f15eaa535b37025c0173cfd5034d78ef30524634700182a464f35f6c3805bf03cbc2de693a3dc0a902e475b61cc3c3894685fd4af7fb1d24ef
+EBUILD gr-iio-0.3_p20191219-r1.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
+EBUILD gr-iio-9999.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
 MISC metadata.xml 434 BLAKE2B 565c3b42597436890ea7bc2d5b13d16720480e8932878c73bc3efe0708ca6ad2e900b7595248dfc0e25fbca17ad3f216bdfc02c0f29519013db5ac8137a09a7c SHA512 1e970d2cfc935f25ad3cde099739a9574c8bcae6a4e8c59d7aba6bd01319155d9bfc80124d2dad649f24aa7a937bdad7cc843525282f72b10e5e999eca7a4f49
diff --git a/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild b/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
index ed62ac0d9684..cc5dd36528ff 100644
--- a/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
+++ b/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -22,7 +22,7 @@ SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:=
+	=net-wireless/gnuradio-3.7*:=
 	dev-libs/boost:=
 	net-libs/libiio:=
 	net-libs/libad9361-iio:="
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
new file mode 100644
index 000000000000..b86aad9b816d
--- /dev/null
+++ b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
@@ -0,0 +1,44 @@
+# 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 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
+	KEYWORDS=""
+else
+	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
+	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~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-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild
index ed62ac0d9684..b86aad9b816d 100644
--- a/net-wireless/gr-iio/gr-iio-9999.ebuild
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils python-single-r1
+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
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
+	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="GPL-3+"
@@ -22,9 +25,11 @@ SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:=
+	=net-wireless/gnuradio-3.8*:=
 	dev-libs/boost:=
 	net-libs/libiio:=
+	dev-libs/gmp
+	sci-libs/volk
 	net-libs/libad9361-iio:="
 
 DEPEND="${RDEPEND}
@@ -32,3 +37,8 @@ DEPEND="${RDEPEND}
 	sys-devel/bison:=
 	dev-util/cppunit:=
 	dev-lang/swig:0"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}