gentoo auto-resync : 05:06:2024 - 00:07:52

13 files changed, 263 insertions, 17 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bd964b286b3f..fd6b16065805 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 43fa5a235b32..64ab8aa42e1c 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -8,5 +8,5 @@ DIST etckeeper-1.18.20.tar.gz 110787 BLAKE2B 8d69cd65a1cad7ff64eae95d70a3da70c60
 DIST etckeeper-1.18.21.tar.gz 116961 BLAKE2B ad765ebc1e3b393a896b6491f21195a7c1081212f798b8586966adc72578c2bffe9adfb5a6004cba7ff87efb66f4318314dd3646e538d9bbe7a686250ea1f160 SHA512 c23bd0f24e04b565ceae77e552eb00926dae16f4a6c8c183c5a6bb404d5351ee7a040e01287b7c0d3d530bc8dea62cd2336b3151a349998aa9c145f1258ac2a0
 EBUILD etckeeper-1.18.18.ebuild 2229 BLAKE2B 893d9dd8e5396b7c2e09c257e5a76336de8137fdd48e163d1dec4c3e4e0476c1d8cb18a31eb442bd4367db8066ab401c46359dc8a345f68847dddca7ea66f4a8 SHA512 a0e84e59fb262669829960f02b6ea1d3172a9a5d515900f2328eef73851cd5d8c675f264ba4d82a31a688444c7a6fb11576d570a7fb4c74149be8ec57a5b4fa4
 EBUILD etckeeper-1.18.20.ebuild 2405 BLAKE2B d77f64607cf4099ec8ad15421cfca19dba945ad05216a035451e20306ce38254510fed68e34ce8eca33ee2b336e665f1acba094a30be8bfab46bc7b556a88e95 SHA512 3dd78111f59a71a2980906214a8d46cfefd260edc36d6c9f773c785e1acdbc6d723ac0c70a8d70c14f21095af0685e575ba2820899335ebd6ef4bea6e65c8a13
-EBUILD etckeeper-1.18.21.ebuild 2406 BLAKE2B 022362638ea63e88d06c56c13cbd9183012a80fd7b22b59416e68cf328eaca34e5c117842b7507d7ad9f7d6d8a41bfb8fe1b6de9eb7ef00f5b7a3d354d9e74dd SHA512 5e45baec30d70ce9948092c5a6a3ea35a814f4db49c825f8d3e3dcafc33f14cf0454d07498dc55021ae288bb2e054245eb3c923edf96bac3ee6e6548985dbca0
+EBUILD etckeeper-1.18.21.ebuild 2405 BLAKE2B e38b137e069420eae0b4c6d43d396621884e741fb88c70e121dc253f2c63995202bd15b38257b117410fb255b7bfed5eec700b21ae092c9362762666f760547a SHA512 39bcdb77a8ddc3e7115f0f8d49ad6f5cdbed86ba391deb38c39b593ff544ba8c96a9735700aea5e2563bef0136c84aaefa3ebabf19f7ae4f0bca816b1abc3bd4
 MISC metadata.xml 701 BLAKE2B 5abe7a50a0c1070b8a90f571b235d6b33508d1ded7b83c6e71a236be21feece6e6b5289e57c6e795dc1c1500f61f8e553f81e305486c9b0c7154b26a8fdc4d72 SHA512 1a0aaebf491bd7c2e01bef46353375ed9c4cb2761bd855543759cfe60539133041ea96c1bb8b6dc280f91825d11186b0936e8cda4b0a006234adf31a6f293f21
diff --git a/sys-apps/etckeeper/etckeeper-1.18.21.ebuild b/sys-apps/etckeeper/etckeeper-1.18.21.ebuild
index 1c110e577dd0..32271399bfb1 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.21.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.21.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 ~riscv ~sparc x86"
 SLOT="0"
 IUSE="cron test"
 
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 8ddbbb6c1333..e39a9e049b80 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -5,5 +5,5 @@ AUX profile_patch.local 198 BLAKE2B 6a84eca54c8fa5429b171707d6d2b7617c918798f40a
 AUX profile_pdftotext.local 132 BLAKE2B 2c98ecf386cdceae4cbaf4e3623187c66ff81540d86f978467a6a0106d57a0f41f7626f1049602fee8b7545fa413ed6ca8e21e1fb1448a374b8d80e6ae72451b SHA512 c0121f1ba4db0a737acdd250834ccd73fcd441b5d7f8d5740f75230edbb10bd6bb038dd09772ba21cb24cf4224a474749a2e0f3d0e9567b4e207f4adf67c19d0
 AUX profile_wget.local 128 BLAKE2B d2069517fce414faec2b23f8704fe15683a956af210e6e39321ca9f65bde939c71a7980506fdd3b01a6b15fb6733ebb013c684a63589839c60c53616a52ca5b6 SHA512 ef0b97b11fac742464b6520c6e6293017519b84c137c4aa60976b53b3d072bc9a69588267ac0a79c9647cee1e802fb0cd0d28e1647778e30473518415ce4d699
 DIST firejail-0.9.72.tar.xz 503192 BLAKE2B 3d57b345476cb62399859622c88f5d6c22842da5894045c09bc7d84229ec2a01c494e4e9393b6fba6c668f73c6b7046f9a014a315baa5bc56d1479b9cad178a7 SHA512 846fa5caf6e68c669f76a07d6321ed365bf3c45f7992e8be3784ed99ef508ea8dffc5d6cc5da75eeb37964ad358d61b7959e8590051950951de8ca904d8a49de
