Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

23 files changed, 119 insertions, 214 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 01de0d1bada1..dcf2362385e4 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 38f60e8ee447..90d2db5e5baf 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -10,6 +10,6 @@ AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a591
 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1
 DIST bluez-5.50-fedora-backports.tar.xz 32232 BLAKE2B 35244036bbe18481e32bef2dcd4a223d44442ce28cee85a3a736bfbf5ee9d74372fa6366dc1102bf86babada608966a8c30b1c2537859a3741c289cabbc76026 SHA512 6d33e8bc67e50dc0d4cee3fa080402a51ddc8b6549f19b6c272de7dc51604eab23f909322f01aaca8a834abdc3cfd0bf24bb8623071af0cf0611d7427c9d8e9a
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
-EBUILD bluez-5.50-r2.ebuild 8152 BLAKE2B 9a5973bb8fade0c504fcbc425d79c895a4c86122b4eb91fd77b03a8b11f3db70dd72a264c82e2f3c8b13a89d2e54b6bad51b3b257665f30ad9c4878ee9c3f8c6 SHA512 c22e0b7230c3b8ec1c30eb6b1df3e2323379aa453206afebb146338c60a8e695f37b2dc4778a733262fa9068664a4e07f5f8cd26347d758384f047fd8201d0fa
+EBUILD bluez-5.50-r2.ebuild 8157 BLAKE2B 8156c32dd8c0df0f84e48971a23f1bfabcbee9dee023390d4e8b0747ef2cf895811fb097242e3eb7402f1b716b2f18b5ed5eefd8929e1e2f5df46c0f401630cf SHA512 ef118fbbedad97e9a99601f60cdd32c02eab7ae782ab875c8126ed921a00ff8117cc3f31628605b08ff1169ebe1858b26b80e9b3ff36ca0c3216cc7ca9acdc7f
 EBUILD bluez-5.50-r3.ebuild 7990 BLAKE2B a909e6b969f90d3602db76fbf1614df14507cce2ca6b131f36fd5617033083b7a7fbe3f97bf315d85d9438b9b5f30d5ed82f1ad2601707378c19204af3f85ebc SHA512 b0d65fa1383bbb03dfa5db4c5b24880ddace37b200bb00fd68c49d3609c6505b4f502fdaab0d56576b05f4f75278372932de98f70b00f11c9ba26e317d911ceb
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.50-r2.ebuild b/net-wireless/bluez/bluez-5.50-r2.ebuild
index 4c335870096f..5415ba0b6795 100644
--- a/net-wireless/bluez/bluez-5.50-r2.ebuild
+++ b/net-wireless/bluez/bluez-5.50-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+inherit autotools python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://www.bluez.org"
@@ -53,7 +53,6 @@ DEPEND="
 	udev? ( >=virtual/udev-172 )
 "
 RDEPEND="${DEPEND}
-	acct-group/plugdev
 	selinux? ( sec-policy/selinux-bluetooth )
 	test-programs? ( ${TEST_DEPS} )
 "
@@ -87,6 +86,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+	enewgroup plugdev
+
 	if use test || use test-programs; then
 		python-single-r1_pkg_setup
 	fi
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 6e5f06cf16ff..5bb74f966c88 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,4 +1,4 @@
 AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f7ba43e2350ed2c7e88aaf6fef4b06c51b6212650523c4de577cb3a85946bae9b955cf6c17a0c984431abd5d2b SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d
 DIST gnome-bluetooth-3.28.2.tar.xz 349456 BLAKE2B 24a8adbbd37a6a7338a10bb84fd113c3a65bb9c5ef277c9df082f10f52b9d9dc2bc3ff6182993fd85fb5f5f8269a965f0aba864f73ed8595a700a51e59242fc1 SHA512 03f66f8c5c195b10cf2c13dc93191b9f2f79adae099ddb8037ef1277731f37b8f0a42b603e8aacbe2fb108be6abf7a77a823d86d5fac62a42a53e3498d53d87e
