Version bump for Cinnamon 2.6

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 168 insertions, 6 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/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 2976bbeb4953..ffca98f56ff2 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,16 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cinnamon-screensaver-2.6.3-automagic-logind.patch 1124 SHA256 99d43c908427f15c8ab103e6b4d7e8e4a1a887b00173de89b0bee6ba68d685e7 SHA512 56c6a2ec1ed5b98583912935f3bcd7d7143d3d2a86bbe48809d39e29d2f451210b83155ec3fbdd1c05c720ec18c458b9be21e948d22db1f546409030889b36cc WHIRLPOOL cb05b9c526d7dcd6731cefa22f2af3274727c9ed8b30fb70a78a4059e86cc0ad28f7d30e5f63c87c6123d8239134a92e8e601a7fe9cf970c8dbf592291250de3
 DIST cinnamon-screensaver-2.4.1.tar.gz 142276 SHA256 e73c5d483cd4faeb8d7a4fec9bb1ab73df5cef5d05a3ab268f7a29947d2a483e SHA512 816cca80f2fe7bd333c3e23cea88e18262cb43b776d3280ab25bf8757aec338e24bb4fff867c6113b98b4f5d4988859e3c0ab41e552ee4f4ce122ba1cb4c2be7 WHIRLPOOL 6c56f2676242a8bf6e2666e819c17448d935046a4d552aec78403b9567ff8bd23e13d01cc224dc284331da57932d4b320fe8a25efae9169a091b3bfe917747c6
 DIST cinnamon-screensaver-2.4.2.tar.gz 142557 SHA256 52afb2c9b5b00e1d026469c7f2b1865ca44c784b920e35bfcd61d2a75b87bbda SHA512 54131d1c8aab2abf31210031f0888e9913535ce2697e3310c6f86a9edefe832fc46b0340af792d88d97788aa65c15d210e703dc3b15d419f08f64352444ccc61 WHIRLPOOL 56f87bc6fdf5eba04cd68df9546d6451ba1d7c146903813b76e368e6a71f45a97814923cdfa5bba881d4e53761b3c711a51a139e38c09c3ecc29902aa3b9949d
+DIST cinnamon-screensaver-2.6.3.tar.gz 145989 SHA256 cef3e6ccbb77e91f7e4ef04115b45696c5b6070b8517a60c8782b1f0a67a348a SHA512 d18fac08f7a56e79629b1e78c7ea69bb14c8e906a56252d523bc1129e97f58a3f6a6dc9b9adc21b3e2fb8826783e74375abb50b5b14d35f178522eb5c6d7e509 WHIRLPOOL 4b534d363f04dbd7f3785e19c9ebd847f78b8263aadcf8f9e1ab80dc4183a866f8d269704ebe5bdb9c18b5f5dcd44b5908f5859d72d16f775e2d7d3052614b5b
 EBUILD cinnamon-screensaver-2.4.1.ebuild 2163 SHA256 446b815b452d3308a997aad45837ada17d79cce7b0a15d9d452d98c36300ae5f SHA512 98e9cd427e8df0c98412e1f42b6ab406a05c0df230a420d1bc3e78cd216b1907c4799a87d8ba786da0064995e796d705d35e23c04926ccc7befd8dd89da45c7c WHIRLPOOL 2265c67dcdba9e564caaa61971684f26234e137d88a0b460821da7625615d521687cfb91d4b03223f44e9e89407ec9438e1b2bef2f78a61167b5b937fa8994f6
 EBUILD cinnamon-screensaver-2.4.2.ebuild 2022 SHA256 d89d8288fa7669525aad04e80d52d6ccf55cc449596b55562451a4ee9daa2259 SHA512 1f3606be8ed877a732cfb1619fc2122920c5193fb1aa1dc3636ec56cff97fd114229e140d3f94db023e3193522fb0ded20bcdfc1f66a6963759550d0c6701f95 WHIRLPOOL a6166c1b1d23169f9970c34a8c944e681a71be209cd9a0a6204fef2742037a409e6daddc75c895d32c005d28e2bf185322fabb1386f7deecdb9e1ed8f4bd70dc
