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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     75595ff182c08f38b641ca0caaf13151b253d630
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 22:49:57 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 22:55:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75595ff1

sys-auth/elogind: Fix XDG dir sandbox issue

Closes: https://bugs.gentoo.org/638706
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-auth/elogind/Manifest                |  2 +-
 sys-auth/elogind/elogind-233.7-r1.ebuild | 10 +++++++---
 sys-auth/elogind/elogind-234.4-r1.ebuild | 11 +++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index e699fdea425..6cc742ae229 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,2 +1,2 @@
 DIST elogind-233.7.tar.gz 957308 SHA256 8854f29a53d1305dc1c264635b1e970cfcbcc32507af8ef35de4a9b447f79e0b SHA512 c4ca84d45c289131f2b9d698d0e010fb368da39e80a9a972822148509644727a5e420ec2c68dc896bd250e81bdb125b4d760b0a65a4444365c81af2da9555a78 WHIRLPOOL 597f43c47ff630ec408f99c3d7e88622fc179f542772d800af09691734882bede81ab2d54ea51de21de08be568500477e2688579f9d244ddc11bd282a6678fce
-DIST elogind-234.4.tar.gz 973370 SHA256 ffb465a62c4281c19b07eb7fbb9ad0987f3b726ae1a868a92a3144d7714542f3 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e WHIRLPOOL 1b735338cb02ef8cffb5837a0702110117ae1d677a4cbf106180c549485f7fb0604f3134e6ff5e14b23485ddfe4d4415a41e69d93b8f099cee41a220d0ea4a69
+DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e

diff --git a/sys-auth/elogind/elogind-233.7-r1.ebuild b/sys-auth/elogind/elogind-233.7-r1.ebuild
index ef17d6fd855..6a9df040c51 100644
--- a/sys-auth/elogind/elogind-233.7-r1.ebuild
+++ b/sys-auth/elogind/elogind-233.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools linux-info pam udev
+inherit autotools linux-info pam udev xdg-utils
 
 DESCRIPTION="The systemd project's logind, extracted to a standalone package"
 HOMEPAGE="https://github.com/elogind/elogind"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl debug pam policykit selinux"
 
-RDEPEND="
+COMMON_DEPEND="
 	sys-apps/util-linux
 	sys-libs/libcap
 	virtual/libudev:=
@@ -23,7 +23,7 @@ RDEPEND="
 	selinux? ( sys-libs/libselinux )
 	!sys-apps/systemd
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
@@ -32,6 +32,9 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig
 "
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
 PDEPEND="
 	sys-apps/dbus
 	policykit? ( sys-auth/polkit )
@@ -51,6 +54,7 @@ pkg_setup() {
 src_prepare() {
 	default
 	eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
+	xdg_environment_reset
 }
 
 src_configure() {

diff --git a/sys-auth/elogind/elogind-234.4-r1.ebuild b/sys-auth/elogind/elogind-234.4-r1.ebuild
index ef17d6fd855..b554bf7b836 100644
--- a/sys-auth/elogind/elogind-234.4-r1.ebuild
+++ b/sys-auth/elogind/elogind-234.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools linux-info pam udev
+inherit autotools linux-info pam udev xdg-utils
 
 DESCRIPTION="The systemd project's logind, extracted to a standalone package"
 HOMEPAGE="https://github.com/elogind/elogind"
@@ -14,16 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl debug pam policykit selinux"
 
-RDEPEND="
+COMMON_DEPEND="
 	sys-apps/util-linux
 	sys-libs/libcap
 	virtual/libudev:=
 	acl? ( sys-apps/acl )
 	pam? ( virtual/pam )
 	selinux? ( sys-libs/libselinux )
-	!sys-apps/systemd
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
@@ -32,6 +31,9 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig
 "
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
 PDEPEND="
 	sys-apps/dbus
 	policykit? ( sys-auth/polkit )
@@ -51,6 +53,7 @@ pkg_setup() {
 src_prepare() {
 	default
 	eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
+	xdg_environment_reset
 }
 
 src_configure() {