[gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/

[Lars Wendler]

commit:     163027b005f0aecb00e4a83768fa130cce3ad666
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 16:17:34 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 16:17:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163027b0

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

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/dbus/dbus-1.10.24.ebuild | 6 +++---
 sys-apps/dbus/dbus-1.12.2.ebuild  | 6 +++---
 sys-apps/dbus/dbus-1.12.4.ebuild  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild 
b/sys-apps/dbus/dbus-1.10.24.ebuild
index 4a700ffad46..650cbbee2c5 100644
--- 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 d795c5b67e5..d53c2a80ec6 100644
--- 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 cfd65c2af31..d53c2a80ec6 100644
--- 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"