gentoo resync : 20.03.2022

15 files changed, 302 insertions, 199 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 605d38524857..82b96f6b2d80 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index d40a3edcd873..2c9f3cbf92d5 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -3,13 +3,16 @@ DIST intel-microcode-collection-20210221.tar.xz 6690716 BLAKE2B 09758341d20d60b7
 DIST intel-microcode-collection-20210514.tar.xz 7907672 BLAKE2B d5226008e50e804c0acfa648393032b08a317572be1e38743721613000dede886d3885b36f7fa4a9c061e72855fc0ad409ce3299f679afc866abda7d29c9512a SHA512 fc4fcd3e2c4f1abdf5c0d23c1c0ac2f8c572531dadbc9a070c38150ec939cd4e2b13226b86df2371eb0679cef96307262d0356f2e617773c51c53f3e440894d2
 DIST intel-microcode-collection-20210608.tar.xz 8012692 BLAKE2B 98df9d18658bfdf06ac7db84ac30707fe8834874583b324ebc882b514975d71b686788fcd1c9b9c5b05448403b27524e29a94ade34facdffb1645333059019a9 SHA512 7fd810cf05334f6442b9a0c77aef5319d3e2006e887d0354dee952647ded3fa6331a30192abf82eda0676af0439b40f5e3ab0210611f96c78fe52f01f106c5d4
 DIST intel-microcode-collection-20210830.tar.xz 8681768 BLAKE2B 84f098285ed0b79b953e1f54b9ca077e42e7a2b6b28e862dddcb23a546ebebdd5afb9e54215b6c6493b72bf82121ace4b06f759413d3745571ff8156db52d6b1 SHA512 8a6a7376524888b0e89f9fd9a592d52a3859f4ddf1d961484b60d77098faa6984c5e8efc9cf4258a943cfc2c3503dbb87989868962a7ad8028c391d897e212b6
+DIST intel-microcode-collection-20220207.tar.xz 9362888 BLAKE2B 9efb2a943bffc1d702675c4ca5d17b6bc7f5bf5688fb1979caadbf96c516c31c3e1894823aaa16dbdb8c778c933eaf49dec6f2d416483d11e58ed1e75823cef8 SHA512 72458aa64c05ceb8bb21b296da5ad15230af3e6ac63240a10370fadec09523cf7ebefaaddce2b31e2c16570c2700a875cccf86fd1770046ff36cc30eb594f041
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f SHA512 248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
 DIST microcode-20201112.tar.gz 3610834 BLAKE2B 4212924f1673afded961266a25fe6063ec6cdafaa26c8bee1c42372eb8ab5f278dc2501615b23e09e2f9809bf2792a8db317c98c170bf0c5e1dd62b7dc80a084 SHA512 0875675d065a83ee14fa34a31022ee34e46aee579d1ff192414e79861af157ae269ca7c2c462f03b3accbd45590c76e5cbf4f53d7a6ed237e410213a96459211
 DIST microcode-20210216.tar.gz 3506111 BLAKE2B e09ab59dcccc77c15545b119dcf5309e626d53649a601c49fc7d6a65d774b8016d9ad44783f75ceb4bf384a03b909bc28693ed2be9f047029342dca9beae9cae SHA512 211ed90a248c891224bb8c569e24c04410d3f67ecc6daee41dc025042bd51c257baaba0da1ac5327df76352d2b53d812e81f06cc8726e43b95ea2f8898bc00bf
 DIST microcode-20210608.tar.gz 4782451 BLAKE2B 2eac43aaa7832365e428bf2de20797ef42293a53087545920d205bd3b11a3d8ca2afb33931af5d36b8f3a224b9c22ed89ff828acc8afdcfa1b8220884c55ae89 SHA512 61acd2e76aa019fa0002fbf56c503791080a937ff93d81e020f8f0cc089dc08928b4c7e9884f713b886e2f9d4a8409fea59e39f628ef534a588515e1c3fc861d
