diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2017-12-16 14:46:10 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2017-12-16 14:46:53 -0500 |
| commit | 33ae78e82b42d4b6d9c203d88e8be8c4aaa68e72 (patch) | |
| tree | e27b79c27deab0b87056395c79ffba94a7f643c7 /sys-apps | |
| parent | sys-libs/glibc: Downgrade hosts.conf message to einfo, bug 638154 (diff) | |
| download | gentoo-33ae78e82b42d4b6d9c203d88e8be8c4aaa68e72.tar.gz gentoo-33ae78e82b42d4b6d9c203d88e8be8c4aaa68e72.tar.bz2 gentoo-33ae78e82b42d4b6d9c203d88e8be8c4aaa68e72.zip | |
sys-apps/systemd: fix usrmerge install
Closes: https://bugs.gentoo.org/641396
Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/systemd/metadata.xml | 2 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-236.ebuild | 5 | ||||
| -rw-r--r-- | 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 51065b2c69ca..c0dbc0de0126 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -25,7 +25,7 @@ <flag name="nat">Enable support for network address translation in networkd</flag> <flag name="qrcode">Enable qrcode output support in journal</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</flag> + <flag name="usrmerge">Enable /usr merge (experimental)</flag> <flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag> <flag name="xkb">Depend on <pkg>x11-libs/libxkbcommon</pkg> to allow logind to control the X11 keymap</flag> </use> diff --git a/sys-apps/systemd/systemd-236.ebuild b/sys-apps/systemd/systemd-236.ebuild index e32db7f21900..e0653a7a84ab 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 e32db7f21900..e0653a7a84ab 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 |