gentoo resync : 02.09.2020

24 files changed, 105 insertions, 647 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 749f2282331d..3d0858fb6795 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/cpyrit-cuda/Manifest b/net-wireless/cpyrit-cuda/Manifest
deleted file mode 100644
index 51dfc44075a5..000000000000
--- a/net-wireless/cpyrit-cuda/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyrit-0.5.0.tar.gz 267614 BLAKE2B 2a0df7ebf2a06aee3367e9780d075ec2b6b76a8d9227ada17778eb386fa0243a06639ac27b8e7f6de2370d88836196288670c9d5112dada5dcb8b32efcae7da9 SHA512 912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25
-EBUILD cpyrit-cuda-0.5.0.ebuild 871 BLAKE2B 16c3f7daf97addd4392860e30c600e55847c28d6bfe8c9a2e3bb6c546bd43b9a2015e46e76b2576f0b57a130f535fe3184c8e90bba630290717128098f34fcc5 SHA512 fcd50bbd2c749d660cd2b3b053ab720436a6f2fe7d7c842b8e755fccf024734345834b52f2086e0de3155765e031dd95fc8b00d23af98fa62ddf9154c98d2fa1
-MISC metadata.xml 553 BLAKE2B 7710478ffec030312cd867adfc353feb9cb00550ab851d53e482e392ec92d5d5d4cada601469aa8e7a40852fe59352f4d335b4237da69ba52709b58e9b7bd4e8 SHA512 50a9be6513024862930a058a37dbafc8707c160a39428b8590dd16237ded08c43946300d10115f58b900fac078015a07eefbbab17018311b88f13238ef5c3fe0
diff --git a/net-wireless/cpyrit-cuda/cpyrit-cuda-0.5.0.ebuild b/net-wireless/cpyrit-cuda/cpyrit-cuda-0.5.0.ebuild
deleted file mode 100644
index 3c8d5c041e81..000000000000
--- a/net-wireless/cpyrit-cuda/cpyrit-cuda-0.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit toolchain-funcs distutils-r1 eapi7-ver
-
-DESCRIPTION="A sub-package that adds CUDA-capability to Pyrit"
-HOMEPAGE="https://github.com/JPaulMora/Pyrit"
-SRC_URI="https://github.com/JPaulMora/Pyrit/archive/v${PV}.tar.gz -> pyrit-${PV}.tar.gz"
-
-LICENSE="GPL-3+ GPL-3+-with-cuda-exception GPL-3+-with-cuda-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/openssl:=
-	net-libs/libpcap
-	dev-util/nvidia-cuda-toolkit"
-RDEPEND="${DEPEND}"
-PDEPEND="~net-wireless/pyrit-${PV}"
-
-S="${WORKDIR}/Pyrit-${PV}/modules/cpyrit_cuda"
-
-pkg_pretend() {
-	if tc-is-gcc && ver_test $(gcc-version) -ge 4.8; then
-		die "gcc 4.8 and up are not supported"
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/net-wireless/cpyrit-cuda/metadata.xml b/net-wireless/cpyrit-cuda/metadata.xml
deleted file mode 100644
index 7affef4e4f96..000000000000
--- a/net-wireless/cpyrit-cuda/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>oleg@kaa.org.ua</email>
-		<name>Oleg Kravchenko</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">JPaulMora/Pyrit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/cpyrit-opencl/Manifest b/net-wireless/cpyrit-opencl/Manifest
deleted file mode 100644
index 53863630a758..000000000000
--- a/net-wireless/cpyrit-opencl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyrit-0.5.0.tar.gz 267614 BLAKE2B 2a0df7ebf2a06aee3367e9780d075ec2b6b76a8d9227ada17778eb386fa0243a06639ac27b8e7f6de2370d88836196288670c9d5112dada5dcb8b32efcae7da9 SHA512 912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25
-EBUILD cpyrit-opencl-0.5.0.ebuild 720 BLAKE2B f111fe5568fc9943f9beeaa90975946c3bccc714bb985df41321ab45dd851529d73adde4e419c1e99b6de5b4ddcc978594b94c98938adb87fc2404b6535747cf SHA512 63d9345ea7b17223b4563306890f36ab59a887c888b34274fff5018fe89b68998420c5b84bbcf0c9d42ff8b958df8392aec3afc27d49c4be568b6173ac55bc9c
-MISC metadata.xml 553 BLAKE2B 7710478ffec030312cd867adfc353feb9cb00550ab851d53e482e392ec92d5d5d4cada601469aa8e7a40852fe59352f4d335b4237da69ba52709b58e9b7bd4e8 SHA512 50a9be6513024862930a058a37dbafc8707c160a39428b8590dd16237ded08c43946300d10115f58b900fac078015a07eefbbab17018311b88f13238ef5c3fe0
diff --git a/net-wireless/cpyrit-opencl/cpyrit-opencl-0.5.0.ebuild b/net-wireless/cpyrit-opencl/cpyrit-opencl-0.5.0.ebuild
deleted file mode 100644
index 21e2d29a1c08..000000000000
--- a/net-wireless/cpyrit-opencl/cpyrit-opencl-0.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A sub-package that adds OpenCL-capability to Pyrit"
-HOMEPAGE="https://github.com/JPaulMora/Pyrit"
-SRC_URI="https://github.com/JPaulMora/Pyrit/archive/v${PV}.tar.gz -> pyrit-${PV}.tar.gz"
-
-LICENSE="GPL-3+ GPL-3+-with-opencl-exception GPL-3+-with-opencl-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/openssl:=
-	sys-libs/zlib
-	virtual/opencl"
-RDEPEND="${DEPEND}"
-PDEPEND="~net-wireless/pyrit-${PV}"
-
-S="${WORKDIR}/Pyrit-${PV}/modules/cpyrit_opencl"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/net-wireless/cpyrit-opencl/metadata.xml b/net-wireless/cpyrit-opencl/metadata.xml
deleted file mode 100644
index 7affef4e4f96..000000000000
--- a/net-wireless/cpyrit-opencl/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>oleg@kaa.org.ua</email>
-		<name>Oleg Kravchenko</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">JPaulMora/Pyrit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest
index b89f56c89ebb..254f1f68c0a9 100644
--- a/net-wireless/gr-rds/Manifest
+++ b/net-wireless/gr-rds/Manifest
@@ -1,2 +1,4 @@
-EBUILD gr-rds-9999.ebuild 1164 BLAKE2B 84b1858c4c791de99615269e68abb270137d376c597b51c45571cdab542314fc4ba38ac7323b657c44beae50fa6f1f24a20b239a6adf276aecf85fde76edb08a SHA512 a7e3c647c67c62c89b061c1d9c8ec44fa7f58e0f8d47b7bfc8ff8b1ba8198d2d7a0e662a40a50ba7ba928a14869cfcdaf7ed0234a9221d8f8321f26596f2116b
+DIST gr-rds-0.0_p20200807.tar.gz 210730 BLAKE2B be2ded79a744d97572f754458fbab6c4091eb9096fa01238e09cfb1703d50fc1f228000b973826456fe4fae7577ef4dcc871edb4f72bd4e2daacdf3d01330d03 SHA512 d04944db7c02d3a004beae5be96a42274dcc4503d94bd22b726c664fb49103c41479ce49f7b4f2e6fb86d7b6bdd01873375fd6a7a7cc4b04ec9bf033235743a2
+EBUILD gr-rds-0.0_p20200807.ebuild 1406 BLAKE2B 1b3ebaca58bbf8bfadcfa326ddc8b01f6947e06192d04ad66651169d20edab1229e70ea3b144f8b36a29ac2194a1bb75817683e32ad75434a11f45ceeb0e948b SHA512 e7c0334948256d669ff63c4bcae410c8f3b85cf2c26ce6e301504f02d9fec44dfe88d55bc3dfef9c29a1a68d722ff57c805cae9316630cfe0bf24a836e4d1c88
+EBUILD gr-rds-9999.ebuild 1406 BLAKE2B 1b3ebaca58bbf8bfadcfa326ddc8b01f6947e06192d04ad66651169d20edab1229e70ea3b144f8b36a29ac2194a1bb75817683e32ad75434a11f45ceeb0e948b SHA512 e7c0334948256d669ff63c4bcae410c8f3b85cf2c26ce6e301504f02d9fec44dfe88d55bc3dfef9c29a1a68d722ff57c805cae9316630cfe0bf24a836e4d1c88
 MISC metadata.xml 317 BLAKE2B 38ab4417f4befdeb7d9912a3712a259653e223aac63528287493cde0094efbe7c985f1cd93e871a10fb1a99b8add72f20d6b31a93d06017171a85a276f4b9840 SHA512 a5cb2c2182d2c0a2afbb3ebc9ac175af13be57ea5ca28abd3cb59d25a562484f8dc01b08da9e0644929a6cbd63f2c850eb6169f574dbed838180e5a5e89ad510
diff --git a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
new file mode 100644
index 000000000000..e4b42b14c552
--- /dev/null
+++ b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bastibl/${PN}"
+	EGIT_BRANCH="maint-3.8"
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT="ffbe3ea302c32a621f14329b7fcc09e868305e78"
+	SRC_URI="https://github.com/bastibl/gr-rds/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+fi
+inherit cmake python-single-r1
+
+DESCRIPTION="GNU Radio FM RDS Receiver"
+HOMEPAGE="https://github.com/bastibl/gr-rds"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig:0
+"
+#cppunit is listed in cmake, but only needed for tests and there are no tests
+#	dev-util/cppunit"
+
+src_prepare() {
+	cmake_src_prepare
+	#although cppunit is not used, it fails if it isn't there, fix it
+	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild
index 10e9f43865de..e4b42b14c552 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-9999.ebuild
@@ -3,15 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bastibl/${PN}"
+	EGIT_BRANCH="maint-3.8"
 else
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
+	COMMIT="ffbe3ea302c32a621f14329b7fcc09e868305e78"
+	SRC_URI="https://github.com/bastibl/gr-rds/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 fi
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="GNU Radio FM RDS Receiver"
 HOMEPAGE="https://github.com/bastibl/gr-rds"
@@ -25,7 +29,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -35,7 +39,7 @@ BDEPEND="
 #	dev-util/cppunit"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	#although cppunit is not used, it fails if it isn't there, fix it
 	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
 	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
@@ -44,5 +48,10 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	cmake-utils_src_configure
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
 }
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 9c506ce85492..9f4cdc0c2f93 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -3,13 +3,9 @@ AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4
 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
-DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
-DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
-DIST kismet-2019-12-R2.tar.xz 3127064 BLAKE2B b7ffac6a6a4d7d7893d3564f9471080e055798c325b102f98fa0e86db37bcbab33422afae9c2694b747ae0c369259b62c218a77c673d0e0c05969a56e42311c2 SHA512 b1e3de74a6d314150d849ac3d95c8b99324bba14522dc4f00244d1c09acb690cce40d35dbe33845ffb1060a69cd38f036d59a0283ed9b1a70b022e3d57cde5a0
 DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6 SHA512 585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2
-EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.09.1-r2.ebuild 4702 BLAKE2B 5ab2650fda3f9c669eb02d81e11c89a376e4704c46f1ad9b9a0b491c5accf56811edaea7fd4021ee23ee171207203c082e132a441ab147bc79dcea43e1ce5bb7 SHA512 4ea2cffec42a04b0e0588cc0a37f52b898b9dd81d5a72d17d13ec8b1eebaa1eea9d6d807de1bb1a1ebc345e264b9e7dfd1b77463fdf884631199e4d4c600225d
-EBUILD kismet-2019.12.2-r1.ebuild 4919 BLAKE2B b64aa866a750583e867308e5eb53aad49c4c897f13cd36c2d92e9881b1a1196dade4ce87968db86d0ed5cf6fc9e636917bb46830fe991ffee1936660680aff2c SHA512 ffa77d9843091abf23bf9789243567eb369d9cf3e505237647e7a4cef2b34025df243272f7ebf45445e4a908d6126b563442ca2ec5b5c8d0cc6d6daae46debd8
+DIST kismet-2020-09-R1.tar.xz 8694804 BLAKE2B 1389486809024179c3be71a8b26cdb460f483e1af0dd7cda9d36450d10e4df16536f23db3b5ca3fd6b65b0c48514c96e5cb37ec71425a8f087d58e7a89bed137 SHA512 e687c76b9e94d973245f61d6fc59a1a05a06ba9c765f7661a183d14d0228676359a7d7798bac9f3b493a5c311e53785c54fd9f0d12bf6cdc4d43919bad167327
 EBUILD kismet-2020.04.3.ebuild 4981 BLAKE2B 62fcf37f04f9651f33c8686e31f387eb237498a4030a07636c922823167a59e69d9896789fa908f432af41c8f6701c3044996dd2229be6eb67ca455bd8b858ca SHA512 dd6e4ddbbbb1847574e35a66413f0d208b02c9ade36f4f4646920df86fc714466aeea3f357f7541cf10bff4e38e7b86ca1a2aead7a8a60c4a18eb9230875355a
-EBUILD kismet-9999.ebuild 4984 BLAKE2B 375fb59e8dbc7884fb73c44137ec31041b091f8a450795309b6f5db63a3746e41471a73bb6818afdeb9956ccb5670fc8c2782e1ac6f93c254a85a4f3caef2e32 SHA512 59d5ef75637be6ebdbc15c9c69e9a7b8f2fd1298a2d01910cc478c7d370688fa1ffdad9a4e1d9a45dc00e9f0e7ca38f95739820383a71e4919ea66268e74a9f2
-MISC metadata.xml 1545 BLAKE2B c1b1fe5d6f61ca1141bf0bec03e7f416a0c7e8ec2b15aaaefe0cfc763af9c385e791747eeaf6c3d0b83594acbb528e0c6ef4abfcb348edd027d77a5ef720fa83 SHA512 49e887edfcde73eea51e96dad9c648f70f59524fc0e3f6567aeff116bf33ad7b9e57f4e8dcdfd02b0fef524a101f172bf1035437a6138376b0a41f1e8e60af32
+EBUILD kismet-2020.09.1.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
+EBUILD kismet-9999.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
+MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
diff --git a/net-wireless/kismet/kismet-2016.07.1-r2.ebuild b/net-wireless/kismet/kismet-2016.07.1-r2.ebuild
deleted file mode 100644
index f80d05230173..000000000000
--- a/net-wireless/kismet/kismet-2016.07.1-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib user
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid"
-
-CDEPEND="net-wireless/wireless-tools
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	client? ( sys-libs/ncurses:0= )
-	!arm? ( speech? ( app-accessibility/flite ) )
-	plugin-btscan? ( net-wireless/bluez )
-	plugin-dot15d4? ( virtual/libusb:0 )
-	plugin-spectools? ( net-wireless/spectools )
-	plugin-ptw? ( dev-libs/openssl:= )
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	ruby? ( dev-lang/ruby:* )
-	selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	epatch "${FILESDIR}/${P}-ruby-fixes.patch"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable client) \
-		$(use_enable pcre)
-}
-
-src_compile() {
-	emake
-
-	if use plugin-autowep; then
-		cd "${S}"/restricted-plugin-autowep
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/restricted-plugin-ptw
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake
-	fi
-}
-
-src_install() {
-	if use plugin-autowep; then
-		cd "${S}"/restricted-plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/restricted-plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use ruby; then
-		cd "${S}"/ruby
-		dobin *.rb
-	fi
-
-	cd "${S}"
-	emake DESTDIR="${D}" commoninstall
-
-	##dragorn would prefer I set fire to my head than do this, but it works
-	##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
-	##is there an automatic way to force this?
-	# install headers for external plugins
-	insinto /usr/include/kismet
-	doins *.h
-	doins Makefile.inc
-	#todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
-	dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-
-	insinto /etc
-	doins conf/kismet{,_drone}.conf
-
-	if use suid; then
-	dobin kismet_capture
-	fi
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture
-		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
-}
diff --git a/net-wireless/kismet/kismet-2019.09.1-r2.ebuild b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild
deleted file mode 100644
index 178c532ebfb5..000000000000
--- a/net-wireless/kismet/kismet-2019.09.1-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils multilib user python-single-r1
-
-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="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
-	#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="lm-sensors mousejack networkmanager +pcre selinux +suid"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-CDEPEND="
-	${PYTHON_DEPS}
-	networkmanager? ( net-misc/networkmanager:= )
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	mousejack? ( virtual/libusb:1 )
-	dev-libs/protobuf-c:=
-	dev-libs/protobuf:=
-	$(python_gen_cond_dep '
-		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
-	')
-	selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	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 pcre) \
-		$(use_enable lm-sensors lmsensors) \
-		$(use_enable mousejack libusb) \
-		$(use_enable networkmanager libnm) \
-		--sysconfdir=/etc/kismet \
-		--disable-optimization
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	python_optimize
-	emake DESTDIR="${D}" forceconfigs
-
-	insinto /usr/share/${PN}
-	doins Makefile.inc
-
-	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		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/"
-	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
-		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
-		ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	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-2019.12.2-r1.ebuild b/net-wireless/kismet/kismet-2020.09.1.ebuild
index 73b8a86810b3..06840c1eb328 100644
--- a/net-wireless/kismet/kismet-2019.12.2-r1.ebuild
+++ b/net-wireless/kismet/kismet-2020.09.1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools eutils multilib user python-single-r1
+inherit autotools eutils multilib python-single-r1 udev systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
 
 	#but sometimes we want a git commit
-	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	#COMMIT="9ca7e469cf115469f392db7436816151867e1654"
 	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-${COMMIT}"
 
@@ -33,11 +33,13 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth"
+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:=
@@ -83,9 +85,14 @@ 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
+
 	# Don't strip and set correct mangrp
 	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
+		-e 's|@mangrp@|root|g' Makefile.in || die
 
 	eapply_user
 
@@ -113,6 +120,7 @@ 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
@@ -120,11 +128,11 @@ src_install() {
 	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
-		enewgroup kismet
 		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
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index f55bc6dc159c..06840c1eb328 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools eutils multilib user python-single-r1 udev
+inherit autotools eutils multilib python-single-r1 udev systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
@@ -38,6 +38,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="
 	${PYTHON_DEPS}
+	acct-user/kismet
+	acct-group/kismet
 	networkmanager? ( net-misc/networkmanager:= )
 	dev-libs/glib:=
 	dev-libs/elfutils:=
@@ -83,9 +85,14 @@ 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
+
 	# Don't strip and set correct mangrp
 	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
+		-e 's|@mangrp@|root|g' Makefile.in || die
 
 	eapply_user
 
@@ -121,11 +128,11 @@ src_install() {
 	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
-		enewgroup kismet
 		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
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index db93b745df76..c596280be249 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -6,24 +6,14 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
-		<flag name="client">Build the ncurses-based user interface</flag>
 		<flag name="libusb">Support libusb based capture sources such as mousejack, cc2540(ble), and nrf51822(ble)</flag>
 		<flag name="suid">
 			Install a setuid root helper binary with limited functionality;
 			this allows running kismet as a normal user, significantly
 			reducing security risks
 		</flag>
-		<flag name="mousejack">Add support for mousejack hardware using <pkg>dev-libs/libusb</pkg></flag>
 		<flag name="pcre">Build with pcre support</flag>
-		<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag>
-		<flag name="plugin-autowep">Build the autowep plugin</flag>
-		<flag name="plugin-btscan">Build the btscan plugin</flag>
-		<flag name="plugin-dot15d4">Build the dot15d4 plugin</flag>
-		<flag name="plugin-ptw">Build the ptw plugin</flag>
-		<flag name="plugin-spectools">Build the spectools plugin. This uses <pkg>net-wireless/spectools</pkg></flag>
-		<flag name="plugin-syslog">Build the syslog plugin.</flag>
 		<flag name="rtlsdr">Enable rtlsdr based kismet capture sources</flag>
-		<flag name="ruby">Build extras which are written in ruby, example plugins and the like.</flag>
 		<flag name="ubertooth">Enable capture source for ubertooth to sniff bluetooth low energy</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-wireless/pyrit/Manifest b/net-wireless/pyrit/Manifest
deleted file mode 100644
index 19f6507d9a99..000000000000
--- a/net-wireless/pyrit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyrit-0.4.0.tar.gz 191614 BLAKE2B 4cace6de8ba8d66445b9a082cc4d257b19ad2ac3a8003ce45c667dded0438e7da26bc6d25a3a33b2ef998d7af137c03b59610bc6e5637b6c7c70897e1b76d68a SHA512 8111b3f6f1a94319f5e146db6c184eb391c03ca554b20ea7227237afbc546a064898835ad16007333bb63aa725079046d413be11dfc3ecb76c77b6ac5096f7e9
-DIST pyrit-0.5.0.tar.gz 267614 BLAKE2B 2a0df7ebf2a06aee3367e9780d075ec2b6b76a8d9227ada17778eb386fa0243a06639ac27b8e7f6de2370d88836196288670c9d5112dada5dcb8b32efcae7da9 SHA512 912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25
-EBUILD pyrit-0.4.0-r1.ebuild 829 BLAKE2B dc1cd9c6c96e71d02e95e030eebcfdd82cdde96168bd4d89bb0ddfc91b896ea0318da8a68f0cf20d8e8702c1bea023b215516c29c0d24e379de9943912712db9 SHA512 87a90cbfafa92d5ec0c0ba010d18ec998c17c4531fcd1097bde3435ea4df0d3d8d19cd3a217f717fed73c3c21c4ffdb26f2758aa73db12dc6415dae97d84c7ee
-EBUILD pyrit-0.5.0-r1.ebuild 878 BLAKE2B b4b40a474875926a0e196faf3e74670dbde5307aab9d4d9a735642a9dc0a4db04234d4beebc501c588ec35ec3167f8a188ea2f6db724130d6d43c1b7a73615d9 SHA512 4b9a2099780aa4e72076599bad5f01ef55d65493e42555e851e85cb9e2ad2e301c3ab5cb1ba275ff3db874cf1c521c2bed136a570c780e1d90259af0f2b0d01d
-MISC metadata.xml 748 BLAKE2B df71b5873e8e4dae8a99c55089dc2be37ebb1c9f952ad690e1fb420e65356b62a097685a33f97f229c8f3c56ec04fe6938913b8eb86e399b1ad4b9645dbd627a SHA512 df0f3711149c3db962c544ec7c4733e69039b1a27dfaf2fedfe0330049f4524c686b65c83307b3eafd5c592c41e9a75f8517d262ef7e66440d7f279164ff7e9a
diff --git a/net-wireless/pyrit/metadata.xml b/net-wireless/pyrit/metadata.xml
deleted file mode 100644
index 6d1f64c4bd81..000000000000
--- a/net-wireless/pyrit/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>oleg@kaa.org.ua</email>
-		<name>Oleg Kravchenko</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="cuda">Enable CUDA support via <pkg>net-wireless/cpyrit-cuda</pkg></flag>
-		<flag name="opencl">Enable OpenCL support via <pkg>net-wireless/cpyrit-opencl</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="github">JPaulMora/Pyrit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild b/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild
deleted file mode 100644
index 5f819594a5f5..000000000000
--- a/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="GPU-accelerated attack against WPA-PSK authentication"
-HOMEPAGE="https://github.com/JPaulMora/Pyrit"
-SRC_URI="https://github.com/JPaulMora/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda opencl test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/openssl
-	net-libs/libpcap
-	test? (
-		$(python_gen_cond_dep '
-			>=net-analyzer/scapy-2[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-RDEPEND=">=net-analyzer/scapy-2
-	opencl? ( net-wireless/cpyrit-opencl )
-	cuda? ( net-wireless/cpyrit-cuda )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_test() {
-	cd test
-	"${PYTHON}" test_pyrit.py
-}
diff --git a/net-wireless/pyrit/pyrit-0.5.0-r1.ebuild b/net-wireless/pyrit/pyrit-0.5.0-r1.ebuild
deleted file mode 100644
index 451b7678ac0f..000000000000
--- a/net-wireless/pyrit/pyrit-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-MY_PN="${PN^}"
-DESCRIPTION="GPU-accelerated attack against WPA-PSK authentication"
-HOMEPAGE="https://github.com/JPaulMora/Pyrit"
-SRC_URI="https://github.com/JPaulMora/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda opencl test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/openssl
-	net-libs/libpcap
-	test? (
-		$(python_gen_cond_dep '
-			>=net-analyzer/scapy-2[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-RDEPEND=">=net-analyzer/scapy-2
-	opencl? ( net-wireless/cpyrit-opencl )
-	cuda? ( net-wireless/cpyrit-cuda )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_test() {
-	cd test
-	"${PYTHON}" test_pyrit.py
-}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index f29ec9f290ac..d7cea33ba987 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -12,7 +12,7 @@ DIST unifi-6.0.15.zip 181660567 BLAKE2B 7dd73e54711333ed3893994dcde15e8d362a823a
 EBUILD unifi-5.13.29.ebuild 1566 BLAKE2B f3518c77f5344023a9f219e5e01b501b0d1855879c06c90b7b89798059100e844325fe1cf42c09117049056d49df19723613977eb3f73da4a5845e403a5303c8 SHA512 b3d01a742500089913ceba14990b18cea9470be9413b753ae3ab17e4adbaf49a5575f4ffdbcbb97c7b369be3aff400a3b3cdcdf711d944dc3865f3844347cadb
 EBUILD unifi-5.13.32.ebuild 1567 BLAKE2B cbfbf056c1f98854bc1732b2b4c3204cc1f9b63f9a3fece1bf629047d87164d9b4487f39825e90f41a6cc4251985bc1e263ab1efeb297034d4316107e93043b2 SHA512 9e251af9c81088256c6bdd06a6c557f9a7cc10c4e6e48aa94e0a76173cd2dedca26886d3b52bc7d39b6a9faad30ebf5306d178803cdc8ba95bc2bdec8b4974d9
 EBUILD unifi-5.14.22.ebuild 1567 BLAKE2B 18e719065dabc0f01e0e9ef1b078e9351e915fef828efb36ce4772226f30d20c4833fff9255e23c59fbbf2e6f77e89423d3a909f0faf2978e86d11f55af70645 SHA512 811b5ab374ff4673916ee7577a48e48638bf0336542e1884e2cefe92d3b8b31d13a69bbb74547b06d0511c832901e8e8388f802a04ec5322671fa360c90d7758
-EBUILD unifi-5.14.23.ebuild 1567 BLAKE2B c31646d73d1431df37128fcae64363d48625387686111d52d79ce4b4be70f69f07886daacbbb03e8782eb32cfb7959d70b25e7097a31b7dca284ad807329ca04 SHA512 de7d3746952cd92fcce20e643c8ecca38435f9be33f3a123169cdffda27b9dfab98760ef4316f1c97cb64726739a94dc32ce8f2a01e4772f4f29bfcfe261feda
+EBUILD unifi-5.14.23.ebuild 1566 BLAKE2B b41bc9e03b2812566edb82bf3127501cb12df15484045c267c2e47bf1eebdefc740ee978c36e914d3cd1911728b7a4871f2bfb2f90198d38b9c3a771299c4e4e SHA512 a9998d13dda0fd508595d0c53667fec28001c1ee5766422a793f8a512c22a1266933c21f5e6e3b17702f68cd328aa5202f810aa9da020fdd66c88b3e80c30afd
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 EBUILD unifi-6.0.13.ebuild 1566 BLAKE2B bae463772dccc551033e2bd55b2245f61dccffe681748a0c01c9694c621462a1a80404f3b3dba0ce43c4a281e2f2caf5c0ccd3844cc8a360b636652715e35366 SHA512 86c928324383f716df8b6f0ff7bb7e80728dfaa733544eefbe8321b5806260622a149b3e0ae04dc7e304b9036ef3bd500eb2d3883af0cb3a941a6151daae81f4
 EBUILD unifi-6.0.15.ebuild 1566 BLAKE2B 8b4b7da944d361f82cb4a8eeb4ce65b83784df4c0581bc4873a73c744a4d8de6fdc04d635d328b97533acbee5cfa94109a436374ffad5623a22e6bad6a5999e7 SHA512 3f784d89287bb0a56309f8ed79acac9b8723b30f4e24a15b7e65a2c3c232a7084c7c2739a5f855f60defba114dacbb17f10aee797b8c3c94f408b59773909516
diff --git a/net-wireless/unifi/unifi-5.14.23.ebuild b/net-wireless/unifi/unifi-5.14.23.ebuild
index 3347070e980d..ddf7cd97fb43 100644
--- a/net-wireless/unifi/unifi-5.14.23.ebuild
+++ b/net-wireless/unifi/unifi-5.14.23.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/5.14"
 IUSE="systemd"
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index 9ce24a45a902..17b91b761770 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,5 +1,4 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
 EBUILD wireless-tools-30_pre9-r1.ebuild 1775 BLAKE2B 154b536864dab7a1b024d17a8a996c8641674a936ab08580b98eff46d6024d0eb61b28b427515e80cd93302cdc0c8c6435af2b5ef34f59270642a40ce83703b0 SHA512 27bba166483e60c9daee81683d4de75010491245297a556a7b6e1440f61cb2906051571101577a5bed624662ac23b4efa115da15b545f7d0569dd13fd46dc52e
-EBUILD wireless-tools-30_pre9.ebuild 1763 BLAKE2B 13d6da1bc9bbf1ca4bfe19a83a4b8b3dfe2ca8642abde1f2711814051ca91047bbf161d069acc3dbacea8cb5dada5ace287de309c1c60121809610a01fca272c SHA512 6099ac7cd5f4615e49ef894c21278df88616479ba7a5a8d7e41e289cee43c1eacd575d36ac7804968205ac9396bdbf060a67ff127722dea362bf3e23d8838987
 MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
deleted file mode 100644
index 0d412dd1f216..000000000000
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs multilib eutils
-
-# The following works with both pre-releases and releases
-MY_P=${PN/-/_}.${PV/_/.}
-S="${WORKDIR}/${MY_P/\.pre*/}"
-
-DESCRIPTION="A collection of tools to configure IEEE 802.11 wireless LAN cards"
-HOMEPAGE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="multicall"
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-29-asneeded.patch
-
-	sed -i \
-		-e "s:^\(CC\) = gcc:\1 = $(tc-getCC):" \
-		-e "s:^\(AR\) = ar:\1 = $(tc-getAR):" \
-		-e "s:^\(RANLIB\) = ranlib:\1 = $(tc-getRANLIB):" \
-		-e "s:^\(CFLAGS=-Os\):#\1:" \
-		-e "s:\(@\$(LDCONFIG).*\):#\1:" \
-		-e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man:\1/usr/share/man:" \
-		-e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib:\1/$(get_libdir)/:" \
-		-e "s:^\(INSTALL_INC= \$(PREFIX)\)/include:\1/usr/include:" \
-		-e "s:^\(BUILD_STATIC = y\):#\1:" \
-		-e '/\$(CC)/s:-Wl,-s\>::' \
-		"${S}"/Makefile || die
-}
-
-src_compile() {
-	emake
-
-	use multicall && emake iwmulticall
-}
-
-src_install() {
-	emake PREFIX="${ED}" install
-
-	if use multicall; then
-		# 'make install-iwmulticall' will overwrite some of the tools
-		# with symlinks - this is intentional (brix)
-		emake PREFIX="${ED}" install-iwmulticall
-	fi
-
-	has cs ${LINGUAS-cs} || rm -rf "${ED}"/usr/share/man/cs
-	has fr ${LINGUAS-fr} || rm -rf "${ED}"/usr/share/man/fr.{ISO8859-1,UTF-8}
-
-	dodoc CHANGELOG.h HOTPLUG-UDEV.txt IFRENAME-VS-XXX.txt PCMCIA.txt README
-	has fr ${LINGUAS-fr} && dodoc README.fr
-}