10 files changed, 135 insertions, 259 deletions
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 39a26ba3bf83..ad07a5f522aa 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/alsa-firmware/Manifest b/sys-firmware/alsa-firmware/Manifest
index a3466e381f4e..0642832d157d 100644
--- a/sys-firmware/alsa-firmware/Manifest
+++ b/sys-firmware/alsa-firmware/Manifest
@@ -1,4 +1,6 @@
 AUX 52-usx2yaudio.rules 971 BLAKE2B 1a8b0bf26b61694c95cbfd50e20096255dc0cf8c77b4f5bcf155ae6d163aaa1b6e8a658c864fc2391f5743b8f3a2702e7c03f1fcd7cab12877c5a5d607a42d56 SHA512 5c3ac0e03a496384ea58f6da479c932cb2d2f91f110703d71d0bea60329ebfba8a1a0e78eb951c9854b7fe0dcc9943d10f436fe9acd04848ea780e90ac274f17
 DIST alsa-firmware-1.0.29.tar.bz2 4996942 BLAKE2B cee20bda58653548c8f88ec83657d30a19cad93df25db2f5f982b673d02da28dd9f623d6981b70da97e8f882fdd20b37f2d4c401c36ad977a67503f548e36186 SHA512 f4307c33fb6f401c86e88b82878b8300447ac97bbbe06e83bd69a38cbdd7b4a0ba6faa4f20081f11167805de65c66b7db643483f8669eae3284bc1c4da8d44a4
+DIST alsa-firmware-1.2.1.tar.bz2 5146513 BLAKE2B c3d6047f484e78b3ddcfb23c30aaeb583088e025e4fae47e1a94cf987414524c1324b327f6679a0a8abc24e5c90b0c9454520714045bdaef11c5a01522803c81 SHA512 573bb13d47309253afa7d4d04ef13a7a5e4d18d8f89b1339630266f0ef6638cbb9381b3efce2604ea63fc9cf90a55ecaecf8eb2cccd58da04d0d283a245618b1
 EBUILD alsa-firmware-1.0.29.ebuild 2766 BLAKE2B 89233d9c3afc7f7f1a2b47ad8c47961da63175c3d185c89f7ad1ab9f8a05c9f7f53be565a65ae0a52f1c236554a1a0a4724345e67fb1f527320343e9cd431aa6 SHA512 875a31c3859bcb8f3e08b418b61a8283a2e0caae6fc1669b81620c586cbd1b20a8a85cf18a393c88976b1b4d7b27c5e32eb5a5a32a7aca3374a061376d4cb226