-EBUILD gnome-bluetooth-3.28.2.ebuild 1422 BLAKE2B 3cc1a98ac82cecaeb19a6ccafcff223da18b52187295d8122b185942146f10cc59fc91af72278f8ed33d2411f576dcdccb821a95e16d299ddd9b7b6109fe2d5a SHA512 0899e136be0a00ccb890ce076426bfbb5689cccdada82e1831b851a8cc09ff1b191db3e94031a3eaacf5eb1940d37c7165499cdbcfefff48d9506c81c5ce7c6d
+EBUILD gnome-bluetooth-3.28.2.ebuild 1439 BLAKE2B c9833e1a82c420c0a8073abbdb5841bc6ee2e5ba7104fec68d74c916907fe8995cbfa00fbbff3439923a65ab5ea3d538c6305ecd65715d7f95496da85b077760 SHA512 1e65c3c9a0c92fd81551218611ccbfc34fa7cba3b2b8ac602552414a5541b92aed0dbbd5069a1b03ff1ef4f0d29ec5f072f6793de7948fcb643a9be09b16246c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.28.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.28.2.ebuild
index 67dc1ab5ae02..9cbfd6f8efd0 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.28.2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.28.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome.org gnome2-utils meson udev xdg
+inherit gnome.org gnome2-utils meson udev user xdg
 
 DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
@@ -21,7 +21,6 @@ COMMON_DEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 "
 RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
 	virtual/udev
 	>=net-wireless/bluez-5
 "
