gentoo resync : 23.03.2018

3 files changed, 3 insertions, 117 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index b60ad949a46f..c5910328fbc2 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,11 +1,9 @@
-DIST linux-firmware-20170314.tar.gz 96072698 BLAKE2B bf650b91a696d88272361c1845d0d7856e90c6d6e1d008a3d5f40bb9beb43a6047f2280d7e4fabeff25a2518c63086a331f1e1af59c458d6bec451efc4415ad2 SHA512 1e3a40d42ccd5260afd66161727e45af1de80129093f83f547f20502fce075927952629bfda4ec5b53a6f279daca0304fb462e7c6aa566bfe2b9b687688b6460
 DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
-DIST linux-firmware-20180119.tar.gz 138505266 BLAKE2B d97f8d674b73f487cc90d4ad1f82c45967953bb5fd5241b7f552908efe39a3fe5890ab02b4826df9269bc7abd3dabd2ccf81542af11c97ae50335dc97c70b4ff SHA512 4378d6f9a80cc6c5f6b387b321794bb2a1c7931aebc90d134858ce59d83428d684ff22587efd234e9b30e6d71f672f9e04a92fa0b2c21605912e5ec72252be12
 DIST linux-firmware-20180213.tar.gz 140041732 BLAKE2B 8f8b382233c0d7ad3c1e82169880ed9ab8a00f3372e27f79a0c43bcf8493740dd6c496559a4b28d531878ea32b88ad0e68480ed487f23fa70b2d7c4534ef96b0 SHA512 d4c4e72cf55111cd1914d6f82def864f951c31f7d90031a14c0420ab4d36421c49df788f24ef0c3677b32ae10a1d7920a0d1a4fa983a8f1106715f94fd7977ed
+DIST linux-firmware-20180314.tar.gz 143769384 BLAKE2B 91a90cdfcb413abf6c95a19c240c4f50077b7fcf727edd4ecb280ae29bdd3ed32fb8ffb562eee16da674be0a82ea2ecd84e263b44d910114d89d7b2a031bba5c SHA512 9f9822c0e2f15d928e9c68b2ecd5f3302ac570ca8f375003168cfaaa8acf2efceb279e82ada6a98c5f2554ca81f77b7a5a126d02b43ff2e5252ab68071507f54
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
-EBUILD linux-firmware-20170314.ebuild 3294 BLAKE2B 93fdec863017044fd75ad16694bc1db473607c59d5d873ef21de651078b723d3607a0b40c7955a5e9154969dbcdcedeba04b17ea9c423437b47928dad63aa157 SHA512 1f038e50a2445fcd28a7abbe3f022ebdede0a04801afe3da06fdc0ae7104773c43810fef5b9484dc266cdb1c5a15bf326b7a1424744f1bd0e326ba509af89edc
 EBUILD linux-firmware-20180103-r1.ebuild 3514 BLAKE2B 84d2faeb85a91d1c6e7b1b5b1ee5ccb0a314f191ec6bde04fbe2ba77330a94e58410f4def76459d18e5cc5d2ab566dc4583dafd34b1a3b8a92b0e1ad4cac334c SHA512 d58978d6008035a2d6b59d5a1dd4d04a9684ec9117e1d6d4e1366a7b27a91df4e897a0ccf53f8172d5c540dcae1c45ddf10e764d1e60246e76cc23cd128244ef
-EBUILD linux-firmware-20180119.ebuild 3513 BLAKE2B c17a31ec4545214d6b508437d53f0aa0854f1f63b1a0ff15f210574c73460e5c6f762349294744705be76ba612d78f008213e09f2d9cc8be4112ce9968f383f4 SHA512 40180d26d2f65158f1422641484a56ec0cb11a90bc18dc0e40b35f0b9f71d9695a3f1478627ecf683547efeef324e85390085f65cb2d36c01f094895ba9cbd3f
 EBUILD linux-firmware-20180213.ebuild 3513 BLAKE2B 312bdef9810096849758b66d01772a979dba99fbcb1c8b4fab26936d36a98b8e4cb30b5a8af99340785aa85c76b6c78a74ad22cb89fec2cc8f200fd431706370 SHA512 facf1a2e534340c9515ea5624e5c17847ce07289bc028b29b98ef5ddc0854ef25cea954d6e7f56485d63d28bed1cd7dd4d6c7a62be6b4ba528f4b3306abc60f4
+EBUILD linux-firmware-20180314.ebuild 3513 BLAKE2B 06f646c6d7ddfc8ca0dcfe2fe8a3eb5666ed9898baef4c9a549645490b6f7e29e09d89641aefbaf3031b16c66fd6686d98c684499287830eb9deb18a6f604d6e SHA512 93b5b3d91451dd7e8cc90d9f2f6cf3ad5f2cbd634d5cc00a4b93966e4dc5c640a436ebe6f4b6906d10b3efdb901c4e00a2f0cffa44e61787f84fdba66ae6dd83
 EBUILD linux-firmware-99999999.ebuild 3252 BLAKE2B e676dc8c270f045b62137a1874b3c1560b07961b0b77a17693f28faa154db8b681706ee4d813311001b66b5bc46b166b245166bb5361d6b1e7c7f652350de84e SHA512 fa883958bd1ea0c24641b6ed48895306e5352a4e9baa5932b82d74f54aed7577ceeb7441488123c85a048a37b60ef7e6744f078be2f329cd6e94a2c404269154
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild b/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild
deleted file mode 100644
index 361167c19d6a..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-else
-	GIT_COMMIT="e39f0e3e6897ad865b3704f61218ae83f98a85da"
-	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+ freedist"
-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
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-2_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"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		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-20180119.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180314.ebuild
index fd73289cc2ea..768f03733aa3 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20180119.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20180314.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
 	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 else
-	GIT_COMMIT="2a713be25a44bd6cec90d8affc54b246a2ca9c7b"
+	GIT_COMMIT="4c0bf113a55975d702673e57c5542f150807ad66"
 	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/microcode_amd_fam17h.tar.gz
 		https://dev.gentoo.org/~whissi/dist/${PN}/microcode_amd_fam17h.tar.gz"