gentoo resync : 01.12.2017

5 files changed, 163 insertions, 4 deletions

diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 3bfed63ccdb9..7b7a2e2f4ba3 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,15 +1,19 @@
 AUX cinnamon-session-2.6.2-automagic.patch 1913 BLAKE2B 25af28ac4f088730396f2fb4837cbe854abd8ce9ec21930dae88c18fd4c1b92a12632183e4d828584d7eaa2a262dcf2a75584ec277712f266d47f0a7ec90a55f SHA512 fbeb1a7a5d05e3a7f2f4b65dcda39f78cd5168975b7ade9cc379a51f4c05d12ab97161b68dffef4f37e598199d71a4c7f4c2321cf826b02761ecf72d37ae3a45
 AUX cinnamon-session-3.0.1-automagic.patch 1470 BLAKE2B 799b731979f9a5326d61ec130db092a6b52d10eb0f434302b49fa0996fc9b6c3073ff312bd5f84faf1b12936919209db6159a7ad235f765af78b622b06b700db SHA512 571cdc733a66821abd927a7132bc27ebbc214023eb6c2985213409272d11baad1f734350d2a0853c27ebc35a059ca9d3766c4db658b558e013d5850a13f5e971
+AUX cinnamon-session-3.6.1-elogind.patch 1948 BLAKE2B 616dde6cb6612126074524df8662fc30cf59c126a37cfa9d82b09c086d31f47af64d9f96210a8d430b9eb3aca7279b93ce38f31e4574274064d103dc2f142b97 SHA512 ad8c067514318c126aab6d72da7004a0c07964cb9cac8c3763ec39b07d222a9dd6425eb464f1f0047d55c61f8a335611bd46e1546e2f170b43959207ff98c75f
+AUX cinnamon-session-3.6.1-elogind2.patch 743 BLAKE2B 4827c2cc5c8bcb74b0a31dc81c4fd4a25ade00f3a22371627cc3bdb5e3fb4476f7b66954ab6101681bef04bd7e38531851f2e371e6dee32c6294fc6f6faa240c SHA512 03e7beeaf6a93aaedcbe070c6182d3fcc898bd8410a65c63a9c5dcce310e97a4a4654e88e91e7aa7d8c12eef12d8f02eba89d8e007842c27d04dc9165c642de3
 DIST cinnamon-session-2.8.2.tar.gz 591438 SHA256 0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79 SHA512 4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc WHIRLPOOL 6f202a79a27cdf6a8bbe1ed62d5b4a6c6edd5746b8b50a448fc8874cb5de4b45c4201e1bce25760072ee2874438e87505405810b45c7e10019fdbfc4c7cc9b6b
 DIST cinnamon-session-2.8.3.tar.gz 591500 SHA256 306eb9448500b15b0d06826b66f438d767d001b706fd345c53b4a91d308ae4a9 SHA512 a581af6a00a5273ab4cf7b91ac4770b78d8ab670cf238c396e2087113795de059b4eaa3abcc8440b5eaa5cf0c4edc9696b183f9ce81803af36b9a3a37b5d5977 WHIRLPOOL d3c9d0f6791522c2c24801faacb0a5be34d658cceeaed2459d5f006c24e683d1ea39876045c505dd526ec972912e6c8bde8fffe703da6fa0f69a43f2e579ab61
 DIST cinnamon-session-3.0.1.tar.gz 592265 SHA256 d8935747bc8aa70518e70a7d338eaf9109b5307d8a44d49dc57e0f15d69e9c89 SHA512 cdbf9f910954976854aa1b90033781269dc9d521b86edd3e97ae936b59a9ac4ffa956ba37a51ba11beac73e38a732913ce147557e999484bd68529677eed21e8 WHIRLPOOL 9af4cf92685e6a07220779ed8ef73c7435dff08e3771bbc87994d5294f998129b0d114a3092987b8fc59b49f936616d135ca59327d9979c70d9aec55238a0332
 DIST cinnamon-session-3.2.0.tar.gz 595530 SHA256 d7c3d951ae0dddef96941c9f08f028a099443888db41981524f618a92624e0ca SHA512 00475069849c7bb1d874c65200128128068e6500475c61053f07deabacb98046bf344ab5d3b4537487c48103dd6c6a8316d1326396e606a0d44bc486db9267d6 WHIRLPOOL 1753d5f99a98b718e0db8b945e94ade2c316bb7965943f2b1605b10dcc08a5e74661b4b7edcf8afdceb167c0ceffd57a0f97612c2638b13278240f695fae344e
 DIST cinnamon-session-3.4.1.tar.gz 595567 SHA256 20426fe91347193b13ede47d2b2f14af4321f95274267304dc9844e2a5178948 SHA512 caac3b445e2dca8e040bdb215e8aca833cbcdb77611e435aab5ebcd4b0f9b6bddb117d97763d26e99d42bbacb7ec51171e6927d87dbdd7d6ed0f5287648dee0e WHIRLPOOL aaf997cc1c6b62484be5e466b5d80f221e62b80a4d65e8ec91f5bd51e429df71154ceb5be742a5a3fdb8affebe5407339b4a8eb1593f1ec70909c3e7dabb4e50
