gentoo resync : 04.05.2019

4 files changed, 276 insertions, 2 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index a6a45284f713..06652a643d4d 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,6 +1,10 @@
 DIST linux-firmware-20190313.tar.gz 177810569 BLAKE2B 410206491591115505964ca1cefb5effe6bb43002234489285a0985c7a87f80071ed22dd5678f5457ec6611bdd702ac9610ba89b3e44174f8d222b75b5d32d2a SHA512 eec933ebdefe83d466bfcf0babe710f95f67d319317f3187e43518a15a273b47e63ae88a35106932f0a8d5ce54f8a4c5325d7ab9da8b1789eed532a4a500fafd
 DIST linux-firmware-20190409.tar.gz 183446874 BLAKE2B 2c6ee33a390efd43470cb0f67d289fc1c863f7c5358b4597e1cc7f4b7aa72933332a867a98899f66f9c8df3d9495f96ae583fa9bdb4004f6f2e7ab47380a50d0 SHA512 2a48b210e4101f3aad595612d20f23b4b98b3eb20871712ee17841fd2212d292c25b6c94ac12c71cac82e23c75840b3488c8ada8161a18bce33d328baa002581
+DIST linux-firmware-20190424.tar.gz 184136531 BLAKE2B 84bc08c4771abc75c26a0b0562cde461bfb0b8c372f29bc84a776d6b37f6ce40db49aa7bb2045abbcfe9eb556ca174aeb46c5cfe1d77841edc110477e1847159 SHA512 73dad890b1ea29ce712469a2ca67a57cf8bdb8e3287d71bd6d321cc105cdac1c802aed76b0673626129607c456221356cace22b3249113b44c83cce75a97b856
+DIST linux-firmware-20190502.tar.gz 185125493 BLAKE2B 48e60d08893688ab546d3d834490f5633c890c523890dedda75154fa041db8a4ae6663ce29485d32cf65556c91906aa8eb4f58ebbc95c34b5aeffb15c8737a98 SHA512 4dbc6548a66b5fcf4af47422004123b42f4c62088c5d97c8f24e03403d7acf729d9335addd68b383ecd9e8dc602b301534842c032a58ef920fad74f2c61d29ae
 EBUILD linux-firmware-20190313.ebuild 3685 BLAKE2B 2630a8397dc4a294381d76181c5bb4b73e0a6c7a994dff7af644de2080ff4d3cc41dc6437940ef83372e9ff21761b14a0124f941564a9c41303694c4506911cc SHA512 c13931024b2e044f531878918f71fd8203ba13e0e1f8e29e20d804ce20d756e7fe751b6589ea87a8b9655e9a9f15eca957c03633d5962aa4fe4fec603eb8860f
-EBUILD linux-firmware-20190409.ebuild 3698 BLAKE2B 3c890937535fde0ee95a0e13a06ae424daa2a7f88701729097fee8c443962c348d6c47cd3061a54fec5e2528ff78b85863543d693027ab4f033843999cfd233f SHA512 10042179d70d245d6aeb717c6eaa4298a8b0accd221bf0d54da19983616ebe8c997744b9568e8199a1329e969fe09d7c391b75218fd74036427f4ee2fcdce556
+EBUILD linux-firmware-20190409.ebuild 3685 BLAKE2B 1569626984f3ec7284abeb69b59435708166fec3f18889c765ca7aa1284634844e623d39972a05eec5ea673ef2e2429bce4aca7831a4b155ef76f9f4c35d021c SHA512 7facddd05e72423611caaea66f78f6b459f1eae46643883b5ef2c44aa2c512b740cafb4ed9331e3da2e263bc8e9e4d2a4f18dc4c3354168d9f75275c28eca9fc
+EBUILD linux-firmware-20190424.ebuild 3698 BLAKE2B a3a41b2cfba2085f1914e9089230a841aafca343584c53427d0df35b188c1b317021e06df7b4d94dfd416bd276f4536a8b8ccbc7c6da54aa8a42a092ff219e98 SHA512 30d14af5f050e46bc6e61e366459f3c547d639897750208699382e74601a2ae57ecaf07dad37f0b0773123ac6811ba48eba47143af4ec456197400b966337fa2
+EBUILD linux-firmware-20190502.ebuild 3698 BLAKE2B 664c165700ace9e5a23c380ffcb65479bdd8c26d9d61255d290ebca4c5242e8413dc2d6b8fec4271041b336fa9f1e8416c83c42f5a5b5513a494a9cf20728186 SHA512 57baef699e973cbd22a9ee38d57b2a3ae759f1e7246db850be46c451fe2e5c7ad05f5c6b6a67af0909f1d7969643d500ba33a39fc2710c31166e02970d35f618
 EBUILD linux-firmware-99999999.ebuild 3658 BLAKE2B fd08ee9d29ff91a161693cdfd6b493bf8c898d4596e19ce5633b60f5bf06a07ba6217587f5737edcee36e0bb03cde69dd3a68d6083b0f63cdf3e177dad2367d3 SHA512 64c453294857b99cf7373cb1fe5e8451efbc0ba62d1660dbe49d91670270468a468dfadbcedd3cc03df5ea8d25eed3235f7b82fa21a36f7234fbb2d6e3d1ce9f
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190409.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190409.ebuild
index 0bdd581f790e..05277bf07072 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20190409.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20190409.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 99999999* ]]; then
 else
 	GIT_COMMIT="260cb35b11a968e7896f911565b75e411636ad69"
 	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-20190424.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190424.ebuild
new file mode 100644
index 000000000000..1310a70dcf7b
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20190424.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="4b6cf2bd1a9d53caa087403d943e7695009c1d0c"
+	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+"
+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."
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190502.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190502.ebuild
new file mode 100644
index 000000000000..62302e0b8b3e
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20190502.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="92e17d0dd2437140fab044ae62baf69b35d7d1fa"
+	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+"
+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."
+}