gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /net-wireless
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
48 files changed, 655 insertions, 220 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3612f2829689..7af2684159ad 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index f55e8423e960..35ff4d1414b7 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,4 +1,4 @@
 DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046a094f9c772a562f19ae783c30810cf7b6aa8668566ef6998af79090266771aeea8037b446eb0b9755b602ddcebc0d2 SHA512 72c249782dda3a875fbec98e4fe0e6044a6f123ebd36341a5f42733dfe6c26d96b5c74f67c0547b81c5dd5e2f52a6f475b424885f8e6fa21279ac539228038f5
-EBUILD aircrack-ng-1.5.2.ebuild 2929 BLAKE2B e6deaa039cfc88df20a8495413524eff1d0f90a742fd0ae3f21ba3211824bbba21965ba7f4f8e7c2ce87621b576dfa6d754ceaa3edb375a9e0c602167bdb5765 SHA512 1b1bf42f4537fdf5a757acc1a54469917946e238a49982ab364faa220fcc83627e1f5869039c1004f0405f2b8d0efd95a3a669f9ccd6183903c8ab1e50a0a41e
-EBUILD aircrack-ng-9999.ebuild 2912 BLAKE2B 1f63fc126c2e93c75f91f8a4f59274a8ae3379b74f85dea59ad97b8bbd46110d6e4904e71516b4f82a6e4bc948f2963510f03c2e289d96375d1fda6e54e8eb77 SHA512 b143217d62ae40565beb150307657e31e4b1e80f8e250f940f58c138bfbfc26b3acdb46c5743eeb215920710a484bc0abaa2d228f4778d0131093a689a86543f
+EBUILD aircrack-ng-1.5.2.ebuild 2919 BLAKE2B 43fcdcb640aa5935a3e2219effd6916261ef339a11cbd5640c4c3c0b7b19eb7a770152e827b8435073a035dfd31783981a588cc50400b7e7381cb792d5f08727 SHA512 8b55b035ce6adc7496ad42096e3350b68673a1c5fbc767435656941107d7259a3e8d578a90eae25ed357eebda34afe3ca1ce39e62e0921f03df92009f18b6e28
+EBUILD aircrack-ng-9999.ebuild 2902 BLAKE2B 5f58efb09471a894c7cff3898d7a73b252fe92270f2834fd22acb3c3f57ebccfcd96fe493bc7715d0bde7189ffb713ef8ae5dca5fc74b8ba864375d522f0e934 SHA512 5108b684defd91d55de9ebd9c0d26a4fe6c8e625cb7ba84eabaf0ded2f7cdd4e64b6796230185398f7679e7c1923bec3cf9f92503967729d87ca3ac519d018e3
 MISC metadata.xml 1033 BLAKE2B d1891cb0f4c12730c46b03a0b502b20b898881c1fab3a2260a85bfdd06b1d69ba0d7bac12afbbe37c060d2eefbaa5fc5d3e085efb0a28c65c443228279c9a24a SHA512 f42092ddaeac9aca346120d869382895a679d2a6eed8ad1b80fb91f7fbc7c356feba55629a1470ba18afa632d2bce1c7b9e3f3298d827a169e49c72f95a3892c
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
index 09e5e6b6a669..c03f3658dc90 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index cdc4a06e100a..a2e14c08c242 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index 8e6762c2146d..3e4982d4891b 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,5 @@
 DIST blueberry-1.1.13.tar.gz 1382261 BLAKE2B 5b23429243bc63d864f7176139a577cb5c8aea1f00906c218c66e92b9d679ad793f6429d01f9e49f960674b1ad5100d642075a730db49dd568282ea00089d8a3 SHA512 587165b33f087720f9ae72dfb37feda9c6c3e4c4ad166a5a410c078a63bea0d33182b781f8f0c7840575917d06faec752866009c9b3664241b7ca23ab1586b94
+DIST blueberry-1.2.9.tar.gz 1402410 BLAKE2B 0b816d4ca812b18e00a88d0d5b9cd1d44086a29f656d56cb23eede9b7f5cf7380ecf802ebc04369d39cbff56912292bff10bf31724389ab4a33731d2ce61c822 SHA512 6119cc9a7e1c18db2110f568f9fc8717ff0cc1db5fa8794f95734229cc4ebbc658b9b19c9b545dabdcbfa56c4fe2c5631c5fe2e8675860645790bb1c67aaa8f6
 EBUILD blueberry-1.1.13-r1.ebuild 1337 BLAKE2B cacdc37bd1749bd5796f92f1203d9d43580e2fe2325db1ee3eeaa4e57badff81e44a03bfdec6d25145cfd502fc90735b828538003252a3fdeab02d6896bf035f SHA512 a3e0fd5df76c02c9cb920120a0b5a57dfe777d5cbdfe870d5bc33440a28c4c39890fb86f4cff72bcf0dd86517317dc1759d5aac5fa03720a4e792abd458b20b8
+EBUILD blueberry-1.2.9.ebuild 1199 BLAKE2B c33b006a43069cbc82aeedafbea25256f93355dad90d6d3e29ed37071ea3a1a96390ed28b7dcf31e50fdeef0198591e3d1ea09a9b89c1bf5bf1eb29551681a82 SHA512 34721d07feb1b1163f76c5337c276f0a697c61e2b21e8b2b09751c4a10d2e1b7bef88c0335b3e3c6fd43fd7ef4c14db7618ba4968853d33879f2af0f3b9fa5a8
 MISC metadata.xml 576 BLAKE2B 1c705170b11fd8afef9f65f90743b7d3443b3952c084b771dbf93ea5bb4765cedce34cc818334ec01c577c85774e26fcf28b45d35c601e033b3478cd7713d87a SHA512 0d04db85d6d5ce7df8bdddc00ec8ff040e3a1bfdbde15300d83b4c7d59b8577314b43716909fae926ba5ace3ed75ff9b5fed7e1da3e7f8bc54f4411018d1b445
diff --git a/net-wireless/blueberry/blueberry-1.2.9.ebuild b/net-wireless/blueberry/blueberry-1.2.9.ebuild
new file mode 100644
index 000000000000..8bcaa8254cf0
--- /dev/null
+++ b/net-wireless/blueberry/blueberry-1.2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit eutils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A Bluetooth configuration tool"
+HOMEPAGE="https://github.com/linuxmint/blueberry"
+SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	>=net-wireless/gnome-bluetooth-3.14[introspection]
+	net-wireless/bluez[obex]
+	net-wireless/bluez-tools
+	|| (
+		>=sys-apps/util-linux-2.31_rc1
+		net-wireless/rfkill
+	)
+	x11-libs/libnotify[introspection]
+	x11-misc/wmctrl"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	doins -r etc
+	exeinto /usr/bin
+	doexe usr/bin/*
+	exeinto /usr/lib/blueberry
+	doexe usr/lib/blueberry/*
+	insinto /usr
+	doins -r usr/share
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/net-wireless/bluez-hcidump/Manifest b/net-wireless/bluez-hcidump/Manifest
index 85c54ea06871..6c6470e661ae 100644
--- a/net-wireless/bluez-hcidump/Manifest
+++ b/net-wireless/bluez-hcidump/Manifest
@@ -1,3 +1,3 @@
 DIST bluez-hcidump-2.5.tar.xz 157072 BLAKE2B e0ceb98f42a61f56ebf0a5a6adf3c95c6525106bf0491cff042f9938ab32819446be352f80dac0c26b44bfedeec58dadeb87caaf740a6ce150e91a6ca905bf2e SHA512 20e05bba1ea53fa774311fb0c24263c8837818b598ea8519539d0792cad7888330feb5c717c327630d6f6985eb0813de99a30994c3ef108fa128b484487ea3f2
-EBUILD bluez-hcidump-2.5.ebuild 400 BLAKE2B cd276f04a41e568ec6323cc280db4d149407cb0abe5358ddb4f7b61c09f479678d7d0806c5283cef9aeff1b663aca3c449d70cf1e54a566e62d192a8aeba5f39 SHA512 5f86119a17f876e80e870bee08947f44e9c234d5a99774794f072d6b61ef6605730ccf4401b9883cf1b977bf746f3d677f7fe61bc25e67de5aadb7cf6e459185
+EBUILD bluez-hcidump-2.5.ebuild 411 BLAKE2B ef58039c3fb3b621f9dda57de9b20bfc30d465fe5e05c754cde092f68695c9e6149b406f14f7c7021d3457fa022b3fcfea2b68f37617b8ead1f194541f788186 SHA512 c744d7cfb1d2f75dd69e8fe2a791f36bf1846e0fcc2193cbd535bdd252331368f0266cdd06a09bb43579c0d5bae195b1fb180d9fec07630d644a67fc52b1cd8d
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild b/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
index f844d8ba6090..55e2eba236f8 100644
--- a/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
+++ b/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Bluetooth HCI packet analyzer"
 HOMEPAGE="http://www.bluez.org/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 38f60e8ee447..1a08840a6ac3 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,15 +1,20 @@
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch 1907 BLAKE2B f930b3a5d1b928ec89f08a07c25acc4f0c77b43de1e389583a1d86b3b9e542ceb9d67a5d938fcddc91df7b2fff0364fb01b10a12c7a6606cba6ef0045b935d6c SHA512 17a0967ac291be3822e2be73912ab4c1720564bdce0765582e54bc0347d0477d38f82dbf0db9d660f982c35b3c2ea13dd37b22e18223d36745306c4c9d859423
+AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch 1909 BLAKE2B a4929ea456e63bb9e0de76885c4de9ffc7082bf869f46be61bba11c351a3de471b9fc93a4b2f094243f5d4c3bc172a9ff98c26c6d3530b75264cd64d6fade7a2 SHA512 5b278d603632685e31eeda6fe0bf32bd59536c6d8f2af221c3e39aa4a26bcbb6cb25d75822dbcf0a2ffb43f645b73a17bff1b62f40815c0f6243391ce24f5813
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
 AUX 0004-agent-Assert-possible-infinite-loop.patch 583 BLAKE2B 22cd0d0b4c6c1859631e31bba434f368a1cec07128aa69ecb9003734292aa1349b5dfad87b0ac35e79d089459dd24ecc8cb8f7bd0147c52b2284c2340884ee93 SHA512 f3af46b27180f500c3f978799633b7a01a9d7720eafdb7a9fb108684161616b976b42d135a2358785830c26642ef7c2175d0f1fa3d6df898fe3bd5e77f6a191d
-AUX bluetooth-init.d-r4 283 BLAKE2B 639679bb0156538e63e5e401a3063f8e72c2096b9ff9558e2e3289bd337dfb11c228010a50e40dd0a84ab2bb6f9cba69eb59b51b018d4983638dba4e3635e20c SHA512 155ec9c0deb82b1fc2218a0d23297ea1390b1ce0bcfffaf4b5ffbf5ee13fe4179b763edfcc6dec48c7a731a852d5307966090f35cc5caf28bbb8bee7dd01714a
+AUX 69-btattach-bcm.rules 2141 BLAKE2B 07fe8306e29f05082a603bd5a4b9d51c8c23b4ed48eaeebd01591970c0e29ea37198abaa8725023fd00cd38c67451910b6028d6725be3aca5ed1c495e02555ee SHA512 ecf535d737b9f1dc7a077f2a13e3712c959c505a93c24f48d63b04db0d42f8feef3918d48b7db5e8e115574a9b62f47aaa9c3e77230cff682d3f35da2f09047e
+AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb36465739462208d1564c59d59b3c8801dca5f9ba8547efc982d972cdaeef340403c82c9fa1ad8922b0396d29bd SHA512 05fd235483c65decc8badeca1b3ec60ae59f4881cc9125f6b148afe2cbc269a636df620b6bab72ce20b6b265c73074b1afef1029aecd884dc1dbb2694c0d16d9
 AUX bluez-5.39-systemd-quote.patch 1298 BLAKE2B c06a96ffee4f40d574765f7f5b58ba3544fe9862bf4d64d45be0dcbfe1446cb8cdca150402e44117f44b973d7041fd66f01088d843d35d0d6538ccf169551923 SHA512 a31a93934b3ad5d55633ab8ac0878f3cd8bda0ca7836a8912b444f88fe8c71183d25a6e3f36d962cc68da6d2776837b4bf660efb17d379c4003a092c313e69ba
 AUX bluez-5.50-btpclient-header.patch 345 BLAKE2B 0418270a696b9a682a3f74f35af64152fbf005dd3abf0230b03d673632f2e5a8b2874c11b9adbfd1733fb601eb5aea02da9028894041e200f99121e41dff855a SHA512 eba5462c20a37905ab8491b6812cd5dd8229280a56fcf24b3a2624a871d14a0377697f93588d02fa03ed422f953072109ea76b544173b97d874b9190de060a97
 AUX bluez-5.50-sink-connect.patch 2275 BLAKE2B ae03cc1c04774867d72602735554cdb377f3aa25165cd6a681a1996d30a9d0c51463d3d2a366049840ced9d805c1c3827ceaa69d619b5357fb21c1a708950064 SHA512 7fbb45e37b842cc6e8bbc98f19d5582c697c01c42000deacee6ea5554699669bd5ec23acba33cff994edd2b7d2865274905e074117b9a04334e9670bc8d6a386
 AUX bluez-plugdev.patch 469 BLAKE2B 611a9971e4614ab32ab62e8d2dc23e4a98b59c02ad8303ed0dc10831ab9023665436cfa9c47f8ccab7f83ab2b46ca8369ce53c5084ba7bf649c3ea89779882af SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1
+AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
+AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
 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-r3.ebuild 7990 BLAKE2B a909e6b969f90d3602db76fbf1614df14507cce2ca6b131f36fd5617033083b7a7fbe3f97bf315d85d9438b9b5f30d5ed82f1ad2601707378c19204af3f85ebc SHA512 b0d65fa1383bbb03dfa5db4c5b24880ddace37b200bb00fd68c49d3609c6505b4f502fdaab0d56576b05f4f75278372932de98f70b00f11c9ba26e317d911ceb
+DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f
+EBUILD bluez-5.50-r3.ebuild 8001 BLAKE2B 53a60e148a3db4c9eaff57ea07b0b1b5d12fb758e520569d0e553c28006826fe855771a2dd8e36ce32a5fb2c8e5002ff8a670e3cfe7e5ef7f70420c17b129db2 SHA512 6e9937151b6514d2ddb34426400a4f4a96c983b0996588bc3b82073e188c34419f70a1d78bbb34d68ac8e7d369fa111a9e5c27647b3cb6322fe0123803afb0a1
+EBUILD bluez-5.51.ebuild 9082 BLAKE2B 1e5ba81fa700f4fc6ae4aa538d4113f36852ea3f890777e05d3d61ad99d3def6eb00be9f789529f555f21e9d83818c2f2d3c0e5e42ec1ac93db40af2b46a3aad SHA512 81fbae889430f555b3d208529abddb5214565ca34de56e68418a0806487237ac2b151ef7c37b55fc7a889d0724ff3990b98a128a257ab097c51fa0dce76b69e2
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.50-r3.ebuild b/net-wireless/bluez/bluez-5.50-r3.ebuild
index c590e2ced4dd..e6f8139acd8a 100644
--- a/net-wireless/bluez/bluez-5.50-r3.ebuild
+++ b/net-wireless/bluez/bluez-5.50-r3.ebuild
@@ -9,7 +9,7 @@ inherit autotools python-single-r1 systemd udev user multilib-minimal
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://www.bluez.org"
 SRC_URI="
-	mirror://kernel/linux/bluetooth/${P}.tar.xz
+	https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz
 	https://dev.gentoo.org/~pacho/${PN}/${P}-fedora-backports.tar.xz
 "
 
diff --git a/net-wireless/bluez/bluez-5.50-r2.ebuild b/net-wireless/bluez/bluez-5.51.ebuild
index 4c335870096f..00a51cb60471 100644
--- a/net-wireless/bluez/bluez-5.50-r2.ebuild
+++ b/net-wireless/bluez/bluez-5.51.ebuild
@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 PYTHON_COMPAT=( python2_7 )
+
 inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="alsa btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
 # change in the future, hence, this REQUIRED_USE constraint could be dropped
@@ -35,14 +35,14 @@ BDEPEND="
 DEPEND="
 	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
 	>=sys-apps/hwids-20121202.2
-	alsa? ( media-libs/alsa-lib )
-	btpclient? ( >=dev-libs/ell-0.3 )
+	btpclient? ( >=dev-libs/ell-0.14 )
 	cups? ( net-print/cups:= )
 	mesh? (
-		>=dev-libs/ell-0.3
+		>=dev-libs/ell-0.14
 		dev-libs/json-c:=
 		sys-libs/readline:0=
 	)
+	midi? ( media-libs/alsa-lib )
 	obex? ( dev-libs/libical:= )
 	readline? ( sys-libs/readline:0= )
 	systemd? (
@@ -53,26 +53,17 @@ DEPEND="
 	udev? ( >=virtual/udev-172 )
 "
 RDEPEND="${DEPEND}
-	acct-group/plugdev
 	selinux? ( sec-policy/selinux-bluetooth )
 	test-programs? ( ${TEST_DEPS} )
 "
-DOC_CONTENTS="
-	If you want to control your bluetooth devices as a non-root user,
-	please remember to add you to plugdev group.
-"
 
-PATCHES=(
-	# Fix missing header (fixed in 'master')
-	"${FILESDIR}"/${P}-btpclient-header.patch
-
-	# Use static group "plugdev" to not force people to become root for
-	# controlling the devices.
-	"${FILESDIR}"/${PN}-plugdev.patch
+RESTRICT="!test? ( test )"
 
+PATCHES=(
 	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
 	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	"${FILESDIR}"/${PN}-udevadm-path.patch
+	# https://bugs.gentoo.org/539844
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
 
 	# build: Quote systemd variable names, bug #527432
 	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
@@ -81,9 +72,6 @@ PATCHES=(
 	# Fedora patches
 	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
 	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# ???
-	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
 )
 
 pkg_setup() {
@@ -105,7 +93,7 @@ src_prepare() {
 
 	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
 	if ! use user-session || ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch
 	fi
 
 	if use cups; then
@@ -115,6 +103,7 @@ src_prepare() {
 	fi
 
 	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	# https://bugs.gentoo.org/618548
 	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
 
 	eautoreconf
@@ -152,12 +141,14 @@ multilib_src_configure() {
 		--enable-monitor \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
 		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable alsa midi) \
 		$(multilib_native_use_enable btpclient) \
+		$(multilib_native_use_enable btpclient external-ell) \
 		$(multilib_native_use_enable cups) \
 		$(multilib_native_use_enable deprecated) \
 		$(multilib_native_use_enable experimental) \
 		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable mesh external-ell) \
+		$(multilib_native_use_enable midi) \
 		$(multilib_native_use_enable obex) \
 		$(multilib_native_use_enable readline client) \
 		$(multilib_native_use_enable systemd) \
@@ -198,9 +189,14 @@ multilib_src_install() {
 			# Upstream doesn't install this, bug #524640
 			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
 			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			dobin tools/btmgmt
 			# gatttool is only built with readline, bug #530776
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
+			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
+			# https://bugs.archlinux.org/task/37686
 			dobin attrib/gatttool
-			dobin tools/btmgmt
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+			dobin tools/avinfo
 		fi
 
 		# Not installed by default after being built, bug #666756
@@ -208,20 +204,22 @@ multilib_src_install() {
 
 		# Unittests are not that useful once installed, so make them optional
 		if use test-programs; then
-			# example-gatt-client is the only one needing
-			# python3, the others are python2 only. Remove
-			# until we see how to pull in python2 and python3
-			# for runtime
+			# Few are needing python3, the others are python2 only. Remove
+			# until we see how to pull in python2 and python3 for runtime
 			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
 			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || die
+
 			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+
 			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
 				dosym "${i}" /usr/bin/bluez-"${i##*/}"
 			done
 		fi
 	else
 		emake DESTDIR="${D}" \
-			install-includeHEADERS \
+			install-pkgincludeHEADERS \
 			install-libLTLIBRARIES \
 			install-pkgconfigDATA
 	fi
@@ -240,7 +238,7 @@ multilib_src_install_all() {
 		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
 	fi
 
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 
 	keepdir /var/lib/bluetooth
 
@@ -251,20 +249,37 @@ multilib_src_install_all() {
 	for d in input network; do
 		doins profiles/${d}/${d}.conf
 	done
+	# Setup auto enable as Fedora does for allowing to use
+	# keyboards/mouse as soon as possible
+	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
 	doins src/main.conf
 
 	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
 
 	einstalldocs
 	use doc && dodoc doc/*.txt
-	! use systemd && readme.gentoo_create_doc
+	# Install .json files as examples to be used by meshctl
+	if use mesh; then
+		dodoc tools/mesh/*.json
+		local DOC_CONTENTS="Some example .json files were installed into
+		/usr/share/doc/${PF} to be used with meshctl. Feel free to
+		uncompress and copy them to ~/.config/meshctl to use them."
+		readme.gentoo_create_doc
+	fi
+
+	# From Fedora:
+	# Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
+	# as found on some Atom based x86 hardware
+	udev_dorules "${FILESDIR}/69-btattach-bcm.rules"
+	systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service"
+	exeinto /usr/libexec/bluetooth
+	doexe "${FILESDIR}/btattach-bcm-service.sh"
 }
 
 pkg_postinst() {
-	! use systemd && readme.gentoo_print_elog
-
 	use udev && udev_reload
 	systemd_reenable bluetooth.service
 
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
+	use mesh && readme.gentoo_print_elog
 }
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch
new file mode 100644
index 000000000000..dec93073e18a
--- /dev/null
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch
@@ -0,0 +1,58 @@
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd                      | 4 ++--
+ obexd/src/org.bluez.obex.service    | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ obex_plugindir = $(libdir)/obex/plugins
+ 
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+-- 
+1.8.3.1
+
diff --git a/net-wireless/bluez/files/69-btattach-bcm.rules b/net-wireless/bluez/files/69-btattach-bcm.rules
new file mode 100644
index 000000000000..dfe8d1e785c8
--- /dev/null
+++ b/net-wireless/bluez/files/69-btattach-bcm.rules
@@ -0,0 +1,33 @@
+# Some devices have a bluetooth HCI connected to an uart, these needs to be
+# setup by calling btattach. The systemd btattach-bcm.service takes care of
+# this. These udev rules hardware-activate that service when necessary.
+#
+# For now this only suports ACPI enumerated Broadcom BT HCIs.
+# This has been tested on Bay and Cherry Trail devices with both ACPI and
+# PCI enumerated UARTs.
+
+# Note we check for the platform device not for the acpi device, because
+# some DSDTs list multiple bluetooth adapters, but only some (or none)
+# are enabled. Only enabled adapters get a platform device created.
+ACTION!="add", GOTO="btattach_bcm_rules_end"
+SUBSYSTEM!="platform", GOTO="btattach_bcm_rules_end"
+
+KERNEL=="BCM2E1A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E39:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E3A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E3D:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E3F:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E40:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E54:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E55:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E64:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E65:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E67:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E71:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E7B:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E7C:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E7E:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E95:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+KERNEL=="BCM2E96:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
+
+LABEL="btattach_bcm_rules_end"
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r4 b/net-wireless/bluez/files/bluetooth-init.d-r4
index 97cf500008e0..e69c66867fa0 100755..100644
--- a/net-wireless/bluez/files/bluetooth-init.d-r4
+++ b/net-wireless/bluez/files/bluetooth-init.d-r4
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/bluetoothd.pid"
diff --git a/net-wireless/bluez/files/btattach-bcm-service.sh b/net-wireless/bluez/files/btattach-bcm-service.sh
new file mode 100644
index 000000000000..c7f8b1784679
--- /dev/null
+++ b/net-wireless/bluez/files/btattach-bcm-service.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Simple shell script to wait for the tty for an uart using BT HCI to show up
+# and then invoke btattach with the right parameters, this is intended to be
+# invoked from a hardware-activated systemd service
+#
+# For now this only suports ACPI enumerated Broadcom BT HCIs.
+# This has been tested on Bay and Cherry Trail devices with both ACPI and
+# PCI enumerated UARTs.
+#
+# Note the kernel bt developers are working on solving this entirely in the
+# kernel, so it is not worth the trouble to write something better then this.
+
+BT_DEV="/sys/bus/platform/devices/$1"
+BT_DEV="$(readlink -f $BT_DEV)"
+UART_DEV="$(dirname $BT_DEV)"
+
+# Stupid GPD-pocket has USB BT with id 0000:0000, but still claims to have
+# an uart attached bt
+if [ "$1" = "BCM2E7E:00" ] && lsusb | grep -q "ID 0000:0000"; then
+	exit 0
+fi
+
+while [ ! -d "$UART_DEV/tty" ]; do
+	sleep .2
+done
+
+TTY="$(ls $UART_DEV/tty)"
+
+exec btattach --bredr "/dev/$TTY" -P bcm
diff --git a/net-wireless/bluez/files/btattach-bcm_at.service b/net-wireless/bluez/files/btattach-bcm_at.service
new file mode 100644
index 000000000000..1e7c7dbe582e
--- /dev/null
+++ b/net-wireless/bluez/files/btattach-bcm_at.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=btattach for Broadcom devices
+
+[Service]
+Type=simple
+ExecStart=/usr/libexec/bluetooth/btattach-bcm-service.sh %I
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index df8b6c5dc349..685e26ea60bd 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -6,5 +6,5 @@ AUX crda-3.18-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a
 AUX crda-3.18-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
 AUX crda-3.18-openssl-1.1.0-compatibility.patch 8782 BLAKE2B 7906eedd86aca173199ec957516167cf940d41da668cc7c5b5935232984f88960c1e00c87dfcd03c7d068cdb9168525378c46e1c52b28a9714d14cddce9240df SHA512 417a67139f61c467cd13274d0e6ad1542107dbb00765beed5becccdb64ac0228236498241e1fba9dfd4a5e1acb04ee583c435b699cca9b6a6461e5b7e86328cb
 DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
-EBUILD crda-3.18-r3.ebuild 2160 BLAKE2B 2ec9011409bb23ece341fdebac90f07b1489b6b211b4cf1c96dbb6077d9ae5804ad55ac11a8f16465b98515b15a4d0681e7ec1f07094d9d0f63734bc9e4283a3 SHA512 c08a38bbf714889e08f1865517fab94ee679c89117ba929c12f4441a634dd414710e8765ccf424d1718083b41851ad544f095a27cf29ba800178982bebac0ddc
+EBUILD crda-3.18-r3.ebuild 2171 BLAKE2B 0e23394b5a5b51754b1b3165cac0cae8be1d70395134bdd2d6cd06631efdbb0cfb47faef1ed16556922a018ba4f69ade67f53cb68bc1c383844383c4e2bf8f9c SHA512 4aee854e3516bfa14494543645b0926885ef700b6a5144b31805c98b7f2149cf3c935cbcd40b77355398698835edacc27c77cc196e2e9ba3cef7a03827e340aa
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-3.18-r3.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild
index 5073287cd767..c1fa8bd32e47 100644
--- a/net-wireless/crda/crda-3.18-r3.ebuild
+++ b/net-wireless/crda/crda-3.18-r3.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs python-any-r1 udev
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
 HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
 SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
-	mirror://kernel/software/network/crda/${P}.tar.xz"
+	https://www.kernel.org/pub/software/network/crda/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index f49ffba8328a..8e9200b29d4a 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,6 +1,8 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 DIST iwd-0.21.tar.xz 793432 BLAKE2B d82b90dbc83a2953d9de82e5e3a031f4db21f4e707d630cf2762475d34ed97fe78c4cc16bb6fed6ec7343af6bbf89672c37c76a06ed7181b57c657607859f4ab SHA512 eca8847cb68bc52f33a2f50ce4cba9ee4cbd37ad989292a21d613afd3307b0dc974da56df49dc97aa65c9647e3497849d696d5a9fdc5c0d0443a141a0887b324
+DIST iwd-0.22.tar.xz 813324 BLAKE2B 690ac6edbcd07be3b84318c77b8be5bef570951d02a7a6be1cd70ff0a475077253dd8e6f3b5c8a0177e6294b6cb12042e302b6752e2631ddd7cebe829c0c9f9f SHA512 4fa9f8688a33663aad754a371e9c1c71161f394fc0d7c4a32ce3afe7e00efdca8f55f378a71ab32002bbe73538b1a092bc0f24c19912672d70d6b02fcc824fe0
 EBUILD iwd-0.21.ebuild 3824 BLAKE2B 2e8b98874265758ab013bec9be6ca070acfc91efd4bf3383a4566cd214ce8bd01f733f9e73b33ffacd39edeade6771fde394ac3274266296da972761f59d4cb2 SHA512 8c0fe2fab776ff7874af859c12cb32a31609dc0bb49ed6ef6949683d5a423e99c133baa23b2d8e0b4dd9d57233742994544d9d42dad6ab86e00cf532f2764c36
-EBUILD iwd-9999.ebuild 3923 BLAKE2B cf7730fdfc71fa62f927d574a8c06cc7df01ddd1fd05179de0202301a5bf260712b2bf30d8b81c50b6abba1ca63c9ba8aa93e8ecb91fc6df5e69c3e71d8d7286 SHA512 f5a5a262bd355f32a7e2fbc87438a15fd6c1d6152ab04112faadba187caa8efa525f718d57d45111793fb67865526b9f899da8fb62a6a7d041e436f961cbe2db
+EBUILD iwd-0.22.ebuild 3923 BLAKE2B 9907dd60efc4a6ee1084d675a830fba740acf0ae0a59283f93a4164ec14b0246ca27478a0b9850f89eb61d910dc2a55eabb940d7e205dac8d7e00918bab914b2 SHA512 7b7dd5b92438176bf3e091fdfef2a861c74b2a0f578cc2ac3429c235d8672972cb5d1eeb3d4cedef1f02766351ac259e444b8f4af49fac1f1af248771b34336a
+EBUILD iwd-9999.ebuild 3922 BLAKE2B 2d463908a0bf8d08ab99a8e84eac265f50feefe61987bf7f43d029a6185aad708b867a9dd7647300744cdb5c03c0b9bd2b4a793008ee81e0713d2720409f2ee5 SHA512 bf8deb15aa4a094efafb9920a47f2f97b41c564a8b7275cb0ec2f93a6e51ce917a555922963ac97034ab55a0391e813b99b2874680eeb733c933d24012a5960d
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-0.22.ebuild b/net-wireless/iwd/iwd-0.22.ebuild
new file mode 100644
index 000000000000..468cef07ee8a
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.22.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic linux-info systemd
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+COMMON_DEPEND=">=dev-libs/ell-0.24
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+RDEPEND="${COMMON_DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \
+			&& [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		$(use_enable ofono) \
+		$(use_enable wired) \
+		--enable-external-ell \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index e1dc339b4d2c..23be63d6ea2b 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
 
-COMMON_DEPEND=">=dev-libs/ell-0.21
+COMMON_DEPEND="~dev-libs/ell-9999
 	sys-apps/dbus
 	client? ( sys-libs/readline:0= )"
 
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index f54db04e8932..e65b4d77c0aa 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,6 +1,6 @@
 DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
 DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9
-EBUILD lorcon-0.0_p20150109.ebuild 1333 BLAKE2B 5546a5ca92fe15423699d82cf1b29638ca3e4e2b6a77ac752801a7a7dee397ae95fe9604f38ee642a348f848b208e2ec80ce696e7d9481efb9273f32ed4bfe85 SHA512 7061ee2bb8da455a0e6e451b4ca5cbf024ad0ad4012cc0f35db48d2c30f5ba46b10970479ec141e028675a978eb3fb7ea93f2a1af1b57c089f078f47d49ad856
-EBUILD lorcon-0.0_p20180409-r1.ebuild 1940 BLAKE2B 32afa152622c4c847041c584474db0fd4170047654ad59012b9b57f3309e91faec98bbc2eb08937306564d9f0d15f7cd8fdf9b70c9d593b3680090c3abffbd15 SHA512 86503ef48fe8795a459ebb01c0fc3f67973b0e66f6b2d2130a25722de8baca213a31b0a17eff41bdb617c444bebdf38ab4d8112353f60dec231b2a32b68c5132
-EBUILD lorcon-9999.ebuild 1940 BLAKE2B 32afa152622c4c847041c584474db0fd4170047654ad59012b9b57f3309e91faec98bbc2eb08937306564d9f0d15f7cd8fdf9b70c9d593b3680090c3abffbd15 SHA512 86503ef48fe8795a459ebb01c0fc3f67973b0e66f6b2d2130a25722de8baca213a31b0a17eff41bdb617c444bebdf38ab4d8112353f60dec231b2a32b68c5132
+EBUILD lorcon-0.0_p20150109.ebuild 1323 BLAKE2B b6339a31e80485e9169453e69c2311f964eb2995e613001ffb033cac40581868124d1635f56d627291224dcc2346778c269d0c5e4f65682c7e4b99cfc01e02d2 SHA512 1933c94718b830c9c5a24a78dec8835f82b5c30c43bd6fde38bfa994c8916c19eba7b3b49912ef9f7f5e7b5313fcdd55a127b81f88126c6c31ad7ada4d0b5927
+EBUILD lorcon-0.0_p20180409-r1.ebuild 1930 BLAKE2B 30ef4dec066a7edd7b2c1656571a7cbb211eb95dfe27d7fc44fff303e3dbfc21f95532c5ef197107e64d8f90c9a5cfd326b7c0fa539ea4d40223fa28c8c83d9c SHA512 d94e57cf76f0e0f2d313fcf1bfefd9f48f44335f7d77f9c43e24f492cfe48abefd02f711349a2c12dfc4a84c1e971255f8045999192c3ad33594327dab7ed260
+EBUILD lorcon-9999.ebuild 1930 BLAKE2B 30ef4dec066a7edd7b2c1656571a7cbb211eb95dfe27d7fc44fff303e3dbfc21f95532c5ef197107e64d8f90c9a5cfd326b7c0fa539ea4d40223fa28c8c83d9c SHA512 d94e57cf76f0e0f2d313fcf1bfefd9f48f44335f7d77f9c43e24f492cfe48abefd02f711349a2c12dfc4a84c1e971255f8045999192c3ad33594327dab7ed260
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index 702bd34a3a2d..715e6dd1a8c6 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
index 3d4ff55cdf8e..d9ac3ecfbee9 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
@@ -21,7 +21,7 @@ else
 	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
 	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index 3d4ff55cdf8e..d9ac3ecfbee9 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -21,7 +21,7 @@ else
 	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
 	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/neard/Manifest b/net-wireless/neard/Manifest
index 3883cbd7dcdc..28cc4465523f 100644
--- a/net-wireless/neard/Manifest
+++ b/net-wireless/neard/Manifest
@@ -1,5 +1,5 @@
 AUX neard.confd 274 BLAKE2B f61cc6b061a146899aabd430e3e5c082da57a8e413600a748ae23959dd4ff5668d39b17222c7c22f0cf6f990e289e8dd21287142e9d4bf21e7bdd4d15beb05ec SHA512 d696911f7e5f33f6b2a0f6508c73676998a3bfaebbda02386dc08d9149d525bf211bfcf9836276d070f31288ef84540ef1bce3d68119d4439089297c079392ef
 AUX neard.rc 417 BLAKE2B cdbd53502cebf7ac732830d5266fca64e7bfb8ec06caf660e026ec8bd9413375495e630b27e0e0b97997aab5313c5a215059c1624fd350e8b25e59bd5563c578 SHA512 68459f7dfc9bdcc6b450770d76c0ffa4b0adb248476c801317f8a8cc7c2dc9e41dea4fcf9425b9d667821037d923fb8368acb72540cc63478dd45e21ba9215d5
 DIST neard-0.15.tar.xz 368196 BLAKE2B e23d144229ad7550927b45af715050d158ceb1ee163ef49f1d0269d92bfbd5afcd63c1b698b7f55b471caf2cc1a351a78fef4dd6d7748e26422ae43dbd8b3899 SHA512 daaa001a305f0d200bb03bf614c938256fa5c07d480bf820d5e83da80d930e060b5bb6a09234f1c3f7ecbd3cb0af378a1de675dd4dcd99b728677430e0cd111d
-EBUILD neard-0.15-r1.ebuild 831 BLAKE2B e7a5940ef5ac08bdaf30beb613f1a13a867f9c2bf85c7e40fbb8856521f7be085d341a26456e1790aa9a2003740828792325340b9c2e1626201d4f7c3013c2c4 SHA512 7410edd0d0bc3ee7e238f0b4db26d967ec5be6642529e5b38d002b0ecb85b1798bbef268555318e979afd815fa56d9914862283836821bfc1aaee114bb6e46c1
+EBUILD neard-0.15-r1.ebuild 842 BLAKE2B 442a79bc08f363cf94b32101852fd2158d3c428889ed15d5397a008cfc6cf67e1c63706f6f1a5af9831bed7cab4cded91a700566521b17011d3d93e7996536c8 SHA512 462ca9bb20bfb8c99d8f674c362410bdc6c5dae4b3fed88227d6be5fb5196f352f3c72d22174a0f5703be3276ed21bdd218368f11c504222e6355e8d27744ced
 MISC metadata.xml 247 BLAKE2B 3af5a6a98b5737f4b55191850c41fad5c3ea1aabb85140efa70c728008d84b855803f2b0648e5c4d8f7494ccf407eee85a7a095971796c12b2d98833cd4855e8 SHA512 863541182875c927594f5ff837151d030db4786803ddc8f59fa5564687692b9985df1f15e8494ff947d555c541bc3a877edf1c2407a38f037a65a2076ac2eddd
diff --git a/net-wireless/neard/neard-0.15-r1.ebuild b/net-wireless/neard/neard-0.15-r1.ebuild
index 4f410f2a5001..57b3ceae337c 100644
--- a/net-wireless/neard/neard-0.15-r1.ebuild
+++ b/net-wireless/neard/neard-0.15-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 DESCRIPTION="Near Field Communication (NFC) management daemon"
 HOMEPAGE="https://01.org/linux-nfc/"
-SRC_URI="mirror://kernel/linux/network/nfc/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/network/nfc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-wireless/orinoco-fwutils/Manifest b/net-wireless/orinoco-fwutils/Manifest
deleted file mode 100644
index 50afdcef76ce..000000000000
--- a/net-wireless/orinoco-fwutils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST orinoco-fwutils-0.3.tar.gz 5802 BLAKE2B 7e3be29addfab56aef6b32cabe9c452e99f1c6300b9ab2abde5577619bc8e6b965eaf55b3f5b155a5539f1ef1e8d9f5815571e96268dd05f3d1b1318bbae4284 SHA512 5222c7e651170d34694fc77056042a535bd4c17fe6e806d9b2a1be38a828c58789e98566109f37dfb800efce5bd0b99f0e2ad98e0e72bfbc663b875b00ceb7e2
-EBUILD orinoco-fwutils-0.3.ebuild 812 BLAKE2B 739adb172aaba9931aec03f28daa9c08c1fbc2c67f7e2b18e9205ec807e8b86935b9187950b025e1c58bbe1226a30b14ee2336468890b44b3135065cb96e6b8c SHA512 87a1e7665246f116cab29a53ccd3027e980b502cba8ba5106c563f781582175837c27ca9c89b98896e4c8f8c769e5f10578e0d0dbac5d29cd5cdb4b5363fa28c
-MISC metadata.xml 247 BLAKE2B d8d86921a0b6833d1cf4db6cc487eec2508ccbd42f17fe3e3c041b6eb843707a9fadc3c22f591b14d26622485e39d490316c3946f0441e234e07aea05c55ab11 SHA512 ce7a47414b28e44b5ca2b7bb75953ffa3e7892f8d30753c563927b0849b57d0a383df2635e015a69bf1462d9be6602f41872500890bd32e50b6105af8c23cfda
diff --git a/net-wireless/orinoco-fwutils/metadata.xml b/net-wireless/orinoco-fwutils/metadata.xml
deleted file mode 100644
index 079b949c0a8e..000000000000
--- a/net-wireless/orinoco-fwutils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="sourceforge">orinoco</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-wireless/orinoco-fwutils/orinoco-fwutils-0.3.ebuild b/net-wireless/orinoco-fwutils/orinoco-fwutils-0.3.ebuild
deleted file mode 100644
index 89f3c439742e..000000000000
--- a/net-wireless/orinoco-fwutils/orinoco-fwutils-0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="ORiNOCO IEEE 802.11 wireless LAN firmware utilities"
-HOMEPAGE="http://www.nongnu.org/orinoco/"
-SRC_URI="mirror://sourceforge/orinoco/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-RDEPEND="app-arch/unzip
-		dev-lang/perl
-		net-misc/wget
-		sys-apps/coreutils
-		sys-apps/sed"
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	# fix paths
-	for file in "${S}"/get_*; do
-		sed -i \
-			-e "s:parse_:/usr/bin/parse_:g" \
-			-e "s:\./::g" \
-		${file}
-	done
-}
-
-src_install() {
-	dobin get_* parse_*
-
-	dodoc README SHA1SUM
-}
-
-pkg_postinst() {
-	elog "After fetching the firmware using these tools you must place it in"
-	elog "/lib/firmware/ for the kernel driver to be able to load it."
-}
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 9a7bd353108d..c9a39daba9fd 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,16 +1,19 @@
 AUX uhd-3.10.3.0-tinfo.patch 1680 BLAKE2B 6b31b95c4b63d043e66e5fb41f75b3e73d0e9327d304a211d950bc982209f12425ee716ff2218ceace317ba978ddfe7d0b94961c9feeb0a08dd5454515df7505 SHA512 2c0e6163ddb005b5d02a380033030d111d1eff23f8327aff802e80e449594e48bdd8f2656ffd21c6281233a36ac89d52aa6833e2ea0349276baaef497c463cba
 AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a66406becf5b315ac14075675da5e3098c7ca8e64f056035e617d84c0ac6695d065c56665c8cc03c8db07bbef31b SHA512 170c77f04d759fd4a2148c04b85adb48c10d5b1ed6363aaf6c3a78ad79c8055ee65434eec7b26db4cb540a5405d2a6d902a2ef4cf60152032128f05ef1e0adf5
+AUX uhd_man_pages_optional_compress.diff 3357 BLAKE2B b1b46def45f4ddad84af04245b5a257bba9e9334ca40aa7712579b51f0f8094fd2a94bb0377368e16fc627d2164678f5aa11d729601b9732c51ac340947b6add SHA512 c5915d57366d50ccbad0cb4a57855a403e4951765595e5f8c9ab5f05fa4ef3b0f7778a242bc097f925f9e90d955ac04aea4d8a5af64d1bdefc19edf85c59d3ab
 DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
 DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
 DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
 DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799 SHA512 83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
 DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B 44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238 SHA512 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
 DIST EttusResearch-UHD-3.14.0.0.tar.gz 12935658 BLAKE2B 8b5273ee3cd4c39ebb3848152116dc26caac951b3cea4c5e5efe37a90ac3a1e0580e7ed65af9145e4981abf7abd9ef748f9b3c823d87194ce7a4a5f9b799abec SHA512 c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
+DIST EttusResearch-UHD-3.14.1.1.tar.gz 12960651 BLAKE2B 8a2a0ac4d1cf71177dad1334dcc7426dc78a0c6b8c1bd895d7eb1ca4e2eb5b9a4208998118ba084f1932edacc7503b49a5ebd78dd1b1d9acbac6fe83f503b9eb SHA512 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4
 DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
 DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
 DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
 DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B 3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a SHA512 3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
 DIST uhd-images_3.14.0.0.tar.xz 112971440 BLAKE2B b0aeb77251500c42ccaa753483b20d82113d55f1e2f2e1181a27cd95f6aec1768e8a02c9dbc65db612d04d43e7756c6b6e3d6f662a4e66043b3ec52b44bbeb77 SHA512 a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
+DIST uhd-images_3.14.1.1.tar.xz 113265248 BLAKE2B b1ac40435b8bce5cdc29bbdfd182f65d8d2f7d80b21a835202551e52cdc5d7f3b028faa73850121a79a1ff4df73620b8c36a5cab38cb2fed9c582a48429e0ee3 SHA512 d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
 DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
 EBUILD uhd-3.10.3.0.ebuild 2043 BLAKE2B 299a8f73dbabe40dafae728cca63636e29ba90b0ee48bec4637bbab4c61668fb2121f6a65808a44696a2c4f8bf5f2bc773d4485a2b6556bc6e7c3e819b5bf1cd SHA512 777d6d6fd40bd74816916dc94e712de0cecc9e5a4275bfff67d69cef63866e9ae75cdaf0ed75bf17591b8667e3f73fda35f513ab13070c40d855b807bc53d93e
 EBUILD uhd-3.11.0.0.ebuild 3902 BLAKE2B 34d21ac5fca3a00b255bb0dbae36d5930416013d79a7544d0c365c0f3cdd6df5a9418cc5a4196968e15b469312522545ce6c360103bfd76191aa6595a777e5fe SHA512 1ee713c893dbf749851df9a4e628504b7a3bd907b3a9f06de3444656e101d63ab6f85a0b201658da3afce3a03389dba027fde92b09076976289694cb091ab498
@@ -18,4 +21,5 @@ EBUILD uhd-3.12.0.0.ebuild 3535 BLAKE2B cde3b15683186acf7f2eb877609df487c83afb92
 EBUILD uhd-3.13.0.1.ebuild 3535 BLAKE2B cde3b15683186acf7f2eb877609df487c83afb924718076b591e5670eee32634867e658088d88edab7ebf3b3346572b4c3a19b070169e5e78a9e72962a35bf90 SHA512 6e6cb73b52e631dc7ac6274f77756846d5252e73e7b95c28b639ff1713be1bbca0ab333aaecd971553433fe49ebbd61ab18f9be04b2ff0b81bdf9a45e0ceb8c8
 EBUILD uhd-3.13.1.0.ebuild 3532 BLAKE2B db3b8f22560bb2897c4ef4445addbfa5b715f3be9ba14c21a61d5eb4bd7f8eeb597eeaa9ca86b6acf14cdf752626c66e4727df61f157f2cd1478a6a7456945d1 SHA512 c59999e1df4420385d242ffe8a3b326d39688b1a160d31c3eff479aea43a9f9ec5f8f0deea762a7955af045b1d7169e18edee3c6778d7e3d8a2b40b8121a3c68
 EBUILD uhd-3.14.0.0.ebuild 3532 BLAKE2B db3b8f22560bb2897c4ef4445addbfa5b715f3be9ba14c21a61d5eb4bd7f8eeb597eeaa9ca86b6acf14cdf752626c66e4727df61f157f2cd1478a6a7456945d1 SHA512 c59999e1df4420385d242ffe8a3b326d39688b1a160d31c3eff479aea43a9f9ec5f8f0deea762a7955af045b1d7169e18edee3c6778d7e3d8a2b40b8121a3c68
+EBUILD uhd-3.14.1.1.ebuild 3533 BLAKE2B 4298e633c293cb6cfc95752d627387d5ce5a7109621e1d9e25b81d4b49120291f652e83c5fe5eebc557bef8661772d9e1eb5f169bd704602b6655828254805c9 SHA512 22e75796aca435068b45ba3008dbc22e21d17589d5b4a3a10c52bed8f04dbe4681d61405e876269968c359aaab30472dba183665cfb58405d492dd5fb67d1788
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
new file mode 100644
index 000000000000..5847d50c66f0
--- /dev/null
+++ b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
@@ -0,0 +1,76 @@
+diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt
+index 240a534db..7a7108f00 100644
+--- a/host/docs/CMakeLists.txt
++++ b/host/docs/CMakeLists.txt
+@@ -144,34 +144,49 @@ set(man_page_sources
+ ########################################################################
+ # Setup man pages
+ ########################################################################
+-find_package(GZip)
++option(ENABLE_MAN_PAGE_COMPRESSION "Compress man pages if installed." ON)
+ 
+ # No elegant way in CMake to reverse a boolean
+ if(NOT WIN32)
+     set(NOT_WIN32 TRUE)
+ endif(NOT WIN32)
+ 
+-LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "GZIP_FOUND;NOT_WIN32" OFF OFF)
++set(MAN_PAGES_DEPS "NOT_WIN32")
++
++message(STATUS "")
++if(ENABLE_MAN_PAGE_COMPRESSION)
++    message(STATUS "Compress man pages enabled; looking for compression program")
++    find_package(GZip)
++    list(APPEND MAN_PAGES_DEPS "GZIP_FOUND")
++else(ENABLE_MAN_PAGE_COMPRESSION)
++    message(STATUS "Compress man pages disabled")
++endif(ENABLE_MAN_PAGE_COMPRESSION)
++
++LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "${MAN_PAGES_DEPS}" OFF OFF)
+ 
+ if(ENABLE_MAN_PAGES)
+-    #Generate man pages
+-    foreach(manfile ${man_page_sources})
+-        #make the gzip file depend on the text file
+-        string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
+-        set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
+-        set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
+-        add_custom_command(
+-            OUTPUT ${gzfile}
+-            DEPENDS ${manfile}
+-            COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
+-            COMMENT "Generating ${PROGRAM_NAME} man page"
+-        )
+-
+-        #make the man page target depend on the gz file
+-        list(APPEND man_page_gz_files ${gzfile})
+-        UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
+-    endforeach(manfile ${man_page_sources})
+-
+-    #make the man pages a build-time dependency
+-    add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
++    #Generate man pages; either compressed or not
++    if(ENABLE_MAN_PAGE_COMPRESSION)
++        # compress man pages
++        foreach(manfile ${man_page_sources})
++            #make the gzip file depend on the text file
++            string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
++            set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
++            set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
++            add_custom_command(
++                OUTPUT ${gzfile}
++                DEPENDS ${manfile}
++                COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
++                COMMENT "Generating ${PROGRAM_NAME} man page"
++            )
++            #make the man page target depend on the gz file
++            list(APPEND man_page_gz_files ${gzfile})
++        endforeach(manfile ${man_page_sources})
++        #make the man pages a build-time dependency
++        UHD_INSTALL(FILES ${man_page_gz_files} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
++        add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
++    else(ENABLE_MAN_PAGE_COMPRESSION)
++        # uncompressed man pages; just install them
++        UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
++    endif(ENABLE_MAN_PAGE_COMPRESSION)
+ endif(ENABLE_MAN_PAGES)
diff --git a/net-wireless/uhd/uhd-3.14.1.1.ebuild b/net-wireless/uhd/uhd-3.14.1.1.ebuild
new file mode 100644
index 000000000000..8f61652cc090
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.14.1.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+#not sure why, but eapi 7 fails
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+			b100? ( usb )
+			b200? ( usb )
+			usrp1? ( usb )
+			usrp2? ( usb )
+			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+	e300? ( virtual/udev )
+	usb? ( virtual/libusb:1 )
+	dev-libs/boost:=
+	sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-python/mako
+	app-arch/unzip
+	app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+	default
+	mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+	cd ..
+	eapply "${FILESDIR}"/uhd_man_pages_optional_compress.diff
+	cd host
+
+	cmake-utils_src_prepare
+
+	gnome2_environment_reset #534582
+
+	#this may not be needed in 3.4.3 and above, please verify
+	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_LIBUHD=ON
+		-DENABLE_C_API=ON
+		-DENABLE_LIBERIO=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_GPSD=OFF
+		-DENABLE_MAN_PAGE_COMPRESSION=OFF
+		-DENABLE_EXAMPLES="$(usex examples)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_USB="$(usex usb)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DENABLE_MANUAL="$(usex doc)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_B100="$(usex b100)"
+		-DENABLE_B200="$(usex b200)"
+		-DENABLE_E300="$(usex e300)"
+		-DENABLE_USRP1="$(usex usrp1)"
+		-DENABLE_USRP2="$(usex usrp2)"
+		-DENABLE_X300="$(usex x300)"
+		-DENABLE_N230="$(usex n230)"
+		-DENABLE_MPMD="$(usex mpmd)"
+		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+	)
+	cmake-utils_src_configure
+}
+src_install() {
+	cmake-utils_src_install
+	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+	if [ "${PV}" != "9999" ]; then
+		rm -rf "${ED}/usr/bin/uhd_images_downloader"
+		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
+	fi
+
+	insinto /lib/udev/rules.d/
+	doins "${S}/utils/uhd-usrp.rules"
+
+	rm -rf "${WORKDIR}/images/winusb_driver"
+	if ! use b100; then
+		rm "${WORKDIR}"/images/usrp_b100* || die
+	fi
+	if ! use b200; then
+		rm "${WORKDIR}"/images/usrp_b2[01]* || die
+	fi
+	if ! use e300; then
+		rm "${WORKDIR}"/images/usrp_e3* || die
+	fi
+	if ! use mpmd; then
+		rm "${WORKDIR}"/images/usrp_n310* || die
+	fi
+	if ! use n230; then
+		rm "${WORKDIR}"/images/usrp_n230* || die
+	fi
+	if ! use octoclock; then
+		rm "${WORKDIR}"/images/octoclock* || die
+	fi
+	if ! use usrp1; then
+		rm "${WORKDIR}"/images/usrp1* || die
+	fi
+	if ! use usrp2; then
+		rm "${WORKDIR}"/images/usrp2* || die
+		rm "${WORKDIR}"/images/usrp_n2[01]* || die
+		rm -r "${WORKDIR}"/images/bit || die
+	fi
+	if ! use x300; then
+		rm "${WORKDIR}/"images/usrp_x3* || die
+	fi
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}/images"
+
+	#fix doc location
+	mv "${ED}"/usr/share/doc/uhd "${ED}/usr/share/doc/${PF}" || die
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 2afd755159de..f25e5d4da784 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,22 +3,16 @@ AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb857
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.11.46.zip 112381219 BLAKE2B 7f73cf5db1d132af85fd54dda36cb82cedddae1d3c8e84282f9dcfe0766a839f165d17a8292096bfe976ccced1e29173476de9042f96cdc2c15c4edf24ee9c65 SHA512 41b03ebbbb49089bd40e3e715d7c9a447b42a6df61a2d3551175ae55b85010fd896318909f394bb166bd7a8e9fd7611439158a8141df349acf3b4980bbe9dd6b
-DIST unifi-5.11.47.zip 112374653 BLAKE2B 42e981f526dcdc7f7c35b7884aaa81cd96de4105d8700e8f8625a1fbd14640d248d46153328dbc852591f96221ab5753b65e2038d948a3d5b091f17b3e47e4bb SHA512 ec2a1f8e3a3c3bf5cf8ab25ece9ee164fbaaeef4b03585d2ff9add74a34992a24fe0becbd28b212b470d4fd87eea67e4291724addc8b12e5d1c463a73817569c
-<<<<<<< HEAD
-=======
-DIST unifi-5.11.48.zip 112379777 BLAKE2B da30a094350229aebdda958a966412a350c918d6d6cef775fce675bb139cb13f27dc5e3efbd7b68eb0a1b75adb11f9352cf330ca45af89bb9690c9d4a2505e8c SHA512 f09e2fd280cc6c1859d89536f9c517308c6945f7f4b38f9ef46a8231551284049baf50309ecc3cf7f9523b5c9f85758a56ee2520652c10ad22035491d8ee32d9
->>>>>>> next
-DIST unifi-5.12.5.zip 113544662 BLAKE2B 7b79a1b107927fbb6ee2c7bb531901b5cedef0768146b369e8653e0e34e41758914b5108a01681e806c117dd80561091b6064bffe779e913774d61ff2fba369d SHA512 ff3ab833ce13889f1f6c2d1ee71f28bf8d48789c053c84b1f427e95e09aedb4d9f66a640a1891262f31300af50859581dc874a613f5f92b3bcf18b05c0140052
+DIST unifi-5.11.50.zip 112355461 BLAKE2B 5d63c3a0488a1da7ed696993982728cd1b7449d7af65ee1a49d065fd928feef5628a84d5add7d670ddc5bed3d9df2084fd0905a417cde22737dd74de15a74b39 SHA512 509e54b1237a41bea08d96eaa9efacbd45d823dc4e2d6965ac577aab159bf907378322aa6ad15a776dd0fc725a6737951f2d4cdafe073443a18e36d2d4827ead
+DIST unifi-5.11.52.zip 114092809 BLAKE2B 902dec158ba60fa424ff0b59b53776aeabc3f1ae7a9b88e549f0d62974e280b51ce5b8bb3eac150c1d75e4b0816b46bb19bd953e987bf6d8a58c3e271efdaea3 SHA512 887b25c22d7ac7a14854b95007794a63c200717fdfec791be5e1b03fe4bda1c44a05767d44f55062c691b922e54fa8c183b249407c30fb2d596906e00fa969e0
+DIST unifi-5.12.13.zip 114644574 BLAKE2B 4a2217c7696f23a7602a89bb3eaf0c58094b23331ed60f210e3626c2f194dbc272de18dd0e46fe1cc829e0adb1fb704a8b00191039573544e0111dfd1e2b6cb1 SHA512 4af685239df47891adb93afd95ad53fd89f85bc3f0c9346b91dbafabdbca57113eddb2b317a5342c93d44b250637d16d740fda34df35851f3466277abd814bac
+DIST unifi-5.12.16.zip 114676348 BLAKE2B 82d0ade4541d102648aa6938c050e23e68c91b40b35d0f5a68113f4be844f0fc5a00c82c4d7286552f7d076fc3bbe79f32b9bc8f6aa51a7609993d7cd4231c34 SHA512 e1320bfa54f6419c079d485ccf902be69de1322c5090e0b1a7f7ffec85f7ef8b3516a6e2d9571d9c2403da0444b611601037d3a211f32bee3dc8d59a6ce9f48f
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-EBUILD unifi-5.11.46-r1.ebuild 1789 BLAKE2B ec4e389a2bc3acfc0cf52a7d6bbc4e07efcfe38821a3a51b3c6295f4e736a0e1bae4e9e65f8886769e6b2f9bc22efb8cd26873c2d5847ca3a74d37b1e4b33b5f SHA512 2c1721e731fd9e800ffc331c1e79fa0fddfae5f29815b8780312a2b560ca7734b90f48502f267eb568f57320fe0c22c0a7efe233867c91c9bc48c987b9ee3342
 EBUILD unifi-5.11.46.ebuild 1832 BLAKE2B e47b011986e7abc36e9df65eea9fcc1fb56a19dadc78a18c74699043cd0024b7d74676efcf9882e70d19247435ce0ff8e28dcc23ea905c4562b6285aae3685be SHA512 9b9cfc432580c3ecc8b8e79f73a5549f54fb6b46b23ff29ead84b85cc360bb091b278210d57e5889b319d3fa5c0a4a066fa01f4a85eab1e12b2c443f70c33bce
-EBUILD unifi-5.11.47.ebuild 1789 BLAKE2B f60faeba740a9e49e0bf313f62bbf6fcfa437652616206ae266518d39f330a0c5f01ae00de74139c4e5557dad0f13615e128230fcace4d0369d29a743462ce83 SHA512 7f10f359e1cd77333a4e59845fb844476ef973d968164361f0a0879a32da8c3427fec5692aeb06f66324177b464554a4d96bfeee520fbeeec752054fd0f0dc89
-<<<<<<< HEAD
-=======
-EBUILD unifi-5.11.48.ebuild 1789 BLAKE2B d656f824d3312769b225b7e65e4c9abe2e9be318520c47c3794e87a96ef5d9deac9e763d981b8c27627802cd694e4bdd9b83d3a9de4d64a74a3af856ef01b4cb SHA512 0d75d95541a097cb0885d98bb4529688ef7513df7d28f793a2e4ecb679ac531384288db5cd1dc9db66c9ce8453d57d1d3efdb0a9aa642c8e64e81b0dc415ffde
->>>>>>> next
-EBUILD unifi-5.12.5-r1.ebuild 1789 BLAKE2B a2cc863351a4d4a0d4b210931a86de25220357d8479a86f13b3bbeadaf4e451af2f82b90ab433fb05154d70d678ebdc5db92cdd0e2f353ac9dc00022d2c45bd9 SHA512 8bfbd9d2cab24b2584880f42c2fd60748520147868c134ae34c4af8e1ead24501ddde7c4460a2884ded81dcd4ed8965f6274e1417eecc2742ff79af7d2b595d5
-EBUILD unifi-5.12.5.ebuild 1833 BLAKE2B f9e7cae98e23b3525c628d0e987884f2e211d806073a97824bed45e4fb43dd131a849489d5c0bbb64cd7b865db71e600b9926a7b8ab38c70f2aa7e37e90dbb01 SHA512 46c149a06ee68e3e89a2ec3404c8eb501299649c2fd58a33a053d72caa85fc66cb1c6334e338d4aedcc3c3bee4bb18ae6468a2cdd882e46a213bb578cfc05d8d
+EBUILD unifi-5.11.50.ebuild 1789 BLAKE2B cef87423291b5aad60062454c901b3436e12963bc4c801467d8393e15c729aaf6b04a7ddc2e5ab3df42c1442ab0867c5af4c567002f058bac6226628f18ed939 SHA512 482c4add6b3c11cc3889f50913068edd41a3ca16a527a9454b904047aa68bf12fc90d2d8b485215d8db1bb4b9e1b7791c997fcc7dafcb13759fd568ab2ba29c9
+EBUILD unifi-5.11.52.ebuild 1789 BLAKE2B b2c72b01604753f3c95c76a58dce04c91ca396f406f94661a9950ea4dd6358b8bd24fce709c4426027e2fcc9628ae2cdde5b272694c5b2ca8b9d1051feab7513 SHA512 426d583f22031a9ec95267341dca5f38e3f60577a0560a618cd64d9169f42a4a90cb311d67e8bc70690232806dbbb3688790e784eb9ce9137a8a5a02c7ba749f
+EBUILD unifi-5.12.13.ebuild 1789 BLAKE2B 5527f3ce00ebe570486481356d384158c999cecd4ef01b82accb4034a18ca31331f28ccf5a0c3d67f42ce444806000937bbd0b84666733fac858e355c87c3789 SHA512 18b24e1a3b4b08dea056b1a8ee58c0b4282f0b9c345dc97925987bd00988c13aa7822bfe5944aa567da8efcf283fbf6b211d97986a697c353a5dcb0b516f1695
+EBUILD unifi-5.12.16.ebuild 1789 BLAKE2B d58fa10a52eff42f011eff0ad64ca095d1a9182cecbab5479a600300c15907cb359c27812cab8e539d4bbcbe4685d615b63609215ab1e777e59512a2ae779de9 SHA512 07506d368b575a65a7610b59ea61482b8648c57498628f946eb1958bb371437a6f3540634799ed963049216dbc4caa7e40d5c04f99ba8f0904fcf2f29b1616a6
 EBUILD unifi-5.6.42-r1.ebuild 1668 BLAKE2B 0db78f1241b651079c1c37326ef9c5414037c1bf192b344d55f9fd03a7af8f1cfc709f80b7257b9930f6c19d7cb77ec52e2cb5b492a571a60098436672c9514d SHA512 952253c6e51ac78796c7ee7729f75c1eaf0fa997832b60aaa7e9d73d0f6d3f444e632cd81550637733bf21ec1013d0a974edf12897dfc2fe70157403363eba86
 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-r1.ebuild b/net-wireless/unifi/unifi-5.11.50.ebuild
index efe877dff671..f6e16df92f33 100644
--- a/net-wireless/unifi/unifi-5.11.46-r1.ebuild
+++ b/net-wireless/unifi/unifi-5.11.50.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-a5113ebc10"
+RC_SUFFIX="-c9dac5377d"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-5.11.47.ebuild b/net-wireless/unifi/unifi-5.11.52.ebuild
index dd8f7198dd79..5a12db360e52 100644
--- a/net-wireless/unifi/unifi-5.11.47.ebuild
+++ b/net-wireless/unifi/unifi-5.11.52.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-248db21f47"
+RC_SUFFIX="-3b4f13d722"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-5.12.5-r1.ebuild b/net-wireless/unifi/unifi-5.12.13.ebuild
index 8abd17d3590a..19b3b64c5cc5 100644
--- a/net-wireless/unifi/unifi-5.12.5-r1.ebuild
+++ b/net-wireless/unifi/unifi-5.12.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-802c4da1a2"
+RC_SUFFIX="-a94c374f1a"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-5.11.48.ebuild b/net-wireless/unifi/unifi-5.12.16.ebuild
index 793968b05c2a..61f68ecb90d9 100644
--- a/net-wireless/unifi/unifi-5.11.48.ebuild
+++ b/net-wireless/unifi/unifi-5.12.16.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-0023c8f3bf"
+RC_SUFFIX="-949a431d7a"
 
 inherit systemd
 
@@ -14,7 +14,7 @@ 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"
+SLOT="0/5.12"
 IUSE="systemd"
 
 RDEPEND="
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/urh/Manifest b/net-wireless/urh/Manifest
index b01cdaf0e378..568fd1f59deb 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,6 +1,6 @@
 DIST urh-1.6.4.1.tar.gz 14993226 BLAKE2B 97ce52430d7449b1ea0dfe57a0dbd95d9b84da03b15403dc16c46c45c3b656686622182306b3e70f48aee8ef09540c82639216d30f29a6e495fce5978299a272 SHA512 3e7d3a770c97f4a5653524a2844721336440724611e554ba2fb33529c99abd15206a14249c27bd7a9fd21b5f5c34f2719b64477e4ebc58fa64d94e211383e8e6
-DIST urh-2.7.3.tar.gz 13379031 BLAKE2B b3b417b4cebed4f7a96509d451c82e52ed76590f993232ae0fc680a8585729a0aec11acc1581e6cc903e034f418ab37c46fb1c2bfa585b65defc706583dd55c9 SHA512 2caf0bb3900f30d4fc59205fabbfb0a0d81b0ab4eecc04ff1a1ab4f76d8bac569c652385bb0cf64d50786abb939eda4e8e5bf9f50b794bd5055b18ff6fbab41c
+DIST urh-2.7.5.tar.gz 13380707 BLAKE2B 3f712e212ebe15e6a2f0affcb77f8973b1aa88971b8854cdc62b14b900fc010b8d2b27d918f7d6bb5a3d6914accce7cba01014aae9ed63de1bdaddc14145b96b SHA512 81f32d8be83c5ea764de728c66c201d522a25a14baed30a7e6c7f0a4089d98d71520f8cb9cc594f41a6570e61fd48b9dc06ce8b87701f94b4ff58aed356f6481
 EBUILD urh-1.6.4.1.ebuild 942 BLAKE2B 21125d0f771cc1d657669d3dc5e7bcbf268521233f6e19fa29c8ab50e5165f75f45d7a0094728c02f00585d532a7f66828dd18c12a2fe8c180ea21bb02914f93 SHA512 c5c0ea78020b72084b45f97506215c724022469474919ee83f8a9098ab5d24d52a90c45faec1f3ca9100b6aa18b8149983dfd7821cb3066c126a26b9ea59c119
-EBUILD urh-2.7.3.ebuild 1275 BLAKE2B 1ef3ae6c0b69ca86d3369f35d9b611cdbf73db62b2f08865be26e9833ebff69cc21f86ab47dd3b821eb54789d2a026a36ec532125130f76e42b38cbc3e634abe SHA512 a590240d2093292f718883df41f84125c671b4d3ed951b12d351606e93679dda2ffbdcbdb70aa1574413725ab892f452848b345b2d550ee86bd35f479397146f
+EBUILD urh-2.7.5.ebuild 1275 BLAKE2B 1ef3ae6c0b69ca86d3369f35d9b611cdbf73db62b2f08865be26e9833ebff69cc21f86ab47dd3b821eb54789d2a026a36ec532125130f76e42b38cbc3e634abe SHA512 a590240d2093292f718883df41f84125c671b4d3ed951b12d351606e93679dda2ffbdcbdb70aa1574413725ab892f452848b345b2d550ee86bd35f479397146f
 EBUILD urh-9999.ebuild 1275 BLAKE2B b110be15580f72feaa0356864e6a18ab2e998637e6179811790cce1b002b38d038b2ec53030c2c9075a4b3cc38e3078c80bd179a65edc785c423f2ecee9fdf3d SHA512 65eb35cde7f49ff0d3c94261ff32bfc30aca3977a4f8eef73f339e3ad87819c640e8ef2238f7c5d454fdda7826df353e83fe46cea056921fc6d1265b9dca9047
 MISC metadata.xml 925 BLAKE2B 2ae753ff0a9b2c58db180655350b7805546a6d4bf548902d5717be45ce07481ed1e478b7e46cfc4d0b9c82807b7b99135017aa1beb882d3ac1c9b9cd80ada30c SHA512 1d1005d81c4ba5eb2d482419d4469de906d3c754750fd7ed46540b92861e4b5356935986572168f1ee3008319aa31054a206d71b5153e7a1758a8c6796949f89
diff --git a/net-wireless/urh/urh-2.7.3.ebuild b/net-wireless/urh/urh-2.7.5.ebuild
index 22ba4e271aca..22ba4e271aca 100644
--- a/net-wireless/urh/urh-2.7.3.ebuild
+++ b/net-wireless/urh/urh-2.7.5.ebuild
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index ad5fed495273..f9d858e47449 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -20,10 +20,10 @@ DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 99c61326c402f60b384fa6c9a7381e43d
 DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa SHA512 8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3
 DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 260b4830949a3e051ef4f33f279b3b225ab9fd95100e4b270d29af457cf07601421fac636d9f1d8927271d7c76aecb0b7c93ddab35203e31a0fd84c3e327d951 SHA512 b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8
-EBUILD wpa_supplicant-2.6-r10.ebuild 12647 BLAKE2B 1c79f30a1746cb72ca4a8dd1353fc943731ab13633ec963f53f36ddf8c75a64bc738e9be75a059d174e05f85693b251de413f8733d47392de53c8bdbcd8bec75 SHA512 dca78957810df5fd52a1a4bbc7fdb5460dad19b2388124ef90c4616e4684eeac01ea60f0436d9c81ad168ac7acf5f56011270a0972fc42da58d2731539993ba8
-EBUILD wpa_supplicant-2.7-r1.ebuild 11750 BLAKE2B eb1e7a72330890822359cc0d006957cd6e25723bc063ee739148a9923aa5d966287e5f35049190dbf730f116025bfc960545561d869ca8d06ad35a92c88bbd26 SHA512 b9bd97e080835f1aeec619cab60e5bf23382b6a91bead57373edef72064b53945ee4722ec4ebd23ce8d5d95d342a56f72d9c508910176d890e796067802b1746
-EBUILD wpa_supplicant-2.7-r3.ebuild 11552 BLAKE2B 2634e6f8bf06e5a9f65dc52194334bda1b89fafc5db5d5c080840944c58431d8271eac507d3ae33ea9496ca05bffa76d2852231ae39032f697feb297ec895b9b SHA512 83fef1ecea3a7b21a995920018a63b4cd3f3f5019573aaa559faae16bf8550e4fd4f1b26fb96d3f94dead411067f11ffc444a37728883bedb73e493f1a476d69
-EBUILD wpa_supplicant-2.8-r1.ebuild 11671 BLAKE2B d03e365d8897f8029cd4cb1f5d935ac8cf63b4889863ec86a32ac8a503a24239c4f8edd7d827e39204e5732b1dd9c24e552da8ac51e60f43186510ec910b14a9 SHA512 08884e96122db43448dcffb8a957c595d6a8dbe1493274e94b3d3d69e7cec26242c21dcdba780219da5d0cb081cfabdc95e27ae3592cb2d9382683e71a24a6ca
-EBUILD wpa_supplicant-2.9.ebuild 11883 BLAKE2B 6a3a0b2da56a2a9045b196d83e237a2e6c8cc49674f7a556ce1718546b5592df44b34761e8f43899c60e919ea1154b76a405830cf21bfe3a1fd75c066d3a3e09 SHA512 20184ba90153581468db253f59a3528b86f10186ab6ee89ede28d87d2e81a2812e966f9a53b6d63f9da2bb77c55b59be3428c5e718c4e82fbe3b3ee5a4c5c665
-EBUILD wpa_supplicant-9999.ebuild 11361 BLAKE2B cbac3abdabd5438ce306317f5b8616d93feaf4260fada105e8ac452f70a131696e4f956f1bc09a07005856548648838f634f3d967beec7c4c393f5257c25b282 SHA512 29a6025e9ce15f9e27465dcc155d6089dccc2e0b6e2422c4acd3ae715d5657e043377c6534d9fa3f4f2dc89fc08e4fab90a1424c411dccfc59491580c9405c74
+EBUILD wpa_supplicant-2.6-r10.ebuild 12637 BLAKE2B 6461f5db9a4174524d9939937a73a31cecf63e6f55ce4499ab27ffc099ae08309acedc4d2a62d9ad132e6d1842ad406bfb79c3adfae136dcba87f7377e7b18b2 SHA512 06a8bc35e5cd40bf43fd42c28a34149fff47a523c71c573101047907952bb31c128d7d4e606a6b33d7b1c8532d228fec0fcaad3d6ba0dc463623da25a73f0247
+EBUILD wpa_supplicant-2.7-r1.ebuild 11740 BLAKE2B b0619e04c599161f54220e6aec3cb750095047b4b463c01dd0aac1e25b52afc7460dad373abb0cdc51ba45fc528f4773e8c7f9ea4e89d0d5bb677574808773d4 SHA512 334289db49c59f172e838a3c33a7a16903265c5d45762473f9ab3c329d73f77937c4bd545caba471a13c4831ba1e3bbbf3cedb58a32dbb0d2e842b0b165969a6
+EBUILD wpa_supplicant-2.7-r3.ebuild 11542 BLAKE2B bbbc734c6bea7237863739eec4e63585dcb09995fa66cc7a992dd842c85d192f9afa3364a45277bc70d3438980f7f37582dedb351ce3a24e24813b9f566a0f82 SHA512 e40aae436d4357566d6f098ff2dc5416264ee205456292e93ffc2618594b922fbfdb2922760af177efde170d59614d4441b9f61bfc9351e7ad691bd0c0bcaede
+EBUILD wpa_supplicant-2.8-r1.ebuild 11661 BLAKE2B 9df7321b8318959fd5741aa2b83d1305c4d4554a2b3a4d1ee35f745fd4128a67d529b5dd532c18a2dfcfd73210e656e925ef5116238856463187ce7a6837a288 SHA512 7cd5edaf38491aa44ef6f9c2384e07cb5ecf211c002f8c4b3843c418048437e1b784070714a735316e57af1b0cc01f6f4ef9d87db79829746b76e563ec9c6381
+EBUILD wpa_supplicant-2.9.ebuild 11873 BLAKE2B 30bc6201b56069f7324573cbc744b75bfaf4bbfdff5ecf1e8449968e9d1cea447b59277a0c6596612ded24c35cb09fd245bb42629893136793ded68b752fc93f SHA512 78e9289f0dca5d54fa33fa8fa6ad15f15d97f6add91798e7b36f8bdaade97eb8e7f47c206992b4719d3c94befa98ff0255438cc03314ccc7fc19fa64985918b7
+EBUILD wpa_supplicant-9999.ebuild 11351 BLAKE2B 0e4eb379cb2db7c74e298fe220e2fc2d0e6c7aa1479046bb19fb736fa56f1583dcb4e8f80a74fae9544c29024ff8bee08f0cf657ae67bccb8561a402f558810c SHA512 f9436603860527df244ccf4f00b105ed0a4e1879392f515fda120200893b7c6d4d04ad8511287cd096a54c72168b4c14b1393f45ab6e656dfe5a34fa6b917fba
 MISC metadata.xml 1523 BLAKE2B 50ad101e8ccf8a08b6c778c5108c518b81f2d28770f7cf4b770aa92a7a16da5806354bfe4ac1342fdb7a1f1fdf943272507f9c7308c5f421e2ee7d7d20c70266 SHA512 3ea8bfd877e93ebe91a75f989fe09e11546d76ffbea1ddf559de0829d6728cd4bdac64321971011eccd673e8dfdd446bf4a67e4619f07c3f8330816d5a815ee2
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index a51880a17ddc..5c5b91c36f5b 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 REQUIRED_USE="smartcard? ( ssl )"
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
index 54a02a98ae6c..e9cff9806212 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild
index a20d8e0dce38..697e343ecab3 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index 1c68d46a2a63..2b773d19178e 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild
index 2d3f2e93d50c..2eb8231f0f5f 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 98c75f3618e1..a439dde4108c 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /net-wireless
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)