gentoo auto-resync : 10:12:2024 - 02:01:16

13 files changed, 113 insertions, 85 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 50737949acdb..d2faed508098 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 9da1fc403b7d..d133212bfbc2 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -10,6 +10,6 @@ DIST coreutils-9.5.tar.xz 6007136 BLAKE2B 6fd3a77697c9e85f31415c6ad66559faf18acc
 DIST coreutils-9.5.tar.xz.sig 833 BLAKE2B 37c29984bceee0ff3bffde76712f71dbb118c228e328dc230d5c53c37da12f5ec2130e0123b97fda4a561f556c3be307fdbe1f0c21279db2c84030818386f626 SHA512 029997e0f4ee64e561853cff7c8a124f58cc891598595b44c4a46f9813b4b71c9d677464bc8a26d294e9971832f4b87c23777fea4fac6e8e30f06ad93b9957d5
 EBUILD coreutils-9.4-r1.ebuild 8488 BLAKE2B 39c45419769c3eb3b27f6e11cac3196874e323562e3ea0520d277a3739beae6bda3b967ecbdad92ce9e069f17b2798e8baaf23b39b497ad83204308e0c7dab9a SHA512 e510b0a4f080bbdc2411617eb95523c4504d300a4142f1e02a662683e0d8d864dd55fcf533563053990a247d803b566f94df71879030233335ee432d877be67f
 EBUILD coreutils-9.4.ebuild 8390 BLAKE2B a3ad5d870e7e03e49acc837bfec6d51bde3604aeaf57db373b4f0780e43ee9cabe94f28b620a11566a5ebf8e1756c6e137dc744deb12a5603c5eddb7c42b8f5a SHA512 8f491086f1bb1c7f9a1b2c206377cef994d206215427b723df211af55bb00e0b9e7121b05c49b1e809b232ca27d27592199cb87ffeab973fe72d089c5c7279e9
-EBUILD coreutils-9.5.ebuild 8576 BLAKE2B c4eebfd17509ea396bb6963a50e784f06289d17d9087c808bb6132cee33e33d0d9536abf2c8977034e74ba588d23bf39f88c39c7a69d4d5ab11cbe49d0b0b8a4 SHA512 8e1025571e796a0ad27efe27c5b6dd7072e1318754d04397fb6f679193d549b00e90b53a3c7e8f76542817ad651213641c91a07a91ff41e20e479253091c644f
+EBUILD coreutils-9.5.ebuild 8575 BLAKE2B 380dc8f4d3e2746436d77bf9b6f315003b2e91099abcb5a3c074b7c1d96293a38e263761314c90b185489e39afbc870d8cd515a4a80b07f5f50133df3297a2c1 SHA512 20cba518baeb5ad28f48b4965e9d55c30a00987714137ef9931f4c5120dd73394c5ab8c1d1908f424f11c4bb053dfd83a81dc59264cfb31f3b8a99a831b1fb60
 EBUILD coreutils-9999.ebuild 8352 BLAKE2B 53b38a1e0304a89e7b63a5b7c146ab51ecf0bd8d0609f6e29e1b587541aa110dfc93f160dc16a66cf0af78ad5d7e3f02714c0744a5740833f129a0c84fcd7dff SHA512 8c0fbe0dad01b67b4410e72f31333fef7f004a7ba97ffcc6db739e72e95147d168b2d69829c87db79501140cbdc0049a8144bc0108b97723231218e3c8af3c6c
 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1
diff --git a/sys-apps/coreutils/coreutils-9.5.ebuild b/sys-apps/coreutils/coreutils-9.5.ebuild
index abfd4b15a6af..645b4547bbe6 100644
--- a/sys-apps/coreutils/coreutils-9.5.ebuild
+++ b/sys-apps/coreutils/coreutils-9.5.ebuild
@@ -33,7 +33,7 @@ else
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 288df3df480b..440e762447ed 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,7 +1,4 @@
-DIST ed-1.19.tar.lz 66448 BLAKE2B 139305a1d64e96f7eadcb462325918e5eee18de229ec8e1b3fac29dc9b8ef58ceea4cd7ffdbd3674fd7f421d90bc0c9e3557318eb57830d7cd46e579828fa95d SHA512 594d5cf895931783110ee1956078f6a77aee022fb67730cbc6f1d30521c120b97820a5eb349278575f85c4c1e17fea0e16a3bc22592edae53c6fd27941ee3d7e
-DIST ed-1.19.tar.lz.sig 72 BLAKE2B ada611148a6347d8953c65669b61f69eb0ed8d48f6dc4ffaab8975dd7e28f1d87e434493a77e817ca05874f741e243309529e60e95f2a7636148fa71c711f5e3 SHA512 03ff7cf2f337fdc94efaa1374ce95d37c29c556b2a9a13f7216e05e8e9e9efc95bcbb554bd05000b5283d5f20884f3f50b16f220fba8e6ff318b1b975c6a44c9
 DIST ed-1.20.2.tar.lz 69182 BLAKE2B 5a9d36dba98488e3cacb3e4c0b9d70003345ca94dbf9a3ebd3181b93567b9ef94df0e72614e99e2c6dde4929933d9333c6dba90fafcea6962e2c1abccb0525af SHA512 5efad386399035329892d8349500544f76e1b18406e164aae35af872c15a0935d412dd4a6996bd15b960d0e899857cc7d8657805f441b1b9f2ae3d73c73dcf4f
 DIST ed-1.20.2.tar.lz.sig 72 BLAKE2B f62d5fc9d909cd1f665ed2b4793407d1d91981bad6b4da0383b84936d03d2ee78c37dca1f0c09fbb84cbbfd8211980ea489b897ff14834773185fce0339c7fe3 SHA512 dc895c0634d73c5ddaaffc78c8dd86df88c477607a7d5f1828229009e2a72091cbb24286dbad295019a30651cc6e98d07a1181b0ae38b94d66cb28532876098e
-EBUILD ed-1.19-r1.ebuild 1261 BLAKE2B d9cd74614414271475a916abaee9551a701581741e8a85e74938d7c9ed093ce7b1346fc006d6333c8a4335b01e49c99ea5674913fbc89e936e55a1ffb68980e5 SHA512 836b4ee9653cf7721b4956da0a4e8316f4bc5912ec9d7018c0c2b179ea4889498ec0d5a09e81b044cef9d2d7c5b41641fe86f6cb9f898a3046df8c704b676507
-EBUILD ed-1.20.2.ebuild 1261 BLAKE2B 6c3fcb40415552d7fcc89af8278162d35b671c77bff9c9c6fd1a00cbbb9f70bdf665bd752b6374f377c638567a041d7d1baf1da1a7699a48804e4e4785271d0b SHA512 f3085b922cfaae29c0832baab1e5741fc22e641fa61c8e32065c1ebd9e6cfce33360be3585fee252816175412b368cef40ecf8697f61aa3b2559a0c910af4f08
+EBUILD ed-1.20.2.ebuild 1332 BLAKE2B 80e942c42870f9fcd68cc2222fb79492897c7334f6e3236fd1e962de6e006e46a75241824cf0c7483f5b631c94f7fe6d500f8234f626eb68c8abe8908e94d3ee SHA512 1ae71b64c75f518681ebcff4991946d46eaf992a1e85d19b436d379a1889c918694dffddf3ff8d4f29a1f36f5a37f792f5179147b5ce6f1e9e921bcc754cd673
 MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/ed-1.19-r1.ebuild b/sys-apps/ed/ed-1.19-r1.ebuild
