From: Mart Raudsepp <leio@gentoo.org>
Date: Sun, 24 Mar 2019 16:10:55 +0000 (+0200)
Subject: mate-extra/mate-screensaver: add elogind support
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6a58f568520b5fedc9b81b9b5fa02f6c3bf9b4b2;p=gentoo.git

mate-extra/mate-screensaver: add elogind support

Bug: https://bugs.gentoo.org/681334
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
index afbb7b7d8e62..cea71578dfcb 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
@@ -10,10 +10,11 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-IUSE="X debug consolekit kernel_linux libnotify opengl pam systemd"
+IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
+REQUIRED_USE="?? ( elogind systemd )"
 
 DOC_CONTENTS="
 	Information for converting screensavers is located in
@@ -45,6 +46,7 @@ COMMON_DEPEND="
 	opengl? ( virtual/opengl )
 	pam? ( gnome-base/gnome-keyring virtual/pam )
 	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd:= )
 	!!<gnome-extra/gnome-screensaver-3"
 
@@ -58,19 +60,30 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig:*"
 
 src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
+	local myconf=(
+		--enable-locking
+		--with-kbd-layout-indicator
+		--with-xf86gamma-ext
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		$(use_with X x)
+		$(use_with consolekit console-kit)
+		$(use_with libnotify)
+		$(use_with opengl libgl)
+		$(use_with systemd)
+		$(use_enable debug)
 		$(use_enable pam)
+	)
+
+	if use elogind; then
+		myconf+=(
+			--with-systemd
+			SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+			SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+		)
+	fi
+
+	mate_src_configure "${myconf[@]}"
 }
 
 src_install() {