commit:     dca86f03e1430b92d038bd46a17bec55efafde32
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 18:02:29 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 18:03:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca86f03

sys-kernel/linux-firmware: drop old

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-kernel/linux-firmware/Manifest                 |   5 -
 .../linux-firmware/linux-firmware-20190603.ebuild  | 299 -----------------
 .../linux-firmware/linux-firmware-20190904.ebuild  | 354 ---------------------
 .../linux-firmware/linux-firmware-20191008.ebuild  | 354 ---------------------
 .../linux-firmware/linux-firmware-20191108.ebuild  | 354 ---------------------
 .../linux-firmware/linux-firmware-20200302.ebuild  | 354 ---------------------
 6 files changed, 1720 deletions(-)

diff --git a/sys-kernel/linux-firmware/Manifest 
b/sys-kernel/linux-firmware/Manifest
index 17b7803413c..3548855ba41 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,11 +1,6 @@
-DIST linux-firmware-20190603.tar.gz 186855626 BLAKE2B 
66e3bf709ae9a3df1ac9b7b9bd4e1fa556b07696896e7db086c7b60887a8e8854638d86ecead091d32b3d9a83adc1ab88e8b2fde730f8f97a3225492c2229512
 SHA512 
9027ae7f649b7e1ff15177c1edb23def93d8fe90a63a90e72e7ab98414d557c9f4545ced30363c68eb1715cd74d19c0dd9e395e82320427b4aab2432a173e62b
 DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B 
bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703
 SHA512 
99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a
-DIST linux-firmware-20190904.tar.gz 196829538 BLAKE2B 
b45b03b26908fab0602ad7e6ff8b5a2028b56a2d4d200de6fda332e9f589e6fa898cfc5eb7a28b585b1eadefb3bc7a06e5e5685928f2a087ddba39b792ff9ca2
 SHA512 
5469754181b3ddbe7233958d517d845c1220890758769995f90605e2f70cd34ed29d1904e8b0388293515191795deef8be1f457f9cb196c9cf01a65707534aff
 DIST linux-firmware-20190923.tar.gz 198130120 BLAKE2B 
21f337e8ef693513b5569ab67bf3ae2323f2c9109ce3fc7d6d0d071974dc8c53301eb21e0b1c279753e867873e4bb04274c0b2b5bfb1160aeaff2f2c92d7f26c
 SHA512 
1421f283602fe889b6fba5d84eab1199c63c597a4fb487583bee188cfa01c7d41bde4ac53eee992a6aa1bb95a77126eee786f96fb682cd7992c5ec581601db54
-DIST linux-firmware-20191008.tar.gz 198940781 BLAKE2B 
35d7bca55473264c4f713bc97d26367ceee4013e57c3f310038674290dd1fc0a0a1a1cf8aa26dcb06c6dc0d7df7b927e47455d2b94f7aaf331650f4b4e3335b8
 SHA512 
a47be88327f59b6ee9964370ebd0e813de3d22d780971815c5696dacbaad402996ad0f312fffa110beb1f588a450618e24b12181a984bb4383f011f4ae53c875
 DIST linux-firmware-20191022.tar.gz 198935619 BLAKE2B 
94d90a8e85af7104f08c398d3df20a88dc4d6f86d638565ab6e45e7fc5dff53e4e56a62a859585438812a1438ea7f7c4e4e47ce4adb22b0adf69439feb5803b4
 SHA512 
2cc99664c8d0275b670373581d7c6e29699f8b84cd6403949182cc1970c3241e5d9c388c34643630a237d87962b7c8e891445969ca9817ac92a4bbbe74e0dc0d
-DIST linux-firmware-20191108.tar.gz 203746264 BLAKE2B 
cd756ac1b1bde9706cd8321133da2e4e620a3236614427ae9836fc5e98fbc62e79060e6cf50717b41391fba9d56e16140f722ffcc5764e4b81ad2e798d1b41ec
 SHA512 
75eb78ef642cc48dc3d8d2cdd7e5312b82ee3c9ebd6ead40a02fdc1d4329c5a9226237fa0ec8e617fc358cc12144dacf4ef6c1441fe444974c1506ef21ea70a0
 DIST linux-firmware-20191215.tar.gz 203746264 BLAKE2B 
cd756ac1b1bde9706cd8321133da2e4e620a3236614427ae9836fc5e98fbc62e79060e6cf50717b41391fba9d56e16140f722ffcc5764e4b81ad2e798d1b41ec
 SHA512 
75eb78ef642cc48dc3d8d2cdd7e5312b82ee3c9ebd6ead40a02fdc1d4329c5a9226237fa0ec8e617fc358cc12144dacf4ef6c1441fe444974c1506ef21ea70a0
 DIST linux-firmware-20200122.tar.gz 219807963 BLAKE2B 
976cf7f8da61213a1210348cffdda8cae1b3f3a2d46aac05fe331fdff37e954620c2768f8941e0d4b6fff8c7b69d68b86516c9df9b9cf96538a4463b0957d1a2
 SHA512 
23500cc99d31597fe691341404cbe9375f7995783b4bf055a53a67ace380bdf9db1c247f12ae7e63ac02e4078e5089aa33e5cc6c2622b26dfaab4a65bfab1db3
-DIST linux-firmware-20200302.tar.gz 221566178 BLAKE2B 
a6fd243dcf4b9e1f0d91136046f1f9df0059c4916debb4108e620f0e587982d61bc9433ca6880dc4451fc60510eff2489ecd1c4979ac2344a0eacb6041da2dd7
 SHA512 
c694d268c0be20a34dbf4f823458d1ed378ae41dfebd2b4d064207f44b0532fe3b02af58ff4ab58e3d2777ad82cb87c1d11e7906b0f423043007b3b75648b458
 DIST linux-firmware-20200316.tar.gz 221745284 BLAKE2B 
6ab4944927420dd8c50d3a97beb32aff22917ab13b283c3358de9f5331479c2a4353dde68a221ac221e9ff5202e46cdaaab9b65cd0431a3984877ab44e2bd0ab
 SHA512 
2fb16fcc474753902ab0236cbb116cdd5de10080d5ad5fc19a015ad3881a203c42beeccf5745e18346fc028a5c743d3d6439f0a04b86b2e0abf9f32aa5f55bad