+EBUILD alsa-firmware-1.2.1.ebuild 2767 BLAKE2B 73eef5805463d47ae0cadd4af7c3085f4fffcb952f6bea6ef67968da8e504c7102695dd258f7c7f3424857f72857bd2cbdcefc33ad801f2fc5e0565853027df9 SHA512 c2fb4961c887fdaf64438e0e22fa761b2f0e7e7ddfda6bbecda2eb1b0d3b0b1c024514f2f891e5873d3c9259a38d65ca6a274fdf81e649138e3ec88f336f9792
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild
new file mode 100644
index 000000000000..ea61da5b2c93
--- /dev/null
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit udev
+
+DESCRIPTION="Advanced Linux Sound Architecture firmware"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="https://www.alsa-project.org/files/pub/firmware/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20
+alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona
+alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g"
+
+EMU_CARDS="alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820
+alsa_cards_emu10k1"
+
+IUSE="alsa_cards_cs46xx alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp
+alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16
+alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront
+alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 ${ECHOAUDIO_CARDS}
+${EMU_CARDS}"
+
+RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
+	alsa_cards_hdsp? ( media-sound/alsa-tools )
+	alsa_cards_hdspm? ( media-sound/alsa-tools )"
+
+DOCS="README"
+
+src_configure() {
+	econf --with-hotplug-dir=/lib/firmware
+}
+
+src_install() {
+	default
+
+	use alsa_cards_pcxhr || rm -rf "${ED}"/usr/share/alsa/firmware/pcxhrloader "${ED}"/lib/firmware/pcxhr
+	use alsa_cards_vx222 || rm -rf "${ED}"/usr/share/alsa/firmware/vxloader "${ED}"/lib/firmware/vx
+	use alsa_cards_usb-usx2y || rm -rf "${ED}"/usr/share/alsa/firmware/usx2yloader "${ED}"/lib/firmware/vx
+	use alsa_cards_mixart || rm -rf "${ED}"/usr/share/alsa/firmware/mixartloader "${ED}"/lib/firmware/mixart
+	use alsa_cards_hdsp || use alsa_cards_hdspm || rm -rf "${ED}"/usr/share/alsa/firmware/hdsploader
+	use alsa_cards_asihpi || rm -rf "${ED}"/lib/firmware/asihpi
+	use alsa_cards_sb16 || rm -rf "${ED}"/lib/firmware/sb16
+	use alsa_cards_korg1212 || rm -rf "${ED}"/lib/firmware/korg
+	use alsa_cards_maestro3 || rm -rf "${ED}"/lib/firmware/ess
+	use alsa_cards_ymfpci || rm -rf "${ED}"/lib/firmware/yamaha
+	use alsa_cards_wavefront || rm -rf "${ED}"/lib/firmware/wavefront
+	use alsa_cards_msnd-pinnacle || rm -rf "${ED}"/lib/firmware/turtlebeach
+	use alsa_cards_aica || rm -rf "${ED}"/lib/firmware/aica_firmware.bin
+	use alsa_cards_ca0132 || rm -rf "${ED}"/lib/firmware/c{tefx,tspeq}.bin
+	use alsa_cards_cs46xx || rm -rf "${ED}"/lib/firmware/cs46xx
+
+	local ea="no"
+	for card in ${ECHOAUDIO_CARDS}; do
+		use ${card} && ea="yes" && break
+	done
+
+	local emu="no"
+	for card in ${EMU_CARDS}; do
+		use ${card} && emu="yes" && break
+	done
+
+	[[ ${ea} == "no" ]] && rm -rf "${ED}"/lib/firmware/ea
+	[[ ${emu} == "no" ]] && rm -rf "${ED}"/lib/firmware/emu
+
+	use alsa_cards_usb-usx2y && udev_dorules "${FILESDIR}"/52-usx2yaudio.rules
+}
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 13e951c311b4..43cca6e93488 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,7 +1,4 @@
-DIST intel-microcode-collection-20190908.tar.xz 5265124 BLAKE2B c3d9b611e9ea052e28921ea8cfa4c9b0dad980cd527564cdc077e9af2935f83ee24eb3c784d6dfe8e627a372c8474a218f7447f4d174e1677e04e59880a938ac SHA512 0d55067c3933f35526f655c20d732545bce83089c5cb45092bf7a50f6f8acff7b97266fa0c8a94ab88c67c77f836e88910851de4db98939a3775fb02fe7fa231
-DIST intel-microcode-collection-20190918.tar.xz 5341868 BLAKE2B 9825b57dc4cacd35003ed4e9c581c7d07e49701b12467d726e6620076d25024e79a54f279d0d89924945805565c4ab0521f67fdb7ce7294996cc34f637ae2a33 SHA512 0eb1caff43f1009f8370692b23a74cde5c35f67dc03fddb74925be5cccd2b14a1a021086af7f92d39b8ddf80ac91f32ab4970fa338124d686536e9ea94f35e55
-DIST microcode-20190618.tar.gz 2446418 BLAKE2B f5e4846c7d6d4251c8a53e7a238ce0be9530827d16a015b91beec9d2ba2186d6632d370342b4b7a898f32d294b3c8c12522d07ea40c13ebc75d40b8b83eb1da3 SHA512 f7717f476465705e14ea26b516cf7b1d04e29842da0924d7da5582346ad5dd5dfd8755041bdca8f3afa7fe64f138e91354498d87006fe4487701242858c24c17
-DIST microcode-20190918.tar.gz 2452786 BLAKE2B 63054290e3691883eab20a2e86d9ef0a8b4417a9efd4ca3e2a540b7013c65751b4c9f1fa345345a73d97321bf3cc88dfe05dd4dd941994613ad358ee4e981c07 SHA512 82e5212238d3e35470d139240d9157877ac252725598ec31bfe1763755681539a4ecdf24e04c4e4270215578a9ca3c063c8fc353accf99999c3d4ac2780a6e0c
-EBUILD intel-microcode-20190618_p20190908.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
-EBUILD intel-microcode-20190918_p20190918.ebuild 8552 BLAKE2B 0b9a8351dddb883254899b4763bec619d8e4f1642becc8ce34aa7e29ccf793e7ce49cd424389b4f2f9b0074830d455797c9bd5db52beaef47a578987f491168d SHA512 b3d2b8a6df09fe39598a2773fa0c4e67f3847ca9122b9580094e8a8c96df71254f77bbb2ef3b50ad3383ee7896448adc3f429ab3de944749b9789f8084535dec
+DIST intel-microcode-collection-20191110.tar.xz 5487112 BLAKE2B 89674e81857235abfdc21e50c767c702cd52da0c61c2c860bc8484c0d2b6c368601c5b1db956e90c9039c3e0b9d79139ed15e3a1a8c5a203e2cf196db69ade79 SHA512 b82221b7f506126613a80d1b8d0e47f4fea9debc51f5390c67eb50fda01677d60f50573376172054973c46563911dc79feb7b8d2cf35f53813c3a93228e7e2ee
+DIST microcode-20191115.tar.gz 2998063 BLAKE2B a06f2769da1577b9ce3a34f447e182312d003842b043372d850de51012efd9c0247f9a6bc8964e3da6127f8afb58f3fb31b1204e7286af9b27c795c00419ef7e SHA512 11014c16bde83ac290bc75e458242f5e64b8dffd49de2e938f61f4a09979cd5e80dd1a85d2ccbac067e4398dc3d93ef3583e4aa9b2e545ba46d26e65ec1e2881
+EBUILD intel-microcode-20191115_p20191110.ebuild 8552 BLAKE2B 0b9a8351dddb883254899b4763bec619d8e4f1642becc8ce34aa7e29ccf793e7ce49cd424389b4f2f9b0074830d455797c9bd5db52beaef47a578987f491168d SHA512 b3d2b8a6df09fe39598a2773fa0c4e67f3847ca9122b9580094e8a8c96df71254f77bbb2ef3b50ad3383ee7896448adc3f429ab3de944749b9789f8084535dec
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190908.ebuild b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190908.ebuild
deleted file mode 100644
index c38383872511..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190908.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="sys-apps/iucode_tool"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks bindist mirror strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED%/}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED%/}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED%/}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED%/}"/lib/firmware/intel-ucode-temp )
-
-		mv "${ED%/}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED%/}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED%/}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED%/}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT%/}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20190918_p20190918.ebuild b/sys-firmware/intel-microcode/intel-microcode-20191115_p20191110.ebuild
index 030826b2de0c..030826b2de0c 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20190918_p20190918.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20191115_p20191110.ebuild
diff --git a/sys-firmware/iwl1000-ucode/Manifest b/sys-firmware/iwl1000-ucode/Manifest
index a46375d6bb8f..4f8c982e44c2 100644
--- a/sys-firmware/iwl1000-ucode/Manifest
+++ b/sys-firmware/iwl1000-ucode/Manifest
@@ -2,4 +2,4 @@ DIST iwlwifi-1000-ucode-128.50.3.1.tgz 175772 BLAKE2B 5665cdfaee40b1ce72e48effbc
 DIST iwlwifi-1000-ucode-39.31.5.1.tgz 180879 BLAKE2B c188230b9beade89d0db2d7bb52432a75aad425618348ee7e242c52bb57f8940ce302ed9dab13420a99cc29178f56d2fd7bf069e35ab5c26d3ddb34be45dcba5 SHA512 18f01b51f83e133bd6803567afb75606faba8cd96e3ed4faab8350d6f63e43c4c9397fdc17631efda1606fbef9e1a2b3065cbb58779de0f56223c95703474b06
 EBUILD iwl1000-ucode-128.50.3.1.ebuild 502 BLAKE2B f26742278ebb5df857a1b3f832290e497154bbc9624ccc86506890f5344feed3506e0a5639cb61e4126de58d2656564931f19503e3b0579d30c30080722dc719 SHA512 6f1522ddce725414461a94ecc5860665ce2326b1d05d3bbd201c7697ae5a17a8345b34492462622a2ad45eb589f2108e824d84aae5139005ffcc60457d496f64
 EBUILD iwl1000-ucode-39.31.5.1.ebuild 829 BLAKE2B 00586d0fb395bbd7d4154d16cb77fc7c263755c26a140f135853acec117a2387201d3fc2d530ec0968af133e5020578689a724e1f46f20457892cdd2ce116e4b SHA512 befbe6fd9cf11acecff8f7719f5437aff6c057ab1cbd415ccdb2058b2f46215d21ffc5ccdead84b17bde5b6ee37474ba8e867bd8f6205e202e70b3a9d326b66c
