commit:     211241dcf679ef732f18b3d05893126c61678820
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 15:52:12 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 15:52:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211241dc

sys-apps/systemd: drop 251.2

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

 sys-apps/systemd/Manifest                      |   1 -
 sys-apps/systemd/files/251-format-string.patch |  25 --
 sys-apps/systemd/systemd-251.2.ebuild          | 536 -------------------------
 3 files changed, 562 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 23ca1233d0c1..05521151098e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,2 @@
-DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B 
a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f
 SHA512 
0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 
544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8
 SHA512 
fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 
58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e
 SHA512 
7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738

diff --git a/sys-apps/systemd/files/251-format-string.patch 
b/sys-apps/systemd/files/251-format-string.patch
deleted file mode 100644
index f36cc5d657f3..000000000000
--- a/sys-apps/systemd/files/251-format-string.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 08e86b15fc22a8e9f1ee0a791dfd35b2fc25e4c4 Mon Sep 17 00:00:00 2001
-From: Daan De Meyer <[email protected]>
-Date: Sun, 22 May 2022 14:36:07 +0200
-Subject: [PATCH] coredump: Fix format string type mismatch
-
-Fixes #23471
----
- src/coredump/coredump.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
-index c9747416ad3c..994d968d871b 100644
---- a/src/coredump/coredump.c
-+++ b/src/coredump/coredump.c
-@@ -512,8 +512,8 @@ static int save_external_coredump(
- 
-         if (truncated)
-                 log_struct(LOG_INFO,
--                           LOG_MESSAGE("Core file was truncated to %zu 
bytes.", max_size),
--                           "SIZE_LIMIT=%zu", max_size,
-+                           LOG_MESSAGE("Core file was truncated to %"PRIu64" 
bytes.", max_size),
-+                           "SIZE_LIMIT=%"PRIu64, max_size,
-                            "MESSAGE_ID=" SD_MESSAGE_TRUNCATED_CORE_STR);
- 
-         r = fix_permissions(fd, tmp, fn, context, uid);

diff --git a/sys-apps/systemd/systemd-251.2.ebuild 
b/sys-apps/systemd/systemd-251.2.ebuild
deleted file mode 100644
index ec03de9fc1b8..000000000000
--- a/sys-apps/systemd/systemd-251.2.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..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 flag-o-matic linux-info meson-multilib pam 
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 build 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 ) )
-       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 )
-       !build? ( || (
-               sys-apps/util-linux[kill(-)]
-               sys-process/procps[kill(+)]
-               sys-apps/coreutils[kill(-)]
-       ) )
-       !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() {
-       has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-       has_version -b "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=" ~BINFMT_MISC ~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() {
-       # Do NOT add patches here
-       local PATCHES=()
-
-       [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-       # Add local patches here
-       PATCHES+=(
-               "${FILESDIR}/251-format-string.patch"
-               # Breaks Clang. Revert the commit for now and force off F_S=3.
-               # bug #841770.
-               "${FILESDIR}/251-revert-fortify-source-3-fix.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-generator-path-r2.patch"
-                       
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-                       "${FILESDIR}/gentoo-journald-audit.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
-
-       # Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
-       # the upstream patch for it because it breaks Clang: bug #841770.
-       #
-       # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-       # to unset F_S first, then explicitly set 2, to negate any default
-       # and anything set by the user if they're choosing 3 (or if they've
-       # modified GCC to set 3).
-       #
-       if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-               # We can't unconditionally do this b/c we fortify needs
-               # some level of optimisation.
-               filter-flags -D_FORTIFY_SOURCE=3
-               append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-       fi
-
-       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)"
-               # make sure we get /bin:/sbin in PATH
-               $(meson_use split-usr)
-               -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
-               $(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 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
-       meson_src_test
-}
-
-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
-
-       # 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; 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.
-       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 [email protected] 
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
-}

Reply via email to