Version bump, bug #282687, thank Coderoar for report. Took maintenance. Removed old.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

7 files changed, 85 insertions, 232 deletions

diff --git a/gnome-extra/gsynaptics/ChangeLog b/gnome-extra/gsynaptics/ChangeLog
index 009f35840eab..6d7b97adba71 100644
--- a/gnome-extra/gsynaptics/ChangeLog
+++ b/gnome-extra/gsynaptics/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gsynaptics
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gsynaptics/ChangeLog,v 1.16 2009/03/20 03:56:25 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gsynaptics/ChangeLog,v 1.17 2009/09/21 06:59:09 pva Exp $
+
+*gsynaptics-0.9.16 (21 Sep 2009)
+
+  21 Sep 2009; Peter Volkov <pva@gentoo.org> -gsynaptics-0.9.13-r1.ebuild,
+  -files/gsynaptics-0.9.13-no-libgnome.patch, -gsynaptics-0.9.14.ebuild,
+  +gsynaptics-0.9.16.ebuild, metadata.xml:
+  Version bump, bug #282687, thank Coderoar for report. Took maintenance.
+  Removed old.
 
   20 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/gnome-extra/gsynaptics/Manifest b/gnome-extra/gsynaptics/Manifest
index b89ec1e574a7..1d69099372ef 100644
--- a/gnome-extra/gsynaptics/Manifest
+++ b/gnome-extra/gsynaptics/Manifest
@@ -1,15 +1,13 @@
 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 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
+DIST gsynaptics-0.9.16.tar.gz 357950 RMD160 173e4cf7eb54689b325ee7b7d87fc041b5c8b94e SHA1 277ec37e39a90374a9659e3fd64843623ac77dc8 SHA256 1afcc57ff6f74d7255f9af1e65a0fddaf0315ab61a00271b7acb04d7fd10476c
 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 2851 RMD160 6d080c3805cd8252d39d923c8d170bf1b910025a SHA1 d0d5e2e9659b8aaca0613a7630a5f8be0832ed1f SHA256 9c01d3d8355e1e676c1b0bfbf942f784b65a0e1e06143bafe869a9a556e6b2f1
-MISC metadata.xml 286 RMD160 23a456560c8a8defb4a474573a6c75185ed83561 SHA1 ed861a6e7ce45fc4994b23de90430bb103edc624 SHA256 a310f065b7b6c052f2a71c5e42c832c8c9dacd5be44b71c6e680567ea34171cb
+EBUILD gsynaptics-0.9.16.ebuild 2578 RMD160 3e67f727f1232d2875b6624d0ccc4133e6a6607a SHA1 90c60d9cf008c4dba30b14f0242168af028cb66f SHA256 7c88265c18edc814ab773c56b8d21cf4b316eca6a894f034647c6230b68d552c
+MISC ChangeLog 3158 RMD160 4082ed7e3aac485c0587eef53b9d8f010701f404 SHA1 ad95fabb58875ad423a85b6f6498aae0f0711f08 SHA256 086e3b6b1a26edc1150b0f162a9b3c8d41423564c6e11aff59e8531ae58859bc
+MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d
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
deleted file mode 100644
index 2f4309425b9f..000000000000
--- a/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-no-libgnome.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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-r1.ebuild b/gnome-extra/gsynaptics/gsynaptics-0.9.13-r1.ebuild
deleted file mode 100644
index 06408a74f78c..000000000000
--- a/gnome-extra/gsynaptics/gsynaptics-0.9.13-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-r1.ebuild,v 1.2 2008/02/22 05:06:37 compnerd Exp $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
-HOMEPAGE="http://gsynaptics.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/28322/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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"
-
-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
-
-	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
-	echo
-	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
-}
diff --git a/gnome-extra/gsynaptics/gsynaptics-0.9.14.ebuild b/gnome-extra/gsynaptics/gsynaptics-0.9.14.ebuild
deleted file mode 100644
index 087414d69b4a..000000000000
--- a/gnome-extra/gsynaptics/gsynaptics-0.9.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.14.ebuild,v 1.1 2008/07/14 13:14:18 eva Exp $
-
-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=""
-
-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"
-
-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"
-}
-
-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
-	echo
-	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
-}
diff --git a/gnome-extra/gsynaptics/gsynaptics-0.9.16.ebuild b/gnome-extra/gsynaptics/gsynaptics-0.9.16.ebuild
new file mode 100644
index 000000000000..30711558dd12
--- /dev/null
+++ b/gnome-extra/gsynaptics/gsynaptics-0.9.16.ebuild
@@ -0,0 +1,69 @@
+# 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.16.ebuild,v 1.1 2009/09/21 06:59:09 pva 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}/38463/${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
+	>=dev-util/intltool-0.35.5
+	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"
+
+	# Ubuntu/Debian patch stack. See bug #248939 and
+	# http://patches.ubuntu.com/by-release/extracted/debian/g/gsynaptics/
+	epatch "${FILESDIR}/${PN}-0.9.14-do-not-set-zero.patch"
+	epatch "${FILESDIR}/${PN}-0.9.14-dot-fixes.patch"
+	epatch "${FILESDIR}/${PN}-0.9.14-fix-docbook.patch"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	echo
+	elog "SHMConfig option of the synaptics X11 driver must be enabled to allow"
+	elog "${PN} to configure touchpad: if hal is used to configure input devices"
+	elog "copy /usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi into"
+	elog "/etc/hal/fdi/policy/, uncomment relevant setting there and restart"
+	elog "hal. In case xorg.conf is used ensure that the following line is in"
+	elog "the InputDevice section:"
+	elog
+	elog 'Option "SHMConfig" "on"'
+	elog
+	elog "To restore touchpad settings the next time you log into GNOME it's"
+	elog "necessary to add gsynaptics-init to your session:"
+	elog "Desktop -> Preferences -> Sessions -> Start Programs -> Add"
+	echo
+	ewarn "SHMConfig is real SECURITY nightmare. E.g. it allows anyone with access"
+	ewarn "to the system to click on arbitrary points of the screen."
+	ewarn "This is the reason for the deprecation of ${PN} (see homepage)."
+# gnome-extra/gpointing-device-settings is not working here, so it's not in the
+# tree. I've put it in overlay for now and contacted upstream...
+#	ewarn "Use gnome-extra/gpointing-device-settings instread as it uses XInput"
+#	ewarn "properties and doesn't need SHMConfig option to be set."
+#	ewarn "In gnome 2.28 gnome-mouse-properties will allow to configure touchpad"
+#	ewarn "settings (also trough XInput), so no additional software needed there."
+}
diff --git a/gnome-extra/gsynaptics/metadata.xml b/gnome-extra/gsynaptics/metadata.xml
index b6337ba2c9eb..fe8a273e1e15 100644
--- a/gnome-extra/gsynaptics/metadata.xml
+++ b/gnome-extra/gsynaptics/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		</maintainer>
-	<longdescription lang="en">
-	</longdescription>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
 </pkgmetadata>