-EBUILD intel-microcode-20201112_p20201116-r1.ebuild 9298 BLAKE2B ff4ab91d73e431201865fc9c01df0d859abfa45ffec44942625c46e572f4283cdf79da2f8e2bcfb3d56d820e558630ce1d7404d2875be852fea1cb01e8b6ed2d SHA512 8f49e0fb4c4f1b1c5a43bfe428c1964d5d014c94d4c15b0ffda8b625395aabae4412488a70e82e855999db1b762f87c815ccd57b88c334e6e5215278520db476
-EBUILD intel-microcode-20210216_p20210221.ebuild 9298 BLAKE2B b61bac5b36aa2e1e72db6f4708dff56c2d5f62902cb44d975fd47b6089571e8f265a09fca46f4eb53993a30f855dea7154256f881af35382fe91774474e1ec56 SHA512 599e41379bedfe4afb9e4fb8ed386bb2c04427dfd2b31954c598457f96d976decd1a6ba420bd504ba6c3969e1ef6f6e7f98aaacb58e3bf6bb68963453e1ee41e
-EBUILD intel-microcode-20210216_p20210514.ebuild 9298 BLAKE2B b61bac5b36aa2e1e72db6f4708dff56c2d5f62902cb44d975fd47b6089571e8f265a09fca46f4eb53993a30f855dea7154256f881af35382fe91774474e1ec56 SHA512 599e41379bedfe4afb9e4fb8ed386bb2c04427dfd2b31954c598457f96d976decd1a6ba420bd504ba6c3969e1ef6f6e7f98aaacb58e3bf6bb68963453e1ee41e
-EBUILD intel-microcode-20210608_p20210608.ebuild 9298 BLAKE2B b61bac5b36aa2e1e72db6f4708dff56c2d5f62902cb44d975fd47b6089571e8f265a09fca46f4eb53993a30f855dea7154256f881af35382fe91774474e1ec56 SHA512 599e41379bedfe4afb9e4fb8ed386bb2c04427dfd2b31954c598457f96d976decd1a6ba420bd504ba6c3969e1ef6f6e7f98aaacb58e3bf6bb68963453e1ee41e
-EBUILD intel-microcode-20210608_p20210830.ebuild 9298 BLAKE2B b61bac5b36aa2e1e72db6f4708dff56c2d5f62902cb44d975fd47b6089571e8f265a09fca46f4eb53993a30f855dea7154256f881af35382fe91774474e1ec56 SHA512 599e41379bedfe4afb9e4fb8ed386bb2c04427dfd2b31954c598457f96d976decd1a6ba420bd504ba6c3969e1ef6f6e7f98aaacb58e3bf6bb68963453e1ee41e
+DIST microcode-20220207.tar.gz 4590237 BLAKE2B 8c47a330794615b6684084976b6bb9e8800cd2869f81ecc33b28b54441b220a645502c0ade0cbd58e91879a652ff6bca181800004de477fc74033413ea4b1c8f SHA512 efa9f80815947cf2be371e7da7185634cbacefe779d1d6dfef0c15b78ccae7d2740ea6681b967a19dfbcc3014edce5bcdcdba87c9dea1f19d0415a03fca9e936
+EBUILD intel-microcode-20201112_p20201116-r1.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
+EBUILD intel-microcode-20210216_p20210221.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
+EBUILD intel-microcode-20210216_p20210514.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
+EBUILD intel-microcode-20210608_p20210608.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
+EBUILD intel-microcode-20210608_p20210830.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
+EBUILD intel-microcode-20220207_p20220207.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
 MISC metadata.xml 668 BLAKE2B 9b5e9c5ad6b5889f72758aa76253fc43f0fba9ab9fa51b8393f2b48e76ba61455c257561697a00dd2178c3a563ae76066a3d930cb20e5f51c9534ee1d8db232e SHA512 c1354363370d038f70e20176232dbbe8e66f515a0a28e9da4fa1b792de8c7c785bd70fdc872db774d1f29a50217955becf93a3a55e31c431a4954bada801c6ac
