diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-02-20 17:17:34 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-02-20 17:17:42 +0100 |
| commit | 163027b005f0aecb00e4a83768fa130cce3ad666 (patch) | |
| tree | f7f36ab4d901921bcf5dd8768fedb65125d14537 /sys-apps | |
| parent | www-servers/nginx: Bump to v1.13.9 mainline (diff) | |
| download | gentoo-163027b005f0aecb00e4a83768fa130cce3ad666.tar.gz gentoo-163027b005f0aecb00e4a83768fa130cce3ad666.tar.bz2 gentoo-163027b005f0aecb00e4a83768fa130cce3ad666.zip | |
sys-apps/dbus: Don't mess with EPREFIX and EROOT.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/dbus/dbus-1.10.24.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.12.2.ebuild | 6 | ||||
| -rw-r--r-- | 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 4a700ffad463..650cbbee2c5c 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 d795c5b67e5b..d53c2a80ec6f 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 cfd65c2af31b..d53c2a80ec6f 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" |