New ebuild for mate-extra/mate-screensaver, replaces xscreensaver, integrating with the MATE desktop; imported from the mate-overlay, reviewed and adjusted.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

7 files changed, 226 insertions, 0 deletions

diff --git a/mate-extra/mate-screensaver/ChangeLog b/mate-extra/mate-screensaver/ChangeLog
new file mode 100644
index 000000000000..68436075e94a
--- /dev/null
+++ b/mate-extra/mate-screensaver/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for mate-extra/mate-screensaver
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/ChangeLog,v 1.1 2014/03/10 00:31:51 tomwij Exp $
+
+*mate-screensaver-1.6.1 (10 Mar 2014)
+
+  10 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/mate-screensaver-1.2.0-fix-popsquares-includes.patch,
+  +files/mate-screensaver-1.2.0-fix-with-libgl.patch, +files/xss-conversion.txt,
+  +mate-screensaver-1.6.1.ebuild, +metadata.xml:
+  New ebuild for mate-extra/mate-screensaver, replaces xscreensaver, integrating
+  with the MATE desktop; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
new file mode 100644
index 000000000000..a6ecf9a4e791
--- /dev/null
+++ b/mate-extra/mate-screensaver/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX mate-screensaver-1.2.0-fix-popsquares-includes.patch 309 SHA256 f21d10a9a3ffecbe1dfc90d27c032a7678f7918fdcb14e5575e1935c90506a59 SHA512 14dac0aca344c414123bf2feac312d09800c89299568ee9b0d8fa84858702a54a57b0eeee15574509a1d5e11181c217890bf09c864dac7e0facaade7ebd2d5d3 WHIRLPOOL dfe99f877dbc50ef80f99c5f7f483ba5fd0ed3a2ef4077f2c5098f89ad19ba5bb83896b5b1f889007a739e653b98888d725c33cbdedd952cbeb9355ab0572c10
+AUX mate-screensaver-1.2.0-fix-with-libgl.patch 381 SHA256 f4860df79ec7ebcc46da120095f726031ba39b806bc2107817095193ea27f008 SHA512 ce5675738d3a53ad864a4a8fdaa39ac50037c0ba23e598838b7a0bdd4104e97e2ee23dd0bcb7830c6fdf878680596a9668cac6f4ca1cdee43117c3f31ea4ac8c WHIRLPOOL 5a355a4f05a837795043a585a516a00cc3a3c73e098f0fdee7a2d0c54f4774da86d3875402d8ddf506cce7ed06681fe2f2d3e0981a35d86664b49554e9020ea5
+AUX xss-conversion.txt 1026 SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8 SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a WHIRLPOOL 95492336413595cd91fbf31dc44f616500714ec11ddedcbdf98e9c18b0d0897d83b3f5ef82fe410cdd45409060a2560a873b67141576ed3a196bc33f87734ee3
+DIST mate-screensaver-1.6.1.tar.xz 4974032 SHA256 b04801e68d013c899cdfefceed25e28040c21197a2da40cd650be52ac643843c SHA512 cebb8aef6d68429a0f0033449e3d412e58055f1c3c88903dd609b21408fed5e393d93ee043a4243c3952b7387e10a2e6f86b1a255136604ccc91951a5b62b486 WHIRLPOOL 82dca4fbd87f5e13fb13006bba4c3974f8f7354c4a9c27468cb2359097b97d2255c3dbed8d96beb6b8f88e665d293beabce841493bc57b618d4f7c5e8235b8d2
+EBUILD mate-screensaver-1.6.1.ebuild 3965 SHA256 307a99f2a4805ae1aabab3520e661769eea209d2ae0005f6c38af51c880ac912 SHA512 020c371bf760c6fe2c6d4a6053d7c54be1b94ba4d336856264eeff3d31451313d7919442f92edd0d7fbebd71427ade1bec77b44193e12ed27b1145e472048339 WHIRLPOOL 0fc571aa78a62989181a6b4b423b7420156ac3e86472415bb4b57ef7a41f4e687a304e0f938da559f000e2f85fc024c5700e08a3cfcc9ada28e9859ca90e0331
+MISC ChangeLog 667 SHA256 923a665f191e9977fbb3caa0f7e901ad0a72dbb63108ef95d90190f4fde3836c SHA512 471f6232858f1afba76f674e728021c64ea2ecb651ecbd4f201757e4716d3df7a1caa6e2ee8f3d7ba34976fd0b9bdaaa6f25b430082f243784f1ef64c53e18a5 WHIRLPOOL 635c1928958082ebd6ee87fccef6e415ed412e3314a2bfb85e624e7d9b4863ebe2077a0860964a391b1bc1817e40e07f56806585e14deefb9ee958c58d195652
+MISC metadata.xml 333 SHA256 65924dc5eb9352b23b5cbd440061640d0651dc0300fc43085b33d3606e710b87 SHA512 e4ca39f2167d40427df01498ba04b05ee9c109c6c9f02cf192a637179fc3c3a642b2862488613d18a5942a9660b56c293fe4c0d582fb64267064b90dcd7bea7d WHIRLPOOL 9b85f9a29c79be7448cde034436d23bf00068bd545905a310f777902ce5346e765a90937c584b004a2addafdb440f354629ff6ce757270f847d9575430fcd063
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTHQfUAAoJEJWyH81tNOV91NkH/A+NM4LVFlIk6roNT0ixkPDz
+tRUVp+X6t0ruS+Fq0QfuBH9uwkR9ifUUbPHTp1P3/KwJko4KdZjSgHnNwlXteRT5
+dTRegvgOTVq6Brv6/DNRxSW0WWxexwJCdMoiKhNXU9DeoU/fV54iKEDzBHfNlt0b
+wNy/dWKuazlWD3ptvBWznhPpcrvk4fiKJb/vBI9PkJdmiPrxR/EHDaksyYYK1Dnu
+2S/fffBHDVHfWpmaftvfErawMyywiraelSjMjAZZQq0Vz9DnAZmoFjxofk3gkoqB
+4AQaMKpGn/94wYhIh63IVQR37+jSG3gCKvM75B4AyXuvpCLugE0uJq7ARgsQm3Q=
+=epEL
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch
new file mode 100644
index 000000000000..5d13f69486b6
--- /dev/null
+++ b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch
@@ -0,0 +1,11 @@
+diff -burN a/savers/popsquares.c b/savers/popsquares.c
+--- a/savers/popsquares.c	2012-03-07 22:28:11.000000000 +0100
++++ b/savers/popsquares.c	2012-07-17 19:54:44.062628969 +0200
+@@ -21,6 +21,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch
new file mode 100644
index 000000000000..45638c0ea10e
--- /dev/null
+++ b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2012-08-08 19:23:14.026623125 +0200
++++ b/configure.ac	2012-08-08 19:23:20.766623326 +0200
+@@ -545,7 +545,7 @@
+ dnl - Check for GL
+ dnl ---------------------------------------------------------------------------
+ 
+-AC_ARG_WITH(gl, [  --with-libgl	  build with GL support])
++AC_ARG_WITH(libgl, [  --with-libgl	build with GL support])
+ have_libgl=no
+ GL_LIBS=""
+ 
diff --git a/mate-extra/mate-screensaver/files/xss-conversion.txt b/mate-extra/mate-screensaver/files/xss-conversion.txt
new file mode 100644
index 000000000000..d69e50619589
--- /dev/null
+++ b/mate-extra/mate-screensaver/files/xss-conversion.txt
@@ -0,0 +1,22 @@
+There is a conversion script which you can use to convert XScreenSaver
+screensavers to the gnome-screensaver format.  The conversion script is located
+in the documentation directory (/usr/share/doc/${PF}/).
+
+The migrate-xscreensaver-config.sh and xscreensaver-config.xsl files will be
+needed to convert the screensaver.  Make sure to enable the executable bit on
+the script (chmod +x migrate-xscreensaver-config.sh).
+
+The script takes the module to convert and creates a .desktop file corresponding
+to the module.
+
+migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml
+
+The above command should convert all xscreensaver modules.
+
+You must copy the desktop files into /usr/share/applications/gnome-screensavers (cp
+*.desktop /usr/share/applications/screensavers), and the executables from
+/usr/lib/misc/xscreensaver into /usr/libexec/gnome-screensaver
+(cp /usr/lib/misc/xscreensaver/* /usr/libexec/gnome-screensaver)
+
+Going to the gnome-screensaver-preferences dialog should now show the new
+modules in the list.
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.6.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.6.1.ebuild
new file mode 100644
index 000000000000..e37533c3d413
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.6.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/mate-screensaver-1.6.1.ebuild,v 1.1 2014/03/10 00:31:51 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+
+inherit gnome2 multilib versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop."
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="X consolekit kernel_linux libnotify opengl pam systemd"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.71:0
+	>=dev-libs/glib-2.15:2
+	>=mate-base/libmatekbd-1.6:0
+	>=mate-base/mate-desktop-1.6:0
+	>=mate-base/mate-menus-1.6:0
+	>=sys-apps/dbus-0.30:0
+	>=x11-libs/gdk-pixbuf-2.14:2
+	>=x11-libs/gtk+-2.11.5:2
+	>=x11-libs/libX11-1:0
+	x11-libs/cairo:0
+	x11-libs/libXext:0
+	x11-libs/libXrandr:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXxf86misc:0
+	x11-libs/libXxf86vm:0
+	x11-libs/libxklavier:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	opengl? ( virtual/opengl:0 )
+	pam? ( virtual/pam:0 )
+	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
+	!!<gnome-extra/gnome-screensaver-3:0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35:0
+	>=mate-base/mate-common-1.6:0
+	sys-devel/gettext:0
+	x11-proto/randrproto:0
+	x11-proto/scrnsaverproto:0
+	x11-proto/xextproto:0
+	x11-proto/xf86miscproto:0
+	virtual/libc:0
+	virtual/pkgconfig:0
+	consolekit? ( sys-auth/consolekit:0 )
+	systemd? ( sys-apps/systemd:0= )"
+
+src_prepare() {
+	# Fix QA warnings due to missing includes in popsquares.
+	epatch "${FILESDIR}"/${PN}-1.2.0-fix-popsquares-includes.patch
+
+	# Fix libgl typo in configure.ac.
+	epatch "${FILESDIR}"/${PN}-1.2.0-fix-with-libgl.patch
+
+	# Fix intltoolize broken file, see upstream #577133.
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die
+
+	# Fix forgotten gnome->mate rename.
+	sed -i 's:org.gnome:org.mate:' po/POTFILES.in || die
+
+	# Make tests work.
+	sed -i '6 a\data/lock-dialog-default.ui' po/POTFILES.in || die
+
+	# We use gnome-keyring now, update pam file.
+	sed -e 's:mate_keyring:gnome_keyring:g' -i data/mate-screensaver || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with consolekit console-kit) \
+		$(use_enable debug) \
+		$(use_with libnotify) \
+		$(use_with opengl libgl) \
+		$(use_enable pam) \
+		$(use_with systemd) \
+		$(use_with X x) \
+		--enable-locking \
+		--with-kbd-layout-indicator \
+		--with-xf86gamma-ext \
+		--with-xscreensaverdir=/usr/share/xscreensaver/config \
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+	gnome2_src_install
+
+	# Install the conversion script in the documentation.
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
+	dodoc "${FILESDIR}"/xss-conversion.txt
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms u+s /usr/libexec/mate-screensaver-dialog
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
+	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+		ewarn "You have xscreensaver installed, you probably want to disable it."
+		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+		ewarn "build xscreensaver with -gnome in the USE flags."
+		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+		echo
+	fi
+
+	elog "Information for converting screensavers is located in "
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
+}
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
new file mode 100644
index 000000000000..444f546fe229
--- /dev/null
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>TomWij@gentoo.org</email>
+		<name>Tom Wijsman</name>
+	</maintainer>
+	<use>
+		<flag name="consolekit">Enable support for 
+			<pkg>sys-auth/consolkekit</pkg></flag>
+	</use>
+</pkgmetadata>