gentoo resync : 31.01.2018

5 files changed, 42 insertions, 2 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 8847d028c27f..7e8e3c06ac13 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 1a235c8133b2..90283f49ee58 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -9,5 +9,5 @@ EBUILD iw-4.0.ebuild 753 BLAKE2B 0dcafdc4d190d6786d32ff487056184789d60745d1e7ab5
 EBUILD iw-4.14.ebuild 771 BLAKE2B bdf9689a1784e513ba927bf4674abbb060f0065b066ef5aaa5ed49b128b480ec8253968fccd671feb683cf9d4e858ce2c8c64c135ef7c636845b63a45fe0dc71 SHA512 33b81ff5cbf786b406a759dd2b72d8e914c805df99d442c07bbf79723be063608ddab0851c3728862ef71e4d37b7baeb4b1a8b560836f4f4e93eb65c628e5d1f
 EBUILD iw-4.3.ebuild 755 BLAKE2B d9c359eb34d37efc6ef28f44aea898bf6d89e622c4db6fe206b2d04c2c40d543954498df913fa43c3ccd47338b1bb07290c91045e4a29f83d95b092e43443227 SHA512 46429aae6cc69881d3a1320df9e11f28c5e01d010839b99cab83c5f455ed986b4972c698f71c72b9063b3475be062bc7e05e8dd64de18727bf5978b75e165fa5
 EBUILD iw-4.7.ebuild 762 BLAKE2B 417d038aa7efece0cfd2dadeb4bdfc7fb10834053d1e4a0c72706c69deb06b8ba0210e663ff7b0c3ce48358e77a1df80992b2277d567ea76f689979a1d35c84e SHA512 4788121468e574ed343a9a8f781c3e83d15fef389661ffbf17032f29ba984e1bff46f837ec30cedbbb3f52ffaea558ed1794357bbde49be7384546acb5ec7d72
-EBUILD iw-4.9.ebuild 768 BLAKE2B 1462b68541721ab422c35c7db9bee36a041bfc3e93b653a6381fe99a85636a606da965e3c0eb7456cba98cf0c97bafe77d783e3380f246b2afbc0a4c5ab64118 SHA512 b19a2be04bf5900292408d539ba3ca666fbc4807898cbb6ec4684b4261fd490d7c1be106419216d7a3c4de41f5dc99d9f66dd0d01c0154e822381f07c10c5df2
+EBUILD iw-4.9.ebuild 767 BLAKE2B 24d03718a38935e17656d47b36aa9d6e864dc60c51c4f83af82816c52e448fcaea24e2952ad9d5dc5151aadce6cdf4c15f918e244fcf66f3db75c9e33c695f41 SHA512 2bf8724c33a3690ff91b659fa65f4991030ce3c677bed98026a9121c714da0018c7364e0c021c6d1ff9494304749fd3f6e354e45cc47acbf7551ec76b3ccef53
 MISC metadata.xml 429 BLAKE2B e3e0a01fc5b56817b2c9ee51eb9ed0a01209aca6fe2f61762a71e7396897040642b6d85b291d825e6d8bab75a7c47f8bc632339ac68560a267d17ba1a4fc7924 SHA512 1587dc139d13d1c33e06d52235f0334fca32c6c4536e46ffa81f14ef093fb978c34f739d57046e01cda58cd18e5638202a6e580ece4fdb1b2e350b5b083b66c0
diff --git a/net-wireless/iw/iw-4.9.ebuild b/net-wireless/iw/iw-4.9.ebuild
index f9a771d3839a..ca557ca3ebc7 100644
--- a/net-wireless/iw/iw-4.9.ebuild
+++ b/net-wireless/iw/iw-4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/libnl"
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 840c690837bc..d2ff913fd6f7 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -5,5 +5,6 @@ DIST wireless-regdb-2017.12.23.tar.xz 21444 BLAKE2B 0fa2b2e998d255c574c810b1bd3c
 EBUILD wireless-regdb-20160502.ebuild 921 BLAKE2B a9440bdbc3c99eaef7a75444fad7a8594044e712cc0adff02db655324e87eb2953dfe23d7f8c8986501bfcd121bdd2038dca2a4f5eaa923922efabe8c0c29bb5 SHA512 a368f96429681ae0aa9b1110e5d11ed43948e01c38b99151d24e95913bf9ec2ee3a6252416330fa129c14058d58a01f82f9a4671b70d6073266a11fe16728693
 EBUILD wireless-regdb-20160610.ebuild 921 BLAKE2B a9440bdbc3c99eaef7a75444fad7a8594044e712cc0adff02db655324e87eb2953dfe23d7f8c8986501bfcd121bdd2038dca2a4f5eaa923922efabe8c0c29bb5 SHA512 a368f96429681ae0aa9b1110e5d11ed43948e01c38b99151d24e95913bf9ec2ee3a6252416330fa129c14058d58a01f82f9a4671b70d6073266a11fe16728693
 EBUILD wireless-regdb-20170307.ebuild 921 BLAKE2B cb0d44fca0b8cf7fb9d2a6a58917d046ccfb0bcbc7eae8866bfbec28a1023fa99cb857ab33e972cc8df9e41d06d3c1381234382038aba4aca28cf3a929909c6c SHA512 63a8a84b7378654a354ca7a68ef17a8cd1f27365d10324dae72479ac1df5d305a22ebb9de495837b4cadb52b18e10ed31b73eae35cdac8af663ee8941146ad67
+EBUILD wireless-regdb-20171223-r1.ebuild 1076 BLAKE2B 8637fc982f8ecb9b717fa7d3090facd20690190fa0d423fa0ca745a8de233de13170c575c5af696b840f7fff2f311d94d1a9b2eb87d81edc01cd693296835ed4 SHA512 5a14a0890ed1adc8ef76d08145dcc62aaa27c24521928c7b6db2bbc53741ee9fa3b8aba60b6f6691d74a052157d3a098d13190f9476acc056bedeedc96da7de6
 EBUILD wireless-regdb-20171223.ebuild 921 BLAKE2B b4468cb0bc864b8c78157eb706d94b2982f2cc33c6b458be6f760260da3cbad191cfabd94086e9840baf13e9655781791adec325059c85aa652ebdac867f1cec SHA512 aa24eda52c76c3a34b994aa5b8b16e4df05a1dd89af754141704b5a26ce16b25c63e17b70b1f357cdbbba5bf268ef082047c72a17d92490342c4fb84554238e2
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20171223-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20171223-r1.ebuild
new file mode 100644
index 000000000000..23973a6371c7
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20171223-r1.ebuild
@@ -0,0 +1,39 @@
+# 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
+}