gentoo auto-resync : 09:10:2024 - 04:26:32

17 files changed, 672 insertions, 12 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 14446fba2524..26c6292a7ec7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpu-x/Manifest b/sys-apps/cpu-x/Manifest
index 131adc68dbc3..2dbc811fe6f2 100644
--- a/sys-apps/cpu-x/Manifest
+++ b/sys-apps/cpu-x/Manifest
@@ -1,7 +1,9 @@
 DIST cpu-x-5.0.2.tar.gz 1975214 BLAKE2B 2b4cccdf96cc789a6c7b8a9e8124b380de681adabcd55cda05b5f0b97661a68feab9a434c1bcb8e092c529502d3472fd7385a7fbe5339fb93f4808ba2546b92d SHA512 3677207af8ea233a5bc1e435f501f4dffbe555486b048f5b51ac818cb458d52ab7ac94830ab83e992772e339de93464b3d4cd92798b8f49a272fd5292484de7e
 DIST cpu-x-5.0.3.tar.gz 1988476 BLAKE2B f1f693d6c7df5f8f342ac8326539febcc95df1ccd154cb013b215ea50d9f8bec70e894d7cbf76f08d454c73a8a2e450296144e9c6af4ed92a07b95df6c705901 SHA512 d9a29a5303101a6c00d9145265d85acec865833f175246bde550ba2dff24a924c1b2de7579b3d8e20aa163092d269af9bbb24e073585d3e18a2c726e48d9be41
 DIST cpu-x-5.0.4.tar.gz 1995465 BLAKE2B 6e3982040400a2bbdb7fba0cac24f1b183792693fff13fd223d1194a5bc57acd9b0dde407016f4f0039705759f0e57da472dc634a237e9d89c7c7d23e9cfa6b9 SHA512 134f8a8fe6782279f7288d891a66b3d426b0e173de3d5445367c94029aa9d33348d037f5bca25690aff16f00d261777a71de6847991e564578099b03ff398453
+DIST cpu-x-5.1.0.tar.gz 2705947 BLAKE2B 8f5989170ebba7b943bc4bf5d3550ff2a7f9d527305d2ee4ad9ffa39cebcf089098b6ed0340c001d0926d0a093fd559273b3b61b404cc21ece3aea937097c1f5 SHA512 7f0ce6123cdd957663aa1012194cee12a09cdd3a44b0bcdfecad36315a3b1c1e5e6461ffa0d9613c0ff275332d4aae0499f8687d1acbcd921703971508819ed6
 EBUILD cpu-x-5.0.2.ebuild 1823 BLAKE2B b8e7318b93a8603b5d0de8978de442ebda77878f84af965e541c9e5035cb1ccf4fcd9ddd5d3de80c0a84a865b2801c62d07ed356d97011ae00f8e88b98b03381 SHA512 6bddd67ef011623b156fbf44b41a13385675bd0b27b23962390d8d84bd17dabdfcd6abecb9a2e184fca9c1826ea51b0e82458ad13f433ee44dfbd5dd83764912
 EBUILD cpu-x-5.0.3.ebuild 1823 BLAKE2B f3070e76ea40d66d01aad73e5728141a15856587e8bd1df07e7140708cc0f89aa3614090dd2f6afa7926af0c78f87327dd32a41fccd2374e819059e965adeaeb SHA512 3a04877974eff90a711fefb3531c39e213bdd71e6cf72a3074ba208bab85304bf8629a995464e5af0f7ccd2bc8a6ba0c2426293e522e14acb047e6d15a52b031
 EBUILD cpu-x-5.0.4.ebuild 1823 BLAKE2B f3070e76ea40d66d01aad73e5728141a15856587e8bd1df07e7140708cc0f89aa3614090dd2f6afa7926af0c78f87327dd32a41fccd2374e819059e965adeaeb SHA512 3a04877974eff90a711fefb3531c39e213bdd71e6cf72a3074ba208bab85304bf8629a995464e5af0f7ccd2bc8a6ba0c2426293e522e14acb047e6d15a52b031
+EBUILD cpu-x-5.1.0.ebuild 1823 BLAKE2B ec3fa60b5b921bbcd3e4669cd5d9ab32a335769e0aee085ef5450adc55d08a3d93d94404c49c8e2fb0223b9f5447f76e8c33e642f70174514cc76684113c7903 SHA512 54d8192a9c865a9a9088c7e253bd373f9c85ce486ead9fe8875ec4342115d28719e638be3bca3e0eded8f9bdea07653315a5c30e2bc1d6a1e1e154a7e2fa9c5d
 MISC metadata.xml 2357 BLAKE2B 2d91edba3359636e90930e62986ef801b99352a2df1891dfd9acd810290d38f8df9050e043482631d024da81929d01ab818f4b862b5ccedb1daf762382b3febd SHA512 0b168263a7d6e9e97bd2138edde5e4957e1cc04a50dc5b4043dfdd20ff37d8798074bd3430c396fc784c55ffa015e95a0d2f49de553cfbad462acb0601f0cc0f
