1 |
commit: 189ac42416a5d82a21b15ebeae36d78b4973caf7 |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 30 03:12:13 2020 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 1 20:43:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189ac424 |
7 |
|
8 |
net-wireless/gr-ieee802154: bump |
9 |
|
10 |
prep for gr3.8 |
11 |
|
12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
13 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
14 |
|
15 |
net-wireless/gr-ieee802154/Manifest | 3 ++- |
16 |
...0180402.ebuild => gr-ieee802154-0.0_p20190606.ebuild} | 14 ++++++++------ |
17 |
...0180402.ebuild => gr-ieee802154-0.0_p20191006.ebuild} | 16 +++++++++------- |
18 |
net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild | 16 +++++++++------- |
19 |
4 files changed, 28 insertions(+), 21 deletions(-) |
20 |
|
21 |
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest |
22 |
index 1419ea0abdf..7cf49226bdd 100644 |
23 |
--- a/net-wireless/gr-ieee802154/Manifest |
24 |
+++ b/net-wireless/gr-ieee802154/Manifest |
25 |
@@ -1 +1,2 @@ |
26 |
-DIST gr-ieee802154-0.0_p20180402.tar.gz 195464 BLAKE2B 391bd4eefb5a90135a084a94c2edd83e6f2c2bd6dca26be4d9a54448382d5ee463e1740c305e9583be0107b424c67e74fac84ece147844e7c2a63f6096c7dd36 SHA512 90f164bdcd636dee68a49fe844901ca73e1f743fdeacd8019edddc57c681ec3d1fcfe209d8abd89e2013c2c2c436b7992fe0b0dbe9c88c04352aebc0813a9d96 |
27 |
+DIST gr-ieee802154-0.0_p20190606.tar.gz 195541 BLAKE2B f565808788c463816633774362be0bf6e6900db52051ef4f8e2eed5b110c7b9edcf05458f8a4a8e3afef59c4a76101a5606ea9c9023ad922162ee9466cc7e343 SHA512 b430ee6c16356307566619cd50258c3fd05ca198a67f0b47eea6b8d1038de6cc070823dd7392a56c4308cd74495802b4b52a4a425ce43ce4afb56386ec5fa39a |
28 |
+DIST gr-ieee802154-0.0_p20191006.tar.gz 94443 BLAKE2B f561b401b97741e6a06d36b97be765f66778002c6ea7814ffcc08e7aa93d6236705a25c1f32d536d3e2d2193b92608cdd469ba086f459f0f8290c74f52297d6a SHA512 1c552cfe3739165382c36aeb8f556b17ee7925459d74c96d36a7b1f821e177860ddab601c87184cd33db9c97d1231edeb4267bbfbf9df198708db692e27a1a86 |
29 |
|
30 |
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild |
31 |
similarity index 80% |
32 |
copy from net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild |
33 |
copy to net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild |
34 |
index e99620f1b2a..89e8afbf67b 100644 |
35 |
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild |
36 |
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild |
37 |
@@ -1,7 +1,7 @@ |
38 |
# Copyright 1999-2020 Gentoo Authors |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
|
41 |
-EAPI=6 |
42 |
+EAPI=7 |
43 |
PYTHON_COMPAT=( python2_7 ) |
44 |
|
45 |
inherit cmake-utils python-single-r1 |
46 |
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then |
47 |
EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git" |
48 |
KEYWORDS="" |
49 |
else |
50 |
- COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569" |
51 |
+ COMMIT="d3d94023c71af9e6d7721f7412fba88ff5325234" |
52 |
SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
53 |
S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}" |
54 |
KEYWORDS="~amd64 ~x86" |
55 |
@@ -23,15 +23,13 @@ fi |
56 |
LICENSE="GPL-3" |
57 |
SLOT="0/${PV}" |
58 |
|
59 |
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}] |
60 |
+RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}] |
61 |
$(python_gen_cond_dep ' |
62 |
dev-libs/boost:=[${PYTHON_MULTI_USEDEP}] |
63 |
') |
64 |
${PYTHON_DEPS}" |
65 |
DEPEND="${RDEPEND} |
66 |
dev-lang/swig:0" |
67 |
-#cppunit is listed in cmake, but only needed for tests and there are no tests |
68 |
-# dev-util/cppunit" |
69 |
|
70 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
71 |
|
72 |
@@ -40,10 +38,14 @@ src_prepare() { |
73 |
sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt |
74 |
sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt |
75 |
sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt |
76 |
+ sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt |
77 |
cmake-utils_src_prepare |
78 |
} |
79 |
|
80 |
src_configure() { |
81 |
- mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
82 |
+ mycmakeargs=( |
83 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
84 |
+ -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" |
85 |
+ ) |
86 |
cmake-utils_src_configure |
87 |
} |
88 |
|
89 |
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild |
90 |
similarity index 77% |
91 |
rename from net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild |
92 |
rename to net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild |
93 |
index e99620f1b2a..f398a0ebda3 100644 |
94 |
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild |
95 |
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild |
96 |
@@ -1,8 +1,8 @@ |
97 |
# Copyright 1999-2020 Gentoo Authors |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
|
100 |
-EAPI=6 |
101 |
-PYTHON_COMPAT=( python2_7 ) |
102 |
+EAPI=7 |
103 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
104 |
|
105 |
inherit cmake-utils python-single-r1 |
106 |
|
107 |
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then |
108 |
EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git" |
109 |
KEYWORDS="" |
110 |
else |
111 |
- COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569" |
112 |
+ COMMIT="a3c79af96e18de3eb3a76659e1669a370efccf17" |
113 |
SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
114 |
S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}" |
115 |
KEYWORDS="~amd64 ~x86" |
116 |
@@ -23,15 +23,13 @@ fi |
117 |
LICENSE="GPL-3" |
118 |
SLOT="0/${PV}" |
119 |
|
120 |
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}] |
121 |
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] |
122 |
$(python_gen_cond_dep ' |
123 |
dev-libs/boost:=[${PYTHON_MULTI_USEDEP}] |
124 |
') |
125 |
${PYTHON_DEPS}" |
126 |
DEPEND="${RDEPEND} |
127 |
dev-lang/swig:0" |
128 |
-#cppunit is listed in cmake, but only needed for tests and there are no tests |
129 |
-# dev-util/cppunit" |
130 |
|
131 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
132 |
|
133 |
@@ -40,10 +38,14 @@ src_prepare() { |
134 |
sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt |
135 |
sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt |
136 |
sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt |
137 |
+ sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt |
138 |
cmake-utils_src_prepare |
139 |
} |
140 |
|
141 |
src_configure() { |
142 |
- mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
143 |
+ mycmakeargs=( |
144 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
145 |
+ -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" |
146 |
+ ) |
147 |
cmake-utils_src_configure |
148 |
} |
149 |
|
150 |
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild |
151 |
index e99620f1b2a..f398a0ebda3 100644 |
152 |
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild |
153 |
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild |
154 |
@@ -1,8 +1,8 @@ |
155 |
# Copyright 1999-2020 Gentoo Authors |
156 |
# Distributed under the terms of the GNU General Public License v2 |
157 |
|
158 |
-EAPI=6 |
159 |
-PYTHON_COMPAT=( python2_7 ) |
160 |
+EAPI=7 |
161 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
162 |
|
163 |
inherit cmake-utils python-single-r1 |
164 |
|
165 |
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then |
166 |
EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git" |
167 |
KEYWORDS="" |
168 |
else |
169 |
- COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569" |
170 |
+ COMMIT="a3c79af96e18de3eb3a76659e1669a370efccf17" |
171 |
SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
172 |
S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}" |
173 |
KEYWORDS="~amd64 ~x86" |
174 |
@@ -23,15 +23,13 @@ fi |
175 |
LICENSE="GPL-3" |
176 |
SLOT="0/${PV}" |
177 |
|
178 |
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}] |
179 |
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] |
180 |
$(python_gen_cond_dep ' |
181 |
dev-libs/boost:=[${PYTHON_MULTI_USEDEP}] |
182 |
') |
183 |
${PYTHON_DEPS}" |
184 |
DEPEND="${RDEPEND} |
185 |
dev-lang/swig:0" |
186 |
-#cppunit is listed in cmake, but only needed for tests and there are no tests |
187 |
-# dev-util/cppunit" |
188 |
|
189 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
190 |
|
191 |
@@ -40,10 +38,14 @@ src_prepare() { |
192 |
sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt |
193 |
sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt |
194 |
sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt |
195 |
+ sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt |
196 |
cmake-utils_src_prepare |
197 |
} |
198 |
|
199 |
src_configure() { |
200 |
- mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
201 |
+ mycmakeargs=( |
202 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
203 |
+ -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" |
204 |
+ ) |
205 |
cmake-utils_src_configure |
206 |
} |