Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/
Date: Fri, 07 Jan 2022 13:10:25
Message-Id: 1641560880.e419be9a500ea464bca682557f538e1ef9a7007d.bkohler@gentoo
1 commit: e419be9a500ea464bca682557f538e1ef9a7007d
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 7 13:02:33 2022 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 7 13:08:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e419be9a
7
8 net-wireless/iwd: drop old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
12
13 net-wireless/iwd/Manifest | 2 -
14 net-wireless/iwd/iwd-1.18.ebuild | 185 ---------------------------------------
15 net-wireless/iwd/iwd-1.19.ebuild | 182 --------------------------------------
16 3 files changed, 369 deletions(-)
17
18 diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
19 index 76feeaf21d9a..2c35e3033a4f 100644
20 --- a/net-wireless/iwd/Manifest
21 +++ b/net-wireless/iwd/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST iwd-1.18.tar.xz 961392 BLAKE2B 3c7b0a7996590435d8f8033ab0b6283b2860409064c8617eda51ecbd73102134bbced66bb4e1323b64563e21d52beaa7f88ae5168747a5a2a38355e266f9c3a4 SHA512 85c3e16bb8eb8e564072fab66b30d1636c853706546fcb35723b4b3339bcf969f08ca07bcd458521f044f407513f5d793724b316af4b7819def8400ed88f0d3b
24 -DIST iwd-1.19.tar.xz 972652 BLAKE2B ff93a1e26ad6afd90d1c92865e2c26c0722b5f1e0a8bba73c37569b0dfac2923e68ab4459dc83dff1bd14364f473b531f967466a2cd70b258ee13c45ce1eb03a SHA512 67544433107ff95ccfc39853a65348c5602495532a40ff6dce3c0e5dc492aa2a6cce281db9b8a1e9f2a1e5c2e712b8adce0b088d340605c9947aa6fe859fa87d
25 DIST iwd-1.20.tar.xz 973964 BLAKE2B 750368aec999b988aaaed34454a1a15a75fa9c37ce4523715156c1bc89e343aad62c0d0f0ef5f798a75b19a271175f05517e641f3e2a6e502d932da8e1cfff63 SHA512 1a272492d101bd6ec22df16d98895ce03aa8470b35a7b3c36e5431239e519f74fae81f8bee25e52ce7705459b42e37298778f671a39e98787ddb1b9881521847
26 DIST iwd-1.21.tar.xz 994644 BLAKE2B d8a12463f4f6e4b5f1840625b723fbffdd67df12092a9f945240751e40af7cf1d6cab4cba2e97f4fa628f902354bf76921238107c630c9fc4b35f451ccb7456c SHA512 420e4c1f9a7a0a11f6dedff5213d4b80671747ea3d24c4d492a843e3dd9813727127f4f0930588849d4aa6e6e1ca8f8434f0b07be7da50fdd0b2ab4156725389
27
28 diff --git a/net-wireless/iwd/iwd-1.18.ebuild b/net-wireless/iwd/iwd-1.18.ebuild
29 deleted file mode 100644
30 index a80d0e0f25f2..000000000000
31 --- a/net-wireless/iwd/iwd-1.18.ebuild
32 +++ /dev/null
33 @@ -1,185 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -inherit flag-o-matic linux-info systemd
39 -
40 -#Set this variable to the required external ell version
41 -ELL_REQ="0.44"
42 -
43 -if [[ ${PV} == *9999* ]]; then
44 - inherit autotools git-r3
45 - IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
46 - ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
47 -else
48 - SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
49 - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
50 - MYRST2MAN="RST2MAN=:"
51 -fi
52 -
53 -DESCRIPTION="Wireless daemon for linux"
54 -HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
55 -
56 -LICENSE="GPL-2"
57 -SLOT="0"
58 -IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda +monitor ofono standalone systemd wired"
59 -
60 -DEPEND="
61 - sys-apps/dbus
62 - client? ( sys-libs/readline:0= )
63 -"
64 -
65 -[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
66 -
67 -RDEPEND="
68 - ${DEPEND}
69 - net-wireless/wireless-regdb
70 - crda? ( net-wireless/crda )
71 - standalone? (
72 - systemd? ( sys-apps/systemd )
73 - !systemd? ( virtual/resolvconf )
74 - )
75 -"
76 -
77 -BDEPEND="
78 - virtual/pkgconfig
79 -"
80 -
81 -[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
82 -
83 -PATCHES=( "${FILESDIR}"/iwd-1.17-fix-tests.patch )
84 -
85 -pkg_setup() {
86 - CONFIG_CHECK="
87 - ~ASYMMETRIC_KEY_TYPE
88 - ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
89 - ~CFG80211
90 - ~CRYPTO_AES
91 - ~CRYPTO_CBC
92 - ~CRYPTO_CMAC
93 - ~CRYPTO_DES
94 - ~CRYPTO_ECB
95 - ~CRYPTO_HMAC
96 - ~CRYPTO_MD4
97 - ~CRYPTO_MD5
98 - ~CRYPTO_RSA
99 - ~CRYPTO_SHA1
100 - ~CRYPTO_SHA256
101 - ~CRYPTO_SHA512
102 - ~CRYPTO_USER_API_HASH
103 - ~CRYPTO_USER_API_SKCIPHER
104 - ~KEY_DH_OPERATIONS
105 - ~PKCS7_MESSAGE_PARSER
106 - ~RFKILL
107 - ~X509_CERTIFICATE_PARSER
108 - "
109 - if use crda;then
110 - CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
111 - WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
112 - fi
113 -
114 - if use amd64;then
115 - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
116 - WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
117 - fi
118 -
119 - if use cpu_flags_x86_aes;then
120 - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
121 - WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
122 - fi
123 -
124 - if use cpu_flags_x86_ssse3 && use amd64; then
125 - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
126 - WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
127 - WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
128 - WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
129 - fi
130 -
131 - if use kernel_linux && kernel_is -ge 4 20; then
132 - CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
133 - fi
134 -
135 - check_extra_config
136 -
137 - if ! use crda; then
138 - if use kernel_linux && kernel_is -lt 4 15; then
139 - ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
140 - ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
141 - fi
142 - if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
143 - [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
144 - then
145 - ewarn ""
146 - ewarn "REGULATORY DOMAIN PROBLEM:"
147 - ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
148 - ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m"
149 - ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
150 - ewarn ""
151 - fi
152 - fi
153 -}
154 -
155 -src_unpack() {
156 - if [[ ${PV} == *9999* ]] ; then
157 - EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
158 - EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
159 - else
160 - default
161 - fi
162 -}
163 -
164 -src_prepare() {
165 - default
166 - use elibc_musl && eapply "${FILESDIR}"/iwd-1.18-musl-backport.patch
167 - if [[ ${PV} == *9999* ]] ; then
168 - eautoreconf
169 - fi
170 -}
171 -
172 -src_configure() {
173 - append-cflags "-fsigned-char"
174 - local myeconfargs=(
175 - --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
176 - $(use_enable client)
177 - $(use_enable monitor)
178 - $(use_enable ofono)
179 - $(use_enable wired)
180 - --enable-systemd-service
181 - --with-systemd-unitdir="$(systemd_get_systemunitdir)"
182 - --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
183 - --with-systemd-networkdir="$(systemd_get_utildir)/network"
184 - )
185 - [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
186 - econf "${myeconfargs[@]}"
187 -}
188 -
189 -src_compile() {
190 - emake ${MYRST2MAN}
191 -}
192 -
193 -src_install() {
194 - emake DESTDIR="${D}" ${MYRST2MAN} install
195 - keepdir /var/lib/${PN}
196 -
197 - newinitd "${FILESDIR}/iwd.initd-r1" iwd
198 -
199 - if use wired;then
200 - newinitd "${FILESDIR}/ead.initd" ead
201 - fi
202 -
203 - if [[ ${PV} == *9999* ]] ; then
204 - exeinto /usr/share/iwd/scripts/
205 - doexe test/*
206 - fi
207 -
208 - if use standalone ; then
209 - local iwdconf="${ED}/etc/iwd/main.conf"
210 - dodir /etc/iwd
211 - echo "[General]" > "${iwdconf}"
212 - echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
213 - echo "[Network]" >> "${iwdconf}"
214 - echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
215 - dodir /etc/conf.d
216 - echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
217 - fi
218 -}
219
220 diff --git a/net-wireless/iwd/iwd-1.19.ebuild b/net-wireless/iwd/iwd-1.19.ebuild
221 deleted file mode 100644
222 index d91aa706aa87..000000000000
223 --- a/net-wireless/iwd/iwd-1.19.ebuild
224 +++ /dev/null
225 @@ -1,182 +0,0 @@
226 -# Copyright 1999-2022 Gentoo Authors
227 -# Distributed under the terms of the GNU General Public License v2
228 -
229 -EAPI=7
230 -inherit flag-o-matic linux-info systemd
231 -
232 -#Set this variable to the required external ell version
233 -ELL_REQ="0.45"
234 -
235 -if [[ ${PV} == *9999* ]]; then
236 - inherit autotools git-r3
237 - IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
238 - ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
239 -else
240 - SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
241 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
242 - MYRST2MAN="RST2MAN=:"
243 -fi
244 -
245 -DESCRIPTION="Wireless daemon for linux"
246 -HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
247 -
248 -LICENSE="GPL-2"
249 -SLOT="0"
250 -IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda +monitor ofono standalone systemd wired"
251 -
252 -DEPEND="
253 - sys-apps/dbus
254 - client? ( sys-libs/readline:0= )
255 -"
256 -
257 -[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
258 -
259 -RDEPEND="
260 - ${DEPEND}
261 - net-wireless/wireless-regdb
262 - crda? ( net-wireless/crda )
263 - standalone? (
264 - systemd? ( sys-apps/systemd )
265 - !systemd? ( virtual/resolvconf )
266 - )
267 -"
268 -
269 -BDEPEND="
270 - virtual/pkgconfig
271 -"
272 -
273 -[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
274 -
275 -pkg_setup() {
276 - CONFIG_CHECK="
277 - ~ASYMMETRIC_KEY_TYPE
278 - ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
279 - ~CFG80211
280 - ~CRYPTO_AES
281 - ~CRYPTO_CBC
282 - ~CRYPTO_CMAC
283 - ~CRYPTO_DES
284 - ~CRYPTO_ECB
285 - ~CRYPTO_HMAC
286 - ~CRYPTO_MD4
287 - ~CRYPTO_MD5
288 - ~CRYPTO_RSA
289 - ~CRYPTO_SHA1
290 - ~CRYPTO_SHA256
291 - ~CRYPTO_SHA512
292 - ~CRYPTO_USER_API_HASH
293 - ~CRYPTO_USER_API_SKCIPHER
294 - ~KEY_DH_OPERATIONS
295 - ~PKCS7_MESSAGE_PARSER
296 - ~RFKILL
297 - ~X509_CERTIFICATE_PARSER
298 - "
299 - if use crda;then
300 - CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
301 - WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
302 - fi
303 -
304 - if use amd64;then
305 - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
306 - WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
307 - fi
308 -
309 - if use cpu_flags_x86_aes;then
310 - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
311 - WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
312 - fi
313 -
314 - if use cpu_flags_x86_ssse3 && use amd64; then
315 - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
316 - WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
317 - WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
318 - WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
319 - fi
320 -
321 - if use kernel_linux && kernel_is -ge 4 20; then
322 - CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
323 - fi
324 -
325 - check_extra_config
326 -
327 - if ! use crda; then
328 - if use kernel_linux && kernel_is -lt 4 15; then
329 - ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
330 - ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
331 - fi
332 - if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
333 - [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
334 - then
335 - ewarn ""
336 - ewarn "REGULATORY DOMAIN PROBLEM:"
337 - ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
338 - ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m"
339 - ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
340 - ewarn ""
341 - fi
342 - fi
343 -}
344 -
345 -src_unpack() {
346 - if [[ ${PV} == *9999* ]] ; then
347 - EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
348 - EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
349 - else
350 - default
351 - fi
352 -}
353 -
354 -src_prepare() {
355 - default
356 - if [[ ${PV} == *9999* ]] ; then
357 - eautoreconf
358 - fi
359 -}
360 -
361 -src_configure() {
362 - append-cflags "-fsigned-char"
363 - local myeconfargs=(
364 - --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
365 - $(use_enable client)
366 - $(use_enable monitor)
367 - $(use_enable ofono)
368 - $(use_enable wired)
369 - --enable-systemd-service
370 - --with-systemd-unitdir="$(systemd_get_systemunitdir)"
371 - --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
372 - --with-systemd-networkdir="$(systemd_get_utildir)/network"
373 - )
374 - [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
375 - econf "${myeconfargs[@]}"
376 -}
377 -
378 -src_compile() {
379 - emake ${MYRST2MAN}
380 -}
381 -
382 -src_install() {
383 - emake DESTDIR="${D}" ${MYRST2MAN} install
384 - keepdir /var/lib/${PN}
385 -
386 - newinitd "${FILESDIR}/iwd.initd-r1" iwd
387 -
388 - if use wired;then
389 - newinitd "${FILESDIR}/ead.initd" ead
390 - fi
391 -
392 - if [[ ${PV} == *9999* ]] ; then
393 - exeinto /usr/share/iwd/scripts/
394 - doexe test/*
395 - fi
396 -
397 - if use standalone ; then
398 - local iwdconf="${ED}/etc/iwd/main.conf"
399 - dodir /etc/iwd
400 - echo "[General]" > "${iwdconf}"
401 - echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
402 - echo "[Network]" >> "${iwdconf}"
403 - echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
404 - dodir /etc/conf.d
405 - echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
406 - fi
407 -}