From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25C721382C5 for ; Tue, 3 Apr 2018 22:37:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E99A8E0E64; Tue, 3 Apr 2018 22:37:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B22F2E0E64 for ; Tue, 3 Apr 2018 22:37:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38EF3335D34 for ; Tue, 3 Apr 2018 22:37:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77EF5264 for ; Tue, 3 Apr 2018 22:37:23 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1522795010.8623dee4e8b818a56203283c7f717d6e26d3a6e6.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/metadata.xml sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 8623dee4e8b818a56203283c7f717d6e26d3a6e6 X-VCS-Branch: master Date: Tue, 3 Apr 2018 22:37:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1112774a-aa77-4013-8d7b-b4a6f2ccacdc X-Archives-Hash: 90480330d4f6920be2f09e1bb26d9f79 commit: 8623dee4e8b818a56203283c7f717d6e26d3a6e6 Author: Mike Gilbert gentoo org> AuthorDate: Tue Apr 3 22:36:50 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Apr 3 22:36:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8623dee4 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 sys-apps/systemd/metadata.xml | 1 + 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 d2004bef107..cdc951205cd 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -23,6 +23,7 @@ Enable lz4 compression for the journal Enable support for network address translation in networkd Enable qrcode output support in journal + Install resolvconf symlink for systemd-resolve Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown Enable /usr merge (experimental) Disable Gentoo-specific behavior and compatibility quirks diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 560fc8c4f15..a57c2ffe12c 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