commit:     43481c7e31c810bc77eedfff6eae2f0053bb7a48
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 20:04:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 20:10:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43481c7e

sys-kernel/linux-firmware: drop old

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

 sys-kernel/linux-firmware/Manifest                 |   6 -
 .../linux-firmware/linux-firmware-20190502.ebuild  | 135 --------
 .../linux-firmware/linux-firmware-20190514.ebuild  | 312 ------------------
 .../linux-firmware/linux-firmware-20190620.ebuild  | 301 ------------------
 .../linux-firmware/linux-firmware-20190712.ebuild  | 301 ------------------
 .../linux-firmware/linux-firmware-20190717.ebuild  | 301 ------------------
 .../linux-firmware-20190726-r2.ebuild              | 354 ---------------------
 7 files changed, 1710 deletions(-)

diff --git a/sys-kernel/linux-firmware/Manifest 
b/sys-kernel/linux-firmware/Manifest
index d3fa92347d4..9b7444cea83 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,8 +1,2 @@
-DIST linux-firmware-20190502.tar.gz 185125493 BLAKE2B 
48e60d08893688ab546d3d834490f5633c890c523890dedda75154fa041db8a4ae6663ce29485d32cf65556c91906aa8eb4f58ebbc95c34b5aeffb15c8737a98
 SHA512 
4dbc6548a66b5fcf4af47422004123b42f4c62088c5d97c8f24e03403d7acf729d9335addd68b383ecd9e8dc602b301534842c032a58ef920fad74f2c61d29ae
-DIST linux-firmware-20190514.tar.gz 186854834 BLAKE2B 
cc4feeb4627fa402e445b8176557d67107701c6c0db44f5e5398b4040a0b80d40e32731ca3a31ca67de1e134e6b05f7e43ad29f5793c69e23fa220562624d53f
 SHA512 
eff7a5b7c65b254949443b9d2943332f486c73a69baaaa8398c1298cfe1c06c9fdafa2dcfb2f9d1c02adad8b5e205f25bd61001fee99814e12e5d524179bc3e2
 DIST linux-firmware-20190603.tar.gz 186855626 BLAKE2B 
66e3bf709ae9a3df1ac9b7b9bd4e1fa556b07696896e7db086c7b60887a8e8854638d86ecead091d32b3d9a83adc1ab88e8b2fde730f8f97a3225492c2229512
 SHA512 
9027ae7f649b7e1ff15177c1edb23def93d8fe90a63a90e72e7ab98414d557c9f4545ced30363c68eb1715cd74d19c0dd9e395e82320427b4aab2432a173e62b
-DIST linux-firmware-20190620.tar.gz 190401448 BLAKE2B 
a31bbe2f2bf00b9b4f5dfe43f1b764b1cd66e07baf12b21a9f9ab0186c6075c0e78b70b22ac0c3e0762d54dd1624c55f1ae177c445472e28be7c46f570dc015e
 SHA512 
f09ed91c57d6b9f181131030e0af66766c0b49e06cce732744f5df44ed989b635e9a275ec5b140418586fd6fec7f3a1d703dd22b9257f4e5dc7c52f1194f75ae
-DIST linux-firmware-20190712.tar.gz 193523688 BLAKE2B 
2c2751d41b7e17eb40092af43d9dd196ef5544ed43a77392780b77a2def50306f7479aa5b682507b29e471e9acdc446cc44e4ef2c0cceba9d116dbeea5a4d981
 SHA512 
db60dc1d42603c4fba663b7a7ff7fa8de66dd17d8dd99560162c7e763f73012d2e0ded0bb3827d80efa9a4eec4689c11000d44dc094a59242e62f92670b4aca0
-DIST linux-firmware-20190717.tar.gz 193982388 BLAKE2B 
9f3795aba9d1d4127bae4cbf758844bf2ef8dbc185858d2de9c89017b51f410d5f1267aa29b9ce9e41cabfc306a73f5c4d3658aa7929b0b2701b74b13b7af86e
 SHA512 
f50a63ec9f28d4a6f6800559469a43986b1f66c09950f96d1c6ad1402ae5a02599c8f86468d96b014ede00a0a1a7cedf1aa28d53075308bf5d7f12a355fbbe20
-DIST linux-firmware-20190726.tar.gz 195272955 BLAKE2B 
0997ad87830a73909943d01a01a40b8bad06798e4f039bebee663e49ba0694de368164c596033d4dffb146b684a151cc89f98de956ec3743f0a9407097954d9f
 SHA512 
