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 DE5DA139694 for ; Tue, 13 Jun 2017 15:20:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAE06E0769; Tue, 13 Jun 2017 15:20:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4E37E0769 for ; Tue, 13 Jun 2017 15:20:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 604A034187D for ; Tue, 13 Jun 2017 15:20:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A69D746A for ; Tue, 13 Jun 2017 15:20:10 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1497366626.e72fcb2fc9ed567137b78ff738f5d11b540ecaba.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/consolekit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/consolekit/consolekit-1.1.2.ebuild sys-auth/consolekit/consolekit-9999.ebuild X-VCS-Directories: sys-auth/consolekit/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: e72fcb2fc9ed567137b78ff738f5d11b540ecaba X-VCS-Branch: master Date: Tue, 13 Jun 2017 15:20:10 +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: 62ebfbc4-f8ce-4c93-97d8-aaeb1d5d9cb4 X-Archives-Hash: 90aad38c155929f3f11dc03fed22a0ac commit: e72fcb2fc9ed567137b78ff738f5d11b540ecaba Author: Jason Zaman gentoo org> AuthorDate: Mon Jun 12 14:49:42 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Tue Jun 13 15:10:26 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72fcb2f sys-auth/consolekit: reset xdg environment (bug 621040) Package-Manager: Portage-2.3.5, Repoman-2.3.1 sys-auth/consolekit/consolekit-1.1.2.ebuild | 4 +++- sys-auth/consolekit/consolekit-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys-auth/consolekit/consolekit-1.1.2.ebuild b/sys-auth/consolekit/consolekit-1.1.2.ebuild index 0ff201ad989..94b183899d1 100644 --- a/sys-auth/consolekit/consolekit-1.1.2.ebuild +++ b/sys-auth/consolekit/consolekit-1.1.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools libtool linux-info pam +inherit autotools libtool linux-info pam xdg-utils MY_PN=ConsoleKit2 MY_P=${MY_PN}-${PV} @@ -66,6 +66,8 @@ pkg_setup() { } src_prepare() { + xdg_environment_reset + sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die default diff --git a/sys-auth/consolekit/consolekit-9999.ebuild b/sys-auth/consolekit/consolekit-9999.ebuild index 602bd0d11b8..a87eea41cc3 100644 --- a/sys-auth/consolekit/consolekit-9999.ebuild +++ b/sys-auth/consolekit/consolekit-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools libtool git-r3 linux-info pam +inherit autotools libtool git-r3 linux-info pam xdg-utils MY_PN=ConsoleKit2 MY_P=${MY_PN}-${PV} @@ -64,6 +64,8 @@ pkg_setup() { } src_prepare() { + xdg_environment_reset + sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die default