diff --git a/sys-apps/cpu-x/cpu-x-5.1.0.ebuild b/sys-apps/cpu-x/cpu-x-5.1.0.ebuild
new file mode 100644
index 000000000000..34fdbb46bef2
--- /dev/null
+++ b/sys-apps/cpu-x/cpu-x-5.1.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="CPU-X"
+
+inherit cmake gnome2-utils xdg
+
+DESCRIPTION="A Free software that gathers information on CPU, motherboard and more"
+HOMEPAGE="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
+SRC_URI="https://github.com/TheTumultuousUnicornOfDarkness/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+cpu force-libstatgrab +gpu gui +ncurses +nls opencl +pci test vulkan"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	force-libstatgrab? ( sys-libs/libstatgrab )
+	!force-libstatgrab? ( sys-process/procps:= )
+	gui? ( dev-cpp/gtkmm:3.0
+		>=x11-libs/gtk+-3.12:3 )
+	cpu? ( >=dev-libs/libcpuid-0.7.0:= )
+	gpu? ( >=media-libs/glfw-3.3
+		media-libs/libglvnd )
+	pci? ( sys-apps/pciutils )
+	ncurses? ( sys-libs/ncurses:=[tinfo] )
+	opencl? ( virtual/opencl )
+	vulkan? ( media-libs/vulkan-loader
+		>=dev-util/vulkan-headers-1.3.151 )
+"
+
+DEPEND="
+	test? (
+		sys-apps/grep[pcre]
+		sys-apps/mawk
+		sys-apps/nawk
+	)
+
+	${COMMON_DEPEND}
+"
+
+BDEPEND="
+	dev-lang/nasm
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFORCE_LIBSTATGRAB=$(usex force-libstatgrab)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_GTK=$(usex gui)
+		-DWITH_LIBCPUID=$(usex cpu)
+		-DWITH_LIBGLFW=$(usex gpu)
+		-DWITH_LIBPCI=$(usex pci)
+		-DWITH_LIBSTATGRAB=OFF
+		-DWITH_NCURSES=$(usex ncurses)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_VULKAN=$(usex vulkan)
+	)
+	use gui && mycmakeargs+=( -DGSETTINGS_COMPILE=OFF )
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 3120a6f56c4e..4c064172ee6c 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,6 +3,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24
 DIST kmod-33.tar.xz 514428 BLAKE2B 5fb4ea9d96217f8c94cba752b07a1b53228c6ae79dbaa605030cd84e3c6ca8d9c1a703a0253cea1d6c78a78f1507e2a1d9c6215d28dcb01b9e7f8b98a9fde425 SHA512 32d79d0bb7e89012f18458d4e88325f8e19a7dba6e1d5cff01aec3e618d1757b0f7c119735bf38d02e0d056a14273fd7522fca7c61a4d12a3ea5854bb662fff8
 EBUILD kmod-32-r2.ebuild 3950 BLAKE2B e03748b29007b8bdb0aa03587f5193a475d06a60e5e1b86d2d7e34a579ea8355de328a410939877dcd6635c66657e623d0ea840b0fc9f1aac98c944fa150e3fd SHA512 9118b0cdbb93cef9af9022b42ed71a2642b7c09a7db7692a4b825e21880fec4dd8ab3824f480eeee4db9e5e6826cff293609429f3a668552d777d61c92d1877f
-EBUILD kmod-33.ebuild 4269 BLAKE2B 2ab526fa5b275002a3e327cf408b68753f44f4d2dcecdf9e8a86ff79bab646363c7d60da6668eeba5ed5b81678953fc27ba888ac386b1b9eb59b63e68a7329d4 SHA512 6d9b26b988bcba3a329c3660e8f67c4fa9a0e21f8de6cbe3b780da75fe326e858f6de5085c839e36dda60c35cb4471d11e4217dbd3d86716abc0c9fde0e98045
+EBUILD kmod-33.ebuild 4268 BLAKE2B 5830018151b2d1bb33a77897745bfe6bfe79b7abc7fa28a1e16b115a6646ffcd70a416467879d110b9dfd8525a9f36a63cb0293b864808b3a8fff09836ee5ba5 SHA512 c087784925dfe0d9411f581b20d1f1570270a37d74be1ffc516899fa88320a9fb5e60f387771b1dfd76a2c10b7f518ed3a2336c78a96a2f4f0104af1d344a87e
 EBUILD kmod-9999.ebuild 4273 BLAKE2B cb91951eb3ab13904b1349432ce9260106bd19af975283f3d7502939f6d0dbfc355f2c15c4d99d81d367266f8d22f00b2528c74858a110df464ff03baf7d7fdc SHA512 5a36d94341addf334b1f6a4b34838348c9415cadb9221d89a18cdeb027b8354b335c1c72369d6f48a9bf3ccae17e09e0644cbbba3cb29696337b205dd4e54e06
 MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3
