commit: d082d078a21831a3bc1cbcbef1ac686f059611b9
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 1 01:35:03 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun 1 20:45:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d082d078
Revert "net-wireless/gr-iio: bump for gr3.8"
This reverts commit 77c45f0c98e63cc1f3df46177f04bcb7b8700933.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/gr-iio/Manifest | 2 +-
.../{gr-iio-0.3_p20191029.ebuild => gr-iio-0.3-r2.ebuild} | 12 +++++-------
net-wireless/gr-iio/gr-iio-9999.ebuild | 12 +++++-------
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index a61f0b9ed9a..df074d7140a 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1 +1 @@
-DIST gr-iio-0.3_p20191029.tar.gz 68968 BLAKE2B
f7d0a0d79091153e7d91614828b751d70791d55f8a4d4dfe5b09c181c42ca9362452d82fca7fbbbce30c3fa1b0024d52cea630408b3ca4495486a65a8454148c
SHA512
636ce9ccc92ee46c9be96aa720cf8fa19889bf3b0c809b0d5726cb199df4b28c7fa95ec5316ccd2c2b933f4b26ffaa519d833199da7b43f04e510dd47228e7df
+DIST gr-iio-0.3.tar.gz 55090 BLAKE2B
3c89567a921e79261434eefb0706a53e10553aaecd4b6f913e3cadd8714b1d5a089b0ff0d66e9815825d57e21050a4a726a3d095eacda634f8434ab6e4726224
SHA512
2618790f5e1a56af2bcb045871f27d8d5ef37c8708e84dd413ce8e5094bb72d59f7b37798ab0c3ab0bc56d70baeb77bae26f5e1125e1a2d251396e84ea6cde02
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191029.ebuild
b/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
similarity index 67%
rename from net-wireless/gr-iio/gr-iio-0.3_p20191029.ebuild
rename to net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
index 3ebe5b6600a..ed62ac0d968 100644
--- a/net-wireless/gr-iio/gr-iio-0.3_p20191029.ebuild
+++ b/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 )
inherit cmake-utils python-single-r1
@@ -14,9 +14,7 @@ if [ "${PV}" = "9999" ]; then
inherit git-r3
KEYWORDS=""
else
- COMMIT="8196f3de5b2fdf384801748166cc4ad86a4a9338"
-
SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${PN}-${COMMIT}"
+
SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-3+"
@@ -24,7 +22,7 @@ SLOT="0"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="${PYTHON_DEPS}
- =net-wireless/gnuradio-3.8*:=
+ >=net-wireless/gnuradio-3.7.0:=
dev-libs/boost:=
net-libs/libiio:=
net-libs/libad9361-iio:="
diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild
b/net-wireless/gr-iio/gr-iio-9999.ebuild
index 3ebe5b6600a..ed62ac0d968 100644
--- a/net-wireless/gr-iio/gr-iio-9999.ebuild
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 )
inherit cmake-utils python-single-r1
@@ -14,9 +14,7 @@ if [ "${PV}" = "9999" ]; then
inherit git-r3
KEYWORDS=""
else
- COMMIT="8196f3de5b2fdf384801748166cc4ad86a4a9338"
-
SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${PN}-${COMMIT}"
+
SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-3+"
@@ -24,7 +22,7 @@ SLOT="0"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="${PYTHON_DEPS}
- =net-wireless/gnuradio-3.8*:=
+ >=net-wireless/gnuradio-3.7.0:=
dev-libs/boost:=
net-libs/libiio:=
net-libs/libad9361-iio:="
