4 files changed, 5 insertions, 223 deletions
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index a5162654ceca..96710be31f31 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -4,10 +4,8 @@ AUX kismet-2022.08.1-sandbox-fix.patch 4981 BLAKE2B 8bc7010844020b5b0928fe972915
 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-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f SHA512 befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1
 DIST kismet-2023-07-R1.tar.xz 11144120 BLAKE2B c43f0665c784ff9245289e624e23cb3eb4ffcb79f050deede50129cf6b07662e817f9c9aaf6cc608395045b5b449b87d22ff314d7dbc8f04b29db2df86dc5f84 SHA512 b8b320b8e09be5be582848ce8a1a66f71a96eccc3c78f52d3f1f18122abbe614ff3b5a55b5fcedf3e6a1fc959a72838adc0d7278ffd6c25a1c179a1caf5584ce
 DIST kismet-2023.07.1-stdint-fix.patch 144077 BLAKE2B 77a4ca3da4ed54e567d21c7d8d0a718751802827bcefc1122318c989cde93a2132753c910e6f503e74dac30024111edc788d9df65ef4c4749ab918485d818ee3 SHA512 cb9220cdd5e14d030ef303e28a32dced61916ff64aa5960c412c2355c1b714dc423e34b33ef701e1daa2a22c9562a85a739dc130c4ec5761924338ffb462286b
-EBUILD kismet-2022.08.1-r2.ebuild 6217 BLAKE2B e4e4455a37f4903529bfaf14d8bd5b8813abf9bd232f9db8f221e69901d26aba55e923ca7723a4888119f6a3f64fd05df7ad21e37690f92871c71db782e6b70d SHA512 a05e823d4a60a48396c9c55dd2ce46726e973548da3c55a881dbd41075e6aea2a56b8916b6dc5fe5fb5781b80b0ea8e1f8ce721f1f53033d0e38df9592c0780d
-EBUILD kismet-2023.07.1-r1.ebuild 6053 BLAKE2B 67901b98264964d78a6942ed9d7d63687b07c15559b83aae8b7d4209c47c8d83b0c45c99499750cdc0ca6b31384963db84f80f49d64d98ba1c7bbe59eb29b909 SHA512 eb54d32c983a8d083b0e62c78f6f5da164e8d3d398c5cad3032e121d81019d97ba49199560c0647f97d7313ae2a50caed821fbea528652e63e4a8b2c7e5024fc
-EBUILD kismet-9999.ebuild 6045 BLAKE2B 113d3a842e1f6ac59fa3efeaf332629e0a533c5a4a10ec9aeceb5e29bd4aeeec5bb76ec4590e3b908a8663d7bc9aac316ce5d851da5cc8c454ac6d4e547c4b4f SHA512 15a08a7f1c864d5a9b28b3716740401cf39669947f9e9e437c03eefbbb481108f2bd94926bf06adddc704baca691e5b7e926f17b429329243718f2a391ba4315
+EBUILD kismet-2023.07.1-r2.ebuild 6052 BLAKE2B 365e3952ea5b96c4050be648cda4121da6b42834366b5faec6f37d225bfc971fa77041e0d61663278b2447ba92a7af78c9c8c24c7ebe0b10eba3870662a22a11 SHA512 4385166e2edbcc520c9befdc2d010a45877e565fbe8d7b95927d63d357ea61de21ec420cc90fb941fb55c62c98c3f280e3b1cc7a46b491a4b14bf9cba35f730d
+EBUILD kismet-9999.ebuild 6047 BLAKE2B 29a3caba66742d03076bec23b3088f775a8f48d07a972465f0dc768d3fc53206a4bc10fd9bc54fb902aceb01a5e56fb113dee4bc761b6bd3a0cd5f4874e21e6f SHA512 216d45301c137f603ed202afcd2ecbded74f209d38a1d13f85ec85a3bfaa11cb7192959b44fba9c62e1b8274eb1b031411a0b0014da3a7d112b1969a518d5fe4
 MISC metadata.xml 1305 BLAKE2B 3ca03a4a0a033a236f8e361b12f77c4a174c3767d63e0ba874b05f4871834790c108fd65bfdf8b2b718dde964c84966bed8bcd4707a8003830792e02c19b8ec6 SHA512 fffe5d6d801050296b5872377346b15f0774a9875ba407fefe18ebccf319b85dd59f9e9cf9b555317f9f3f7f402c6c7e11c5bbed744e7c41bc771225685e36bc
diff --git a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
deleted file mode 100644
index 271645980ba9..000000000000
--- a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools flag-o-matic 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:2
-	dev-libs/elfutils
-	sys-libs/zlib:=
-	dev-db/sqlite:3
-	net-libs/libwebsockets:=[client,lejp]
-	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_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	')
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	ubertooth? ( net-wireless/ubertooth )
-	"
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_USEDEP}]
-	')
-	rtlsdr? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-		net-wireless/rtl-sdr
-	)
-	selinux? ( sec-policy/selinux-kismet )
-"
-#switched back to bundled libfmt-8
-#https://bugs.gentoo.org/895252
-#<dev-libs/libfmt-9
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	sys-libs/libcap
-"
-BDEPEND="virtual/pkgconfig"
-
-# https://bugs.gentoo.org/872608
-# drop after 2022.08*
-PATCHES=( "${FILESDIR}/${P}-sandbox-fix.patch" )
-
-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
-	#switched back to bundled libfmt-8
-	#https://bugs.gentoo.org/895252
-	#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
-
-	default
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-	# drop after 2022.08*
-	# VERSION was incorrectly removed in 4e490cf0b49a287e964df9c5e5c4067f6918909e upstream
-	# https://github.com/kismetwireless/kismet/issues/427
-	# https://bugs.gentoo.org/864298
-	echo "${PV}" > VERSION
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/877761
-	# https://github.com/kismetwireless/kismet/issues/518
-	#
-	# Do not trust with LTO either.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	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 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
-	udev_reload
-}
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-wireless/kismet/kismet-2023.07.1-r1.ebuild b/net-wireless/kismet/kismet-2023.07.1-r2.ebuild
index 0f20214c45d8..5b89290ed3bd 100644
--- a/net-wireless/kismet/kismet-2023.07.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2023.07.1-r2.ebuild
@@ -32,7 +32,7 @@ else
 		"${FILESDIR}"/0001-configure.ac-bashism-fix-critical-existence-failure-.patch
 	)
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -80,7 +80,7 @@ RDEPEND="${CDEPEND}
 		$(python_gen_cond_dep '
 			dev-python/numpy[${PYTHON_USEDEP}]
 		')
-		net-wireless/rtl-sdr
+		net-wireless/rtl-sdr:=
 	)
 	selinux? ( sec-policy/selinux-kismet )
 "
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 7832dd966789..749852805c4a 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -74,7 +74,7 @@ RDEPEND="${CDEPEND}
 		$(python_gen_cond_dep '
 			dev-python/numpy[${PYTHON_USEDEP}]
 		')
-		net-wireless/rtl-sdr
+		net-wireless/rtl-sdr:=
 	)
 	selinux? ( sec-policy/selinux-kismet )
 "