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 3AC9A139694 for ; Thu, 27 Apr 2017 04:05:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA1C221C0CC; Thu, 27 Apr 2017 04:04:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2F5421C0CC for ; Thu, 27 Apr 2017 04:04:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 31BFB341687 for ; Thu, 27 Apr 2017 04:04:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 449597443 for ; Thu, 27 Apr 2017 04:04:27 +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: <1493265857.6be6d71b928d0ce74611604592c7e74cce70b0ab.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: 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: 6be6d71b928d0ce74611604592c7e74cce70b0ab X-VCS-Branch: master Date: Thu, 27 Apr 2017 04:04:27 +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: a39322e5-360a-4e37-8446-a8149fd097ab X-Archives-Hash: b846e721f29fcf566b129a5eb1957b2a commit: 6be6d71b928d0ce74611604592c7e74cce70b0ab Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 27 04:04:17 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Apr 27 04:04:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be6d71b sys-apps/systemd: EPREFIX tweaks Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61 sys-apps/systemd/systemd-9999.ebuild | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 60be1bfc79b..aacb665331d 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -199,9 +199,10 @@ meson_ml_use() { multilib_src_configure() { local myconf=( --buildtype=plain - --prefix=/usr + --prefix="${EPREFIX}/usr" --libdir="$(get_libdir)" - --localstatedir=/var + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" -Dpamlibdir="$(getpam_mod_dir)" # avoid bash-completion dep -Dbashcompletiondir="$(get_bashcompdir)" @@ -313,9 +314,9 @@ multilib_src_install_all() { dosym "..${ROOTPREFIX%/}/lib/systemd/systemd" /sbin/init else # we just keep sysvinit tools, so no need for the mans - rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ + rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ || die - rm "${D}"/usr/share/man/man1/init.1 || die + rm "${ED%/}"/usr/share/man/man1/init.1 || die fi # Preserve empty dirs in /etc & /var, bug #437008 @@ -328,13 +329,13 @@ multilib_src_install_all() { # If we install these symlinks, there is no way for the sysadmin to remove them # permanently. - rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die - rm -r "${D}"/etc/systemd/system/network-online.target.wants || die - rm -r "${D}"/etc/systemd/system/sockets.target.wants || die - rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die + rm "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die + rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die + rm -r "${ED%/}"/etc/systemd/system/network-online.target.wants || die + rm -r "${ED%/}"/etc/systemd/system/sockets.target.wants || die + rm -r "${ED%/}"/etc/systemd/system/sysinit.target.wants || die - rm -r "${D}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die + rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die } migrate_locale() { @@ -403,7 +404,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="${ROOT%/}" + udevadm hwdb --update --root="${EROOT%/}" fi udev_reload || FAIL=1