commit: 18e77c5d17b5f13700754fbc5a155890f3a0b5fd Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Jun 25 15:29:49 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Jun 25 16:26:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e77c5d
gnome-extra/cinnamon-screensaver: Version bump Package-Manager: portage-2.3.0_rc1 gnome-extra/cinnamon-screensaver/Manifest | 1 + .../cinnamon-screensaver-3.0.1.ebuild | 105 +++++++++++++++++++++ .../files/cinnamon-screensaver-2.8.0-webkit4.patch | 4 +- ...nnamon-screensaver-3.0.1-automagic-logind.patch | 21 +++++ 4 files changed, 129 insertions(+), 2 deletions(-) diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest index 8e27e02..3a921d5 100644 --- a/gnome-extra/cinnamon-screensaver/Manifest +++ b/gnome-extra/cinnamon-screensaver/Manifest @@ -1 +1,2 @@ DIST cinnamon-screensaver-2.8.0.tar.gz 146275 SHA256 595c787bdc9d3a7189d603fe065475e39ac09f957de2da8423b685ade1441036 SHA512 438ce35145d29b2cee8bb2f07191e0aeb5803e21a67ddd0a4bb13e113ac12e2e1be6b8780c657a67e9c27f8cb09aaec1e261f478432aa9fdbd1f21229294df6d WHIRLPOOL 61a2af9bdfcc4be850ff4455782f00048d12ee1d1f36cd35acdc498e4054d450946a064db8b09b6c6000b897af21cfa0a3acc699eefdef437a699e454e252dcc +DIST cinnamon-screensaver-3.0.1.tar.gz 147036 SHA256 de32ab1852b605835ea0ca41f248d18b32d7805d479eb6fd5877d4de92dbb784 SHA512 d9ad3f5c09d35388811387e3a7d1a8637d59390c4f797dedc4f6ff97cff631deb009d1cd1288317ca119f5db6456c05fd99c87c135595b2b1f07882892447427 WHIRLPOOL 6b4094cff650234933d82248fc671e399956bc435d1c47aa3b6869f2ba7c3eaaf9d973e05d29f1c274b269b6be62beca0ff0b3babc3804a73d62b9329be568f2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild new file mode 100644 index 0000000..a8c339a --- /dev/null +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit autotools 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="debug 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:4[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/adwaita-icon-theme + + ${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() { + eapply "${FILESDIR}"/${PN}-3.0.1-automagic-logind.patch + eapply "${FILESDIR}"/${PN}-2.8.0-webkit4.patch #566572 + + # Fix xscreensaver paths for gentoo + sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \ + -i data/screensavers/[email protected]/main || die + + python_fix_shebang data/screensavers + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(usex debug --enable-debug ' ') \ + $(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.8.0-webkit4.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch index 831f9fd..cbf7427 100644 --- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch +++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch @@ -1,5 +1,5 @@ ---- configure.ac~ 2015-10-16 17:06:50.000000000 +0200 -+++ configure.ac 2016-01-30 13:33:07.595401835 +0100 +--- a/configure.ac~ 2015-10-16 17:06:50.000000000 +0200 ++++ b/configure.ac 2016-01-30 13:33:07.595401835 +0100 @@ -58,7 +58,7 @@ gtk+-3.0 >= $GTK_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch new file mode 100644 index 0000000..06048d5 --- /dev/null +++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch @@ -0,0 +1,21 @@ +--- a/configure.ac~ 2016-05-30 17:09:04.000000000 +0200 ++++ b/configure.ac 2016-06-25 17:26:08.614205626 +0200 +@@ -580,9 +580,15 @@ + dnl logind support + dnl --------------------------------------------------------------------------- + +-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [ +- PKG_CHECK_MODULES(LOGIND, [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, [libsystemd], [have_logind=yes], [have_logind=no]) ++fi + + if test x$have_logind = xyes ; then + AC_DEFINE(HAVE_LOGIND, 1, [logind support])