diff --git a/sys-apps/kmod/kmod-33.ebuild b/sys-apps/kmod/kmod-33.ebuild
index 7a9b69dd31e6..eae4e008977f 100644
--- a/sys-apps/kmod/kmod-33.ebuild
+++ b/sys-apps/kmod/kmod-33.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index f2d7d36cb593..cf9cecbf5e46 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -5,7 +5,7 @@ DIST logwatch-7.10.tar.gz 511766 BLAKE2B 66d7cb09f4c73ca55a3bad9eb2e9a46eabdc0da
 DIST logwatch-7.11.tar.gz 513041 BLAKE2B 074b9b1d58bd199c82edc6fb40703b71f9488966e2acb8afc015fde93806740d11a3c8705303139716bbc50c353f3e8c3f4c0e9cf1d5f870cbb8599fbdd526d1 SHA512 1af075ad2459fade202396af5fa50b705b4635b71b5fc3be832df80c491baa1dd726b3023f84ecbb621e0e19004a0f8cdb017e657c4511bcd4cbd3205177ce22
 DIST logwatch-7.9.tar.gz 501086 BLAKE2B ebfc65c88036244840fe4fbf42c0bea668cac3063771f0042827a2f583d654403b75bdfa428f50a7fdac5f0098ec08ef5a27006db7f7576b361653594462d607 SHA512 d091fbbeb0cac4b661fb066118fd384dbdeabe137c699ea6892d53567a45978c0742b1be9cf2f8b8c2e522314351ee6c2e3710ac2e61bbf1a3c8d63f78a3646f
 EBUILD logwatch-7.10.ebuild 2497 BLAKE2B acebe4f6d92304edffc1b569ec8c3b168beffb3f0c1e1332c9605ef553e099ecc222655f323cbed250d7417528a2ae05641e0a369fe64aa0a56d729b76e9d115 SHA512 eb0c9f9177d40ca3ad4565d30b95c167cec6ce7e0669427cee18d8ee69d386fde7a8f2f6a9869a91ee48d5f16af41dd15f16b82cac3c4e44cd6606c74f5ebca9
-EBUILD logwatch-7.11.ebuild 2546 BLAKE2B 06f0b0b2314c5b8bfd70c985b0e3c0eb376d591df806ea31dd997415281de4312667194de7ef943bbadb61007697de84e9d2e1965f1ae8cb67048abed7fdcb47 SHA512 106d8bd8ecfcf6f22d3a7ae4591668b3498a19e71d896f4bbb1debd06d163f79a5b16bf030a237418b1f413aefc9fd503b85799caa4f1f1204e31e25d74f5a68
+EBUILD logwatch-7.11.ebuild 2545 BLAKE2B 4e9e2c74700330abe6e195092364f434607cb4d0d206cbd5e05e7c46ea130800c12e46fa7ed8f8b3e5805344a9d9da545b6329b9a6387fdf9422740ab0476020 SHA512 4fc7db4f6bf499fbae6a6a18d9f5b822ea1da32c7c9ce8eb86919f7e0f9beb2380ebfe135dc08bb13234dc53c72c752cdc4d7ac19c5d58599477cb9f07473d6e
 EBUILD logwatch-7.9.ebuild 2497 BLAKE2B acebe4f6d92304edffc1b569ec8c3b168beffb3f0c1e1332c9605ef553e099ecc222655f323cbed250d7417528a2ae05641e0a369fe64aa0a56d729b76e9d115 SHA512 eb0c9f9177d40ca3ad4565d30b95c167cec6ce7e0669427cee18d8ee69d386fde7a8f2f6a9869a91ee48d5f16af41dd15f16b82cac3c4e44cd6606c74f5ebca9
 EBUILD logwatch-9999.ebuild 2499 BLAKE2B 0286401822c73b2ad3557db063bb0d97a913b111c5983b5e83051433874546c44abe0857d0e3d64068f15a70b660296cdb523b5fd6fb3a634e7f9869e863b7cb SHA512 3a972e6717453956a979ae5f6d40d8161d433efe9dae4a3065b79f3053ca90c6d1920be100d928ef00cd67d3b07d50252fdbec86f064833900fc12738b19fdc7
 MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a
diff --git a/sys-apps/logwatch/logwatch-7.11.ebuild b/sys-apps/logwatch/logwatch-7.11.ebuild
index b1031394b749..ab9241a33e8d 100644
--- a/sys-apps/logwatch/logwatch-7.11.ebuild
+++ b/sys-apps/logwatch/logwatch-7.11.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index efc686f77a51..ec00c0b3e0fc 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -7,6 +7,6 @@ DIST man-db-2.13.0.tar.xz 2071032 BLAKE2B 7ce91a7abc6d3bbd92d4707f13caacd8ab5cae
 EBUILD man-db-2.11.2.ebuild 5080 BLAKE2B dd2113d2f22eca247879850d7f9bb0f3b6884b2f5a284fbc530d91b4e849bb850311ba7a3a43d195c195e0ab1d1236740f8e854bc78b5ddd2c41315e6d16710e SHA512 8c7248e6cb6e2bbc5fc265257805676753db41e930d46ee5992ebf496578b629308777f860d1b1b0baf60c8d02008334d5e6ebf658fd05d219ddd700b7fa1753
 EBUILD man-db-2.12.0.ebuild 5145 BLAKE2B 7dab620913a3d7b72d7ad9500c0710e18a547df57c139186b5a56f60f74115d5efc1d6d3bdff46dba382dfcd783676274f1e51d945d0343d30fc3c5e2b08993a SHA512 56f80c5238155e0003063fa623a07ab90d76acd0033fbf29268f12d711199143ecf8990e02da8f580bf32a83150ee9ce36eead0081c2221d4dea0bf26f07c639
 EBUILD man-db-2.12.1.ebuild 5228 BLAKE2B 8093da7aa13374fee25b33f7dee27305744a06c466d19f814b8feddad9fd361a0166a4090f5b785bdde56d7e37507ea72f80ee3e71df69cf25f24d6b3b607571 SHA512 87add84e689c08e3c2ce857a383cfc88f2ce5f79ea6a6a87377eb25f2ebbf748d83bcae902fc8b06511fcfd2f968e98443f8b5e401fa742b04f2b5cfdabc2c93
-EBUILD man-db-2.13.0.ebuild 5248 BLAKE2B 7224eaa57a2f973b1831840943774cf0d83d81e7b8bfcb69938469f651a2cab05c22c36cebf0e27fc1c03b8f2741d2b951db4f29842f142e934e984c520f96f6 SHA512 14cf158a746d27ff09832223d1281bc7e5b76920fd995756bafa915a617497260abacac1a94aedda836615e5a36aafc502e9505d9661db08b977a37cadc10aec
+EBUILD man-db-2.13.0.ebuild 5247 BLAKE2B 6ec947fe78f7d4bba736851f787932f22b489233859418204108c5519380b648496a52337015ea052474ce2140819e035cbbf5d2954eb0c9f9d2424142f4b651 SHA512 75db15428ed9dfbae2a11ba18a8710a79cac363f08784d1c20b9b9f8e8a98078664632dce0bbae235baa02cdf3ce9c5cdc869d7943edb2de69630c659d1fe232
 EBUILD man-db-9999.ebuild 5236 BLAKE2B 27f6f1c1661d6d6fe59bcb7fb7f6eab680630ee745fcb7c95673b056ea16bcbbd500ceda2d6bfad1de63c2879aab912600881a9d2ba0f4ac4e7ebb02001ff75f SHA512 bcb6d7f3c64e3f9e3db4a5957e77cdd6d4b25a64279f6d5a86e7f80ee3a6446d307c236e9864e7984d497f4fe4c6e27675d72b40d5babc3baca0c96958d52779
 MISC metadata.xml 493 BLAKE2B 33282cbeba0e727dbe080ce8dab8b903590f4139d346e260d950d531fadee3c9a36451b8ec37564b313c8c2fa3ce0accf41cb632db2b2f709287fae4c57bcfd5 SHA512 2ac84cdda859f02a19005ca0cc43b84160171f9080a100491cef5451d0ba3f6d38cdbfb4da35bf38b1942f14eae8ea705774820c2c7a0cd86d4bc9540c9c5490
