gentoo auto-resync : 13:11:2024 - 03:02:42

10 files changed, 447 insertions, 21 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 848d6cd2badf..6df60ed4764e 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dkms/Manifest b/sys-kernel/dkms/Manifest
index d13dc6b0e9ca..99972aca2a3f 100644
--- a/sys-kernel/dkms/Manifest
+++ b/sys-kernel/dkms/Manifest
@@ -5,4 +5,4 @@ DIST dkms-3.1.1.tar.gz 92491 BLAKE2B c0dc97a17661430a301369e284ddfa73c398b53242c
 EBUILD dkms-3.0.13-r1.ebuild 1022 BLAKE2B 3f0cb2e7746809cf98447f093b6280ac62824a3f2091ed7851cc7e14299a71f073b2208d4ac09395b86bfd6c8ed7ddddd89e1a93ba8f90bef81b26b0aef11b31 SHA512 339c3fde05a0d0b8b7738d8ebf65c4619f4fe7d22ed179c2285da9d9bed0f0271a49917cbee8a8fe7063b11c78fc9eb3d8c55d5a6955ee93740b80da409161cd
 EBUILD dkms-3.1.0-r1.ebuild 1084 BLAKE2B 4e1f083f9785b4f29db747d9c01c2d1120138151193d4720c400207ad4e8cd8e815b0496623e9c25cf220ac37fa2c2dc7a9281049b6e190fb41f57c5e43cac3a SHA512 28e3b965e02fc901c0a2bad6c07529fc45fff18c84d2d5efd26a3d7ff4e009f691e4f90fca143da98180e085d42369aa173294e62693e8ee18ccb67fe782bb59
 EBUILD dkms-3.1.1.ebuild 1024 BLAKE2B ced62fb3ae029d71e4389128cd9989f7561680f7cffe67e64b60875b78651a3e3dc58d1bc2a94c67127e327529da70600ece88091d6ad176fcc075d85b8253c7 SHA512 ed8e449cb203abcdbbe19b6e6cdd773d2916fc8fe833dcb0e3b7c087ff8da55db2ce2e33db17f2f93ca0bccefc731dfe36b681404349cf379f4a496a6d0adf40
-MISC metadata.xml 1447 BLAKE2B eca1543c0cb28d4502f82cc727c929cbe57a35e9fe5cf4475a1367bd89ccb781185917c54492749f3413e60c275248f745da4722324d99f2f5167bc4a7674089 SHA512 bc810e9460ca296b7e1e9405d1716c43139969b06549839fb0bc65c9c242050054b83898b5c60a2a247295fcc472595d0686ea654961e86db25865840e57cd1a
+MISC metadata.xml 1434 BLAKE2B cb34aa7e05b52bd63f860ab0de7adf4e430d8fe7fcb466cefef4a718625a6432e310d65554250cfb9c3914dc102612d2ec4e9cb5c7e8ce5408b50566e475897b SHA512 7132d501fdcb3e2f768032cef040bcf291f0fdc7fb8b448d765dee97b213c2303f2cc741cc648ac2786386e6c3cf2591083b971fd78d9293889dc62a9b0b11e0
diff --git a/sys-kernel/dkms/metadata.xml b/sys-kernel/dkms/metadata.xml
index 29a745a382f7..211e39ce894b 100644
--- a/sys-kernel/dkms/metadata.xml
+++ b/sys-kernel/dkms/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
+		<email>nowa@gentoo.org</email>
+		<name>Nowa Ammerlaan</name>
 	</maintainer>
 	<longdescription lang="en">
 		Dynamic Kernel Module Support (DKMS) is a program/framework that enables generating Linux kernel modules whose sources generally reside outside the kernel source tree. The concept is to have DKMS modules automatically rebuilt when a new kernel is installed.
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 6eaeb0a826b4..185d1fab4169 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -16,5 +16,5 @@ EBUILD dracut-060_pre20240104-r4.ebuild 4582 BLAKE2B 2e90c9669b95ccbdc38a3bedd13
 EBUILD dracut-103-r2.ebuild 4693 BLAKE2B 739ea0296e64867ea756d0062e20b6a475e8a70e76b0f306930d35ab42857c83936e90463e01cde10bf255c439442b3309b12dba826f0fe6ce9b9faa909c386e SHA512 5d75977e66c881f067ce86ef52adc3acfe563f17d7bd1ef3887b6c23b9dcbd727b550f1dc4f1cd5352dcd7663d0b863625a4163e1cf2fd5727b42daeb450655e
 EBUILD dracut-103-r4.ebuild 6183 BLAKE2B d95d7f9b5f2f3c6abba94f647cc18c7bc2c752e16a348d78115008fac8251b3e4abca295e965045d15cbadaeb855f5a9bbf7d8ac8502ea151ab2df96b31049f5 SHA512 abaf01ca4ca3f5cae79a4c36ada95dc085ab9806ac03231561a77629e83b003b3540153ef93e39f0b57da605737193519e6a03abf238774a8913545997d7fa96
 EBUILD dracut-105-r3.ebuild 6794 BLAKE2B 44d022baa8c4a06a0ce64ba2e1c79ee207574cd5af8183109276418b286e677e6c5ae0fd64e965985385314e5719abe80490d24a61b86d66ad497abd20627103 SHA512 eba341246301114ad86f73054e6cea7761c1311ea85f05a7203f3dfb703c0e38b4dd74c42e576d067f102ed39012f6165b02203e183c1b10418e48463443cccd
