[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Sam James]

commit:     3dcb91618ebb14780a4ed62e56796997ac47ebd6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 22:29:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 22:29:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcb9161

sys-apps/systemd: drop versions

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/systemd/Manifest                |   6 -
 sys-apps/systemd/systemd-253.10.ebuild   | 514 ------------------------------
 sys-apps/systemd/systemd-253.4.ebuild    | 512 ------------------------------
 sys-apps/systemd/systemd-253.5-r1.ebuild | 515 ------------------------------
 sys-apps/systemd/systemd-253.5.ebuild    | 512 ------------------------------
 sys-apps/systemd/systemd-253.7.ebuild    | 514 ------------------------------
 sys-apps/systemd/systemd-253.8.ebuild    | 514 ------------------------------
 sys-apps/systemd/systemd-254.1-r2.ebuild | 526 -------------------------------
 8 files changed, 3613 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 932dc25766bc..0a44fb22fd7f 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,11 +1,5 @@
-DIST systemd-stable-253.10.tar.gz 12116663 BLAKE2B 
9232067c5fb4ceb3c941d9840a043f34ca3c6eee6e696743715e9f36d47a58e98046ffb6af19084bbd7e8b4edf40c67132a3fa967f37785eb988a18530ca89b1
 SHA512 
dab45496586a9a78ba46a3c03c02e6bd97a8b832e28f96fdf052ecf1906c8c1bdc55967fc243ca837d0371e81730a92bb230e59a43e2ab6bc1b62fbd42a051d4
 DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B 
bb8d95e77ad970ba642346fd0179384258b13b94aacb9f6ff05d4967f5e13d1c709f8b917e485a227fb126e552429c4e302b959eb4697a69dc88b45836c36646
 SHA512 
0018a544f924725f1e7664bfbee0c66591514c077e97352ae5d8d90b6dccfd4d07b9876f25923afa9782b57cc17b8e9ab34c7ae627998804751ba38e46558af4
 DIST systemd-stable-253.3.tar.gz 11996044 BLAKE2B 
fdbac11914ea4a3718dd48c19f0dc34db798e68f36e2e858536e4ef50e376380a250ad59dbbd1ccec4ed73e59efd198dcc0aa85faafa9d6f85d4b2e1de67ccfa
 SHA512 
2c686d83b8b09efa09e09c82feb965f3cfceb6338e42b57d4133dc9ffe52592c67bce9bc9e294c69bc831294e3cbdcc391aba778f10d7b408cef90a85c0ab8aa
-DIST systemd-stable-253.4.tar.gz 12010733 BLAKE2B 
166ce3f089a9fc3d5d374566258d05ddc9ad1e6a06f5d171ee4e3462e30dd996ed45eccac9e27a8ce75ddf591d81ad2af8ce3bd214709cc0b816422f3960f52a
 SHA512 
cbd572330871fe938307cdead57637e9a03fcdb95b62dd12506f13f48fddcacfaf1e7b179bc9e1c1889a07d3bf21f840aafc773df3a1ab05b37d28950cb94ee1
-DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 
3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4
 SHA512 
39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
 DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 
7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4
 SHA512 
c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
-DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 
2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b
 SHA512 
6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
-DIST systemd-stable-253.8.tar.gz 12112413 BLAKE2B 
0edf5d2fdb47ef4c2fd9257642a719cb3cf70096d74ae0002f4df2696f3efd591ddf239f2ac9762aa53ebcee5bf31295739f8176313b8260e97fe99cc51722f6
 SHA512 
628db658ccf01e6cf09c6832735ad08c3d0dd906798e3366d42621fb08ad8b72aa7a51ae4874d76acf6c56282c63dc5fdce677cde3d4e102ce0036571ccabcc4
-DIST systemd-stable-254.1.tar.gz 14324840 BLAKE2B 
10a72db38dae1dd13440f6d59c629b515bfb32f1708efeb6b9134b17887cc0c5af47c184b9a7d3c9be1ecbf8be16ea2682f84c44afd4702ce12861a143e8347a
 SHA512 
eb2f4a95c890792fe11080e8dafc1eb4588ee98a3084d28083c4dd1f97962f56188c41641708c23267d01f1431821e823e1b89012f90d6ede80a12a0ce11a6d7
 DIST systemd-stable-254.3.tar.gz 14329148 BLAKE2B 