diff --git a/sys-apps/man-db/man-db-2.13.0.ebuild b/sys-apps/man-db/man-db-2.13.0.ebuild
index e441afb3ee1f..0c4eb96cdf15 100644
--- a/sys-apps/man-db/man-db-2.13.0.ebuild
+++ b/sys-apps/man-db/man-db-2.13.0.ebuild
@@ -14,7 +14,7 @@ else
 	inherit libtool
 	# TODO: Change tarballs to gitlab too...?
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 8acf6e15b86f..ca95a5834531 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -15,6 +15,6 @@ EBUILD mawk-1.3.4_p20231126.ebuild 1292 BLAKE2B 4dd35ea625d13e2bb21eed8a9ddffcde
 EBUILD mawk-1.3.4_p20240123.ebuild 1292 BLAKE2B 5eee6c13ced45b7d9a9d1262843304a9ce56b68532b33f795ff0bce98ff4cd246741683b89f0174d577027847ad8a8531301c4f60c32c4e8e153ad6924bf08a3 SHA512 0a4364d54585eef2b1a23b23678f7f93298b07426b81af065fbf2c63dba55ad421085ab01991337b383bd57c5c76a7095118331d7192c43ede1251ee15c25ef2
 EBUILD mawk-1.3.4_p20240622.ebuild 1300 BLAKE2B 3efdcb2f4c2c24c069e74e1241b0c47dd1317e6b8bc137b41168e9ee5366e133009e36906b36be15943ade8f21db935a0e8a22c924389bd50052dc194da6042d SHA512 110b5b5f41327d02a9107a2d5598fc008ce8cd63908e3effecdc1df43920d9cf6181064d10581e2b2959e420c1265fadcacc68d5dc95767c04fb9bb97d475127
 EBUILD mawk-1.3.4_p20240819.ebuild 1362 BLAKE2B a4a193890918d6bf951765d60fef1a214f6a1afb7f1b577badf2f17878c51b219b8afdbe381941e8404ab699d4ccc249cb0d982a881989a744c2bcf684f45272 SHA512 e6ef5323a03c71adc251ace0db6287a16ab0f911437f2f62191e2a44d0b1e738011797eb43fc9d2cef718e49852d6046a1add6afa6d2e6e95e27daeebdec2c32
-EBUILD mawk-1.3.4_p20240827.ebuild 1295 BLAKE2B 299f53b3c120c6cdbdff1618c98ea128124a5ce6593effa1c42125d716f08e0f360195f055fbc780eb319b875849b87f526656332fc41550f765bd88c8ead987 SHA512 6b265191cb13aa0358d6db5d9a7ec0f3b4443c9519fe25319b98c3d1433bd447beb55097cb1da1a8bc8d8a6daeacd9081003c151460d819c7f56493f92ab110e
+EBUILD mawk-1.3.4_p20240827.ebuild 1294 BLAKE2B 42add796898aeca0bb07cd1992acf616f5e936000eb35c5fa8cb99627ac7aab11f50a81d601f812b4bcdc528144ccf8b2df3dc2f1ad66432d60a93d1c2e516d6 SHA512 521895ee631eb17ad8435b48166c57eb66cfdd61c2983d7066f38ca2af18adbde0545e8e46f2e1c2df3c2ff9744ae0a9d17c84347e616963c7ed8ccc5fab10bb
 EBUILD mawk-1.3.4_p20240905.ebuild 1353 BLAKE2B f921f7636e5e644ea207bc78c28a75a76d9453a569fc30ce93cb5bd3e665a693a026605f1fea6b4c54f456b06cb359288b3b6daa574cb7b121596559aa866134 SHA512 27648f3ff7ae46e3c302492462ea3a59d19591ec2aa54b7bdb2adfc675ba04bd10a353e67a424a3a0b43695798e393e331022e30f46c8d7715c56de4fe279fae
 MISC metadata.xml 422 BLAKE2B 8bd344848b5247eb1858b7cd31d91a796671c321610b826e602d9350e59769a4e6612438d9bf89ee2d6d63c327729d88a9ccb538b162beb816fde2910d0a4d9a SHA512 9adcc3c3b54ee935d3363e874e76f9e9b1efee00faac94184a84d10a6600dad4f11da51d4567acabf63707ca55f9b3d5ac3df107c6de8b38cad1da9891e82086
diff --git a/sys-apps/mawk/mawk-1.3.4_p20240827.ebuild b/sys-apps/mawk/mawk-1.3.4_p20240827.ebuild
index e96ad61d5abc..068495d7ce3d 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20240827.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20240827.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
 
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 59d7f06bfbae..0d3e622103a9 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -4,5 +4,5 @@ AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9
 DIST rng-tools-6.16.tar.gz 67401 BLAKE2B ab1a84c9a298e71ea5cdc1e91004ac069199a0128ee9701b1b3e24b6c705c63a642ab3db260a2c6c910c185e8fc75d5775caa3b7c370f102c75fac496e9bca17 SHA512 f4155dca8a54f47227f49ccf5f8453ddd50bd91a37b3b1659b5ad02278ed119028cee42918dd48552c79e19f2e2477277a41afa8e422395b2778b17fab09484d
 DIST rng-tools-6.17.tar.gz 69979 BLAKE2B 4e5a654369ef21ffe19c50fc60bb0242d48ee91c9ea839cde18379aba01fc3648019c610526a51d75094578e25f94a4aa23566bb2dc723b2ff447b9800bfc03f SHA512 fe874e578c0d5916c271ed5a96b87ed8bb5ce4238cc158471d390ca32864959206b0657dd5910ebb0730a3987f3bf9656690759f5a910d1c4a5891a27678e60d
 EBUILD rng-tools-6.16-r1.ebuild 1955 BLAKE2B fcc4557e57d58d50b60e242f12690c250bb483772458e406266434584b0a92f0a30a0d28f19d75ab212e47a1cdfd2ce8a2bf57eca9d9ceb00fa10cd5da10dd46 SHA512 62901116134af3f02c3c624d60636e57ecc99f024a4ae4b11e11f6cd4a153bd8a8d787d1e250aa3f0efcfb5cd10e14b006082aecf70de26c0fcafed49bc8fe9e
