Version bump for Cinnamon 2.6

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

3 files changed, 148 insertions, 1 deletions

diff --git a/gnome-extra/cinnamon-screensaver/ChangeLog b/gnome-extra/cinnamon-screensaver/ChangeLog
index 1b9d5b607da7..cf0dfc9a0561 100644
--- a/gnome-extra/cinnamon-screensaver/ChangeLog
+++ b/gnome-extra/cinnamon-screensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/cinnamon-screensaver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.13 2015/06/07 11:12:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.14 2015/06/14 01:56:46 tetromino Exp $
+
+*cinnamon-screensaver-2.6.3 (13 Jun 2015)
+
+  13 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cinnamon-screensaver-2.6.3.ebuild,
+  +files/cinnamon-screensaver-2.6.3-automagic-logind.patch:
+  Version bump for Cinnamon 2.6
 
 *cinnamon-screensaver-2.4.2 (07 Jun 2015)
 
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild
new file mode 100644
index 000000000000..9669fdee73d7
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild,v 1.1 2015/06/14 01:56:46 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc pam systemd"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:3[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/gnome-icon-theme-symbolic
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
+
+	# Fix xscreensaver paths for gentoo
+	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr$(get_libdir)/misc/xscreensaver/#" \
+		-i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+	python_fix_shebang data/screensavers
+
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_configure \
+		$(use_enable doc docbook-docs) \
+		$(use_enable pam locking) \
+		$(use_enable systemd logind) \
+		--with-mit-ext \
+		--with-pam-prefix=/etc \
+		--with-xf86gamma-ext \
+		--with-kbd-layout-indicator
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+}
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
new file mode 100644
index 000000000000..cc12685296cd
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
@@ -0,0 +1,33 @@
+From b382066324d2c42c3d5d04fbb21cf144c79daff0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 17:16:34 -0400
+Subject: [PATCH] Make logind check non-automagic
+
+---
+ configure.ac | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6c424c..0eae195 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -581,7 +581,15 @@ dnl ---------------------------------------------------------------------------
+ dnl logind support
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [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, [libsystemd-login], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes ; then
+         AC_DEFINE(HAVE_LOGIND, 1, [logind support])
+-- 
+2.4.3
+