-MISC metadata.xml 352 BLAKE2B 5cdba9442561916f9c09ed40cd7d798a3ce04ac44c8d04202a51577e4be4559bbaaecf1271ef667d47f35170c92305034017682df7e34e9828e98f72a73efb51 SHA512 efb6d7cd6b9798880dc106a543f305e87e6340a3a6fd61098c7b2566a9d1579db2af5b117e80c79a0006d9f144a67ac62685c2334433e956104c359d075b97ac
+MISC metadata.xml 276 BLAKE2B b9964cd15414bfca69a8c5487e9f24abe490df73db7af4d679605706d26281655acf865caa07a35fe0bb1b8b979b442c23537bce27287290d2384224b970d4e7 SHA512 e10aa6dab7aa9e9bf1294968a556dd0b1e28f0365afa96e1d6e3c2ccaded21de540f5ed3bef9a5f58294dd6289fcd3a7fd79046fa3a7cf1b32405165294e3833
diff --git a/sys-firmware/iwl1000-ucode/metadata.xml b/sys-firmware/iwl1000-ucode/metadata.xml
index 93d0cc1e92f0..00f209d8495e 100644
--- a/sys-firmware/iwl1000-ucode/metadata.xml
+++ b/sys-firmware/iwl1000-ucode/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>ulm@gentoo.org</email>
-  <name>Ulrich Mueller</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
   Firmware image for Intel WiFi Link 1000 series network cards
 </longdescription>
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/Manifest b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
index 18fb3f421d7a..f1f61607ccc9 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/Manifest
+++ b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
@@ -1,5 +1,8 @@
 DIST sigrok-firmware-fx2lafw-0.1.6.tar.gz 143755 BLAKE2B 017222f5cedf8cda16e08af75761fc27cf04335557490e03f6fcd4a875d2e67f64a6d01fa7e8ff43aaa5d2633d176a0d756f693819f839c87d7fcd43f829e378 SHA512 d636e9a86009a4581630e38beaee144330bd3ea2e2f69487b09c3d8e372e722877f76dab05c8c5098c6fabd041eab04c3169a0d2f8fbed8a6f5de8c3e6f5841d
