| 1 |
commit: 8623dee4e8b818a56203283c7f717d6e26d3a6e6 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 3 22:36:50 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 3 22:36:50 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8623dee4 |
| 7 |
|
| 8 |
sys-apps/systemd: optionally remove the resolvconf symlink |
| 9 |
|
| 10 |
This allows systemd and openresolv to be installed concurrently. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81 |
| 13 |
|
| 14 |
sys-apps/systemd/metadata.xml | 1 + |
| 15 |
sys-apps/systemd/systemd-9999.ebuild | 10 ++++++++-- |
| 16 |
2 files changed, 9 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml |
| 19 |
index d2004bef107..cdc951205cd 100644 |
| 20 |
--- a/sys-apps/systemd/metadata.xml |
| 21 |
+++ b/sys-apps/systemd/metadata.xml |
| 22 |
@@ -23,6 +23,7 @@ |
| 23 |
<flag name="lz4">Enable lz4 compression for the journal</flag> |
| 24 |
<flag name="nat">Enable support for network address translation in networkd</flag> |
| 25 |
<flag name="qrcode">Enable qrcode output support in journal</flag> |
| 26 |
+ <flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag> |
| 27 |
<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag> |
| 28 |
<flag name="usrmerge">Enable /usr merge (experimental)</flag> |
| 29 |
<flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag> |
| 30 |
|
| 31 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 32 |
index 560fc8c4f15..a57c2ffe12c 100644 |
| 33 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 34 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 35 |
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 36 |
|
| 37 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
| 38 |
SLOT="0/2" |
| 39 |
-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" |
| 40 |
+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" |
| 41 |
|
| 42 |
REQUIRED_USE="importd? ( curl gcrypt lzma )" |
| 43 |
RESTRICT="!test? ( test )" |
| 44 |
@@ -68,6 +68,7 @@ RDEPEND="${COMMON_DEPEND} |
| 45 |
selinux? ( sec-policy/selinux-base-policy[systemd] ) |
| 46 |
sysv-utils? ( !sys-apps/sysvinit ) |
| 47 |
!sysv-utils? ( sys-apps/sysvinit ) |
| 48 |
+ resolvconf? ( !net-dns/openresolv ) |
| 49 |
!build? ( || ( |
| 50 |
sys-apps/util-linux[kill(-)] |
| 51 |
sys-process/procps[kill(+)] |
| 52 |
@@ -298,14 +299,19 @@ multilib_src_install() { |
| 53 |
} |
| 54 |
|
| 55 |
multilib_src_install_all() { |
| 56 |
+ local rootprefix=$(usex usrmerge /usr '') |
| 57 |
+ |
| 58 |
# meson doesn't know about docdir |
| 59 |
mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die |
| 60 |
|
| 61 |
einstalldocs |
| 62 |
dodoc "${FILESDIR}"/nsswitch.conf |
| 63 |
|
| 64 |
+ if ! use resolvconf; then |
| 65 |
+ rm -f "${ED%/}${rootprefix}"/sbin/resolvconf || die |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
if ! use sysv-utils; then |
| 69 |
- local rootprefix=$(usex usrmerge /usr '') |
| 70 |
rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die |
| 71 |
rmdir "${ED%/}${rootprefix}"/sbin || die |
| 72 |
rm "${ED%/}"/usr/share/man/man1/init.1 || die |
Archives