-EBUILD rng-tools-6.17.ebuild 1908 BLAKE2B 25fe237c1e748d2d49c1bac934056f748c877e21d82d9ba677aa76a9a2ce66ae23efef77c137429602504e25df2516947e6e01f4f3ab19daddb6b5d9ed29e8f7 SHA512 4ec87b08e6fb44ddd7933cce48d4f44a62b8a087d658f0734f84ed5757ce8f60a434f09f3a00536219e9c78afff1ac2b7b2457f2df89a7ea9218f26b036809fa
+EBUILD rng-tools-6.17.ebuild 1907 BLAKE2B 78dfa7fdd895da0405a0508dbb5bd68410f476b96fea1d18ac61fc5151794247eee8b741cd2865bfc22000bfe600d8c9a740d7f476bc059f922a517c61bad5c2 SHA512 e3c56f165516f0f20ed23d4390b5a1f91eeff27b9909cf326ba3322f5fefd691e0aeffe07c2935b966d9591b344ee0247580fce06c3fddcb694d1df12772665a
 MISC metadata.xml 894 BLAKE2B 8a337d1832bc0c80ae7869fcd8b390594beb17514f792ddeee1e3544e76f99b70022ff63c6766befc79a1acc4f0f48651d7b52ac4a3995fd4bc4fc81916ecabd SHA512 c678013dd0a4882c1be0b7d4784910e52ec13118237f9f488fb53ce363e8d51c7a3ddbf50feca00f1c7b99a604754201687f512947b5aca64eefa331d3c2532f
diff --git a/sys-apps/rng-tools/rng-tools-6.17.ebuild b/sys-apps/rng-tools/rng-tools-6.17.ebuild
index 8a95e35076d5..185ed58cb7a0 100644
--- a/sys-apps/rng-tools/rng-tools-6.17.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="jitterentropy nistbeacon pkcs11 qrypt rtlsdr selinux test"
 REQUIRED_USE="test? ( jitterentropy )"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index fff928fbbb69..e5767a50f352 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -9,6 +9,7 @@ AUX systemd-test-process-util.patch 1077 BLAKE2B 0f01ea7641366cdb01a9e310d326ea7
 AUX systemd-user-selinux.pam 204 BLAKE2B cb67dbe29fba5e3f4282b3b55e2347b642ce40532fdf57c1adbfc854a1caf107868a725e170f43aad6bf14ab6163f2070839b63abdfc1f66cbbee3f706e49a33 SHA512 305dbc275d5faacb8992de04e0699dbc69033273872e0def66a663ca9ad951871e4dd22c74130d55f40f4c6698740bb039fe51dc2981c5c2cc346fb2c524cbb0
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-256.6.tar.gz 15667835 BLAKE2B f7c51e3e8638ec415ba46428c13de9f0ff7ac92221c5f702117f53a46ed9818d330727b90eec7f16f9fada09bdc04eff943480d26c4c2dabc8fdc94b4b9e3f6d SHA512 99d0fad02cab3559e081dabc2797d1d66bbc21daf9aaec847aeb6bce289456ff9c8599a34563c9bfa3826db36ae9ab30836b09bae00bf1a410b54d0bad9bd4dc
+DIST systemd-256.7.tar.gz 15672532 BLAKE2B d718b7bcbf9c3583953a9fa82319f04b32d17c5b7539a49b9999881bd8cea7fd9a06f252d763170613a6cd0fd2535762b233cba74eb87764f662c4bdf2d8c1da SHA512 2ff3805a7d97780a716b23ddeea3722a85aba6326ecee527e53e9d35510a0ffa5ec0bf0cdbf8f3409bb9c6832406916f63eb7e8305db5f67c284e5590c642422
 DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
 DIST systemd-stable-254.18.tar.gz 14567354 BLAKE2B 30605ae63bdb650d380bcf4697eeaaba96f5e7a32051aa103ad9f8d32bb9a0c3bd9859ca23fda6b4e6ffab98a814748bc30638a01d03473191013758a958c70b SHA512 437db125a15021a5f51f59f8cc66992c8d2d767fd3fa13331c41502d1d362a3fd0024058a708602bb2760689bd61ec656c6faffcb22932776d54e9815a43d4ed
 DIST systemd-stable-255.11.tar.gz 15107037 BLAKE2B 7839323367d47dc57914fb501c7be38206f3bc882e560c4df25c65d421e5756108711b0ce57df6ad444d5eabb256d6730366e21d283cb02e1ef014b670855669 SHA512 be06010b56f4ea0651ebe921cd2a68f1794a64367fedea6752f7ba71ac5e00c5f0167d52ba5b662fd9781f5aa3f372e174b65f99a9bac66d4bf6af92caa67ba7