deleted file mode 100644
index 9344e09f8d47..000000000000
--- a/sys-apps/ed/ed-1.19-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc
-inherit edo toolchain-funcs unpacker verify-sig
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Your basic line editor"
-HOMEPAGE="https://www.gnu.org/software/ed/"
-SRC_URI="
-	mirror://gnu/ed/${MY_P}.tar.lz
-	https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz
-	verify-sig? (
-		mirror://gnu/ed/${MY_P}.tar.lz.sig
-		https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz.sig
-	)
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-if [[ ${PV} != *_rc* ]] ; then
-	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
-
-BDEPEND="
-	sys-apps/texinfo
-	$(unpacker_src_uri_depends)
-	verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )
-"
-
-src_unpack() {
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.lz{,.sig}
-	unpacker "${DISTDIR}"/${MY_P}.tar.lz
-}
-
-src_configure() {
-	edo ./configure \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		--bindir="${EPREFIX}/bin" \
-		--prefix="${EPREFIX}/usr"
-}
diff --git a/sys-apps/ed/ed-1.20.2.ebuild b/sys-apps/ed/ed-1.20.2.ebuild
index ec44180112ba..43d94fb05eb3 100644
--- a/sys-apps/ed/ed-1.20.2.ebuild
+++ b/sys-apps/ed/ed-1.20.2.ebuild
@@ -38,8 +38,9 @@ src_unpack() {
 }
 
 src_configure() {
+	# TOOD: -std=gnu99 can be dropped on next release > 1.20.2
 	edo ./configure \
-		CC="$(tc-getCC)" \
+		CC="$(tc-getCC) -std=gnu99" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index c1e11391a057..e09e5d7d5f1b 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,6 +3,6 @@ DIST findutils-4.10.0.tar.xz 2240712 BLAKE2B 2eebdcb425c04170d17afb80e7270ba095b
 DIST findutils-4.10.0.tar.xz.sig 488 BLAKE2B fadd7dbf80a52965d6da641bda21ce00790623cf2c959ed03c1193a22c19f30417733511a739edcb1a0a97892a1257e0e88e32d872f94e71e3ade04776337d3c SHA512 a835153a0671309021be187bf78afee58d9682acb40545aaa9dd187f0ebdea0cfa5583bd03f363243633ea056ddb0a7a6603987ab5e34a608426cb4265ac6d8f
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
-EBUILD findutils-4.10.0.ebuild 2334 BLAKE2B d2ebd61841595c99e1935cca7f64aa674a46ab474887893d69bea400e21f450b497b23ac1bdd4e1d7d32cfec52a3a5c0cac3c9f5358ac836f27333923c4253d4 SHA512 5aa86f11f85eae421d4da327d932cd44845fd7bfe4e28636ffeb10432795bdf0bc1c046a4add03a5cc635c77386704446d9ebe5e92641e345da75fddf325aabf
+EBUILD findutils-4.10.0.ebuild 2333 BLAKE2B acb58765c1993668385eb76a69b74af9d4524474ffede5748ddf95b98a15b6e1e6024f4b4ff1f5f9cc6b895f2ba58ec441840ca9909329458ee796ccdb0eeb82 SHA512 979c7f145f5ca3561a32033dfd37ccb2e30324ab54f77c0c3536808916f208231d1d3c1bfacd7fe546a84ccd6f8152401ac5cbcf4cd5db0a9f40272dfc653d67
 EBUILD findutils-4.9.0-r2.ebuild 2390 BLAKE2B 0dfd9a900b2672f95ab548e9dc9866416783950d7ad3b36070917b1c99f9703b2ca4f035d07ed50bd18dcd115db15a492f2c2a4529b63ce700e3d9f12a1ac70d SHA512 da9fce98bcf160caace94ca55cc499238adf04164aeb8be15a357ef95cdea6110479057446dbf30518bc2a3aafa80860623c393933dee53c679bf5ac3b27a7e8
 MISC metadata.xml 383 BLAKE2B 19523d687c23d0f2e1edc4f9f9f183642d34717f29e0ddb0215c3fecabc4af9eb36443451044dd41e0b379c5b69d11ea60332f777c4ebc17dd8569483b88e3b2 SHA512 355aca11f02d0770f684a423dad09a107b28f4d4bcfdbede4b5dd80523803fe6f0d03dea23569c1d728a51c7545ee3ac041068492038ace55093d738f81d04d1
diff --git a/sys-apps/findutils/findutils-4.10.0.ebuild b/sys-apps/findutils/findutils-4.10.0.ebuild
index fccb8bb8914c..fc88cf09d5a4 100644
--- a/sys-apps/findutils/findutils-4.10.0.ebuild
+++ b/sys-apps/findutils/findutils-4.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-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"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 971cc564ea11..f5ca0a2fcb5e 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -11,7 +11,9 @@ AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629
 AUX kexec.service-r1 355 BLAKE2B 90ba7fe6af6db107821acd61679e29db44e180d768624a6b5e3817ff0850dfa96c01ab701adbd13ca17c81b34b7b83b3267e052e6149e7cabdac0c800d382d52 SHA512 2b9bb9c8b250cdf7c2b519b76d6dee2d68ddd02f3b04c2b6f912def8864c5024a89d27ce236c6d8a49f605889b5afd73fe5b803870b810ad432daac800b0f123
 DIST kexec-tools-2.0.28.tar.xz 312524 BLAKE2B b2ab25c632cd2bad21751940acee1816f9cd930e1bb5af1052f9f6c4979dcd62d82c487a88fa8015e3ce7c843de9f47a3f6ccf7efa9270b5f24c79ba30a82a91 SHA512 889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753
 DIST kexec-tools-2.0.29.tar.xz 314576 BLAKE2B 3cb94015d0bcd8ab13f25e23835758fc305093c4d1a81c590830ced852e61da66321617f04bda847e26c95ec44bd101eb235fa1d34f397e22ed4e80426efa162 SHA512 4c9e0b3df47b240f0eac2c31e8b515465f626ce043f64daa32b0b032d7132e54dada5d70875dab256345f66cf94a25dc3c160a9009ba60addd8dcb1e5205f5ca
+DIST kexec-tools-2.0.30.tar.xz 316548 BLAKE2B 06789dda9526e0d507f50861468baf674dc702eef015dee00b72946c72e78e8d11636db164c2f41c6dd8e5bd647b33a64d079ac624e0d45938b466a61f972e43 SHA512 4550607ad7eb51d169c2565cfee9195441634624d1c8859e21bca6bd7f15031713c39ba475301c1ef5fc67c009bc6599d254da184be25e68b226155e515e3852
 EBUILD kexec-tools-2.0.28.ebuild 3518 BLAKE2B eb7f52ad884eb38b72a710c8602bd7b006fb18a331aed5a755fe0365a3620750950ccbaea30780220f0017f0e9f5648dfa25f1f21eac2c837a2fc32f5dcf411a SHA512 dff2e7b8a8d3c8d907b8eaafe07dc7945d9b82e0b4c14e1d5f04b02984eefeebed934037b0d4f0ebb97d33c6340e08c7eb0fe91ec352a00da5728c17e58fe4c7
 EBUILD kexec-tools-2.0.29-r1.ebuild 3083 BLAKE2B e79ad02f612f02fa7bc255fcb7c209a046638efb61effa21bf44999568c721be38f5614dec85ba9dcfd75809e030b4762a194f4d12bc4dca3e398543293549d1 SHA512 e675b9a2eafacf0e133afadd98c70a3754a9e629c6a8e7414bc323c7a7698b9c261ae4154b6c382a3f60fab252c7cda52453e6d72ea9f1b7de586e1142aa8f43
-EBUILD kexec-tools-9999.ebuild 3085 BLAKE2B 80c6be4bfc1aef542231dcf9b172942bb0ef4cd6f020732426435ead5edacb95a4f5780a5f95e280c9e88e57fb4a953b453fe2f46483ed7e53d01004af08cce4 SHA512 bf4f7f344836f16e75fd0e01ed23e3770d4cf105872bfaddc26f283fd4b2c60519b4df15a3043170a860d4814272cd0526fff3daf40fc3781329749fd3b503cf
+EBUILD kexec-tools-2.0.30.ebuild 2286 BLAKE2B ca394b10c6ced377de61b630629a2f888d825599f25ae22280b22477b280a9ae6a092f69e4356a7e3e46930609504ebadc2bfac8b9982191f18170b185cbdd79 SHA512 f7294f4d796988107070ea7aa93ab5d43caf4fcd5d197e9f38c037ef93e5a973438bc701bd9a48768d0fdf18b00022ada303b64320110af802f2ce37014d3906
+EBUILD kexec-tools-9999.ebuild 2286 BLAKE2B ca394b10c6ced377de61b630629a2f888d825599f25ae22280b22477b280a9ae6a092f69e4356a7e3e46930609504ebadc2bfac8b9982191f18170b185cbdd79 SHA512 f7294f4d796988107070ea7aa93ab5d43caf4fcd5d197e9f38c037ef93e5a973438bc701bd9a48768d0fdf18b00022ada303b64320110af802f2ce37014d3906
 MISC metadata.xml 845 BLAKE2B c2e80468e673bd35bbe6c6dd63d6c95941d15e8671c29b9bee1be84b4735b89db861a17e2c7e2b80790e49a6586f9fe791e42523a25011a8074de0ef22b33070 SHA512 4a5165c6456d53f56855b4d701d6e4f8697995d66f4aa0c88ef03bc62432897e6261626b408d146f684c59bc1f619fa5a4f543e4d4ea6c3a93cdf3f9ff0915e8
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.30.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.30.ebuild
new file mode 100644
index 000000000000..d0255bda1bc6
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.30.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma selinux xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-kdump )
+"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+
+	local myeconfargs=(
+		$(use_with booke)
+		$(use_with lzma)
+		$(use_with xen)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
+
+	insinto /etc
+	doins "${FILESDIR}"/kexec.conf
+	dosym ../kexec.conf /etc/conf.d/kexec
+
+	dosbin "${FILESDIR}"/kexec-auto-load
+	systemd_newunit "${FILESDIR}"/kexec.service-r1 kexec.service
+}
+
+pkg_postinst() {
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	local has_rootpart_set=no
+	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
+			has_rootpart_set=yes
+		fi
+	fi
+
+	if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no"  ]]; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "This was probably caused by a previous version of ${PN}."
+		ewarn "Please reboot system once *without* kexec to avoid boot problems"
+		ewarn "in case running system and initramfs do not agree on detected"
+		ewarn "root device name!"
+	fi
+}
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index c8af4693cfed..d0255bda1bc6 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -41,17 +41,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
 )
 
