[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/files/, gnome-extra/cinnamon-screensaver/

[Pacho Ramos]

commit:     b1a9d2da1e140c1b420a99d1f459ef170220cec0
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 12:36:51 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 12:57:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a9d2da

gnome-extra/cinnamon-screensaver: Ensure webkit-gtk:4.0 is used (#566572 by Perfect Gentleman)

Package-Manager: portage-2.2.27

 .../cinnamon-screensaver-2.8.0-r1.ebuild           | 107 +++++++++++++++++++++
 .../files/cinnamon-screensaver-2.8.0-webkit4.patch |  11 +++
 2 files changed, 118 insertions(+)

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
new file mode 100644
index 0000000..fd41717
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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: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() {
+	epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
+	epatch "${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/xscreensaver@××××××××.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.8.0-webkit4.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
new file mode 100644
index 0000000..831f9fd
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
@@ -0,0 +1,11 @@
+--- configure.ac~	2015-10-16 17:06:50.000000000 +0200
++++ 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
+         cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)
+-PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0],, [PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])])
++PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])
+ AC_SUBST(CINNAMON_SCREENSAVER_CFLAGS)
+ AC_SUBST(CINNAMON_SCREENSAVER_LIBS)
+