diff --git a/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
index a162e73196e8..adfb7ec7e6a4 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,7 +30,7 @@ BDEPEND=">=sys-apps/iucode_tool-2.3"
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="hostonly? ( sys-apps/iucode_tool )"
 
-RESTRICT="binchecks bindist mirror strip"
+RESTRICT="binchecks strip"
 
 S=${WORKDIR}
 
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild
index 0a8e3fc79f0d..adfb7ec7e6a4 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,7 +30,7 @@ BDEPEND=">=sys-apps/iucode_tool-2.3"
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="hostonly? ( sys-apps/iucode_tool )"
 
-RESTRICT="binchecks bindist mirror strip"
+RESTRICT="binchecks strip"
 
 S=${WORKDIR}
 
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
index 0a8e3fc79f0d..adfb7ec7e6a4 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,7 +30,7 @@ BDEPEND=">=sys-apps/iucode_tool-2.3"
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="hostonly? ( sys-apps/iucode_tool )"
 
-RESTRICT="binchecks bindist mirror strip"
+RESTRICT="binchecks strip"
 
 S=${WORKDIR}
 
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild
index 0a8e3fc79f0d..adfb7ec7e6a4 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,7 +30,7 @@ BDEPEND=">=sys-apps/iucode_tool-2.3"
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="hostonly? ( sys-apps/iucode_tool )"
 
-RESTRICT="binchecks bindist mirror strip"
+RESTRICT="binchecks strip"
 
 S=${WORKDIR}
 
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210608_p20210830.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210608_p20210830.ebuild
index 0a8e3fc79f0d..adfb7ec7e6a4 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20210608_p20210830.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20210608_p20210830.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,7 +30,7 @@ BDEPEND=">=sys-apps/iucode_tool-2.3"
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="hostonly? ( sys-apps/iucode_tool )"
 
-RESTRICT="binchecks bindist mirror strip"
+RESTRICT="binchecks strip"
 
 S=${WORKDIR}
 
