sys-apps/systemd: fix usrmerge install

Closes: https://bugs.gentoo.org/641396
Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 51065b2c69caa33181c764e1a7df6390a82b0e03..c0dbc0de01262c4e51176a4f455cee6c6507e384 100644 (file)
--- 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 e32db7f2190010a394541c20a8ce43a11164c1be..e0653a7a84ab01bdf26b1eb32f0bc9a992389ba6 100644 (file)
--- 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 e32db7f2190010a394541c20a8ce43a11164c1be..e0653a7a84ab01bdf26b1eb32f0bc9a992389ba6 100644 (file)
--- 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