gentoo resync : 05.04.2019

4 files changed, 98 insertions, 5 deletions

diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index cd57539f1018..ba297e2946f8 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 6ab823caf7be..220e5965eac3 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -2,9 +2,10 @@ AUX 10-user-dirs-update-mate 267 BLAKE2B d1943bd1ee27d95ffd9a09f7d6c4f98681b9c36
 AUX 15-xdg-data-mate 224 BLAKE2B ae38eaf5c0abc088a353d244de928ff12c7da020da0304c5592c7232ae4be69db55083da91fa8d95cdbb6bbc4c4d76ac37df3e011a5a5b984348435a0c615b3c SHA512 a19acef85d510d6244fd29ba7daa6d5cc314392257b47574d8aedea235e4a5273d36bd67c138da9496663c2786ba5f7f433ff4aa6990a91a39be267026e5694d
 AUX MATE 2378 BLAKE2B 824c6e357c90322a499aeeece3e38d25bcfb87c23eab159e1bc3c4dc39aeb535eb86f7833e8d9b9b1d48fc765414ca79120bee81ffde8c7d1f0ea6a112fe2dcc SHA512 dbb162f694eeee806a12b46bf45d47f4887a83562b61d05037b3de5a7778a68d79de5528327588da13a5c17c283c8b7590c10877eba77cea75ebe5113ef2c920
 AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76841c9802ce6182556a29faebcd28f71dfdd778ae73268ebba1d450c9f18ac730aedd5ba0f025e53c SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d
+AUX mate-session-manager-1.22.0-elogind.patch 3002 BLAKE2B 90f18a3e7c98d5dbadd34c327bb9ac0a971f4585da35b401625641842ac05c8fe0385cbf1ab0955e16865c106d2046de44409a452ce4a251e09ec127a33390e4 SHA512 aa5fba7040879aeeba931d5cc62896ff43fc5d770664cfcd9ca45cbf5959e7eec3fa74ba632ef19d653b2516589119a8c2c1349c054be1e9a8d42ccf3dd755da
 AUX mate-session-manager-1.22.0-fix-systemd-regression.patch 1833 BLAKE2B 894f6f223fefc7921ef42d604fccb30d3f9efb80ecea1bc0637b286e57552a9eaaad2f42c6e6bb2cdddd396954dea2712c8aa02da5ba54ca2974acb54d825acc SHA512 7a0036c706b56d4431fbb3d54be77930aede8d8d1d0889a568bc0432d91b15026ac26ef4ccdc0f41a860a6adf1a88cf07d4c260c810f66f1a910ff568b4e90fb
 DIST mate-session-manager-1.18.2.tar.xz 570336 BLAKE2B d1fd8f6a037fa38833d4aae05dcc9ed98ff192c712819342a77d19fb00e09febaa90fd0396048a3cee64ea424c6a72e8ae90f067d61929ef524825c97d500f8e SHA512 e3d3e2524cd0d00930b5c6b81134b969555f00550d23a357d426a6f0d475884ce6ab16be365fd5e95801dd53c250069ad091dec6c93f2ab70818460fbef4765e
 DIST mate-session-manager-1.22.0.tar.xz 603016 BLAKE2B 5d7064756b7d7d2ca4fdebf18319dc8a8d8eca6ed31c5e8e37e503c7099a0d541186028d6b4e174bff1ce9ca727a374e9597498b2ca6d5494dc74f21fec0baeb SHA512 7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a
 EBUILD mate-session-manager-1.18.2-r1.ebuild 2050 BLAKE2B 9863863dcb955c561cd69f67c141608a73e7bfe70804efee79438f5271e342c80da8e2a45e00c25e66ad5092ed8ca944ef9afd8133232e80a181910b5a1fa945 SHA512 cf6cbac9c513aadafa94bbb995bf4ca2f91fde90a0b3f09daab720b3fd73b4fbb349336e8ab96663c3abc557d6eede12e49e37036545f492d67a9775cad5d31a
-EBUILD mate-session-manager-1.22.0.ebuild 2108 BLAKE2B 7dc60870e72603c64ffb58c5a3525cc9eb3f76bf23c4f51eb3b72ddef9c6a2b753d345e2c9172808af5c54e1f3e70fa8761c008241665986ea4de2654710a961 SHA512 a986b52222ad4e026e3105ebe7f40fe94f7660be9c35022a5c69a4502a035a424ee01a0c7a7d5a5a87428c6f090bfffeac8cfd4168db7f5b3dbc607ad7c24be4
+EBUILD mate-session-manager-1.22.0.ebuild 2262 BLAKE2B 9a22af81b50bde176f0b7573209de64c11038ce9faab201e8548bb79acbc97176afe3fd49e2c2293f80a42f3e9cff4dc0423cd0c57b83a7d8f7165744e95646c SHA512 dd98ed6e03760881fb88d33df67c94bc47c6a7d93967deadbcb505b1fc96c7f947196f9a822e2243e85406192d8208dd96e503febab300752799c858a881b3ee
 MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-elogind.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-elogind.patch
