gentoo resync : 04.01.2018

3 files changed, 7 insertions, 121 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index eef070cf054d..00dacba27c74 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,10 +1,8 @@
 DIST linux-firmware-20170314.tar.gz 96072698 BLAKE2B bf650b91a696d88272361c1845d0d7856e90c6d6e1d008a3d5f40bb9beb43a6047f2280d7e4fabeff25a2518c63086a331f1e1af59c458d6bec451efc4415ad2 SHA512 1e3a40d42ccd5260afd66161727e45af1de80129093f83f547f20502fce075927952629bfda4ec5b53a6f279daca0304fb462e7c6aa566bfe2b9b687688b6460
-DIST linux-firmware-20171009.tar.gz 106811352 BLAKE2B b4c18f3a72e16657244e77bbc39d905692cc2cc1aa95b89c0381f8948eeb6cac9b67688f6b4b2ef275eb53ee9ffd24b48b45b75f7632a7d26231fb3e92f6ea8b SHA512 3a91f05197b03e8f4e51f4fb936c68a9b7d7ead58fe489e679da8626391dfa1ed72362c857a7522f49d055e6b349b93564542658f7e9da96068b15b52f5862f4
-DIST linux-firmware-20171123.tar.gz 115603524 BLAKE2B cb2a4e4f849c1125f969e59104caf4abc4f195dd28d1ad7a8feb21bc29df82baea30b8236368bbc64c6dddde13aea5230763673b4580cd7c48736b64242b757b SHA512 6ac6fd05dc9b260686822d7eced94ceb2ec391626b88b68c6803224e5eb984caf8d28d446b7f348fe09f435e8f4faee716b53164d6f121dcb367e9ff753907e7
 DIST linux-firmware-20171206.tar.gz 122782333 BLAKE2B f80f810c5544f3e7627fbfd70fdf9c725be710e1783d21e023e3d45e272a4c4521ccc12d406e204174fe10edeec7a1d06f56b09396c7952e00fb14e08b3fe3ef SHA512 1c0db1802732579c7923f0afaf0690db70f0925138ee1ea1a0eaff7f933a15fdc7d2fb3581e74883c01a75d16a285dc5467fabc7570cb378c0fa108426e7dc0f
+DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
 EBUILD linux-firmware-20170314.ebuild 3294 BLAKE2B 93fdec863017044fd75ad16694bc1db473607c59d5d873ef21de651078b723d3607a0b40c7955a5e9154969dbcdcedeba04b17ea9c423437b47928dad63aa157 SHA512 1f038e50a2445fcd28a7abbe3f022ebdede0a04801afe3da06fdc0ae7104773c43810fef5b9484dc266cdb1c5a15bf326b7a1424744f1bd0e326ba509af89edc
-EBUILD linux-firmware-20171009.ebuild 3258 BLAKE2B a569f21666576a4b46069ee1ad6f1cade8e01accc5066b9ef05606185c08a6e2560630f56ca8a13173a3000a4d040d8037d65276ad7647d6ebf28a242df166b1 SHA512 e476306c556ad8aa97121dde15b8d230564cb37003272a120eda763277bef2166c088c6be2d3f09744dc8aca4ef341e6373d50ce9147537faec14563309e781b
-EBUILD linux-firmware-20171123.ebuild 3288 BLAKE2B 42f58bfa8cc057310694b69cbcd54d8ac2c1117a7e4952d375f0b8e9129ef52eee2ad3fbdd6e405ea6a4ec318a29d007f654b251ae8ba1cdb34d4d1b70f18fff SHA512 614709cce3334573470bdd5fbb819d8c03418c20f9894845f5628a3913bf836587c2683788b3bdefa9f24fae0bc6c403fe15c8f65f79ea31d2f83fbb865f62b3
 EBUILD linux-firmware-20171206.ebuild 3292 BLAKE2B 456e5bcf89e1c7aad7db0b7db03f5c9d6fd5b70377dd4fb05a2d790e6bb16474f48500b1786f44bbab00c6144b5f251a7f72af4cdc905b14a6e0e2a9eeea921a SHA512 228744b704e482d1389bb4ff56db95c397a213eb93952032c8d504072a68adf68d8a5864381240f9ad436c29c1cac82fd177f48556682ec99b59a61016976044
+EBUILD linux-firmware-20180103.ebuild 3292 BLAKE2B fdc9d0a0dbeeb9a5b22c69d1bce7bef97af6eaa012430afdb9ddfc8e491cd520bb8d7ab542f97bc1dff5ec0237a47568eb6225e1f876ec8d768a0a569f0f66f8 SHA512 b2f6fa573c116e0f9514fecff7acc2ad95ca7e81bcbb1ccc6bb8f08ebaae34ad5aba8c264300e65444f6c3d9e3d93e4febc2d9b3585b70565fcb7c2c4a23ce7e
 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-20171009.ebuild b/sys-kernel/linux-firmware/linux-firmware-20171009.ebuild
deleted file mode 100644
index f7a00d9f5ee7..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20171009.ebuild
+++ /dev/null
@@ -1,112 +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-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS=""
-else
-	GIT_COMMIT="bf04291309d3169c0ad3b8db52564235bbd08e30"
-	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
-
-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-20171123.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180103.ebuild
index 3ff0029ae57f..3642df85db82 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20171123.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20180103.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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-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
-	GIT_COMMIT="90436ce9f11152483b35aac58dec7f99d52821aa"
+	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"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
@@ -68,7 +68,7 @@ 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