diff --git a/sys-kernel/linux-firmware/linux-firmware-20190603.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190603.ebuild
deleted file mode 100644
index 875b922e60b..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190603.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-       inherit git-r3
-       
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git";
-else
-       GIT_COMMIT="1884732e01bec25affbd5d3366b187b757b095db"
-       
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 
sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
-       unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="+redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-       unknown-license? ( bindist )"
-
-RDEPEND="!savedconfig? (
-               redistributable? (
-                       !sys-firmware/alsa-firmware[alsa_cards_ca0132]
-                       !media-tv/cx18-firmware
-                       !<sys-firmware/ivtv-firmware-20080701-r1
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-                       !net-dialup/ueagle-atm
-                       !net-dialup/ueagle4-atm
-                       !net-wireless/ar9271-firmware
-                       !net-wireless/i2400m-fw
-                       !net-wireless/libertas-firmware
-                       !sys-firmware/rt61-firmware
-                       !net-wireless/rt73-firmware
-                       !net-wireless/rt2860-firmware
-                       !net-wireless/rt2870-firmware
-                       !sys-block/qla-fc-firmware
-                       !sys-firmware/amd-ucode
-                       !sys-firmware/iwl1000-ucode
-                       !sys-firmware/iwl2000-ucode
-                       !sys-firmware/iwl2030-ucode
-                       !sys-firmware/iwl3945-ucode
-                       !sys-firmware/iwl4965-ucode
-                       !sys-firmware/iwl5000-ucode
-                       !sys-firmware/iwl5150-ucode
-                       !sys-firmware/iwl6000-ucode
-                       !sys-firmware/iwl6005-ucode
-                       !sys-firmware/iwl6030-ucode
-                       !sys-firmware/iwl6050-ucode
-                       !sys-firmware/iwl3160-ucode
-                       !sys-firmware/iwl7260-ucode
-                       !sys-firmware/iwl7265-ucode
-                       !sys-firmware/iwl3160-7260-bt-ucode
-                       !sys-firmware/radeon-ucode
-               )
-               unknown-license? (
-                       !sys-firmware/alsa-firmware[alsa_cards_korg1212]
-                       !sys-firmware/alsa-firmware[alsa_cards_maestro3]
-                       !sys-firmware/alsa-firmware[alsa_cards_sb16]
-                       !sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-               )
-       )"
-
-#add anything else that collides to this
-
-src_unpack() {
-       if [[ ${PV} == 99999999* ]]; then
-               git-r3_src_unpack
-       else
-               default
-               # rename directory from git snapshot tarball
-               mv ${PN}-*/ ${P} || die
-       fi
-}
-
-src_prepare() {
-       # source and documentation files, not to be installed
-       local source_files=(
-               README
-               WHENCE
-               "LICEN[CS]E*"
-               "GPL*"
-               configure
-               Makefile
-               check_whence.py
-               atusb/ChangeLog
-               av7110/Boot.S
-               av7110/Makefile
-               carl9170fw/
-               cis/Makefile
-               cis/src/
-               dsp56k/bootstrap.asm
-               dsp56k/concat-bootstrap.pl
-               dsp56k/Makefile
-               "isci/*.[ch]"
-               isci/Makefile
-               isci/README
-               "keyspan_pda/*.S"
-               keyspan_pda/Makefile
-               usbdux/
-       )
-
-       # whitelist of images with a free software license
-       local free_software=(
-               # keyspan_pda (GPL-2+)
-               keyspan_pda/keyspan_pda.fw
-               keyspan_pda/xircom_pgs.fw
-               # dsp56k (GPL-2+)
-               dsp56k/bootstrap.bin
-               # ath9k_htc (BSD GPL-2+ MIT)
-               ath9k_htc/htc_7010-1.4.0.fw
-               ath9k_htc/htc_9271-1.4.0.fw
-               # pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-               cis/LA-PCM.cis
-               cis/PCMLM28.cis
-               cis/DP83903.cis
-               cis/NE2K.cis
-               cis/tamarack.cis
-               cis/PE-200.cis
-               cis/PE520.cis
-               cis/3CXEM556.cis
-               cis/3CCFEM556.cis
-               cis/MT5634ZLX.cis
-               cis/RS-COM-2P.cis
-               cis/COMpad2.cis
-               cis/COMpad4.cis
-               # serial_cs (GPL-3)
-               cis/SW_555_SER.cis
-               cis/SW_7xx_SER.cis
-               cis/SW_8xx_SER.cis
-               # dvb-ttpci (GPL-2+)
-               av7110/bootcode.bin
-               # usbdux, usbduxfast, usbduxsigma (GPL-2+)
-               usbdux_firmware.bin
-               usbduxfast_firmware.bin
-               usbduxsigma_firmware.bin
-               # brcmfmac (GPL-2+)
-               brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-               brcm/brcmfmac43340-sdio.meegopad-t08.txt
-               brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-               brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-               brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-               "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-               brcm/brcmfmac43430-sdio.AP6212.txt
-               brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-               brcm/brcmfmac43430-sdio.MUR1DX.txt
-               brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-               brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-               brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-               # isci (GPL-2)
-               isci/isci_firmware.bin
-               # carl9170 (GPL-2+)
-               carl9170-1.fw
-               # atusb (GPL-2+)
-               atusb/atusb-0.2.dfu
-               atusb/atusb-0.3.dfu
-               atusb/rzusb-0.3.bin
-               # mlxsw_spectrum (dual BSD/GPL-2)
-               mellanox/mlxsw_spectrum-13.1420.122.mfa2
-               mellanox/mlxsw_spectrum-13.1530.152.mfa2
-               mellanox/mlxsw_spectrum-13.1620.192.mfa2
-               mellanox/mlxsw_spectrum-13.1702.6.mfa2
-               mellanox/mlxsw_spectrum-13.1703.4.mfa2
-               mellanox/mlxsw_spectrum-13.1910.622.mfa2
-               mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-       )
-
-       # blacklist of images with unknown license
-       local unknown_license=(
-               atmsar11.fw
-               korg/k1212.dsp
-               ess/maestro3_assp_kernel.fw
-               ess/maestro3_assp_minisrc.fw
-               yamaha/ds1_ctrl.fw
-               yamaha/ds1_dsp.fw
-               yamaha/ds1e_ctrl.fw
-               tr_smctr.bin
-               ttusb-budget/dspbootcode.bin
-               emi62/bitstream.fw
-               emi62/loader.fw
-               emi62/midi.fw
-               emi62/spdif.fw
-               ti_3410.fw
-               ti_5052.fw
-               mts_mt9234mu.fw
-               mts_mt9234zba.fw
-               whiteheat.fw
-               whiteheat_loader.fw
-               intelliport2.bin
-               cpia2/stv0672_vp4.bin
-               vicam/firmware.fw
-               edgeport/boot.fw
-               edgeport/boot2.fw
-               edgeport/down.fw
-               edgeport/down2.fw
-               edgeport/down3.bin
-               sb16/mulaw_main.csp
-               sb16/alaw_main.csp
-               sb16/ima_adpcm_init.csp
-               sb16/ima_adpcm_playback.csp
-               sb16/ima_adpcm_capture.csp
-               sun/cassini.bin
-               acenic/tg1.bin
-               acenic/tg2.bin
-               adaptec/starfire_rx.bin
-               adaptec/starfire_tx.bin
-               yam/1200.bin
-               yam/9600.bin
-               3com/3C359.bin
-               ositech/Xilinx7OD.bin
-               qlogic/isp1000.bin
-               myricom/lanai.bin
-               yamaha/yss225_registers.bin
-               lgs8g75.fw
-       )
-
-       default
-
-       # remove sources and documentation (wildcards are expanded)
-       rm -r ${source_files[@]} || die
-       rm -rf .git
-
-       if use !unknown-license; then
-               # remove files in unknown_license
-               rm "${unknown_license[@]}" || die
-       fi
-
-       if use !redistributable; then
-               # remove files _not_ in the free_software or unknown_license 
lists
-               # everything else is confirmed (or assumed) to be 
redistributable
-               # based on upstream acceptance policy
-               local IFS=$'\n'
-               find ! -type d -printf "%P\n" \
-                       | grep -Fvx -e "${free_software[*]}" -e 
"${unknown_license[*]}" \
-                       | xargs -d '\n' rm || die
-               IFS=$' \t\n'
-       fi
-
-       echo "# Remove files that shall not be installed from this list." > 
${PN}.conf
-       find * ! -type d ! -name ${PN}.conf >> ${PN}.conf
-
-       if use savedconfig; then
-               restore_config ${PN}.conf
-
-               ebegin "Removing all files not listed in config"
-               find ! -type d ! -name ${PN}.conf -printf "%P\n" \
-                       | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-                               || die "grep failed, empty config file?") \
-                       | xargs -d '\n' --no-run-if-empty rm
-               eend $? || die
-       fi
-
-       # remove empty directories, bug #396073
-       find -type d -empty -delete || die
-}
-
-src_install() {
-       save_config ${PN}.conf
-       rm ${PN}.conf || die
-
-       if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-               eerror "No files to install. Check your USE flag settings"
-               eerror "and the list of files in your saved configuration."
-               die "Refusing to install an empty package"
-       fi
-
-       insinto /lib/firmware/
-       doins -r *
-}
-
-pkg_preinst() {
-       if use savedconfig; then
-               ewarn "USE=savedconfig is active. You must handle file 
collisions manually."
-       fi
-}
-
-pkg_postinst() {
-       elog "If you are only interested in particular firmware files, edit the 
saved"
-       elog "configfile and remove those that you do not want."
-
-       local ver
-       for ver in ${REPLACING_VERSIONS}; do
-               if ver_test ${ver} -lt 20190514; then
-                       elog
-                       elog 'Starting with version 20190514, installation of 
many firmware'
-                       elog 'files is controlled by USE flags. Please review 
your USE flag'
-                       elog 'and package.license settings if you are missing 
some files.'
-                       break
-               fi
-       done
-}