-MISC ChangeLog 2325 SHA256 4ece8cc91c82fb52c2537bc193339389b88b732f0b2db1a22862e74f0bf014ac SHA512 4cb5814636f36eb9a677874dea30f38dba49b3e30f2e6ea57dadc86296ccab7c437cbbb2caf585b782f76618509d66bea88ad73cd0a343c2c3681aaff89ca2ce WHIRLPOOL a881a7a472cd49511129c1dd6c328a11292b983750c31f84771ceaaff285625bec056fe1c83b4c784a9bd9922df243e31fd8365743ebba5bd94e94bd64f81856
+EBUILD cinnamon-screensaver-2.6.3.ebuild 2682 SHA256 81c594a2d32bb242b62ec1ce9c48ed951bb0ef4a1f45604438ac6c6a0f2f025f SHA512 064589f1fe622d8485d94961d8896135fa6c5f9fa0fa7ce898b595e1f08a89c5757a52b27de18614a95436de34908aae4fac70a5d561cd876aa9d40769740b7b WHIRLPOOL fb6ee892b5b6bb124e9e3ef6ab91790a422c4b5d101e6eaf02227401f7dcc183ef47aaad1b9dad00278a1193abbd730c79d5c9d287a3263c08a70d19f23329bb
+MISC ChangeLog 2562 SHA256 9a898f0e5badef70166d373217aa467785eb353c419bf54f00b2a5e0abfd932b SHA512 bc94b654e2cacff9b3ec72f6c8a917fb7a39a4f4dae5a5d50cf0a796d344fe62f242d2ab5857d7b49e6d5733f54fea6a8ff11c75ad9a7755a7164508b64986db WHIRLPOOL 7dc09a86a4c1bff40734727fe23eced813393f471f1e8239ce3b956ebad008cc24de3f9b1f6b300e25a8166cec437f5863b7072b61ae058d3ab06ed270aa0ca2
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0JxUACgkQCaWpQKGI+9T3vQCfapIBo9ZpFI4JOMDWVPbOx/jM
-mbcAnA/p8b19eFO8h5SOFBwWXbpbBnMj
-=Qne1
+iQJ8BAEBCABmBQJVfN9gXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNuaEP+weI+BqCz8jZNSwQMCC8f3Mz
+xpqUuqQD7RyQ2EeFFjc1fie7iEb9Nh9EOg18UY7rBfMdUsrvSSZG4+zyay8an8+7
+LmSXBPtbAAalKQSJKGRVUF1MxKEseuriVgU5iUec1jXdT0n2D42rvogZvLYv8ld7
+Nb5wmUNavIgsNWN7yjdb0WoAZdxEURj8HILXuesZP1kjdCHrCcQ5DJjA2If9ZMB/
+zshwe7KXTqY3GOjvxafHqbP1IhFrzDTp21mKs/bk2WS7RRLruL+32JfBB7Sp4Vtp
+Vup/H4TKevywEXQNl2E0BEbvy0Huu9TPdsWx0/7sU8XiMxhAZ/lQIbtp0L5N45c9
+P7qw+iFx/04jLS57rChgm++F0leNKN0PrhJE93r51VLsk6ve8L43UzciVhHUoWmA
+wLNdwfqYpzlb7lCdDVUbipcfX2B9rNbbm7maTw3vltCJ4P7IPDwBZjnF7PL2XFFT
+xALaCsHPfZoVPn8rPzPvI9K47MnNROiKjE7G3F23k4B1iOA+nFs96ZocdVvS5bFY
+Ka5UVQVjWK8DZReT8Y2h6FF48gCLgWqas6NPXZJ8UAZdGfdrinAj1KV8ujHuLWeG
+TeO9114XQ2+6BsqvU8SFljaGZI9udQk9pA64WWLOScy61nCX48Hgf7AWV6LALow+
+80xxW4DsIRpAdnWjU821
+=eCCO
 -----END PGP SIGNATURE-----
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
+