-EBUILD firejail-0.9.72.ebuild 3567 BLAKE2B 256542643d8cae9c808bb56dd8513ef53cdeacc25cdbf6cee6ef6d3a26fe6bae4cdbcbfb7a146cdf4e40bd99729cd4dfb349d584f77bb8357372f16c14ad9ce8 SHA512 80e279a187cbf556cae30db5104494b2f43d614de89f52c7fb9140056cc72db7885b1b5443101eeec81813b02df16d25f722528436b9d82b063fd38ec692697a
+EBUILD firejail-0.9.72.ebuild 3568 BLAKE2B 9e339537b2f691200a4a6bbb1afd346fbaccf096c23bc5b4a4c5ea8788daf981b1550df6cbacc822328c95bc08d5a7271fc79b13cb8ed985a7672884eb719cec SHA512 d9654967bcb5f3ebb754bbb644e2404854a81f64896a7c96769f778a5804293c5e158ea5483e7d46ca2a367079314b463b163eb35735b1db2b250d7a7e23ceaf
 MISC metadata.xml 1674 BLAKE2B ccb5e94f6e55a8d1864cb6a1d15239ed0a5dd76173a9c20c1162bb55f1ca97e48f1c09902d429bd1086c7b1b014a146c9eb27f0115941e6f7a44cf8aff690e27 SHA512 e8b6c84d5413f6dd33cfe60c111e51a59c89dc95f874c02e38451639ebd05646e49421852cedeef1f101309d73f2aabf6dea1da664f1a6596fce00c0bb2fffae
diff --git a/sys-apps/firejail/firejail-0.9.72.ebuild b/sys-apps/firejail/firejail-0.9.72.ebuild
index 85c24854379a..a778a5a44e7c 100644
--- a/sys-apps/firejail/firejail-0.9.72.ebuild
+++ b/sys-apps/firejail/firejail-0.9.72.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_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit toolchain-funcs python-single-r1 linux-info
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index e1b09dc459d8..d860c1f3257c 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -4,6 +4,6 @@ DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566
 DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24
 EBUILD kmod-31-r1.ebuild 4060 BLAKE2B 51002c2d019b425de450833fd11776d68d35e8536ca8c52b3d431393f5eb089492c6ba16726eaf6de07ab8377427daba841028b8e44abcdb8890db4e3a896296 SHA512 3dbf1d3320920204e740fece6e05ffa37025bd16ce51eb44b738f0497144786f4c8c4f8a68c55a7fed849f7186c16e782652a8d93c07c843b4e67a61beb8e884
 EBUILD kmod-31.ebuild 5880 BLAKE2B 636d01e1c32f4f22e64c868e56d49c238bd6beed835ed5d1b3aef655162ac5741adba02b03e5ed6d89e7303465a7727cf4dcfaed0f87b78318f2142edbb6d1c1 SHA512 eed9173f25d7a9436652a0f0661308ac68a85ef6fdfb88949264189bc836401b6394f62f5bcefadb1564f350a2e011873a3c73d8eadde3a0fc5686d017f0b12e