@@ -34,6 +33,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+pkg_setup() {
+	enewgroup plugdev
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dicon_update=false
@@ -50,7 +53,7 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	if ! has_version 'sys-auth/consolekit[acl]' && ! has_version 'sys-apps/systemd[acl]' ; then
+	if ! has_version sys-auth/consolekit[acl] && ! has_version sys-apps/systemd[acl] ; then
 		elog "Don't forget to add yourself to the plugdev group "
 		elog "if you want to be able to control bluetooth transmitter."
 	fi
diff --git a/net-wireless/gr-scan/Manifest b/net-wireless/gr-scan/Manifest
index 7cce3e2f662f..5ffdc5620078 100644
--- a/net-wireless/gr-scan/Manifest
+++ b/net-wireless/gr-scan/Manifest
@@ -1,3 +1,3 @@
-DIST gr-scan-20160211.tar.xz 17872 BLAKE2B 4dc4d579e4ac3b6e713f577201fb5a0fdedceff98464cebaa4188a3d4c719660dbebbd5a2167fda6a30f3cd82a209699e4be438406bd150fc5e18119cf36599e SHA512 218c39f2143050a7315b01cac723880ef9153165bf2257ec1cb2df4837920f2609d6de98a9dd28b058528a598c4fd1f60c14d0e4ff44f021742e55c9ad50e890
-EBUILD gr-scan-20160211.ebuild 733 BLAKE2B e03c659751421054bbed7e09e6b8023873cc9d8889330633cfc5845e90f9f19100e9bda90b94380c468b404db1dc95221c4476d7ebcb54f99ef6a8e5d5c768a9 SHA512 4fd0562a0a74c1a6e14c905779b7c9d6e188b5c470a3229103aa3edae0dde33b1d169acf00f716061f234199ddffac6a205643379f2de1a4e4f80b0eaa033d97
+DIST gr-scan-20160104.tar.xz 17804 BLAKE2B c7b2a4d77e9ddbbb0a1fb81b8c4da0f61b9a8bcb516c3ad1e53a46b98d045f61c09da85761300fc11551827a07077296f04faa7f0b675587d455e84af745aecb SHA512 e19a2053b5fe6c4db6f397cfce6313306f4357964dc32ee6c41a7aaec9a36407d06d90cf32d3fc916ac04f74dc76d75c7b20502227559a489a99d323ea585b50
+EBUILD gr-scan-20160104.ebuild 474 BLAKE2B 589dd4f244707962ab112ef0d0feebb330a2e60f158bbacca2302aa410bdd88c290082696d2d6170df8189bb11d921f4f2dc244a88730740a49c85c64d9bcc7d SHA512 304d5c68d90ad150fcb21114af610c26b0ce8c61202347b97b3951a841295f4b850535b9515682769894c305ab96bf9b41352d0688a86abec33a56add559311c
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/gr-scan/gr-scan-20160104.ebuild b/net-wireless/gr-scan/gr-scan-20160104.ebuild
new file mode 100644
index 000000000000..7221db020de9
--- /dev/null
+++ b/net-wireless/gr-scan/gr-scan-20160104.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Frequency scanner for GNU Radio"
+HOMEPAGE="http://git.zx2c4.com/gr-scan/about"
+SRC_URI="http://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz"
+LICENSE="GPL-3"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	net-wireless/gnuradio
+	net-wireless/gr-osmosdr
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/net-wireless/gr-scan/gr-scan-20160211.ebuild b/net-wireless/gr-scan/gr-scan-20160211.ebuild
deleted file mode 100644
index 8ac634e2728f..000000000000
--- a/net-wireless/gr-scan/gr-scan-20160211.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Frequency scanner for GNU Radio"
-HOMEPAGE="http://git.zx2c4.com/gr-scan/about"
-#SRC_URI="http://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz"
-COMMIT="25030f6063e796e5cb048ffc1ec7e1914192146b"
-SRC_URI="https://git.zx2c4.com/${PN}/snapshot/${PN}-${COMMIT}.tar.xz -> ${P}.tar.xz"
-LICENSE="GPL-3"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-wireless/gnuradio:=
-	net-wireless/gr-osmosdr:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	sed -i 's#install -s#install#' Makefile
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/horst/Manifest b/net-wireless/horst/Manifest
index 3db101ac0e04..3d88c73da495 100644
--- a/net-wireless/horst/Manifest
+++ b/net-wireless/horst/Manifest
@@ -2,7 +2,11 @@ AUX horst-5.1-CC.patch 252 BLAKE2B 433c63fee4a658b36e9569496e83c7c9fc0700604d65e
 AUX horst-5.1-pcap_bufsize.patch 872 BLAKE2B 8a6efdf7becf69b161cb582dd3d1331eb0288f74217a6c4451917b79f7469b03837efed00ae390c08c1f2da16b12bdfeca97c714aa0a849b22d2526881be5933 SHA512 52581262e9d3527c2db42935e74b328a41e3bfc6ebea6687053b82a230b223fe7fdea2e8cf8287caa921de0e95bfd04e0086046049882ba4c68b8b91013a4130
 AUX horst-5.1-tinfo.patch 263 BLAKE2B 94082bdde6de7ebf957628b963e25189c2db0c37cbc96f1d7854b9c35139ce9c8c942e9a70ce0f49b99687253d484c371cacd8d0d823649de7a0768fa197bbef SHA512 955491bbbe5c997b941e0654d028fd8aefd9e789f2ec57204b0e5a11d1cac0a83f0101ea73182b4be9d4690e891bea097b37f29d506ae3eeb90d7da6f7c41d76
 AUX horst-9999-tinfo.patch 244 BLAKE2B 87be3426db885f2ba8256faa7ee44c6d33b897dfdd59462f6dae311b82556004065df7b6177d8e1a506a1fabb92454f70f379bfce334234374ad01a300c2b7ae SHA512 54990da3d2825f2ff128379c81aa3f396f8b57429b73ee7301cb57f67f7bc90726980e4db78be95fd8372d6158ff8df9a68db13d9f76994502a95941d27aac17
+DIST horst-4.2.tar.gz 97976 BLAKE2B 9f59e2dd6f67b50d0d6c67ff269f327e073edbfa87db5d3d63621116123cdcda3d85759e47bcd26344f750f87b0516589aff140542f2ef36cd12dddd048be60f SHA512 a6fa50d6eb0d2c2ae83dfccf59359f8cd74334dbc2362f01f1a3787ebb3d34bcdb76c34899cb048e4a4abc7353d72e8dd846b567ba228f9930e3f418b3656c0a
+DIST horst-5.0.tar.gz 115572 BLAKE2B a7702fe05a706f3f9cfd0545850451e1035840503c1fdf9377594d883095e41acaf89dca4ef9433f3a0109491932612e657dce8054a9f28c2bd725d230588bb1 SHA512 d2df54fade3d62b91482fb16e34f9b03567285880eceb5baea3f76b46caf1763909f3999b2924e210eb0ab0d9fd9f6444f31d2b06ea1a3b73a9f54e257cfd989
 DIST horst-5.1.tar.gz 117392 BLAKE2B 4e21a1cb4d508c8ed6e63fe975a30299452c706aec1a83125acabc547ab8718bbae66d546d973bc10af1f0b6c885a20193c584312c30f5ecaef9d86156c0b12b SHA512 d2889a8c42c31bea72d4e0efd7141ca56c96953b37d2476793ef52d019720059eb57e48b72fa5d720e0c5518a9b0b8dee1a105828d581655c0fbf4dfb29698c4
+EBUILD horst-4.2.ebuild 685 BLAKE2B ec04008d3e20a19b4ce054448eb16b9239e80fb831d4d97954458e2e646064ef03b33d91b171f6a9240ee8451f0e0d9940c3857128bf8d25003d8fa2618f6c34 SHA512 4eb7dddc151955b926ac4d61cdb8a433d8746272bb1c446bdabf0dfda5d86ac90758668f09bcf4c188341d3a658f77517ed67949b878f991daae4fdfb45ef4ad
+EBUILD horst-5.0.ebuild 727 BLAKE2B c680e63fd2044c4766e4a405f0329916578cdff4091c7d341c26b528532166c790f87e9ee1b6d719e9fdff890e91c2722ef3ae1f0e02ab1dbef588ee85864e36 SHA512 57001845bfcac12b7e1583e51edc8f2d7602c48788a6b83facb0bfab2c94a3afbce75a389322dd6fc11c4ff9235388017c1bbb4bcdf75e86e17222856bb80de6
 EBUILD horst-5.1.ebuild 902 BLAKE2B a8a17629fbe942b75f755d860ec2c2ddc6524bf626d757f11bc273b7deaf4efbde1d782c0dc71171b402a0fde88a88ecc8ea679530851336ffedfb7773bb4c70 SHA512 c6042e1dd4c75fd41e94687a1231921b42883c35fb56ff97b5361a5c51b2876ab7b65026a1524a7603b6cabf719ec719bfe5957ae7cc7c55f8d065ea54e1ee48
 EBUILD horst-9999.ebuild 810 BLAKE2B a2fae8554af5eca1c8b62593a617f0a49b20fb736dbe3c6f0580ed05865de1ef569dd4f01298dc8dbcdd13cced825d9a218886952290416d0469c2f12e1dc79c SHA512 cb82f22c69fdaaf1343c4bc0df6c82eb48c3380bbe289988a8b805d4b892af7e7b65a873187a1bcbcee23d745773d21427f8e4580ae5836ae6dc9411cbd4db1a
 MISC metadata.xml 345 BLAKE2B cfd5f56689aa8af1450eeeadb90726bf94db301545fc4ec3f02bca2b6f2b53dcb2013c272530747bc6f42575c2cf92164b60091bb07cd819da2197c283a5fd98 SHA512 ad77a1b246b65a97abcedf9f80c8f37fba7081a4b3466ed734eb57042129d492c2851d13b7768f11dc412c9316d1ccb6f91575d11f6aed806a6972141057f653
diff --git a/net-wireless/horst/horst-4.2.ebuild b/net-wireless/horst/horst-4.2.ebuild
new file mode 100644
index 000000000000..a799b0945eb4
--- /dev/null
+++ b/net-wireless/horst/horst-4.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Small 802.11 wireless LAN analyzer"
+HOMEPAGE="http://br1.einfach.org/tech/horst/"
+SRC_URI="http://br1.einfach.org/${PN}_dl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +pcap test"
+
+RDEPEND="sys-libs/ncurses:0
+	pcap? ( net-libs/libpcap )"
+DEPEND="${RDEPEND}
+	test? ( sys-devel/sparse )"
+
+#just semantic tests, no functional tests
+RESTRICT=test
+
+src_compile() {
+	tc-export CC
+	emake PCAP=$(usex pcap 1 0) DEBUG=$(usex debug 1 0)
+}
+
+src_install() {
+	dosbin ${PN}{,.sh}
+	dodoc README TODO
+	doman ${PN}.1
+}
diff --git a/net-wireless/horst/horst-5.0.ebuild b/net-wireless/horst/horst-5.0.ebuild
new file mode 100644
index 000000000000..c06fc8f45db0
--- /dev/null
+++ b/net-wireless/horst/horst-5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Small 802.11 wireless LAN analyzer"
+HOMEPAGE="http://br1.einfach.org/tech/horst/"
+SRC_URI="https://github.com/br101/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +pcap test"
+
+RDEPEND="sys-libs/ncurses:0
+	pcap? ( net-libs/libpcap )"
+DEPEND="${RDEPEND}
+	test? ( sys-devel/sparse )"
+
+#just semantic tests, no functional tests
+RESTRICT=test
+
+src_compile() {
+	tc-export CC
+	emake PCAP=$(usex pcap 1 0) DEBUG=$(usex debug 1 0)
+}
+
+src_install() {
+	dosbin ${PN}{,.sh}
+	dodoc README.md
+	doman ${PN}.1
+}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f3fc8a024b8b..cc74e57e67ca 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,4 +4,4 @@ DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803c
 EBUILD hostapd-2.8.ebuild 6682 BLAKE2B f7b0f129334d7d784f89de6fbcc2086f347ad740ba2daec570f721c109871239cbf6fd4f2d894d358b128cc497d368046aa05a6e0a6705f7ba79d5ca98a69416 SHA512 e23c2e753f91b69da5e4b5fa49b9683c92c8df5af17f5d457f2e8639fb0cee1f96490a81d914d592dc3fb74ad61d0e79528045edb401d33c8828045ebc4f7e08
 EBUILD hostapd-2.9.ebuild 6683 BLAKE2B ae53db361d4e846f2c1f08960235d69dda3d4162c9a261fa144dcb623751c9dec68285d00821e40afa707cffc08fc2474d47f7e28fee4fb1dc01425237a21571 SHA512 7912df1d03950951f7c5b80eaa262717939ac6347ecb0becf3e71bd81aa891a57ad16dec174c86d8a34cc2e5253d27cb9f7e4beb42887f784b9d05f733d484ee
 EBUILD hostapd-9999.ebuild 6687 BLAKE2B d9c80e418f9f19e44afe890ab9251ea0b3eba6e4c852ba2bb25ad17466801de9c4e52f960f3baa13be1b3de49a7cb7188ca9c23fe1b2128fdbd74e2e6a9e03f0 SHA512 f8f78876354cd9501d4260309b526c61c1e2d6b501f27fd539ff50a6c651f5fbf482be730360fffd4c8d168096349e15053eb8d21939f7dc5c4e33568af2b5ea
-MISC metadata.xml 1055 BLAKE2B f04ae6c0be8dbf9385cc0ce306a3aee69c0c07370e6574a88804ba0ed4cef38c81ec61ca6cac9b1810ce5d07ce6bd97f0dfec23b4737c4b092a12cda95799994 SHA512 afc6a14a55d177190797a6483fde1e6ea397ed43b60faf9d3bb919e5c9c68aaa75238d73a8e15d3a3450d916c6b5d9bc2cd8cf75fc4592cc99220128152a5867
+MISC metadata.xml 973 BLAKE2B 009e9b39aa6c7d1d6da4421ec1d0c4610a64b136b497f92dc5a822ab54449720cfacb9ce898fc2015cdcf741939acb46aa8797e13c80079ce424f5f6bfbde8be SHA512 19a5d72d11eee955856bde7065a784d1942b2c55adbb154e1af432c693763beedb1541d119ba6c0d7b5e2f37e13a3aa915b13def6c9ee651b6f4f7f8e85a57e5
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index b06f07f2352a..7cce4a9bd8db 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -22,7 +22,4 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:w1.fi:hostapd</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 4ab0fb6b1b18..9ea3b735f2f5 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -6,4 +6,4 @@ EBUILD iw-4.14.ebuild 771 BLAKE2B bdf9689a1784e513ba927bf4674abbb060f0065b066ef5
 EBUILD iw-4.9.ebuild 764 BLAKE2B e8fc3877f5f708350de7dd4ecb9bc457f066e898d8a30580842e13f651af755e1911d05ef695f3ba7ab9ebd98974788a5ada1ae793ef17a221b2ff44dd2a31b9 SHA512 c5e3fd7b855b8d3fcb5613e793f0278036fe1ebee2c40a41dc6aa9bddaf9176e3d8cb2d26fb951f721fdb5acfbc5ef1e6e85e0c9983b2c54cf69e74ae8493d0f
 EBUILD iw-5.0.1.ebuild 865 BLAKE2B eb0ecd9f2b4cb9310f4a49f33f85e348945d2ad4d666b3c0cd0bd4b5e43d6f4205f911341a7f9dff3638e20f7cdd8f270785722236573c1684742f0e1fa78469 SHA512 da9f4cbd8642006cb3cbc94cd6c35e0f188f967990f79f2e17669d74e7415d804867784ea64611fc461fa8ffdbcca18e1e65cc0675874a38a9e13e84871f0528
 EBUILD iw-5.3.ebuild 869 BLAKE2B 441f9cc4a8eea707fe8c714e49f611c10f90ffa11a9966c46cb738847c653feebbe9ffd8db3899e7e3932a934857d1872bc8949e0d51e1e1cc847562c4f78f7e SHA512 8defb95178b71d16f5b880e63d1cc378ba99fcf874152ac4652d30cc82a131f5a608dbeccd94b817c59c31ef82e03e8c128c8a742bb6f805d439f068a1cd6b8f
-MISC metadata.xml 325 BLAKE2B 4081db738ce07e18a087d3517e082f3aca70e17aa3e7fe371795cac7fead6fcd6a8226817fc0d995a8be9e43cb56617c345b64abbaf806ced7a96246538db9a5 SHA512 4d4ca6e03b9d43532e35b043873f134e47176b9e22b9c61e19a129726e2685218beecf31148ec5d3eba6cd02a0f818c1e2032e5bda247a1e51bafcbd7b951cea
+MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/iw/metadata.xml b/net-wireless/iw/metadata.xml
index 7b261cf7822c..2b9b4266ca5b 100644
--- a/net-wireless/iw/metadata.xml
+++ b/net-wireless/iw/metadata.xml
@@ -5,7 +5,4 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:kernel:iw</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index f04e51e8433b..45331b6f70d2 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -7,6 +7,6 @@ AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.09.1.ebuild 4694 BLAKE2B ecd5c2939a343e49db435ca704b147679df0ee8ea8fa73bae5eacda8ebf522e455e2044d413775073d241e6f78ca1633dfa92610a306c17d2fdfa57f1293624c SHA512 1f7b25ab6ac85e71c4e88aa5ce453de8b1a1f79bfe299999484fb919edbe65d8a12588c0b21ac98d2903551967870ca773235dcf56ac83df5cf6a7b47e386fdb
-EBUILD kismet-9999.ebuild 4694 BLAKE2B ecd5c2939a343e49db435ca704b147679df0ee8ea8fa73bae5eacda8ebf522e455e2044d413775073d241e6f78ca1633dfa92610a306c17d2fdfa57f1293624c SHA512 1f7b25ab6ac85e71c4e88aa5ce453de8b1a1f79bfe299999484fb919edbe65d8a12588c0b21ac98d2903551967870ca773235dcf56ac83df5cf6a7b47e386fdb
+EBUILD kismet-2019.09.1.ebuild 4694 BLAKE2B 5203e6f7cc6149e1272f97155aa62b157c8ecded4ff86c76f12ff4f0c5912b0f09ed361f7d265b89601c8a2c9cfcc4026f43ce785b4a8697ccc5fc8fe6d4b709 SHA512 438d2ea946ece4ba71cc60927f93da3f86e9fb91f7da70fbd3f13aade8b95b5f5982aa9930a626ed933fa9234bef719bee90506c66170bb8bced2faae35c13e6
+EBUILD kismet-9999.ebuild 4694 BLAKE2B 5203e6f7cc6149e1272f97155aa62b157c8ecded4ff86c76f12ff4f0c5912b0f09ed361f7d265b89601c8a2c9cfcc4026f43ce785b4a8697ccc5fc8fe6d4b709 SHA512 438d2ea946ece4ba71cc60927f93da3f86e9fb91f7da70fbd3f13aade8b95b5f5982aa9930a626ed933fa9234bef719bee90506c66170bb8bced2faae35c13e6
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/kismet-2019.09.1.ebuild b/net-wireless/kismet/kismet-2019.09.1.ebuild
index 491e99e9a65b..f6b223f22b1e 100644
--- a/net-wireless/kismet/kismet-2019.09.1.ebuild
+++ b/net-wireless/kismet/kismet-2019.09.1.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid"
+IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 CDEPEND="
@@ -53,7 +53,7 @@ CDEPEND="
 	dev-libs/protobuf:=
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
+	lm_sensors? ( sys-apps/lm_sensors )
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
 	"
@@ -89,7 +89,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable pcre) \
-		$(use_enable lm-sensors lmsensors) \
+		$(use_enable lm_sensors lmsensors) \
 		$(use_enable mousejack libusb) \
 		$(use_enable networkmanager libnm) \
 		--sysconfdir=/etc/kismet \
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 491e99e9a65b..f6b223f22b1e 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid"
+IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 CDEPEND="
@@ -53,7 +53,7 @@ CDEPEND="
 	dev-libs/protobuf:=
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
+	lm_sensors? ( sys-apps/lm_sensors )
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
 	"
