gentoo resync : 22.05.2021

3 files changed, 4 insertions, 47 deletions

diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 237272be0b46..91b0a8fe1834 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,7 +1,5 @@
-DIST wireless-regdb-2019.03.01.tar.xz 23196 BLAKE2B 804ad05a0270df58dd89eb7193f8b568b5534abfc52b35f519e27cfa1f1922db457c77477b3014bd6b48cdd1bbe9e859a6508afa848cf01efbbf6b20d10c4984 SHA512 f0b94e1f661d86f4fcd39384588e10d7353ad085563ddc40a98446b416ce0d7bd0cbe34f1d9620ac45a33f16b7bfe58419da915061942cd5f51d5a3bf9809d72
-DIST wireless-regdb-2019.06.03.tar.xz 23176 BLAKE2B 46ed9c25103a57d2370f07035f27ffd89d6a65cdccb22d283aef524aff60b669f21dd4a4dd78c68229a443640a5fd0faa1ad6917e712181881d4b27ead74f480 SHA512 73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb
 DIST wireless-regdb-2020.11.20.tar.xz 24840 BLAKE2B b2db70097db43710cc2b6d8966b5c6d4d910a704a87a0bc979667bfd293d8baa402677b5e5bc0fcc4f49647ede4cd6bc3e17d41288f41e58c5c6cf3b968489a9 SHA512 93764e677c4d5cdcb4e927bff206c646061fe1e65896dd63f683e145d45917545b4e08caa14bfb3ea04ffb85438935503bbde386cbabfef2804905e508ecf7a0
-EBUILD wireless-regdb-20190301.ebuild 1094 BLAKE2B 338477e1eb34d00ac7ade07eba3b453b72ccb7dfe00b946b1c4e957f923a689ee4edc8c784b134eb99a0c66135de18e1306eaf7d91601d3ede4d08a937c31fbb SHA512 2b6fc9abea0484d1a21afca5b71c1026352a80b49defa22b8b308eb0bca95d88eec792f78afa9af8f56b97c6b6cf9dd95c9cc24731676d1b3d66c58fa8227466
-EBUILD wireless-regdb-20190603.ebuild 1094 BLAKE2B 338477e1eb34d00ac7ade07eba3b453b72ccb7dfe00b946b1c4e957f923a689ee4edc8c784b134eb99a0c66135de18e1306eaf7d91601d3ede4d08a937c31fbb SHA512 2b6fc9abea0484d1a21afca5b71c1026352a80b49defa22b8b308eb0bca95d88eec792f78afa9af8f56b97c6b6cf9dd95c9cc24731676d1b3d66c58fa8227466
+DIST wireless-regdb-2021.04.21.tar.xz 24944 BLAKE2B 4af782ceefe67c311cb90d1f64d830d9e5d2ccb7bc1aebcd8a176079522c21f1d8ef70cad0bd7223e9d56d46e6d20030af2349da9944d7ee3590bad28aeba467 SHA512 0ffbee04ec08c2025a34b60adc11198d64cb258a6ce53caf758667d25b733a242ca592d76ebd08e5692047917f5f42bb67a176f67a7d6bd11ad9178378cd0d26
 EBUILD wireless-regdb-20201120.ebuild 1086 BLAKE2B 0e5bf6a57dc56c9dcb93be6d789a37493aeef6481ef84e922fc78b5f8844c1ad5bd9f8a89ffb555c252fb42be83e470bb3961a7b01df9ccb2b52db9fe7bc1c2e SHA512 05abfc850d4c87c819ee5a124afeccb00f681546884fb33b4546f9e262861a5eae54f93857714c4031c1ccf048c0105dc9184136ca15a04d69fe8a37aa421cca
+EBUILD wireless-regdb-20210421.ebuild 1085 BLAKE2B c25b4832b8974cc08a905585df068faa79257b707e47e6f9b640e7db77f33c151e297f111d88ad7340a42a35947d519c8e29a56411f73ef395ce1bda77da676e SHA512 945cef5481d528902bab4bb1d62fb77770e12acbaa1e7ace2bb9ab7be4b2f4218203a7e5bae2e679d3d6c806aae2c2bbd8dc35136e9ad649f1b1940393890fac
 MISC metadata.xml 377 BLAKE2B 0d6169ef294234e5652cf6dbf9d270e8e09e2780449b1bd7b9d565163fbd150584590aff69547aa016fba6c746c64ec34b6ea99cfa3b5203d2b28fa25f5b6546 SHA512 79208a488315b6c618273728b77d0edfbd4c42defca71e4c2092ddf9ef61c535045b181e11dd50277caea46e910e52b310bf6903c84267495a36e8cbc3e17c7c
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
deleted file mode 100644
index 238679fd3abd..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-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
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20210421.ebuild
index 238679fd3abd..52d63984fd0d 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20210421.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
 DESCRIPTION="Binary regulatory database for CRDA"
 HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
 SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 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."