gentoo resync : 26.11.2017

5 files changed, 139 insertions, 21 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 86a7890df978..f445dadf4615 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,14 +1,14 @@
-DIST linux-firmware-20161205.tar.xz 40891260 SHA256 a1ab4b2d77b60b466f2312d5ee14717f0f70c9b40e36d20587e5df6ceca61e0b SHA512 ba6d5c919d55da78b17acdf8bab53735190c4fab892ba9510a13a05d56b15c91957a818e4eb4fc092646796acc49e775c147dcb8b901523365d21df453767b0d WHIRLPOOL 45a82e4002c764e8eba2f3ad5dcb7c2d151783b580d70b1e1a4c49e6827c10c07876cb5d3d5a7ecf4c300867dbba62379983af125bfd64cb5b71ae8ff83c565e
-DIST linux-firmware-20170314.tar.xz 43175092 SHA256 9f07ee85524a95af1ec16e7008aa71eb07edf2edda07bf36f85b2d790452a67f SHA512 501e84d3ee9272d23e4d26a0a8bb7471f4e1edd16dee7c0c12a8ae8e90d6f5fa7f08276fc43eed6020bc3608c79b0914519c5c7082b6f013b6651d8afa7f79ae WHIRLPOOL 339a5f30f132d2f1688187d63df4dfdbe551fd3ca59d73e8f9e515fd1e26d62be62b87a8198437ad4934ce2d44287266f9628f7e82e53936f4957cf59d534827
-DIST linux-firmware-20170622.tar.gz 104302528 SHA256 03d220c1747ed71b54b53ce04bfb178fe937ba585309b4a0b32eb351d709fcb0 SHA512 946b31666ef79a21e29a757340482dfdb70b43f7818ca47bf5e16fb6a79bb585822af014731b6c6034944dd37269ae948bbc23fc1f104bccfd7b7b405f41bbd5 WHIRLPOOL dedfef88d4ba7fdc9b5e7c07f6a04221d4d34256678e366f3182d4180d0e8de4071ded809d285c89aa0ab68bdf05cd9b9c0139084d9497df4d420e7e91ba48c8
-DIST linux-firmware-20170906.tar.gz 106748426 SHA256 db961e03e8914360c36210bcd10367b6bab655c652a29046bc8ec66241dc034c SHA512 c21043600e0c8e9ee58f439c01f38981f4c4bb2dc9397e655fc8285e656f3c34560cbeff1ea16f3d0204fc06d83fd1982c600d78cf6851b8f6c307e1a7a92b71 WHIRLPOOL 7cf9e547c018e69b1f3b047cd6a4fc2db7363abaa51d38432db8ad0b76e5029827ef2c73883bfcea79313d67499d5dc145625a85e3a7a4eec759a62ef493cc8f
-DIST linux-firmware-20171009.tar.gz 106811352 SHA256 c95d7a4456c6fc89268e9bad546e3c0b9adb58aaa14971640c642c95c7d553ec SHA512 3a91f05197b03e8f4e51f4fb936c68a9b7d7ead58fe489e679da8626391dfa1ed72362c857a7522f49d055e6b349b93564542658f7e9da96068b15b52f5862f4 WHIRLPOOL d780cf11ba9088dc6c44b58349e7bb8744eba7a42bf30ea832ced43cc08f8dfdd6466e2d6b18f43545359fb68b4ee165c2e7864e334df1cfe6ef230d6ccd8f33
-EBUILD linux-firmware-20161205.ebuild 3260 SHA256 9e0a83d6e9ff9519321bb9b4bb6f8a8988bbbdaf937fbb80b52900db262fb7e1 SHA512 11b84d341fbf6b9f424867a36bf1b444baa02bb1daf0cc6e26cc637f5519682a179e324842711c29f40da588026769759b51bbaf77f10a67e13864771fb5074f WHIRLPOOL 3d2871a46cdc35eb3056d54550bf8c11c82bb465f0458e385a5747c2c783bc4775a2a38df0adbfa6de8f4bcfb4cdba50dbb63e34e29b7e57105ae674e5503d43
-EBUILD linux-firmware-20170314.ebuild 3290 SHA256 0aab6538a31d84d084d346e9b59244b76ed2bef6d99d50ee0f0f926cd0c635cc SHA512 a008c6c41693094bd604017815b5e0c687f98fb53f655463f204a5077a2d260469680601bfe72ab2521b3657bad40d5dd6ce00cf3a5b485a3bd58b67ab789220 WHIRLPOOL 7e9f4a909359dadf371eebe99fca6c30845de42296b46e22bf5f544d71c43f5db458b8a858e9784266701adbf2d62a5b60c06b0084d5b42be7ec43dd32a7b5d8
-EBUILD linux-firmware-20170622.ebuild 3258 SHA256 68d53b5e8957d2637461c08d45de3caa5993b161d278154eba07d2dcaa0bcdae SHA512 f255c17eab32003cbcc561cd2996a5246ced84a2dc36251b02123c4a15737c204bce1b01d1b5063c065cfbd7069836fa61859ace5e64a1d2e7eb70334b2571d7 WHIRLPOOL d09f019ab5a1042f59f13d3de31b28b4f33ace569b8d74293e0c96d4caf3a561c2faaf3e00d0cff63094a9d2bdab3c3c03f2a9998f2d98cd27489d67eb046b93
-EBUILD linux-firmware-20170906.ebuild 3258 SHA256 ee44e69a9734b7a1a0a24360b80e21e80b117076f389a1a5d40ed27a6515666d SHA512 072f827134deed4c8b29fcb66a927696c1930edc4c3fb10d9b5620a5bdf76dce3afe4aafcdda3637e6025b76130b0e4e602d882ae35689241ff0c27ffd85a7ec WHIRLPOOL e0603decf05cb45653fe67c0b7535958bae7d76ef670f34b751ece1022dd10033b0cc3511c0d98851741d5aa1890238ae99976cc125e9e086b516154e97ab5cf
-EBUILD linux-firmware-20171009.ebuild 3258 SHA256 0589e54c0a0437f929c61b8e1963fdc3b7eff18dee18627682560eb01612607d SHA512 e476306c556ad8aa97121dde15b8d230564cb37003272a120eda763277bef2166c088c6be2d3f09744dc8aca4ef341e6373d50ce9147537faec14563309e781b WHIRLPOOL 60bf2496692f60541bdbfe0a35c5395ccc6f447119096ad668f359324d7409d8a5b7b1372985a9d5538bb8def3a0439e45692cb8b5ff57322cb62aef61d2ead2
-EBUILD linux-firmware-99999999.ebuild 3089 SHA256 b02306c72aedae621419540a7d87a104e658fd1f8477e7a188c82513388bb945 SHA512 21637497b8fcc0d3b302d9d8db35f395c31f93426103b6f1401fc2c32c05ab9f5fb0374226c26ee7fb6e5ad412678c128f00e123e6cd1820705ee917767f22c7 WHIRLPOOL 2189d7e7296ef63155f61014080af604fefc9635c5ce4d3486cdcf95b2a82f1f2a3922ffeecbebf7f0c254f6e4b801e9a27bccbf089e47642a94f318642f2ea9
-MISC ChangeLog 12152 SHA256 523dc04163dceae881e031f7424570fdd80c927c28539e821c8fb0488e4566bb SHA512 260b60920824085212f4b2818554b5fb36683f669872a08f916329124d6ff89a5f098d35b9d78e239c9c6190d7db2ed663316f52050615e1ae5053132ebd16d7 WHIRLPOOL c57df826499caa21a89b95582c6df6c17698032c464d64c956fe497f9b66ee27240a2ea80ff8d95c89758fff75ca2e9a7f6918ac94186e26f900ad8c11def588
-MISC ChangeLog-2015 21057 SHA256 4d5d2fe9e0e1e35bd173ef509cae0cc80abc77d58888d6d5a4b64773b54030c7 SHA512 0f7d4d49b0f96464a8e4a63574c6173a6be829bbd1c24f1080a206fbad886bcfead74c9876695281e2f5588b0f27947fc9d3ff04a4c399d549c0f3261b8b0aaa WHIRLPOOL 42e82b80bb9dda822d7a06b939c22269b05ed5b5ec0d9533622d3422f00efd2462f01ca64e1223b1c373254184e9b23981b9fa31b7b7bb22e7b08b2bf6132583
-MISC metadata.xml 570 SHA256 4046cafe19e48656306555a9bc9c299fc3125ccdf303f926d24237af851e62c1 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9 WHIRLPOOL 934c78170504f3fb2ffe032bfa35abb1f35b8a5c6a85d0f6736b9a499a399dddf9ad3a71d7fa1019ae58ea0f535cd11d1e4b3752cd1865aad6ef80811f0f7468
+DIST linux-firmware-20161205.tar.gz 88994449 BLAKE2B 8007703af2bd54ce4bca74bd76be00aa258e1256c7845539a5f8cb6a76522a0e481654adbe6967035019102de630503b94627ff01c8ba523b6df22d6ad0b626f SHA512 4a34047b04d9940302a967d424dc259f5792f26dc6b8f653197840ff48b4b5bf97f56d0e416cfa79f7dd437c377dbc5f8f0662f56dbbcb35519217ed170d9719
+DIST linux-firmware-20170314.tar.gz 96072698 BLAKE2B bf650b91a696d88272361c1845d0d7856e90c6d6e1d008a3d5f40bb9beb43a6047f2280d7e4fabeff25a2518c63086a331f1e1af59c458d6bec451efc4415ad2 SHA512 1e3a40d42ccd5260afd66161727e45af1de80129093f83f547f20502fce075927952629bfda4ec5b53a6f279daca0304fb462e7c6aa566bfe2b9b687688b6460
+DIST linux-firmware-20170622.tar.gz 104302528 BLAKE2B 11e67217f4ad62f4a72ecf12ec6b177a3a7d21724d22e75a97b5b6378c4f0eb86f841a0dcb27302a599d86a4e65ab5e228c27181a6d6e40a0bfe6a3b126f5c5e SHA512 946b31666ef79a21e29a757340482dfdb70b43f7818ca47bf5e16fb6a79bb585822af014731b6c6034944dd37269ae948bbc23fc1f104bccfd7b7b405f41bbd5
+DIST linux-firmware-20170906.tar.gz 106748426 BLAKE2B 20fee8e38bf59f8cce0e50410eff308a97a5c9ff989915b8454fdc7003a8daaa86cd4dc336b262f52ea11f81daebd734d648cc3abc8a42a775dd58526ce27b7c SHA512 c21043600e0c8e9ee58f439c01f38981f4c4bb2dc9397e655fc8285e656f3c34560cbeff1ea16f3d0204fc06d83fd1982c600d78cf6851b8f6c307e1a7a92b71
+DIST linux-firmware-20171009.tar.gz 106811352 BLAKE2B b4c18f3a72e16657244e77bbc39d905692cc2cc1aa95b89c0381f8948eeb6cac9b67688f6b4b2ef275eb53ee9ffd24b48b45b75f7632a7d26231fb3e92f6ea8b SHA512 3a91f05197b03e8f4e51f4fb936c68a9b7d7ead58fe489e679da8626391dfa1ed72362c857a7522f49d055e6b349b93564542658f7e9da96068b15b52f5862f4
+DIST linux-firmware-20171123.tar.gz 115603524 BLAKE2B cb2a4e4f849c1125f969e59104caf4abc4f195dd28d1ad7a8feb21bc29df82baea30b8236368bbc64c6dddde13aea5230763673b4580cd7c48736b64242b757b SHA512 6ac6fd05dc9b260686822d7eced94ceb2ec391626b88b68c6803224e5eb984caf8d28d446b7f348fe09f435e8f4faee716b53164d6f121dcb367e9ff753907e7
+EBUILD linux-firmware-20161205.ebuild 3260 BLAKE2B 10c0c390d4d68895e55c02e923a0744fd6e559adb12f3c112988b151187e8dd5d59d48583edbf323de750696d23e7cf02ea9e20856460b58408e0da9e6238dd6 SHA512 cf3adde4f108d1dd28a46d72e97acb0af017ed416174d70e6281d06ad9eb7e00c69bbb338c678d1bf84b275d8a91a6780881a1334e2fa08fc5c4265a7179a36d
+EBUILD linux-firmware-20170314.ebuild 3290 BLAKE2B 6b8abf09181f5a2bb2552a779542cb4cb95f83fe6d04f329cef0a96a2355c8fd0d47f3eff100f1ad964b244fe71fb4392f916865cf54b8511cde13b9c8a9ee69 SHA512 c2c8d707d072a5b201ba1f167fe392dc5b6c90e38986f648ab74901c431dd25e00a9e6e2b0bfaca0adc5aa11f83c82e5ef259da3af7a5f8a9dad8348ea66b4ef
+EBUILD linux-firmware-20170622.ebuild 3258 BLAKE2B 45810e8e480057fc9ae4adb79e104a20c37c2e475cd27e8a5d1df541e0b23fc8aba32226953f0726bf6ebf74ace3f157f7f56ae2b02dcc9a5c72716daeb32f7b SHA512 f255c17eab32003cbcc561cd2996a5246ced84a2dc36251b02123c4a15737c204bce1b01d1b5063c065cfbd7069836fa61859ace5e64a1d2e7eb70334b2571d7
+EBUILD linux-firmware-20170906.ebuild 3258 BLAKE2B 1806b875af63d7ffb9e67041d85c8a1c2c80810b15f12fead78e23e42d084da0f99265ffbeb46f8c2d0b9cba5a7c3d0298e5e0947b4d41b10111f6c75b219dc8 SHA512 072f827134deed4c8b29fcb66a927696c1930edc4c3fb10d9b5620a5bdf76dce3afe4aafcdda3637e6025b76130b0e4e602d882ae35689241ff0c27ffd85a7ec
+EBUILD linux-firmware-20171009.ebuild 3258 BLAKE2B a569f21666576a4b46069ee1ad6f1cade8e01accc5066b9ef05606185c08a6e2560630f56ca8a13173a3000a4d040d8037d65276ad7647d6ebf28a242df166b1 SHA512 e476306c556ad8aa97121dde15b8d230564cb37003272a120eda763277bef2166c088c6be2d3f09744dc8aca4ef341e6373d50ce9147537faec14563309e781b
+EBUILD linux-firmware-20171123.ebuild 3288 BLAKE2B 42f58bfa8cc057310694b69cbcd54d8ac2c1117a7e4952d375f0b8e9129ef52eee2ad3fbdd6e405ea6a4ec318a29d007f654b251ae8ba1cdb34d4d1b70f18fff SHA512 614709cce3334573470bdd5fbb819d8c03418c20f9894845f5628a3913bf836587c2683788b3bdefa9f24fae0bc6c403fe15c8f65f79ea31d2f83fbb865f62b3
+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-20161205.ebuild b/sys-kernel/linux-firmware/linux-firmware-20161205.ebuild
index 7258629c9056..67fbc9fa6492 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20161205.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20161205.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 99999999* ]]; then
 	KEYWORDS="alpha arm hppa ppc64"
 else
 	GIT_COMMIT="91ddce492dc0a6a718396e0c79101087134f622d"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.xz -> ${P}.tar.xz"
+	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
 
diff --git a/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild b/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild
index 3b23fb500322..188550b4aa0e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 99999999* ]]; then
 	KEYWORDS="alpha amd64 arm 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.xz -> ${P}.tar.xz"
+	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
 
diff --git a/sys-kernel/linux-firmware/linux-firmware-20171123.ebuild b/sys-kernel/linux-firmware/linux-firmware-20171123.ebuild
new file mode 100644
index 000000000000..3ff0029ae57f
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20171123.ebuild
@@ -0,0 +1,114 @@
+# 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=""
+else
+	GIT_COMMIT="90436ce9f11152483b35aac58dec7f99d52821aa"
+	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-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-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index b3a27592e5b2..1056574b8066 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit savedconfig
 
 if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
+	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	GIT_COMMIT=""
+	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
 
@@ -63,9 +64,11 @@ RDEPEND="!savedconfig? (
 	)"
 #add anything else that collides to this
 
+QA_PREBUILT="lib/firmware/*"
+
 src_unpack() {
 	if [[ ${PV} == 99999999* ]]; then
-		git-2_src_unpack
+		git-r3_src_unpack
 	else
 		default
 		# rename directory from git snapshot tarball
@@ -74,6 +77,7 @@ src_unpack() {
 }
 
 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