c7503f889b9b37f18f8c4489c1c666fa49e4d6d31329f51f0b59a7ec69eeb9cbc3aa9324e09f373609df242db8f51e1890fd4a61f54bcb7731a642555fd807fe
 DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B 
bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703
 SHA512 
99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a

diff --git a/sys-kernel/linux-firmware/linux-firmware-20190502.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190502.ebuild
deleted file mode 100644
index dc0a935d311..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190502.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-       inherit git-r3
-       SRC_URI=""
-       
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git";
-else
-       GIT_COMMIT="92e17d0dd2437140fab044ae62baf69b35d7d1fa"
-       
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="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-               !sys-firmware/alsa-firmware[alsa_cards_ca0132]
-               !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]
-               !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
-       )"
-#add anything else that collides to this
-
-RESTRICT="binchecks strip"
-
-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() {
-       default
-
-       echo "# Remove files that shall not be installed from this list." > 
${PN}.conf
-       find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-       if use savedconfig; then
-               restore_config ${PN}.conf
-               ebegin "Removing all files not listed in config"
-
-               local file delete_file preserved_file preserved_files=()
-
-               while IFS= read -r file; do
-                       # Ignore comments.
-                       if [[ ${file} != "#"* ]]; then
-                               preserved_files+=("${file}")
-                       fi
-               done < ${PN}.conf || die
-
-               while IFS= read -d "" -r file; do
-                       delete_file=true
-                       for preserved_file in "${preserved_files[@]}"; do
-                               if [[ "${file}" == "${preserved_file}" ]]; then
-                                       delete_file=false
-                               fi
-                       done
-
-                       if ${delete_file}; then
-                               rm "${file}" || die
-                       fi
-               done < <(find * \( \! -type d -and \! -name ${PN}.conf \) 
-print0 || die)
-
-               eend || die
-
-               # remove empty directories, bug #396073
-               find -type d -empty -delete || die
-       fi
-}
-
-src_install() {
-       if use !savedconfig; then
-               save_config ${PN}.conf
-       fi
-       rm ${PN}.conf || die
-       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."
-}

diff --git a/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild
deleted file mode 100644
index ef067f81422..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2019 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="711d3297bac870af42088a467459a0634c1970ca"
-       
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
-
-       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 file remove=()
-               while IFS= read -d "" -r file; do
-                       has "${file#./}" "${free_software[@]}" 
"${unknown_license[@]}" \
-                               || remove+=("${file}")
-               done < <(find * ! -type d -print0 || die)
-               printf "%s\0" "${remove[@]}" | xargs -0 rm || die
-       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
-
-               local file preserved_files=() remove=()
-
-               ebegin "Removing all files not listed in config"
-               while IFS= read -r file; do
-                       # Ignore comments.
-                       if [[ ${file} != "#"* ]]; then
-                               preserved_files+=("${file}")
-                       fi
-               done < ${PN}.conf || die
-
-               while IFS= read -d "" -r file; do
-                       has "${file}" "${preserved_files[@]}" || 
remove+=("${file}")
-               done < <(find * ! -type d ! -name ${PN}.conf -print0 || die)
-               if [[ ${#remove[@]} -gt 0 ]]; then
-                       printf "%s\0" "${remove[@]}" | xargs -0 rm || die
-               fi
-               eend 0
-       fi
-
-       # remove empty directories, bug #396073
-       find -type d -empty -delete || die
-}
-
-src_install() {
-       if use !savedconfig; then
-               save_config ${PN}.conf
-       fi
-       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-20190620.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190620.ebuild
deleted file mode 100644
index b4197ce2f0d..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190620.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2019 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="7ae3a09dcc7581da3fcc6c578429b89e2764a684"
-       
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() {
-       if use !savedconfig; then
-               save_config ${PN}.conf
-       fi
-       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-20190712.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190712.ebuild
deleted file mode 100644
index f395cd682de..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190712.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2019 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="d52556e4592e64023157a83fb0f483661f23ac0e"
-       
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() {
-       if use !savedconfig; then
-               save_config ${PN}.conf
-       fi
-       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-20190717.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190717.ebuild
deleted file mode 100644
index e2002ef04f1..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190717.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2019 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="bf13a71b18af229b4c900b321ef1f8443028ded8"
-       
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() {
-       if use !savedconfig; then
-               save_config ${PN}.conf
-       fi
-       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-20190726-r2.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190726-r2.ebuild
deleted file mode 100644
index 83a5df63b99..00000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190726-r2.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2019 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="dff98c6c57383fe343407bcb7b6e775e0b87274f"
-       
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 )"
-
-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() {
-       if use !savedconfig; then
-               save_config ${PN}.conf
-       fi
-       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