gentoo resync : 25.01.2018

3 files changed, 10 insertions, 120 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index d2ed59d1ce6a..d0a964cfc858 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,10 +1,9 @@
 DIST linux-firmware-20170314.tar.gz 96072698 BLAKE2B bf650b91a696d88272361c1845d0d7856e90c6d6e1d008a3d5f40bb9beb43a6047f2280d7e4fabeff25a2518c63086a331f1e1af59c458d6bec451efc4415ad2 SHA512 1e3a40d42ccd5260afd66161727e45af1de80129093f83f547f20502fce075927952629bfda4ec5b53a6f279daca0304fb462e7c6aa566bfe2b9b687688b6460
-DIST linux-firmware-20171206.tar.gz 122782333 BLAKE2B f80f810c5544f3e7627fbfd70fdf9c725be710e1783d21e023e3d45e272a4c4521ccc12d406e204174fe10edeec7a1d06f56b09396c7952e00fb14e08b3fe3ef SHA512 1c0db1802732579c7923f0afaf0690db70f0925138ee1ea1a0eaff7f933a15fdc7d2fb3581e74883c01a75d16a285dc5467fabc7570cb378c0fa108426e7dc0f
 DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
+DIST linux-firmware-20180119.tar.gz 138505266 BLAKE2B d97f8d674b73f487cc90d4ad1f82c45967953bb5fd5241b7f552908efe39a3fe5890ab02b4826df9269bc7abd3dabd2ccf81542af11c97ae50335dc97c70b4ff SHA512 4378d6f9a80cc6c5f6b387b321794bb2a1c7931aebc90d134858ce59d83428d684ff22587efd234e9b30e6d71f672f9e04a92fa0b2c21605912e5ec72252be12
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
 EBUILD linux-firmware-20170314.ebuild 3294 BLAKE2B 93fdec863017044fd75ad16694bc1db473607c59d5d873ef21de651078b723d3607a0b40c7955a5e9154969dbcdcedeba04b17ea9c423437b47928dad63aa157 SHA512 1f038e50a2445fcd28a7abbe3f022ebdede0a04801afe3da06fdc0ae7104773c43810fef5b9484dc266cdb1c5a15bf326b7a1424744f1bd0e326ba509af89edc
-EBUILD linux-firmware-20171206.ebuild 3292 BLAKE2B 456e5bcf89e1c7aad7db0b7db03f5c9d6fd5b70377dd4fb05a2d790e6bb16474f48500b1786f44bbab00c6144b5f251a7f72af4cdc905b14a6e0e2a9eeea921a SHA512 228744b704e482d1389bb4ff56db95c397a213eb93952032c8d504072a68adf68d8a5864381240f9ad436c29c1cac82fd177f48556682ec99b59a61016976044
 EBUILD linux-firmware-20180103-r1.ebuild 3501 BLAKE2B f6dae34d64343fbf98ee5128ce1b1eecc29425ed74254129fa0d69f15f9b8053402811c4e0f298bf3c4a6503701261f46a7ba1575a9077f16dc92cd8b6259424 SHA512 5700810ed30e5625c0de31cc3f01fbd2a221294390799bd29acca706706cbdcfda4e73b80207c4b6726f299d59edb78da2472a6bf988b352fafebc32596cb6aa
-EBUILD linux-firmware-20180103.ebuild 3292 BLAKE2B fdc9d0a0dbeeb9a5b22c69d1bce7bef97af6eaa012430afdb9ddfc8e491cd520bb8d7ab542f97bc1dff5ec0237a47568eb6225e1f876ec8d768a0a569f0f66f8 SHA512 b2f6fa573c116e0f9514fecff7acc2ad95ca7e81bcbb1ccc6bb8f08ebaae34ad5aba8c264300e65444f6c3d9e3d93e4febc2d9b3585b70565fcb7c2c4a23ce7e
+EBUILD linux-firmware-20180119.ebuild 3513 BLAKE2B c17a31ec4545214d6b508437d53f0aa0854f1f63b1a0ff15f210574c73460e5c6f762349294744705be76ba612d78f008213e09f2d9cc8be4112ce9968f383f4 SHA512 40180d26d2f65158f1422641484a56ec0cb11a90bc18dc0e40b35f0b9f71d9695a3f1478627ecf683547efeef324e85390085f65cb2d36c01f094895ba9cbd3f
 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-20171206.ebuild b/sys-kernel/linux-firmware/linux-firmware-20171206.ebuild
deleted file mode 100644
index 046d9c1e0eed..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20171206.ebuild
+++ /dev/null
@@ -1,114 +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-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS=""
-else
-	GIT_COMMIT="7f93c9deb484c0a8f4cf59780e77dc7b0c14abe3"
-	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
-
-QA_PREBUILT="lib/firmware/*"
-
-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"
-		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-20180103.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180119.ebuild
index 3642df85db82..fd73289cc2ea 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20180103.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20180119.ebuild
@@ -8,10 +8,12 @@ if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 else
-	GIT_COMMIT="2eefafb2e9dcbafdf4b83d8c43fcd6b75fd4ac78"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	GIT_COMMIT="2a713be25a44bd6cec90d8affc54b246a2ca9c7b"
+	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"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
@@ -78,6 +80,9 @@ src_unpack() {
 
 src_prepare() {
 	default
+
+	mv "${WORKDIR}"/microcode_amd_fam17h.bin "${S}"/amd-ucode || die
+
 	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
 	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf