From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA3A51382C5 for ; Tue, 20 Feb 2018 16:17:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F117FE0A5A; Tue, 20 Feb 2018 16:17:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFEC0E0A5A for ; Tue, 20 Feb 2018 16:17:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB059335C30 for ; Tue, 20 Feb 2018 16:17:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F04D91DF for ; Tue, 20 Feb 2018 16:17:44 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1519143462.163027b005f0aecb00e4a83768fa130cce3ad666.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/dbus/dbus-1.10.24.ebuild sys-apps/dbus/dbus-1.12.2.ebuild sys-apps/dbus/dbus-1.12.4.ebuild X-VCS-Directories: sys-apps/dbus/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 163027b005f0aecb00e4a83768fa130cce3ad666 X-VCS-Branch: master Date: Tue, 20 Feb 2018 16:17:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: affeedbe-7926-4e9a-98c6-45695cd8ef95 X-Archives-Hash: 9d0e0ef0e7ac0893bea59405166aef6e commit: 163027b005f0aecb00e4a83768fa130cce3ad666 Author: Lars Wendler gentoo org> AuthorDate: Tue Feb 20 16:17:34 2018 +0000 Commit: Lars Wendler gentoo 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"