gentoo resync : 11.05.2018

4 files changed, 9 insertions, 73 deletions

diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index d2ff913fd6f7..4792cc0fb9d7 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,10 +1,6 @@
-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
+DIST wireless-regdb-2018.05.09.tar.xz 22768 BLAKE2B 6c384b2f1303013572b53380d23b38b00e3b87300897ec79a5dbb8de1d8e9f9b6c1302f19e306384141e894c3f8fbbca48fbc6c78d721979e0657a3d8156fb18 SHA512 37b20960e82f48d25b441d2656f09687d9f16a55ca18be56f805c0d6a689454e2ec372ccaecec201799e6610d8275c0556a1e249bb8758d8964908b3a78d6c41
 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
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20160502.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20160502.ebuild
deleted file mode 100644
index 78f4a5a33963..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20160502.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20160610.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20160610.ebuild
deleted file mode 100644
index 78f4a5a33963..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20160610.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20170307.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20180509.ebuild
index 2a733247c7ae..23973a6371c7 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20170307.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20180509.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
@@ -28,6 +28,12 @@ src_install() {
 	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
 }