diff --git a/sys-kernel/linux-firmware/linux-firmware-20190904.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190904.ebuild
deleted file mode 100644
index 6a83e8d27e4..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190904.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-       inherit git-r3
-       
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git";
-else
-       GIT_COMMIT="6ddb9d9704e2171d91439c9c42c5965bf3863de8"
-       
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 
sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
-       unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-       unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-               redistributable? (
-                       !sys-firmware/alsa-firmware[alsa_cards_ca0132]
-                       !media-tv/cx18-firmware
-                       !<sys-firmware/ivtv-firmware-20080701-r1
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-                       !net-dialup/ueagle-atm
-                       !net-dialup/ueagle4-atm
-                       !net-wireless/ar9271-firmware
-                       !net-wireless/i2400m-fw
-                       !net-wireless/libertas-firmware
-                       !sys-firmware/rt61-firmware
-                       !net-wireless/rt73-firmware
-                       !net-wireless/rt2860-firmware
-                       !net-wireless/rt2870-firmware
-                       !sys-block/qla-fc-firmware
-                       !sys-firmware/amd-ucode
-                       !sys-firmware/iwl1000-ucode
-                       !sys-firmware/iwl2000-ucode
-                       !sys-firmware/iwl2030-ucode
-                       !sys-firmware/iwl3945-ucode
-                       !sys-firmware/iwl4965-ucode
-                       !sys-firmware/iwl5000-ucode
-                       !sys-firmware/iwl5150-ucode
-                       !sys-firmware/iwl6000-ucode
-                       !sys-firmware/iwl6005-ucode
-                       !sys-firmware/iwl6030-ucode
-                       !sys-firmware/iwl6050-ucode
-                       !sys-firmware/iwl3160-ucode
-                       !sys-firmware/iwl7260-ucode
-                       !sys-firmware/iwl7265-ucode
-                       !sys-firmware/iwl3160-7260-bt-ucode
-                       !sys-firmware/radeon-ucode
-               )
-               unknown-license? (
-                       !sys-firmware/alsa-firmware[alsa_cards_korg1212]
-                       !sys-firmware/alsa-firmware[alsa_cards_maestro3]
-                       !sys-firmware/alsa-firmware[alsa_cards_sb16]
-                       !sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-               )
-       )"
-
-pkg_pretend() {
-       use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-       if [[ ${PV} == 99999999* ]]; then
-               git-r3_src_unpack
-       else
-               default
-               # rename directory from git snapshot tarball
-               mv ${PN}-*/ ${P} || die
-       fi
-}
-
-src_prepare() {
-       # source and documentation files, not to be installed
-       local source_files=(
-               README
-               WHENCE
-               "LICEN[CS]E*"
-               "GPL*"
-               configure
-               Makefile
-               check_whence.py
-               atusb/ChangeLog
-               av7110/Boot.S
-               av7110/Makefile
-               carl9170fw/
-               cis/Makefile
-               cis/src/
-               dsp56k/bootstrap.asm
-               dsp56k/concat-bootstrap.pl
-               dsp56k/Makefile
-               "isci/*.[ch]"
-               isci/Makefile
-               isci/README
-               "keyspan_pda/*.S"
-               keyspan_pda/Makefile
-               usbdux/
-       )
-
-       # whitelist of images with a free software license
-       local free_software=(
-               # keyspan_pda (GPL-2+)
-               keyspan_pda/keyspan_pda.fw
-               keyspan_pda/xircom_pgs.fw
-               # dsp56k (GPL-2+)
-               dsp56k/bootstrap.bin
-               # ath9k_htc (BSD GPL-2+ MIT)
-               ath9k_htc/htc_7010-1.4.0.fw
-               ath9k_htc/htc_9271-1.4.0.fw
-               # pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-               cis/LA-PCM.cis
-               cis/PCMLM28.cis
-               cis/DP83903.cis
-               cis/NE2K.cis
-               cis/tamarack.cis
-               cis/PE-200.cis
-               cis/PE520.cis
-               cis/3CXEM556.cis
-               cis/3CCFEM556.cis
-               cis/MT5634ZLX.cis
-               cis/RS-COM-2P.cis
-               cis/COMpad2.cis
-               cis/COMpad4.cis
-               # serial_cs (GPL-3)
-               cis/SW_555_SER.cis
-               cis/SW_7xx_SER.cis
-               cis/SW_8xx_SER.cis
-               # dvb-ttpci (GPL-2+)
-               av7110/bootcode.bin
-               # usbdux, usbduxfast, usbduxsigma (GPL-2+)
-               usbdux_firmware.bin
-               usbduxfast_firmware.bin
-               usbduxsigma_firmware.bin
-               # brcmfmac (GPL-2+)
-               brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-               brcm/brcmfmac43340-sdio.meegopad-t08.txt
-               brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-               brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-               brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-               "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-               brcm/brcmfmac43430-sdio.AP6212.txt
-               brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-               brcm/brcmfmac43430-sdio.MUR1DX.txt
-               brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-               brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-               brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-               # isci (GPL-2)
-               isci/isci_firmware.bin
-               # carl9170 (GPL-2+)
-               carl9170-1.fw
-               # atusb (GPL-2+)
-               atusb/atusb-0.2.dfu
-               atusb/atusb-0.3.dfu
-               atusb/rzusb-0.3.bin
-               # mlxsw_spectrum (dual BSD/GPL-2)
-               mellanox/mlxsw_spectrum-13.1420.122.mfa2
-               mellanox/mlxsw_spectrum-13.1530.152.mfa2
-               mellanox/mlxsw_spectrum-13.1620.192.mfa2
-               mellanox/mlxsw_spectrum-13.1702.6.mfa2
-               mellanox/mlxsw_spectrum-13.1703.4.mfa2
-               mellanox/mlxsw_spectrum-13.1910.622.mfa2
-               mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-       )
-
-       # blacklist of images with unknown license
-       local unknown_license=(
-               atmsar11.fw
-               korg/k1212.dsp
-               ess/maestro3_assp_kernel.fw
-               ess/maestro3_assp_minisrc.fw
-               yamaha/ds1_ctrl.fw
-               yamaha/ds1_dsp.fw
-               yamaha/ds1e_ctrl.fw
-               tr_smctr.bin
-               ttusb-budget/dspbootcode.bin
-               emi62/bitstream.fw
-               emi62/loader.fw
-               emi62/midi.fw
-               emi62/spdif.fw
-               ti_3410.fw
-               ti_5052.fw
-               mts_mt9234mu.fw
-               mts_mt9234zba.fw
-               whiteheat.fw
-               whiteheat_loader.fw
-               intelliport2.bin
-               cpia2/stv0672_vp4.bin
-               vicam/firmware.fw
-               edgeport/boot.fw
-               edgeport/boot2.fw
-               edgeport/down.fw
-               edgeport/down2.fw
-               edgeport/down3.bin
-               sb16/mulaw_main.csp
-               sb16/alaw_main.csp
-               sb16/ima_adpcm_init.csp
-               sb16/ima_adpcm_playback.csp
-               sb16/ima_adpcm_capture.csp
-               sun/cassini.bin
-               acenic/tg1.bin
-               acenic/tg2.bin
-               adaptec/starfire_rx.bin
-               adaptec/starfire_tx.bin
-               yam/1200.bin
-               yam/9600.bin
-               3com/3C359.bin
-               ositech/Xilinx7OD.bin
-               qlogic/isp1000.bin
-               myricom/lanai.bin
-               yamaha/yss225_registers.bin
-               lgs8g75.fw
-       )
-
-       default
-
-       # remove sources and documentation (wildcards are expanded)
-       rm -r ${source_files[@]} || die
-       rm -rf .git
-
-       if use !unknown-license; then
-               # remove files in unknown_license
-               rm "${unknown_license[@]}" || die
-       fi
-
-       if use !redistributable; then
-               # remove files _not_ in the free_software or unknown_license 
lists
-               # everything else is confirmed (or assumed) to be 
redistributable
-               # based on upstream acceptance policy
-               local IFS=$'\n'
-               find ! -type d -printf "%P\n" \
-                       | grep -Fvx -e "${free_software[*]}" -e 
"${unknown_license[*]}" \
-                       | xargs -d '\n' rm || die
-               IFS=$' \t\n'
-       fi
-
-       if use initramfs; then
-               if [[ -d "${S}/amd-ucode" ]]; then
-                       local UCODETMP="${T}/ucode_tmp"
-                       local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-                       mkdir -p "${UCODEDIR}" || die
-                       echo 1 > "${UCODETMP}/early_cpio"
-
-                       local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-                       cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die 
"Failed to concat amd cpu ucode"
-
-                       if [[ ! -s "${amd_ucode_file}" ]]; then
-                               die "Sanity check failed: '${amd_ucode_file}' 
is empty!"
-                       fi
-
-                       pushd "${UCODETMP}" &>/dev/null || die
-                       find . -print0 | cpio --quiet --null -o -H newc -R 0:0 
> "${S}"/amd-uc.img
-                       popd &>/dev/null || die
-                       if [[ ! -s "${S}/amd-uc.img" ]]; then
-                               die "Failed to create '${S}/amd-uc.img'!"
-                       fi
-               else
-                       # If this will ever happen something has changed which
-                       # must be reviewed
-                       die "'${S}/amd-ucode' not found!"
-               fi
-       fi
-
-       echo "# Remove files that shall not be installed from this list." > 
${PN}.conf
-       find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> 
${PN}.conf
-
-       if use savedconfig; then
-               restore_config ${PN}.conf
-
-               ebegin "Removing all files not listed in config"
-               find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) 
-printf "%P\n" \
-                       | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-                               || die "grep failed, empty config file?") \
-                       | xargs -d '\n' --no-run-if-empty rm
-               eend $? || die
-       fi
-
-       # remove empty directories, bug #396073
-       find -type d -empty -delete || die
-}
-
-src_install() {
-       save_config ${PN}.conf
-       rm ${PN}.conf || die
-
-       if use initramfs ; then
-               mkdir "${ED}/boot" || die
-               mv "${S}"/amd-uc.img "${ED}/boot" || die
-       fi
-
-       if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-               eerror "No files to install. Check your USE flag settings"
-               eerror "and the list of files in your saved configuration."
-               die "Refusing to install an empty package"
-       fi
-
-       insinto /lib/firmware/
-       doins -r *
-}
-
-pkg_preinst() {
-       if use savedconfig; then
-               ewarn "USE=savedconfig is active. You must handle file 
collisions manually."
-       fi
-
-       # Make sure /boot is available if needed.
-       use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-       elog "If you are only interested in particular firmware files, edit the 
saved"
-       elog "configfile and remove those that you do not want."
-
-       local ver
-       for ver in ${REPLACING_VERSIONS}; do
-               if ver_test ${ver} -lt 20190514; then
-                       elog
-                       elog 'Starting with version 20190514, installation of 
many firmware'
-                       elog 'files is controlled by USE flags. Please review 
your USE flag'
-                       elog 'and package.license settings if you are missing 
some files.'
-                       break
-               fi
-       done
-
-       # Don't forget to umount /boot if it was previously mounted by us.
-       use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-       # Make sure /boot is mounted so that we can remove /boot/amd-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
-}