diff --git a/sys-firmware/intel-microcode/intel-microcode-20220207_p20220207.ebuild b/sys-firmware/intel-microcode/intel-microcode-20220207_p20220207.ebuild
new file mode 100644
index 000000000000..adfb7ec7e6a4
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20220207_p20220207.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info toolchain-funcs mount-boot
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+COLLECTION_SNAPSHOT="${PV##*_p}"
+INTEL_SNAPSHOT="${PV/_p*}"
+#NUM="28087"
+#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
+#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
+SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
+	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
+	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="hostonly initramfs +split-ucode vanilla"
+REQUIRED_USE="|| ( initramfs split-ucode )"
+
+BDEPEND=">=sys-apps/iucode_tool-2.3"
+
+# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
+RDEPEND="hostonly? ( sys-apps/iucode_tool )"
+
+RESTRICT="binchecks strip"
+
+S=${WORKDIR}
+
+# Blacklist bad microcode here.
+# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
+MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
+
+# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
+MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
+
+# https://bugs.gentoo.org/722768
+MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
+
+# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
+MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
+
+# In case we want to set some defaults ...
+MICROCODE_SIGNATURES_DEFAULT=""
+
+# Advanced users only!
+# Set MIRCOCODE_SIGNATURES to merge with:
+# only current CPU: MICROCODE_SIGNATURES="-S"
+# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
+# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
+		# new tarball format from GitHub
+		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
+		cd .. || die
+		rm -r Intel-Linux-Processor-Microcode-Data* || die
+	fi
+
+	mkdir intel-ucode-old || die
+	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
+
+	# Prevent "invalid file format" errors from iucode_tool
+	rm -f "${S}"/intel-ucod*/list || die
+}
+
+src_install() {
+	# This will take ALL of the upstream microcode sources:
+	# - microcode.dat
+	# - intel-ucode/
+	# In some cases, they have not contained the same content (eg the directory has newer stuff).
+	MICROCODE_SRC=(
+		"${S}"/intel-ucode/
+		"${S}"/intel-ucode-with-caveats/
+		"${S}"/intel-ucode-old/
+	)
+
+	# Allow users who are scared about microcode updates not included in Intel's official
+	# microcode tarball to opt-out and comply with Intel marketing
+	if ! use vanilla; then
+		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
+	fi
+
+	# These will carry into pkg_preinst via env saving.
+	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
+	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
+
+	opts=(
+		${MICROCODE_BLACKLIST}
+		${MICROCODE_SIGNATURES}
+		# be strict about what we are doing
+		--overwrite
+		--strict-checks
+		--no-ignore-broken
+		# we want to install latest version
+		--no-downgrade
+		# show everything we find
+		--list-all
+		# show what we selected
+		--list
+	)
+
+	# The earlyfw cpio needs to be in /boot because it must be loaded before
+	# rootfs is mounted.
+	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
+
+	keepdir /lib/firmware/intel-ucode
+	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
+
+	iucode_tool \
+		"${opts[@]}" \
+		"${MICROCODE_SRC[@]}" \
+		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
+
+	dodoc releasenote.md
+}
+
+pkg_preinst() {
+	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
+		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
+	fi
+
+	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
+		ewarn "Package was created using advanced options:"
+		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+
+	local _initramfs_file="${ED}/boot/intel-uc.img"
+
+	if use hostonly; then
+		# While this output looks redundant we do this check to detect
+		# rare cases where iucode_tool was unable to detect system's processor(s).
+		local _detected_processors=$(iucode_tool --scan-system 2>&1)
+		if [[ -z "${_detected_processors}" ]]; then
+			ewarn "Looks like iucode_tool was unable to detect any processor!"
+		else
+			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
+		fi
+
+		opts=(
+			--scan-system
+			# be strict about what we are doing
+			--overwrite
+			--strict-checks
+			--no-ignore-broken
+			# we want to install latest version
+			--no-downgrade
+			# show everything we find
+			--list-all
+			# show what we selected
+			--list
+		)
+
+		# The earlyfw cpio needs to be in /boot because it must be loaded before
+		# rootfs is mounted.
+		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
+
+		if use split-ucode; then
+			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
+		fi
+
+		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
+
+		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
+		keepdir /lib/firmware/intel-ucode
+
+		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
+
+		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
+
+	elif ! use split-ucode; then # hostonly disabled
+		rm -r "${ED}"/lib/firmware/intel-ucode || die
+	fi
+
+	# Because it is possible that this package will install not one single file
+	# due to user selection which is still somehow unexpected we add the following
+	# check to inform user so that the user has at least a chance to detect
+	# a problem/invalid select.
+	local _has_installed_something=
+	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
+		_has_installed_something="yes"
+	elif use split-ucode; then
+		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
+	fi
+
+	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
+		elog "You only installed ucode(s) for all currently available (=online)"
+		elog "processor(s). Remember to re-emerge this package whenever you"
+		elog "change the system's processor model."
+		elog ""
+	elif [[ -z "${_has_installed_something}" ]]; then
+		ewarn "WARNING:"
+		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
+			ewarn "No ucode was installed! Because you have created this package"
+			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
+			ewarn "have an invalid select."
+			ewarn "It's rare but it is also possible that just no ucode update"
+			ewarn "is available for your processor(s). In this case it is safe"
+			ewarn "to ignore this warning."
+		else
+			ewarn "No ucode was installed! It's rare but it is also possible"
+			ewarn "that just no ucode update is available for your processor(s)."
+			ewarn "In this case it is safe to ignore this warning."
+		fi
+
+		ewarn ""
+
+		if use hostonly; then
+			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
+			ewarn ""
+		fi
+	fi
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
+
+pkg_postinst() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+
+	# We cannot give detailed information if user is affected or not:
+	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
+	# to to force a specific, otherwise blacklisted, microcode. So we
+	# only show a generic warning based on running kernel version:
+	if kernel_is -lt 4 14 34; then
+		ewarn "${P} contains microcode updates which require"
+		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
+		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
+		ewarn "can crash your system!"
+		ewarn ""
+		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
+		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
+		ewarn "re-enabled those microcodes...!"
+		ewarn ""
+		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
+		ewarn "requires additional kernel patches or not."
+	fi
+}
diff --git a/sys-firmware/iwl3160-ucode/Manifest b/sys-firmware/iwl3160-ucode/Manifest
index 3f71117c6be0..5e7dbc2eb9df 100644
--- a/sys-firmware/iwl3160-ucode/Manifest
+++ b/sys-firmware/iwl3160-ucode/Manifest
@@ -1,3 +1,3 @@
 DIST iwl3160-ucode-0.16.242414.tgz 467156 BLAKE2B 47a94667cfdc5a9409073e866f750b7c3edefe42539ab1b4f7ac432e2dc74a8a5c0cf45bad5febb1ed165b74dc2af1319b088c751bde69cd5c64812ffd5f43f7 SHA512 ca0f675ebddb92c936df6bf412fdd1a41a33426636c3c40881251dfdd8b6527bc03d03b73b10dfb6fcc23676d1d51c372ac406f9554baf7f4ac36c9bd302b79d
