From 2891d29af8907ce881662f4a02844926d7a293c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Dec 2018 13:43:35 +0000 Subject: gentoo resync : 31.12.2018 --- sys-apps/systemd/systemd-9999.ebuild | 55 +++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 23 deletions(-) (limited to 'sys-apps/systemd/systemd-9999.ebuild') diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 3403bfbf099d..df6e7a98ecda 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -85,15 +85,18 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd] !vanilla? ( sys-apps/gentoo-systemd-integration )" # Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} +DEPEND=" + >=sys-kernel/linux-headers-${MINKV} + gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) +" + +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-kernel/linux-headers-${MINKV} virtual/pkgconfig[${MULTILIB_USEDEP}] - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 @@ -161,7 +164,7 @@ src_prepare() { "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" "${FILESDIR}/gentoo-systemd-user-pam.patch" "${FILESDIR}/gentoo-uucp-group-r1.patch" - "${FILESDIR}/gentoo-generator-path.patch" + "${FILESDIR}/gentoo-generator-path-r1.patch" ) fi @@ -302,23 +305,23 @@ multilib_src_install_all() { local rootprefix=$(usex split-usr '' /usr) # meson doesn't know about docdir - mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die + mv "${ED}"/usr/share/doc/{systemd,${PF}} || die einstalldocs dodoc "${FILESDIR}"/nsswitch.conf if ! use resolvconf; then - rm -f "${ED%/}${rootprefix}"/sbin/resolvconf || die + 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 + 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 + rmdir "${ED}${rootprefix}"/sbin || die fi # Preserve empty dirs in /etc & /var, bug #437008 @@ -332,18 +335,18 @@ multilib_src_install_all() { # If we install these symlinks, there is no way for the sysadmin to remove them # permanently. - rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die - rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die - rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die - rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die - rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die - rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die - rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die + rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die + rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die + rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die + rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die + rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die + rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die + rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die local udevdir=/lib/udev use split-usr || udevdir=/usr/lib/udev - rm -r "${ED%/}${udevdir}/hwdb.d" || die + rm -r "${ED}${udevdir}/hwdb.d" || die if use split-usr; then # Avoid breaking boot/reboot @@ -353,9 +356,9 @@ multilib_src_install_all() { } 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" + 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... @@ -420,7 +423,7 @@ pkg_postinst() { # 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%/}" + udevadm hwdb --update --root="${EROOT}" fi udev_reload || FAIL=1 @@ -431,6 +434,12 @@ pkg_postinst() { systemd_reenable systemd-networkd.service systemd-resolved.service + 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" -- cgit v1.2.3