gentoo resync : 25.01.2019

3 files changed, 139 insertions, 2 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 9d9a48b63a42..b33e700de9e4 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -2,9 +2,11 @@ DIST linux-firmware-20181026.tar.gz 167486645 BLAKE2B 9923b9a8ab692023022d7bceb2
 DIST linux-firmware-20181216.tar.gz 172681622 BLAKE2B 3d98af002e5ab1ba8935a8716273311cb9f8f52462724882dc6bf63d96ac17011f3b68c37a87eb6e7447f1542b289fcd7afd3b4bbe21afa3aa63c7c2a2fa0ec8 SHA512 fd1790571a744ebbde7ac163ab86bdbe0476f5b3774e3a129eaac850207b146e5b537c7c1c01535c8813215274c9ce02ca9efe1cffe2406fb922f764adbf1a02
 DIST linux-firmware-20181218.tar.gz 174835447 BLAKE2B 8bac1dbd413c4fc5c8c07bb299860504cf9ec39b3665e20d86c3755c2a655a5bd4508b406d91fe8648378217bc3aa49fdac05beafd31dcbc0a05496a195d1deb SHA512 58bb759378e569169a4499e5b0e09b7aa3e42a160b1187313fd8e74b4d26e45a018202c2dfd94b7b592cb0a5ad040bbd4051a0f74d7737aa3a72f0e3ed060dfc
 DIST linux-firmware-20190114.tar.gz 175568625 BLAKE2B 1d89ed002293343dc448acb97bf047b99752661d7a358d8ea0f8d2fcce5331af85cde0717861fc429e71aa89647189476df0c92ebfc8edb75c2954e56d8a1860 SHA512 05df281667402b3265f401b3845c4ead22521c8c82f9a48a7fb15dbfaadaacce9fb9ca0e17c521c8928e7a82a7e170cc339697b8fbae8b89798a1f0daf9846da
+DIST linux-firmware-20190118.tar.gz 175570644 BLAKE2B 4d1492e820c2f03ab47068be4a8f343cbee62ab18fc72849a4edfa8a0afd5f3ed131f95efa578177155d8e31b7d4283567661855ee693566710934588ef65511 SHA512 2cc06f179c4a720a43f6fbf634b169bd664ec1740cff86abc78de4f30b49e5bd280f5134975a55a2d20f442a4bd72a91cc228ad23ef8c5bc67c7a08e1c0e9658
 EBUILD linux-firmware-20181026.ebuild 3264 BLAKE2B c4807c4de0151798e24d4f60fbef04d10d68885fcf90fbe9e8148c7f9e2243ec586273e7ecf379f11582108c848056595a6d841ea7b78fa9a5090ceabb088917 SHA512 eefd8c608d20f1f9fe6f0f6417a57296b788d0e52dddd45e089c67bd1585e8e7ed2d32fd6cf1ddc91aaec18bcfabd8fae67a90fecc2871c2bc7b4423d4af162d
 EBUILD linux-firmware-20181216.ebuild 3264 BLAKE2B be21dd1418b31a5e271d747912c6a03ceab9ba4200d7b800e49fd551203e0f7a4c9452076efbbce2164c66aea5c5c05a09468f77b42bb44e821d24896c6a4fae SHA512 9505939bf247742f154552b83902d74d4e3edcf3ac8bedab5d333d44a2aaf07839c1c2f05762cdd761e9f99a97def573cd47dbd16eedf98c821ff5c38792cfc5
 EBUILD linux-firmware-20181218.ebuild 3694 BLAKE2B 2db2b8bae84bc63236f6aa3a7686f4f6ef6ea8e84e305991d67ac6f3db3bd9983123a3626f59e6fed137d4fe903e790732bf27e7b8841a4355b4156259b06fdb SHA512 ecda974e37eca65dc57fb9c9374c475b263978508ec957f5ed70c12576173c489734c0011311b1b1c857b86a61f92c5ed01f31611fcd499e818f2c0bab8b5035
-EBUILD linux-firmware-20190114.ebuild 3707 BLAKE2B 8116844d56ec98246c396584a85ebca8000f33cb414c318e855830b24c227e99e6a4eb630fdd90e41135f6267aef163eb91cbaad35235bbba6ba2b34704b39f7 SHA512 b02f63b6cced6f9ab3acb6ce04847d0eb571855b1120cc9eed55af8ddabf069da766bf680aea3c5b9882d6a752971bad6873fec6cd6a746a1598703e18f00576
+EBUILD linux-firmware-20190114.ebuild 3694 BLAKE2B 9087a9003d5eb486d271cef39f3af62c4bdfeb3b8e14f9cb9ed6e341d7477df5773708bf3cbd86b257b933a682193bcd18ae8e46707052caa646ec66fa94993a SHA512 df9472c30e735435b21cebbedddf7504256e6cb76d233cb9c06ccbaf2df1614b1b225a9d3ee001513ff1b2b9952029c046d9a426642c41e1dcbca9ab9d717b0c
+EBUILD linux-firmware-20190118.ebuild 3707 BLAKE2B 0407436553644a9ab4812e0fc28c49815a4c22d137671970c9b7262a7d396b9c9b4d74ee47f6f814558cf67c40f50dde1e9a315a015bf472a48eb962402a386d SHA512 df0853945d7e8c8f41816515b4b4c2f657336397c2b01387bfef742edf8c8d770027b17e5719b330f6283d6121d764e7465e747a70698d6c2cbdc3b5935b43d2
 EBUILD linux-firmware-99999999.ebuild 3667 BLAKE2B b89213f7eddba701f283917616420b6daa64c275b8eac90179e8de0cb9d85eaf09b3db5c61472c27b1c9a909325596b30e7315334472d02fe7f226d7acdfce7f SHA512 c58aee0eb2cbe4d6ae0956c5c96ccc2a965772414f84ebd971be885a9c5fd2665dc9be925465d303a2aaa967d07e8a662f852947c830f74ec510e2987475acb0
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190114.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190114.ebuild
index afca50ebb360..360918495e9e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20190114.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20190114.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 99999999* ]]; then
 else
 	GIT_COMMIT="bc656509a3cfb60fcdfc905d7e23c18873e4e7b9"
 	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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190118.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190118.ebuild
new file mode 100644
index 000000000000..7f6679a3bcb9
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20190118.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+else
+	GIT_COMMIT="a8b75cac06f80dc1500ba385680ac5b5c1d1c4f8"
+	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
+
+RESTRICT="binchecks strip"
+
+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"
+
+		local file delete_file preserved_file preserved_files=()
+
+		while IFS= read -r file; do
+			# Ignore comments.
+			if [[ ${file} != "#"* ]]; then
+				preserved_files+=("${file}")
+			fi
+		done < ${PN}.conf || die
+
+		while IFS= read -d "" -r file; do
+			delete_file=true
+			for preserved_file in "${preserved_files[@]}"; do
+				if [[ "${file}" == "${preserved_file}" ]]; then
+					delete_file=false
+				fi
+			done
+
+			if ${delete_file}; then
+				rm "${file}" || die
+			fi
+		done < <(find * \( \! -type d -and \! -name ${PN}.conf \) -print0 || die)
+
+		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."
+}