| 1 |
commit: 163027b005f0aecb00e4a83768fa130cce3ad666 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 20 16:17:34 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 20 16:17:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163027b0 |
| 7 |
|
| 8 |
sys-apps/dbus: Don't mess with EPREFIX and EROOT. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-apps/dbus/dbus-1.10.24.ebuild | 6 +++--- |
| 13 |
sys-apps/dbus/dbus-1.12.2.ebuild | 6 +++--- |
| 14 |
sys-apps/dbus/dbus-1.12.4.ebuild | 4 ++-- |
| 15 |
3 files changed, 8 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild |
| 18 |
index 4a700ffad46..650cbbee2c5 100644 |
| 19 |
--- a/sys-apps/dbus/dbus-1.10.24.ebuild |
| 20 |
+++ b/sys-apps/dbus/dbus-1.10.24.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -234,8 +234,8 @@ pkg_postinst() { |
| 28 |
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink |
| 29 |
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse |
| 30 |
# dependencies with hardcoded paths (although the known ones got fixed already) |
| 31 |
- dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id |
| 32 |
- ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id |
| 33 |
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id |
| 34 |
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id |
| 35 |
|
| 36 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 37 |
local plist="org.freedesktop.dbus-session.plist" |
| 38 |
|
| 39 |
diff --git a/sys-apps/dbus/dbus-1.12.2.ebuild b/sys-apps/dbus/dbus-1.12.2.ebuild |
| 40 |
index d795c5b67e5..d53c2a80ec6 100644 |
| 41 |
--- a/sys-apps/dbus/dbus-1.12.2.ebuild |
| 42 |
+++ b/sys-apps/dbus/dbus-1.12.2.ebuild |
| 43 |
@@ -1,4 +1,4 @@ |
| 44 |
-# Copyright 1999-2017 Gentoo Foundation |
| 45 |
+# Copyright 1999-2018 Gentoo Foundation |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
EAPI=6 |
| 49 |
@@ -236,8 +236,8 @@ pkg_postinst() { |
| 50 |
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink |
| 51 |
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse |
| 52 |
# dependencies with hardcoded paths (although the known ones got fixed already) |
| 53 |
- dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id |
| 54 |
- ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id |
| 55 |
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id |
| 56 |
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id |
| 57 |
|
| 58 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 59 |
local plist="org.freedesktop.dbus-session.plist" |
| 60 |
|
| 61 |
diff --git a/sys-apps/dbus/dbus-1.12.4.ebuild b/sys-apps/dbus/dbus-1.12.4.ebuild |
| 62 |
index cfd65c2af31..d53c2a80ec6 100644 |
| 63 |
--- a/sys-apps/dbus/dbus-1.12.4.ebuild |
| 64 |
+++ b/sys-apps/dbus/dbus-1.12.4.ebuild |
| 65 |
@@ -236,8 +236,8 @@ pkg_postinst() { |
| 66 |
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink |
| 67 |
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse |
| 68 |
# dependencies with hardcoded paths (although the known ones got fixed already) |
| 69 |
- dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id |
| 70 |
- ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id |
| 71 |
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id |
| 72 |
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id |
| 73 |
|
| 74 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 75 |
local plist="org.freedesktop.dbus-session.plist" |
Archives