gentoo resync : 02.02.2022

7 files changed, 76 insertions, 228 deletions

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 2c42ab71d4f9..c7b38b437a3c 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,12 +1,12 @@
 AUX gdb 232 BLAKE2B dc970ec4b6a5c82198d949d6a9a0e763bf63b62c4dceaf27a045ddc50226f3230108b981e6a3383f3098401f42334ce167eaa62a7e1b163f59d1d26fcbea6110 SHA512 232ebc8d3cfc9855f196e49533159638a54f03337c5734d768d3aa4a92c3ffb859eb04db35074aa2362f3074c8c153d2cad7f1fbec403894315eea0b595e740f
+AUX kismet-2021.08.1-nopcre.patch 790 BLAKE2B 838b3853413b4cd3ef41decdd08cc1320c42f3ea5d820a20cd171f04ccf606519ae47c1853a80fa228dcefbe94bb3a5ddd5308f64579f2aa5490e295c163476f SHA512 fb4e8f319db88b69860f88d76ebef153a24b404a9e39d02349fd7f1e47c878a5e4948598407f12954cd37d5393871a31c1a2bb9a3cd8ce1d1edee5d12f9cb124
+AUX kismet-2022-01-3-wardrive.patch 647 BLAKE2B e9c9d63ad952de72b9d3f45e9351e0bda71c9a4c62d3841fa03cb3db111b67082aee579ea75ab270629c14ade25677fb0a5e1257383339901bfc02067e50980d SHA512 f74a747d6a0043d87016b04e2a37503da98ebc1655a1814494cff3f5a4f9f59fec80e1d39b2464865d3e2b5310508948735197643294094fb90aeaf6f93cbe6b
 AUX kismet-gdb 53 BLAKE2B 8409c5f55c0b35dd13ab122d60baa2e164e158bfaa3579f1da6505a46908b4227f3973b2ac175c91090a07b6e66059349d3ffd132e15a162befc03b3d0758708 SHA512 d31173eb60a4240fb6cb6c649866d78dcfc779eea952985292711fea7f8c973b052f6d3676e9cfd8fc495336ea03710f99754669de1278f4694d25f709b15385
 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
-DIST kismet-2021-05-R1.tar.xz 10611692 BLAKE2B fc0a145005440c8af5320488e1a4bfe808ad8aeba614c9294b511a8da70ec2d51dbfd2ecc840c9af84e0222967200bb82856b2e008e39f015b455be131f89484 SHA512 edca956c9c04f99e06a09dc23216a908fbac68637246d73430b2d9d3a3ba1c2e8099d263819073d24494dce17bd36c83a2f51c648430a6eea3db7332b07e2fba
-DIST kismet-2021-06-R1.tar.xz 10616368 BLAKE2B 22c216355b31224f41991f6caa6ad86cd2549982196cf0dd6f89ef88f92d85f57bd12100a74ebbe3e0cee0140da4bd545b548382d55a4c3ac1403504680c9ca3 SHA512 88d92e2ef3f0513a3a00b573012edbd115f92e5f28f884aead5ab049fad97b328222c2f3cbb49d80c5fcfdab2212934532cf41c100c4d0a5e94c932e1c5e8352
 DIST kismet-2021-08-R1.tar.xz 10621004 BLAKE2B 236a43d2073e380c60dadfc4f611465ffa5c7de2a282fa3f45252368cbc65aaa21ad6d33c504685e39ec7913a36364283f6706d6ad8fcecf2f7922c23a4aa792 SHA512 91e86dc1d3b69aa8cb6dff4c4b8bb959dca128f06d1298effe1b23ed24158ce4285abdf2af838f48588b9e71c69f82538d1a002838c4bc1d053868118e394b7a