+DIST sigrok-firmware-fx2lafw-0.1.7.tar.gz 145443 BLAKE2B 6e19fde87caf942ca8f95a67f5ba5553e2044e9ba43ca81f6b7be69f4a75ca25e946edf80d0f4ddf7d361f98aff68e9a0d950070fbca24423c908fbc70155ae9 SHA512 e9973980b07cef395637476c6294473e349770be24afe6b03d284bf3057f6b32fe686e25f3baa180b96455397db43e16f191a9feb07bf46e097170fb4d326f8e
 DIST sigrok-firmware-fx2lafw-bin-0.1.6.tar.gz 52195 BLAKE2B 8e20720efeb5c4bc2ed91698db625439594669920fecce785e3ea4213f32a06da3186489c78b27bb35f1574b6ebac82bfe01352806c39ecc671568c73b93e5af SHA512 0dd4eb5327fbf5a8ee413b5ad460e2febe7da6aba13cfe4c7467966e4d4a0033b796ce7634647c0bbfa335034180272e7f8167b7a8181fb73ed3839891a44e46
+DIST sigrok-firmware-fx2lafw-bin-0.1.7.tar.gz 54529 BLAKE2B b8659ba77f6976a927bd60c903abbc7bf7128d4dfff8a58dfe1f6522c6f7d5e5c0f8c8bc170fef7499461426ab1059093c4cc1553a39f4a059786cfc144f787f SHA512 60faac29198532bd5e03e44ed7f89c1502c83c6cf60ec5cc0f3ae9891c45b5de55eba5304c47d3231c8222ff61f1425aed88a44e7ff89d30b75d6e5faf7a623c
 EBUILD sigrok-firmware-fx2lafw-0.1.6.ebuild 1193 BLAKE2B 7808567d5817da53b0c898b6cf6c2d988328dae9935ff4a72a957a5f79b8d591db63e585c40f968988bb10a1fd9b73324801df61d50ceec8202f21b5cbe2fd98 SHA512 56af199012cfccaa20274191047a3d1dcabbcea57872e3723b3a4457fd18564036df1fd79a2a6467f3d2051ca51ed3b9c7535b357b7b56cf16babc85949ddf10