10b947e04a4ef9ccaeb7adaa67ac0f391927fb172c0750ffb93d4df69d970fd91f26b052f8bfdfb4f81ae69566d0a3459cbc87cc86b624014cfb8781a2914121
 SHA512 
a0c361c993ac9a121823bdd58e29ef7bd25ccfd206ae0c3e1eed9833b3ddf24f53afe6f669eb9fbff5078977403236b0e4ef5a5f6fde56c504caed1d411e71fe
 DIST systemd-stable-254.4.tar.gz 14332995 BLAKE2B 
2b51ea867e142beeaf332cead5e2daf99b6599a6069d961d19248be2c2b211d25f7e18dd3e1ad2f0588ec121492a1da95e078aa74b7aebed8523ca0512b489ea
 SHA512 
ea2faaa5ba9c8c286c24fba5f47317fa6b26f8678eb1e59c481cf35462b625b605ce18875eaa8cdfdd49ddfeca823e9c571e18bf6df4a62a2421762ab271fb69

diff --git a/sys-apps/systemd/systemd-253.10.ebuild 
b/sys-apps/systemd/systemd-253.10.ebuild
deleted file mode 100644
index cf50cf37cc92..000000000000
--- a/sys-apps/systemd/systemd-253.10.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-# 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";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1
-inherit secureboot systemd toolchain-funcs udev usr-ldscript
-
-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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-       fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-       +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-       +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb 
+zstd
-"
-REQUIRED_USE="
-       dns-over-tls? ( || ( gnutls openssl ) )
-       fido2? ( cryptsetup openssl )
-       homed? ( cryptsetup pam openssl )
-       importd? ( curl lzma || ( gcrypt openssl ) )
-       pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-       >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       acl? ( sys-apps/acl:0= )
-       apparmor? ( sys-libs/libapparmor:0= )
-       audit? ( >=sys-process/audit-2:0= )
-       cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-       curl? ( net-misc/curl: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= )
-       pcre? ( dev-libs/libpcre2 )
-       pwquality? ( dev-libs/libpwquality:0= )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux: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}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# 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
-       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-util/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_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-       $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-       python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-       python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != buildonly ]]; then
-               if use test && has pid-sandbox ${FEATURES}; then
-                       ewarn "Tests are known to fail with PID sandboxing 
enabled."
-                       ewarn "See https://bugs.gentoo.org/674458.";
-               fi
-
-               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 gnuefi && secureboot_pkg_setup
-}
-
-src_unpack() {
-       default
-       [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}/systemd-253-initrd-generators.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-generator-path-r2.patch"
-                       "${FILESDIR}/gentoo-journald-audit-r1.patch"
-               )
-       fi
-
-       # Fails with split-usr.
-       sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-       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"
-               -Dsupport-url="https://gentoo.org/support/";
-               -Dpamlibdir="$(getpam_mod_dir)"
-               # avoid bash-completion dep
-               -Dbashcompletiondir="$(get_bashcompdir)"
-               $(meson_use split-usr)
-               $(meson_use split-usr split-bin)
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               # 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)
-               # Optional components/dependencies
-               $(meson_native_use_bool acl)
-               $(meson_native_use_bool apparmor)
-               $(meson_native_use_bool audit)
-               $(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 gnuefi gnu-efi)
-               $(meson_native_use_bool gnutls)
-               -Defi-includedir="${ESYSROOT}/usr/include/efi"
-               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-               $(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 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 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_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       local -x COLUMNS=80
-       meson_src_test
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-       local sbin=$(usex split-usr sbin bin)
-
-       # 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}${rootprefix}/${sbin}"/resolvconf || die
-       fi
-
-       if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}/${sbin}"/{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
-
-       if ! use resolvconf && ! use sysv-utils && use split-usr; then
-               rmdir "${ED}${rootprefix}"/sbin || 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 "${rootprefix}"/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
-
-       # Symlink /etc/sysctl.conf for easy migration.
-       dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-       if use pam; then
-               newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-       fi
-
-       if use split-usr; then
-               # Avoid breaking boot/reboot
-               dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-               dosym ../../../lib/systemd/systemd-shutdown 
/usr/lib/systemd/systemd-shutdown
-       fi
-
-       gen_usr_ldscript -a systemd udev
-
-       use gnuefi && 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 ! use split-usr; then
-               local dir
-               for dir in bin sbin lib usr/sbin; do
-                       if [[ ! -L ${EROOT}/${dir} ]]; then
-                               eerror "'${EROOT}/${dir}' is not a symbolic 
link."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "installing ${CATEGORY}/${PN} with 
USE=\"-split-usr\" to avoid run-time breakage."
-                       die "System layout with split directories still used"
-               fi
-       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 [[ ${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
-}
-
-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/systemd/systemd-253.4.ebuild 
b/sys-apps/systemd/systemd-253.4.ebuild
deleted file mode 100644
index 72824b08e850..000000000000
--- a/sys-apps/systemd/systemd-253.4.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-# 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";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam
-inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-       fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-       +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-       +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb 
+zstd
-"
-REQUIRED_USE="
-       dns-over-tls? ( || ( gnutls openssl ) )
-       fido2? ( cryptsetup openssl )
-       homed? ( cryptsetup pam openssl )
-       importd? ( curl lzma || ( gcrypt openssl ) )
-       pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-       >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       acl? ( sys-apps/acl:0= )
-       apparmor? ( sys-libs/libapparmor:0= )
-       audit? ( >=sys-process/audit-2:0= )
-       cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-       curl? ( net-misc/curl: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= )
-       pcre? ( dev-libs/libpcre2 )
-       pwquality? ( dev-libs/libpwquality:0= )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux: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}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# 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
-       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-util/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_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-       $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-       python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-       python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != buildonly ]]; then
-               if use test && has pid-sandbox ${FEATURES}; then
-                       ewarn "Tests are known to fail with PID sandboxing 
enabled."
-                       ewarn "See https://bugs.gentoo.org/674458.";
-               fi
-
-               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() {
-       :
-}
-
-src_unpack() {
-       default
-       [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}/systemd-253-initrd-generators.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-generator-path-r2.patch"
-                       "${FILESDIR}/gentoo-journald-audit-r1.patch"
-               )
-       fi
-
-       # Fails with split-usr.
-       sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-       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"
-               -Dsupport-url="https://gentoo.org/support/";
-               -Dpamlibdir="$(getpam_mod_dir)"
-               # avoid bash-completion dep
-               -Dbashcompletiondir="$(get_bashcompdir)"
-               $(meson_use split-usr)
-               $(meson_use split-usr split-bin)
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               # 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)
-               # Optional components/dependencies
-               $(meson_native_use_bool acl)
-               $(meson_native_use_bool apparmor)
-               $(meson_native_use_bool audit)
-               $(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 gnuefi gnu-efi)
-               $(meson_native_use_bool gnutls)
-               -Defi-includedir="${ESYSROOT}/usr/include/efi"
-               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-               $(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 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 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_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       local -x COLUMNS=80
-       meson_src_test
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-       local sbin=$(usex split-usr sbin bin)
-
-       # 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}${rootprefix}/${sbin}"/resolvconf || die
-       fi
-
-       if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}/${sbin}"/{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
-
-       if ! use resolvconf && ! use sysv-utils && use split-usr; then
-               rmdir "${ED}${rootprefix}"/sbin || 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 "${rootprefix}"/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
-
-       # Symlink /etc/sysctl.conf for easy migration.
-       dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-       if use pam; then
-               newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-       fi
-
-       if use split-usr; then
-               # Avoid breaking boot/reboot
-               dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-               dosym ../../../lib/systemd/systemd-shutdown 
/usr/lib/systemd/systemd-shutdown
-       fi
-
-       gen_usr_ldscript -a systemd udev
-}
-
-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 ! use split-usr; then
-               local dir
-               for dir in bin sbin lib usr/sbin; do
-                       if [[ ! -L ${EROOT}/${dir} ]]; then
-                               eerror "'${EROOT}/${dir}' is not a symbolic 
link."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "installing ${CATEGORY}/${PN} with 
USE=\"-split-usr\" to avoid run-time breakage."
-                       die "System layout with split directories still used"
-               fi
-       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 [[ ${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
-}
-
-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/systemd/systemd-253.5-r1.ebuild 
b/sys-apps/systemd/systemd-253.5-r1.ebuild
deleted file mode 100644
index 684c214f6aaa..000000000000
--- a/sys-apps/systemd/systemd-253.5-r1.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-# 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";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1
-inherit secureboot systemd toolchain-funcs udev usr-ldscript
-
-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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-       fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-       +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-       +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb 
+zstd
-"
-REQUIRED_USE="
-       dns-over-tls? ( || ( gnutls openssl ) )
-       fido2? ( cryptsetup openssl )
-       homed? ( cryptsetup pam openssl )
-       importd? ( curl lzma || ( gcrypt openssl ) )
-       pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-       >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       acl? ( sys-apps/acl:0= )
-       apparmor? ( sys-libs/libapparmor:0= )
-       audit? ( >=sys-process/audit-2:0= )
-       cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-       curl? ( net-misc/curl: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= )
-       pcre? ( dev-libs/libpcre2 )
-       pwquality? ( dev-libs/libpwquality:0= )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux: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}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# 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
-       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-util/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_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-       $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-       python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-       python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != buildonly ]]; then
-               if use test && has pid-sandbox ${FEATURES}; then
-                       ewarn "Tests are known to fail with PID sandboxing 
enabled."
-                       ewarn "See https://bugs.gentoo.org/674458.";
-               fi
-
-               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 gnuefi && secureboot_pkg_setup
-}
-
-src_unpack() {
-       default
-       [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}/systemd-253-initrd-generators.patch"
-               "${FILESDIR}/systemd-253.5-services-stop.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-generator-path-r2.patch"
-                       "${FILESDIR}/gentoo-journald-audit-r1.patch"
-               )
-       fi
-
-       # Fails with split-usr.
-       sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-       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"
-               -Dsupport-url="https://gentoo.org/support/";
-               -Dpamlibdir="$(getpam_mod_dir)"
-               # avoid bash-completion dep
-               -Dbashcompletiondir="$(get_bashcompdir)"
-               $(meson_use split-usr)
-               $(meson_use split-usr split-bin)
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               # 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)
-               # Optional components/dependencies
-               $(meson_native_use_bool acl)
-               $(meson_native_use_bool apparmor)
-               $(meson_native_use_bool audit)
-               $(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 gnuefi gnu-efi)
-               $(meson_native_use_bool gnutls)
-               -Defi-includedir="${ESYSROOT}/usr/include/efi"
-               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-               $(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 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 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_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       local -x COLUMNS=80
-       meson_src_test
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-       local sbin=$(usex split-usr sbin bin)
-
-       # 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}${rootprefix}/${sbin}"/resolvconf || die
-       fi
-
-       if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}/${sbin}"/{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
-
-       if ! use resolvconf && ! use sysv-utils && use split-usr; then
-               rmdir "${ED}${rootprefix}"/sbin || 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 "${rootprefix}"/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
-
-       # Symlink /etc/sysctl.conf for easy migration.
-       dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-       if use pam; then
-               newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-       fi
-
-       if use split-usr; then
-               # Avoid breaking boot/reboot
-               dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-               dosym ../../../lib/systemd/systemd-shutdown 
/usr/lib/systemd/systemd-shutdown
-       fi
-
-       gen_usr_ldscript -a systemd udev
-
-       use gnuefi && 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 ! use split-usr; then
-               local dir
-               for dir in bin sbin lib usr/sbin; do
-                       if [[ ! -L ${EROOT}/${dir} ]]; then
-                               eerror "'${EROOT}/${dir}' is not a symbolic 
link."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "installing ${CATEGORY}/${PN} with 
USE=\"-split-usr\" to avoid run-time breakage."
-                       die "System layout with split directories still used"
-               fi
-       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 [[ ${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
-}
-
-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/systemd/systemd-253.5.ebuild 
b/sys-apps/systemd/systemd-253.5.ebuild
deleted file mode 100644
index 72824b08e850..000000000000
--- a/sys-apps/systemd/systemd-253.5.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-# 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";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam
-inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-       fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-       +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-       +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb 
+zstd
-"
-REQUIRED_USE="
-       dns-over-tls? ( || ( gnutls openssl ) )
-       fido2? ( cryptsetup openssl )
-       homed? ( cryptsetup pam openssl )
-       importd? ( curl lzma || ( gcrypt openssl ) )
-       pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-       >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       acl? ( sys-apps/acl:0= )
-       apparmor? ( sys-libs/libapparmor:0= )
-       audit? ( >=sys-process/audit-2:0= )
-       cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-       curl? ( net-misc/curl: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= )
-       pcre? ( dev-libs/libpcre2 )
-       pwquality? ( dev-libs/libpwquality:0= )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux: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}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# 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
-       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-util/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_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-       $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-       python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-       python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != buildonly ]]; then
-               if use test && has pid-sandbox ${FEATURES}; then
-                       ewarn "Tests are known to fail with PID sandboxing 
enabled."
-                       ewarn "See https://bugs.gentoo.org/674458.";
-               fi
-
-               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() {
-       :
-}
-
-src_unpack() {
-       default
-       [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}/systemd-253-initrd-generators.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-generator-path-r2.patch"
-                       "${FILESDIR}/gentoo-journald-audit-r1.patch"
-               )
-       fi
-
-       # Fails with split-usr.
-       sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-       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"
-               -Dsupport-url="https://gentoo.org/support/";
-               -Dpamlibdir="$(getpam_mod_dir)"
-               # avoid bash-completion dep
-               -Dbashcompletiondir="$(get_bashcompdir)"
-               $(meson_use split-usr)
-               $(meson_use split-usr split-bin)
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               # 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)
-               # Optional components/dependencies
-               $(meson_native_use_bool acl)
-               $(meson_native_use_bool apparmor)
-               $(meson_native_use_bool audit)
-               $(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 gnuefi gnu-efi)
-               $(meson_native_use_bool gnutls)
-               -Defi-includedir="${ESYSROOT}/usr/include/efi"
-               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-               $(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 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 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_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       local -x COLUMNS=80
-       meson_src_test
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-       local sbin=$(usex split-usr sbin bin)
-
-       # 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}${rootprefix}/${sbin}"/resolvconf || die
-       fi
-
-       if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}/${sbin}"/{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
-
-       if ! use resolvconf && ! use sysv-utils && use split-usr; then
-               rmdir "${ED}${rootprefix}"/sbin || 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 "${rootprefix}"/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
-
-       # Symlink /etc/sysctl.conf for easy migration.
-       dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-       if use pam; then
-               newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-       fi
-
-       if use split-usr; then
-               # Avoid breaking boot/reboot
-               dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-               dosym ../../../lib/systemd/systemd-shutdown 
/usr/lib/systemd/systemd-shutdown
-       fi
-
-       gen_usr_ldscript -a systemd udev
-}
-
-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 ! use split-usr; then
-               local dir
-               for dir in bin sbin lib usr/sbin; do
-                       if [[ ! -L ${EROOT}/${dir} ]]; then
-                               eerror "'${EROOT}/${dir}' is not a symbolic 
link."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "installing ${CATEGORY}/${PN} with 
USE=\"-split-usr\" to avoid run-time breakage."
-                       die "System layout with split directories still used"
-               fi
-       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 [[ ${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
-}
-
-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/systemd/systemd-253.7.ebuild 
b/sys-apps/systemd/systemd-253.7.ebuild
deleted file mode 100644
index cf50cf37cc92..000000000000
--- a/sys-apps/systemd/systemd-253.7.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-# 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";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1
-inherit secureboot systemd toolchain-funcs udev usr-ldscript
-
-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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-       fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-       +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-       +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb 
+zstd
-"
-REQUIRED_USE="
-       dns-over-tls? ( || ( gnutls openssl ) )
-       fido2? ( cryptsetup openssl )
-       homed? ( cryptsetup pam openssl )
-       importd? ( curl lzma || ( gcrypt openssl ) )
-       pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-       >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       acl? ( sys-apps/acl:0= )
-       apparmor? ( sys-libs/libapparmor:0= )
-       audit? ( >=sys-process/audit-2:0= )
-       cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-       curl? ( net-misc/curl: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= )
-       pcre? ( dev-libs/libpcre2 )
-       pwquality? ( dev-libs/libpwquality:0= )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux: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}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# 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
-       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-util/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_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-       $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-       python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-       python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != buildonly ]]; then
-               if use test && has pid-sandbox ${FEATURES}; then
-                       ewarn "Tests are known to fail with PID sandboxing 
enabled."
-                       ewarn "See https://bugs.gentoo.org/674458.";
-               fi
-
-               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 gnuefi && secureboot_pkg_setup
-}
-
-src_unpack() {
-       default
-       [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}/systemd-253-initrd-generators.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-generator-path-r2.patch"
-                       "${FILESDIR}/gentoo-journald-audit-r1.patch"
-               )
-       fi
-
-       # Fails with split-usr.
-       sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-       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"
-               -Dsupport-url="https://gentoo.org/support/";
-               -Dpamlibdir="$(getpam_mod_dir)"
-               # avoid bash-completion dep
-               -Dbashcompletiondir="$(get_bashcompdir)"
-               $(meson_use split-usr)
-               $(meson_use split-usr split-bin)
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               # 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)
-               # Optional components/dependencies
-               $(meson_native_use_bool acl)
-               $(meson_native_use_bool apparmor)
-               $(meson_native_use_bool audit)
-               $(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 gnuefi gnu-efi)
-               $(meson_native_use_bool gnutls)
-               -Defi-includedir="${ESYSROOT}/usr/include/efi"
-               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-               $(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 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 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_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       local -x COLUMNS=80
-       meson_src_test
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-       local sbin=$(usex split-usr sbin bin)
-
-       # 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}${rootprefix}/${sbin}"/resolvconf || die
-       fi
-
-       if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}/${sbin}"/{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
-
-       if ! use resolvconf && ! use sysv-utils && use split-usr; then
-               rmdir "${ED}${rootprefix}"/sbin || 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 "${rootprefix}"/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
-
-       # Symlink /etc/sysctl.conf for easy migration.
-       dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-       if use pam; then
-               newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-       fi
-
-       if use split-usr; then
-               # Avoid breaking boot/reboot
-               dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-               dosym ../../../lib/systemd/systemd-shutdown 
/usr/lib/systemd/systemd-shutdown
-       fi
-
-       gen_usr_ldscript -a systemd udev
-
-       use gnuefi && 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 ! use split-usr; then
-               local dir
-               for dir in bin sbin lib usr/sbin; do
-                       if [[ ! -L ${EROOT}/${dir} ]]; then
-                               eerror "'${EROOT}/${dir}' is not a symbolic 
link."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "installing ${CATEGORY}/${PN} with 
USE=\"-split-usr\" to avoid run-time breakage."
-                       die "System layout with split directories still used"
-               fi
-       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 [[ ${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
-}
-
-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/systemd/systemd-253.8.ebuild 
b/sys-apps/systemd/systemd-253.8.ebuild
deleted file mode 100644
index cf50cf37cc92..000000000000
--- a/sys-apps/systemd/systemd-253.8.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-# 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";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1
-inherit secureboot systemd toolchain-funcs udev usr-ldscript
-
-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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-       fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-       +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-       +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb 
+zstd
-"
-REQUIRED_USE="
-       dns-over-tls? ( || ( gnutls openssl ) )
-       fido2? ( cryptsetup openssl )
-       homed? ( cryptsetup pam openssl )
-       importd? ( curl lzma || ( gcrypt openssl ) )
-       pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-       >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       acl? ( sys-apps/acl:0= )
-       apparmor? ( sys-libs/libapparmor:0= )
-       audit? ( >=sys-process/audit-2:0= )
-       cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-       curl? ( net-misc/curl: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= )
-       pcre? ( dev-libs/libpcre2 )
-       pwquality? ( dev-libs/libpwquality:0= )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux: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}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# 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
-       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-util/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_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-       $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-       python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-       python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != buildonly ]]; then
-               if use test && has pid-sandbox ${FEATURES}; then
-                       ewarn "Tests are known to fail with PID sandboxing 
enabled."
-                       ewarn "See https://bugs.gentoo.org/674458.";
-               fi
-
-               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 gnuefi && secureboot_pkg_setup
-}
-
-src_unpack() {
-       default
-       [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}/systemd-253-initrd-generators.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-generator-path-r2.patch"
-                       "${FILESDIR}/gentoo-journald-audit-r1.patch"
-               )
-       fi
-
-       # Fails with split-usr.
-       sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-       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"
-               -Dsupport-url="https://gentoo.org/support/";
-               -Dpamlibdir="$(getpam_mod_dir)"
-               # avoid bash-completion dep
-               -Dbashcompletiondir="$(get_bashcompdir)"
-               $(meson_use split-usr)
-               $(meson_use split-usr split-bin)
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               # 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)
-               # Optional components/dependencies
-               $(meson_native_use_bool acl)
-               $(meson_native_use_bool apparmor)
-               $(meson_native_use_bool audit)
-               $(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 gnuefi gnu-efi)
-               $(meson_native_use_bool gnutls)
-               -Defi-includedir="${ESYSROOT}/usr/include/efi"
-               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-               $(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 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 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_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       local -x COLUMNS=80
-       meson_src_test
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-       local sbin=$(usex split-usr sbin bin)
-
-       # 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}${rootprefix}/${sbin}"/resolvconf || die
-       fi
-
-       if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}/${sbin}"/{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
-
-       if ! use resolvconf && ! use sysv-utils && use split-usr; then
-               rmdir "${ED}${rootprefix}"/sbin || 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 "${rootprefix}"/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
-
-       # Symlink /etc/sysctl.conf for easy migration.
-       dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-       if use pam; then
-               newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-       fi
-
-       if use split-usr; then
-               # Avoid breaking boot/reboot
-               dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-               dosym ../../../lib/systemd/systemd-shutdown 
/usr/lib/systemd/systemd-shutdown
-       fi
-
-       gen_usr_ldscript -a systemd udev
-
-       use gnuefi && 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 ! use split-usr; then
-               local dir
-               for dir in bin sbin lib usr/sbin; do
-                       if [[ ! -L ${EROOT}/${dir} ]]; then
-                               eerror "'${EROOT}/${dir}' is not a symbolic 
link."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "installing ${CATEGORY}/${PN} with 
USE=\"-split-usr\" to avoid run-time breakage."
-                       die "System layout with split directories still used"
-               fi
-       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 [[ ${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
-}
-
-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/systemd/systemd-254.1-r2.ebuild 
b/sys-apps/systemd/systemd-254.1-r2.ebuild
deleted file mode 100644
index 3764fb99b05a..000000000000
--- a/sys-apps/systemd/systemd-254.1-r2.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-# 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";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-single-r1
-inherit secureboot systemd toolchain-funcs udev usr-ldscript
-
-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 +kmod
-       +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-       +resolvconf +seccomp selinux split-usr +sysv-utils test tpm 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 )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-       >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       acl? ( sys-apps/acl:0= )
-       apparmor? ( sys-libs/libapparmor:0= )
-       audit? ( >=sys-process/audit-2:0= )
-       cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-       curl? ( net-misc/curl: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= )
-       pcre? ( dev-libs/libpcre2 )
-       pwquality? ( dev-libs/libpwquality:0= )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux: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
-       boot? (
-               ${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-util/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}]
-                       test? ( ${PEFILE_DEPEND} )
-               )
-       ")
-"
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != buildonly ]]; then
-               if use test && has pid-sandbox ${FEATURES}; then
-                       ewarn "Tests are known to fail with PID sandboxing 
enabled."
-                       ewarn "See https://bugs.gentoo.org/674458.";
-               fi
-
-               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-253-initrd-generators.patch"
-               "${FILESDIR}/systemd-254.1-tmpfiles-setup-dev-early.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-generator-path-r2.patch"
-                       "${FILESDIR}/gentoo-journald-audit-r1.patch"
-               )
-       fi
-
-       # Fails with split-usr.
-       sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-       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"
-               -Dsupport-url="https://gentoo.org/support/";
-               -Dpamlibdir="$(getpam_mod_dir)"
-               # avoid bash-completion dep
-               -Dbashcompletiondir="$(get_bashcompdir)"
-               $(meson_use split-usr)
-               $(meson_use split-usr split-bin)
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               # 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)
-               # 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 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 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_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       local -x COLUMNS=80
-       meson_src_test
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-       local sbin=$(usex split-usr sbin bin)
-
-       # 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}${rootprefix}/${sbin}"/resolvconf || die
-       fi
-
-       if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}/${sbin}"/{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 "${rootprefix}"/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 split-usr; then
-               # Avoid breaking boot/reboot
-               dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-               dosym ../../../lib/systemd/systemd-shutdown 
/usr/lib/systemd/systemd-shutdown
-       fi
-
-       gen_usr_ldscript -a systemd udev
-
-       if use boot; then
-               python_fix_shebang "${ED}"
-               secureboot_auto_sign
-       fi
-}
-
-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 split-usr; then
-               local dir
-               for dir in bin sbin lib usr/sbin; do
-                       if [[ ! -L ${EROOT}/${dir} ]]; then
-                               eerror "'${EROOT}/${dir}' is not a symbolic 
link."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "installing ${CATEGORY}/${PN} with 
USE=\"-split-usr\" to avoid run-time breakage."
-                       die "System layout with split directories still used"
-               fi
-       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 [[ ${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
-}
-
-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
-}