-EBUILD kmod-32-r1.ebuild 3926 BLAKE2B 7de3b60ca02be848582ad58d28511d0977a834f183d55c0fe28501d7d94687315ce10e307b36234033bfb07780ece6d4ea188570b33aa637cac46f4d37132029 SHA512 351f1f878f805804a8a8cd4c5a5dc9411a5fdc7feecd3bea021d601ea95b57e78ce746cd6db9408ce537912e3661993ad65ea3942fe56c47e77c697c61be94d8
+EBUILD kmod-32-r1.ebuild 3925 BLAKE2B f21c70bcb3793b2caa848995aa4798013642c4eab93ef0613389bff4dbf7f08ab35dece2f5326868f56a09057b76dae17bfc14821708853a7f76aa33640622c8 SHA512 eec0243d89a5b4c9ff55800bb13d528de3b59d332b41ca7f3cbaad1352410610e83be828b816a7f0b93daffbf9ae3b03e30893e931457975571ffaa6b02adfbe
 EBUILD kmod-9999.ebuild 3933 BLAKE2B 9a80b9fd4b0a197965d57ff600af8b3b01fcf531e9e8887fb1900dcae5ff295ca13aa6e148d6742a8f2098914e82f3e6932a3c21b3081402cb61e91e33ff3f2e SHA512 15b1baf7b6f40eff083fb8e96172a2b586941083737062c0110ac10f2a110e98668afe3ce82e26ee086e261cdee0fda22c70b5f9bd732a50a3f9f436a1f6c6bd
 MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3
diff --git a/sys-apps/kmod/kmod-32-r1.ebuild b/sys-apps/kmod/kmod-32-r1.ebuild
index 4be43d175957..e7ffd559cc75 100644
--- a/sys-apps/kmod/kmod-32-r1.ebuild
+++ b/sys-apps/kmod/kmod-32-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 26a0d31c8de7..db473a0ccee2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,8 +6,10 @@ AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205
 DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b SHA512 1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
 DIST portage-3.0.63.tar.bz2 1187961 BLAKE2B 10523150b0eabac97309004c57356c40fa94ebd59f8f76701ae63d13f9424b523ccee2a367174af3a52078d5d9e4338b94e144247f6709c2f7df4418c040b06f SHA512 323adc17254f92e58f22028dad12ebcaaafa25c82567c5d31cc9575c30e0d78224c8f9efe0fcbeee549b08b0797edffb4bbe9c6fbbd8943e3f9dcda25eedd699
 DIST portage-3.0.64.tar.bz2 1187654 BLAKE2B 622cdda85315ab60ca3b1ae7cf1cb1fe479b69c945dafe14655030387d857ae89c0d8326b85fb3d3754ea95ecf2792ae60ba36f1ad9b18d1ac693fdabf9b235e SHA512 26a9fc9532aebd5965c6d62d78914d827ac48df100b5fc518934857881ca19b927e05b2cd9a2bb674b0e1bd5feff2058a083de9c8fb86af16efe8752325c7722
+DIST portage-3.0.65.tar.bz2 1193321 BLAKE2B 4734b0a2b17cf0cdbd0bedac9efa6cecb5799460e1faa8b8ab137fa017e17d47d6d5da6382e75322f21d4be77a31acffbacd753c70b43b011613cc5a6332bc96 SHA512 c864bcb3bef11916128852a5f50b161d82529d7316ec970703a9ec948c46a51148419ef1dfde2906f72347dd41d0eebd49f5a1769a228d97145f5517c34dbff8
 EBUILD portage-3.0.61-r1.ebuild 6919 BLAKE2B 42d9b40cd255004ae6e3e598940717296163e500434a8c2bdf08b280915aecf8dc9d5f3b6d9eb5dc09c8718f689b459ec6a1f5df03187935d17d447f8b2e0f25 SHA512 59cfb6566b72a82cf81503b40b3ad73bb1616c39a6957d14681c55b53a60b662eb5330b7021d6c860212c4e583c4ed67e64ff5a55738f2f8f1a22d5cf4442e03
-EBUILD portage-3.0.63-r1.ebuild 7012 BLAKE2B 9f14fe44a720ea32003fbc4f5856541ae135fc2ebeae475102a12090058e45603bf3e9795ec48509bf8ff321ee1b7e8a0db25591f2fec2a34fab0c6934afb4bd SHA512 6d98b02860fc108d650b071b4764d5a159b6b499c376a0a460060428d53eb1a95153be79a8080e55785b15fb528d01868b817e4f6c5f0969660ee38d154e505a
+EBUILD portage-3.0.63-r1.ebuild 7011 BLAKE2B c4699c5b413f5071199b9a5a8a12e2ea4be8a72cac9ef08bc9a79254584175f98730080ad15d7ce42228f54a5172a1ef97440aa179f440f0b53142367baea905 SHA512 1fa6ca885f591aa34faa2fa39bc4502cd3793cfc4ed6f95eec40a56f056bbd91813d7182893c07a0b5a6e34ceb2283faa3b94ad13b2cc05477c5ab8d78e4ffe9
 EBUILD portage-3.0.64-r3.ebuild 6925 BLAKE2B c891b87805d71055af7b8356ba291256266bc7182e95986e08a770f9449a1a33497e57d53f35ab6e7103b4bd41ebbad4bb86500308a4fb9e16a0265f65f2b909 SHA512 c9bcddeb6d28610fbac860bb76ecf7c71a2189c567c2be785fdd87db25c9ebc432c594f0bb21c2b8d1c2ad1f8dbdbc17128b30f8d5056923ee4bc0cfbae9edcc