-DIST cinnamon-session-3.4.2.tar.gz 595721 SHA256 bfeb8a73cc8c7d9dfd728d34df0f578bd2ad8ed88f7de9d7cd5d3ae08f454530 SHA512 4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d WHIRLPOOL 7b4cc7c37b7ea02de59923752064edede742a9619a9dee86776475149cf3aa602d358b50cefa94601c8343119651792644f86f50ed27dacfb324b94fefab70ad
+DIST cinnamon-session-3.4.2.tar.gz 595721 BLAKE2B 7f50d208d6928144a6b47153fd21f4a90875eec8b37fac5b4efb3d7a70a8806561710a10568a2f597ff5f471e8a4d2deb6ce9e233d8c6a0616c966a7c74ca654 SHA512 4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d
+DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
 EBUILD cinnamon-session-2.8.2.ebuild 1582 BLAKE2B dcfd8b604c2d7a5c01c041f0539624c191e81ddaf3cbdb0b6564fcfe4c3305ddcd2bffcdaa2bea947bd2a5218b4e9287cf78aed542187043641c3423ed11ca3d SHA512 80076e1274b641acfdce833baf0bab4d6bb07a2736cef07d9654c5c300f186680b4fba99663d7a398365e625dbfa03ed49355db00b917bb42cb8411e1b3c6acd
 EBUILD cinnamon-session-2.8.3.ebuild 1514 BLAKE2B 2cd4bccadb4525a42203cd8fda3686d36cb279ddb0fddce7ba1f3e5e0314433540d5c8e240b585768d076f2c49d7ebd56a596916978513d5079f27c6d44326fb SHA512 b98dd92afdb560fc56cf3a2c099107f5db639cd417f9b235bcd4671a95ecbbad76439e6bf2f97aa0e2db62a542f60a060c8c7769cad99d359387b4665291a4dd
 EBUILD cinnamon-session-3.0.1.ebuild 1514 BLAKE2B c11e91af2692addda8cb991216b4bcb199caeb84833f2e76bb42dcc5415ed92dce35fbc82a8ff54d27550706f915f33e5f742d32bbd695e9d0abb00ef8fd0b7d SHA512 fc351c3e943a366a4f21c08c046c6f0e3d44e11064c233f8c9465973aabde43f96369478f5cf46700d7fbf39315197f73601baa1a1fad42d9be12ecfe08a0d11
 EBUILD cinnamon-session-3.2.0.ebuild 1516 BLAKE2B 0ae4a2d7091ae89542a9fe48c49ee107acf352c0844c7a7aa7ee1a704329616aebc6287fcd97705b7f6a3978644e36cfad4e81d7c5bbafd0d9958839b2ff1419 SHA512 5bcf426ccfea1d07cd8679a52e4c9bbb45301459f425e549b4fc700c8a9fd47aa0025390dd3025ee6ac48692467cabc2591ac817e4a7d229e9ea64a140a1d7e2
 EBUILD cinnamon-session-3.4.1.ebuild 1516 BLAKE2B 83488fb908998effe8ad1ac8e3f45b00fc941b6d34cba67d1996808ace9e9aad38f32601ebc3e731733cf4cbe47edaab0bdc5c2f2cd3126a0375a89c0b4bee37 SHA512 9d0aec5ac77901ba904bbe8f7fde160b5d4d993b779f5708dbbf7c2e783e873052b6470ed4099a7ca516c55fc0cd9d11a396d7c2f8b32fc5d0a5bd08abadf740
 EBUILD cinnamon-session-3.4.2.ebuild 1516 BLAKE2B 83488fb908998effe8ad1ac8e3f45b00fc941b6d34cba67d1996808ace9e9aad38f32601ebc3e731733cf4cbe47edaab0bdc5c2f2cd3126a0375a89c0b4bee37 SHA512 9d0aec5ac77901ba904bbe8f7fde160b5d4d993b779f5708dbbf7c2e783e873052b6470ed4099a7ca516c55fc0cd9d11a396d7c2f8b32fc5d0a5bd08abadf740