@@ -20,5 +21,6 @@ EBUILD systemd-255.11.ebuild 15230 BLAKE2B 3f29ad915e4984bfa1928b68508053681030d
 EBUILD systemd-255.12.ebuild 15238 BLAKE2B 834f02a0001137b4435a7d90764279cc5fb4044f088258852f27b3c96b0b4986abccaffc75826944adc7a6fdee3c5e7c9599e354233a4eec5d7fb9b2cc4261d5 SHA512 170064f830a56925ac5fd70c3209131665d84195458494ef73a05f2e6c3bc438f08839bd0b5dea2eabc7b1a71ddce8ab7a5ba3e49d82ad41669be43f7e4bf110
 EBUILD systemd-255.7-r1.ebuild 15230 BLAKE2B 3f29ad915e4984bfa1928b68508053681030d7ca18f57aea525e959870e52d0711eb660985a3229dbdac1fc75e1072d26ea0106bdf9e5c838f4142bd73b7a41d SHA512 585b08fccfa2d0ff1caccfede77c56e34b12231a1bbc534a40e85dc807e9d3cc42e5ca9c43cabb5768cdac997c63f54c08aade4e138fd5d4a99792b0bf1c03c4
 EBUILD systemd-256.6.ebuild 16226 BLAKE2B 8b4c9d42c64fe0e0f3817da49dce9dcf4d1c329af71f3ebf123f09b9a8fbec71866fbf78622c337ea53f9f34b147c034c433a5bc6b58862df97a94b99f81cb18 SHA512 21150f9979ef78a8658956172c0bf27b8cbc5d6114819537cb1471a6d257744ecf0e94c271cee9a3f98ce1a050a2521f1eef902d76320be69312fc4c2d9289be
+EBUILD systemd-256.7.ebuild 16226 BLAKE2B 8b4c9d42c64fe0e0f3817da49dce9dcf4d1c329af71f3ebf123f09b9a8fbec71866fbf78622c337ea53f9f34b147c034c433a5bc6b58862df97a94b99f81cb18 SHA512 21150f9979ef78a8658956172c0bf27b8cbc5d6114819537cb1471a6d257744ecf0e94c271cee9a3f98ce1a050a2521f1eef902d76320be69312fc4c2d9289be
 EBUILD systemd-9999.ebuild 16204 BLAKE2B 60b1e6168ce2ed5bc0f25ee0cdd8de5fe07d492203ffb0f8fcb5db88065e0b001d5ea0141c08fddaf17b3d4afdf0c71457beb31300d493503d72589d36182f80 SHA512 c2ffec6cd8035f40c18dca4b49048cf5a14a876f3a8c06ca07f2ffa3dcbc541eec37a42f0cbe6ed38cadd6fd7ea61bb80415af458cae909c31666165c1cc3015
 MISC metadata.xml 2686 BLAKE2B cd65634500cfb85ace929a24ce7d21603d50d6f532e0445bcca9b888050f347dd162696045267995b14f3d0985a2ab0d99441b323c9e596ba68dc04d6239bc0a SHA512 7dec9047b453b28d796a5e589aabd975838f48a51ba5e1267aa5c8f91a3cca97bef33419cd38c652a522ba347e63a0a5f5a427c4894ea656cffd94e2680f8f89
