Version bump

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 284 insertions, 2 deletions

diff --git a/gnome-extra/drwright/ChangeLog b/gnome-extra/drwright/ChangeLog
index 1e5097343d9a..27fa26deeca3 100644
--- a/gnome-extra/drwright/ChangeLog
+++ b/gnome-extra/drwright/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/drwright
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/ChangeLog,v 1.25 2013/03/29 20:09:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/ChangeLog,v 1.26 2013/10/03 20:42:46 pacho Exp $
+
+*drwright-3.5.0 (03 Oct 2013)
+
+  03 Oct 2013; Pacho Ramos <pacho@gentoo.org> +drwright-3.5.0.ebuild,
+  +files/drwright-3.5.0-gsd-3.5.patch, +files/drwright-3.5.0-gsd-3.7.patch:
+  Version bump
 
   29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -drwright-3.2.4.ebuild:
   Clean up old revision.
@@ -97,4 +103,3 @@
 
   08 Jun 2003; Alastair Tse <liquidx@gentoo.org> drwright-0.16.ebuild:
   new version, thanks to Baptiste Mille-Mathias <bmm80@ifrance.com>.
-
diff --git a/gnome-extra/drwright/drwright-3.5.0.ebuild b/gnome-extra/drwright/drwright-3.5.0.ebuild
new file mode 100644
index 000000000000..dc34d1220f04
--- /dev/null
+++ b/gnome-extra/drwright/drwright-3.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/drwright-3.5.0.ebuild,v 1.1 2013/10/03 20:42:46 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Tool forcing you to take regular breaks to prevent RSI"
+HOMEPAGE="http://git.gnome.org/browse/drwright"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.31.13:2
+	>=x11-libs/gtk+-3.0.0:3
+	>=x11-libs/gdk-pixbuf-2.25.3
+	>=gnome-base/gnome-settings-daemon-3.7.3
+	>=gnome-base/gnome-control-center-3.2
+	>=x11-libs/libnotify-0.7
+	media-libs/libcanberra[gtk3]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	sys-devel/gettext
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
+"
+
+src_prepare() {
+	# Patches from 'master' to allow compilation with latest gsd
+	epatch "${FILESDIR}/${P}-gsd-3.5.patch"
+	epatch "${FILESDIR}/${P}-gsd-3.7.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/gnome-extra/drwright/files/drwright-3.5.0-gsd-3.5.patch b/gnome-extra/drwright/files/drwright-3.5.0-gsd-3.5.patch
new file mode 100644
index 000000000000..fd26c80566e8
--- /dev/null
+++ b/gnome-extra/drwright/files/drwright-3.5.0-gsd-3.5.patch
@@ -0,0 +1,40 @@
+From 6fb8014c2474e086a66d1474bd771d256e79be8d Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Wed, 19 Sep 2012 20:59:36 +0000
+Subject: Remove gsd_typing_break_plugin_class_finalize boilerplate
+
+class_finalize is now included in the GNOME_SETTINGS_PLUGIN_REGISTER
+convenience macro. Also bumped g-s-d requirement to 3.5.91 to get the
+new macro.
+---
+diff --git a/configure.in b/configure.in
+index d0adc9d..aaa1223 100644
+--- a/configure.in
++++ b/configure.in
+@@ -48,7 +48,7 @@ GDK_PIXBUF_REQUIRED=2.25.3
+ GTK_REQUIRED=3.0.0
+ LIBCANBERRA_REQUIRED=0
+ LIBNOTIFY_REQUIRED=0.7
+-GSD_REQUIRED=2.91.8
++GSD_REQUIRED=3.5.91
+ 
+ # ************
+ # Typing Break
+diff --git a/src/gsd-typing-break-plugin.c b/src/gsd-typing-break-plugin.c
+index ceb5e88..8150331 100644
+--- a/src/gsd-typing-break-plugin.c
++++ b/src/gsd-typing-break-plugin.c
+@@ -35,11 +35,6 @@ struct GsdTypingBreakPluginPrivate {
+ GNOME_SETTINGS_PLUGIN_REGISTER (GsdTypingBreakPlugin, gsd_typing_break_plugin)
+ 
+ static void
+-gsd_typing_break_plugin_class_finalize (GsdTypingBreakPluginClass *klass)
+-{
+-}
+-
+-static void
+ gsd_typing_break_plugin_init (GsdTypingBreakPlugin *plugin)
+ {
+         plugin->priv = GSD_TYPING_BREAK_PLUGIN_GET_PRIVATE (plugin);
+--
+cgit v0.9.2
diff --git a/gnome-extra/drwright/files/drwright-3.5.0-gsd-3.7.patch b/gnome-extra/drwright/files/drwright-3.5.0-gsd-3.7.patch
new file mode 100644
index 000000000000..244916d1b1c7
--- /dev/null
+++ b/gnome-extra/drwright/files/drwright-3.5.0-gsd-3.7.patch
@@ -0,0 +1,187 @@
+From 75d3053882dafbf1eb8ccc1df2085d32e453ac37 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Fri, 19 Apr 2013 22:02:11 +0000
+Subject: Adapt to and require gnome-settings-daemon 3.7.3
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698413
+---
+diff --git a/configure.in b/configure.in
+index 16f7cc4..6b6c5a7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -48,7 +48,7 @@ GDK_PIXBUF_REQUIRED=2.25.3
+ GTK_REQUIRED=3.0.0
+ LIBCANBERRA_REQUIRED=0
+ LIBNOTIFY_REQUIRED=0.7
+-GSD_REQUIRED=3.5.91
++GSD_REQUIRED=3.7.3
+ 
+ # ************
+ # Typing Break
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 49ca76a..f8e09f2 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -73,7 +73,6 @@ gsd_plugin_LTLIBRARIES = \
+ 	$(NULL)
+ 
+ libtyping_break_la_SOURCES = 		\
+-	gsd-typing-break-plugin.h	\
+ 	gsd-typing-break-plugin.c	\
+ 	gsd-typing-break-manager.h	\
+ 	gsd-typing-break-manager.c	\
+diff --git a/src/gsd-typing-break-plugin.c b/src/gsd-typing-break-plugin.c
+index 8150331..2cee4f3 100644
+--- a/src/gsd-typing-break-plugin.c
++++ b/src/gsd-typing-break-plugin.c
+@@ -23,81 +23,8 @@
+ #include <glib/gi18n-lib.h>
+ #include <gmodule.h>
+ 
+-#include "gsd-typing-break-plugin.h"
++#include <gnome-settings-daemon/gnome-settings-plugin.h>
+ #include "gsd-typing-break-manager.h"
+ 
+-struct GsdTypingBreakPluginPrivate {
+-        GsdTypingBreakManager *manager;
+-};
++GNOME_SETTINGS_PLUGIN_REGISTER (GsdTypingBreak, gsd_typing_break)
+ 
+-#define GSD_TYPING_BREAK_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPluginPrivate))
+-
+-GNOME_SETTINGS_PLUGIN_REGISTER (GsdTypingBreakPlugin, gsd_typing_break_plugin)
+-
+-static void
+-gsd_typing_break_plugin_init (GsdTypingBreakPlugin *plugin)
+-{
+-        plugin->priv = GSD_TYPING_BREAK_PLUGIN_GET_PRIVATE (plugin);
+-
+-        g_debug ("GsdTypingBreakPlugin initializing");
+-
+-        plugin->priv->manager = gsd_typing_break_manager_new ();
+-}
+-
+-static void
+-gsd_typing_break_plugin_finalize (GObject *object)
+-{
+-        GsdTypingBreakPlugin *plugin;
+-
+-        g_return_if_fail (object != NULL);
+-        g_return_if_fail (GSD_IS_TYPING_BREAK_PLUGIN (object));
+-
+-        g_debug ("GsdTypingBreakPlugin finalizing");
+-
+-        plugin = GSD_TYPING_BREAK_PLUGIN (object);
+-
+-        g_return_if_fail (plugin->priv != NULL);
+-
+-        if (plugin->priv->manager != NULL) {
+-                g_object_unref (plugin->priv->manager);
+-        }
+-
+-        G_OBJECT_CLASS (gsd_typing_break_plugin_parent_class)->finalize (object);
+-}
+-
+-static void
+-impl_activate (GnomeSettingsPlugin *plugin)
+-{
+-        gboolean res;
+-        GError  *error;
+-
+-        g_debug ("Activating typing_break plugin");
+-
+-        error = NULL;
+-        res = gsd_typing_break_manager_start (GSD_TYPING_BREAK_PLUGIN (plugin)->priv->manager, &error);
+-        if (! res) {
+-                g_warning ("Unable to start typing_break manager: %s", error->message);
+-                g_error_free (error);
+-        }
+-}
+-
+-static void
+-impl_deactivate (GnomeSettingsPlugin *plugin)
+-{
+-        g_debug ("Deactivating typing_break plugin");
+-        gsd_typing_break_manager_stop (GSD_TYPING_BREAK_PLUGIN (plugin)->priv->manager);
+-}
+-
+-static void
+-gsd_typing_break_plugin_class_init (GsdTypingBreakPluginClass *klass)
+-{
+-        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
+-        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
+-
+-        object_class->finalize = gsd_typing_break_plugin_finalize;
+-
+-        plugin_class->activate = impl_activate;
+-        plugin_class->deactivate = impl_deactivate;
+-
+-        g_type_class_add_private (klass, sizeof (GsdTypingBreakPluginPrivate));
+-}
+diff --git a/src/gsd-typing-break-plugin.h b/src/gsd-typing-break-plugin.h
+deleted file mode 100644
+index 50bee59..0000000
+--- a/src/gsd-typing-break-plugin.h
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- *
+- */
+-
+-#ifndef __GSD_TYPING_BREAK_PLUGIN_H__
+-#define __GSD_TYPING_BREAK_PLUGIN_H__
+-
+-#include <glib.h>
+-#include <glib-object.h>
+-#include <gmodule.h>
+-
+-#include <gnome-settings-daemon/gnome-settings-plugin.h>
+-
+-G_BEGIN_DECLS
+-
+-#define GSD_TYPE_TYPING_BREAK_PLUGIN                (gsd_typing_break_plugin_get_type ())
+-#define GSD_TYPING_BREAK_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPlugin))
+-#define GSD_TYPING_BREAK_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPluginClass))
+-#define GSD_IS_TYPING_BREAK_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_TYPING_BREAK_PLUGIN))
+-#define GSD_IS_TYPING_BREAK_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_TYPING_BREAK_PLUGIN))
+-#define GSD_TYPING_BREAK_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPluginClass))
+-
+-typedef struct GsdTypingBreakPluginPrivate GsdTypingBreakPluginPrivate;
+-
+-typedef struct
+-{
+-        GnomeSettingsPlugin    parent;
+-        GsdTypingBreakPluginPrivate *priv;
+-} GsdTypingBreakPlugin;
+-
+-typedef struct
+-{
+-        GnomeSettingsPluginClass parent_class;
+-} GsdTypingBreakPluginClass;
+-
+-GType   gsd_typing_break_plugin_get_type            (void) G_GNUC_CONST;
+-
+-/* All the plugins must implement this function */
+-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+-
+-G_END_DECLS
+-
+-#endif /* __GSD_TYPING_BREAK_PLUGIN_H__ */
+--
+cgit v0.9.2