-EBUILD dracut-9999.ebuild 6476 BLAKE2B b7565285640c0612764419fe2c2db79191db1a07854b8c7ff30afff2f16df9c16bad171873cc360fa5c4ff3ab8ec497b5826cd87ce944c1037a11d4dd73ca73c SHA512 64b9008a3ed8066dd11c8d81a72ed1c3e65bcb66fa8f4824504c8c30804ac9e5dc8dc5ff2108536fb1e46e7b5e8db250a6283bc9107a589930872a177708a36d
-MISC metadata.xml 572 BLAKE2B a1f308c046673cc7acfc4c74cb78b8fd24527241eec46193004ac64fdd17f325eab761b19fdd5428071f4db6e7c1cc27ccaedd89a2724adc6226dd7e96f3714f SHA512 651ea5de77053dbb2b172e3f2a8d8e2d57957bfb726ef78801091f9f1c7c03fde9fe086cd28e94e2e6102b9a2e99f32cb84a6150b4f6b2b6a9cadae3856bad29
+EBUILD dracut-9999.ebuild 6820 BLAKE2B 4435daa30e94641d9630fc45b1726aadaf96d3c337fb8b57c3ce620d4a46ed179f9491b0e311ea3ae9fcc1490eba1eba844bc1fc62343386b417fa507f9e2207 SHA512 5669a0c8ceba5792b1e41a5a13fcc63e8f409d573e2fee38f1527d9fe40cec798c3618dafa7aa3c67be286cee7f4630bb20c936b98ef7d17a13470bb6f65a433
+MISC metadata.xml 649 BLAKE2B 0b6afdf3bfb6dd4f90fdac5e1dbd2e65224bceed9d59c09ba0fad14153af2e338ba2f8873a58f6423795c07ab1b9a5661a43ad0690682162bfef6f19f344440c SHA512 fec50b992b00ebc91c0662c32861a58d94c643155f082b14141cad0c5a2ce2c615d858adac26b20ce03d0fdeb48dcb5e63fa830856b3105e1ab67fdd3fa835f7
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index ac29cf44513b..40da9319cb51 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+CARGO_OPTIONAL=1
 
-inherit flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs
+inherit cargo flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -21,7 +22,7 @@ HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="selinux test"
+IUSE="+dracut-cpio selinux test"
 RESTRICT="test"
 PROPERTIES="test? ( test_privileged test_network )"
 
@@ -59,6 +60,7 @@ BDEPEND="
 	>=app-text/docbook-xsl-stylesheets-1.75.2
 	>=dev-libs/libxslt-1.1.26
 	virtual/pkgconfig
+	dracut-cpio? ( ${RUST_DEPEND} )
 	test? (
 		net-nds/rpcbind
 		net-fs/nfs-utils
@@ -101,12 +103,17 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch
 )
 
+pkg_setup() {
+	use dracut-cpio && rust_pkg_setup
+}
+
 src_configure() {
 	local myconf=(
 		--prefix="${EPREFIX}/usr"
 		--sysconfdir="${EPREFIX}/etc"
 		--bashcompletiondir="$(get_bashcompdir)"
 		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-dracut-cpio
 	)
 
 	# this emulates what the build system would be doing without us
@@ -115,6 +122,19 @@ src_configure() {
 	tc-export CC PKG_CONFIG
 
 	edo ./configure "${myconf[@]}"
+	if use dracut-cpio; then
+		cargo_gen_config
+		cargo_src_configure
+	fi
+}
+
+src_compile() {
+	default
+	if use dracut-cpio; then
+		pushd src/dracut-cpio >/dev/null || die
+		cargo_src_compile
+		popd >/dev/null || die
+	fi
 }
 
 src_test() {
@@ -140,17 +160,12 @@ src_install() {
 		AUTHORS
 		NEWS.md
 		README.md
-		docs/HACKING.md
-		docs/README.cross
-		docs/README.kernel
-		docs/RELEASE.md
-		docs/SECURITY.md
 	)
-
 	default
-
-	docinto html
-	dodoc dracut.html
+	if use dracut-cpio; then
+		exeinto /usr/lib/dracut
+		doexe "src/dracut-cpio/$(cargo_target_dir)/dracut-cpio"
+	fi
 }
 
 pkg_preinst() {
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
index 2fcbcf06bc84..f1071d29e6e2 100644
--- a/sys-kernel/dracut/metadata.xml
+++ b/sys-kernel/dracut/metadata.xml
@@ -10,9 +10,12 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
+		<email>nowa@gentoo.org</email>
+		<name>Nowa Ammerlaan</name>
 	</maintainer>
+	<use>
+		<flag name="dracut-cpio">Build the enhanced 'dracut-cpio' program</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">dracut-ng/dracut-ng</remote-id>
 	</upstream>
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index cc055ba3311e..e34995c5ce0f 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -7,8 +7,10 @@ AUX linux-firmware-make-amd-ucode-img.bash 2911 BLAKE2B 94586ef124310da2314655eb
 DIST linux-firmware-20240811.tar.xz 379287388 BLAKE2B abcd5eff8e7bd7200079a691e4c09dcc7f349e09eb35c3eae594a7b27eef714767f0eaa92e259b32f4d347f7b6a2ee710332b728546305a01558d732dd947ac6 SHA512 4ea6c24f4bf60eb7ae4cd2993ce4e9dadb03ca7e92f8ccb4778fcebd5c32e16ba8c6095e74b9ed6a111f1b44b983177b52f35a9ad8be7d1dfec2de29a296b8d1
 DIST linux-firmware-20240909.tar.xz 383099276 BLAKE2B 3769ca5501db43a6d1ca54ac11d6857087c51d064ee58f3da543ab713ce8280dbe4206a2d3d00431518e509b260fe9be0f1eb15fe2e737647468f76f2e7282ac SHA512 d1918364f9925291da722075cf2d038082a6b6b5c6d7e5ab8b0888c5e87563718934f493fe172db21608d6eace92ade5c519b5f50b1fc7f25a328e45be059142
 DIST linux-firmware-20241017.tar.xz 397400292 BLAKE2B b158855a61324e3194274b0d6dc146bde2b517915a3f1fe5ddba1cc80fca39d7c0c5058eaaf4189c85cd43f1e432c8ccc9c338fc35cd8289e0d661cc5c321b18 SHA512 2b72f1e7651acc04209ab12841915e1bed5819964d9d31f0be5523ad0ea50b51557687b6005014dff1b1f9caa38038321522b17a5de86ee065961fbb5462b5b6
+DIST linux-firmware-20241110.tar.xz 405593676 BLAKE2B 949fbcc2da08c0cbde6e03613cb820d18c9c2443a8c9769e251958cbc600efa31d8b37d108bd7396c6ea539f972344053f3a3d6ab0f9fd8471f2797b833db765 SHA512 74e5e7ae2fb7af7c69b118ba14dea0ee69d36c3b9a39cf1c87f820410c79af9291b900381eaca6d367caa5207d8cb81ffb88e122a5f68e3fa1f16dbb33d0782e
 EBUILD linux-firmware-20240811-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240909-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20241017-r3.ebuild 11151 BLAKE2B 96164e2955922808133afba98801559a807944f9eec0fce6d0236f2f15f9112d3380464c908776fb8b8d803fcd4e5b6892c180b2aa5f1688d24aa2d4acea59a8 SHA512 cbb8bf436a9e7d0243b8a6463795be66a1bb53f7b7f181a53d329e46695f5a2c8c7ad6448ef6b04484fc262725654257ceb8f9ec186025209b11821084abc625
+EBUILD linux-firmware-20241110.ebuild 11119 BLAKE2B 306400c199f88b33f2cae2f3eda00e0296017e170cb217f7e0f88340d57602cf9ec47219d3fd0cddee114d4db5077f10373c832be5f573b065c4bd72654248b4 SHA512 f438827a9c33ae8a41155c2303a2e4b8add53e673062c2f60dfea4c1db25975a30f9661664111ace0dbf894d1b5231ae44486f0c9b496a94593a8335f4fc138e
 EBUILD linux-firmware-99999999.ebuild 11375 BLAKE2B aa565e1987a561216363d1166c7d41a3a25d714472c82a0d38c95c44db5d6d4deef3d50a45abd38915aa895fc071b54becd178d09dd23a7f2d80b2ed7d3a80e5 SHA512 829fc5efe1107e7090c1d7fc58248886f672a24c15b4e02944a97b6f948bcc69c4defebbaa42a82b283639b7bf942ee5c45315aa3b1190f582ec1ed75726b937
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild
new file mode 100644
index 000000000000..c9b18e4a9008
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild
@@ -0,0 +1,406 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit dist-kernel-utils linux-info mount-boot python-any-r1 savedconfig
+
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=""
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${MY_COMMIT}"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license"
+REQUIRED_USE="initramfs? ( redistributable )
+	?? ( compress-xz compress-zstd )
+	savedconfig? ( !deduplicate )"
+
+RESTRICT="binchecks strip test
+	!bindist? ( bindist )
+	unknown-license? ( bindist )"
+
+BDEPEND="initramfs? ( app-alternatives/cpio )
+	compress-xz? ( app-arch/xz-utils )
+	compress-zstd? ( app-arch/zstd )
+	deduplicate? ( app-misc/rdfind )
+	${PYTHON_DEPS}"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!sys-block/qla-fc-firmware
+			!sys-firmware/raspberrypi-wifi-ucode
+		)
+		unknown-license? (
+			!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]
+		)
+	)
+	dist-kernel? (
+		virtual/dist-kernel
+		initramfs? (
+			app-alternatives/cpio
+		)
+	)
+"
+IDEPEND="
+	dist-kernel? (
+		initramfs? ( sys-kernel/installkernel )
+	)
+"
+
+QA_PREBUILT="*"
+PATCHES=(
+	"${FILESDIR}"/${PN}-copy-firmware-r6.patch
+)
+
+pkg_pretend() {
+	if use initramfs; then
+		if use dist-kernel; then
+			# Check, but don't die because we can fix the problem and then
+			# emerge --config ... to re-run installation.
+			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+		else
+			mount-boot_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use compress-xz || use compress-zstd ; then
+		local CONFIG_CHECK
+
+		if kernel_is -ge 5 19; then
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
+			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
+		else
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
+			if use compress-zstd; then
+				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
+			fi
+		fi
+	fi
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
+			mv ${PN}-*/ ${P} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
+	chmod +x "${T}/make-amd-ucode-img" || die
+
+	if use initramfs && ! use dist-kernel; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			"${T}/make-amd-ucode-img" "${S}" "${S}/amd-ucode" || die
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	# whitelist of misc files
+	local misc_files=(
+		build_packages.py
+		carl9170fw/autogen.sh
+		carl9170fw/genapi.sh
+		contrib/process_linux_firmware.py
+		copy-firmware.sh
+		check_whence.py
+		dedup-firmware.sh
+		LICEN[CS]E.*
+		README.md
+		WHENCE
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	if use !unknown-license; then
+		einfo "Removing files with unknown license ..."
+		rm -v "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		einfo "Removing non-redistributable files ..."
+		local OLDIFS="${IFS}"
+		local IFS=$'\n'
+		set -o pipefail
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' --no-run-if-empty rm -v
+
+		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
+
+		IFS="${OLDIFS}"
+	fi
+
+	restore_config ${PN}.conf
+}
+
+src_install() {
+
+	local FW_OPTIONS=( "-v" )
+	local files_to_keep=
+
+	if use savedconfig; then
+		if [[ -s "${S}/${PN}.conf" ]]; then
+			files_to_keep="${T}/files_to_keep.lst"
+			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
+			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
+			FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" )
+		fi
+	fi
+
+	if use compress-xz; then
+		FW_OPTIONS+=( "--xz" )
+	elif use compress-zstd; then
+		FW_OPTIONS+=( "--zstd" )
+	fi
+	FW_OPTIONS+=( "${ED}/lib/firmware" )
+	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
+	use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; }
+
+	pushd "${ED}/lib/firmware" &>/dev/null || die
+
+	# especially use !redistributable will cause some broken symlinks
+	einfo "Removing broken symlinks ..."
+	find * -xtype l -print -delete || die
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+
+	# sanity check
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	# create config file
+	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
+	find * ! -type d >> "${S}"/${PN}.conf || die
+	save_config "${S}"/${PN}.conf
+
+	popd &>/dev/null || die
+
+	# Instruct Dracut on whether or not we want the microcode in initramfs
+	(
+		insinto /usr/lib/dracut/dracut.conf.d
+		newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)"
+	)
+	if use initramfs; then
+		# Install installkernel/kernel-install hooks for non-dracut initramfs
+		# generators that don't bundled the microcode
+		dobin "${T}/make-amd-ucode-img"
+		(
+			exeinto /usr/lib/kernel/preinst.d
+			doexe "${FILESDIR}/35-amd-microcode.install"
+			exeinto /usr/lib/kernel/install.d
+			doexe "${FILESDIR}/35-amd-microcode-systemd.install"
+		)
+	fi
+
+	if use initramfs && ! use dist-kernel; then
+		insinto /boot
+		doins "${S}"/amd-uc.img
+	fi
+
+	dodoc README.md
+	# some licenses require copyright and permission notice to be included
+	use bindist && dodoc WHENCE LICEN[CS]E.*
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Fix 'symlink is blocked by a directory' Bug #871315
+	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
+		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
+}
+
+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."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	if use initramfs; then
+		if use dist-kernel; then
+			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		else
+			# Don't forget to umount /boot if it was previously mounted by us.
+			mount-boot_pkg_postinst
+		fi
+	fi
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
+	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
+}
diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index c37245e58917..6c6ddefa93d4 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -15,4 +15,4 @@ EBUILD ugrd-1.25.0.ebuild 1892 BLAKE2B 7abbad2995faf4f16f38579cbb00ee8ddf595bfa7
 EBUILD ugrd-1.26.0.ebuild 1892 BLAKE2B 8ad234bc47b5a470fb44c0d4f1e1ffdaf127f1da42de246f5dd903434d49064b9b0467f8e3f10660018d4d5744985263d76bde7b9a633c950d07f61ed272eac2 SHA512 b8d3ccf1de3213cdb4643f0165cd671df423cc227cc80c5e6beb952494cd03d962cb80240b73a55721b73d79517b22c20c31994ddcc851dc970cee2a07b7dee1
 EBUILD ugrd-1.27.1.ebuild 1951 BLAKE2B fcbf8784b95bae64f105adfb6067944e50716004500bff3f18c0e5558dbb4bf1540c2fd340fa04f635df079a5a73b560a41edeba1a3c7fe40b9e165c979fd228 SHA512 2b08ddedd7800e15b3d7501d00d87fc774a7fbba7323e4d8b03cd3a3fe05b3925d5240d2736d72d818b69c72332d75db59efecf80953926175f1efc2d31b8bbf
 EBUILD ugrd-9999.ebuild 1891 BLAKE2B 5a5c09edcc689073fb98137374f7990c70e16bd5dd3e2f1c3fbbdb734fde84ff62d016c6144e941c90f506bafd11680502da93b5cd5a7f63ea9a2edec23792c0 SHA512 229e3512adc73069629feebae1ce9efb1687e8b324812f78f3de704f023c27368caec64d36108591683b61ea35960ac43f0184fa992e0e93be54b96e03527d8c
-MISC metadata.xml 459 BLAKE2B 4b2afaf098699bd77c60b089a853528c9f8c054623c8c317ec99090572dc5d2e686150303fa69b739f0e654e35e6fe2f43f71df8920cfdb83b17393a67425c22 SHA512 78b8572050924ef651f833821bc1b15ce6e989311a30f0970d966fae78287263f14d67db59b4fc93dd0d8d1c07b89b9b05c42f325b61337f497589b769fdf103
+MISC metadata.xml 446 BLAKE2B 5d9a9a8331461be39cff60dd19d13c5bec86a117204bd51e389e05911c599da08532153e8e697f18010ee7c1fd7e54bd57ecfbb2913d30324688c0b97cff6540 SHA512 4e5db18cf4816954ae59a578f33abc88f433d4e3aec22f651aba44b796776ba5531fbd37be88968d8616bea18daa0718da7a183eec1beb028d5ec30d2354ca8a
diff --git a/sys-kernel/ugrd/metadata.xml b/sys-kernel/ugrd/metadata.xml
index 7beddeb5bc2b..9299eb2d63ab 100644
--- a/sys-kernel/ugrd/metadata.xml
+++ b/sys-kernel/ugrd/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Zen</name>
 	</maintainer>
 	<maintainer type="person" proxied="proxy">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
+		<email>nowa@gentoo.org</email>
+		<name>Nowa Ammerlaan</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">desultory/ugrd</remote-id>