gentoo resync : 04.08.2018

6 files changed, 11 insertions, 128 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 48ae0cae8226..17fc80a757f0 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,11 +1,9 @@
 DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
-DIST linux-firmware-20180518.tar.gz 150672075 BLAKE2B ef0c5a5d6ea2e978a5638fd509bde5fe4b50ebc682b685e6e8728667617b2d1460c562331e89b748c86d815341e5bede8fc4a2d5a3088c14b3bcc01bd783f01a SHA512 c2b1cce708f6bb21cc5d48408f335cadcf4318ef98c31c182cfe0630500b1074c90c0b0da1391c64bfcc921ebb500f0f46e8d8cdd6888c60458cce8faab6d12c
-DIST linux-firmware-20180525.tar.gz 151301971 BLAKE2B a2da25004f5458c2383b8f0c0d28dab56f40d24045723d9bf169d0cf256ff819e34899b487dc73cc6135ca83207cbccfa9fb5a5888e1a7764b2e464e95f6db49 SHA512 ef2e29a24ee4f52ad91eb35b79e2a8717ee0e0cd1b94877779c839bc0f64aa6de91b6828e069f0e4b1cdb8a97bbf140802c008582f7a4dfd61327c7059c99c96
 DIST linux-firmware-20180606.tar.gz 152670671 BLAKE2B 7c4fb07451c1c459bd0bf8bec15e3bff41bdb64166decfd7776650c85f0b373c97dfa23330ebb7ddd4bc144bffb57751f3a94bb4a352e5f8ef1dd0b8a3679c81 SHA512 4eb02e11beffde5bf8daff45af78304881e01eb51004ff0758bfff3a4a4cb59f6a2e081b7a3c3e07734a29954f09fa6277f920c2bdab6aeb608065936861c650
+DIST linux-firmware-20180717.tar.gz 155038756 BLAKE2B be94a60c95b23ad14008ed2c1d6eb1e126ef4b959bb9375b9d6c7374d16de0b503c434c00975cb9be74cc8d191db826ec58312a1405c558eb476807dfcf247cd SHA512 e885b31d01c7aa7864742dc3f2b67888aa93166390d5572ae56d191656991876e4aea1e412e452f4caa6ee031d0ab10c26f615f639cfde6f15bdea47a9819816
 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-20180518.ebuild 3328 BLAKE2B da57e8f60e4133aad29390cb1d6f561432f95437931058bdf9f6b2593f93f59bae3a738ffb93517b4432c26db14c2e913bacbbf5ba5cdc02368f187c625c3d8b SHA512 2507de0063c35243920dcd2ec231fc04b7d4e7ec37a950ec98c21ca49d5ed9f94f09e1cc492a6b6404e0f5bc1cfe4518355c32059cf129cb0bedc55d4550c5c0