@@ -89,7 +89,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable pcre) \
-		$(use_enable lm-sensors lmsensors) \
+		$(use_enable lm_sensors lmsensors) \
 		$(use_enable mousejack libusb) \
 		$(use_enable networkmanager libnm) \
 		--sysconfdir=/etc/kismet \
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 48a2661bcdb6..d61c00dfc105 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,12 +4,8 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.11.39.zip 112221641 BLAKE2B 33acc8ba7e31dc0e4bc768f26dbb9d995d42a5f9bf58b4671c5a3c973c575c3ca232781e6747ad82ff808df44dbbe71a75a340f738461f1e21a069d144440176 SHA512 2c2e5a4216b916905666b6d0585458d2dba8cfe5a60e183b95406361b39a97cd9c7243faaaecb439db77cf7e2751941c729c2d0bc4d0807aad18706e10e696ff
 DIST unifi-5.11.45.zip 112350672 BLAKE2B add0446bb39c169d988395f47e418ea63428bee8c5effa98d021128219f313572ac8763f26ffea7d5b051f9c7e4e0e2b6848d499fb2c68a8869e195d99d35e67 SHA512 e5a72a784ae7f6e829204fb39f7f7daef00dd30b59e7d8c2ddd7a20a302ad43c45bf7ad680cd824cf8a28d7017a05dbbc11c0c24a65d6a8980f86739785121c9
