1 |
commit: 24ecb374615b6a96175a1209f0d845bb3d34576c |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 1 15:36:08 2022 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 1 15:50:20 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ecb374 |
7 |
|
8 |
net-wireless/gr-iio: bump to latest snapshot |
9 |
|
10 |
Mostly deprecate in favor of gnuradio[iio] |
11 |
|
12 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
13 |
|
14 |
net-wireless/gr-iio/Manifest | 2 +- |
15 |
...iio-0.3_p20191219-r2.ebuild => gr-iio-0.3_p20210726.ebuild} | 10 +++++++--- |
16 |
net-wireless/gr-iio/gr-iio-9999.ebuild | 10 +++++++--- |
17 |
3 files changed, 15 insertions(+), 7 deletions(-) |
18 |
|
19 |
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest |
20 |
index cd98bcee556d..9fdff3854352 100644 |
21 |
--- a/net-wireless/gr-iio/Manifest |
22 |
+++ b/net-wireless/gr-iio/Manifest |
23 |
@@ -1 +1 @@ |
24 |
-DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c |
25 |
+DIST gr-iio-0.3_p20210726.tar.gz 67948 BLAKE2B 59d72f5fb31f5166ba7eb58f6bb50fe91f1edfc0c6fbff5f2d55e3768bc70504c15d32555695f65a9356d7a10a9d4549829896bc3062e9e3992d1f8072114751 SHA512 6c8316e6d3c2711256e1463dc1b5ec00e16366069d33d26e6c502e206459be4c76cbf2aa93fa8c54b7766e06b15efdcbc41a83cc72862cdd3c5ce83d0159385e |
26 |
|
27 |
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20210726.ebuild |
28 |
similarity index 73% |
29 |
rename from net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild |
30 |
rename to net-wireless/gr-iio/gr-iio-0.3_p20210726.ebuild |
31 |
index ded3f63256e6..e36aba5be25f 100644 |
32 |
--- a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild |
33 |
+++ b/net-wireless/gr-iio/gr-iio-0.3_p20210726.ebuild |
34 |
@@ -3,7 +3,7 @@ |
35 |
|
36 |
EAPI=8 |
37 |
|
38 |
-PYTHON_COMPAT=( python3_{7,8,9,10} ) |
39 |
+PYTHON_COMPAT=( python3_{9,10} ) |
40 |
|
41 |
inherit cmake python-single-r1 |
42 |
|
43 |
@@ -14,7 +14,7 @@ if [ "${PV}" = "9999" ]; then |
44 |
EGIT_BRANCH="upgrade-3.8" |
45 |
inherit git-r3 |
46 |
else |
47 |
- COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb" |
48 |
+ COMMIT="407865f89b92daa89fec5c2b3c0e44bb422ef9d3" |
49 |
SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
50 |
S="${WORKDIR}/${PN}-${COMMIT}" |
51 |
KEYWORDS="~amd64 ~riscv ~x86" |
52 |
@@ -24,7 +24,8 @@ SLOT="0" |
53 |
REQUIRED_USE=${PYTHON_REQUIRED_USE} |
54 |
|
55 |
RDEPEND="${PYTHON_DEPS} |
56 |
- =net-wireless/gnuradio-3.8*:= |
57 |
+ !net-wireless/gnuradio[iio(-)] |
58 |
+ net-wireless/gnuradio:= |
59 |
dev-libs/boost:= |
60 |
net-libs/libiio:= |
61 |
dev-libs/gmp |
62 |
@@ -39,5 +40,8 @@ DEPEND="${RDEPEND} |
63 |
|
64 |
src_install() { |
65 |
cmake_src_install |
66 |
+ # Remove stray python files generated by the build system |
67 |
+ find "${ED}" -name '*.pyc' -exec rm -f {} \; || die |
68 |
+ find "${ED}" -name '*.pyo' -exec rm -f {} \; || die |
69 |
python_optimize |
70 |
} |
71 |
|
72 |
diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild |
73 |
index ded3f63256e6..e36aba5be25f 100644 |
74 |
--- a/net-wireless/gr-iio/gr-iio-9999.ebuild |
75 |
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild |
76 |
@@ -3,7 +3,7 @@ |
77 |
|
78 |
EAPI=8 |
79 |
|
80 |
-PYTHON_COMPAT=( python3_{7,8,9,10} ) |
81 |
+PYTHON_COMPAT=( python3_{9,10} ) |
82 |
|
83 |
inherit cmake python-single-r1 |
84 |
|
85 |
@@ -14,7 +14,7 @@ if [ "${PV}" = "9999" ]; then |
86 |
EGIT_BRANCH="upgrade-3.8" |
87 |
inherit git-r3 |
88 |
else |
89 |
- COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb" |
90 |
+ COMMIT="407865f89b92daa89fec5c2b3c0e44bb422ef9d3" |
91 |
SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
92 |
S="${WORKDIR}/${PN}-${COMMIT}" |
93 |
KEYWORDS="~amd64 ~riscv ~x86" |
94 |
@@ -24,7 +24,8 @@ SLOT="0" |
95 |
REQUIRED_USE=${PYTHON_REQUIRED_USE} |
96 |
|
97 |
RDEPEND="${PYTHON_DEPS} |
98 |
- =net-wireless/gnuradio-3.8*:= |
99 |
+ !net-wireless/gnuradio[iio(-)] |
100 |
+ net-wireless/gnuradio:= |
101 |
dev-libs/boost:= |
102 |
net-libs/libiio:= |
103 |
dev-libs/gmp |
104 |
@@ -39,5 +40,8 @@ DEPEND="${RDEPEND} |
105 |
|
106 |
src_install() { |
107 |
cmake_src_install |
108 |
+ # Remove stray python files generated by the build system |
109 |
+ find "${ED}" -name '*.pyc' -exec rm -f {} \; || die |
110 |
+ find "${ED}" -name '*.pyo' -exec rm -f {} \; || die |
111 |
python_optimize |
112 |
} |