commit:     c7fb3be35836126c26ce27ae5f5ad221b53114f8
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 14:49:32 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 14:49:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7fb3be3

sys-apps/systemd: remove old

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/Manifest                          |   2 -
 sys-apps/systemd/files/245-clang-gnu11.patch       |  60 ---
 .../systemd/files/245-libmicrohttpd-0.9.71.patch   |  67 ---
 sys-apps/systemd/systemd-244.3.ebuild              | 507 --------------------
 sys-apps/systemd/systemd-245.5.ebuild              | 529 ---------------------
 5 files changed, 1165 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 176014c52ae..db43ac9e2de 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,2 @@
 DIST systemd-246.tar.gz 9534036 BLAKE2B 
71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0
 SHA512 
7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
-DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 
25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d
 SHA512 
f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
-DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 
7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d
 SHA512 
47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 DIST systemd-stable-245.7.tar.gz 9171465 BLAKE2B 
77117360155ef6358244a382ebd521fe180d8dd982cc2edda18790105933cd5e8880030572eb50d5405b9afdab519b06e0721f48c57394d3d1043a123169ccb1
 SHA512 
306b3a9cd1d8985a05be259f8a08efb5e9f7102a657eccdef58e082822b61a6e82246dc4f3b6e0bd33eedbd550af54e0029af9d0d2b70416e27626ec43921449

diff --git a/sys-apps/systemd/files/245-clang-gnu11.patch 
b/sys-apps/systemd/files/245-clang-gnu11.patch
deleted file mode 100644
index 9056b56d48e..00000000000
--- a/sys-apps/systemd/files/245-clang-gnu11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 36e0d89a88c51ba879a2d7e2f90ea9b38333e2c0 Mon Sep 17 00:00:00 2001
-From: Denis Pronin <dann...@yandex.ru>
-Date: Sun, 8 Mar 2020 23:57:07 +0300
-Subject: [PATCH] Support compiling with clang and gnu11 standard
-
-Signed-off-by: Denis Pronin <dann...@yandex.ru>
----
- src/shared/json-internal.h | 35 ++++++++++++++++++++++++-----------
- 1 file changed, 24 insertions(+), 11 deletions(-)
-
-diff --git a/src/shared/json-internal.h b/src/shared/json-internal.h
-index bf158bff0d4..fabff0c860e 100644
---- a/src/shared/json-internal.h
-+++ b/src/shared/json-internal.h
-@@ -26,21 +26,34 @@ assert_cc(sizeof(JsonValue) == 16U);
- /* We use fake JsonVariant objects for some special values, in order to avoid 
memory allocations for them. Note that
-  * effectively this means that there are multiple ways to encode the same 
objects: via these magic values or as
-  * properly allocated JsonVariant. We convert between both on-the-fly as 
necessary. */
--#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) 1)
--#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) 2)
--#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) 3)
--#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 4)
--#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 5)
--#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 6)
--#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 7)
--#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 8)
--#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 9)
--#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) 10)
-+enum
-+{
-+ _JSON_VARIANT_MAGIC_TRUE = 1,
-+#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) _JSON_VARIANT_MAGIC_TRUE)
-+ _JSON_VARIANT_MAGIC_FALSE,
-+#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) _JSON_VARIANT_MAGIC_FALSE)
-+ _JSON_VARIANT_MAGIC_NULL,
-+#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) _JSON_VARIANT_MAGIC_NULL)
-+ _JSON_VARIANT_MAGIC_ZERO_INTEGER,
-+#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_INTEGER)
-+ _JSON_VARIANT_MAGIC_ZERO_UNSIGNED,
-+#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_UNSIGNED)
-+ _JSON_VARIANT_MAGIC_ZERO_REAL,
-+#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_REAL)
-+ _JSON_VARIANT_MAGIC_EMPTY_STRING,
-+#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 
_JSON_VARIANT_MAGIC_EMPTY_STRING)
-+ _JSON_VARIANT_MAGIC_EMPTY_ARRAY,
-+#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 
_JSON_VARIANT_MAGIC_EMPTY_ARRAY)
-+ _JSON_VARIANT_MAGIC_EMPTY_OBJECT,
-+#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 
_JSON_VARIANT_MAGIC_EMPTY_OBJECT)
-+ __JSON_VARIANT_MAGIC_MAX
-+#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) __JSON_VARIANT_MAGIC_MAX)
-+};
- 
- /* This is only safe as long as we don't define more than 4K magic pointers, 
i.e. the page size of the simplest
-  * architectures we support. That's because we rely on the fact that malloc() 
will never allocate from the first memory
-  * page, as it is a faulting page for catching NULL pointer dereferences. */
--assert_cc((uintptr_t) _JSON_VARIANT_MAGIC_MAX < 4096U);
-+assert_cc((unsigned) __JSON_VARIANT_MAGIC_MAX < 4096U);
- 
- enum { /* JSON tokens */
-         JSON_TOKEN_END,

diff --git a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch 
b/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
deleted file mode 100644
index 08affa50170..00000000000
--- a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d17eabb1052e7c8c432331a7a782845e36164f01 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbys...@in.waw.pl>
-Date: Tue, 30 Jun 2020 09:56:10 +0200
-Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The return type of callbacks was changed from int to an enum.
----
- src/journal-remote/journal-gatewayd.c    | 4 ++--
- src/journal-remote/journal-remote-main.c | 2 +-
- src/journal-remote/microhttpd-util.h     | 6 ++++++
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/journal-remote/journal-gatewayd.c 
b/src/journal-remote/journal-gatewayd.c
-index 5177e0d1577..3ab7c98b0b5 100644
---- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -349,7 +349,7 @@ static int request_parse_range(
-         return 0;
- }
- 
--static int request_parse_arguments_iterator(
-+static mhd_result request_parse_arguments_iterator(
-                 void *cls,
-                 enum MHD_ValueKind kind,
-                 const char *key,
-@@ -796,7 +796,7 @@ static int request_handler_machine(
-         return MHD_queue_response(connection, MHD_HTTP_OK, response);
- }
- 
--static int request_handler(
-+static mhd_result request_handler(
-                 void *cls,
-                 struct MHD_Connection *connection,
-                 const char *url,
-diff --git a/src/journal-remote/journal-remote-main.c 
b/src/journal-remote/journal-remote-main.c
-index 69a111afead..f82d188a8c6 100644
---- a/src/journal-remote/journal-remote-main.c
-+++ b/src/journal-remote/journal-remote-main.c
-@@ -253,7 +253,7 @@ static int process_http_upload(
-         return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK.");
- };
- 
--static int request_handler(
-+static mhd_result request_handler(
-                 void *cls,
-                 struct MHD_Connection *connection,
-                 const char *url,
-diff --git a/src/journal-remote/microhttpd-util.h 
b/src/journal-remote/microhttpd-util.h
-index d90c6bbd4f1..4ca9a5c4f16 100644
---- a/src/journal-remote/microhttpd-util.h
-+++ b/src/journal-remote/microhttpd-util.h
-@@ -47,6 +47,12 @@
- #  define MHD_create_response_from_fd_at_offset64 
MHD_create_response_from_fd_at_offset
- #endif
- 
-+#if MHD_VERSION >= 0x00097002
-+#  define mhd_result enum MHD_Result
-+#else
-+#  define mhd_result int
-+#endif
-+
- void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
- 
- /* respond_oom() must be usable with return, hence this form. */

diff --git a/sys-apps/systemd/systemd-244.3.ebuild 
b/sys-apps/systemd/systemd-244.3.ebuild
deleted file mode 100644
index 7a177b4f052..00000000000
--- a/sys-apps/systemd/systemd-244.3.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ppc ppc64 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam 
python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls 
elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit 
qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test 
vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${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= )
-       dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
-       elfutils? ( >=dev-libs/elfutils-0.158:0= )
-       gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-       http? (
-               >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-               >=net-libs/gnutls-3.1.4:0=
-       )
-       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}] )
-       nat? ( net-firewall/iptables:0= )
-       pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-       pcre? ( dev-libs/libpcre2 )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# 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
-       acct-group/wheel
-       acct-group/kmem
-       acct-group/tty
-       acct-group/utmp
-       acct-group/audio
-       acct-group/cdrom
-       acct-group/dialout
-       acct-group/disk
-       acct-group/input
-       acct-group/kvm
-       acct-group/render
-       acct-group/tape
-       acct-group/video
-       acct-group/systemd-journal
-       acct-user/systemd-journal-remote
-       acct-user/systemd-coredump
-       acct-user/systemd-network
-       acct-user/systemd-resolve
-       acct-user/systemd-timesync
-       >=sys-apps/baselayout-2.2
-       selinux? ( sec-policy/selinux-base-policy[systemd] )
-       sysv-utils? ( !sys-apps/sysvinit )
-       !sysv-utils? ( sys-apps/sysvinit )
-       resolvconf? ( !net-dns/openresolv )
-       !build? ( || (
-               sys-apps/util-linux[kill(-)]
-               sys-process/procps[kill(+)]
-               sys-apps/coreutils[kill(-)]
-       ) )
-       !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-apps/hwids-20150417[udev]
-       >=sys-fs/udev-init-scripts-25
-       policykit? ( sys-auth/polkit )
-       !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-       app-arch/xz-utils:0
-       dev-util/gperf
-       >=dev-util/meson-0.46
-       >=dev-util/intltool-0.50
-       >=sys-apps/coreutils-8.16
-       sys-devel/m4
-       virtual/pkgconfig
-       test? ( 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/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-       has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-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="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-                       ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-                       ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD 
~SYSFS
-                       ~TIMERFD ~TMPFS_XATTR ~UNIX
-                       ~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"
-               kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-               kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-               kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-               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() {
-       # Do NOT add patches here
-       local PATCHES=()
-
-       [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-       # Add local patches here
-       PATCHES+=(
-               "${FILESDIR}/245-clang-gnu11.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-                       "${FILESDIR}/gentoo-systemd-user-pam.patch"
-                       "${FILESDIR}/gentoo-generator-path-r1.patch"
-               )
-       fi
-
-       default
-}
-
-src_configure() {
-       # Prevent conflicts with i686 cross toolchain, bug 559726
-       tc-export AR CC NM OBJCOPY RANLIB
-
-       python_setup
-
-       multilib-minimal_src_configure
-}
-
-meson_use() {
-       usex "$1" true false
-}
-
-meson_multilib() {
-       if multilib_is_native_abi; then
-               echo true
-       else
-               echo false
-       fi
-}
-
-meson_multilib_native_use() {
-       if multilib_is_native_abi && use "$1"; then
-               echo true
-       else
-               echo false
-       fi
-}
-
-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)"
-               # make sure we get /bin:/sbin in PATH
-               -Dsplit-usr=$(usex split-usr true false)
-               -Dsplit-bin=true
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               -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
-               -Dacl=$(meson_multilib_native_use acl)
-               -Dapparmor=$(meson_multilib_native_use apparmor)
-               -Daudit=$(meson_multilib_native_use audit)
-               -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-               -Dlibcurl=$(meson_multilib_native_use curl)
-               -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-               -Delfutils=$(meson_multilib_native_use elfutils)
-               -Dgcrypt=$(meson_use gcrypt)
-               -Dgnu-efi=$(meson_multilib_native_use gnuefi)
-               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-               -Dmicrohttpd=$(meson_multilib_native_use http)
-               -Didn=$(meson_multilib_native_use idn)
-               -Dimportd=$(meson_multilib_native_use importd)
-               -Dbzip2=$(meson_multilib_native_use importd)
-               -Dzlib=$(meson_multilib_native_use importd)
-               -Dkmod=$(meson_multilib_native_use kmod)
-               -Dlz4=$(meson_use lz4)
-               -Dxz=$(meson_use lzma)
-               -Dlibiptc=$(meson_multilib_native_use nat)
-               -Dpam=$(meson_use pam)
-               -Dpcre2=$(meson_multilib_native_use pcre)
-               -Dpolkit=$(meson_multilib_native_use policykit)
-               -Dqrencode=$(meson_multilib_native_use qrcode)
-               -Dseccomp=$(meson_multilib_native_use seccomp)
-               -Dselinux=$(meson_multilib_native_use selinux)
-               -Ddbus=$(meson_multilib_native_use test)
-               -Dxkbcommon=$(meson_multilib_native_use xkb)
-               -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
-               -Dbacklight=$(meson_multilib)
-               -Dbinfmt=$(meson_multilib)
-               -Dcoredump=$(meson_multilib)
-               -Denvironment-d=$(meson_multilib)
-               -Dfirstboot=$(meson_multilib)
-               -Dhibernate=$(meson_multilib)
-               -Dhostnamed=$(meson_multilib)
-               -Dhwdb=$(meson_multilib)
-               -Dldconfig=$(meson_multilib)
-               -Dlocaled=$(meson_multilib)
-               -Dman=$(meson_multilib)
-               -Dnetworkd=$(meson_multilib)
-               -Dquotacheck=$(meson_multilib)
-               -Drandomseed=$(meson_multilib)
-               -Drfkill=$(meson_multilib)
-               -Dsysusers=$(meson_multilib)
-               -Dtimedated=$(meson_multilib)
-               -Dtimesyncd=$(meson_multilib)
-               -Dtmpfiles=$(meson_multilib)
-               -Dvconsole=$(meson_multilib)
-
-               # static-libs
-               -Dstatic-libsystemd=$(usex static-libs true false)
-               -Dstatic-libudev=$(usex static-libs true false)
-       )
-
-       meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       eninja
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       meson_src_test
-}
-
-multilib_src_install() {
-       DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-
-       # meson doesn't know about docdir
-       mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-       einstalldocs
-       dodoc "${FILESDIR}"/nsswitch.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,runlevel,shutdown,telinit} 
|| die
-               rm "${ED}"/usr/share/man/man1/init.1 || die
-               rm 
"${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 
|| die
-       fi
-
-       if ! use resolvconf && ! use sysv-utils; then
-               rmdir "${ED}${rootprefix}"/sbin || die
-       fi
-
-       # 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/{hwdb.d,rules.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 ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-       rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-
-       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
-}
-
-save_enabled_units() {
-       ENABLED_UNITS=()
-       type systemctl &>/dev/null || return
-       for x; do
-               if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-                       ENABLED_UNITS+=( "${x}" )
-               fi
-       done
-}
-
-pkg_preinst() {
-       save_enabled_units {machines,remote-{cryptsetup,fs}}.target 
getty@tty1.service
-
-       if ! use split-usr; then
-               local dir
-               for dir in bin sbin lib; do
-                       if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-                               eerror "\"${EROOT}/${dir}\" and 
\"${EROOT}/usr/${dir}\" are not merged."
-                               eerror "One of them should be a symbolic link 
to the other one."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "rebuilding ${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. Despite that this file is owned by sys-apps/hwids.
-       if has_version "sys-apps/hwids[udev]"; then
-               udevadm hwdb --update --root="${EROOT}"
-       fi
-
-       udev_reload || FAIL=1
-
-       # Bug 465468, make sure locales are respect, and ensure consistency
-       # between OpenRC & systemd
-       migrate_locale
-
-       systemd_reenable systemd-networkd.service systemd-resolved.service
-
-       if [[ ${ENABLED_UNITS[@]} ]]; then
-               systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-       fi
-
-       if [[ -z ${REPLACING_VERSIONS} ]]; then
-               if type systemctl &>/dev/null; then
-                       systemctl --root="${ROOT:-/}" enable getty@.service 
remote-fs.target || FAIL=1
-               fi
-               elog "To enable a useful set of services, run the following:"
-               elog "  systemctl preset-all --preset-mode=enable-only"
-       fi
-
-       if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-               rm "${EROOT}/var/lib/systemd/timesync"
-       fi
-
-       if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-               ebegin "Reexecuting system manager"
-               systemctl daemon-reexec
-               eend $?
-       fi
-
-       if [[ ${FAIL} ]]; then
-               eerror "One of the postinst commands failed. Please check the 
postinst output"
-               eerror "for errors. You may need to clean up your system and/or 
try installing"
-               eerror "systemd again."
-               eerror
-       fi
-}
-
-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-245.5.ebuild 
b/sys-apps/systemd/systemd-245.5.ebuild
deleted file mode 100644
index ce5b9534257..00000000000
--- a/sys-apps/systemd/systemd-245.5.ebuild
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ~ppc ~ppc64 ~sparc 
~x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam 
python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls 
elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam 
pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux 
split-usr static-libs +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="
-       homed? ( cryptsetup )
-       importd? ( curl gcrypt lzma )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${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= )
-       dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-       elfutils? ( >=dev-libs/elfutils-0.158:0= )
-       gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-       homed? ( ${OPENSSL_DEP} )
-       http? (
-               >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-               >=net-libs/gnutls-3.1.4:0=
-       )
-       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}] )
-       nat? ( net-firewall/iptables: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= )
-       repart? ( ${OPENSSL_DEP} )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# 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
-       acct-group/wheel
-       acct-group/kmem
-       acct-group/tty
-       acct-group/utmp
-       acct-group/audio
-       acct-group/cdrom
-       acct-group/dialout
-       acct-group/disk
-       acct-group/input
-       acct-group/kvm
-       acct-group/render
-       acct-group/tape
-       acct-group/video
-       acct-group/systemd-journal
-       acct-user/systemd-journal-remote
-       acct-user/systemd-coredump
-       acct-user/systemd-network
-       acct-user/systemd-resolve
-       acct-user/systemd-timesync
-       >=sys-apps/baselayout-2.2
-       selinux? ( sec-policy/selinux-base-policy[systemd] )
-       sysv-utils? ( !sys-apps/sysvinit )
-       !sysv-utils? ( sys-apps/sysvinit )
-       resolvconf? ( !net-dns/openresolv )
-       !build? ( || (
-               sys-apps/util-linux[kill(-)]
-               sys-process/procps[kill(+)]
-               sys-apps/coreutils[kill(-)]
-       ) )
-       !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]
-       hwdb? ( >=sys-apps/hwids-20150417[udev] )
-       >=sys-fs/udev-init-scripts-25
-       policykit? ( sys-auth/polkit )
-       !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-       app-arch/xz-utils:0
-       dev-util/gperf
-       >=dev-util/meson-0.46
-       >=dev-util/intltool-0.50
-       >=sys-apps/coreutils-8.16
-       sys-devel/m4
-       virtual/pkgconfig
-       test? ( 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/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-       has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-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="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-                       ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-                       ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD 
~SYSFS
-                       ~TIMERFD ~TMPFS_XATTR ~UNIX
-                       ~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"
-               kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-               kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-               kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-               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() {
-       # Do NOT add patches here
-       local PATCHES=()
-
-       [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-       # Add local patches here
-       PATCHES+=(
-               "${FILESDIR}/245-libmicrohttpd-0.9.71.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-                       "${FILESDIR}/gentoo-systemd-user-pam.patch"
-                       "${FILESDIR}/gentoo-generator-path-r1.patch"
-                       "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
-               )
-       fi
-
-       default
-}
-
-src_configure() {
-       # Prevent conflicts with i686 cross toolchain, bug 559726
-       tc-export AR CC NM OBJCOPY RANLIB
-
-       python_setup
-
-       multilib-minimal_src_configure
-}
-
-meson_use() {
-       usex "$1" true false
-}
-
-meson_multilib() {
-       if multilib_is_native_abi; then
-               echo true
-       else
-               echo false
-       fi
-}
-
-meson_multilib_native_use() {
-       if multilib_is_native_abi && use "$1"; then
-               echo true
-       else
-               echo false
-       fi
-}
-
-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)"
-               # make sure we get /bin:/sbin in PATH
-               -Dsplit-usr=$(usex split-usr true false)
-               -Dsplit-bin=true
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
-               -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               # 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
-               -Dacl=$(meson_multilib_native_use acl)
-               -Dapparmor=$(meson_multilib_native_use apparmor)
-               -Daudit=$(meson_multilib_native_use audit)
-               -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-               -Dlibcurl=$(meson_multilib_native_use curl)
-               -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-               -Delfutils=$(meson_multilib_native_use elfutils)
-               -Dgcrypt=$(meson_use gcrypt)
-               -Dgnu-efi=$(meson_multilib_native_use gnuefi)
-               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-               -Dhomed=$(meson_multilib_native_use homed)
-               -Dhwdb=$(meson_multilib_native_use hwdb)
-               -Dmicrohttpd=$(meson_multilib_native_use http)
-               -Didn=$(meson_multilib_native_use idn)
-               -Dimportd=$(meson_multilib_native_use importd)
-               -Dbzip2=$(meson_multilib_native_use importd)
-               -Dzlib=$(meson_multilib_native_use importd)
-               -Dkmod=$(meson_multilib_native_use kmod)
-               -Dlz4=$(meson_use lz4)
-               -Dxz=$(meson_use lzma)
-               -Dlibiptc=$(meson_multilib_native_use nat)
-               -Dpam=$(meson_use pam)
-               -Dp11kit=$(meson_multilib_native_use pkcs11)
-               -Dpcre2=$(meson_multilib_native_use pcre)
-               -Dpolkit=$(meson_multilib_native_use policykit)
-               -Dpwquality=$(meson_multilib_native_use pwquality)
-               -Dqrencode=$(meson_multilib_native_use qrcode)
-               -Drepart=$(meson_multilib_native_use repart)
-               -Dseccomp=$(meson_multilib_native_use seccomp)
-               -Dselinux=$(meson_multilib_native_use selinux)
-               -Ddbus=$(meson_multilib_native_use test)
-               -Dxkbcommon=$(meson_multilib_native_use xkb)
-               -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
-               -Dbacklight=$(meson_multilib)
-               -Dbinfmt=$(meson_multilib)
-               -Dcoredump=$(meson_multilib)
-               -Denvironment-d=$(meson_multilib)
-               -Dfirstboot=$(meson_multilib)
-               -Dhibernate=$(meson_multilib)
-               -Dhostnamed=$(meson_multilib)
-               -Dldconfig=$(meson_multilib)
-               -Dlocaled=$(meson_multilib)
-               -Dman=$(meson_multilib)
-               -Dnetworkd=$(meson_multilib)
-               -Dquotacheck=$(meson_multilib)
-               -Drandomseed=$(meson_multilib)
-               -Drfkill=$(meson_multilib)
-               -Dsysusers=$(meson_multilib)
-               -Dtimedated=$(meson_multilib)
-               -Dtimesyncd=$(meson_multilib)
-               -Dtmpfiles=$(meson_multilib)
-               -Dvconsole=$(meson_multilib)
-
-               # static-libs
-               -Dstatic-libsystemd=$(usex static-libs true false)
-               -Dstatic-libudev=$(usex static-libs true false)
-       )
-
-       meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       eninja
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       meson_src_test
-}
-
-multilib_src_install() {
-       DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-
-       # meson doesn't know about docdir
-       mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-       einstalldocs
-       dodoc "${FILESDIR}"/nsswitch.conf
-
-       if ! use resolvconf; then
-               rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-       fi
-
-       rm "${ED}"/etc/init.d/README || die
-       rm 
"${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-       if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} 
|| die
-               rm "${ED}"/usr/share/man/man1/init.1 || die
-               rm 
"${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 
|| die
-       fi
-
-       if ! use resolvconf && ! use sysv-utils; then
-               rmdir "${ED}${rootprefix}"/sbin || die
-       fi
-
-       # 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
-
-       if use hwdb; then
-               keepdir /etc/udev/hwdb.d
-       fi
-
-       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 ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-       if use hwdb; then
-               rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-       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
-}
-
-save_enabled_units() {
-       ENABLED_UNITS=()
-       type systemctl &>/dev/null || return
-       for x; do
-               if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-                       ENABLED_UNITS+=( "${x}" )
-               fi
-       done
-}
-
-pkg_preinst() {
-       save_enabled_units {machines,remote-{cryptsetup,fs}}.target 
getty@tty1.service
-
-       if ! use split-usr; then
-               local dir
-               for dir in bin sbin lib; do
-                       if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-                               eerror "\"${EROOT}/${dir}\" and 
\"${EROOT}/usr/${dir}\" are not merged."
-                               eerror "One of them should be a symbolic link 
to the other one."
-                               FAIL=1
-                       fi
-               done
-               if [[ ${FAIL} ]]; then
-                       eerror "Migration to system layout with merged 
directories must be performed before"
-                       eerror "rebuilding ${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. Despite that this file is owned by sys-apps/hwids.
-       if has_version "sys-apps/hwids[udev]"; then
-               udevadm hwdb --update --root="${EROOT}"
-       fi
-
-       udev_reload || FAIL=1
-
-       # Bug 465468, make sure locales are respect, and ensure consistency
-       # between OpenRC & systemd
-       migrate_locale
-
-       systemd_reenable systemd-networkd.service systemd-resolved.service
-
-       if [[ ${ENABLED_UNITS[@]} ]]; then
-               systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-       fi
-
-       if [[ -z ${REPLACING_VERSIONS} ]]; then
-               if type systemctl &>/dev/null; then
-                       systemctl --root="${ROOT:-/}" enable getty@.service 
remote-fs.target || FAIL=1
-               fi
-               elog "To enable a useful set of services, run the following:"
-               elog "  systemctl preset-all --preset-mode=enable-only"
-       fi
-
-       if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-               rm "${EROOT}/var/lib/systemd/timesync"
-       fi
-
-       if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-               ebegin "Reexecuting system manager"
-               systemctl daemon-reexec
-               eend $?
-       fi
-
-       if [[ ${FAIL} ]]; then
-               eerror "One of the postinst commands failed. Please check the 
postinst output"
-               eerror "for errors. You may need to clean up your system and/or 
try installing"
-               eerror "systemd again."
-               eerror
-       fi
-}
-
-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
-}

Reply via email to