-DIST unifi-5.11.46.zip 112381219 BLAKE2B 7f73cf5db1d132af85fd54dda36cb82cedddae1d3c8e84282f9dcfe0766a839f165d17a8292096bfe976ccced1e29173476de9042f96cdc2c15c4edf24ee9c65 SHA512 41b03ebbbb49089bd40e3e715d7c9a447b42a6df61a2d3551175ae55b85010fd896318909f394bb166bd7a8e9fd7611439158a8141df349acf3b4980bbe9dd6b
-DIST unifi-5.12.5.zip 113544662 BLAKE2B 7b79a1b107927fbb6ee2c7bb531901b5cedef0768146b369e8653e0e34e41758914b5108a01681e806c117dd80561091b6064bffe779e913774d61ff2fba369d SHA512 ff3ab833ce13889f1f6c2d1ee71f28bf8d48789c053c84b1f427e95e09aedb4d9f66a640a1891262f31300af50859581dc874a613f5f92b3bcf18b05c0140052
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 EBUILD unifi-5.11.39.ebuild 1832 BLAKE2B 7c40929311169e488fca0f551e8636222bf15e8f7e180bca177fe7b1e3e1d217071689951676a7cc90fe106de74b08be430ac9731843390eedef700bfb2d0445 SHA512 aa414683457d916af76f22ae2004bccc79610f8522005202d0c43367227f5a6d46e1fbdf506993c7c20098a4b6d697824fab7d23088e73ba929727067465caca
 EBUILD unifi-5.11.45.ebuild 1833 BLAKE2B adf52bdbd0c09b41feedaa66635b7ae771c784efae0615f5adb40a03e7a3c5defdcbcbe40282ac91b4905f3a85825288a9914d6a773830ba515b406b3f257ca9 SHA512 ff34c8cbebc2ecf0307d459c551900b771b3ab452bdc9ab5fb9189aa612667116f47c40b1797a402200f7dbae7d465b74b68c069029975151aa8b2f1ff1ec42c
-EBUILD unifi-5.11.46.ebuild 1833 BLAKE2B b92cabb1ef13bb7070df55fc6a5d89864debed1f988124d0553644358ad11fea51b90bba105b89d1aedfd203ae309fbaf7f660b2121fbeb813238b0e72c3c00e SHA512 410792f35aff9d6569d1e53c94a2cac7646348dd0b5f554f7b53640d6e311fadf602d09cdcee57e2430acda10ee9d2b99a37fccea8bb2e3a3cf905119b27d9a0
-EBUILD unifi-5.12.5.ebuild 1833 BLAKE2B f9e7cae98e23b3525c628d0e987884f2e211d806073a97824bed45e4fb43dd131a849489d5c0bbb64cd7b865db71e600b9926a7b8ab38c70f2aa7e37e90dbb01 SHA512 46c149a06ee68e3e89a2ec3404c8eb501299649c2fd58a33a053d72caa85fc66cb1c6334e338d4aedcc3c3bee4bb18ae6468a2cdd882e46a213bb578cfc05d8d
 EBUILD unifi-5.6.42.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 MISC metadata.xml 802 BLAKE2B cf4248b03b6b0f5ecee40ab09e9d7fe718c8a3478aeb5814faa489b74080b19fa20b0db05b7910523c68297d2fc00a56d4b16822367811b52fbdbd2cf707962a SHA512 8071155df75634be1db52068b17960b194f47c8a1ca38f23fe4397df8c3156123c6023cab0d33db4dce1b0763beaa096ba6f745671c3078be637dad6ef63abf5
diff --git a/net-wireless/unifi/unifi-5.11.46.ebuild b/net-wireless/unifi/unifi-5.11.46.ebuild
deleted file mode 100644
index 221ef9e70a72..000000000000
--- a/net-wireless/unifi/unifi-5.11.46.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-RC_SUFFIX="-a5113ebc10"
-
-inherit systemd user
-
-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"
-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.11"
-IUSE="systemd"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.12.5.ebuild b/net-wireless/unifi/unifi-5.12.5.ebuild
deleted file mode 100644
index 545a8e5589ea..000000000000
--- a/net-wireless/unifi/unifi-5.12.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-RC_SUFFIX="-802c4da1a2"
-
-inherit systemd user
-
-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"
-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.12"
-IUSE="systemd"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index ef5807adf6cf..cf60bd9ef0d8 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,4 +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.ebuild 1768 BLAKE2B fe847c9861b38e619b5fe2496fea5d1e52e841d479b302faf7a2c1cf39b2c2330414b8a9128e7a7aca9d53fc0de855ab62d72219457842c8d17c07caae341056 SHA512 ae7bf5bbff8a2b1cb077c6b380895be7feea8f80a84b0c93b91ce787fa5cb20bb6aabc9b6ce8cee8fe70bac9e005e626b33604a4f4bb603d8e151be52956f7e7
-MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
+MISC metadata.xml 598 BLAKE2B 0085b4ab932754c0859d4596502bf01926536f85d772e8b8029909a6677ea154309bbf1573fdb8da48f8e89f360c1de6ae4231e3863e678123f11f7c37381a0a SHA512 98a55c6dc07509ff2917df4bfbf0fc3203ce0b3674f47f44002e7955d6374be28b8ecf32e657a4fe3dcb1e0496060ba31c4933b08b129186784fa2eeac26eedc
diff --git a/net-wireless/wireless-tools/metadata.xml b/net-wireless/wireless-tools/metadata.xml
index b6db26b52827..994039f32211 100644
--- a/net-wireless/wireless-tools/metadata.xml
+++ b/net-wireless/wireless-tools/metadata.xml
@@ -14,7 +14,4 @@
 		<flag name="multicall">Build the most commonly used tools as one
 			binary</flag>
 	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:wireless_tools:wireless_tools</remote-id>
-	</upstream>
 </pkgmetadata>