sys-apps/accountsservice-0.6.42-r2 : Make (real) use of elogind like it would with systemd.

4 files changed, 93 insertions, 1 deletions

diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 9006b0d..d7addd4 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,4 +1,6 @@
 AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 SHA256 f1a308a364db53ec939505daf1435fb99cf2899789976e21080464720b78297f SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931 WHIRLPOOL 35d8756e1fcff2c08926ecc2864bacccad5542d59a028b0969a4429a4855528d9b607f4cfe5849d04f131db2e142dd1bf9531ca6b79b404e55d97ba0fd6162f8
+AUX accountsservice-0.6.42-use-elogind.patch 411 SHA256 9a107d800c2b1bcd33487ac910d69764978e0d34bd5140ed40500edf88a71502 SHA512 7c79e9d3a178e3bbc774d4240fdaf9f61d5c54831349208eee2a898899952b343d22ace20c97727d983855f3d7ca4096f490972974ddb25411aba6df82665d3a WHIRLPOOL a14ec090b3e734bb207fdc658b0622a954196a930a640f7cfee05be22d1641eb3320cac2cd38eb32db18cc276afac54b26b5770dd9a9eb36302c0704395357bf
 DIST accountsservice-0.6.42.tar.xz 380500 SHA256 e56494c2f18627900b57234e5628923cc16a37bf8fd16b06c46118d6ae9c007e SHA512 b31d77b88793a8264d32963a98ad446537292a134a3f80fabb4e2ce30f796e5f3066d02a27515c993133fa493b511a6abba6ff1a7827b5a54ea6a4f62a7b6fc9 WHIRLPOOL 2da1b5037f2306d93471db8ae792145abded9f33e5014f5ad748bb0d988757a4c5e53e5e64ef69752b6e80041af09a87512b95b1b955cfc75b379d7cec40d496
 EBUILD accountsservice-0.6.42-r1.ebuild 1394 SHA256 1b8550448ff1f7c41613ab28dfd358ac749ecc003cdb4632fe56b9befdb1b6b3 SHA512 3e5fe466165e48a615c631ea9ec3a6c3704b1dce21a83438a4ead1b87083448dabeca29e0684ed2069ca083914eea07d7972527e040ba6b05edb2ccc22164e07 WHIRLPOOL 3538bc54e4f62a9d493e7705d80f318c054ba48104e59cd99a377bb8220ad54f0872ab7a9c94e9e13f183c4e4498d0fea2d1856b2e8b2417899833327f809dea
-MISC metadata.xml 396 SHA256 51257c7b97ea8af47f6485adee93352a26dc901024f316b3a1dcf8c2cbcd62bf SHA512 e523489c63c11a5ed2d060f9bfdf5cf5d47813c1289823032e9b45ed2dfdd1ef9d11a863403cd1492696f4ea0070a61ca3a8d8780d1bdba9ed710a035ef1a5ce WHIRLPOOL c4687da67a3971a43863ce13a2bba326a8271e392d5253024ecf0abe55977c09f81e06da7b5c4506a232a2abb1a8b13bd41ffa4a128f0c8fcb22f43c20de5e4c
+EBUILD accountsservice-0.6.42-r2.ebuild 1758 SHA256 1124da2bbbf4b5a150745e82dd64419e7e57531c296715ceb97797175524d6cd SHA512 b947d5a5c58159aac64435d456960b4ad46f0304601ec5a91d9ac584f8f6db3d5853264d364381fae7deade850cd4a55a5d4cc0266577144bb3dfce04017e974 WHIRLPOOL ce3a22ff2c6f20f0f5b6f6e0fff98f2a9cb5986c0ba0e836e7deb3784d22d43ccf6463f9f7b070f75c089e9432ed4b3c6388b5d8fe55c695756b7703ffdc06dc
+MISC metadata.xml 524 SHA256 c1df2efad39b5d939c4fc58523088160d252a5a23eedabf675261fb4a10e2a3b SHA512 a0c662b3c0c45df43780f160b6db6db67561a1b2c84ce60929707d94cd9f1bf76588420189b91e0eafe58001a61d8a313f2a4b421b980a7c7f988c95e782ee07 WHIRLPOOL 6584ed3c6ba861aa01f56ef558ba5f4a8852243b7fd72e454d1ec3bf2edc1f61313bca357ebbb56f91919cdaf7917710fa3060542c91fe8485511d44d310880c
diff --git a/sys-apps/accountsservice/accountsservice-0.6.42-r2.ebuild b/sys-apps/accountsservice/accountsservice-0.6.42-r2.ebuild
new file mode 100644
index 0000000..746309d
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-0.6.42-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnome2 systemd
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+IUSE="doc elogind +introspection selinux systemd"
+
+REQUIRED_USE=" systemd? ( !elogind )
+	elogind? ( !systemd )
+"
+
+CDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	sys-auth/polkit
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	systemd? ( >=sys-apps/systemd-186:0= )
+	!systemd? (
+		elogind?  ( sys-auth/elogind    )
+		!elogind? ( sys-auth/consolekit )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-accountsd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.35-gentoo-system-users.patch"
+)
+
+src_prepare() {
+	if use elogind; then
+		sed -i -e 's|libsystemd|libelogind|' configure || die
+		epatch "${FILESDIR}/${P}-use-elogind.patch"
+	fi
+
+	default
+}
+
+
+src_configure() {
+	local enable_systemd="--disable-systemd"
+
+	if use elogind || use systemd ; then
+		enable_systemd="--enable-systemd"
+	fi
+
+	gnome2_src_configure \
+		--disable-static \
+		--disable-more-warnings \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-admin-group="wheel" \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable doc docbook-docs) \
+		$(use_enable introspection) \
+		$enable_systemd
+}
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.42-use-elogind.patch b/sys-apps/accountsservice/files/accountsservice-0.6.42-use-elogind.patch
new file mode 100644
index 0000000..18976e8
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.42-use-elogind.patch
@@ -0,0 +1,11 @@
+--- a/src/libaccountsservice/act-user-manager.c	2016-01-18 19:07:01.000000000 +0100
++++ b/src/libaccountsservice/act-user-manager.c	2016-11-01 17:22:28.449045864 +0100
+@@ -42,7 +42,7 @@
+ #include <gio/gunixinputstream.h>
+ 
+ #ifdef WITH_SYSTEMD
+-#include <systemd/sd-login.h>
++#include <elogind/sd-login.h>
+ 
+ /* check if logind is running */
+ #define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)
diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
index df1259a..69657d0 100644
--- a/sys-apps/accountsservice/metadata.xml
+++ b/sys-apps/accountsservice/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> instead of
+			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
 			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 	</use>