gentoo resync : 05.04.2019

6 files changed, 288 insertions, 202 deletions

diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index 6f7cc664b252..7342ce21943f 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,7 +1,4 @@
-AUX light-locker-1.7.0-systemd.patch 2393 BLAKE2B ecb060b9311b415d7d225b0c2d7148a7b17a914cba456bfd9d1aefba4c078ba2fc9d3e077e7af161932c9cb9e8ae071a0357558f14769b2cc7b6caf2de7f88d3 SHA512 7903288386daaaa8f63c472ba4956eae01db91006bfdfac53269bac7097fe422c3b8052d8f3dddffea8b4ca94ba31fdd4fba804a2a0747852213ce5c20082b90
-DIST light-locker-1.7.0.tar.bz2 530315 BLAKE2B b93247e730a4cd30469f7e0113df1641994b6d4f1a77c8394a70235949ec6965b3115c0889b5e9dd11ba8a0b9b7ae3704843620b6aed4c0c0400676ad7138885 SHA512 dcd524ed5bf8475743585ee5a6b35dfe396d17f307418e208450ccabc12ab6b3835818fdf11324b8c7dc63332b9faacea184409b7c9c0a242fbb9d6402a2d079
+AUX light-locker-1.8.0-elogind.patch 9190 BLAKE2B c60e166a853aaee5de2ffcbb708dd0f1b25b9fc5e2ec9a862bce2c0cd8b90928b0ceb4dae2a46e9ce3f41f9665911abaebccd9a73a9cb09c9c113788de60845e SHA512 a837a458d4d221ad4a009d2461c927168f64a3f50ef5484c0aca26913477d35cd0799605d66b8b4876b7530c7c604720fe95783576c658bd6e84b5867df1ef8e
 DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
-EBUILD light-locker-1.7.0-r1.ebuild 1503 BLAKE2B 6d623f170b4fd0bdd53ac8662c3a1e86d4573959f315b888763b68bf3cf894f8331895d1ffb983ea87db65aed9666b3bf91a6e5e28a3a6827fbdd677591c250f SHA512 92a46afa1d2bb54d72c3b315323c96b8a292e5e1cb186e531e8932f359ef5f3cabf2fbcf6b5c788954b3ae1ea0288f355a80f78105dc5e627aba840e629b42a5
-EBUILD light-locker-1.7.0.ebuild 1373 BLAKE2B 43332df429845bca4244c1ade7ea6a3436fd4b2e338d57745adc06b2fa289fe22577a00c2ecc7e635ded00b0599d79eb79c53b920a6fc4eaec8806e6bf6c41a2 SHA512 415556f4491ec5232ab0f5ab0a1a930bf220fb298e5a0e3e41ff57d8e2bf5d2a534499a1f2847910268be086676141703e27c68df8d0f2e31f9f492364fd1a72
-EBUILD light-locker-1.8.0.ebuild 1373 BLAKE2B 43332df429845bca4244c1ade7ea6a3436fd4b2e338d57745adc06b2fa289fe22577a00c2ecc7e635ded00b0599d79eb79c53b920a6fc4eaec8806e6bf6c41a2 SHA512 415556f4491ec5232ab0f5ab0a1a930bf220fb298e5a0e3e41ff57d8e2bf5d2a534499a1f2847910268be086676141703e27c68df8d0f2e31f9f492364fd1a72
+EBUILD light-locker-1.8.0-r1.ebuild 1617 BLAKE2B 340b6658d7bbe2567a4d0786476b77d3979f0aae1c0d9a6c3fe5ce798d7c8aa30d7e0fc97688ed0ade1785c1707f768ddd57402a8e2bf2a946f529da44183505 SHA512 186ae4504e45b0b6f4914e93c009ef7c2cc954cff6632c91a2d3b6ebc81aaef099340e67a59292e1adfd4d7fb68be672f9bc9ad550f464e6e4f9e8c39cd66a55
 MISC metadata.xml 698 BLAKE2B a8f5e435f66bea6fab128e600e4bfce575c819c2de03c141e9d5ba72880dc58017fce9e4355d700c01d441c4eec56d19f0f2ec8d27027700decedc685a8a2d38 SHA512 583d1108a9be5b71a9e3867b60b20dba60a1c999fe7a27634456b9102af8193dc22e6b7a5410c520f5aa13482a290d4e6cf6bdcde070788fd7ce8d2b74ece144
diff --git a/x11-misc/light-locker/files/light-locker-1.7.0-systemd.patch b/x11-misc/light-locker/files/light-locker-1.7.0-systemd.patch
deleted file mode 100644
index 757dda27329e..000000000000
--- a/x11-misc/light-locker/files/light-locker-1.7.0-systemd.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.orig	2016-09-12 19:48:08.510799596 -0600
-+++ configure	2016-09-12 19:48:33.804071980 -0600
-@@ -17532,12 +17532,12 @@
-     pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null`
-+  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -17549,12 +17549,12 @@
-     pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null`
-+  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -17575,9 +17575,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1`
-+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
-         else
--	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1`
-+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$SYSTEMD_PKG_ERRORS" >&5
diff --git a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch
new file mode 100644
index 000000000000..511e730f434e
--- /dev/null
+++ b/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch
@@ -0,0 +1,257 @@
+diff --git a/README b/README
+index 330ec82..d16cc6b 100644
+--- a/README
++++ b/README
+@@ -34,6 +34,7 @@ Most of these configurations will be enabled automatically when their dependenci
+ Here is a list of the different dependencies and there configuration flags:
+   --with-gtk2: This decides between the Gtk+-3.0 and Gtk+-2.0 dependency.
+   --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed.
++  --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above.
+   --with-console-kit: This adds the support for ConsoleKit.
+   --with-upower: This adds the support for UPower.
+   --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed.
+diff --git a/configure.ac.in b/configure.ac.in
+index 929befd..8639583 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -447,6 +447,42 @@ fi
+ AC_SUBST(SYSTEMD_CFLAGS)
+ AC_SUBST(SYSTEMD_LIBS)
+ 
++dnl ---------------------------------------------------------------------------
++dnl elogind
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH(elogind,
++            AS_HELP_STRING([--with-elogind],
++                           [Add elogind support]),
++            [with_elogind=$withval], [with_elogind=auto])
++
++if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then
++    AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind])
++fi
++
++PKG_CHECK_MODULES(ELOGIND,
++                  [libelogind],
++                  [have_elogind=yes], [have_elogind=no])
++
++if test "x$with_elogind" = "xauto" ; then
++        if test x$have_elogind = xno ; then
++                use_elogind=no
++        else
++                use_elogind=yes
++        fi
++else
++	use_elogind=$with_elogind
++fi
++
++if test "x$use_elogind" = "xyes"; then
++        if test "x$have_elogind" = "xno"; then
++                AC_MSG_ERROR([Elogind support explicitly required, but elogind not found])
++        fi
++        AC_DEFINE(WITH_ELOGIND, 1, [elogind support])
++fi
++AC_SUBST(ELOGIND_CFLAGS)
++AC_SUBST(ELOGIND_LIBS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl UPower
+ dnl ---------------------------------------------------------------------------
+@@ -668,6 +704,7 @@ echo "
+         systemd:                  ${use_systemd}
+         ConsoleKit:               ${use_console_kit}
+         UPower:                   ${use_upower}
++        elogind:                  ${use_elogind}
+ 
+                     Features:
+                     ---------
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0fa4ef9..7c6a46f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -90,7 +90,8 @@ light_locker_SOURCES =	\
+ light_locker_LDADD =		\
+ 	$(LIGHT_LOCKER_LIBS)	\
+ 	$(SAVER_LIBS)			\
+-	$(SYSTEMD_LIBS)                 \
++	$(SYSTEMD_LIBS)		\
++	$(ELOGIND_LIBS)		\
+ 	$(NULL)
+ 
+ light_locker_LDFLAGS = -export-dynamic
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index cab6a9e..8928cbf 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -47,6 +47,10 @@
+ #include <systemd/sd-login.h>
+ #endif
+ 
++#ifdef WITH_ELOGIND
++#include <elogind/systemd/sd-login.h>
++#endif
++
+ #include "gs-listener-dbus.h"
+ #include "gs-marshal.h"
+ #include "gs-debug.h"
+@@ -82,7 +86,7 @@ struct GSListenerPrivate
+         char           *session_id;
+         char           *seat_path;
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         gboolean        have_systemd;
+         char           *sd_session_id;
+         int             delay_fd;
+@@ -138,7 +142,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
+ 
+         gs_debug ("Send switch greeter");
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         /* Compare with 0. On failure this will return < 0.
+          * In the later case we probably aren't using systemd.
+          */
+@@ -179,7 +183,7 @@ gs_listener_send_lock_session (GSListener *listener)
+ 
+         gs_debug ("Send lock session");
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         /* Compare with 0. On failure this will return < 0.
+          * In the later case we probably aren't using systemd.
+          */
+@@ -363,7 +367,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+ 
+         gs_debug ("Send idle hint: %d", idle);
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         if (listener->priv->have_systemd) {
+ 
+                 if (listener->priv->system_connection == NULL) {
+@@ -436,7 +440,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+ void
+ gs_listener_delay_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         DBusMessage    *message;
+         DBusMessage    *reply;
+         DBusError       error;
+@@ -509,7 +513,7 @@ gs_listener_delay_suspend (GSListener *listener)
+ void
+ gs_listener_resume_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd);
+ 
+         if (listener->priv->delay_fd >= 0) {
+@@ -1112,7 +1116,7 @@ _listener_message_path_is_our_session (GSListener  *listener,
+         return FALSE;
+ }
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ static gboolean
+ query_session_active (GSListener *listener)
+ {
+@@ -1248,7 +1252,7 @@ query_lid_closed (GSListener *listener)
+ #endif
+ #endif
+ 
+-#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
+ static gboolean
+ properties_changed_match (DBusMessage *message,
+                           const char  *property)
+@@ -1343,7 +1347,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+                   dbus_message_get_destination (message));
+ #endif
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ 
+         if (listener->priv->have_systemd) {
+ 
+@@ -1963,7 +1967,7 @@ gs_listener_acquire (GSListener *listener,
+                                             listener_dbus_system_filter_function,
+                                             listener,
+                                             NULL);
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+                 if (listener->priv->have_systemd) {
+                         dbus_bus_add_match (listener->priv->system_connection,
+                                             "type='signal'"
+@@ -2075,7 +2079,7 @@ query_session_id (GSListener *listener)
+ 
+         dbus_error_init (&error);
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         if (listener->priv->have_systemd) {
+                 dbus_uint32_t pid = getpid();
+ 
+@@ -2164,7 +2168,7 @@ query_session_id (GSListener *listener)
+ #endif
+ }
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ static char *
+ query_sd_session_id (GSListener *listener)
+ {
+@@ -2192,7 +2196,7 @@ init_session_id (GSListener *listener)
+         listener->priv->session_id = query_session_id (listener);
+         gs_debug ("Got session-id: %s", listener->priv->session_id);
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         g_free (listener->priv->sd_session_id);
+         listener->priv->sd_session_id = query_sd_session_id (listener);
+         gs_debug ("Got sd-session-id: %s", listener->priv->sd_session_id);
+@@ -2284,7 +2288,7 @@ gs_listener_init (GSListener *listener)
+ {
+         listener->priv = GS_LISTENER_GET_PRIVATE (listener);
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         /* check if logind is running */
+         listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
+         listener->priv->delay_fd = -1;
+@@ -2313,7 +2317,7 @@ gs_listener_finalize (GObject *object)
+         g_free (listener->priv->session_id);
+         g_free (listener->priv->seat_path);
+ 
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+         g_free (listener->priv->sd_session_id);
+ #endif
+ 
+diff --git a/src/light-locker.c b/src/light-locker.c
+index 264b033..79de29a 100644
+--- a/src/light-locker.c
++++ b/src/light-locker.c
+@@ -144,7 +144,8 @@ main (int    argc,
+                   "gtk:        %d\n"
+                   "systemd:    %s\n"
+                   "ConsoleKit: %s\n"
+-                  "UPower:     %s",
++                  "UPower:     %s\n"
++                  "elogind:    %s",
+                   GTK_MAJOR_VERSION,
+ #ifdef WITH_SYSTEMD
+                   "yes",
+@@ -160,6 +161,11 @@ main (int    argc,
+                   "yes"
+ #else
+                   "no"
++#endif
++#ifdef WITH_ELOGIND
++                  "yes"
++#else
++                  "no"
+ #endif
+                   );
+         gs_debug ("Features:\n"
diff --git a/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
deleted file mode 100644
index e8c99ce5fec8..000000000000
--- a/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A simple locker using lightdm"
-HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit +dpms gtk3 +screensaver -systemd +upower"
-
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.25.6:2
-	>=sys-apps/dbus-0.30
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/libXxf86vm
-	consolekit? ( sys-auth/consolekit )
-	dpms? ( x11-libs/libXext )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	screensaver? ( x11-libs/libXScrnSaver )
-	systemd? ( sys-apps/systemd )
-	upower? ( sys-power/upower )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/intltool
-	sys-devel/gettext"
-RDEPEND="${RDEPEND}
-	x11-misc/lightdm"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-src_prepare() {
-	# Not using debian's patch on configure.ac because it requires running xdg-autogen which is a mess
-	epatch "${FILESDIR}/${PN}-${PV}-systemd.patch"
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_with consolekit console-kit) \
-		$(use_with dpms dpms-ext) \
-		$(use_with !gtk3 gtk2) \
-		$(use_with screensaver x) \
-		$(use_with screensaver mit-ext) \
-		$(use_with systemd) \
-		$(use_with upower)
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/x11-misc/light-locker/light-locker-1.7.0.ebuild b/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
index e5e721f142e9..eab1233af0ca 100644
--- a/x11-misc/light-locker/light-locker-1.7.0.ebuild
+++ b/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools-utils gnome2-utils
+inherit autotools gnome2-utils
 
 DESCRIPTION="A simple locker using lightdm"
 HOMEPAGE="https://github.com/the-cavalry/light-locker"
@@ -12,32 +12,45 @@ SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit +dpms gtk3 +screensaver -systemd +upower"
+IUSE="consolekit +dpms elogind gtk3 +screensaver systemd +upower"
 
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.25.6:2
-	>=sys-apps/dbus-0.30
+BDEPEND="dev-lang/perl
+	dev-perl/XML-Parser
+	dev-util/intltool
+	sys-devel/gettext"
+DEPEND="dev-libs/dbus-glib
+	dev-libs/glib
+	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/libX11
 	x11-libs/pango
 	x11-libs/libXxf86vm
 	consolekit? ( sys-auth/consolekit )
 	dpms? ( x11-libs/libXext )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	elogind? ( sys-auth/elogind )
+	!gtk3? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 	screensaver? ( x11-libs/libXScrnSaver )
 	systemd? ( sys-apps/systemd )
 	upower? ( sys-power/upower )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/intltool
-	sys-devel/gettext"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	x11-misc/lightdm"
 
+REQUIRED_USE="?? ( consolekit elogind systemd )"
+
 DOCS=( AUTHORS HACKING NEWS README )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-${PV}-elogind.patch"
+)
+
+src_prepare() {
+	default
+	# remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf
+	sed -si -e "/XDT_I18N/d" configure.ac || die
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_with consolekit console-kit)
@@ -46,13 +59,10 @@ src_configure() {
 		$(use_with screensaver x)
 		$(use_with screensaver mit-ext)
 		$(use_with systemd)
+		$(use_with elogind)
 		$(use_with upower)
 	)
-	autotools-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
+	econf "${myeconfargs[@]}"
 }
 
 pkg_postinst() {
diff --git a/x11-misc/light-locker/light-locker-1.8.0.ebuild b/x11-misc/light-locker/light-locker-1.8.0.ebuild
deleted file mode 100644
index e5e721f142e9..000000000000
--- a/x11-misc/light-locker/light-locker-1.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils gnome2-utils
-
-DESCRIPTION="A simple locker using lightdm"
-HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit +dpms gtk3 +screensaver -systemd +upower"
-
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.25.6:2
-	>=sys-apps/dbus-0.30
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/libXxf86vm
-	consolekit? ( sys-auth/consolekit )
-	dpms? ( x11-libs/libXext )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	screensaver? ( x11-libs/libXScrnSaver )
-	systemd? ( sys-apps/systemd )
-	upower? ( sys-power/upower )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/intltool
-	sys-devel/gettext"
-RDEPEND="${RDEPEND}
-	x11-misc/lightdm"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with consolekit console-kit)
-		$(use_with dpms dpms-ext)
-		$(use_with !gtk3 gtk2)
-		$(use_with screensaver x)
-		$(use_with screensaver mit-ext)
-		$(use_with systemd)
-		$(use_with upower)
-	)
-	autotools-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}