+EBUILD portage-3.0.65.ebuild 6790 BLAKE2B c0c4b0323ecf461cdd38831f8644944803b3c3cc653e11b7ed88ac4495f99ccf6fffc170d1bf41daffa60e5d8d262766a3e9641eac3f106f2dd866b6354722fd SHA512 73def9620f9e55157d298d89064cf7c7011ed0320fe1a2fb597b5ad74cf2ff2696a60ef1a89780883aecd98964bc559ed4d91d2d73f37082795885dc8181f169
 EBUILD portage-9999.ebuild 6790 BLAKE2B c18b8ceeb336a4c684403b02c3d7d8b3e9dc4847e900b8c9d41f10049d9b062a4f259e1cc1c11133569c56a1e9d858686ccbe5139ad9b47d3203baeb33fdd78b SHA512 fc18f3bc8c8751e4698a6cb9481cb93c5d0f9121e1fd0d51c7d6507e17ce1ad03edc2d92ad30d796db4b6ac3045105ac52f8680904e854a758c980ae185919d2
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.63-r1.ebuild b/sys-apps/portage/portage-3.0.63-r1.ebuild
index b58137ac2902..ecd1de90b496 100644
--- a/sys-apps/portage/portage-3.0.63-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.63-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/portage/portage-3.0.65.ebuild b/sys-apps/portage/portage-3.0.65.ebuild
new file mode 100644
index 000000000000..ea323e5a917c
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.65.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/portage.git
+		https://github.com/gentoo/portage.git
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.27
+	>=dev-build/meson-1.2.1-r1
+	|| (
+		>=dev-build/meson-1.3.0-r1
+		<dev-build/meson-1.3.0
+	)
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' python3_12)
+	>=sys-apps/sed-4.0.5
+	sys-devel/patch
+	!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)
+	doc? (
+		~app-text/docbook-xml-dtd-4.4
+		app-text/xmlto
+	)
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-user/portage
+	>=app-arch/tar-1.27
+	app-arch/zstd
+	>=app-misc/pax-utils-0.1.17
+	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
+	>=sys-apps/findutils-4.9
+	!build? (
+		>=app-admin/eselect-1.2
+		app-portage/getuto
+		>=app-shells/bash-5.0:0
+		>=sec-keys/openpgp-keys-gentoo-release-20230329
+		>=sys-apps/sed-4.0.5
+		rsync-verify? (
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	if use prefix-guest; then
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+}
+
+src_configure() {
+	local code_only=false
+	python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+	local emesonargs=(
+		-Dcode-only=${code_only}
+		-Deprefix="${EPREFIX}"
+		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(meson_use doc)
+		$(meson_use apidoc)
+		$(meson_use gentoo-dev)
+		$(meson_use ipc)
+		$(meson_use xattr)
+	)
+
+	if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
+		emesonargs+=( -Dnative-extensions=true )
+	else
+		emesonargs+=( -Dnative-extensions=false )
+	fi
+
+	if use build; then
+		emesonargs+=( -Drsync-verify=false )
+	else
+		emesonargs+=( $(meson_use rsync-verify) )
+	fi
+
+	meson_src_configure
+	code_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local EPYTEST_XDIST=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	python_foreach_impl epytest
+}
+
+src_install() {
+	python_foreach_impl my_src_install
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
+	python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+		"${ED}/usr/lib/portage/${EPYTHON}"
+	)
+
+	meson_src_install
+	python_fix_shebang "${pydirs[@]}"
+	python_optimize "${pydirs[@]}"
+}
+
+pkg_preinst() {
+	if ! use build && [[ -z ${ROOT} ]]; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+
+		env -u BINPKG_FORMAT \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index d36ad2f56dde..4930f126445b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -23,6 +23,6 @@ EBUILD systemd-254.8-r1.ebuild 15472 BLAKE2B 22b00b6cefce875f30858d26a8b900096a9
 EBUILD systemd-255.3-r1.ebuild 14914 BLAKE2B 1166b26b9b4f9149007879f9502f6923459a4eb2faa8474fc23ef66e76b81a6d8541069e3382f26b3fb75043c0cac828223632181f3007f6637ffc41a27cc37b SHA512 61b4888e9d4f208bcbd32da4c6da7b101d5b757518ff22b8013bdfcac055a70b20e43ff5cf6bd2debc14b73e97cebd1e0cc48f17b40639fefe56e4e30154fab5
 EBUILD systemd-255.4.ebuild 14942 BLAKE2B 6023a35d0614ba98ca0fe00ebce0621933d62c7d350acd992c8287e471836b61acd2a46cfd07ab918823bb16f6c18542e1e5fdfe6c1d560dc44847bb50969d36 SHA512 3a2075dfba437da5de587afe478570afc6b309d300a931c82ac3645b13d0fd08f1a56fbc49703032906aaf667b090b2aacf8f44e0849ac4015ad4ba1d5435377
 EBUILD systemd-255.6.ebuild 14899 BLAKE2B 821ecbb2502896c89a293c75047b79695281127336c8fde824834ffd6390187ebb9c3563e55ae66868fc9591bb41857c9db0f54db2d086a60ef1c1f9c831de7a SHA512 faa9ea73c23062b2cd3e6ce973495364d9d410de95b2847364009fe441adff098c79cac13abd34bc52aea06a962c72ced44000e40e930470950ecc317beb154c
-EBUILD systemd-255.7.ebuild 14892 BLAKE2B 9bff2390bb910d8c3954e9772a973ee252aa02fc7fafada8897bc9cb4e6d7c6e9dabba548262f2b344a1caa02afef9f1c2e530ed973fb14b53178e7ea3c7ee74 SHA512 5770343a6638b37370491d6cc55e35e517ab9ab8ae66d5ec93e442a92d49030cf9a59f7e5b777c68cf99c7dafdaf61cb63e884c85b7f5cf543d81487cdc68cd3
-EBUILD systemd-9999.ebuild 14899 BLAKE2B 821ecbb2502896c89a293c75047b79695281127336c8fde824834ffd6390187ebb9c3563e55ae66868fc9591bb41857c9db0f54db2d086a60ef1c1f9c831de7a SHA512 faa9ea73c23062b2cd3e6ce973495364d9d410de95b2847364009fe441adff098c79cac13abd34bc52aea06a962c72ced44000e40e930470950ecc317beb154c
+EBUILD systemd-255.7.ebuild 14887 BLAKE2B afdba69918cb58a4383ca11b7837c9d45b270926ed7cf8292adbc584792c43daacf37f5f4ac9935d04d254eef4b1f2241919ba07c871b49b9dce75cc9a50a4df SHA512 2f55063343684eb5acab668cb9b47ec6b392ad61add9006071fa66815a79e406234b9270a7dbe4caac408f42ee93f4f58d9df308e5b8c2f5cb03150446f6aac6
+EBUILD systemd-9999.ebuild 14797 BLAKE2B 2501377525d119887baa3f1338e571e0b1ae7fb18bf0a3affa417bb21092d855a0210deb8ac18dfba571b86b6aec93a520f8b09b38eb38d710dfa6a3cac433b1 SHA512 f7b05651309066b198219b878ce2ec2fab160ff17118e7fd5811b8c55a3b3bde776e060ee9f0918b9570fff7c6df1c129b7bcc480d29700dc95faa91d6729f84
 MISC metadata.xml 2609 BLAKE2B 8947f3b696fbba7b90e838a54fbb4fd933c71907c8011652fc2b7d68d4ce5f78a19f350a309e4c0f66ef0159376c9064ba9c15941ecf1748c359c4ae3b072102 SHA512 dfeea24b7a93f5d4af4ac47b87ba08092d069fb1a4749c0c1f36a669be6115eaea8f67e6183b6a4f155ef90d7714f74299109420d569c2b0545d80584ed0e97e
diff --git a/sys-apps/systemd/systemd-255.7.ebuild b/sys-apps/systemd/systemd-255.7.ebuild
index 9745b49b3920..01d86166d7d0 100644
--- a/sys-apps/systemd/systemd-255.7.ebuild
+++ b/sys-apps/systemd/systemd-255.7.ebuild
@@ -175,8 +175,10 @@ BDEPEND="
 	$(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} ) )
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
 	")
 "
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 9ebc6c14fa23..00367ef807d0 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -175,8 +175,10 @@ BDEPEND="
 	$(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} ) )
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
 	")
 "
 
@@ -278,8 +280,6 @@ multilib_src_configure() {
 		# 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)