-pkg_setup() {
-	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
-	export ASFLAGS="${CCASFLAGS}"
-}
-
 src_prepare() {
 	default
 
-	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
-	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
-
 	if [[ "${PV}" == 9999 ]] ; then
 		eautoreconf
 	else
@@ -60,6 +52,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+
 	local myeconfargs=(
 		$(use_with booke)
 		$(use_with lzma)
@@ -69,23 +64,6 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	# Respect CFLAGS for purgatory.
-	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
-	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
-	# -mcmodel=large which is added by build system.
-	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
-	local flag flags=()
-	for flag in ${CFLAGS}; do
-		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
-		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
-		flags+=("${flag}")
-	done
-	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
-
-	default
-}
-
 src_install() {
 	default
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b1907915dc69..2710f9c4aabd 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -18,7 +18,7 @@ EBUILD systemd-254.17.ebuild 15486 BLAKE2B c9f1de5ede2d4a980dc9eb25f1a07b3b10265
 EBUILD systemd-254.21.ebuild 15494 BLAKE2B 5eb683dd09f395202e94eda2f9e6d71f7f543c447a165a409df158d7fdcdc146ef65097fb51d59ff737eaa7ef77f95779337e65d1f9ebc88cc18b0e5ae58cfba SHA512 6d9cadc8a94b26a58f998af79a6b6dae47b6ba8cf461fa9753d92f293c5203e563ac35901ea525e25ed3d0ded5eee5cef98d65bee00f8fcc5bf2137766d8b305
 EBUILD systemd-255.11.ebuild 15231 BLAKE2B 477a45b83d9c43fcb30e129828324d1840faabc2d63db2f152979d9997c1e8f40e5bf94b93a15f0df8819c49ee7a83e08245dd9f8f5d7685bbb8ee5c2b59340b SHA512 88299e8a7514fb4ff4893e47ba39c4bc33683f4bfb588b306fcee17085a2b98ca9558d59c7b161c2114d0db93d2bae4503837ae61cd6aa62e55c6696754f0029
 EBUILD systemd-255.15.ebuild 15239 BLAKE2B 32c84a6e234cae90da58a2aecfedfd6c896004242f7b554201953a569013a74b9a14bd1ecd843f2e125a26fd90002015504dc92765b26e83e75ee3ad5a3ae1cf SHA512 a53492ae381f93bddb103de28e680b1cffbccb846ff22cb7c8fa65c65b35e701c03cce68f7495816da23269339cdcef49bd3a7b547442fb7df2805bbbd0ef28a
-EBUILD systemd-256.7.ebuild 16224 BLAKE2B fd9753f00c148947c5748cec7323505315260eff34c6fbe51451c1a391334063aa296fa3568e653f9f2ca44bfc011e5240a2b903ba56549adeb5b266018bbd89 SHA512 b6991acca80b9890f5ef775b7791d587f7f7033710f5b755061525f2c3697debfb2c43390d385b50838b6b7d8db954b1ff7dfe3d906dd17c845a675519c6c595
+EBUILD systemd-256.7.ebuild 16221 BLAKE2B c3df3c023f51636eb243fc4c90b1a72787d016b9dc050b3846d37c7531ae4a6576eb928c854b57c7a1abc8652553d9efc1ec59e48b300fffe838b0d35da76ed0 SHA512 022788475915abf3dd336a9c7c56a8c2cc8aa49a03c783a1b5352435f455ccc27823bdcab41a99a66acf25fc58373904ad19429db83bcf7111e213b54a898adc
 EBUILD systemd-256.9.ebuild 16227 BLAKE2B 7c05254a0a890dbf461cafd41b3a4cb53e5a738233fe55f0db25daa3693042b478716e83dc921777e1d7ee4bebffc895e2c77dc38c85800c93a5e00227b2267f SHA512 8c629b584b7c3c2c4d591f499f93ee650202d898991ab8bbb728bb632f58c1b1cca4148d8df7c27dda398aedda246d04721219ce0c9ac350ce62577034207a53
 EBUILD systemd-9999.ebuild 16157 BLAKE2B 34ada66569d662d27c283e569ead57b190e5c3d5187b2f7a86d764633c322d7cd61ae44efc386a273749ab532a99c6a2fc3dfed9d723a529aa371fff76f4e63a SHA512 0a02994771eacd7a40b911f9866494252dd67795b3def926b6312894843308f21a8566156020e538b4ec06d8198a2f4b6f95151bab5445e6ed96c08fd0671802
 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
index 7b0d42edef94..c0c7ddd5805d 100644
--- a/sys-apps/systemd/systemd-256.7.ebuild
+++ b/sys-apps/systemd/systemd-256.7.ebuild
@@ -20,7 +20,7 @@ else
 	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"
+		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	fi
 fi