diff --git a/sys-kernel/linux-firmware/linux-firmware-20191008.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20191008.ebuild
deleted file mode 100644
index 8f6faf530c2..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20191008.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-       inherit git-r3
-       
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git";
-else
-       GIT_COMMIT="aa95e90b2c638f1ca6647d12b2d1b18284428f9c"
-       
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 
sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
-       unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-       unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-               redistributable? (
-                       !sys-firmware/alsa-firmware[alsa_cards_ca0132]
-                       !media-tv/cx18-firmware
-                       !<sys-firmware/ivtv-firmware-20080701-r1
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-                       !net-dialup/ueagle-atm
-                       !net-dialup/ueagle4-atm
-                       !net-wireless/ar9271-firmware
-                       !net-wireless/i2400m-fw
-                       !net-wireless/libertas-firmware
-                       !sys-firmware/rt61-firmware
-                       !net-wireless/rt73-firmware
-                       !net-wireless/rt2860-firmware
-                       !net-wireless/rt2870-firmware
-                       !sys-block/qla-fc-firmware
-                       !sys-firmware/amd-ucode
-                       !sys-firmware/iwl1000-ucode
-                       !sys-firmware/iwl2000-ucode
-                       !sys-firmware/iwl2030-ucode
-                       !sys-firmware/iwl3945-ucode
-                       !sys-firmware/iwl4965-ucode
-                       !sys-firmware/iwl5000-ucode
-                       !sys-firmware/iwl5150-ucode
-                       !sys-firmware/iwl6000-ucode
-                       !sys-firmware/iwl6005-ucode
-                       !sys-firmware/iwl6030-ucode
-                       !sys-firmware/iwl6050-ucode
-                       !sys-firmware/iwl3160-ucode
-                       !sys-firmware/iwl7260-ucode
-                       !sys-firmware/iwl7265-ucode
-                       !sys-firmware/iwl3160-7260-bt-ucode
-                       !sys-firmware/radeon-ucode
-               )
-               unknown-license? (
-                       !sys-firmware/alsa-firmware[alsa_cards_korg1212]
-                       !sys-firmware/alsa-firmware[alsa_cards_maestro3]
-                       !sys-firmware/alsa-firmware[alsa_cards_sb16]
-                       !sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-               )
-       )"
-
-pkg_pretend() {
-       use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-       if [[ ${PV} == 99999999* ]]; then
-               git-r3_src_unpack
-       else
-               default
-               # rename directory from git snapshot tarball
-               mv ${PN}-*/ ${P} || die
-       fi
-}
-
-src_prepare() {
-       # source and documentation files, not to be installed
-       local source_files=(
-               README
-               WHENCE
-               "LICEN[CS]E*"
-               "GPL*"
-               configure
-               Makefile
-               check_whence.py
-               atusb/ChangeLog
-               av7110/Boot.S
-               av7110/Makefile
-               carl9170fw/
-               cis/Makefile
-               cis/src/
-               dsp56k/bootstrap.asm
-               dsp56k/concat-bootstrap.pl
-               dsp56k/Makefile
-               "isci/*.[ch]"
-               isci/Makefile
-               isci/README
-               "keyspan_pda/*.S"
-               keyspan_pda/Makefile
-               usbdux/
-       )
-
-       # whitelist of images with a free software license
-       local free_software=(
-               # keyspan_pda (GPL-2+)
-               keyspan_pda/keyspan_pda.fw
-               keyspan_pda/xircom_pgs.fw
-               # dsp56k (GPL-2+)
-               dsp56k/bootstrap.bin
-               # ath9k_htc (BSD GPL-2+ MIT)
-               ath9k_htc/htc_7010-1.4.0.fw
-               ath9k_htc/htc_9271-1.4.0.fw
-               # pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-               cis/LA-PCM.cis
-               cis/PCMLM28.cis
-               cis/DP83903.cis
-               cis/NE2K.cis
-               cis/tamarack.cis
-               cis/PE-200.cis
-               cis/PE520.cis
-               cis/3CXEM556.cis
-               cis/3CCFEM556.cis
-               cis/MT5634ZLX.cis
-               cis/RS-COM-2P.cis
-               cis/COMpad2.cis
-               cis/COMpad4.cis
-               # serial_cs (GPL-3)
-               cis/SW_555_SER.cis
-               cis/SW_7xx_SER.cis
-               cis/SW_8xx_SER.cis
-               # dvb-ttpci (GPL-2+)
-               av7110/bootcode.bin
-               # usbdux, usbduxfast, usbduxsigma (GPL-2+)
-               usbdux_firmware.bin
-               usbduxfast_firmware.bin
-               usbduxsigma_firmware.bin
-               # brcmfmac (GPL-2+)
-               brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-               brcm/brcmfmac43340-sdio.meegopad-t08.txt
-               brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-               brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-               brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-               "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-               brcm/brcmfmac43430-sdio.AP6212.txt
-               brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-               brcm/brcmfmac43430-sdio.MUR1DX.txt
-               brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-               brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-               brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-               # isci (GPL-2)
-               isci/isci_firmware.bin
-               # carl9170 (GPL-2+)
-               carl9170-1.fw
-               # atusb (GPL-2+)
-               atusb/atusb-0.2.dfu
-               atusb/atusb-0.3.dfu
-               atusb/rzusb-0.3.bin
-               # mlxsw_spectrum (dual BSD/GPL-2)
-               mellanox/mlxsw_spectrum-13.1420.122.mfa2
-               mellanox/mlxsw_spectrum-13.1530.152.mfa2
-               mellanox/mlxsw_spectrum-13.1620.192.mfa2
-               mellanox/mlxsw_spectrum-13.1702.6.mfa2
-               mellanox/mlxsw_spectrum-13.1703.4.mfa2
-               mellanox/mlxsw_spectrum-13.1910.622.mfa2
-               mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-       )
-
-       # blacklist of images with unknown license
-       local unknown_license=(
-               atmsar11.fw
-               korg/k1212.dsp
-               ess/maestro3_assp_kernel.fw
-               ess/maestro3_assp_minisrc.fw
-               yamaha/ds1_ctrl.fw
-               yamaha/ds1_dsp.fw
-               yamaha/ds1e_ctrl.fw
-               tr_smctr.bin
-               ttusb-budget/dspbootcode.bin
-               emi62/bitstream.fw
-               emi62/loader.fw
-               emi62/midi.fw
-               emi62/spdif.fw
-               ti_3410.fw
-               ti_5052.fw
-               mts_mt9234mu.fw
-               mts_mt9234zba.fw
-               whiteheat.fw
-               whiteheat_loader.fw
-               intelliport2.bin
-               cpia2/stv0672_vp4.bin
-               vicam/firmware.fw
-               edgeport/boot.fw
-               edgeport/boot2.fw
-               edgeport/down.fw
-               edgeport/down2.fw
-               edgeport/down3.bin
-               sb16/mulaw_main.csp
-               sb16/alaw_main.csp
-               sb16/ima_adpcm_init.csp
-               sb16/ima_adpcm_playback.csp
-               sb16/ima_adpcm_capture.csp
-               sun/cassini.bin
-               acenic/tg1.bin
-               acenic/tg2.bin
-               adaptec/starfire_rx.bin
-               adaptec/starfire_tx.bin
-               yam/1200.bin
-               yam/9600.bin
-               3com/3C359.bin
-               ositech/Xilinx7OD.bin
-               qlogic/isp1000.bin
-               myricom/lanai.bin
-               yamaha/yss225_registers.bin
-               lgs8g75.fw
-       )
-
-       default
-
-       # remove sources and documentation (wildcards are expanded)
-       rm -r ${source_files[@]} || die
-       rm -rf .git
-
-       if use !unknown-license; then
-               # remove files in unknown_license
-               rm "${unknown_license[@]}" || die
-       fi
-
-       if use !redistributable; then
-               # remove files _not_ in the free_software or unknown_license 
lists
-               # everything else is confirmed (or assumed) to be 
redistributable
-               # based on upstream acceptance policy
-               local IFS=$'\n'
-               find ! -type d -printf "%P\n" \
-                       | grep -Fvx -e "${free_software[*]}" -e 
"${unknown_license[*]}" \
-                       | xargs -d '\n' rm || die
-               IFS=$' \t\n'
-       fi
-
-       if use initramfs; then
-               if [[ -d "${S}/amd-ucode" ]]; then
-                       local UCODETMP="${T}/ucode_tmp"
-                       local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-                       mkdir -p "${UCODEDIR}" || die
-                       echo 1 > "${UCODETMP}/early_cpio"
-
-                       local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-                       cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die 
"Failed to concat amd cpu ucode"
-
-                       if [[ ! -s "${amd_ucode_file}" ]]; then
-                               die "Sanity check failed: '${amd_ucode_file}' 
is empty!"
-                       fi
-
-                       pushd "${UCODETMP}" &>/dev/null || die
-                       find . -print0 | cpio --quiet --null -o -H newc -R 0:0 
> "${S}"/amd-uc.img
-                       popd &>/dev/null || die
-                       if [[ ! -s "${S}/amd-uc.img" ]]; then
-                               die "Failed to create '${S}/amd-uc.img'!"
-                       fi
-               else
-                       # If this will ever happen something has changed which
-                       # must be reviewed
-                       die "'${S}/amd-ucode' not found!"
-               fi
-       fi
-
-       echo "# Remove files that shall not be installed from this list." > 
${PN}.conf
-       find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> 
${PN}.conf
-
-       if use savedconfig; then
-               restore_config ${PN}.conf
-
-               ebegin "Removing all files not listed in config"
-               find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) 
-printf "%P\n" \
-                       | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-                               || die "grep failed, empty config file?") \
-                       | xargs -d '\n' --no-run-if-empty rm
-               eend $? || die
-       fi
-
-       # remove empty directories, bug #396073
-       find -type d -empty -delete || die
-}
-
-src_install() {
-       save_config ${PN}.conf
-       rm ${PN}.conf || die
-
-       if use initramfs ; then
-               mkdir "${ED}/boot" || die
-               mv "${S}"/amd-uc.img "${ED}/boot" || die
-       fi
-
-       if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-               eerror "No files to install. Check your USE flag settings"
-               eerror "and the list of files in your saved configuration."
-               die "Refusing to install an empty package"
-       fi
-
-       insinto /lib/firmware/
-       doins -r *
-}
-
-pkg_preinst() {
-       if use savedconfig; then
-               ewarn "USE=savedconfig is active. You must handle file 
collisions manually."
-       fi
-
-       # Make sure /boot is available if needed.
-       use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-       elog "If you are only interested in particular firmware files, edit the 
saved"
-       elog "configfile and remove those that you do not want."
-
-       local ver
-       for ver in ${REPLACING_VERSIONS}; do
-               if ver_test ${ver} -lt 20190514; then
-                       elog
-                       elog 'Starting with version 20190514, installation of 
many firmware'
-                       elog 'files is controlled by USE flags. Please review 
your USE flag'
-                       elog 'and package.license settings if you are missing 
some files.'
-                       break
-               fi
-       done
-
-       # Don't forget to umount /boot if it was previously mounted by us.
-       use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-       # Make sure /boot is mounted so that we can remove /boot/amd-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
-}

diff --git a/sys-kernel/linux-firmware/linux-firmware-20191108.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20191108.ebuild
deleted file mode 100644
index e3c4d975db3..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20191108.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-       inherit git-r3
-       
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git";
-else
-       GIT_COMMIT="f1100ddf581f49aa79a54b56fe6ef0815a7ae57e"
-       
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 
sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
-       unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-       unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-               redistributable? (
-                       !sys-firmware/alsa-firmware[alsa_cards_ca0132]
-                       !media-tv/cx18-firmware
-                       !<sys-firmware/ivtv-firmware-20080701-r1
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-                       !net-dialup/ueagle-atm
-                       !net-dialup/ueagle4-atm
-                       !net-wireless/ar9271-firmware
-                       !net-wireless/i2400m-fw
-                       !net-wireless/libertas-firmware
-                       !sys-firmware/rt61-firmware
-                       !net-wireless/rt73-firmware
-                       !net-wireless/rt2860-firmware
-                       !net-wireless/rt2870-firmware
-                       !sys-block/qla-fc-firmware
-                       !sys-firmware/amd-ucode
-                       !sys-firmware/iwl1000-ucode
-                       !sys-firmware/iwl2000-ucode
-                       !sys-firmware/iwl2030-ucode
-                       !sys-firmware/iwl3945-ucode
-                       !sys-firmware/iwl4965-ucode
-                       !sys-firmware/iwl5000-ucode
-                       !sys-firmware/iwl5150-ucode
-                       !sys-firmware/iwl6000-ucode
-                       !sys-firmware/iwl6005-ucode
-                       !sys-firmware/iwl6030-ucode
-                       !sys-firmware/iwl6050-ucode
-                       !sys-firmware/iwl3160-ucode
-                       !sys-firmware/iwl7260-ucode
-                       !sys-firmware/iwl7265-ucode
-                       !sys-firmware/iwl3160-7260-bt-ucode
-                       !sys-firmware/radeon-ucode
-               )
-               unknown-license? (
-                       !sys-firmware/alsa-firmware[alsa_cards_korg1212]
-                       !sys-firmware/alsa-firmware[alsa_cards_maestro3]
-                       !sys-firmware/alsa-firmware[alsa_cards_sb16]
-                       !sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-               )
-       )"
-
-pkg_pretend() {
-       use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-       if [[ ${PV} == 99999999* ]]; then
-               git-r3_src_unpack
-       else
-               default
-               # rename directory from git snapshot tarball
-               mv ${PN}-*/ ${P} || die
-       fi
-}
-
-src_prepare() {
-       # source and documentation files, not to be installed
-       local source_files=(
-               README
-               WHENCE
-               "LICEN[CS]E*"
-               "GPL*"
-               configure
-               Makefile
-               check_whence.py
-               atusb/ChangeLog
-               av7110/Boot.S
-               av7110/Makefile
-               carl9170fw/
-               cis/Makefile
-               cis/src/
-               dsp56k/bootstrap.asm
-               dsp56k/concat-bootstrap.pl
-               dsp56k/Makefile
-               "isci/*.[ch]"
-               isci/Makefile
-               isci/README
-               "keyspan_pda/*.S"
-               keyspan_pda/Makefile
-               usbdux/
-       )
-
-       # whitelist of images with a free software license
-       local free_software=(
-               # keyspan_pda (GPL-2+)
-               keyspan_pda/keyspan_pda.fw
-               keyspan_pda/xircom_pgs.fw
-               # dsp56k (GPL-2+)
-               dsp56k/bootstrap.bin
-               # ath9k_htc (BSD GPL-2+ MIT)
-               ath9k_htc/htc_7010-1.4.0.fw
-               ath9k_htc/htc_9271-1.4.0.fw
-               # pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-               cis/LA-PCM.cis
-               cis/PCMLM28.cis
-               cis/DP83903.cis
-               cis/NE2K.cis
-               cis/tamarack.cis
-               cis/PE-200.cis
-               cis/PE520.cis
-               cis/3CXEM556.cis
-               cis/3CCFEM556.cis
-               cis/MT5634ZLX.cis
-               cis/RS-COM-2P.cis
-               cis/COMpad2.cis
-               cis/COMpad4.cis
-               # serial_cs (GPL-3)
-               cis/SW_555_SER.cis
-               cis/SW_7xx_SER.cis
-               cis/SW_8xx_SER.cis
-               # dvb-ttpci (GPL-2+)
-               av7110/bootcode.bin
-               # usbdux, usbduxfast, usbduxsigma (GPL-2+)
-               usbdux_firmware.bin
-               usbduxfast_firmware.bin
-               usbduxsigma_firmware.bin
-               # brcmfmac (GPL-2+)
-               brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-               brcm/brcmfmac43340-sdio.meegopad-t08.txt
-               brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-               brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-               brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-               "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-               brcm/brcmfmac43430-sdio.AP6212.txt
-               brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-               brcm/brcmfmac43430-sdio.MUR1DX.txt
-               brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-               brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-               brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-               # isci (GPL-2)
-               isci/isci_firmware.bin
-               # carl9170 (GPL-2+)
-               carl9170-1.fw
-               # atusb (GPL-2+)
-               atusb/atusb-0.2.dfu
-               atusb/atusb-0.3.dfu
-               atusb/rzusb-0.3.bin
-               # mlxsw_spectrum (dual BSD/GPL-2)
-               mellanox/mlxsw_spectrum-13.1420.122.mfa2
-               mellanox/mlxsw_spectrum-13.1530.152.mfa2
-               mellanox/mlxsw_spectrum-13.1620.192.mfa2
-               mellanox/mlxsw_spectrum-13.1702.6.mfa2
-               mellanox/mlxsw_spectrum-13.1703.4.mfa2
-               mellanox/mlxsw_spectrum-13.1910.622.mfa2
-               mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-       )
-
-       # blacklist of images with unknown license
-       local unknown_license=(
-               atmsar11.fw
-               korg/k1212.dsp
-               ess/maestro3_assp_kernel.fw
-               ess/maestro3_assp_minisrc.fw
-               yamaha/ds1_ctrl.fw
-               yamaha/ds1_dsp.fw
-               yamaha/ds1e_ctrl.fw
-               tr_smctr.bin
-               ttusb-budget/dspbootcode.bin
-               emi62/bitstream.fw
-               emi62/loader.fw
-               emi62/midi.fw
-               emi62/spdif.fw
-               ti_3410.fw
-               ti_5052.fw
-               mts_mt9234mu.fw
-               mts_mt9234zba.fw
-               whiteheat.fw
-               whiteheat_loader.fw
-               intelliport2.bin
-               cpia2/stv0672_vp4.bin
-               vicam/firmware.fw
-               edgeport/boot.fw
-               edgeport/boot2.fw
-               edgeport/down.fw
-               edgeport/down2.fw
-               edgeport/down3.bin
-               sb16/mulaw_main.csp
-               sb16/alaw_main.csp
-               sb16/ima_adpcm_init.csp
-               sb16/ima_adpcm_playback.csp
-               sb16/ima_adpcm_capture.csp
-               sun/cassini.bin
-               acenic/tg1.bin
-               acenic/tg2.bin
-               adaptec/starfire_rx.bin
-               adaptec/starfire_tx.bin
-               yam/1200.bin
-               yam/9600.bin
-               3com/3C359.bin
-               ositech/Xilinx7OD.bin
-               qlogic/isp1000.bin
-               myricom/lanai.bin
-               yamaha/yss225_registers.bin
-               lgs8g75.fw
-       )
-
-       default
-
-       # remove sources and documentation (wildcards are expanded)
-       rm -r ${source_files[@]} || die
-       rm -rf .git
-
-       if use !unknown-license; then
-               # remove files in unknown_license
-               rm "${unknown_license[@]}" || die
-       fi
-
-       if use !redistributable; then
-               # remove files _not_ in the free_software or unknown_license 
lists
-               # everything else is confirmed (or assumed) to be 
redistributable
-               # based on upstream acceptance policy
-               local IFS=$'\n'
-               find ! -type d -printf "%P\n" \
-                       | grep -Fvx -e "${free_software[*]}" -e 
"${unknown_license[*]}" \
-                       | xargs -d '\n' rm || die
-               IFS=$' \t\n'
-       fi
-
-       if use initramfs; then
-               if [[ -d "${S}/amd-ucode" ]]; then
-                       local UCODETMP="${T}/ucode_tmp"
-                       local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-                       mkdir -p "${UCODEDIR}" || die
-                       echo 1 > "${UCODETMP}/early_cpio"
-
-                       local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-                       cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die 
"Failed to concat amd cpu ucode"
-
-                       if [[ ! -s "${amd_ucode_file}" ]]; then
-                               die "Sanity check failed: '${amd_ucode_file}' 
is empty!"
-                       fi
-
-                       pushd "${UCODETMP}" &>/dev/null || die
-                       find . -print0 | cpio --quiet --null -o -H newc -R 0:0 
> "${S}"/amd-uc.img
-                       popd &>/dev/null || die
-                       if [[ ! -s "${S}/amd-uc.img" ]]; then
-                               die "Failed to create '${S}/amd-uc.img'!"
-                       fi
-               else
-                       # If this will ever happen something has changed which
-                       # must be reviewed
-                       die "'${S}/amd-ucode' not found!"
-               fi
-       fi
-
-       echo "# Remove files that shall not be installed from this list." > 
${PN}.conf
-       find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> 
${PN}.conf
-
-       if use savedconfig; then
-               restore_config ${PN}.conf
-
-               ebegin "Removing all files not listed in config"
-               find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) 
-printf "%P\n" \
-                       | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-                               || die "grep failed, empty config file?") \
-                       | xargs -d '\n' --no-run-if-empty rm
-               eend $? || die
-       fi
-
-       # remove empty directories, bug #396073
-       find -type d -empty -delete || die
-}
-
-src_install() {
-       save_config ${PN}.conf
-       rm ${PN}.conf || die
-
-       if use initramfs ; then
-               mkdir "${ED}/boot" || die
-               mv "${S}"/amd-uc.img "${ED}/boot" || die
-       fi
-
-       if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-               eerror "No files to install. Check your USE flag settings"
-               eerror "and the list of files in your saved configuration."
-               die "Refusing to install an empty package"
-       fi
-
-       insinto /lib/firmware/
-       doins -r *
-}
-
-pkg_preinst() {
-       if use savedconfig; then
-               ewarn "USE=savedconfig is active. You must handle file 
collisions manually."
-       fi
-
-       # Make sure /boot is available if needed.
-       use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-       elog "If you are only interested in particular firmware files, edit the 
saved"
-       elog "configfile and remove those that you do not want."
-
-       local ver
-       for ver in ${REPLACING_VERSIONS}; do
-               if ver_test ${ver} -lt 20190514; then
-                       elog
-                       elog 'Starting with version 20190514, installation of 
many firmware'
-                       elog 'files is controlled by USE flags. Please review 
your USE flag'
-                       elog 'and package.license settings if you are missing 
some files.'
-                       break
-               fi
-       done
-
-       # Don't forget to umount /boot if it was previously mounted by us.
-       use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-       # Make sure /boot is mounted so that we can remove /boot/amd-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
-}