-MISC metadata.xml 355 BLAKE2B 555425fa429a3dc1dc1e04f6dea7fa9ef7bce524b1c4c3ad9e998c464337a90874ce8be7621b8fb6a99ebddd07df3f5a66af41641acf6d592775c69943b92910 SHA512 5ab00ed770845599d3afc384ab32fc886c4626cb1492ef0db65d9202c15c17d09e759e646a05a00f825b4c47c906e4d185cbff2b8a2fa8ba63d739b69d9faccb
+EBUILD cinnamon-session-3.6.1-r4.ebuild 1542 BLAKE2B a478ffe7d1da51f01583e94a8478749296c5922e878598d8ec4d402e9e27de58f4f5e779d1bff1ac0becb00f1fbd9dfd1d39da0a0d654477d3f781a8ff49abd8 SHA512 9744d0854472e0fd449a3261c1113ff2085f2fd1c1584cae513daab89e91843b06cc977bea8722416d80c5a69aa209a6ba6af6cec2ee3942f6fa9eaf92cbf564
+MISC metadata.xml 343 BLAKE2B 6526f06bd8b9c250154c56a126b12c40b9c61fc52b6d4175f9b5e86e3a3ef5b1eba4af9db0b9ef768aaac361e941f2ab93f4e2d6291afb5cc1657c20f69d825b SHA512 dbdf14a6641b809dcdf364577f4e9ca9ca31d6db62a74f74bbbf1f5ee962e69452fb027098735bda31138c27dd43692b78915eca1ad40ab5a29938a28a56b610
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
new file mode 100644
index 000000000000..d5da4702700c
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183
+			   sys-auth/polkit )
+	!systemd? ( sys-power/upower
+			   sys-auth/polkit[elogind] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/elogind[policykit] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+	eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch"
+	eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		--enable-logind \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6)
+}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
new file mode 100644
index 000000000000..fdbda72ca22e
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
@@ -0,0 +1,65 @@
+diff --git a/cinnamon-session/Makefile.am b/cinnamon-session/Makefile.am
+index 789d47d..d8093d4 100644
+--- a/cinnamon-session/Makefile.am
++++ b/cinnamon-session/Makefile.am
+@@ -71,6 +71,7 @@ cinnamon_session_CPPFLAGS =			\
+ 	$(XEXT_CFLAGS)				\
+ 	$(GCONF_CFLAGS)				\
+ 	$(LOGIND_CFLAGS)			\
++	$(ELOGIND_CFLAGS)			\
+ 	-I$(top_srcdir)/egg			\
+ 	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
+ 	-DDATA_DIR=\""$(datadir)/cinnamon-session"\" \
+@@ -91,6 +92,7 @@ cinnamon_session_LDADD =				\
+ 	$(UPOWER_LIBS)				\
+ 	$(GCONF_LIBS)				\
+ 	$(LOGIND_LIBS)				\
++	$(ELOGIND_LIBS)				\
+ 	$(EXECINFO_LIBS)
+ 
+ libcsmutil_la_SOURCES =				\
+diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
+index cef991c..dc2aa2e 100644
+--- a/cinnamon-session/csm-systemd.c
++++ b/cinnamon-session/csm-systemd.c
+@@ -32,7 +32,11 @@
+ #include <sys/types.h>
+ #include <pwd.h>
+ 
++#ifdef HAVE_ELOGIND
++#include <elogind/sd-login.h>
++#else
+ #include <systemd/sd-login.h>
++#endif
+ 
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/configure.ac b/configure.ac
+index 38db5a3..8dafc6a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,15 +113,23 @@ AC_ARG_ENABLE([logind],
+ 
+ have_logind=no
+ if test x$enable_logind != xno ; then
+-  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
++  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
+ fi
+ 
+ if test x$have_logind = xyes; then
+     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+ fi
+ 
++have_elogind=no
++PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
++if test x$have_elogind = xyes; then
++        AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
++fi
++
+ AC_SUBST(LOGIND_CFLAGS)
+ AC_SUBST(LOGIND_LIBS)
++AC_SUBST(ELOGIND_CFLAGS)
++AC_SUBST(ELOGIND_LIBS)
+ 
+ dnl ====================================================================
+ dnl Option to disable DBus user session support.
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
new file mode 100644
index 000000000000..a58703bc1bf3
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index c46b35f..5bde44a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind],
+ 
+ have_logind=no
+ if test x$enable_logind != xno ; then
+-  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
++  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
+ fi
+ 
+ if test x$have_logind = xyes; then
+@@ -124,6 +124,7 @@ have_elogind=no
+ PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
+ if test x$have_elogind = xyes; then
+         AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
++	AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+ fi
+ 
+ AC_SUBST(LOGIND_CFLAGS)
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index 01596926d67b..ad3cba8d7130 100644
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-session</remote-id>