Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

8 files changed, 3 insertions, 119 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 113e2aafd994..1aa26f01e12f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 6b87fa372fd9..43ae5aee2001 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -11,6 +11,6 @@ AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd0
 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
-EBUILD bluez-5.49-r1.ebuild 8104 BLAKE2B 614bf0fab42321ed4b96f92d5309895ff816805ed9405e758981bb0ebc48196a6c14b43349c62b531f19144971b2dab92a6bb1c12894bb8f041580aeb16a04e9 SHA512 cd3308db12790dc05180f0501319d22786150936ce574ec685000aab65fd3bc2c26291cea538afd1ee74c7825fc84618117264d6662376f56f8bda2acca6fda3
+EBUILD bluez-5.49-r1.ebuild 8105 BLAKE2B 4189b5a552e21035ede1457f21dc52e51087223b637771fd30de34e4876a0f338a1275fc42fa12a9203c54f05a24208aefecccb2dd3e8d8dbc21b0f89a63563d SHA512 36439d44207ec0d3c31ef73b768921d5169f5304da133c75597a0ba5db6926ae529de341b1fc7a5306f864801a6eeb6e1bb4058dde9ee019666c5e9baa179566
 EBUILD bluez-5.49.ebuild 7932 BLAKE2B f9c6a66914d52f6e08d4d40ac27cf8b88c554865e10ade87cf66342489c18a514394eba0b0bca71e4fd37a8a90316a9a3296630b5c45da713c10241b5564e55d SHA512 c7bfd84e13fb86070dd5cdb9ccb1fdec8692973d9775c3b82d4ede76316fc98aaf7bf659acfc9027b049097ff9dc155640d3c1b336adedbe322061ba34a85f9e
 MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93
diff --git a/net-wireless/bluez/bluez-5.49-r1.ebuild b/net-wireless/bluez/bluez-5.49-r1.ebuild
index ed09b204db99..843f66de1eb8 100644
--- a/net-wireless/bluez/bluez-5.49-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.49-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 51e7312afc88..d2387e763596 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,8 +1,7 @@
-AUX fix-setuptools.patch 2415 BLAKE2B 880353193f8ba3285b3e91c60a2938b2c67d0b91fd6cfb47504f5bfdba75a29e4c8f3d7b47d5ef2a7b2fdbc2f0587002f7ec58fa80b68919c949ad01498416ad SHA512 fa73125ad86b98513e6112efc5bf8a78a41aa804dc526d304eb89f1f3b53b2298bba2025860f12f74523dffc623a8f68027de48e19fd83afba0f39b6d720179d
 AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 EBUILD kismet-2016.07.1-r1.ebuild 4191 BLAKE2B 121e49130ad54fc963b011b005fa33ea6d01e71cf699232c744f7a497076b489e8913da9a0341becb21657de947204cd260e95ef46fe111716de1b1b6781b521 SHA512 ceefe51d38f6375629708be15a23a9e382578a8b4474503e2ff61bb912ab3ae313b37f417880f180094439505ea36fdbd9aeab95cbd426cc3f744985615080fc
-EBUILD kismet-9999.ebuild 4691 BLAKE2B acc21dc3fc02efd61f4073c37902bcf45b7f264296b71c6315ff800e7c44879a4d565e7286c4667e794e2a997b73c4dc5a110790715c2a7ecd82d0c759e3106a SHA512 2f50cdca13c5626c4bd2353a47c9d4009af440f7376883d42427ea3fdcb891e208aebf43aef5d5d2b1039b50f950c194816272fa9bbf0e729f6eef52c1fe5901
+EBUILD kismet-9999.ebuild 4648 BLAKE2B 7494ea94656dd35db279259d7f2f56b6684eb26f089a59bbe163d4585fb5f2796c9ede6d044258ae2f723d7aed5533e690b43bd78d8ba56725a1f4049b889378 SHA512 17a4dda34d64a1b98414a752f5e134537cc2676942924d374be9314ff3cb1d596fd45fc006332e514cf86297804bb5238aecfa8e9416bece6b0867d5bb20dda2
 MISC metadata.xml 1159 BLAKE2B 2e72c1c62f31b52445c83b6b0d7695c7f1231de69fbe865e123a18dc0030a0f57586b058a7e738d561f48413e8a6ff0e8ac73428de2c41688e5baa1e4c255af1 SHA512 cf7c0f4c38f0a5e7b9c51c9fc98f5dd49e51159986443687a81d486c8805aea069168832f406a16b36dc6342be063fdbcade74685273fcdd2111ea9a616437d7
diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
deleted file mode 100644
index a86f66b4447c..000000000000
--- a/net-wireless/kismet/files/fix-setuptools.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit e31263b50acd960f7bb0c34c0396383319d7da30
-Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
-Date:   Tue Apr 24 11:38:17 2018 -0400
-
-    make setuptools respect DESTDIR
-    
-    thanks to mgorny for pointint it out
-
-diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
-index 75c85da9..980c417a 100644
---- a/capture_freaklabs_zigbee/Makefile.in
-+++ b/capture_freaklabs_zigbee/Makefile.in
-@@ -6,7 +6,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- 
- clean:
-diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
-index 23446edc..babc63f4 100644
---- a/capture_sdr_rtl433/Makefile.in
-+++ b/capture_sdr_rtl433/Makefile.in
-@@ -7,7 +7,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
- 
-diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
-index 036541a0..fc660dfe 100644
---- a/python_modules/KismetExternal/Makefile
-+++ b/python_modules/KismetExternal/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- protobuf:
- 	$(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
-diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
-index d0d6f784..60e1eac1 100644
---- a/python_modules/KismetLog/Makefile
-+++ b/python_modules/KismetLog/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- clean:
- 	@-$(PYTHON2) ./setup.py clean
-diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
-index d0d6f784..60e1eac1 100644
---- a/python_modules/KismetRest/Makefile
-+++ b/python_modules/KismetRest/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- clean:
- 	@-$(PYTHON2) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 2a6321ed5126..8005063ea995 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -67,7 +67,6 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
-	epatch "${FILESDIR}"/fix-setuptools.patch
 	eapply_user
 	eautoreconf
 }
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 9015ca09f0c0..4792cc0fb9d7 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,8 +1,6 @@
 DIST wireless-regdb-2017.12.23.tar.xz 21444 BLAKE2B 0fa2b2e998d255c574c810b1bd3cc142d8e33cab476f5be91977e55ee9cec092f53ebca742817b28377a446ed4839c9239117643f28e3d0937f05f18123e4514 SHA512 4169ad538939350c70ff2af719e66e1ef3b3bb8ccb71802d0de1c29629ca4c90a6c31ea764207cca63ed928847b0f6c6c561e3b73d5c41b3207da0008e2dc49e
 DIST wireless-regdb-2018.05.09.tar.xz 22768 BLAKE2B 6c384b2f1303013572b53380d23b38b00e3b87300897ec79a5dbb8de1d8e9f9b6c1302f19e306384141e894c3f8fbbca48fbc6c78d721979e0657a3d8156fb18 SHA512 37b20960e82f48d25b441d2656f09687d9f16a55ca18be56f805c0d6a689454e2ec372ccaecec201799e6610d8275c0556a1e249bb8758d8964908b3a78d6c41
-DIST wireless-regdb-2018.05.31.tar.xz 22908 BLAKE2B 1cf2596d8c7c3b8fa108af7f13479ea362d73a53eab59bda4dcda6fab15777a65e1661267ab1f4978398f6547fd1596492d3a4323b657a54fed829ea956bd6cc SHA512 fda18edd619b294b125a5c1e04e758c04332c6d1d99ed44574321753294c159bd6c6f0c592ebfd91e99d301467e8ee8b97d1ad595cd56b3902bd5f85acd95b8d
 EBUILD wireless-regdb-20171223-r1.ebuild 1076 BLAKE2B 8637fc982f8ecb9b717fa7d3090facd20690190fa0d423fa0ca745a8de233de13170c575c5af696b840f7fff2f311d94d1a9b2eb87d81edc01cd693296835ed4 SHA512 5a14a0890ed1adc8ef76d08145dcc62aaa27c24521928c7b6db2bbc53741ee9fa3b8aba60b6f6691d74a052157d3a098d13190f9476acc056bedeedc96da7de6
 EBUILD wireless-regdb-20171223.ebuild 921 BLAKE2B b4468cb0bc864b8c78157eb706d94b2982f2cc33c6b458be6f760260da3cbad191cfabd94086e9840baf13e9655781791adec325059c85aa652ebdac867f1cec SHA512 aa24eda52c76c3a34b994aa5b8b16e4df05a1dd89af754141704b5a26ce16b25c63e17b70b1f357cdbbba5bf268ef082047c72a17d92490342c4fb84554238e2
 EBUILD wireless-regdb-20180509.ebuild 1076 BLAKE2B 8637fc982f8ecb9b717fa7d3090facd20690190fa0d423fa0ca745a8de233de13170c575c5af696b840f7fff2f311d94d1a9b2eb87d81edc01cd693296835ed4 SHA512 5a14a0890ed1adc8ef76d08145dcc62aaa27c24521928c7b6db2bbc53741ee9fa3b8aba60b6f6691d74a052157d3a098d13190f9476acc056bedeedc96da7de6
-EBUILD wireless-regdb-20180531.ebuild 1076 BLAKE2B 8637fc982f8ecb9b717fa7d3090facd20690190fa0d423fa0ca745a8de233de13170c575c5af696b840f7fff2f311d94d1a9b2eb87d81edc01cd693296835ed4 SHA512 5a14a0890ed1adc8ef76d08145dcc62aaa27c24521928c7b6db2bbc53741ee9fa3b8aba60b6f6691d74a052157d3a098d13190f9476acc056bedeedc96da7de6
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20180531.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20180531.ebuild
deleted file mode 100644
index 23973a6371c7..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20180531.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}