+EBUILD sigrok-firmware-fx2lafw-0.1.7.ebuild 1193 BLAKE2B 7808567d5817da53b0c898b6cf6c2d988328dae9935ff4a72a957a5f79b8d591db63e585c40f968988bb10a1fd9b73324801df61d50ceec8202f21b5cbe2fd98 SHA512 56af199012cfccaa20274191047a3d1dcabbcea57872e3723b3a4457fd18564036df1fd79a2a6467f3d2051ca51ed3b9c7535b357b7b56cf16babc85949ddf10
 EBUILD sigrok-firmware-fx2lafw-9999.ebuild 1193 BLAKE2B e3104369313d00d1cd925ee29522b8b5b8bb16d813249844acff10701ccc0ec10420762fd3f297c1b3acc90904501168f393169de285538a319133cc80368d6c SHA512 5db1141f7230e3a01f7e7beeafeaf9dcb7aa8aa2a34f2cb6b532d04c16aef0f880072646ca063c95da3388bc82a9306e79121ebe64027fb25e58a435c4403cf6
 MISC metadata.xml 329 BLAKE2B 60a84f5e60d450cb97c53317f470cd599c61b39d3bbffc579db58da460bd84d4b0bdf28a1f9b4d90cbc01bea3e36b0832df78561984eff849256ce50387bc9ae SHA512 56ca5a2c5d91cbb7ac9b3578fdc6eae211a8474649cf418464bfe7b96ea303b2fec80bcc24a0c490ba79b46d0d0cf44832ce3ef9febe1ee533cde57ccf12ddf5
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.ebuild
new file mode 100644
index 000000000000..1f85fa931259
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+SDCC_DEPEND=">=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+),sdcpp(+)]
+	<dev-embedded/sdcc-3.8.6"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	IUSE=""
+	inherit git-r3 autotools
+else
+	SRC_URI="binary? ( https://sigrok.org/download/binary/${PN}/${PN}-bin-${PV}.tar.gz )
+		!binary? ( https://sigrok.org/download/source/${PN}/${P}.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE="binary"
+	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
+fi
+
+DESCRIPTION="Firmware for Cypress FX2 chips for use as simple logic analyzer hardware"
+HOMEPAGE="https://sigrok.org/wiki/Fx2lafw"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${SDCC_DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# The binary & source dirs are slightly diff.
+		use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+	fi
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	eapply_user
+}
+
+src_install() {
+	if [[ ${PV} != "9999" ]] && use binary ; then
+		insinto /usr/share/sigrok-firmware
+		doins *.fw
+		dodoc ChangeLog NEWS README
+	else
+		default
+	fi
+}