gnome-extra/cinnamon-session: Version bump

Package-Manager: portage-2.3.0_rc1

3 files changed, 105 insertions, 0 deletions

diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index d50a561f540..cd45b126bb3 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
new file mode 100644
index 00000000000..9d709f32101
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd logind) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}
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 00000000000..9ca31379a60
--- /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])