add patch from Frittella Laurento for change in synaptics driver (bug #202501) and a patch to drop the libgnome dependency

(Portage version: 2.1.4_rc14)

5 files changed, 157 insertions, 7 deletions

diff --git a/gnome-extra/gsynaptics/ChangeLog b/gnome-extra/gsynaptics/ChangeLog
index 49c1969f0da7..1b7e64deb080 100644
--- a/gnome-extra/gsynaptics/ChangeLog
+++ b/gnome-extra/gsynaptics/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/gsynaptics
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gsynaptics/ChangeLog,v 1.10 2008/01/06 03:18:19 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gsynaptics/ChangeLog,v 1.11 2008/01/06 03:28:54 compnerd Exp $
+
+*gsynaptics-0.9.13-r1 (06 Jan 2008)
+
+  06 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gsynaptics-0.9.13-CoastingSpeedThreshold.patch,
+  +files/gsynaptics-0.9.13-no-libgnome.patch, -gsynaptics-0.9.13.ebuild,
+  +gsynaptics-0.9.13-r1.ebuild:
+  Add no-libgnome patch by myself, and CoastingSpeedThreshold patch (bug
+  #202501) from Frittella Laurento
 
   06 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
   -gsynaptics-0.9.7.ebuild:
diff --git a/gnome-extra/gsynaptics/files/digest-gsynaptics-0.9.13 b/gnome-extra/gsynaptics/files/digest-gsynaptics-0.9.13-r1
index 24f3c7f42820..24f3c7f42820 100644
--- a/gnome-extra/gsynaptics/files/digest-gsynaptics-0.9.13
+++ b/gnome-extra/gsynaptics/files/digest-gsynaptics-0.9.13-r1
diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-CoastingSpeedThreshold.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-CoastingSpeedThreshold.patch
new file mode 100644
index 000000000000..f670564ce9d3
--- /dev/null
+++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-CoastingSpeedThreshold.patch
@@ -0,0 +1,11 @@
+--- src/gsynaptics.c.orig	2008-01-04 14:45:16.721550130 +0100
++++ src/gsynaptics.c	2008-01-04 14:45:47.666549605 +0100
+@@ -821,7 +821,7 @@
+ 	if (priv->synclient)
+ 	{
+ 		gchar *command;
+-		command = g_strdup_printf ("synclient CoastingSpeedThreshold=%f",
++		command = g_strdup_printf ("synclient CoastingSpeed=%f",
+ 			       		   thresh);
+ 		g_spawn_command_line_async (command, NULL);
+ 		g_free (command);
diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-no-libgnome.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-no-libgnome.patch
new file mode 100644
index 000000000000..2f4309425b9f
--- /dev/null
+++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-no-libgnome.patch
@@ -0,0 +1,120 @@
+diff -burNp gsynaptics-0.9.13/configure.ac gsynaptics-0.9.13/configure.ac
+--- gsynaptics-0.9.13/configure.ac	2007-11-28 16:12:02.000000000 -0800
++++ gsynaptics-0.9.13/configure.ac	2007-12-23 21:26:00.000000000 -0800
+@@ -18,14 +18,14 @@ AC_PROG_CC
+ # Checks for libraries.
+ AM_PATH_GTK_2_0(2.6.0)
+ 
+-PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
+-AC_SUBST(GNOME_CFLAGS)
+-AC_SUBST(GNOME_LIBS)
+-
+ PKG_CHECK_MODULES(GLADE2, libglade-2.0)
+ AC_SUBST(GLADE2_CFLAGS)
+ AC_SUBST(GLADE2_LIBS)
+ 
++PKG_CHECK_MODULES(GCONF2, gconf-2.0)
++AC_SUBST(GCONF2_CFLAGS)
++AC_SUBST(GCONF2_LIBS)
++
+ GETTEXT_PACKAGE=gsynaptics
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package])
+diff -burNp gsynaptics-0.9.13/src/init.c gsynaptics-0.9.13/src/init.c
+--- gsynaptics-0.9.13/src/init.c	2007-10-29 00:37:23.000000000 -0700
++++ gsynaptics-0.9.13/src/init.c	2007-12-23 21:31:30.000000000 -0800
+@@ -22,7 +22,7 @@
+ #  include <config.h>
+ #endif
+ 
+-#include <gnome.h>
++#include <glib/gi18n.h>
+ #include <gconf/gconf-client.h>
+ 
+ #include "gsynaptics.h"
+@@ -91,10 +91,7 @@ main (int argc, char **argv)
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
+-	gnome_program_init ("gsynaptics-init", VERSION,
+-			LIBGNOMEUI_MODULE, argc, argv,
+-			GNOME_PARAM_APP_DATADIR, NULL,
+-			NULL);
++	gtk_init (&argc, &argv);
+ 
+ 	synaptics = g_synaptics_new ();
+ 
+diff -burNp gsynaptics-0.9.13/src/main.c gsynaptics-0.9.13/src/main.c
+--- gsynaptics-0.9.13/src/main.c	2007-11-28 16:09:08.000000000 -0800
++++ gsynaptics-0.9.13/src/main.c	2007-12-23 21:28:36.000000000 -0800
+@@ -22,7 +22,7 @@
+ #  include <config.h>
+ #endif
+ 
+-#include <gnome.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ #include <gconf/gconf-client.h>
+ 
+@@ -683,7 +683,7 @@ setup_dialog (GladeXML *dialog)
+ 
+ 	gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1);
+ 
+-	path = gnome_pixmap_file ("touchpad.png");
++	path = g_build_filename (DATADIR "/pixmaps", "touchpad.png");
+ 	if (path)
+ 	{
+ 		icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
+@@ -712,10 +712,7 @@ main (int argc, char **argv)
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
+-	gnome_program_init ("gsynaptics", VERSION,
+-			LIBGNOMEUI_MODULE, argc, argv,
+-			GNOME_PARAM_APP_DATADIR, DATADIR,
+-			NULL);
++	gtk_init (&argc, &argv);
+ 
+ 	synaptics = g_synaptics_new ();
+ 	if (!g_synaptics_is_available(synaptics))
+diff -burNp gsynaptics-0.9.13/src/Makefile.am gsynaptics-0.9.13/src/Makefile.am
+--- gsynaptics-0.9.13/src/Makefile.am	2007-10-29 00:37:23.000000000 -0700
++++ gsynaptics-0.9.13/src/Makefile.am	2007-12-23 21:31:53.000000000 -0800
+@@ -3,8 +3,8 @@ gsynaptics_CFLAGS =				\
+ 	-DDATADIR=\""$(datadir)/$(PACKAGE)"\" 	\
+ 	-DHELPDATADIR=\""$(datadir)"\"	 	\
+ 	$(GTK_CFLAGS)				\
+-	$(GNOME_CFLAGS)				\
+ 	$(GLADE2_CFLAGS)			\
++	$(GCONF2_CFLAGS)			\
+ 	$(AM_CFLAGS)
+ 
+ gsynaptics_SOURCES =			\
+@@ -15,8 +15,8 @@ gsynaptics_SOURCES =			\
+ 
+ gsynaptics_LDADD =	\
+ 	$(GTK_LIBS)	\
+-	$(GNOME_LIBS)	\
+-	$(GLADE2_LIBS)
++	$(GLADE2_LIBS)	\
++	$(GCONF2_LIBS)
+ 
+ gsynaptics_init_SOURCES =		\
+ 	gsynaptics-conf.h		\
+@@ -25,11 +25,14 @@ gsynaptics_init_SOURCES =		\
+ 	gsynaptics.c gsynaptics.h
+ 
+ gsynaptics_init_CFLAGS =				\
++	$(GTK_CFLAGS)				\
+ 	$(GLIB_CFLAGS)				\
+ 	$(GNOME_CFLAGS)				\
++	$(GCONF2_CFLAGS)			\
+ 	$(AM_CFLAGS)
+ 
+ gsynaptics_init_LDADD =	\
++	$(GTK_LIBS)	\
+ 	$(GLIB_LIBS)	\
+-	$(GNOME_LIBS)
+-
++	$(GNOME_LIBS)	\
++	$(GCONF2_LIBS)
diff --git a/gnome-extra/gsynaptics/gsynaptics-0.9.13.ebuild b/gnome-extra/gsynaptics/gsynaptics-0.9.13-r1.ebuild
index 6a1b67ad5433..d6498218adae 100644
--- a/gnome-extra/gsynaptics/gsynaptics-0.9.13.ebuild
+++ b/gnome-extra/gsynaptics/gsynaptics-0.9.13-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gsynaptics/gsynaptics-0.9.13.ebuild,v 1.1 2007/12/23 21:22:40 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gsynaptics/gsynaptics-0.9.13-r1.ebuild,v 1.1 2008/01/06 03:28:54 compnerd Exp $
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
 HOMEPAGE="http://gsynaptics.sourceforge.jp/"
@@ -13,15 +13,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.6.0
-		>=gnome-base/libglade-2
-		>=gnome-base/libgnomeui-2"
+DEPEND=">=dev-libs/glib-2.10
+		>=x11-libs/gtk+-2.6.0
+		>=gnome-base/gconf-2.0
+		>=gnome-base/libglade-2"
 RDEPEND="${DEPEND}
 		 >=dev-util/pkgconfig-0.19
 		 sys-devel/gettext"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-no-libgnome.patch"
+	epatch "${FILESDIR}/${P}-CoastingSpeedThreshold.patch"
+	eautoreconf
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst