[gentoo-commits] repo/gentoo:master commit in: sys-auth/consolekit/

[Jason Zaman]

commit:     e72fcb2fc9ed567137b78ff738f5d11b540ecaba
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 14:49:42 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> 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