-EBUILD linux-firmware-20180525.ebuild 3328 BLAKE2B 6245b25f0cde974411bd44d2f693d95cc90058fbf119f6a4971c366a176be60d730c1b5f5bc49fb4ed128671778a693be182f5cb3b9623ded74a5d35763acfef SHA512 8b167c9888f1409acf958abde777a8c39f2e1a7b46127e7e7cb3dfcfca50f303b8decea40ab42e49e748bdd53d9705551f56e0d203ec095dd119e524c8d01064
-EBUILD linux-firmware-20180606.ebuild 3328 BLAKE2B 190da840614d8828c9fbb9267a263288fa9a7d87d04fc9d594090c4c02cb6b4418c5a8dc5b7267189ae14801f0fe723f39eb5ce6f7d849b59851b2dc0e282abd SHA512 f64d0b9a7d3671c2c228c6bb8803a122553613607ce3b60a3f865c809e455a3827bb3d1b8a2bc2227bb5153b0c4f7f2aa07b88a44e5f951f9bde2666fe983741
-EBUILD linux-firmware-99999999.ebuild 3252 BLAKE2B e676dc8c270f045b62137a1874b3c1560b07961b0b77a17693f28faa154db8b681706ee4d813311001b66b5bc46b166b245166bb5361d6b1e7c7f652350de84e SHA512 fa883958bd1ea0c24641b6ed48895306e5352a4e9baa5932b82d74f54aed7577ceeb7441488123c85a048a37b60ef7e6744f078be2f329cd6e94a2c404269154
+EBUILD linux-firmware-20180103-r2.ebuild 3512 BLAKE2B 9a1d555f59836c93fe8a5f5ae0eeb456bd6ea0f7d9b41d09f20b28d0b52c54f9639e66b8ad840885f06ecb3223d6f6bda73f38a6c6b62ea5650b9adae5d69a88 SHA512 57157b529e2cf627b9647b317138730dc36a442bdfb2bb20db99681288c403eb537fdb84866885d5a892169ad643fd478832cfcdbe892dde5818b24f09dc60ef
+EBUILD linux-firmware-20180606-r1.ebuild 3326 BLAKE2B 8208b7bc4e4a3b8e8f187ed7932140ba2dbc5fc5ccb5e058760d06d880953b9b51d4b39ccdb7199689f4adce8d05c33e0992100b43746e92f3892e02bc8ec193 SHA512 1baf9e596d161c3694bc1922bbbde5607f0f87a0ee4e17bf54e4cf44f528f1a3fd87e11575d4b58010a6e70ef35942babaa1f097b27ced724e00d64a90312728
+EBUILD linux-firmware-20180717-r1.ebuild 3326 BLAKE2B 2c126d139f2d020994da7fe8f82820c43e5b3a5df8f3fa8352f1528fbd47ed063eff68b43f5c5820016c724764edd6d81e3e8e2b95144892a64417d9128629b5 SHA512 2a3230bc6c2eb87670cdaccb066bfe138263401d09652dae5fe9f8ad166beeba506c4a5c2016a993e8cd481c4aa26e731f5ee173c206afcd3071aa03bbb2f15d
+EBUILD linux-firmware-99999999.ebuild 3250 BLAKE2B f6f071feb43a09bb05a09c2e9bfa5476b4681dce00df6728fe1e4517abb6e2748c38b1fd01bf95775529074cce08180c220c748fa757a791ec7b206d6076c5ad SHA512 4b41181bcd95f2b6b07cd9c8d0694c43a1d1cf61df8147316239fc78862d31a38ab0710fa8a669eba2d4c7cb92dd69af14ed0b696e0209e9eaea095fd7290041
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180103-r2.ebuild
index 96c7d5f6017c..266dd651989b 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20180103-r2.ebuild
@@ -66,7 +66,7 @@ RDEPEND="!savedconfig? (
 	)"
 #add anything else that collides to this
 
-QA_PREBUILT="lib/firmware/*"
+RESTRICT="binchecks strip"
 
 src_unpack() {
 	if [[ ${PV} == 99999999* ]]; then
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180525.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180525.ebuild
deleted file mode 100644
index 2e82ead97bb7..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20180525.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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="7518922bd5b98b137af7aaf3c836f5a498e91609"
-	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-20180606.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180606-r1.ebuild
index 4543d3cd0ed3..3fd71f1cf7f8 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20180606.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20180606-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="!savedconfig? (
 	)"
 #add anything else that collides to this
 
-QA_PREBUILT="lib/firmware/*"
+RESTRICT="binchecks strip"
 
 src_unpack() {
 	if [[ ${PV} == 99999999* ]]; then
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180518.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180717-r1.ebuild
index df01f03be23e..3341a3e7e994 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20180518.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20180717-r1.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="2a9b2cf50fb32e36e4fc1586c2f6f1421913b553"
+	GIT_COMMIT="8d69bab7a3da1913113ea98cefb73d5fa6988286"
 	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
@@ -64,7 +64,7 @@ RDEPEND="!savedconfig? (
 	)"
 #add anything else that collides to this
 
-QA_PREBUILT="lib/firmware/*"
+RESTRICT="binchecks strip"
 
 src_unpack() {
 	if [[ ${PV} == 99999999* ]]; then
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 1056574b8066..644175a05219 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -64,7 +64,7 @@ RDEPEND="!savedconfig? (
 	)"
 #add anything else that collides to this
 
-QA_PREBUILT="lib/firmware/*"
+RESTRICT="binchecks strip"
 
 src_unpack() {
 	if [[ ${PV} == 99999999* ]]; then