-EBUILD iwl3160-ucode-0.16.242414.ebuild 1378 BLAKE2B a1d43fb4c278ad25674cb5adad899c6dccb7ef4c410ee1537dddbd4a2e139ea754d88e55df8bc7fcdd561ac790bb683200161f06bd7fa9f951050d0fd7ca6c87 SHA512 2f149bf9cd37e79a7dfcca8388b4874187432e0459a40acd980d71ca1203864e10014c9a279a1fa18425b404be0a1531799198c21157312d256fae2f6112df49
+EBUILD iwl3160-ucode-0.16.242414-r1.ebuild 941 BLAKE2B f930ca3162d774a4a21e3f0f89fd223f174174095611fdd67e737f274c52d77c929e2b309cd53e5f1df6d00c5f16a65de724826f2282b905a21676f5be9102b4 SHA512 4e564d32e689da5612712c9b8b48d6b83368fe98fe9051a131e728c141656ff18f52a0642287c9fac8aaf6998a7021bec3ba8a6ac355b2c159389b4056b4e093
 MISC metadata.xml 413 BLAKE2B 9855c687f05d8a1e1b425e877cc57b6f7048fe1d3d41982c302369c369aea84b461afd0671b0a8d451c9542ab47d9d78c8164065df08a1027e25b7114e9e1daf SHA512 1dcd805a4412643ef1f45f8c105fe40a202e4c7f1481df9420c0276592806280c1a7ed6f7d558be07790ad3e1a1e7ad78202fb4b573460484ea0349ce2db5ed1
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414-r1.ebuild
index 3abce4765618..7bb42e888f01 100644
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414.ebuild
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414-r1.ebuild
@@ -1,46 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit linux-info versionator
+EAPI=8
+
+inherit linux-info
 
 DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
+MY_PV="$(ver_cut 2).$(ver_cut 3).$(ver_cut 1)"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
-DV_MAJOR="4"
-DV_MINOR="3"
-DV_PATCH="0"
-
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
 SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="ipw3945"
-SLOT="${vc[2]}"
+SLOT="$(ver_cut 2)"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+RDEPEND="
+	bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
 CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	doins iwlwifi-${DEV_N}-$(ver_cut 2).ucode
 	dodoc README*
 }
diff --git a/sys-firmware/iwl7260-ucode/Manifest b/sys-firmware/iwl7260-ucode/Manifest
index 2b6a73b910b0..b77eee8032a2 100644
--- a/sys-firmware/iwl7260-ucode/Manifest
+++ b/sys-firmware/iwl7260-ucode/Manifest
@@ -1,3 +1,3 @@
 DIST iwl7260-ucode-0.16.242414.tgz 494594 BLAKE2B b1dc80d923eca6046750d0858f19598473ac7c0d0155e98ecc0080fa61825366d17a2e4985031908548667ce17c8ee3f4b6683d10d53e532385c86c6f9dc84fc SHA512 8abfa4141a390a733ea6a43fe7d8d8874752b84a42a5be0a93ed7935f2f76241af41d48f2911393837a32aaf0230f1b1ee9984488e60f447c29794c0e60cd0bb
-EBUILD iwl7260-ucode-0.16.242414.ebuild 1378 BLAKE2B a1d43fb4c278ad25674cb5adad899c6dccb7ef4c410ee1537dddbd4a2e139ea754d88e55df8bc7fcdd561ac790bb683200161f06bd7fa9f951050d0fd7ca6c87 SHA512 2f149bf9cd37e79a7dfcca8388b4874187432e0459a40acd980d71ca1203864e10014c9a279a1fa18425b404be0a1531799198c21157312d256fae2f6112df49
+EBUILD iwl7260-ucode-0.16.242414-r1.ebuild 941 BLAKE2B f930ca3162d774a4a21e3f0f89fd223f174174095611fdd67e737f274c52d77c929e2b309cd53e5f1df6d00c5f16a65de724826f2282b905a21676f5be9102b4 SHA512 4e564d32e689da5612712c9b8b48d6b83368fe98fe9051a131e728c141656ff18f52a0642287c9fac8aaf6998a7021bec3ba8a6ac355b2c159389b4056b4e093
 MISC metadata.xml 413 BLAKE2B 34b79f66b82c2894f9a8d0e65cc49d89e18535381246a51502026dda3d6a4a8af8b71310dfec3f0a82bc58287ab03e3a3a0ecbdded3336ffb5c942091c3a1f0d SHA512 5fa716cb9b776c117c88bfeea535f114aad428785c2d3ab8c99644da7d5c98fba23b87b212b3d5b7cfdb4007bb3d80546d5541992034fdea7a199047ccfbd002
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414-r1.ebuild
index 3abce4765618..7bb42e888f01 100644
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414.ebuild
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414-r1.ebuild
@@ -1,46 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit linux-info versionator
+EAPI=8
+
+inherit linux-info
 
 DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
+MY_PV="$(ver_cut 2).$(ver_cut 3).$(ver_cut 1)"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
-DV_MAJOR="4"
-DV_MINOR="3"
-DV_PATCH="0"
-
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
 SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="ipw3945"
-SLOT="${vc[2]}"
+SLOT="$(ver_cut 2)"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+RDEPEND="
+	bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
 CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	doins iwlwifi-${DEV_N}-$(ver_cut 2).ucode
 	dodoc README*
 }
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 04af9e055d71..9006a93d5439 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -1,7 +1,3 @@
-DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc261acdcef976c02fb96f312a7c16c1c06c9419de73559c6ba59cf7d558b28c0dbf720bef3942a57c512fe8b5066bbb574b8286f9184ab029af9c20d SHA512 cf8eb4ad1947dc9f692fcf6540174a186bb054ea8cfdcd458c98452fa90125fc5079ac1cdfcf4171b6ee97023bc1d0a2a180d4b6ef6829c7c84a84922ee336f6
 DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d
-DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
-EBUILD raspberrypi-wifi-ucode-20190114.1_p10.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
 EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
