Gentoo Archives: gentoo-commits

From: Rick Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-iio/
Date: Mon, 01 Jun 2020 20:46:04
Message-Id: 1591044337.d082d078a21831a3bc1cbcbef1ac686f059611b9.zerochaos@gentoo
1 commit: d082d078a21831a3bc1cbcbef1ac686f059611b9
2 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 1 01:35:03 2020 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 1 20:45:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d082d078
7
8 Revert "net-wireless/gr-iio: bump for gr3.8"
9
10 This reverts commit 77c45f0c98e63cc1f3df46177f04bcb7b8700933.
11 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
12
13 net-wireless/gr-iio/Manifest | 2 +-
14 .../{gr-iio-0.3_p20191029.ebuild => gr-iio-0.3-r2.ebuild} | 12 +++++-------
15 net-wireless/gr-iio/gr-iio-9999.ebuild | 12 +++++-------
16 3 files changed, 11 insertions(+), 15 deletions(-)
17
18 diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
19 index a61f0b9ed9a..df074d7140a 100644
20 --- a/net-wireless/gr-iio/Manifest
21 +++ b/net-wireless/gr-iio/Manifest
22 @@ -1 +1 @@
23 -DIST gr-iio-0.3_p20191029.tar.gz 68968 BLAKE2B f7d0a0d79091153e7d91614828b751d70791d55f8a4d4dfe5b09c181c42ca9362452d82fca7fbbbce30c3fa1b0024d52cea630408b3ca4495486a65a8454148c SHA512 636ce9ccc92ee46c9be96aa720cf8fa19889bf3b0c809b0d5726cb199df4b28c7fa95ec5316ccd2c2b933f4b26ffaa519d833199da7b43f04e510dd47228e7df
24 +DIST gr-iio-0.3.tar.gz 55090 BLAKE2B 3c89567a921e79261434eefb0706a53e10553aaecd4b6f913e3cadd8714b1d5a089b0ff0d66e9815825d57e21050a4a726a3d095eacda634f8434ab6e4726224 SHA512 2618790f5e1a56af2bcb045871f27d8d5ef37c8708e84dd413ce8e5094bb72d59f7b37798ab0c3ab0bc56d70baeb77bae26f5e1125e1a2d251396e84ea6cde02
25
26 diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191029.ebuild b/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
27 similarity index 67%
28 rename from net-wireless/gr-iio/gr-iio-0.3_p20191029.ebuild
29 rename to net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
30 index 3ebe5b6600a..ed62ac0d968 100644
31 --- a/net-wireless/gr-iio/gr-iio-0.3_p20191029.ebuild
32 +++ b/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
33 @@ -1,9 +1,9 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 +# Copyright 1999-2019 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 -EAPI=7
39 +EAPI=6
40
41 -PYTHON_COMPAT=( python3_{6,7,8} )
42 +PYTHON_COMPAT=( python2_7 )
43
44 inherit cmake-utils python-single-r1
45
46 @@ -14,9 +14,7 @@ if [ "${PV}" = "9999" ]; then
47 inherit git-r3
48 KEYWORDS=""
49 else
50 - COMMIT="8196f3de5b2fdf384801748166cc4ad86a4a9338"
51 - SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
52 - S="${WORKDIR}/${PN}-${COMMIT}"
53 + SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
54 KEYWORDS="~amd64 ~x86"
55 fi
56 LICENSE="GPL-3+"
57 @@ -24,7 +22,7 @@ SLOT="0"
58 REQUIRED_USE=${PYTHON_REQUIRED_USE}
59
60 RDEPEND="${PYTHON_DEPS}
61 - =net-wireless/gnuradio-3.8*:=
62 + >=net-wireless/gnuradio-3.7.0:=
63 dev-libs/boost:=
64 net-libs/libiio:=
65 net-libs/libad9361-iio:="
66
67 diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild
68 index 3ebe5b6600a..ed62ac0d968 100644
69 --- a/net-wireless/gr-iio/gr-iio-9999.ebuild
70 +++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
71 @@ -1,9 +1,9 @@
72 -# Copyright 1999-2020 Gentoo Authors
73 +# Copyright 1999-2019 Gentoo Authors
74 # Distributed under the terms of the GNU General Public License v2
75
76 -EAPI=7
77 +EAPI=6
78
79 -PYTHON_COMPAT=( python3_{6,7,8} )
80 +PYTHON_COMPAT=( python2_7 )
81
82 inherit cmake-utils python-single-r1
83
84 @@ -14,9 +14,7 @@ if [ "${PV}" = "9999" ]; then
85 inherit git-r3
86 KEYWORDS=""
87 else
88 - COMMIT="8196f3de5b2fdf384801748166cc4ad86a4a9338"
89 - SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
90 - S="${WORKDIR}/${PN}-${COMMIT}"
91 + SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
92 KEYWORDS="~amd64 ~x86"
93 fi
94 LICENSE="GPL-3+"
95 @@ -24,7 +22,7 @@ SLOT="0"
96 REQUIRED_USE=${PYTHON_REQUIRED_USE}
97
98 RDEPEND="${PYTHON_DEPS}
99 - =net-wireless/gnuradio-3.8*:=
100 + >=net-wireless/gnuradio-3.7.0:=
101 dev-libs/boost:=
102 net-libs/libiio:=
103 net-libs/libad9361-iio:="