gentoo resync : 14.07.2018

6 files changed, 210 insertions, 0 deletions

diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
new file mode 100644
index 000000000000..d144ce9be781
--- /dev/null
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -0,0 +1,6 @@
+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-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
+EBUILD cinnamon-session-3.6.1-r4.ebuild 1540 BLAKE2B de1d180a3c7ef0b85ff0f8e9766108d5e6f8ed58fab9c124b21d9acf5907665db3eb45723b48e31bdbc9772ecfe5358d0f46c9702c346253530de4bfc9f7dca0 SHA512 4e12e45b19c8c54cc8319ff554c1372942a72ad54f8e13e5b24e23f230ea09292403395fad216cb95bccaddf64d22d4b2a4adc281e8abe4b4b27271d1004123a
+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..2be2b7170fa6
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 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.0.1-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
new file mode 100644
index 000000000000..9ca31379a60e
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
@@ -0,0 +1,38 @@
+--- a/configure.ac~	2016-05-20 13:03:13.000000000 +0200
++++ b/configure.ac	2016-06-25 17:36:55.389583194 +0200
+@@ -56,7 +56,15 @@
+ 
+ dnl We can only support old upower
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
+-PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
++AC_ARG_ENABLE([old-upower],
++  AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
++  [enable_old_upower=$enableval],
++  [enable_old_upower=auto])
++
++have_old_upower=no
++if test x$enable_old_upower != xno ; then
++  PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
++fi
+ AS_IF([test x$have_old_upower = xyes], [
+   AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
+ ])
+@@ -96,9 +104,15 @@
+ dnl Check for logind
+ dnl ====================================================================
+ 
+-PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [
+- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
+-])
++AC_ARG_ENABLE([logind],
++  AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++  [enable_logind=$enableval],
++  [enable_logind=auto])
++
++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])
++fi
+ 
+ if test x$have_logind = xyes; then
+     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
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
new file mode 100644
index 000000000000..ad3cba8d7130
--- /dev/null
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/cinnamon-session</remote-id>
+	</upstream>
+</pkgmetadata>