diff --git a/sys-kernel/linux-firmware/linux-firmware-20200302.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20200302.ebuild
deleted file mode 100644
index c8c50ee8030..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20200302.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-       inherit git-r3
-       
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git";
-else
-       GIT_COMMIT="0148cfefcbf98898ca65bb26d9d7d638b30e211d"
-       
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 
sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
-       unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-       unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-               redistributable? (
-                       !sys-firmware/alsa-firmware[alsa_cards_ca0132]
-                       !media-tv/cx18-firmware
-                       !<sys-firmware/ivtv-firmware-20080701-r1
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-                       !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-                       !net-dialup/ueagle-atm
-                       !net-dialup/ueagle4-atm
-                       !net-wireless/ar9271-firmware
-                       !net-wireless/i2400m-fw
-                       !net-wireless/libertas-firmware
-                       !sys-firmware/rt61-firmware
-                       !net-wireless/rt73-firmware
-                       !net-wireless/rt2860-firmware
-                       !net-wireless/rt2870-firmware
-                       !sys-block/qla-fc-firmware
-                       !sys-firmware/amd-ucode
-                       !sys-firmware/iwl1000-ucode
-                       !sys-firmware/iwl2000-ucode
-                       !sys-firmware/iwl2030-ucode
-                       !sys-firmware/iwl3945-ucode
-                       !sys-firmware/iwl4965-ucode
-                       !sys-firmware/iwl5000-ucode
-                       !sys-firmware/iwl5150-ucode
-                       !sys-firmware/iwl6000-ucode
-                       !sys-firmware/iwl6005-ucode
-                       !sys-firmware/iwl6030-ucode
-                       !sys-firmware/iwl6050-ucode
-                       !sys-firmware/iwl3160-ucode
-                       !sys-firmware/iwl7260-ucode
-                       !sys-firmware/iwl7265-ucode
-                       !sys-firmware/iwl3160-7260-bt-ucode
-                       !sys-firmware/radeon-ucode
-               )
-               unknown-license? (
-                       !sys-firmware/alsa-firmware[alsa_cards_korg1212]
-                       !sys-firmware/alsa-firmware[alsa_cards_maestro3]
-                       !sys-firmware/alsa-firmware[alsa_cards_sb16]
-                       !sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-               )
-       )"
-
-pkg_pretend() {
-       use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-       if [[ ${PV} == 99999999* ]]; then
-               git-r3_src_unpack
-       else
-               default
-               # rename directory from git snapshot tarball
-               mv ${PN}-*/ ${P} || die
-       fi
-}
-
-src_prepare() {
-       # source and documentation files, not to be installed
-       local source_files=(
-               README
-               WHENCE
-               "LICEN[CS]E*"
-               "GPL*"
-               configure
-               Makefile
-               check_whence.py
-               atusb/ChangeLog
-               av7110/Boot.S
-               av7110/Makefile
-               carl9170fw/
-               cis/Makefile
-               cis/src/
-               dsp56k/bootstrap.asm
-               dsp56k/concat-bootstrap.pl
-               dsp56k/Makefile
-               "isci/*.[ch]"
-               isci/Makefile
-               isci/README
-               "keyspan_pda/*.S"
-               keyspan_pda/Makefile
-               usbdux/
-       )
-
-       # whitelist of images with a free software license
-       local free_software=(
-               # keyspan_pda (GPL-2+)
-               keyspan_pda/keyspan_pda.fw
-               keyspan_pda/xircom_pgs.fw
-               # dsp56k (GPL-2+)
-               dsp56k/bootstrap.bin
-               # ath9k_htc (BSD GPL-2+ MIT)
-               ath9k_htc/htc_7010-1.4.0.fw
-               ath9k_htc/htc_9271-1.4.0.fw
-               # pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-               cis/LA-PCM.cis
-               cis/PCMLM28.cis
-               cis/DP83903.cis
-               cis/NE2K.cis
-               cis/tamarack.cis
-               cis/PE-200.cis
-               cis/PE520.cis
-               cis/3CXEM556.cis
-               cis/3CCFEM556.cis
-               cis/MT5634ZLX.cis
-               cis/RS-COM-2P.cis
-               cis/COMpad2.cis
-               cis/COMpad4.cis
-               # serial_cs (GPL-3)
-               cis/SW_555_SER.cis
-               cis/SW_7xx_SER.cis
-               cis/SW_8xx_SER.cis
-               # dvb-ttpci (GPL-2+)
-               av7110/bootcode.bin
-               # usbdux, usbduxfast, usbduxsigma (GPL-2+)
-               usbdux_firmware.bin
-               usbduxfast_firmware.bin
-               usbduxsigma_firmware.bin
-               # brcmfmac (GPL-2+)
-               brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-               brcm/brcmfmac43340-sdio.meegopad-t08.txt
-               brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-               brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-               brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-               "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-               brcm/brcmfmac43430-sdio.AP6212.txt
-               brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-               brcm/brcmfmac43430-sdio.MUR1DX.txt
-               brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-               brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-               brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-               # isci (GPL-2)
-               isci/isci_firmware.bin
-               # carl9170 (GPL-2+)
-               carl9170-1.fw
-               # atusb (GPL-2+)
-               atusb/atusb-0.2.dfu
-               atusb/atusb-0.3.dfu
-               atusb/rzusb-0.3.bin
-               # mlxsw_spectrum (dual BSD/GPL-2)
-               mellanox/mlxsw_spectrum-13.1420.122.mfa2
-               mellanox/mlxsw_spectrum-13.1530.152.mfa2
-               mellanox/mlxsw_spectrum-13.1620.192.mfa2
-               mellanox/mlxsw_spectrum-13.1702.6.mfa2
-               mellanox/mlxsw_spectrum-13.1703.4.mfa2
-               mellanox/mlxsw_spectrum-13.1910.622.mfa2
-               mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-       )
-
-       # blacklist of images with unknown license
-       local unknown_license=(
-               atmsar11.fw
-               korg/k1212.dsp
-               ess/maestro3_assp_kernel.fw
-               ess/maestro3_assp_minisrc.fw
-               yamaha/ds1_ctrl.fw
-               yamaha/ds1_dsp.fw
-               yamaha/ds1e_ctrl.fw
-               tr_smctr.bin
-               ttusb-budget/dspbootcode.bin
-               emi62/bitstream.fw
-               emi62/loader.fw
-               emi62/midi.fw
-               emi62/spdif.fw
-               ti_3410.fw
-               ti_5052.fw
-               mts_mt9234mu.fw
-               mts_mt9234zba.fw
-               whiteheat.fw
-               whiteheat_loader.fw
-               intelliport2.bin
-               cpia2/stv0672_vp4.bin
-               vicam/firmware.fw
-               edgeport/boot.fw
-               edgeport/boot2.fw
-               edgeport/down.fw
-               edgeport/down2.fw
-               edgeport/down3.bin
-               sb16/mulaw_main.csp
-               sb16/alaw_main.csp
-               sb16/ima_adpcm_init.csp
-               sb16/ima_adpcm_playback.csp
-               sb16/ima_adpcm_capture.csp
-               sun/cassini.bin
-               acenic/tg1.bin
-               acenic/tg2.bin
-               adaptec/starfire_rx.bin
-               adaptec/starfire_tx.bin
-               yam/1200.bin
-               yam/9600.bin
-               3com/3C359.bin
-               ositech/Xilinx7OD.bin
-               qlogic/isp1000.bin
-               myricom/lanai.bin
-               yamaha/yss225_registers.bin
-               lgs8g75.fw
-       )
-
-       default
-
-       # remove sources and documentation (wildcards are expanded)
-       rm -r ${source_files[@]} || die
-       rm -rf .git
-
-       if use !unknown-license; then
-               # remove files in unknown_license
-               rm "${unknown_license[@]}" || die
-       fi
-
-       if use !redistributable; then
-               # remove files _not_ in the free_software or unknown_license 
lists
-               # everything else is confirmed (or assumed) to be 
redistributable
-               # based on upstream acceptance policy
-               local IFS=$'\n'
-               find ! -type d -printf "%P\n" \
-                       | grep -Fvx -e "${free_software[*]}" -e 
"${unknown_license[*]}" \
-                       | xargs -d '\n' rm || die
-               IFS=$' \t\n'
-       fi
-
-       if use initramfs; then
-               if [[ -d "${S}/amd-ucode" ]]; then
-                       local UCODETMP="${T}/ucode_tmp"
-                       local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-                       mkdir -p "${UCODEDIR}" || die
-                       echo 1 > "${UCODETMP}/early_cpio"
-
-                       local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-                       cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die 
"Failed to concat amd cpu ucode"
-
-                       if [[ ! -s "${amd_ucode_file}" ]]; then
-                               die "Sanity check failed: '${amd_ucode_file}' 
is empty!"
-                       fi
-
-                       pushd "${UCODETMP}" &>/dev/null || die
-                       find . -print0 | cpio --quiet --null -o -H newc -R 0:0 
> "${S}"/amd-uc.img
-                       popd &>/dev/null || die
-                       if [[ ! -s "${S}/amd-uc.img" ]]; then
-                               die "Failed to create '${S}/amd-uc.img'!"
-                       fi
-               else
-                       # If this will ever happen something has changed which
-                       # must be reviewed
-                       die "'${S}/amd-ucode' not found!"
-               fi
-       fi
-
-       echo "# Remove files that shall not be installed from this list." > 
${PN}.conf
-       find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> 
${PN}.conf
-
-       if use savedconfig; then
-               restore_config ${PN}.conf
-
-               ebegin "Removing all files not listed in config"
-               find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) 
-printf "%P\n" \
-                       | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-                               || die "grep failed, empty config file?") \
-                       | xargs -d '\n' --no-run-if-empty rm
-               eend $? || die
-       fi
-
-       # remove empty directories, bug #396073
-       find -type d -empty -delete || die
-}
-
-src_install() {
-       save_config ${PN}.conf
-       rm ${PN}.conf || die
-
-       if use initramfs ; then
-               mkdir "${ED}/boot" || die
-               mv "${S}"/amd-uc.img "${ED}/boot" || die
-       fi
-
-       if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-               eerror "No files to install. Check your USE flag settings"
-               eerror "and the list of files in your saved configuration."
-               die "Refusing to install an empty package"
-       fi
-
-       insinto /lib/firmware/
-       doins -r *
-}
-
-pkg_preinst() {
-       if use savedconfig; then
-               ewarn "USE=savedconfig is active. You must handle file 
collisions manually."
-       fi
-
-       # Make sure /boot is available if needed.
-       use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-       elog "If you are only interested in particular firmware files, edit the 
saved"
-       elog "configfile and remove those that you do not want."
-
-       local ver
-       for ver in ${REPLACING_VERSIONS}; do
-               if ver_test ${ver} -lt 20190514; then
-                       elog
-                       elog 'Starting with version 20190514, installation of 
many firmware'
-                       elog 'files is controlled by USE flags. Please review 
your USE flag'
-                       elog 'and package.license settings if you are missing 
some files.'
-                       break
-               fi
-       done
-
-       # Don't forget to umount /boot if it was previously mounted by us.
-       use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-       # Make sure /boot is mounted so that we can remove /boot/amd-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
-}

Reply via email to