Bump to 0.9.14-r1. Include a bunch of ubuntu/debian patches (bug #248939) and fix missing DEPEND.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

7 files changed, 399 insertions, 9 deletions

diff --git a/gnome-extra/gsynaptics/ChangeLog b/gnome-extra/gsynaptics/ChangeLog
index dd68508e1ed6..957504653bbf 100644
--- a/gnome-extra/gsynaptics/ChangeLog
+++ b/gnome-extra/gsynaptics/ChangeLog
@@ -1,6 +1,16 @@
 # 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.14 2008/07/14 13:14:18 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gsynaptics/ChangeLog,v 1.15 2009/01/18 22:38:57 eva Exp $
+
+*gsynaptics-0.9.14-r1 (18 Jan 2009)
+
+  18 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  files/gsynaptics-0.9.14-build-filename.patch,
+  +files/gsynaptics-0.9.14-do-not-set-zero.patch,
+  +files/gsynaptics-0.9.14-dot-fixes.patch,
+  +files/gsynaptics-0.9.14-fix-docbook.patch, +gsynaptics-0.9.14-r1.ebuild:
+  Bump to 0.9.14-r1. Include a bunch of ubuntu/debian patches (bug #248939)
+  and fix missing DEPEND.
 
 *gsynaptics-0.9.14 (14 Jul 2008)
 
diff --git a/gnome-extra/gsynaptics/Manifest b/gnome-extra/gsynaptics/Manifest
index 78076c6947eb..046ac6cee9e6 100644
--- a/gnome-extra/gsynaptics/Manifest
+++ b/gnome-extra/gsynaptics/Manifest
@@ -3,19 +3,23 @@ Hash: SHA1
 
 AUX gsynaptics-0.9.13-CoastingSpeedThreshold.patch 407 RMD160 394bd56b0275cdb20643198a30cc8d6f6064cfbc SHA1 1a5ae829406863b02303f3c728659013c7d8f0d1 SHA256 bbe263355d23218ccfab046db4ad2a2b938cc1957979d9a386fd0cd0d13603b8
 AUX gsynaptics-0.9.13-no-libgnome.patch 3456 RMD160 cbdefec29733ba5bdea5be9c82a2afaad662a091 SHA1 a65dcc555612c73e72bb1c5c0c8dbcedd9422358 SHA256 2597a9ac8dce636ea9ff29850bab648ecde5ed7920c72a9d2553255b55e31bca
-AUX gsynaptics-0.9.14-build-filename.patch 802 RMD160 f5136cdc3be6b475ab9aa9125ae92bf1a51b329d SHA1 1aba0e3407134f3c192693c8e1fd0085666146a7 SHA256 0a7f87dd6fddc3e477c068c96a3fdcd5ba4872563d1422a073faf72fa4fe4696
+AUX gsynaptics-0.9.14-build-filename.patch 792 RMD160 afc4cf4a6c472ef668c367a0c84483b205b6d05c SHA1 2e74aa0136906141987dc3244c7ef0bc70e8b699 SHA256 74915d0f692000a25e8e24507c69854e1557a634b1a0e8ac450c9b7142d63924
+AUX gsynaptics-0.9.14-do-not-set-zero.patch 6209 RMD160 0966c2501d023477210d957560101ede144491e4 SHA1 6e71ee8e4b18d3cbc7be927a07a677366552b958 SHA256 cdc2c73c057e98e697fc927f720b2d3979eae92e90fccf84ee0b21f1a4937cc4
+AUX gsynaptics-0.9.14-dot-fixes.patch 2528 RMD160 63039f0ec0c8c8681c4d44f3e45f278758ffd512 SHA1 c178e6a98ca08cc476043534cfe3e9b137695112 SHA256 ca1046623ddfdcedf6d21f212771daae2e262da78b5f819d779ce5d0c89891ff
+AUX gsynaptics-0.9.14-fix-docbook.patch 2384 RMD160 c7cc3a642dea7e1f537b8bd9867ba78d943aa929 SHA1 83bbd052ce65722c28dfe5f9450b80bc17c6508e SHA256 b9d8562d288882457bf1b60f9e26bd84f24f845a558e2be51b1edda5be533202
 DIST gsynaptics-0.9.10.tar.gz 386398 RMD160 ec705e0fdaf5fc7486849ee1fcb4defe5c1852b5 SHA1 2693b79e73a1d4be3c630d947a91a394b3e4c588 SHA256 db477e50e02ffb397e1afb57690bdf478dc3f34ea7f6740b0c9f53bf79b15701
 DIST gsynaptics-0.9.13.tar.gz 410684 RMD160 128c8f6360466823e8d80205e2429939db854d3e SHA1 f9aa2bb684f6922bf87686a8bdf75f5501f126b3 SHA256 a76727d86896b7ddb297d8eb74167fccfd9590158727a1754499c2682edf9edc
 DIST gsynaptics-0.9.14.tar.gz 416168 RMD160 44c568ca8f8e42e5835784a76de557907246c1cf SHA1 c89575bd37883007820c1184f00c0f0831e4b214 SHA256 ad265c810eb281a836954989c88c7faf33d580c81dcc60c4a31f511abd1ab300
 EBUILD gsynaptics-0.9.10.ebuild 1099 RMD160 b489d384800f856735b3b6fc77e28a1c6f239038 SHA1 c610ef0e193cdb5232eafb61a6a2cda0b6c7ee2a SHA256 0c01ee6da5ed4512b67fca9c3686a02a3bf080cd99d7de81952f83170e5a29e0
 EBUILD gsynaptics-0.9.13-r1.ebuild 1335 RMD160 dded393e53f1a85af5c9d6ef12b2fcade9939c3f SHA1 70e76a575abfbb9668277e21ef6c13fdb360252b SHA256 4fb879854c75698304929fe373b89821c855bbc6b6425e0f7f3aba908e445892
+EBUILD gsynaptics-0.9.14-r1.ebuild 1704 RMD160 015a3fb686e4e3ff0898295dee9ec1f24af1e961 SHA1 f56440334408b241cd4d49cb28f071f967a7a719 SHA256 6ed68344dd2efdf6c3e55ae214f9df8acc751f8ca99bd11a6880c965c00dca51
 EBUILD gsynaptics-0.9.14.ebuild 1375 RMD160 84b49d6d898b623f808c42d4ed9c7707cbf2ebea SHA1 388fc8790c9edc8044d250937522ea95c0e4f810 SHA256 c7ccee91bc754caa95fad40eba67b1d68970ccd9c68fe50cce371d33d2087146
-MISC ChangeLog 2289 RMD160 a11a0ec4acf6ab318e0559c13de25dd94b9a7e1e SHA1 02daad91235dd4c3c20e5130ee0e477f4b92ea67 SHA256 633c5740e34d7ae8f1892e555a76d6951e56732f209d1a9db6aa07ac7d2a1cda
+MISC ChangeLog 2701 RMD160 e2cdc1f5c4f48bce18f8fbf14be2a82cbd41a042 SHA1 91466d6c2d3b328cc14b2e3e14b79eda4addc517 SHA256 c3e8e6f64c48c06de497cd1df855bf2df5b646727ecbb13d9bef09578db83e0d
 MISC metadata.xml 311 RMD160 868d0eab62db916aa47b7f440a3f4efecc6163b1 SHA1 0e56da7be32af7c553c07179c574cd7837298702 SHA256 774cc71e08a317563fb2700d5aac76af10e3e31ae7c1c58325730bfa0fbb110a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh7UTEACgkQ1fmVwcYIWAYxoQCgt17tQ0D4XUv42lHJIXe6zrGE
-tCwAoLr01MkDH5xHQt2tT9b2pn5IzBhF
-=N7RY
+iEYEARECAAYFAklzr4YACgkQ1fmVwcYIWAYDSwCguKYOozDsWoReLC0hy3crEzYh
+/2cAoOWd9jJlc1dKBE9Yhmrx0OsYxzeX
+=oM2V
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-build-filename.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-build-filename.patch
index c48689533d76..4f8716d75329 100644
--- a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-build-filename.patch
+++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-build-filename.patch
@@ -4,8 +4,6 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: https://sourceforge.jp/tracker/index.php?func=detail&aid=12568&group_id=1720&atid=6435
 ## DP: Missing terminating NULL for g_build_filename call.
-
-@DPATCH@
 diff -urNad gsynaptics-0.9.14~/src/main.c gsynaptics-0.9.14/src/main.c
 --- gsynaptics-0.9.14~/src/main.c	2008-02-28 23:27:28.000000000 +0100
 +++ gsynaptics-0.9.14/src/main.c	2008-05-17 08:34:04.000000000 +0200
diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-do-not-set-zero.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-do-not-set-zero.patch
new file mode 100644
index 000000000000..996d68227ed0
--- /dev/null
+++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-do-not-set-zero.patch
@@ -0,0 +1,185 @@
+Do not set to 0 when some keys are not defined.
+Debian bug #480744.
+
+Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12545&group_id=1720&atid=6435
+
+diff -urNad gsynaptics-0.9.14~/src/init.c gsynaptics-0.9.14/src/init.c
+--- gsynaptics-0.9.14~/src/init.c	2008-02-28 23:27:41.000000000 +0100
++++ gsynaptics-0.9.14/src/init.c	2008-05-17 09:14:12.000000000 +0200
+@@ -36,63 +36,148 @@
+ {
+ 	gboolean b_value;
+ 	gint i_value;
++	GConfValue *gval = NULL;
+ 
+ 	if (!gconf_client_dir_exists (gconf, DIRNAME, NULL))
+ 		return;
+ 
+ 	/* touchpad on/off */	
+-	b_value = gconf_client_get_bool (gconf, OFF_KEY, NULL);
+-	g_synaptics_set_enabled (synaptics, b_value ? 1 : 0);
++	gval = gconf_client_get (gconf, OFF_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_BOOL) {
++			b_value = gconf_value_get_bool(gval);
++			g_synaptics_set_enabled (synaptics, b_value ? 1 : 0);
++		}
++		gconf_value_free(gval);
++	}
+ 	
+ 	/* vertical scroll delta */
+-	i_value = gconf_client_get_int (gconf, VERTSCROLLDELTA_KEY, NULL);
+-	g_synaptics_set_vertical_scroll_delta (synaptics, i_value);
++	gval = gconf_client_get (gconf, VERTSCROLLDELTA_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_vertical_scroll_delta (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
+ 	
+ 	/* horizontal scroll delta */
+-	i_value = gconf_client_get_int (gconf, HORIZSCROLLDELTA_KEY, NULL);
+-	g_synaptics_set_horizontal_scroll_delta (synaptics, i_value);
++	gval = gconf_client_get (gconf, HORIZSCROLLDELTA_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_horizontal_scroll_delta (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
+ 	
+ 	/* circular scroll */
+-	i_value = gconf_client_get_int (gconf, CIRCSCROLLDELTA_KEY, NULL);
+-	b_value = gconf_client_get_bool (gconf, CIRCULARSCROLLING_KEY, NULL);
+-	g_synaptics_set_circular_scroll_delta (synaptics, i_value);
+-	g_synaptics_set_circular_scroll_enabled (synaptics, b_value);
++	gval = gconf_client_get (gconf, CIRCSCROLLDELTA_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_circular_scroll_delta (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
++	gval = gconf_client_get (gconf, CIRCULARSCROLLING_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_BOOL) {
++			b_value = gconf_value_get_bool(gval);
++			g_synaptics_set_circular_scroll_enabled (synaptics, b_value);
++		}
++		gconf_value_free(gval);
++	}
+ 	/* the trigger of circular scrolling */
+-	i_value = gconf_client_get_int (gconf, CIRCSCROLLTRIGGER_KEY, NULL);
+-	g_synaptics_set_circular_scroll_trigger (synaptics, i_value);
++	gval = gconf_client_get (gconf, CIRCSCROLLTRIGGER_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_circular_scroll_trigger (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
+ 	
+ 	
+ 	/* tapping time */
+-	i_value = gconf_client_get_int (gconf, MAXTAPTIME_KEY, NULL);
+-	g_synaptics_set_tap_time (synaptics, i_value);
++	gval = gconf_client_get (gconf, MAXTAPTIME_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_tap_time (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
+ 	
+ 	/* fast taps */
+-	b_value = gconf_client_get_bool (gconf, FASTTAPS_KEY, NULL);
+-	g_synaptics_set_fast_taps (synaptics, b_value);
++	gval = gconf_client_get (gconf, FASTTAPS_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_BOOL) {
++			b_value = gconf_value_get_bool(gval);
++			g_synaptics_set_fast_taps (synaptics, b_value);
++		}
++		gconf_value_free(gval);
++	}
+ 	
+ 	/* sensitivity */
+-	i_value = gconf_client_get_int (gconf, SENSITIVITY_KEY, NULL);
+-	g_synaptics_set_sensitivity (synaptics, i_value);
++	gval = gconf_client_get (gconf, SENSITIVITY_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_sensitivity (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
+ 
+ 	/* coasting */
+-	b_value = gconf_client_get_bool (gconf, COASTENABLE_KEY, NULL);
+-	g_synaptics_set_coasting_enabled (synaptics, b_value);
++	gval = gconf_client_get (gconf, COASTENABLE_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_BOOL) {
++			b_value = gconf_value_get_bool(gval);
++			g_synaptics_set_coasting_enabled (synaptics, b_value);
++		}
++		gconf_value_free(gval);
++	}
+ 	
+ 	/* edge motion */
+-	b_value = gconf_client_get_bool (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL);
+-	g_synaptics_set_edge_motion_enabled (synaptics, b_value);
++	gval = gconf_client_get (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_BOOL) {
++			b_value = gconf_value_get_bool(gval);
++			g_synaptics_set_edge_motion_enabled (synaptics, b_value);
++		}
++		gconf_value_free(gval);
++	}
+ 
+ 	/* min speed */
+-	i_value = gconf_client_get_int (gconf, MINSPEED_KEY, NULL);
+-	g_synaptics_set_min_speed (synaptics, i_value);
++	gval = gconf_client_get (gconf, MINSPEED_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_min_speed (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
+ 
+ 	/* max speed */
+-	i_value = gconf_client_get_int (gconf, MAXSPEED_KEY, NULL);
+-	g_synaptics_set_max_speed (synaptics, i_value);
++	gval = gconf_client_get (gconf, MAXSPEED_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_max_speed (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
+ 
+ 	/* accel factor */
+-	i_value = gconf_client_get_int (gconf, ACCELFACTOR_KEY, NULL);
+-	g_synaptics_set_accel_factor (synaptics, i_value);
++	gval = gconf_client_get (gconf, ACCELFACTOR_KEY, NULL);
++	if (gval != NULL) {
++		if (gval->type == GCONF_VALUE_INT) {
++			i_value = gconf_value_get_int(gval);
++			g_synaptics_set_accel_factor (synaptics, i_value);
++		}
++		gconf_value_free(gval);
++	}
+ 
+ }
+ 
diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-dot-fixes.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-dot-fixes.patch
new file mode 100644
index 000000000000..94eebe5e5449
--- /dev/null
+++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-dot-fixes.patch
@@ -0,0 +1,68 @@
+# Fix format strings to always use . as decimal separator, see 
+# https://sourceforge.jp/tracker/index.php?func=detail&aid=12498&group_id=1720&atid=6435
+#
+# Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12544&group_id=1720&atid=6435
+diff -urNad gsynaptics-0.9.14~/src/gsynaptics.c gsynaptics-0.9.14/src/gsynaptics.c
+--- gsynaptics-0.9.14~/src/gsynaptics.c	2008-02-28 23:21:17.000000000 +0100
++++ gsynaptics-0.9.14/src/gsynaptics.c	2008-05-17 08:36:54.000000000 +0200
+@@ -713,8 +713,9 @@
+ 	if (priv->synclient)
+ 	{
+ 		gchar *command;
+-		command = g_strdup_printf ("synclient AccelFactor=%f",
+-			       		   (gdouble)value / 1000);
++		char strval[G_ASCII_DTOSTR_BUF_SIZE];
++		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
++		command = g_strdup_printf ("synclient AccelFactor=%s", strval);
+ 		g_spawn_command_line_async (command, NULL);
+ 		g_free (command);
+ 	}
+@@ -734,8 +735,9 @@
+ 	if (priv->synclient)
+ 	{
+ 		gchar *command;
+-		command = g_strdup_printf ("synclient MaxSpeed=%f",
+-			       		   (gdouble)value / 1000);
++		char strval[G_ASCII_DTOSTR_BUF_SIZE];
++		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
++		command = g_strdup_printf ("synclient MaxSpeed=%s", strval);
+ 		g_spawn_command_line_async (command, NULL);
+ 		g_free (command);
+ 	}
+@@ -755,8 +757,9 @@
+ 	if (priv->synclient)
+ 	{
+ 		gchar *command;
+-		command = g_strdup_printf ("synclient MinSpeed=%f",
+-			       		   (gdouble)value / 1000);
++		char strval[G_ASCII_DTOSTR_BUF_SIZE];
++		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
++		command = g_strdup_printf ("synclient MinSpeed=%s", strval);
+ 		g_spawn_command_line_async (command, NULL);
+ 		g_free (command);
+ 	}
+@@ -822,8 +825,10 @@
+ 	if (priv->synclient)
+ 	{
+ 		gchar *command;
+-		command = g_strdup_printf ("synclient CoastingSpeed=%f",
+-			       		   thresh);
++		char strval[G_ASCII_DTOSTR_BUF_SIZE];
++		g_ascii_dtostr(strval, sizeof(strval), thresh);
++		command = g_strdup_printf ("synclient CoastingSpeed=%s",
++			       		   strval);
+ 		g_spawn_command_line_async (command, NULL);
+ 		g_free (command);
+ 	}
+@@ -843,8 +848,9 @@
+ 	if (priv->synclient)
+ 	{
+ 		gchar *command;
+-		command = g_strdup_printf ("synclient CircScrollDelta=%f",
+-			       		   (gdouble)delta / 1000);
++		char strval[G_ASCII_DTOSTR_BUF_SIZE];
++		g_ascii_dtostr(strval, sizeof(strval), (gdouble)delta / 1000);
++		command = g_strdup_printf ("synclient CircScrollDelta=%s", strval);
+ 		g_spawn_command_line_async (command, NULL);
+ 		g_free (command);
+ 	}
diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-fix-docbook.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-fix-docbook.patch
new file mode 100644
index 000000000000..87af5634358b
--- /dev/null
+++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-fix-docbook.patch
@@ -0,0 +1,64 @@
+Fix docbook document to be valid.
+
+See https://sourceforge.jp/tracker/index.php?func=detail&aid=13557&group_id=1720&atid=6433
+
+diff -urNad gsynaptics-0.9.14~/help/C/gsynaptics.xml gsynaptics-0.9.14/help/C/gsynaptics.xml
+--- gsynaptics-0.9.14~/help/C/gsynaptics.xml	2008-02-28 23:38:55.000000000 +0100
++++ gsynaptics-0.9.14/help/C/gsynaptics.xml	2008-09-22 11:08:43.000000000 +0200
+@@ -214,7 +214,7 @@
+     </para>
+     <para>Also, it will only be able to communicate with the driver,
+     if the <command>synclient</command> tool is installed and
+-    operational, which means there is <term>"SHMConfig" "true"</term>
++    operational, which means there is <varname>"SHMConfig" "true"</varname>
+     in the section of the synaptics driver in
+     <filename>xorg.conf</filename> or <filename>XF86Config</filename>.
+     </para>
+@@ -321,7 +321,7 @@
+ 		    Makes the driver react faster to a single tap, but
+ 		    also makes double clicks caused by double tapping
+ 		    slower </quote>. (borrowed from <command>man 5
+-		    synaptics</command> for <term>FastTaps</term>
++		    synaptics</command> for <varname>FastTaps</varname>
+ 		    configuration value of the driver)
+ 		  </para>
+ 		</listitem>
+@@ -342,8 +342,6 @@
+ 	      The touchpad can be used to control scrolling, as could
+ 	      be done with a scroll-wheel mouse.
+ 	    </para>
+-	  </listitem>
+-	  <listitem>
+ 	    <variablelist>
+ 	      <varlistentry id="enable-mail-summary-popup">
+ 		<term><guilabel>Enable vertical scrolling</guilabel></term>
+@@ -353,8 +351,6 @@
+ 		    (emulating a scroll mouse) is possible when moving
+ 		    the finger along the right side of the touchpad.
+ 		  </para>
+-		</listitem>
+-		<listitem>
+ 		  <para>The scrolling speed can be set here.</para>
+ 		</listitem>
+ 	      </varlistentry>
+@@ -366,8 +362,6 @@
+ 		    possible when moving the finger along the bottom
+ 		    side of the touchpad.
+ 		  </para>
+-		</listitem>
+-		<listitem>
+ 		  <para>The scrolling speed can be set here.</para>
+ 		</listitem>
+ 	      </varlistentry>
+@@ -379,11 +373,7 @@
+ 		    a scrolling wheel, by drawing a circle with the
+ 		    finger on the touchpad.
+ 		  </para>
+-		</listitem>
+-		<listitem>
+ 		  <para>The scrolling speed can be set here.</para>
+-		</listitem>
+-		<listitem>
+ 		  <para>The start point of the circle for circular scrolling can also be set here.</para>
+ 		</listitem>
+ 	      </varlistentry>
diff --git a/gnome-extra/gsynaptics/gsynaptics-0.9.14-r1.ebuild b/gnome-extra/gsynaptics/gsynaptics-0.9.14-r1.ebuild
new file mode 100644
index 000000000000..3e0a0984252a
--- /dev/null
+++ b/gnome-extra/gsynaptics/gsynaptics-0.9.14-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gsynaptics/gsynaptics-0.9.14-r1.ebuild,v 1.1 2009/01/18 22:38:57 eva Exp $
+
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
+HOMEPAGE="http://gsynaptics.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/29684/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.6.0
+	>=gnome-base/gconf-2.0
+	>=gnome-base/libglade-2"
+DEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.19
+	app-text/gnome-doc-utils
+	sys-devel/gettext
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix ?
+	epatch "${FILESDIR}/${PN}-0.9.13-CoastingSpeedThreshold.patch"
+
+	# Fix crash on startup, thanks to debian folks, bug #210958
+	epatch "${FILESDIR}/${P}-build-filename.patch"
+
+	# Ubuntu/Debian patch stack. See bug #248939 and
+	# http://patches.ubuntu.com/by-release/extracted/debian/g/gsynaptics/
+	epatch "${FILESDIR}/${P}-do-not-set-zero.patch"
+	epatch "${FILESDIR}/${P}-dot-fixes.patch"
+	epatch "${FILESDIR}/${P}-fix-docbook.patch"
+
+	rm -rf "${S}/.pc"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	echo
+	elog "Ensure that the following line is in the InputDevice section in"
+	elog "your X config file (/etc/X11/xorg.conf):"
+	elog
+	elog "Option \"SHMConfig\" \"on\""
+	elog
+	elog "You need to add gsynaptics-init to your session to restore your"
+	elog "settings the next time you log into GNOME:"
+	elog "Desktop -> Preferences -> Sessions -> Start Programs -> Add"
+	echo
+}