new file mode 100644
index 000000000000..ebe68a0b3547
--- /dev/null
+++ b/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-elogind.patch
@@ -0,0 +1,84 @@
+From e6f62cd82d2717cb26951629e3f071814694fd07 Mon Sep 17 00:00:00 2001
+From: Victor Kareh <vkareh@redhat.com>
+Date: Fri, 8 Mar 2019 13:37:01 -0500
+Subject: [PATCH] Add ELOGIND support
+
+Reuses HAVE_SYSTEMD #define to reduce #ifdef mess.
+
+ELOGIND is not officially supported, but since it's
+a subset of systemd, it should work out of the box.
+
+Co-authored-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
+Co-authored-by: Jorge Pizarro Callejas <jpizarrocallejas@gmail.com>
+---
+ configure.ac             | 29 +++++++++++++++++++++++++++++
+ mate-session/Makefile.am |  2 ++
+ 2 files changed, 31 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 207ad97..1390ba0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,6 +109,34 @@ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes")
+ AC_SUBST(HAVE_SYSTEMD)
+ 
++dnl ====================================================================
++dnl Check for elogind
++dnl
++dnl elogind is not officially supported, but since it's a subset of
++dnl systemd, it should work out of the box
++dnl ====================================================================
++
++AC_ARG_WITH(elogind,
++            AS_HELP_STRING([--with-elogind],
++            [Use libelogind instead of libsystemd-login]),,
++            with_elogind=auto)
++
++use_elogind=no
++if test "x$with_elogind" != "xno"; then
++    PKG_CHECK_MODULES(LIBELOGIND,[libelogind], [use_elogind=yes],
++                      [PKG_CHECK_MODULES([LIBELOGIND], [libelogind],
++                      [use_elogind=yes], [use_elogind=no])])
++
++    if test "x$use_elogind" = "xyes"; then
++        AC_DEFINE([HAVE_ELOGIND], 1, [elogind support])
++        AC_DEFINE([HAVE_SYSTEMD], 1, [Define to 1 to reduce ifdefs since elogind is a drop-in replacement for systemd])
++        AC_SUBST(LIBELOGIND_CFLAGS)
++        AC_SUBST(LIBELOGIND_LIBS)
++    fi
++fi
++AM_CONDITIONAL(HAVE_ELOGIND, [test "x$use_elogind" = "xyes"])
++AC_SUBST(HAVE_ELOGIND)
++
+ dnl ====================================================================
+ dnl Check for XSync extension
+ dnl ====================================================================
+@@ -333,6 +361,7 @@ echo "
+ 
+         Default WM:               ${with_default_wm}
+         Systemd support:          ${use_systemd}
++        Elogind support:          ${use_elogind}
+         IPv6 support:             ${have_full_ipv6}
+         Backtrace support:        ${have_backtrace}
+         XRender support:          ${have_xrender}
+diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am
+index 093c908..ea0dc95 100644
+--- a/mate-session/Makefile.am
++++ b/mate-session/Makefile.am
+@@ -7,6 +7,7 @@ noinst_PROGRAMS = 		\
+ AM_CPPFLAGS =					\
+ 	$(MATE_SESSION_CFLAGS)		\
+ 	$(SYSTEMD_CFLAGS)			\
++	$(LIBELOGIND_CFLAGS)			\
+ 	$(DISABLE_DEPRECATED_CFLAGS)
+ 
+ AM_CFLAGS = $(WARN_CFLAGS)
+@@ -80,6 +81,7 @@ mate_session_LDADD =				\
+ 	$(XEXT_LIBS)				\
+ 	$(MATE_SESSION_LIBS)			\
+ 	$(SYSTEMD_LIBS)				\
++	$(LIBELOGIND_LIBS)			\
+ 	$(EXECINFO_LIBS)
+ 
+ libgsmutil_la_SOURCES =				\
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
index 9b948b230380..47d803f592f3 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
@@ -14,10 +14,9 @@ HOMEPAGE="http://mate-desktop.org/"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
+IUSE="debug elibc_FreeBSD elogind gnome-keyring ipv6 systemd +xtrans"
 
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-systemd-regression.patch )
+REQUIRED_USE="?? ( elogind systemd )"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -40,7 +39,10 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 	virtual/libintl
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	systemd? ( sys-apps/systemd )
-	!systemd? ( >=sys-auth/consolekit-0.9.2 )
+	!systemd? (
+		elogind? ( sys-auth/elogind )
+		!elogind? ( >=sys-auth/consolekit-0.9.2 )
+	)
 	xtrans? ( x11-libs/xtrans )"
 
 RDEPEND="${COMMON_DEPEND}
@@ -56,11 +58,17 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig:*
 	!<gnome-base/gdm-2.20.4"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-systemd-regression.patch
+	"${FILESDIR}"/${P}-elogind.patch
+)
+
 MATE_FORCE_AUTORECONF=true
 
 src_configure() {
 	mate_src_configure \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_with elogind) \
 		$(use_with systemd) \
 		$(use_with xtrans)  \
 		$(use_enable debug) \