sys-apps/dbus: Fix machine-id symlink when ROOT != /

Bug: https://bugs.gentoo.org/560646

Package-Manager: portage-2.2.23_p7

diff --git a/sys-apps/dbus/dbus-1.8.16.ebuild b/sys-apps/dbus/dbus-1.8.16.ebuild
index 1bba9db1416df3129da1d4c0be21689e3310cb1e..c9b188da442b0f6abbedcb5950cd1503b05b8820 100644 (file)
--- a/sys-apps/dbus/dbus-1.8.16.ebuild
+++ b/sys-apps/dbus/dbus-1.8.16.ebuild
@@ -223,7 +223,7 @@ pkg_postinst() {
        # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
        # dependencies with hardcoded paths (although the known ones got fixed already)
        dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-       ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+       ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
 
        if [[ ${CHOST} == *-darwin* ]]; then
                local plist="org.freedesktop.dbus-session.plist"

diff --git a/sys-apps/dbus/dbus-1.8.18.ebuild b/sys-apps/dbus/dbus-1.8.18.ebuild
index 824ceb85a73f0d7656332222284e71f3cbf82103..ed5e8b23aedad2b74f870dd7d25669822c290594 100644 (file)
--- a/sys-apps/dbus/dbus-1.8.18.ebuild
+++ b/sys-apps/dbus/dbus-1.8.18.ebuild
@@ -227,7 +227,7 @@ pkg_postinst() {
        # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
        # dependencies with hardcoded paths (although the known ones got fixed already)
        dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-       ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+       ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
 
        if [[ ${CHOST} == *-darwin* ]]; then
                local plist="org.freedesktop.dbus-session.plist"

diff --git a/sys-apps/dbus/dbus-1.8.20.ebuild b/sys-apps/dbus/dbus-1.8.20.ebuild
index 824ceb85a73f0d7656332222284e71f3cbf82103..ed5e8b23aedad2b74f870dd7d25669822c290594 100644 (file)
--- a/sys-apps/dbus/dbus-1.8.20.ebuild
+++ b/sys-apps/dbus/dbus-1.8.20.ebuild
@@ -227,7 +227,7 @@ pkg_postinst() {
        # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
        # dependencies with hardcoded paths (although the known ones got fixed already)
        dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-       ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+       ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
 
        if [[ ${CHOST} == *-darwin* ]]; then
                local plist="org.freedesktop.dbus-session.plist"