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/kismet/
Date: Thu, 20 Jan 2022 17:04:52
Message-Id: 1642698281.b04ab98040a7e7e15bd0297cd06218ce9108f153.zerochaos@gentoo
1 commit: b04ab98040a7e7e15bd0297cd06218ce9108f153
2 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 20 15:06:39 2022 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 20 17:04:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04ab980
7
8 net-wireless/kismet: fix missing use dep
9
10 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
11 Closes: https://bugs.gentoo.org/828011
12 Bump python support to 10
13 Bump eapi 7->8
14 remove unused eclass
15
16 .../{kismet-2021.08.1.ebuild => kismet-2021.08.1-r1.ebuild} | 12 ++++++------
17 net-wireless/kismet/kismet-9999.ebuild | 12 ++++++------
18 2 files changed, 12 insertions(+), 12 deletions(-)
19
20 diff --git a/net-wireless/kismet/kismet-2021.08.1.ebuild b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
21 similarity index 96%
22 rename from net-wireless/kismet/kismet-2021.08.1.ebuild
23 rename to net-wireless/kismet/kismet-2021.08.1-r1.ebuild
24 index 45462e528503..e82c719234ad 100644
25 --- a/net-wireless/kismet/kismet-2021.08.1.ebuild
26 +++ b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
27 @@ -1,11 +1,11 @@
28 -# Copyright 1999-2021 Gentoo Authors
29 +# Copyright 1999-2022 Gentoo Authors
30 # Distributed under the terms of the GNU General Public License v2
31
32 -EAPI=7
33 +EAPI=8
34
35 -PYTHON_COMPAT=( python3_{8,9} )
36 +PYTHON_COMPAT=( python3_{8,9,10} )
37
38 -inherit autotools multilib python-single-r1 udev systemd
39 +inherit autotools python-single-r1 udev systemd
40
41 if [[ ${PV} == "9999" ]] ; then
42 EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
43 @@ -46,7 +46,7 @@ CDEPEND="
44 sys-libs/zlib:=
45 dev-db/sqlite:=
46 net-libs/libmicrohttpd:=
47 - net-libs/libwebsockets:=[client]
48 + net-libs/libwebsockets:=[client,lejp]
49 kernel_linux? ( sys-libs/libcap
50 dev-libs/libnl:3
51 net-libs/libpcap
52 @@ -175,7 +175,7 @@ pkg_preinst() {
53 migrate_config() {
54 einfo "Kismet Configuration files are now read from /etc/kismet/"
55 ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
56 - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
57 + if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then
58 ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
59 fi
60 if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
61
62 diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
63 index 45462e528503..e82c719234ad 100644
64 --- a/net-wireless/kismet/kismet-9999.ebuild
65 +++ b/net-wireless/kismet/kismet-9999.ebuild
66 @@ -1,11 +1,11 @@
67 -# Copyright 1999-2021 Gentoo Authors
68 +# Copyright 1999-2022 Gentoo Authors
69 # Distributed under the terms of the GNU General Public License v2
70
71 -EAPI=7
72 +EAPI=8
73
74 -PYTHON_COMPAT=( python3_{8,9} )
75 +PYTHON_COMPAT=( python3_{8,9,10} )
76
77 -inherit autotools multilib python-single-r1 udev systemd
78 +inherit autotools python-single-r1 udev systemd
79
80 if [[ ${PV} == "9999" ]] ; then
81 EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
82 @@ -46,7 +46,7 @@ CDEPEND="
83 sys-libs/zlib:=
84 dev-db/sqlite:=
85 net-libs/libmicrohttpd:=
86 - net-libs/libwebsockets:=[client]
87 + net-libs/libwebsockets:=[client,lejp]
88 kernel_linux? ( sys-libs/libcap
89 dev-libs/libnl:3
90 net-libs/libpcap
91 @@ -175,7 +175,7 @@ pkg_preinst() {
92 migrate_config() {
93 einfo "Kismet Configuration files are now read from /etc/kismet/"
94 ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
95 - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
96 + if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then
97 ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
98 fi
99 if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then