-EBUILD raspberrypi-wifi-ucode-20190114.1_p9.ebuild 2379 BLAKE2B 272d3fabba5110c39f661ad346e9cc9e9b8e174eaa369d4494b90cff6d5e7e5e527ac9f7011108bd35d9659b4a708da87d75240f3146533272c6dc95a1b7d081 SHA512 990db7c7fa97de251b566f8b05aa369c0ae0b9538468870c328c5eb06b1860e94a98b2ffd3a93f462963c75544cf96a7355dbe94514c65ba40d1e1f2d9c8dced
 MISC metadata.xml 601 BLAKE2B cb558331f5bc8c0f398a2734474c8c475925e289b77d00250d53e7683c0a64af1de9185058c72187c727b7accc79c741b688d7ce04d4a50913d6169f0fe0f841 SHA512 7617a620030f5bdbad802806d85f09936097c480106d6beb095d235b347d41dd7a43636ea55e42c11f5c409e2c61c644ee69fe926495a1cd4fe89fd9d1a798c2
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild
deleted file mode 100644
index ec573949e197..000000000000
--- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs"
-HOMEPAGE="https://github.com/RPi-Distro/firmware-nonfree
-	https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree"
-MY_PN=firmware-nonfree
-SRC_URI="https://archive.raspberrypi.org/debian/pool/main/f/${MY_PN}/${MY_PN}_$(ver_cut 1)-$(ver_cut 2)+rpt$(ver_cut 4).debian.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="Broadcom"
-SLOT="0"
-KEYWORDS="arm arm64"
-
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-pkg_pretend() {
-	local -a BADFILES=()
-	local txt file
-	# /lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt
-	# The above pattern works because the files we want to hit
-	# have names of the form:
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
-	# While the files installed by raspberrypi-wifi-ucode have names
-	# of the form:
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.txt
-	# * /lib/firmware/brcm/brcmfmac43436-sdio.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.txt
-	# * /lib/firmware/brcm/brcmfmac43456-sdio.txt
-	# So no overlap is assured.
-	for txt in "${EPREFIX}"/lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt; do
-		[[ -e "${txt}" ]] && BADFILES+=( "${txt}" )
-	done
-
-	if [[ "${#BADFILES[@]}" -gt 1 ]]; then
-		eerror "The following files should be excluded from the savedconfig of"
-		eerror "linux-firmware and linux-firmware should be re-emerged. Even"
-		eerror "though they do not collide with files from ${PN},"
-		eerror "they may be loaded preferentially to the files included in"
-		eerror "${PN}, leading to undefined behaviour."
-		eerror "List of files:"
-		for file in "${BADFILES[@]}"; do
-			eerror "${file}"
-		done
-	fi
-}
-
-src_prepare() {
-	default
-	eapply -p1 debian/patches/sdio-txt-files.patch
-}
-
-src_install() {
-	insinto /lib/firmware/brcm
-	doins brcm/*
-	dodoc debian/changelog
-}
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild
deleted file mode 100644
index 5475720b31f7..000000000000
--- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs"
-HOMEPAGE="https://github.com/RPi-Distro/firmware-nonfree
-	https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree"
-MY_PN=firmware-nonfree
-SRC_URI="https://archive.raspberrypi.org/debian/pool/main/f/${MY_PN}/${MY_PN}_$(ver_cut 1)-$(ver_cut 2)+rpt$(ver_cut 4).debian.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="Broadcom"
-SLOT="0"
-KEYWORDS="arm arm64"
-
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-pkg_pretend() {
-	local -a BADFILES=()
-	local txt file
-	# /lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt
-	# The above pattern works because the files we want to hit
-	# have names of the form:
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
-	# While the files installed by raspberrypi-wifi-ucode have names
-	# of the form:
-	# * /lib/firmware/brcm/brcmfmac43430-sdio.txt
-	# * /lib/firmware/brcm/brcmfmac43436-sdio.txt
-	# * /lib/firmware/brcm/brcmfmac43455-sdio.txt
-	# * /lib/firmware/brcm/brcmfmac43456-sdio.txt
-	# So no overlap is assured.
-	for txt in "${EPREFIX}"/lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt; do
-		[[ -e "${txt}" ]] && BADFILES+=( "${txt}" )
-	done
-
-	if [[ "${#BADFILES[@]}" -gt 1 ]]; then
-		eerror "The following files should be excluded from the savedconfig of"
-		eerror "linux-firmware and linux-firmware should be re-emerged. Even"
-		eerror "though they do not collide with files from ${PN},"
-		eerror "they may be loaded preferentially to the files included in"
-		eerror "${PN}, leading to undefined behaviour."
-		eerror "List of files:"
-		for file in "${BADFILES[@]}"; do
-			eerror "${file}"
-		done
-	fi
-}
-
-src_prepare() {
-	default
-	eapply -p1 debian/patches/sdio-txt-files.patch
-}
-
-src_install() {
-	insinto /lib/firmware/brcm
-	doins brcm/*
-	dodoc debian/changelog
-}