gentoo resync : 16.04.2018

2 files changed, 121 insertions, 0 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 877f5e0b1c61..f75382a90a1b 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -2,10 +2,12 @@ DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403
 DIST linux-firmware-20180213.tar.gz 140041732 BLAKE2B 8f8b382233c0d7ad3c1e82169880ed9ab8a00f3372e27f79a0c43bcf8493740dd6c496559a4b28d531878ea32b88ad0e68480ed487f23fa70b2d7c4534ef96b0 SHA512 d4c4e72cf55111cd1914d6f82def864f951c31f7d90031a14c0420ab4d36421c49df788f24ef0c3677b32ae10a1d7920a0d1a4fa983a8f1106715f94fd7977ed
 DIST linux-firmware-20180314.tar.gz 143769384 BLAKE2B 91a90cdfcb413abf6c95a19c240c4f50077b7fcf727edd4ecb280ae29bdd3ed32fb8ffb562eee16da674be0a82ea2ecd84e263b44d910114d89d7b2a031bba5c SHA512 9f9822c0e2f15d928e9c68b2ecd5f3302ac570ca8f375003168cfaaa8acf2efceb279e82ada6a98c5f2554ca81f77b7a5a126d02b43ff2e5252ab68071507f54
 DIST linux-firmware-20180412.tar.gz 145353516 BLAKE2B 72d08ff15ca58f36d53bdee68f7738d9b49a1c3f641b697571ab69e32e9ce3a33fb463a958ffc0d78520ce47518ceef3fc6ae0d560a783b805a1b22f90727878 SHA512 bf124e3e2f8f301ce1bffc0b989e132eebd088efc456a5ee667e93cc689857c67d6a3b964f345e9381c89c9dba9113af8f0d53eba7d9fa1ea74cbafe7b496420
+DIST linux-firmware-20180416.tar.gz 149436328 BLAKE2B 1da8140b8805b4c4d1c12940fe2cb71a8d4fc41ceccdd306f1dbc0c20e986b8a4cef09a1e82bd0c270fad22722738ddb4d7eb2ba81553dfddbb76a3039552d97 SHA512 cf416c7ae8d70a8c36955e7fccff16194515f3b4964e80cba268b5ab2816ea0661bc4ea47ff3bf0c5f47dbdc7abceb39c5586117a6796b5b94bd6ef740424b27
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
 EBUILD linux-firmware-20180103-r1.ebuild 3514 BLAKE2B 84d2faeb85a91d1c6e7b1b5b1ee5ccb0a314f191ec6bde04fbe2ba77330a94e58410f4def76459d18e5cc5d2ab566dc4583dafd34b1a3b8a92b0e1ad4cac334c SHA512 d58978d6008035a2d6b59d5a1dd4d04a9684ec9117e1d6d4e1366a7b27a91df4e897a0ccf53f8172d5c540dcae1c45ddf10e764d1e60246e76cc23cd128244ef
 EBUILD linux-firmware-20180213.ebuild 3513 BLAKE2B 312bdef9810096849758b66d01772a979dba99fbcb1c8b4fab26936d36a98b8e4cb30b5a8af99340785aa85c76b6c78a74ad22cb89fec2cc8f200fd431706370 SHA512 facf1a2e534340c9515ea5624e5c17847ce07289bc028b29b98ef5ddc0854ef25cea954d6e7f56485d63d28bed1cd7dd4d6c7a62be6b4ba528f4b3306abc60f4
 EBUILD linux-firmware-20180314.ebuild 3513 BLAKE2B 06f646c6d7ddfc8ca0dcfe2fe8a3eb5666ed9898baef4c9a549645490b6f7e29e09d89641aefbaf3031b16c66fd6686d98c684499287830eb9deb18a6f604d6e SHA512 93b5b3d91451dd7e8cc90d9f2f6cf3ad5f2cbd634d5cc00a4b93966e4dc5c640a436ebe6f4b6906d10b3efdb901c4e00a2f0cffa44e61787f84fdba66ae6dd83
 EBUILD linux-firmware-20180412.ebuild 3513 BLAKE2B 9a6ea53f19ad908d20371f3b78d3c4315b676834c11695d98f32641fe510239bec1f8fed0e60213e100785b7fcc11a0f9b95a3c184dcd8fbf93ce1bb361be85e SHA512 b4096aa8a5825787c26ad5a6ee3d73f1880c2212f6ccb2ea273d553a5e0efa3b887002d13eaf6e998ce772c9d1c232127c969988e4cb488b4e439e0c10fefb7b
+EBUILD linux-firmware-20180416.ebuild 3513 BLAKE2B 85586cd99b12df5af71c105b5c0e715c75f74e6816a00df38da7322eca7e151e6e738ad3ca7611a20ee6048af72f2d25b9f2780f7898b6c20221791979c9f1cc SHA512 8dbd551e889ee4b53308bd37d97a494b949e7ad54e58bbb9a2d5fffd7effc2a882e7b36e7d26f070652b094559b35a40f705a3c2ec1296bd38f851135b0cadaf
 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-20180416.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180416.ebuild
new file mode 100644
index 000000000000..d8f01a90078a
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20180416.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 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="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+else
+	GIT_COMMIT="162161461d5c9ec62faa6d89a50afb8281fae8c9"
+	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
+
+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
+
+	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
+
+	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."
+}