gentoo resync : 22.05.2018

2 files changed, 117 insertions, 0 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index c731eeace7f1..41c3302d977d 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,9 +1,11 @@
 DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
 DIST linux-firmware-20180416.tar.gz 149436328 BLAKE2B 1da8140b8805b4c4d1c12940fe2cb71a8d4fc41ceccdd306f1dbc0c20e986b8a4cef09a1e82bd0c270fad22722738ddb4d7eb2ba81553dfddbb76a3039552d97 SHA512 cf416c7ae8d70a8c36955e7fccff16194515f3b4964e80cba268b5ab2816ea0661bc4ea47ff3bf0c5f47dbdc7abceb39c5586117a6796b5b94bd6ef740424b27
 DIST linux-firmware-20180507.tar.gz 150551499 BLAKE2B 66cd52d64fdeb02e12e1b8fd6b578e2722bac9e9381fc949f7418425390521004e6d145e943ebc5b804989278f6c204806079db98074f842066350f6fcc7de40 SHA512 6ffdfdd5a730d62d476255bbd26252ddd24dfbf926b4a0e684f31f93a65d86f645a19cb0e8773b64cbd93a6840a991bc8767f6b483553a3b822a734014c1f94c
+DIST linux-firmware-20180518.tar.gz 150672075 BLAKE2B ef0c5a5d6ea2e978a5638fd509bde5fe4b50ebc682b685e6e8728667617b2d1460c562331e89b748c86d815341e5bede8fc4a2d5a3088c14b3bcc01bd783f01a SHA512 c2b1cce708f6bb21cc5d48408f335cadcf4318ef98c31c182cfe0630500b1074c90c0b0da1391c64bfcc921ebb500f0f46e8d8cdd6888c60458cce8faab6d12c
 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-20180416.ebuild 3513 BLAKE2B 85586cd99b12df5af71c105b5c0e715c75f74e6816a00df38da7322eca7e151e6e738ad3ca7611a20ee6048af72f2d25b9f2780f7898b6c20221791979c9f1cc SHA512 8dbd551e889ee4b53308bd37d97a494b949e7ad54e58bbb9a2d5fffd7effc2a882e7b36e7d26f070652b094559b35a40f705a3c2ec1296bd38f851135b0cadaf
 EBUILD linux-firmware-20180507.ebuild 3513 BLAKE2B 1091e1db75858d9a73f814042003c832a62a1882a3654695b98798ea67df6d4e188b05537f930bb4c9287a9762f9e35b26fd8acf8004d4861598ecb142f0ed9e SHA512 f7ae5e5b4bbf76a3db58dbd3fad334974bce9eb1702742be210ef2121652e8adc505331266fc4d504afbc9c44b8259815c82edb7b4f06f4735ea92f8c7c42328
+EBUILD linux-firmware-20180518.ebuild 3328 BLAKE2B da57e8f60e4133aad29390cb1d6f561432f95437931058bdf9f6b2593f93f59bae3a738ffb93517b4432c26db14c2e913bacbbf5ba5cdc02368f187c625c3d8b SHA512 2507de0063c35243920dcd2ec231fc04b7d4e7ec37a950ec98c21ca49d5ed9f94f09e1cc492a6b6404e0f5bc1cfe4518355c32059cf129cb0bedc55d4550c5c0
 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-20180518.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180518.ebuild
new file mode 100644
index 000000000000..df01f03be23e
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20180518.ebuild
@@ -0,0 +1,115 @@
+# 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="2a9b2cf50fb32e36e4fc1586c2f6f1421913b553"
+	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."
+}