sys-apps/dbus: Don't mess with EPREFIX and EROOT.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index 4a700ffad463b3bd3529d336a3f8614d6721bfc4..650cbbee2c5c48484452b8e1eb6a9d484d09c0a4 100644 (file)
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.10.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -234,8 +234,8 @@ pkg_postinst() {
        # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
        # 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 "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+       dbus-uuidgen --ensure="${EROOT}"/etc/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.12.2.ebuild b/sys-apps/dbus/dbus-1.12.2.ebuild
index d795c5b67e5b83142098fd9dc40fe09de60529d1..d53c2a80ec6f9a95a4d291cb691aebdfe3a6cacd 100644 (file)
--- a/sys-apps/dbus/dbus-1.12.2.ebuild
+++ b/sys-apps/dbus/dbus-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -236,8 +236,8 @@ pkg_postinst() {
        # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
        # 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 "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+       dbus-uuidgen --ensure="${EROOT}"/etc/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.12.4.ebuild b/sys-apps/dbus/dbus-1.12.4.ebuild
index cfd65c2af31b80a6204f35cfa95465c087ba7f38..d53c2a80ec6f9a95a4d291cb691aebdfe3a6cacd 100644 (file)
--- a/sys-apps/dbus/dbus-1.12.4.ebuild
+++ b/sys-apps/dbus/dbus-1.12.4.ebuild
@@ -236,8 +236,8 @@ pkg_postinst() {
        # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
        # 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 "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+       dbus-uuidgen --ensure="${EROOT}"/etc/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"