-EBUILD kismet-2021.05.1.ebuild 5903 BLAKE2B f8fd598b17dc569b8393e0a57e300386a60fb5961b9c25fa39a99cf29949206ce9eccff314f9eaaa111158edc54b4664c622072e61a228b1ab5c2b0ae3645477 SHA512 8b56a312d228d82f1aaca7e55efc482276f1578e3cbdfd6511157a1854559b4a02d3029fc4535414647bf84a67d0a518a72a208a6f80678457ca3253fcdb973b
-EBUILD kismet-2021.06.1.ebuild 5903 BLAKE2B f8fd598b17dc569b8393e0a57e300386a60fb5961b9c25fa39a99cf29949206ce9eccff314f9eaaa111158edc54b4664c622072e61a228b1ab5c2b0ae3645477 SHA512 8b56a312d228d82f1aaca7e55efc482276f1578e3cbdfd6511157a1854559b4a02d3029fc4535414647bf84a67d0a518a72a208a6f80678457ca3253fcdb973b
-EBUILD kismet-2021.08.1.ebuild 5906 BLAKE2B 05f821970f3543d285b8a73184c4d5949baec48fbadc7c05f4aa7a48965efc0b344db83210594fa27b198b73fa427c6e20abdb8ed6d26bfeac59a783cd93b615 SHA512 bd51d4b00765e6c767eea72010421401d06539ab5673e5c698c25cce3662c460d8a74681083d013854c1778ba1be2f4c6c891ea323843faa67f32aeeef38339c
-EBUILD kismet-9999.ebuild 5906 BLAKE2B 05f821970f3543d285b8a73184c4d5949baec48fbadc7c05f4aa7a48965efc0b344db83210594fa27b198b73fa427c6e20abdb8ed6d26bfeac59a783cd93b615 SHA512 bd51d4b00765e6c767eea72010421401d06539ab5673e5c698c25cce3662c460d8a74681083d013854c1778ba1be2f4c6c891ea323843faa67f32aeeef38339c
+DIST kismet-2022-01-R3.tar.xz 10694148 BLAKE2B dee1c71922909990cc847cd8253cefdb303d383e2521ed91a3b7144f7004373c1aae8d5673f919caf046ad20a6d2b5d1d8b6c5344fdd5c30bd81787cf3ae7404 SHA512 2f41da4ff835c6d560f2f1f901844a8b88d3e34aec789ebb281ebdcb2e76c589d77394e2eb3b33a5a8bdb28e6e7f68ccd28cc9d68d273e3de0c345d57094f692
+EBUILD kismet-2021.08.1-r1.ebuild 5957 BLAKE2B e0aa26ddd1cee3bef68e3f4943e35f5f04762590f68aa5bb2798fa342d5be4ad1df13e75d74950bbd1911e76916605d059c99d081f60314dd85c80745845b208 SHA512 63bfbb54b03f9ce71a146cd9a171803e474e6b0e13bf73e3f7be4f905985ec9426aa7bc2cd1d4a1c110be00f9fa3253daae42922660041e0daf079ebf915be0b
+EBUILD kismet-2022.01.3.ebuild 5989 BLAKE2B 9ba9596040d36af5a84be92dcb9e0e583d2a86356f3cbacce19b9578a2abd3cc982ff0783c8f0eba818ac1fd90a536f0fd24214243eda8eb89b4e6bb256a0c20 SHA512 e0daecf5c119c011c9adba5ec9058bbef0e4a4aa5f42f6ed09903586283eaa7fe30b3afb277ce2d4c4877a9aee95aadb07e590f0261ba836e371514b7075e558
+EBUILD kismet-9999.ebuild 5907 BLAKE2B 890bbb80e6cb39fb04bb630abbf4c7f65fa105844666abfb2dfd339ad076fb61133606f5eeb363a080f927b4a125f5caccf48f0ee8a1f9fb2b682a8c3f17132d SHA512 06265c5f9ff0d4d71d38e4bf227f69c2919a869105e1d15c50cfd26212751c7e01f8a0ce731589ee5bd85c74db6fc4d9f802f736d31b66ac2410aa465b560b93
 MISC metadata.xml 787 BLAKE2B c7000a14fe4a29247dbb68f535ad8e5b9daffc6cda71176db88f5d55811601a1b3113ad5029fc2cb46f777a16e7c5859de0798fb1a83a03beead91ebf66160a1 SHA512 449e7457a35f11b3c09c917134df48af7896ac9d34892f80102cbd2b2510f78d95331582cbde0be7d24ffe004c58a95fdebc6590ce90522a9f15212d5e70c58b
