diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-04-03 18:36:50 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-04-03 18:36:50 -0400 |
| commit | 8623dee4e8b818a56203283c7f717d6e26d3a6e6 (patch) | |
| tree | 84e6bbfc5d2732fe1ec44e4589bbd23047514957 /sys-apps/systemd | |
| parent | app-misc/elasticsearch: drop 6.2.2 (diff) | |
| download | gentoo-8623dee4e8b818a56203283c7f717d6e26d3a6e6.tar.gz gentoo-8623dee4e8b818a56203283c7f717d6e26d3a6e6.tar.bz2 gentoo-8623dee4e8b818a56203283c7f717d6e26d3a6e6.zip | |
sys-apps/systemd: optionally remove the resolvconf symlink
This allows systemd and openresolv to be installed concurrently.
Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/metadata.xml | 1 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index d2004bef1076..cdc951205cdc 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -23,6 +23,7 @@ <flag name="lz4">Enable lz4 compression for the journal</flag> <flag name="nat">Enable support for network address translation in networkd</flag> <flag name="qrcode">Enable qrcode output support in journal</flag> + <flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag> <flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag> <flag name="usrmerge">Enable /usr merge (experimental)</flag> <flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag> diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 560fc8c4f150..a57c2ffe12cf 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -20,7 +20,7 @@ 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 cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" +IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" RESTRICT="!test? ( test )" @@ -68,6 +68,7 @@ RDEPEND="${COMMON_DEPEND} 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(+)] @@ -298,14 +299,19 @@ multilib_src_install() { } multilib_src_install_all() { + local rootprefix=$(usex usrmerge /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 - local rootprefix=$(usex usrmerge /usr '') rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die rmdir "${ED%/}${rootprefix}"/sbin || die rm "${ED%/}"/usr/share/man/man1/init.1 || die |