gentoo resync : 27.01.2018

5 files changed, 38 insertions, 3 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9c518176e453..8847d028c27f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 82fcec6c139b..1a235c8133b2 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 769 BLAKE2B bcf21b170e7dc3bff669711ce2ecc6b3e5a7234dae100dacc7d32b891187625ea8b1fea98e9c09a946dba73bbbfb43a4db309b488d4d8ac9491b0849d8699153 SHA512 9f320c85b568e4db24ef2379b67bc65f87ed14b624ebc7f204574b5825e16745d97d4936c8f366060ca0ca2e88bfc9d66524edfa362ee2106eea47580766f6c5
+EBUILD iw-4.9.ebuild 768 BLAKE2B 1462b68541721ab422c35c7db9bee36a041bfc3e93b653a6381fe99a85636a606da965e3c0eb7456cba98cf0c97bafe77d783e3380f246b2afbc0a4c5ab64118 SHA512 b19a2be04bf5900292408d539ba3ca666fbc4807898cbb6ec4684b4261fd490d7c1be106419216d7a3c4de41f5dc99d9f66dd0d01c0154e822381f07c10c5df2
 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 f43f3e9fbd79..f9a771d3839a 100644
--- a/net-wireless/iw/iw-4.9.ebuild
+++ b/net-wireless/iw/iw-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 e646a121af31..840c690837bc 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,7 +1,9 @@
 DIST wireless-regdb-2016.05.02.tar.xz 16508 BLAKE2B 15017851a72c9fd8bd12b6154418c49e2d8f51d7b4e14beef0e4019af9d07f2af4c80102ed45e35b13af4a0730853f59847ba8b4ef962a6e6e62ecbdcfd11c29 SHA512 3a81b57430b934978be97a0532c1cd04fdcadd0528279b5fbd8723134f50e5f54ef0ddb4de74c4a397e51c6588b88714dff4cd37ebf059f02f15efed96f705ed
 DIST wireless-regdb-2016.06.10.tar.xz 16596 BLAKE2B ae7dcf2602f675929e6a74f9e5584454574a839c52dc0dbd3043d933dc112d773242fed69f4288b8446d403f6fd6407acc2686bc9131e0ec038438d14e5f01a4 SHA512 8064d18232924d86633df9e1195e9521f8f9ca0216f1e664591e3163d583085971b743b9fbbce196e650f239c231caebb7807c5019fcb409b950c6fbd8396f22
 DIST wireless-regdb-2017.03.07.tar.xz 16848 BLAKE2B 8db0fdf0aac1c1faf34ef69eae9abfd32e9cafb97e123fbd6bbbfffd430ab4f00a03a36a5ba6f4a4a9124799efb3067185ca34939d44ec586c228155e8ffcecc SHA512 91e2458feb5bf4d4b7d9008afd9c2d40b700d53cb898855f6278b93a7779aefeed283bfff2dd77b89bcbcc98c5e131f5187730356e5bba858d96774d610ab450
+DIST wireless-regdb-2017.12.23.tar.xz 21444 BLAKE2B 0fa2b2e998d255c574c810b1bd3cc142d8e33cab476f5be91977e55ee9cec092f53ebca742817b28377a446ed4839c9239117643f28e3d0937f05f18123e4514 SHA512 4169ad538939350c70ff2af719e66e1ef3b3bb8ccb71802d0de1c29629ca4c90a6c31ea764207cca63ed928847b0f6c6c561e3b73d5c41b3207da0008e2dc49e
 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.ebuild 921 BLAKE2B b4468cb0bc864b8c78157eb706d94b2982f2cc33c6b458be6f760260da3cbad191cfabd94086e9840baf13e9655781791adec325059c85aa652ebdac867f1cec SHA512 aa24eda52c76c3a34b994aa5b8b16e4df05a1dd89af754141704b5a26ce16b25c63e17b70b1f357cdbbba5bf268ef082047c72a17d92490342c4fb84554238e2
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20171223.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20171223.ebuild
new file mode 100644
index 000000000000..177f04cb7b8b
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20171223.ebuild
@@ -0,0 +1,33 @@
+# 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
+
+	doman regulatory.bin.5
+	dodoc README db.txt
+}