diff --git a/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch b/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch
new file mode 100644
index 000000000000..c3b648464ff5
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch
@@ -0,0 +1,24 @@
+From e28c407f612877e750e6e5e1b92a8949275b7df0 Mon Sep 17 00:00:00 2001
+From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
+Date: Thu, 16 Dec 2021 20:35:43 -0500
+Subject: [PATCH] Fix compiling when pcre is not available
+
+Fix compiling when pcre is not available
+---
+ log_tools/kismetdb_to_wiglecsv.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/log_tools/kismetdb_to_wiglecsv.cc b/log_tools/kismetdb_to_wiglecsv.cc
+index 8d4a8db68..5c79680c7 100644
+--- a/log_tools/kismetdb_to_wiglecsv.cc
++++ b/log_tools/kismetdb_to_wiglecsv.cc
+@@ -239,6 +239,9 @@ int main(int argc, char *argv[]) {
+ 
+         pcre *re;
+         pcre_extra *study;
++#else
++        pcre_filter(const std::string& in_regex) {}
++        bool match(const std::string& target) {return false;}
+ #endif
+     };
+ 
diff --git a/net-wireless/kismet/files/kismet-2022-01-3-wardrive.patch b/net-wireless/kismet/files/kismet-2022-01-3-wardrive.patch
new file mode 100644
index 000000000000..2f45ecbd68e1
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2022-01-3-wardrive.patch
@@ -0,0 +1,23 @@
+From 2186630f4f4fb3ded5df56d67e88ef1fae36ee5b Mon Sep 17 00:00:00 2001
+From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
+Date: Thu, 27 Jan 2022 16:46:22 -0500
+Subject: [PATCH] Actually install kismet_wardrive.conf via make install
+
+---
+ Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 3544ea711..c1aac51d7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -8,7 +8,8 @@ CONFIGFILES = \
+ 	kismet_logging.conf \
+ 	kismet_filter.conf \
+ 	kismet_uav.conf \
+-	kismet_80211.conf 
++	kismet_80211.conf \
++	kismet_wardrive.conf
+ 
+ # Parsers (modeled on former Kaitai model)
+ PARSERS = \
diff --git a/net-wireless/kismet/kismet-2021.06.1.ebuild b/net-wireless/kismet/kismet-2021.06.1.ebuild
deleted file mode 100644
index 4d086c30ee7b..000000000000
--- a/net-wireless/kismet/kismet-2021.06.1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools multilib python-single-r1 udev systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
-	inherit git-r3
-	RESTRICT="strip"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/_beta/-BETA}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P/BETA/beta}
-
-	#normally we want an official release
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-
-	#but sometimes we want a git commit
-	#COMMIT="9ca7e469cf115469f392db7436816151867e1654"
-	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-
-	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	acct-user/kismet
-	acct-group/kismet
-	networkmanager? ( net-misc/networkmanager:= )
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd:=
-	net-libs/libwebsockets:=[client]
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	libusb? ( virtual/libusb:1 )
-	dev-libs/protobuf-c:=
-	dev-libs/protobuf:=
-	$(python_gen_cond_dep '
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	')
-	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	ubertooth? ( net-wireless/ubertooth:= )
-	"
-
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	dev-libs/libfmt
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_USEDEP}]
-	')
-	selinux? ( sec-policy/selinux-kismet )
-"
-PDEPEND="
-	rtlsdr? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-		net-wireless/rtl-sdr
-	)"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	#this was added to quiet macosx builds but it makes gcc builds noisier
-	sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
-
-	#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
-
-	rm -r boost || die
-	rm -r fmt || die
-
-	#dev-libs/jsoncpp
-	#rm -r json || die
-	#sed -i 's#"json/json.h"#<json/json.h>#' jsoncpp.cc kis_net_beast_httpd.h \
-	#	log_tools/kismetdb_clean.cc log_tools/kismetdb_dump_devices.cc \
-	#	log_tools/kismetdb_statistics.cc log_tools/kismetdb_to_gpx.cc \
-	#	log_tools/kismetdb_to_kml.cc log_tools/kismetdb_to_pcap.cc \
-	#	log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \
-	#	trackedelement.h trackedelement_workers.h
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in || die
-
-	eapply_user
-
-	#just use set to fix setup.py
-	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable libusb libusb) \
-		$(use_enable pcre) \
-		$(use_enable lm-sensors lmsensors) \
-		$(use_enable networkmanager libnm) \
-		$(use_enable ubertooth) \
-		--sysconfdir=/etc/kismet \
-		--disable-optimization
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	python_optimize
-	emake DESTDIR="${D}" forceconfigs
-	use udev && udev_dorules packaging/udev/*.rules
-
-	insinto /usr/share/${PN}
-	doins Makefile.inc
-	if [ "${PV}" = "9999" ];then
-		doins "${FILESDIR}"/gdb
-		dobin "${FILESDIR}"/kismet-gdb
-	fi
-
-	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
-	systemd_dounit packaging/systemd/kismet.service
-}
-
-pkg_preinst() {
-	if use suid; then
-		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_cap_pcapfile
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_cap_pcapfile
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
-
-migrate_config() {
-	einfo "Kismet Configuration files are now read from /etc/kismet/"
-	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
-		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
-	fi
-	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
-		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
-	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
-		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test ${v} -lt 2019.07.2 ; then
-				migrate_config
-				break
-			fi
-			if ver_test ${v} -eq 9999 ; then
-				migrate_config
-				break
-			fi
-		done
-	fi
-}
diff --git a/net-wireless/kismet/kismet-2021.05.1.ebuild b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
index 4d086c30ee7b..802d9b87c1ca 100644
--- a/net-wireless/kismet/kismet-2021.05.1.ebuild
+++ b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools multilib python-single-r1 udev systemd
+inherit autotools python-single-r1 udev systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib:=
 	dev-db/sqlite:=
 	net-libs/libmicrohttpd:=
-	net-libs/libwebsockets:=[client]
+	net-libs/libwebsockets:=[client,lejp]
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
 			net-libs/libpcap
@@ -85,6 +85,8 @@ PDEPEND="
 		net-wireless/rtl-sdr
 	)"
 
+PATCHES=( "${FILESDIR}"/kismet-2021.08.1-nopcre.patch )
+
 src_prepare() {
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
 		conf/kismet_logging.conf || die
@@ -110,7 +112,7 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in || die
 
-	eapply_user
+	default
 
 	#just use set to fix setup.py
 	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
@@ -175,7 +177,7 @@ pkg_preinst() {
 migrate_config() {
 	einfo "Kismet Configuration files are now read from /etc/kismet/"
 	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
+	if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then
 		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
 	fi
 	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
diff --git a/net-wireless/kismet/kismet-2021.08.1.ebuild b/net-wireless/kismet/kismet-2022.01.3.ebuild
index 45462e528503..57d82e0c98d1 100644
--- a/net-wireless/kismet/kismet-2021.08.1.ebuild
+++ b/net-wireless/kismet/kismet-2022.01.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools multilib python-single-r1 udev systemd
+inherit autotools python-single-r1 udev systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib:=
 	dev-db/sqlite:=
 	net-libs/libmicrohttpd:=
-	net-libs/libwebsockets:=[client]
+	net-libs/libwebsockets:=[client,lejp]
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
 			net-libs/libpcap
@@ -110,6 +110,8 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in || die
 
+	#remove this patch on bump
+	eapply "${FILESDIR}/kismet-2022-01-3-wardrive.patch"
 	eapply_user
 
 	#just use set to fix setup.py
@@ -175,7 +177,7 @@ pkg_preinst() {
 migrate_config() {
 	einfo "Kismet Configuration files are now read from /etc/kismet/"
 	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
+	if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then
 		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
 	fi
 	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 45462e528503..e82c719234ad 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools multilib python-single-r1 udev systemd
+inherit autotools python-single-r1 udev systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib:=
 	dev-db/sqlite:=
 	net-libs/libmicrohttpd:=
-	net-libs/libwebsockets:=[client]
+	net-libs/libwebsockets:=[client,lejp]
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
 			net-libs/libpcap
@@ -175,7 +175,7 @@ pkg_preinst() {
 migrate_config() {
 	einfo "Kismet Configuration files are now read from /etc/kismet/"
 	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
+	if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then
 		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
 	fi
 	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then