diff --git a/sys-apps/systemd/systemd-256.7.ebuild b/sys-apps/systemd/systemd-256.7.ebuild
new file mode 100644
index 000000000000..f957b4c395ee
--- /dev/null
+++ b/sys-apps/systemd/systemd-256.7.ebuild
@@ -0,0 +1,573 @@
+# Copyright 2011-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+# 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
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="https://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit boot bpf 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= )
+	bpf? ( >=dev-libs/libbpf-1.4.0: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/openrc-navi[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!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
+	bpf? (
+		dev-util/bpftool
+		sys-devel/bpf-toolchain
+	)
+	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}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+check_cgroup_layout() {
+	# https://bugs.gentoo.org/935261
+	[[ ${MERGE_TYPE} != buildonly ]] || return
+	[[ -z ${ROOT} ]] || return
+	[[ -e /sys/fs/cgroup/unified ]] || return
+	grep -q 'SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1' /proc/cmdline && return
+
+	eerror "This system appears to be booted with the 'hybrid' cgroup layout."
+	eerror "This layout obsolete and is disabled in systemd."
+
+	if grep -qF 'systemd.unified_cgroup_hierarchy'; then
+		eerror "Remove the systemd.unified_cgroup_hierarchy option"
+		eerror "from the kernel command line and reboot."
+		die "hybrid cgroup layout detected"
+	fi
+}
+
+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
+
+	check_cgroup_layout
+
+	if use cgroup-hybrid; then
+		eerror "Disable the 'cgroup-hybrid' USE flag."
+		eerror "Rebuild any initramfs images after rebuilding systemd."
+		die "cgroup-hybrid is no longer supported"
+	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 bpf && CONFIG_CHECK+=" ~BPF ~BPF_SYSCALL ~BPF_LSM ~DEBUG_INFO_BTF"
+		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"
+		"${FILESDIR}/256-bpf-gcc.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${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=
+		# no deps
+		-Dima=true
+		# 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 bpf bpf-framework)
+		-Dbpf-compiler=gcc
+		$(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)
+	)
+
+	case $(tc-arch) in
+		amd64|arm|arm64|ppc|ppc64|s390|x86)
+			# src/vmspawn/vmspawn-util.h: QEMU_MACHINE_TYPE
+			myconf+=( $(meson_native_enabled vmspawn) ) ;;
+		*)
+			myconf+=( -Dvmspawn=disabled ) ;;
+	esac
+
+	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 --timeout-multiplier=10
+	) || 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
+		if use selinux; then
+			newpamd "${FILESDIR}"/systemd-user-selinux.pam systemd-user
+		else
+			newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+		fi
+	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
+
+		# https://lists.freedesktop.org/archives/systemd-devel/2024-June/050466.html
+		ebegin "Signaling user managers to reexec"
+		systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
+		eend $?
+	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
index b3b60c4c31d0..32c9aac29325 100644
--- a/sys-apps/uswid/Manifest
+++ b/sys-apps/uswid/Manifest
@@ -1,3 +1,3 @@
 DIST uswid-0.4.7.tar.gz 43719 BLAKE2B c99ea760658a5b5f518e6e8aa554515bc0a5246d60c358b6542dda17489fe18f06b2dff7342371944fe36c44562f9e78feb230f6573445c4004568c973b66b87 SHA512 6e8069547efbc06ee5e2792908a292e70612041f303b41d54fc618519f3156a8c88ca9176367c47304dbe80b0199467b913060c8fdbcef1287794cac0a9e695c
-EBUILD uswid-0.4.7.ebuild 662 BLAKE2B 3cc50de62cb5219002a6c81784f0f96bde23d2654d9bee5c29ccf7c523e37a02c53e54138f3b0af48a545a2a97edfc27e384a96d39938357971c26f56455f577 SHA512 5bc8b860000408333776155ba9c7037971765b4a891f0e9e0c877efc9c1b50ef7c9a9d05ef036de8d911d44be8877844a41d8c6e974736a7c18cd663be83b451
+EBUILD uswid-0.4.7.ebuild 662 BLAKE2B 01e1087f6fbd6f3fdf53b331bb622d95845b30fbe23ea4a506f4df621c719ac7c88bb3bb0b4cb56ed2ef2fe1771b01f68b83781cef26cdcf1737be4b917d21cf SHA512 0f1accdc5d137ddc65651730a5e98614d0398e0462fce8851b0d5e85a5076d19913a3bd11d4d2fee5e3796a06f0e6336d4dccb0f4d85607ed781d4bd2ff249d1
 MISC metadata.xml 868 BLAKE2B 94c9b3317a9789c66a4917b30c7f1c31b3ea0cb6cd54e503c8eabeef8481ccb0ee02b60d1f5b5752bf3e07740540bf7cb5eb65c19a36536081c4e4ff3a5c9e25 SHA512 85a46283d67e9230cc92f5dc9ed95b1153e43b16e4fbf94e05342998ed8d33c5433cb3c77796085e8f8264a386220a0ff1ec0a3e9f3c524df3fbec25b94409a6
diff --git a/sys-apps/uswid/uswid-0.4.7.ebuild b/sys-apps/uswid/uswid-0.4.7.ebuild
index 3e14347bcbee..8fb812992a0a 100644
--- a/sys-apps/uswid/uswid-0.4.7.ebuild
+++ b/sys-apps/uswid/uswid-0.4.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi