gentoo auto-resync : 24:04:2024 - 23:59:27

29 files changed, 970 insertions, 845 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 38820c34aaf2..80e740d2edf1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index f73d0303e65e..50869d0ce3cf 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-4.4.2.tar.bz2 653525 BLAKE2B ae65e310d33c2e523244a32de1ff28081be940a6a2ed2aadf682218ebe7346de3b5f37ab457d4f16542730d617678effbcda461e7080c43cd81c17f6b959018d SHA512 247a1ed0e491e5e02c4bc9a5c2d11d5f1511ef9644b9edf34b1c9326e6515c33dfd60b98bb2dab59eac36ab5e1c9b5ed1e8d7c749261bde90450a2fc717dae6f
 DIST bleachbit-4.6.0.tar.bz2 667238 BLAKE2B c150ef9ff5c5f3d8241c5d8a8b8ad5b3f7a23aef24c21ef67a8680f56f3844893fd0e8513f47936ac3a667a15f0d6df2186658be282846309f3ad79f545a380d SHA512 fd0888195bc1fd6dfdc19ca4b35906554e0b6bf22c7f12db01ff8a5790a8a358aedd39f0c0906eb98e67ea5344c655e7f042516cc0c17b59637463d01927a33a
-EBUILD bleachbit-4.4.2-r1.ebuild 1784 BLAKE2B e2edd231e5559fc48b88eb54a08745ff3fa5c6b42c2ba1d9d7a130ec8c10f2cd55f591c1a72b4094c311a82a0e6a26be5a39799810cb615329fc092901639129 SHA512 e58472a468efd65203197bd87386284f75dcd4476a257fc35c09f27131c39d9d8ed577e6549b753ce837c22074074da56fa32e346cbe15c10e20cb962b4b946f
 EBUILD bleachbit-4.6.0-r1.ebuild 1800 BLAKE2B 94a4f1ab2a7f5cf8c51e13d982ff99c228737495b629a21ffd78e3329888ae156586fc46872099a30f3f1d24ce57630382beee8a50ce789304c50b1b6de77099 SHA512 a028097f8c0eb2e286631b78f7acb817ea2ba2592f971eba30552f020038fb82a16df209d0f0625600211a8d8f9f1d66e0dd0e7e64ce83972f7b9e86e6536410
 MISC metadata.xml 557 BLAKE2B 61de1eec1e533aea9a008403d40069d8e7fb3ca2e1217f1ebf8746adf07725bf82011ee6597961443e6474de9908e3b8a70a6aef42439b4aa62a562212846378 SHA512 dc31e0aa896798f20540c5f7119aa7cf60a8ec5e498d8a7a7baf3d73b5287b03083e33f0816d84467acfc221d8bf0dfdeea59734b3048e4194693d63ec453214
diff --git a/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild b/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild
deleted file mode 100644
index c6b013a117af..000000000000
--- a/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite(+)"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit desktop distutils-r1 virtualx
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	x11-libs/gtk+:3
-"
-BDEPEND="
-	sys-devel/gettext
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]')
-	)
-"
-
-distutils_enable_tests unittest
-
-# tests fail under FEATURES=usersandbox
-RESTRICT="test"
-
-python_prepare_all() {
-	if use test; then
-		# avoid tests requiring internet access
-		rm tests/Test{Chaff,Update}.py || die
-
-		# fails due to non-existent $HOME/.profile
-		rm tests/TestInit.py || die
-
-		# only applicable to Windows installer
-		rm tests/TestNsisUtilities.py || die
-
-		# these fail on upstream Travis CI as well as on Gentoo
-		sed -e "s/test_notify(self)/_&/" \
-			-i tests/TestGUI.py || die
-
-		sed -e "s/test_get_proc_swaps(self)/_&/" \
-			-i tests/TestMemory.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C po local
-}
-
-python_test() {
-	virtx emake tests
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript ${PN}.py ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	emake -C po DESTDIR="${D}" install
-
-	insinto /usr/share/bleachbit/cleaners
-	doins cleaners/*.xml
-
-	insinto /usr/share/bleachbit
-	doins data/app-menu.ui
-
-	doicon ${PN}.png
-	domenu org.${PN}.BleachBit.desktop
-}
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index d826af24022f..13e493dbc8e2 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -2,6 +2,8 @@ AUX dmidecode-3.5-backport-HPE-OEM-record-137-fix.patch 1667 BLAKE2B 4657a4a77b7
 DIST dmidecode-3.5-80de376231e903d2cbea95e51ffea31860502159.patch 1762 BLAKE2B b3b1d4232ab8089cfd405f5bf88a9e5eab7be244b70c3af663b33836c0e2d7c7bc01affa41e826ff0129b66afd6a066f51a722d8a0ab64c42990a1d1440285c4 SHA512 cb7cc66e608bfd67d1db6ba96e887b06c11526956819ea48c378edbb93af139600b41501330ae936bfbe333de461265b51d680170fb044b29d70fedfeb47f52a
 DIST dmidecode-3.5-c76ddda0ba0aa99a55945e3290095c2ec493c892.patch 1933 BLAKE2B e3aff73dc780d3d6b92a9d0de05906a620657664c3b30d40bc10a57e29522e883f671ce7658c0fdea6ee6c2b891639c1639a695f4f2f25dbe091cc93c6951cee SHA512 7caee6762b6676f4e133025cd0e68e7fbd93ae2dea773b2f6180505fda3384f60e0de40ae32322ff50a470b7986dbf6071a86dd770d7bca9df3cc601dbc0e18b
 DIST dmidecode-3.5.tar.xz 65068 BLAKE2B 07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802 SHA512 690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae
+DIST dmidecode-3.6.tar.xz 69284 BLAKE2B 0fd5d1c6f1cef774fe9b31ee36915d9222f568dcff10b416077aff2edd38cc1193cbf28410fcb7377c482bd267b45ee63ddce3d35e7b58dd8674cdf9a19f1b86 SHA512 b1e47a2121062581876ba2daf3ce80b1c39612d078718609b8bc97d4e7a4b47427200502468b5d71f0d0dcb5ba299fb2e808791b62dc5b50e67acac60c51a461
 EBUILD dmidecode-3.5-r2.ebuild 1325 BLAKE2B 1ba8f7f528efc76c33af5b85d5420c778f76d9debe28c988e8469a2f7055cd330062404b6d29047fce008bd2c2b2509ed82210f638827e4487e08f83cfa562a1 SHA512 1b197bbea13a6ad097b48a4d0c873c449b83f10c36028cb08db92bfdccff74c57825cdf958efe59de247c5cf0a11ffc681054b092d366acb899648e7ab87641b
 EBUILD dmidecode-3.5-r3.ebuild 1554 BLAKE2B a6b1432ad14bea83060562685f0ba3b81626bf84778bc7aff94f6ba8c1aebb27058fcff67cd9cb2a491bc97e0f572059be3a613f180ce1b33d3549b89129481e SHA512 c1e5347330de38270c6b394595fbbfe2717427555c00bccbe58346b83b7824699f941810e7a7f822961b6ea454e915efe138c46e2bbc84afe406c6cc4a69294e
+EBUILD dmidecode-3.6.ebuild 1673 BLAKE2B 199f20afaf1caf5d3c98f22a5ca94ee8b8197fcb413bf555021e605bfa6f04825ff8e6213645c3afe76f6118cb869848114e41742b98a9e3b8065196f04060a1 SHA512 d6bb8e622736845c0e83bd1dac9651c07cc5533e134d8232656be7e2f95a9c6a43252c817a0db46ff49bcedb369c35786052cc9d890cc863b779ffaef4e4e954
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/dmidecode/dmidecode-3.6.ebuild b/sys-apps/dmidecode/dmidecode-3.6.ebuild
new file mode 100644
index 000000000000..f28bc89d104e
--- /dev/null
+++ b/sys-apps/dmidecode/dmidecode-3.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream often give "recommended patches" at https://www.nongnu.org/dmidecode/
+# Check regularly after releases!
+inherit bash-completion-r1 flag-o-matic toolchain-funcs
+
+UPSTREAM_PATCH_COMMITS=()
+DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
+HOMEPAGE="https://www.nongnu.org/dmidecode/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+for commit in "${UPSTREAM_PATCH_COMMITS[@]}" ; do
+	SRC_URI+=" https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=${commit} -> ${P}-${commit}.patch"
+	UPSTREAM_PATCHES+=( "${DISTDIR}"/${P}-${commit}.patch )
+done
+unset commit
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${UPSTREAM_PATCHES[@]}"
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^docdir/s:dmidecode:${PF}:" \
+		-e '/^PROGRAMS !=/d' \
+		Makefile || die
+}
+
+src_compile() {
+	append-lfs-flags
+
+	emake \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	einstalldocs
+	emake DESTDIR="${D}" compdir="$(get_bashcompdir)" install
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "dmidecode needs root privileges to read /dev/xsvc"
+		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
+		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
+		einfo "information without requiring root privileges."
+	fi
+}
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 5781d2e48cbf..fa7ec8f75fef 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,11 +1,6 @@
-AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f7023338b0bffe775c61be9f7c253d6d8343833ec64ff86dc3b4733e90e67435e3cc0d52e6ae11c8d368fe2f21b6a85bc59 SHA512 a0e30c2a87775342302fabfd594c91015b6ea9fba71a7d1b294c399a8336167f85b07fdcc2ff80174cc43362ef5ca28965571ca52e1a76922ef59dcb15991664
-AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d
 AUX flashrom-1.3.0-c99.patch 2134 BLAKE2B d1f0216a5281719972208d22ae31ca19fd6e34d10f3e2c9fb9e9633ea04fe989fd9fbe47939b2f1a9a51f99dd7ca450c479ad3abbcda9f61488d3fd8b4ee1209 SHA512 5c1c8a9663f1d584a4a27a8826062127be9ac2737d40a41c90a3e955c293c7151ed6038cbeaf41cdcb5b28ec654024e9d7ec83f7a22a3c7128cf0074b57f1adb
 AUX flashrom-1.3.0_spi-master.patch 9106 BLAKE2B 594a921aa48ceb67a6370080a0b51665efde24844e3523eaa84d69d49a1384272553bd5dae0642dd8540e13ba67e6d8feb2ac6edfc95949bd0edd8a2eaa164c8 SHA512 78d08c853d9dbe75610b5b0ec14df753a0780bf19309c0d9be34ebfdc4c364b8875a183307da6394456becd19b22f8987569feb9c718ca123764539ef0e52444
-DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 DIST flashrom-v1.3.0.tar.bz2 489782 BLAKE2B e6d2284d83171b003b434251f060fa44edf32ecfd3d397bd4ba39b74c6a0b5c9d1659b703dd6b632b63aa4bf27d08c8aeece72920199712c6a4ae160b2eb3a8a SHA512 73b6e00bd3bc66c98d4ad53966a65b19d3d92f07d7b210d69e041d6f5788605b9791a9bf7aec0a52e13d19fcb62c4bdaf4bab9f805fc31468393ca313129a77b
-EBUILD flashrom-1.2-r4.ebuild 3883 BLAKE2B d6db324e8c8aabb66dc112f537817e921a349a19c614abeaa554c6cd0c1cef307a866406a154df36905a97a4323b18cd10735bdabf884c8c25a1721391285a6a SHA512 2d46f9be773ce539b49ea729ba09257395a69f0d259d434032d88e24db1b0ac7ccd16c6e6ecb00c950f8e2e2cc4400eb9f40593c33534aeb06fd80da0c1fc625
-EBUILD flashrom-1.3.0-r1.ebuild 3315 BLAKE2B 9a4456839280dde45b4bca92e0ad9eb5688409aeb051f8d792a29015bcddf6f0a15812f174b1bc1fdb7bc53dbd43540f35a6347d91916ce179685d723bf282d4 SHA512 8ef2aa35d09eda28f4eb7a0554d00e09d9c69dd3a0654c0a199d3a71466e5334f654696703cff80e4719f66927b8ac269347cfb9bf03a0fcd2b61afe1f25e218
-EBUILD flashrom-1.3.0-r2.ebuild 3357 BLAKE2B 3227bc2d4c9823bf50a5a84e25b25a8385f37ca7f8adefe644960c201e6ca7d0cb723fe5083705b4a66796ed31164131f59c0af70d7b146de13674ccc42bc29b SHA512 c8baceb94bc4c5dc499b526a052101a520205e9c59637830d648f803a528765025881778550582380bee10be5d1b7e75719af7edc2b281c51d041b943c91e9b8
-EBUILD flashrom-1.3.0.ebuild 3251 BLAKE2B c16d96aa5e090f965af567dbb0315d7d1b605129bbea1ae418a58ea7f2800bd4e29cbccfab5052375ef6d853c14e16623bb72ddeea5248c47f9329d4c1e6976a SHA512 70a977760e9b6de32c6da7c484b6f68d56b21a41cccb8e6d9c28ad9970303fba54762f0e73fbf3338b04efde56866732a7fceed73bc516a830c5dbd5d9ff9fdb
+EBUILD flashrom-1.3.0-r1.ebuild 3316 BLAKE2B 8bf9cd5852d5802b40da3446b865608f3a33e8e843acdd548ef3d1a9b1b969bad78f81c2321766b631c5c2ce6d03a508b9082622a0d92863587db49a600673e0 SHA512 508611ca0f0d59062db946fb9d3722db241aa81a78922c1a2ac37490e7ff605e480d301577d455ff2cf682f3daa389106020178def57b7bdfcc9f5e71caaa9d3
+EBUILD flashrom-1.3.0-r2.ebuild 3358 BLAKE2B a362efb7b3b7c3977fa2b5eb3b180d60790da3364bf3b9ede5232c09bb752a420c6827806e057700c8616bdb4b0af450478c50e59d37b3ab1be4f75fd0ffc92c SHA512 e536abc35405b26c32cfbc3277217a280ac96a43ee4a4437bef401066916ea907d95576fb909d3a1b83d2c35acabead6d24e84ebe0ff1980a40ecca9140f811a
 MISC metadata.xml 5072 BLAKE2B 5e11d250b2d59b71281ef50bf9cc79c30b2b2000002fae9725f75c73f89d02e297714d23d63dcaa55fb980162e54395b5ec5a528d15ada6c0fe8b6d020e1e3e9 SHA512 bec32f9d6d997e487f2560c89e68c041ae4162a2cc7b80dc38f20e610c300e76e8fa35144c371055f6a4594653c5af4865ba23634be87bd3e36cc8d66069ebc3
diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
deleted file mode 100644
index bb185fae8223..000000000000
--- a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
+++ /dev/null
@@ -1,289 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -2,7 +2,7 @@
-   version : run_command('util/getversion.sh', '-v').stdout().strip(),
-   license : 'GPL-2.0',
-   meson_version : '>=0.47.0',
--  default_options : ['warning_level=2', 'c_std=c99'],
-+  default_options : ['warning_level=2', 'c_std=gnu99'],
- )
- 
- # libtool versioning
-@@ -44,6 +44,7 @@
- config_gfxnvidia = get_option('config_gfxnvidia')
- config_internal = get_option('config_internal')
- config_it8212 = get_option('config_it8212')
-+config_jlink_spi = get_option('config_jlink_spi')
- config_linux_mtd = get_option('config_linux_mtd')
- config_linux_spi = get_option('config_linux_spi')
- config_mstarddc_spi = get_option('config_mstarddc_spi')
-@@ -67,6 +68,10 @@
- deps = []
- srcs = []
- 
-+config_bitbang_spi = false
-+need_libftdi = false
-+need_libpci = false
-+need_libusb = false
- need_raw_access = false
- need_serial = false
- 
-@@ -81,24 +86,24 @@
-   add_project_arguments('-DHAVE_UTSNAME=1', language : 'c')
- endif
- 
--# some programmers require libusb
--if get_option('usb')
--  srcs += 'usbdev.c'
--  deps += dependency('libusb-1.0')
--else
-+if get_option('no_libftdi_programmers')
-+  message('Disabling ALL libftdi-based programmers')
-+  config_ft2232_spi = false
-+  config_usbblaster_spi = false
-+endif
-+
-+if get_option('no_libusb_programmers')
-+  message('Disabling ALL libusb-based programmers')
-   config_ch341a_spi = false
-   config_dediprog = false
--  config_digilent_spi = false
-   config_developerbox_spi = false
-+  config_digilent_spi = false
-   config_pickit2_spi = false
-+  config_stlinkv3_spi = false
- endif
- 
--# some programmers require libpci
--if get_option('pciutils')
--  srcs += 'pcidev.c'
--  deps += dependency('libpci')
--  cargs += '-DNEED_PCI=1'
--else
-+if get_option('no_libpci_programmers')
-+  message('Disabling ALL libpci-based programmers')
-   config_atahpt = false
-   config_atapromise = false
-   config_atavia = false
-@@ -121,14 +126,20 @@
- # set defines for configured programmers
- if config_atahpt
-   srcs += 'atahpt.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_ATAHPT=1'
- endif
- if config_atapromise
-   srcs += 'atapromise.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_ATAPROMISE=1'
- endif
- if config_atavia
-   srcs += 'atavia.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_ATAVIA=1'
- endif
- if config_buspirate_spi
-@@ -138,22 +149,28 @@
- endif
- if config_ch341a_spi
-   srcs += 'ch341a_spi.c'
-+  need_libusb = true
-   cargs += '-DCONFIG_CH341A_SPI=1'
- endif
- if config_dediprog
-   srcs += 'dediprog.c'
-+  need_libusb = true
-   cargs += '-DCONFIG_DEDIPROG=1'
- endif
- if config_developerbox_spi
-   srcs += 'developerbox_spi.c'
-+  need_libusb = true
-   cargs += '-DCONFIG_DEVELOPERBOX_SPI=1'
- endif
- if config_digilent_spi
-   srcs += 'digilent_spi.c'
-+  need_libusb = true
-   cargs += '-DCONFIG_DIGILENT_SPI=1'
- endif
- if config_drkaiser
-   srcs += 'drkaiser.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_DRKAISER=1'
- endif
- if config_dummy
-@@ -162,12 +179,14 @@
- endif
- if config_ft2232_spi
-   srcs += 'ft2232_spi.c'
-+  need_libftdi = true
-   cargs += '-DCONFIG_FT2232_SPI=1'
--  deps += dependency('libftdi1')
-   cargs += '-DHAVE_FT232H=1'
- endif
- if config_gfxnvidia
-   srcs += 'gfxnvidia.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_GFXNVIDIA=1'
- endif
- if config_internal
-@@ -186,6 +205,8 @@
-     srcs += 'sb600spi.c'
-     srcs += 'wbsio_spi.c'
-   endif
-+  need_libpci = true
-+  need_raw_access = true
-   config_bitbang_spi = true
-   cargs += '-DCONFIG_INTERNAL=1'
-   if get_option('config_internal_dmi')
-@@ -195,6 +216,8 @@
- endif
- if config_it8212
-   srcs += 'it8212.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_IT8212=1'
- endif
- if config_linux_mtd
-@@ -211,36 +234,51 @@
- endif
- if config_nic3com
-   srcs += 'nic3com.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_NIC3COM=1'
- endif
- if config_nicintel
-   srcs += 'nicintel.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_NICINTEL=1'
- endif
- if config_nicintel_eeprom
-   srcs += 'nicintel_eeprom.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_NICINTEL_EEPROM=1'
- endif
- if config_nicintel_spi
-   srcs += 'nicintel_spi.c'
-+  need_libpci = true
-+  need_raw_access = true
-   config_bitbang_spi = true
-   cargs += '-DCONFIG_NICINTEL_SPI=1'
- endif
- if config_nicnatsemi
-   srcs += 'nicnatsemi.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_NICNATSEMI=1'
- endif
- if config_nicrealtek
-   srcs += 'nicrealtek.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_NICREALTEK=1'
- endif
- if config_ogp_spi
-   config_bitbang_spi = true
-   srcs += 'ogp_spi.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_OGP_SPI=1'
- endif
- if config_pickit2_spi
-   srcs += 'pickit2_spi.c'
-+  need_libusb = true
-   cargs += '-DCONFIG_PICKIT2_SPI=1'
- endif
- if config_pony_spi
-@@ -252,15 +290,20 @@
- if config_rayer_spi
-   srcs += 'rayer_spi.c'
-   config_bitbang_spi = true
-+  need_libpci = true
-   need_raw_access = true
-   cargs += '-DCONFIG_RAYER_SPI=1'
- endif
- if config_satamv
-   srcs += 'satamv.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_SATAMV=1'
- endif
- if config_satasii
-   srcs += 'satasii.c'
-+  need_libpci = true
-+  need_raw_access = true
-   cargs += '-DCONFIG_SATASII=1'
- endif
- if config_serprog
-@@ -270,12 +313,19 @@
- endif
- if config_usbblaster_spi
-   srcs += 'usbblaster_spi.c'
-+  need_libftdi = true
-   cargs += '-DCONFIG_USBBLASTER_SPI=1'
- endif
- if config_stlinkv3_spi
-   srcs += 'stlinkv3_spi.c'
-+  need_libusb = true
-   cargs += '-DCONFIG_STLINKV3_SPI=1'
- endif
-+if config_jlink_spi
-+  srcs += 'jlink_spi.c'
-+  cargs += '-DCONFIG_JLINK_SPI=1'
-+  deps += dependency('libjaylink')
-+endif
- 
- # bitbanging SPI infrastructure
- if config_bitbang_spi
-@@ -296,6 +346,25 @@
-   srcs += 'serial.c'
- endif
- 
-+# some programmers require libftdi
-+if need_libftdi
-+  deps += dependency('libftdi1')
-+endif
-+
-+# some programmers require libpci
-+if need_libpci
-+  srcs += 'pcidev.c'
-+  deps += dependency('libpci')
-+  cargs += '-DNEED_PCI=1'
-+endif
-+
-+# some programmers require libusb
-+if need_libusb
-+  srcs += 'usbdev.c'
-+  deps += dependency('libusb-1.0')
-+endif
-+
-+
- prefix = get_option('prefix')
- sbindir = join_paths(prefix, get_option('sbindir'))
- libdir = join_paths(prefix, get_option('libdir'))
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,5 +1,6 @@
--option('pciutils', type : 'boolean', value : true, description : 'use pciutils')
--option('usb', type : 'boolean', value : true, description : 'use libusb1')
-+option('no_libftdi_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libftdi')
-+option('no_libpci_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libpci')
-+option('no_libusb_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libusb')
- 
- option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
- option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller')
-@@ -16,6 +17,7 @@
- option('config_internal', type : 'boolean', value : true, description : 'internal/onboard')
- option('config_internal_dmi', type : 'boolean', value : true, description : 'Use internal DMI parser')
- option('config_it8212', type : 'boolean', value : true, description : 'ITE IT8212F PATA')
-+option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible')
- option('config_linux_mtd', type : 'boolean', value : true, description : 'Linux MTD interfaces')
- option('config_linux_spi', type : 'boolean', value : true, description : 'Linux spidev interfaces')
- option('config_mstarddc_spi', type : 'boolean', value : false, description : 'MSTAR DDC support')
diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch
deleted file mode 100644
index 8783cfeefa7e..000000000000
--- a/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-This is essentially the upstream commit 7aea04f7099ad4dde7b1f5900b54ef603eadf25e,
-modified so that MAN_DATE is set to simply '-' - the commit generates
-the date using the script util/getrevision.sh, which is not included in
-release tarballs.
-
---- a/flashrom.8.tmpl
-+++ b/flashrom.8.tmpl
-@@ -40,7 +40,7 @@
- .    \}
- .  \}
- ..
--.TH FLASHROM 8 "" ""
-+.TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@"
- .SH NAME
- flashrom \- detect, read, write, verify and erase flash chips
- .SH SYNOPSIS
---- a/meson.build
-+++ b/meson.build
-@@ -321,6 +321,7 @@ endif
- prefix = get_option('prefix')
- sbindir = join_paths(prefix, get_option('sbindir'))
- libdir = join_paths(prefix, get_option('libdir'))
-+mandir = join_paths(prefix, get_option('mandir'))
- 
- install_headers([
-     'libflashrom.h',
-@@ -394,6 +395,16 @@ pkgg.generate(
-   description : 'library to interact with flashrom',
- )
- 
-+conf.set('VERSION', version)
-+conf.set('MAN_DATE', '-')
-+configure_file(
-+  input : 'flashrom.8.tmpl',
-+  output : 'flashrom.8',
-+  configuration : conf,
-+  install: true,
-+  install_dir: join_paths(mandir, 'man8'),
-+)
-+
- flashrom_dep = declare_dependency(
-   link_with : flashrom,
-   include_directories : include_directories('.'),
diff --git a/sys-apps/flashrom/flashrom-1.2-r4.ebuild b/sys-apps/flashrom/flashrom-1.2-r4.ebuild
deleted file mode 100644
index 2bb0b89fed55..000000000000
--- a/sys-apps/flashrom/flashrom-1.2-r4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
-	inherit git-r3
-else
-	MY_P="${PN}-v${PV}"
-	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/Flashrom"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# The defaults match the upstream meson_options.txt.
-IUSE_PROGRAMMERS="
-	atahpt
-	atapromise
-	+atavia
-	+buspirate-spi
-	+ch341a-spi
-	+dediprog
-	+developerbox-spi
-	+digilent-spi
-	+drkaiser
-	+dummy
-	+ft2232-spi
-	+gfxnvidia
-	+internal
-	+it8212
-	jlink-spi
-	+linux-mtd
-	+linux-spi
-	mstarddc-spi
-	+nic3com
-	+nicintel
-	+nicintel-eeprom
-	+nicintel-spi
-	nicnatsemi
-	+nicrealtek
-	+ogp-spi
-	+pickit2-spi
-	+pony-spi
-	+rayer-spi
-	+satamv
-	+satasii
-	+serprog
-	+stlinkv3-spi
-	+usbblaster-spi
-"
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi tools"
-
-RDEPEND="atahpt? ( sys-apps/pciutils )
-	atapromise? ( sys-apps/pciutils )
-	atavia? ( sys-apps/pciutils )
-	ch341a-spi? ( virtual/libusb:1 )
-	dediprog? ( virtual/libusb:1 )
-	developerbox-spi? ( virtual/libusb:1 )
-	digilent-spi? ( virtual/libusb:1 )
-	drkaiser? ( sys-apps/pciutils )
-	ft2232-spi? ( dev-embedded/libftdi:1= )
-	gfxnvidia? ( sys-apps/pciutils )
-	internal? ( sys-apps/pciutils )
-	it8212? ( sys-apps/pciutils )
-	jlink-spi? ( dev-embedded/libjaylink )
-	nic3com? ( sys-apps/pciutils )
-	nicintel-eeprom? ( sys-apps/pciutils )
-	nicintel-spi? ( sys-apps/pciutils )
-	nicintel? ( sys-apps/pciutils )
-	nicnatsemi? ( sys-apps/pciutils )
-	nicrealtek? ( sys-apps/pciutils )
-	ogp-spi? ( sys-apps/pciutils )
-	pickit2-spi? ( virtual/libusb:1 )
-	rayer-spi? ( sys-apps/pciutils )
-	satamv? ( sys-apps/pciutils )
-	satasii? ( sys-apps/pciutils )
-	stlinkv3-spi? ( virtual/libusb:1 )
-	usbblaster-spi? ( dev-embedded/libftdi:1= )"
-DEPEND="${RDEPEND}
-	sys-apps/diffutils"
-RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
-
-DOCS=( README Documentation/ )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2_meson-fixes.patch
-	"${FILESDIR}"/${PN}-1.2_meson-install-manpage.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use atahpt config_atahpt)
-		$(meson_use atapromise config_atapromise)
-		$(meson_use atavia config_atavia)
-		$(meson_use buspirate-spi config_buspirate_spi)
-		$(meson_use ch341a-spi config_ch341a_spi)
-		$(meson_use dediprog config_dediprog)
-		$(meson_use developerbox-spi config_developerbox_spi)
-		$(meson_use digilent-spi config_digilent_spi)
-		$(meson_use drkaiser config_drkaiser)
-		$(meson_use dummy config_dummy)
-		$(meson_use ft2232-spi config_ft2232_spi)
-		$(meson_use gfxnvidia config_gfxnvidia)
-		$(meson_use internal config_internal)
-		$(meson_use internal-dmi config_internal_dmi)
-		$(meson_use it8212 config_it8212)
-		$(meson_use jlink-spi config_jlink_spi)
-		$(meson_use linux-mtd config_linux_mtd)
-		$(meson_use linux-spi config_linux_spi)
-		$(meson_use mstarddc-spi config_mstarddc_spi)
-		$(meson_use nic3com config_nic3com)
-		$(meson_use nicintel-eeprom config_nicintel_eeprom)
-		$(meson_use nicintel-spi config_nicintel_spi)
-		$(meson_use nicintel config_nicintel)
-		$(meson_use nicnatsemi config_nicnatsemi)
-		$(meson_use nicrealtek config_nicrealtek)
-		$(meson_use ogp-spi config_ogp_spi)
-		$(meson_use pickit2-spi config_pickit2_spi)
-		$(meson_use pony-spi config_pony_spi)
-		$(meson_use rayer-spi config_rayer_spi)
-		$(meson_use satamv config_satamv)
-		$(meson_use satasii config_satasii)
-		$(meson_use stlinkv3-spi config_stlinkv3_spi)
-		$(meson_use serprog config_serprog)
-		$(meson_use usbblaster-spi config_usbblaster_spi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use tools; then
-		dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool
-	fi
-}
diff --git a/sys-apps/flashrom/flashrom-1.3.0-r1.ebuild b/sys-apps/flashrom/flashrom-1.3.0-r1.ebuild
index bf6e187fd824..cbfc2f492f90 100644
--- a/sys-apps/flashrom/flashrom-1.3.0-r1.ebuild
+++ b/sys-apps/flashrom/flashrom-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,15 +6,16 @@ EAPI=8
 inherit meson
 
 MY_P="${PN}-v${PV}"
-SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
-S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
 HOMEPAGE="https://flashrom.org/Flashrom"
+SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
+
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 
 # The defaults should match the upstream "default" flags in meson.build
 IUSE_PROGRAMMERS="
diff --git a/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild b/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild
index 1249ff4ee1a1..1e3b19367f39 100644
--- a/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild
+++ b/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild
@@ -6,15 +6,16 @@ EAPI=8
 inherit meson
 
 MY_P="${PN}-v${PV}"
-SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
 HOMEPAGE="https://flashrom.org/Flashrom"
+SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
+
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 # The defaults should match the upstream "default" flags in meson.build
 IUSE_PROGRAMMERS="
diff --git a/sys-apps/flashrom/flashrom-1.3.0.ebuild b/sys-apps/flashrom/flashrom-1.3.0.ebuild
deleted file mode 100644
index 1281c12fa3c3..000000000000
--- a/sys-apps/flashrom/flashrom-1.3.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-MY_P="${PN}-v${PV}"
-SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/Flashrom"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# The defaults should match the upstream "default" flags in meson.build
-IUSE_PROGRAMMERS="
-	atahpt
-	atapromise
-	+atavia
-	+buspirate-spi
-	+ch341a-spi
-	+dediprog
-	+developerbox-spi
-	+digilent-spi
-	+dirtyjtag-spi
-	+drkaiser
-	+dummy
-	+ft2232-spi
-	+gfxnvidia
-	+internal
-	+it8212
-	jlink-spi
-	+linux-mtd
-	+linux-spi
-	mediatek-i2c-spi
-	mstarddc-spi
-	+nic3com
-	+nicintel
-	+nicintel-eeprom
-	+nicintel-spi
-	nicnatsemi
-	+nicrealtek
-	+ogp-spi
-	parade-lspcon
-	+pickit2-spi
-	+pony-spi
-	+raiden-debug-spi
-	+rayer-spi
-	realtek-mst-i2c-spi
-	+satamv
-	+satasii
-	+serprog
-	+stlinkv3-spi
-	+usbblaster-spi"
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi test tools"
-
-RESTRICT="!test? ( test )"
-
-COMMON="atahpt? ( sys-apps/pciutils )
-	atapromise? ( sys-apps/pciutils )
-	atavia? ( sys-apps/pciutils )
-	ch341a-spi? ( virtual/libusb:1 )
-	dediprog? ( virtual/libusb:1 )
-	developerbox-spi? ( virtual/libusb:1 )
-	digilent-spi? ( virtual/libusb:1 )
-	dirtyjtag-spi? ( virtual/libusb:1 )
-	drkaiser? ( sys-apps/pciutils )
-	ft2232-spi? ( dev-embedded/libftdi:1= )
-	gfxnvidia? ( sys-apps/pciutils )
-	internal? ( sys-apps/pciutils )
-	it8212? ( sys-apps/pciutils )
-	jlink-spi? ( dev-embedded/libjaylink )
-	nic3com? ( sys-apps/pciutils )
-	nicintel? ( sys-apps/pciutils )
-	nicintel-eeprom? ( sys-apps/pciutils )
-	nicintel-spi? ( sys-apps/pciutils )
-	nicnatsemi? ( sys-apps/pciutils )
-	nicrealtek? ( sys-apps/pciutils )
-	ogp-spi? ( sys-apps/pciutils )
-	pickit2-spi? ( virtual/libusb:1 )
-	raiden-debug-spi? ( virtual/libusb:1 )
-	satamv? ( sys-apps/pciutils )
-	satasii? ( sys-apps/pciutils )
-	stlinkv3-spi? ( virtual/libusb:1 )
-	usbblaster-spi? ( dev-embedded/libftdi:1= )"
-RDEPEND="${COMMON}
-	!internal-dmi? ( sys-apps/dmidecode )"
-DEPEND="${COMMON}
-	sys-apps/diffutils
-	linux-mtd? ( sys-kernel/linux-headers )
-	linux-spi? ( sys-kernel/linux-headers )
-	mediatek-i2c-spi? ( sys-kernel/linux-headers )
-	mstarddc-spi? ( sys-kernel/linux-headers )
-	parade-lspcon? ( sys-kernel/linux-headers )
-	realtek-mst-i2c-spi? ( sys-kernel/linux-headers )"
-BDEPEND="test? ( dev-util/cmocka )"
-
-DOCS=( README Documentation/ )
-
-src_configure() {
-	local programmers="$(printf '%s,' $(for flag in ${IUSE_PROGRAMMERS//+/}; do usev ${flag}; done))"
-	programmers="${programmers%,}"
-	programmers="${programmers//-/_}"
-	local emesonargs=(
-		-Dclassic_cli="enabled"
-		-Dprogrammer="${programmers}"
-		$(meson_feature test tests)
-		$(meson_feature tools ich_descriptors_tool)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Upstream requires libflashrom.a to be present at build time because the classic CLI
-	# executable uses internal symbols from that library. Therefore, we let it be built
-	# but keep it out of the installed tree.
-	find "${ED}" -name '*.a' -delete || die
-
-	if use tools; then
-		dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool
-	fi
-}
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index bde242263e6a..1f6c2e4c5f84 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,8 +1,8 @@
 AUX fwupd-efi-1.4-efi_ld_override.patch 1219 BLAKE2B f501bd949a82d28bc9daaef5b62e726e18825a081a584b50358e566b5c3af1eb0eaf409d17d5947b85b4f15098bb5d12025037ddb7a74489b88a945fc8eafbbc SHA512 31f966a7babdaa3a232ca86df065ff8e3724829455a9a3ce733bbd8454bd2f45cd3abf0b2526793a6b20b60ed9fce39f87f3528fd89c8c15093d016b65fb3784
-AUX fwupd-efi-1.4-uefi_210_fixes.patch 3716 BLAKE2B 9399f95f71fa1180509320dce8eaa58c136a9365c5484283cc3e519179894cac146e0efb9929277e20c8c5cfb4d46ae6bad67047cb59726a3f8409d65efd32ee SHA512 0f6ac5eef011b0a839c598bdf4dfd7c338a8069486d7e575c6d0b5196609edb24d6b6d02de27f64d04c2f7096d54ce0c6ef2e4a8d5d2134da6799948e3e4153e
 DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991
 DIST fwupd-efi-1.5.tar.xz 38460 BLAKE2B fe2d06e9d9a588b524a6a26afc401898f8dd1d3bd49fa608cfaa6c32ec71a88f125d2158e3892a44706cc2f8349ed379ee8d7b62bfbe8ba38990d1545eff9f94 SHA512 b1edaa1fa4b7e768ee822c92bdd2858343993f19edde6445e333fad470f997420aeab10dd36e5abff90cb0a87d8f3b2a0de9e7cf49a03758e0e1c9c2fd06ef19
-EBUILD fwupd-efi-1.4-r1.ebuild 1448 BLAKE2B 88e6c9fdd1060bba21925fc1a8a1012cd69c06ab6af1007f653ce3b485d638590cac28232374014a508bc42ba090fb443d67e936d64ecc1f9da281a507a1ab72 SHA512 088e27e071306e7b8e443e2bd1056fa573b1e818e6482b689ae273dcfcac8a6c7fb7f71cff72ab7bd47b0c90269e1ba4494bdc990219bf45eab4e1847029cd7a
+DIST fwupd-efi-1.6.tar.xz 39940 BLAKE2B 906f90a3187fb7d180dab22941d255220e3d56c2058ff6a5a260b0cd62c90e9c784a7c091da376111f23d02561abdec71958afec63c54134a77aac71deec20bc SHA512 37d3c1348bdead620e626a3e602dc6cd774c47d24ca18a3bf6aee071300d658bc4d37e6ec74fcd20f9b345141d69ea3343d44b9408af4759ad65ef10b72ead69
 EBUILD fwupd-efi-1.4.ebuild 1399 BLAKE2B 726e24909760f613d5557fc5503a8658a5828b119173ba587bfb4b30d818991b87870ad5b3459b58d3c889014f6df997adf022d54fbb2296478d35c99cdb0143 SHA512 37343ef8181e59ee67da8f8508c63e601f96695f4bbdd260f2b82587817c2b931de5b8eb54b00183c036f2c3e94205e72881ac2524cb7a0b854c81bd995849bb
 EBUILD fwupd-efi-1.5.ebuild 1245 BLAKE2B 7e51261127cc41b07e83f1dab13e8249d07b360ca2cb82ac0cd90bcb529212c51d7441b0613f8c3a7a85991515e57833adab9687428b646718b40eda4fcf7eaf SHA512 fa3c44b846478c3f920c122fce44acf53b27a53af683deab1632439c9ab5abd76e4e08e88708d99951baae5a085417dba281fa99e00dd96848b8be27bf9fbd8f
+EBUILD fwupd-efi-1.6.ebuild 1332 BLAKE2B b858460e7a267e000e4ed869fc33b29988ff0639ecd31e8162738fb162bb27d239ff0662763078c24eec35825ad603168069d76e8de856b830a5c63de3718ad8 SHA512 cb01e6b66825e83591ff2482ece081c550f2886c4ba46be70933064935357ac04bddb41304ca86d4a303589dd194e482e514a32819d020c67550bff716ef2a9b
 MISC metadata.xml 389 BLAKE2B 130ccd29eddd855aced2084c0d42873449a4a10e3dd65137ce1994669bb65784909ccf004a9aa19b2fc70a49bdfe469977da6acf49b14dd07ed62189a9a34e0c SHA512 843b9301455128a38a366bb5bc2e8b2867664a5a61710f9db4d1ed1fb814203ab8be4bcf64eb339b4af2bd6e5f1522ae61aed38e6f19dbee238a1721c8769a01
diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch
deleted file mode 100644
index d4de5f174857..000000000000
--- a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From bd958f2e8f03a85a7e1fe40a3ca7b78e0b24b79f Mon Sep 17 00:00:00 2001
-From: Callum Farmer <gmbr3@opensuse.org>
-Date: Sat, 11 Feb 2023 15:39:06 +0000
-Subject: [PATCH] UEFI 2.10 fixes
-
-Revert "Align sections to 512 bytes"
-
-This is not permitted according to the Microsoft
-guidelines which require section alignment to be
-the same as the page size of the architecture which
-for all supported archs is the default in Binutils
-
-https://techcommunity.microsoft.com/t5/hardware-dev-center/new-uefi-ca-memory-mitigation-requirements-for-signing/ba-p/3608714
-
-This reverts commit c60c0b8dfda71275ab40bdb316a6ca650c7a8948.
-
-Keep .areloc ARM32 section
-
-This is the psuedo .reloc section but renamed only on ARM32 to avoid
-a bad RELSZ value (gnu-efi 3.0.18+)
-
-Only use 4KiB pages on aarch64
-
-Binutils is currently configured by default
-to use 64KiB pages on aarch64, however this
-is not allowed by the UEFI specification
-
-Check if crt0 contains .note.GNU-stack section
-
-We need the .note.GNU-stack section for NX
-compat. If we don't have a new enough
-gnu-efi, error as the gnu-efi libraries
-themselves must have been built as NX
-for this to work
-
-Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
----
- efi/crt0/meson.build   |  1 +
- efi/generate_binary.py |  4 ++--
- efi/meson.build        | 12 +++++++++++-
- 3 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/efi/crt0/meson.build b/efi/crt0/meson.build
-index f5f45c5..fbd943e 100644
---- a/efi/crt0/meson.build
-+++ b/efi/crt0/meson.build
-@@ -1,3 +1,4 @@
-+arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
- o_crt0 = custom_target('efi_crt0',
-                        input : arch_crt_source,
-                        output : arch_crt,
-diff --git a/efi/generate_binary.py b/efi/generate_binary.py
-index bd2d959..e27f926 100755
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -31,9 +31,9 @@ def _run_objcopy(args):
-         "-j",
-         ".rodata",
-         "-j",
-+        ".areloc",
-+        "-j",
-         ".rel*",
--        "--section-alignment",
--        "512",
-         args.infile,
-         args.outfile,
-     ]
-diff --git a/efi/meson.build b/efi/meson.build
-index 1931855..a476884 100644
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -95,6 +95,11 @@ else
-         coff_header_in_crt0 = false
- endif
- 
-+# For NX compat, we must ensure we have .note.GNU-stack
-+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
-+    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
-+endif
-+
- # older objcopy for Aarch64 and ARM32 are not EFI capable.
- # Use 'binary' instead, and add required symbols manually.
- if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
-@@ -119,7 +124,6 @@ endif
- # is the system crt0 for arm and aarch64 new enough to know about SBAT?
- if objcopy_manualsymbols
-   if get_option('efi_sbat_distro_id') != ''
--    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
-     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
-@@ -187,6 +191,12 @@ efi_ldflags = ['-T',
-                '-L', efi_libdir,
-                join_paths(efi_crtdir, arch_crt)]
- 
-+if host_cpu == 'aarch64'
-+# Don't use 64KiB pages
-+  efi_ldflags += ['-z', 'common-page-size=4096']
-+  efi_ldflags += ['-z', 'max-page-size=4096']
-+endif
-+
- if objcopy_manualsymbols
-   # older objcopy for Aarch64 and ARM32 are not EFI capable.
-   # Use 'binary' instead, and add required symbols manually.
--- 
-2.34.1
-
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild
index 5a890daf01a9..d3b1a784c4aa 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit meson python-any-r1 secureboot toolchain-funcs
+inherit meson python-any-r1 secureboot
 
 DESCRIPTION="EFI executable for fwupd"
 HOMEPAGE="https://fwupd.org"
@@ -15,26 +15,20 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
 else
 	SRC_URI="https://github.com/fwupd/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
+# uswid is used as a CLI tool, hence no Pythonic stuff
 BDEPEND="$(python_gen_any_dep '
 		dev-python/pefile[${PYTHON_USEDEP}]
 	')
+	sys-apps/uswid
 	virtual/pkgconfig"
 
-DEPEND="sys-boot/gnu-efi"
-
-RDEPEND="!<sys-apps/fwupd-1.6.0"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4-efi_ld_override.patch	# Bug #892339
-	"${FILESDIR}"/${PN}-1.4-uefi_210_fixes.patch
-)
+DEPEND=">=sys-boot/gnu-efi-3.0.18"
 
 python_check_deps() {
 	python_has_version "dev-python/pefile[${PYTHON_USEDEP}]"
@@ -53,7 +47,6 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${EPREFIX}"/usr/$(get_libdir)
 		-Defi_sbat_distro_id="gentoo"
 		-Defi_sbat_distro_summary="Gentoo GNU/Linux"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 9c975126066d..ec6f038f112d 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,9 +3,11 @@ AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c61
 DIST fwupd-1.9.10.tar.xz 3901816 BLAKE2B d8a0931188bf494e1b916f5bdebaf290b8e4b81a314e899f7b7e2aeec2dc37240b40c9fbf6259662fd2d92abca477460d630af0d8d95363027aa00ce46021789 SHA512 308bcd3af84d82157492a2ee8dc6fa4d7df6a66cca64e45b3dff9b46d0367f7d3122671388b627f67ab59a69bac1cb36feeccd1668cce0487fe466736dd8b8cc
 DIST fwupd-1.9.14.tar.xz 4367612 BLAKE2B d2e8ef60d751e56279428cd681769b8b6132148d87ad18beb8b355d10d03519da3d520f7f3f5a72b50591957b00176e80a4b26a472ed2305d39986b56adbbbc3 SHA512 582813ce5d61e10d0774195bc0e5abdf0f0ce103417df4a90a0c94ed6c124cd1bcad3118ba6f9f2054b156c0b85fc66edcbcced70dfefe616c2689257e8beeb1
 DIST fwupd-1.9.16.tar.xz 4284796 BLAKE2B 67f83826ed4978324777e737e2751f43454078b7d5e0165993572747c79465f128954c13ea39056483f9916a0b31cfd6800bea49c7bb50844a4df72d63d6ab09 SHA512 e373f17a8d946b07d6f299353949dfc503138c4198a87272018524a39598f3fbd8c381dd13d74469e296a143071cc9e739b3774d9eda8ae9557760fef0a02bb5
+DIST fwupd-1.9.18.tar.xz 4286880 BLAKE2B 7dd1691e2db600085a61a545961730a14d74e3f8b3a66fd90092658e19336a8e11861202db063d64c936cac9ab12ebf7dcdd3a8dcd7ff01b05f0a860d8b4ba68 SHA512 d5e0f3a8c741240f389628e2ed81f1e6ec21689bdcd39f692222114a2d495925a0f0720b10fbb0087362c0b734f4f0abfd8e105eff4695e41e645395e5587a50
 DIST fwupd-1.9.6.tar.xz 3863452 BLAKE2B 8b54efef5947dc4766a24b8501100f7e24707944b5c9aae3c3fcd88dfce230667507af8816203b0ececa0510485661f5f599c1cdc2285df72683ede4b7a6d15c SHA512 c65d795268e0e36fd2572ce3d4f2fb811412c16d583fa5463bee017a70b5d0f8b1b92460efa977a7d70bb5e3f6b5b02756e795e5f8ab7e7ac7874dc1ab5a0bfb
 EBUILD fwupd-1.9.10-r1.ebuild 5373 BLAKE2B a3301281fb1b062cab315cdfd423cb664f244e3788278fb8e16028f7b8e3d81e523194e9e98fab5acd49394dd74716f5a5be3ceefdaab93967697f651f2bd004 SHA512 9406edeee37d71f68a5f2f20886089f09b7636cc14fbb1d1f6cd5ac032ae2c65bd08481beabd0e2d358ef47a6358ece186f4a4335a091a2762ed9ce333b626f2
-EBUILD fwupd-1.9.14.ebuild 5384 BLAKE2B e73525af331457608a02543c2d55b146720317a8b05382f664f55b7be727f4ab1bf33f49cbb2e594ec7353a96337d30de778dab27d7380c0595ccd5ce2c9b2ed SHA512 b9a746d5e8a419b691dcb9c8d7b5b750dc1c9fd43720662b77ce74920f143f20a904896cdbcde6b57775a8afbda918199ebdbec60d86f7a8fa16b3540ad97049
+EBUILD fwupd-1.9.14.ebuild 5381 BLAKE2B 38ada083d022ac68cdaa9c40b04ed6c649f78eebab0253d65ad5e03a1793d06447a3c01ed83a71bb996ecffbceb9c5102ef84a05c1d55d147e135f2aa5ab042f SHA512 72f48d900e3bfadd4b81fd68abf172647c17bf206dba8e8afbd92fc78807793039d9af1c28935522ad2ef85f3b7f18ff5861d6365f37cd57274be6372eff3e6e
 EBUILD fwupd-1.9.16.ebuild 5384 BLAKE2B e73525af331457608a02543c2d55b146720317a8b05382f664f55b7be727f4ab1bf33f49cbb2e594ec7353a96337d30de778dab27d7380c0595ccd5ce2c9b2ed SHA512 b9a746d5e8a419b691dcb9c8d7b5b750dc1c9fd43720662b77ce74920f143f20a904896cdbcde6b57775a8afbda918199ebdbec60d86f7a8fa16b3540ad97049
-EBUILD fwupd-1.9.6.ebuild 5304 BLAKE2B d1977e7923bfc82dceb2ab275578fb9f5ca50c6ec2edea9878911fbd800e855b649ef80ef096f58ca5b566dc2e119f85a7b41e4e1c6eda70c89ee8807ac28e6c SHA512 4805172ff717ce5081fc41078c0d6b27f6cc17cdc93d123ed430d884e071def6762084ec8c52e0eb6550a1f773798b9a5d40db16fc432c60ba2c86cb2216187c
+EBUILD fwupd-1.9.18.ebuild 5384 BLAKE2B e73525af331457608a02543c2d55b146720317a8b05382f664f55b7be727f4ab1bf33f49cbb2e594ec7353a96337d30de778dab27d7380c0595ccd5ce2c9b2ed SHA512 b9a746d5e8a419b691dcb9c8d7b5b750dc1c9fd43720662b77ce74920f143f20a904896cdbcde6b57775a8afbda918199ebdbec60d86f7a8fa16b3540ad97049
+EBUILD fwupd-1.9.6.ebuild 5305 BLAKE2B 1dda8dcbe45c3b6c3ab191485532dfe0f0c83f67a058c7a144291772e136ddb69263585f57a5297b2ae368f64d18d45caeec78cdc7b389cf7c18b580bd49f3a3 SHA512 6f336569962eb59dd83b3f16eb8b4f2885bf8c5452ba4bcc159e233c53f48b90473e7ecb93b8eb919942400d0401182eae8cc3431e8a0130534932553f2d2b60
 MISC metadata.xml 1521 BLAKE2B 61fd8c6cedf39c9289260683fe6d599f78ba3fc679f4540c3cd0aa936dff3374cf81b3d59536dc5898586f9aeb453960ff64d5182361e712caddbca2986d404c SHA512 1d072df281f653f69abec3c78e10eef5300cfe60a41dc9c2d82460a1807fc7990e12a6a97d56aebadb11a4f4e7325824dcab27ffd4b6a52e73374ee99e075551
diff --git a/sys-apps/fwupd/fwupd-1.9.14.ebuild b/sys-apps/fwupd/fwupd-1.9.14.ebuild
index 6553ff479810..d00aca03ce06 100644
--- a/sys-apps/fwupd/fwupd-1.9.14.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86"
 IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
diff --git a/sys-apps/fwupd/fwupd-1.9.18.ebuild b/sys-apps/fwupd/fwupd-1.9.18.ebuild
new file mode 100644
index 000000000000..6553ff479810
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.9.18.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-single-r1 vala udev xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	fastboot? ( gusb )
+	logitech? ( gusb )
+	minimal? ( !introspection )
+	modemmanager? ( gusb )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	test? ( archive gusb )
+	test-full? ( test )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')
+	>=dev-build/meson-0.60.0
+	virtual/pkgconfig
+	gtk-doc? (
+		$(python_gen_cond_dep '
+			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+		')
+		>=dev-util/gi-docgen-2021.1
+	)
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		net-libs/gnutls[tools]
+		test-full? ( dev-util/umockdev )
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/xz-utils
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/json-glib-1.6.0
+	>=dev-libs/libgudev-232:=
+	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.3.6:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-misc/curl-7.62.0
+	archive? ( app-arch/libarchive:= )
+	cbor? ( >=dev-libs/libcbor-0.7.0:= )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( >=net-libs/gnutls-3.6.0 )
+	gusb? ( >=dev-libs/libgusb-0.3.8[introspection?] )
+	logitech? ( dev-libs/protobuf-c:= )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[mbim,qmi] )
+	policykit? ( >=sys-auth/polkit-0.114 )
+	sqlite? ( dev-db/sqlite )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss:= )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+	amdgpu? (
+		sys-kernel/linux-headers
+		x11-libs/libdrm[video_cards_amdgpu]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.6-fragile_tests.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test-full && has sandbox ${FEATURES}; then
+			ewarn "Certain ${PN} tests are fragile with sandboxing enabled,"
+			ewarn "see https://github.com/fwupd/fwupd/issues/1414."
+			ewarn "When in doubt, emerge ${PN} with USE=-test-full."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	vala_setup
+
+	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
+		-i docs/meson.build || die
+
+	python_fix_shebang "${S}"/contrib/*.py
+}
+
+src_configure() {
+	local plugins=(
+		-Dplugin_gpio="enabled"
+		$(meson_feature amdgpu plugin_amdgpu)
+		$(meson_feature amt plugin_intel_me)
+		$(meson_feature fastboot plugin_fastboot)
+		$(meson_feature flashrom plugin_flashrom)
+		$(meson_feature gusb plugin_uf2)
+		$(meson_feature logitech plugin_logitech_bulkcontroller)
+		$(meson_feature modemmanager plugin_modem_manager)
+		$(meson_feature nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_feature synaptics plugin_synaptics_mst)
+		$(meson_feature synaptics plugin_synaptics_rmi)
+		$(meson_feature tpm plugin_tpm)
+		$(meson_feature uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_feature uefi plugin_uefi_pk)
+	)
+	if use ppc64 || use riscv ; then
+		plugins+=( -Dplugin_msr="disabled" )
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="disabled"
+		-Dcurl="enabled"
+		-Defi_binary="false"
+		-Dman="true"
+		-Dsupported_build="enabled"
+		-Dsystemd_unit_user=""
+		-Dudevdir="${EPREFIX}$(get_udevdir)"
+		$(meson_feature archive libarchive)
+		$(meson_use bash-completion bash_completion)
+		$(meson_feature bluetooth bluez)
+		$(meson_feature cbor)
+		$(meson_feature elogind)
+		$(meson_feature gnutls)
+		$(meson_feature gtk-doc docs)
+		$(meson_feature gusb)
+		$(meson_feature lzma)
+		$(meson_feature introspection)
+		$(meson_feature policykit polkit)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test tests)
+		$(meson_use test-full)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_test() {
+	LC_ALL="C" meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+	fi
+
+	if use test; then
+		# Preventing tests from being installed in the first place is a moving target,
+		# just axe them all afterwards.
+		rm -rf \
+			"${ED}"/usr/libexec/installed-tests \
+			"${ED}"/usr/share/fwupd/device-tests \
+			"${ED}"/usr/share/fwupd/host-emulate.d/thinkpad-p1-iommu.json.gz \
+			"${ED}"/usr/share/fwupd/remotes.d/fwupd-tests.conf \
+			"${ED}"/usr/share/installed-tests \
+		|| die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	use minimal || udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use minimal || udev_reload
+}
diff --git a/sys-apps/fwupd/fwupd-1.9.6.ebuild b/sys-apps/fwupd/fwupd-1.9.6.ebuild
index 76c999756943..68f92e672ef7 100644
--- a/sys-apps/fwupd/fwupd-1.9.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
diff --git a/sys-apps/polychromatic/Manifest b/sys-apps/polychromatic/Manifest
index f4d24f87eff8..f4db72040334 100644
--- a/sys-apps/polychromatic/Manifest
+++ b/sys-apps/polychromatic/Manifest
@@ -1,4 +1,6 @@
 DIST polychromatic-0.8.3.tar.gz 1762021 BLAKE2B eb4925fdd5be892c4f490424f357e8d1a2db79ac4bd9b4ae2a6f05662022837ba624d23c373b073de8045207511c50a6f2c4ba6cc4a6f276c2553edcbae25eaf SHA512 e2b26bfda985a2a80373dfa2c10e85a96724eec16c513e825841b7363b692c3edf51fc7ddc0735e28bb1c5074ebd22e9390606d314df35fc61cb185a0fd0acfc
+DIST polychromatic-0.9.0.tar.gz 1776527 BLAKE2B 20129aad108f362d6efff4ad8e4e3b6eeff36eaba9a4fc12c0093dbf9f4ab91b34cc80760f5c19348f16760b2e569cda645a16d0005b1f5f00dcf478c10b16af SHA512 10ea80f09e032c29036702de70d1b1b977cf07d2ae834cdcfd6a16599fa389209b0db695e8b1cd5c40f2ebe4c48ae99aafc5d649c1cf3bffe5382bd471b9c23d
 EBUILD polychromatic-0.8.3-r1.ebuild 1905 BLAKE2B 149506c4c5bcb6df832d39c2dc482328fe1ecadcd38b52119b19ba25149653449beac38e5acee7afab8f9e0f49137184c461d3891e8cd85b6360525b5830985b SHA512 196b59767cae6c8fb8068422eb4929af1f8b2114c04b72b5788494224d3436b48c180f32f964e81a0975e52f18f6a09b0e15540d80bd89097749927afdcf9665
-EBUILD polychromatic-9999.ebuild 1906 BLAKE2B b503e4438618e0bb4bc8f51ed36223b506e4e388f4d3174d3bee44958a2378ea65d1e491581bad9482cdd9acc7afb87a2eab77697027fdc0f28ba0a439cf7c38 SHA512 a004b450d591c9c48c1c6b6fb7b9502909608a978b5bc21034a7bfc5d7537e10cfcb2ca60d175ee9c8446a6673821a24a8f3b9cc40287fa06af3688d8d261b40
+EBUILD polychromatic-0.9.0.ebuild 1912 BLAKE2B f4f767a988f30d9e192b4660913434e1ba1c4e6021af2605f128c931df14512575dba9e7ab1d42f4485fa4f8418932d23a1143558b37c5ca719fda54b2ff2b00 SHA512 4f4001098bff43f5cc9c63672c51c339272ef4e524099f227f8b7438a50cb7c1166b580c1bb96664910406ceb593b3b7c80894fe418624cd76cae41c3f8f4a4a
+EBUILD polychromatic-9999.ebuild 1912 BLAKE2B f4f767a988f30d9e192b4660913434e1ba1c4e6021af2605f128c931df14512575dba9e7ab1d42f4485fa4f8418932d23a1143558b37c5ca719fda54b2ff2b00 SHA512 4f4001098bff43f5cc9c63672c51c339272ef4e524099f227f8b7438a50cb7c1166b580c1bb96664910406ceb593b3b7c80894fe418624cd76cae41c3f8f4a4a
 MISC metadata.xml 993 BLAKE2B 193ed9d7f922efa078e7856084b828ff4f97d8606a1979206b3ff4a36ddcc6ff88a1adc3d0d899261fef5ae5751a1204fb27a03b0a8ff7510578f431a89a0cd2 SHA512 245f395c90cfbe36dae2bc1da5f1c6d2513ebde78a44e7a785a4bb9c01cf24ea0be81405c82eb8f4fbc34d34a4990a36359e98658d1340e47172257a867aa8db
diff --git a/sys-apps/polychromatic/polychromatic-0.9.0.ebuild b/sys-apps/polychromatic/polychromatic-0.9.0.ebuild
new file mode 100644
index 000000000000..19e9c50db521
--- /dev/null
+++ b/sys-apps/polychromatic/polychromatic-0.9.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-single-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="RGB lighting management software for GNU/Linux powered by OpenRazer"
+HOMEPAGE="https://polychromatic.app/
+	https://github.com/polychromatic/polychromatic/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/PyQt6-WebEngine[${PYTHON_USEDEP}]
+		dev-python/PyQt6[svg,${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/colour[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		sys-apps/openrazer[client,${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	dev-lang/sassc
+"
+
+DOC_CONTENTS="To automatically start up Polychromatic on session login copy
+/usr/share/polychromatic/polychromatic-autostart.desktop file into Your user's
+~/.config/autostart/ directory."
+
+src_install() {
+	meson_src_install
+	python_optimize
+	readme.gentoo_create_doc
+
+	python_doscript "${S}"/polychromatic-{cli,controller,helper,tray-applet}
+
+	# Do not force polychromatic to autostart on session login.
+	# Move it into /usr/share/polychromatic and treat it as an example file
+	# that could be installed into user's ~/.config/autostart/ directory.
+	mv "${ED}/etc/xdg/autostart/${PN}-autostart.desktop" \
+	   "${ED}/usr/share/${PN}/${PN}-autostart.desktop" || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/sys-apps/polychromatic/polychromatic-9999.ebuild b/sys-apps/polychromatic/polychromatic-9999.ebuild
index 7baaa20d6a71..19e9c50db521 100644
--- a/sys-apps/polychromatic/polychromatic-9999.ebuild
+++ b/sys-apps/polychromatic/polychromatic-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 readme.gentoo-r1 xdg
 
@@ -11,12 +11,14 @@ DESCRIPTION="RGB lighting management software for GNU/Linux powered by OpenRazer
 HOMEPAGE="https://polychromatic.app/
 	https://github.com/polychromatic/polychromatic/"
 
-if [[ ${PV} == *9999* ]] ; then
+if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
+
 	KEYWORDS="~amd64"
 fi
 
@@ -28,8 +30,8 @@ RDEPEND="
 	${PYTHON_DEPS}
 	>=x11-libs/gtk+-3.20:3[introspection]
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[svg,${PYTHON_USEDEP}]
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/PyQt6-WebEngine[${PYTHON_USEDEP}]
+		dev-python/PyQt6[svg,${PYTHON_USEDEP}]
 		dev-python/colorama[${PYTHON_USEDEP}]
 		dev-python/colour[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]
@@ -59,8 +61,8 @@ src_install() {
 	# Do not force polychromatic to autostart on session login.
 	# Move it into /usr/share/polychromatic and treat it as an example file
 	# that could be installed into user's ~/.config/autostart/ directory.
-	mv "${ED}"/etc/xdg/autostart/${PN}-autostart.desktop \
-	   "${ED}"/usr/share/${PN}/${PN}-autostart.desktop || die
+	mv "${ED}/etc/xdg/autostart/${PN}-autostart.desktop" \
+	   "${ED}/usr/share/${PN}/${PN}-autostart.desktop" || die
 }
 
 pkg_postinst() {
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index 86a69c9972c8..03199420503d 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,3 +1,3 @@
 DIST sdparm-1.12.tgz 486592 BLAKE2B 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6 SHA512 00e2775c290c6db3a02780dd3eefa58ac40e1df79a7f19f80a9d497c019a9a4a9a16fb2726f48e7083d0104a8e74326e683c3f5f44c7d1f591a0f607e10493b1
-EBUILD sdparm-1.12.ebuild 1033 BLAKE2B 0653c563787bd657b60d995118cc33444e89740bd26bb84c716e50abbc4eb8744f49a186ba9fb1633ed6d335785b989f21236417a40237809ce9409db0392bf8 SHA512 c6c4193c0c5b45375c36f21b181821d7a1b84ad8c46a2b074d4802ececa056c3cb50f87ed26b9edc840059fa14e027399e892a5e5829327811e2084416c7f7e3
+EBUILD sdparm-1.12.ebuild 1032 BLAKE2B bae4f0df59cf9b8bedf36070362d22eead45878f310d7a50ae393069b381ca3b3452fd315f8b82b700d6fbb29edb124b049b795caf5b98c241a00d03ab6f23d9 SHA512 ce0be7d769ad36b0e2e8c09492b348cee12eb4ed577b651969a28bfe4e0256285db1272cde98c69e768208a48af99625bb320ed31aebfbf395b9b01c0363a2f1
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/sdparm/sdparm-1.12.ebuild b/sys-apps/sdparm/sdparm-1.12.ebuild
index f867670ecaf9..1a823e0f0ca8 100644
--- a/sys-apps/sdparm/sdparm-1.12.ebuild
+++ b/sys-apps/sdparm/sdparm-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 365fb098f903..ca223f804e25 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -13,10 +13,12 @@ DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4e
 DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
 DIST systemd-stable-255.3.tar.gz 14873273 BLAKE2B e22ef391c691fcf1e765c5112e1a55096d3bba61a9dae3ea1a3958add4e355892a97d5214e63c516ba3b70e2a83bb5d21254812d870f06c16c74a58d4f957d75 SHA512 c2868a53df2176649b0d0c94e5d451c46ba783bcdbc89ce12434ed2d11dba44b4854ffe4c2430f3f64eef2e214cbb51d5f740170afbd9edd66761a8851157453
 DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
+DIST systemd-stable-255.5.tar.gz 14976055 BLAKE2B 08e2d5e6ed340214f195e8ecc22665c572838af94c19f946de7dc710e0f5e0476dda09d313b6848a7f10f6d545b8cd6b1b7ce234b9f4aad1dbff3a065eda6b76 SHA512 9c0b39379e9ef2af983d885ec3cac0377c90435846341bb4e22abf33c00cc1c9f40abba1d6f598300ffac18e2b27bf917eea41885b1413f63cb9902d2efe9bcc
 EBUILD systemd-254.10.ebuild 15359 BLAKE2B 84800757e9794148b127b5fa11a1da271be1a9f99512e7405d12a0870c133f6d16e540d1d40f7a2717935c8677975577c31380e032a127c5a82d5067c23f7d29 SHA512 f2c0e02124b00a0a48bfe5ad14c7ce900a35ea00ee43c826dcca78c1c315a36a3502ead18b7e0e1881c642eafd2c6a5bc97aae72b6380b5fc5bf3cd33a29432e
 EBUILD systemd-254.8-r1.ebuild 15472 BLAKE2B 22b00b6cefce875f30858d26a8b900096a99551dddda2b2a6a9d4461ad6278bf875254d0b83eab8dbc8b68ef3c647ec1a35cb4bec9cf6d9fec6e723b2539eeaa SHA512 f70748a5b0066598e7d87ee3dc21d3b472c51f327249a0629fc77d24156294b74820442f76597fe5d7ce1d823a6680805e9b2d4aea7a9c1ad0719d494c9de27b
 EBUILD systemd-254.9-r1.ebuild 15526 BLAKE2B 8dcef82b133f49b1916c107575b64e695f0aa2e37aeb41adb9f8e5f0dfa5417343dae73df750c752b85830541b0d6eac4979a432fe9b196476e6a176e93077c0 SHA512 35585c7eb25279b5d668db7ed714e81158b3df57385440225d0267a8e8b7f9f479503de18d5fdfe90c5a29f6f528dc476eb270c7fcdfafa30a5beccf6c050694
 EBUILD systemd-255.3-r1.ebuild 14914 BLAKE2B 1166b26b9b4f9149007879f9502f6923459a4eb2faa8474fc23ef66e76b81a6d8541069e3382f26b3fb75043c0cac828223632181f3007f6637ffc41a27cc37b SHA512 61b4888e9d4f208bcbd32da4c6da7b101d5b757518ff22b8013bdfcac055a70b20e43ff5cf6bd2debc14b73e97cebd1e0cc48f17b40639fefe56e4e30154fab5
 EBUILD systemd-255.4.ebuild 14945 BLAKE2B ae7c0fed5dd09f3f4c7c9f4e036f992e166cec40492de2bed88f8c55cdcf1e9b89a0ff63746739f8beb9b86a48918fcf70c0623f52519d25e48bf958f099eb1b SHA512 3fb56e359d4da5826f9bdc33bd2fac0045eecb9b17dcca0d8600712bc01a4275e665e7f9012b433e7e211d2b4ac0638de1bbf77c3135fe078085e4154ea0d64a
+EBUILD systemd-255.5.ebuild 14899 BLAKE2B 821ecbb2502896c89a293c75047b79695281127336c8fde824834ffd6390187ebb9c3563e55ae66868fc9591bb41857c9db0f54db2d086a60ef1c1f9c831de7a SHA512 faa9ea73c23062b2cd3e6ce973495364d9d410de95b2847364009fe441adff098c79cac13abd34bc52aea06a962c72ced44000e40e930470950ecc317beb154c
 EBUILD systemd-9999.ebuild 14899 BLAKE2B 821ecbb2502896c89a293c75047b79695281127336c8fde824834ffd6390187ebb9c3563e55ae66868fc9591bb41857c9db0f54db2d086a60ef1c1f9c831de7a SHA512 faa9ea73c23062b2cd3e6ce973495364d9d410de95b2847364009fe441adff098c79cac13abd34bc52aea06a962c72ced44000e40e930470950ecc317beb154c
 MISC metadata.xml 2609 BLAKE2B 8947f3b696fbba7b90e838a54fbb4fd933c71907c8011652fc2b7d68d4ce5f78a19f350a309e4c0f66ef0159376c9064ba9c15941ecf1748c359c4ae3b072102 SHA512 dfeea24b7a93f5d4af4ac47b87ba08092d069fb1a4749c0c1f36a669be6115eaea8f67e6183b6a4f155ef90d7714f74299109420d569c2b0545d80584ed0e97e
diff --git a/sys-apps/systemd/systemd-255.5.ebuild b/sys-apps/systemd/systemd-255.5.ebuild
new file mode 100644
index 000000000000..9ebc6c14fa23
--- /dev/null
+++ b/sys-apps/systemd/systemd-255.5.ebuild
@@ -0,0 +1,529 @@
+# Copyright 2011-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dns-over-tls? ( || ( gnutls openssl ) )
+	fido2? ( cryptsetup openssl )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+	boot? ( kernel-install )
+	ukify? ( boot )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.32:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( >=sys-libs/libapparmor-2.13:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( >=net-misc/curl-7.32.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.3:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( >=dev-libs/libpwquality-1.4.1:0= )
+	qrcode? ( >=media-gfx/qrencode-3:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( >=sys-libs/libselinux-2.1.9:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-build/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep "
+		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+		ukify? ( test? ( ${PEFILE_DEPEND} ) )
+	")
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if use split-usr; then
+		eerror "Please complete the migration to merged-usr."
+		eerror "https://wiki.gentoo.org/wiki/Merge-usr"
+		die "systemd no longer supports split-usr"
+	fi
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use boot && secureboot_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/systemd-test-process-util.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Dsplit-bin=false
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Match /etc/shells, bug 919749
+		-Ddebug-shell="${EPREFIX}/bin/sh"
+		-Ddefault-user-shell="${EPREFIX}/bin/bash"
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnutls)
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use test tests)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool ukify)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+		$(meson_native_enabled vmspawn)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	(
+		unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+		export COLUMNS=80
+		addpredict /dev
+		addpredict /proc
+		addpredict /run
+		addpredict /sys/fs/cgroup
+		meson_src_test
+	) || die
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/legacy.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}"/usr/bin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}"/usr/bin/{halt,init,poweroff,reboot,shutdown} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir /usr/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use kernel-install; then
+		# Dummy config, remove to make room for sys-kernel/installkernel
+		rm "${ED}/usr/lib/kernel/install.conf" || die
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/sysctl.conf ]]; then
+		# Symlink /etc/sysctl.conf for easy migration.
+		dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+	fi
+
+	if ! use boot && has_version "sys-apps/systemd[gnuefi(-)]"; then
+		ewarn "The 'gnuefi' USE flag has been renamed to 'boot'."
+		ewarn "Make sure to enable the 'boot' USE flag if you use systemd-boot."
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager (systemd)"
+		systemctl daemon-reexec
+		eend $? || FAIL=1
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if use boot; then
+		optfeature "installing kernels in systemd-boot's native layout and update loader entries" \
+			"sys-kernel/installkernel[systemd-boot]"
+	fi
+	if use ukify; then
+		optfeature "generating unified kernel image on each kernel installation" \
+			"sys-kernel/installkernel[ukify]"
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/uswid/Manifest b/sys-apps/uswid/Manifest
new file mode 100644
index 000000000000..2f3603e1d21f
--- /dev/null
+++ b/sys-apps/uswid/Manifest
@@ -0,0 +1,3 @@
+DIST uswid-0.4.7.tar.gz 43719 BLAKE2B c99ea760658a5b5f518e6e8aa554515bc0a5246d60c358b6542dda17489fe18f06b2dff7342371944fe36c44562f9e78feb230f6573445c4004568c973b66b87 SHA512 6e8069547efbc06ee5e2792908a292e70612041f303b41d54fc618519f3156a8c88ca9176367c47304dbe80b0199467b913060c8fdbcef1287794cac0a9e695c
+EBUILD uswid-0.4.7.ebuild 664 BLAKE2B 3c09ff6b7df0e84f8479751e0d6c46b4a2887d6e77fae853b01f66d7b046c1be1923f57d5a6ee26ea4d87470e79bae1f8448de9d7f3b947253032bb1398053df SHA512 8888830573aefe7e6922e19552ccb445864bc25205472238d6c2417a0db30e8127035ab4aa57bee321cbfb146fe3d678be94fd2ab3fd8f11c47ebb763e5dd2b7
+MISC metadata.xml 946 BLAKE2B 6aec42fb59ffbbcbff4d2a68861bd93b9625c0230aeb689605f1ee132301558f37ce3f37eaa76650a55436f37b64d10c179b5aa53bc3e259006b6c754b80b008 SHA512 a78e1066ccbcf102725849720da52cec75c434dfca180282126b58dcddac4ed98bfc1d0418495758f7aa0399a5a7c4b72daefe6327488a6fe023ca4bc45964a9
diff --git a/sys-apps/uswid/metadata.xml b/sys-apps/uswid/metadata.xml
new file mode 100644
index 000000000000..36b5e41b4afc
--- /dev/null
+++ b/sys-apps/uswid/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		Using the uSWID tool or Python API allows one to create, convert and merge
+		Software Bill of Materials (SBoM) metadata to and from a number of different
+		formats including SWID, coSWID, CycloneDX, SPDX and goSWID. It can also import
+		SBoM metadata from .ini files, pkgconfig files, PE binaries including EFI ones,
+		and various unspecified firmware files as long as they include the coSWID SBoM
+		header. Last but not least, it can be used to embed coSWID SBoM metadata
+		into PE/EFI binaries.
+	</longdescription>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">uswid</remote-id>
+		<remote-id type="github">hughsie/python-uswid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/uswid/uswid-0.4.7.ebuild b/sys-apps/uswid/uswid-0.4.7.ebuild
new file mode 100644
index 000000000000..b70a42cc1ef2
--- /dev/null
+++ b/sys-apps/uswid/uswid-0.4.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure-Python library and CLI tool for processing SBoM metadata"
+HOMEPAGE="
+	https://github.com/hughsie/python-uswid/
+	https://pypi.org/project/uswid/
+"
+
+# Reminder: relicensed to BSD-2-with-patent between 0.4.7 and 0.5.0
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cbor2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pefile[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest