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 BA84F139083 for ; Sat, 16 Dec 2017 19:47:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E989FE0CCD; Sat, 16 Dec 2017 19:47:02 +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 B735EE0CCD for ; Sat, 16 Dec 2017 19:47:02 +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 C625633BE19 for ; Sat, 16 Dec 2017 19:47:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62526A89E for ; Sat, 16 Dec 2017 19:46:59 +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: <1513453613.33ae78e82b42d4b6d9c203d88e8be8c4aaa68e72.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-236.ebuild 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: 33ae78e82b42d4b6d9c203d88e8be8c4aaa68e72 X-VCS-Branch: master Date: Sat, 16 Dec 2017 19:46:59 +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: 273d19fa-ddd1-48dd-9f39-dc6d8727bdb5 X-Archives-Hash: 1b766e33516ecfa0ef1c09ded0ef63f4 commit: 33ae78e82b42d4b6d9c203d88e8be8c4aaa68e72 Author: Mike Gilbert gentoo org> AuthorDate: Sat Dec 16 19:46:10 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Dec 16 19:46:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ae78e8 sys-apps/systemd: fix usrmerge install Closes: https://bugs.gentoo.org/641396 Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35 sys-apps/systemd/metadata.xml | 2 +- sys-apps/systemd/systemd-236.ebuild | 5 ++++- sys-apps/systemd/systemd-9999.ebuild | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index 51065b2c69c..c0dbc0de012 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -25,7 +25,7 @@ Enable support for network address translation in networkd Enable qrcode output support in journal Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown - Enable /usr merge + Enable /usr merge (experimental) Disable Gentoo-specific behavior and compatibility quirks Depend on x11-libs/libxkbcommon to allow logind to control the X11 keymap diff --git a/sys-apps/systemd/systemd-236.ebuild b/sys-apps/systemd/systemd-236.ebuild index e32db7f2190..e0653a7a84a 100644 --- a/sys-apps/systemd/systemd-236.ebuild +++ b/sys-apps/systemd/systemd-236.ebuild @@ -328,7 +328,10 @@ multilib_src_install_all() { rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die - rm -r "${ED%/}"/lib/udev/hwdb.d || die + local udevdir=/lib/udev + use usrmerge && udevdir=/usr/lib/udev + + rm -r "${ED%/}${udevdir}/hwdb.d" || die if ! use usrmerge; then # Avoid breaking boot/reboot diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index e32db7f2190..e0653a7a84a 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -328,7 +328,10 @@ multilib_src_install_all() { rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die - rm -r "${ED%/}"/lib/udev/hwdb.d || die + local udevdir=/lib/udev + use usrmerge && udevdir=/usr/lib/udev + + rm -r "${ED%/}${udevdir}/hwdb.d" || die if ! use usrmerge; then # Avoid breaking boot/reboot