New version for GNOME 2.26. Bug fixes and translation updates.

Clean up old revisions.
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

13 files changed, 36 insertions, 358 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index b252c2557641..66f2f0dfe959 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.140 2009/04/27 13:00:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.141 2009/05/02 12:26:08 eva Exp $
+
+*dasher-4.10.1 (02 May 2009)
+
+  02 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/dasher-4.4.0-gnome_help.patch, -files/dasher-4.5.2-as-needed.patch,
+  -files/dasher-4.5.2-gcc4-speech-fix.patch,
+  -files/dasher-4.6.1-gnome.patch, -files/dasher-4.6.1-lldiv.patch,
+  -files/dasher-4.7.0-as-needed.patch, -files/dasher-4.7.3-cairo.patch,
+  -files/dasher-4.7.3-gcc-4.3.patch, -files/dasher-4.7.3-no-gnome.patch,
+  -dasher-4.6.1.ebuild, -dasher-4.7.3.ebuild, +dasher-4.10.1.ebuild:
+  New version for GNOME 2.26. Bug fixes and translation updates.
+  Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> dasher-4.9.0:
   Stable for HPPA (bug #260063).
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index c0a162812209..c6bd8c7ba32b 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -1,17 +1,16 @@
-AUX dasher-4.4.0-gnome_help.patch 1076 RMD160 91e637ea1db3184431d7d33036e63298f3a8651d SHA1 914a543280b53a86e60a7ab3bfc0edcb90e49b21 SHA256 d4afe24f6cbb98d1c308713406ae0b8ef097749c749e6fa0f6d2921def736fb0
-AUX dasher-4.5.2-as-needed.patch 801 RMD160 b89483d0e7b84de0be454db9709d6dab7d141a7b SHA1 1f09ae61f92a5192c847022554b08222646673f9 SHA256 dcee5d5b918db49e38f32cedc0d0c9c6e34da79db9bcd2363a8612bd2eb4e8c6
-AUX dasher-4.5.2-gcc4-speech-fix.patch 2029 RMD160 ccd0efc75fc29c5b327f0d7ba9e9ffe2e529a7c2 SHA1 c006a97f8953da5b1d69bac1806edc190f126d37 SHA256 d87ad6cb85a71e8dd0b8ec7afd8b0d2af265c37f9147c9343b74024733edfb12
-AUX dasher-4.6.1-gnome.patch 1685 RMD160 8767be5fa679862e0a793062eff491d32704afe9 SHA1 cb0768f4d98ed6d2c2432042673d04506008a107 SHA256 6462d01b3ce27e89a2d44ba9e1461d21da6490485bddfce87a82e9a549165d84
-AUX dasher-4.6.1-lldiv.patch 367 RMD160 2ea3a9f822e27c8fbc68b7ffcd63cd0153501876 SHA1 cfc2193d0b98f9ede818241d5b1d53205a7dec7f SHA256 9d4d814d6e13190f3677f3cf08dbf8a729bbab80d48f0451c6de91572dde879c
-AUX dasher-4.7.0-as-needed.patch 690 RMD160 9a33ecd5ccce8edef2478288775dd9e9a908d57a SHA1 90f12dde417adc072c36b48686136b3081fec97e SHA256 15531b4cf1ed129ff094700e5818c2cb4c38ab9de9163518d1ce1282a0ae38b7
-AUX dasher-4.7.3-cairo.patch 199 RMD160 345a76c8edbf73d1dc8276f1b939c947fbc40dd8 SHA1 bc6c7968c08d5278e387dc7f97aef1ec4bbd70e0 SHA256 5534bffb20d25b91004663150fe1a47af73981d17aa53eeaf1e91ca583665a62
-AUX dasher-4.7.3-gcc-4.3.patch 351 RMD160 328821a4e4f07d08939c2b96072b34b69819fa2b SHA1 6fdfdb867635c8bdd326720cce84d6b28d4b5e01 SHA256 4d0d11253c2a1dc43aa0ca69b1dfe96ddcff8efca0859b54dcc0c88d0b4dace8
-AUX dasher-4.7.3-no-gnome.patch 835 RMD160 eb3212cd1a960ffe55f60d273a67ed8e727107e0 SHA1 54d49828f6f14ba680aadb76184cc7101e8c611b SHA256 b3919625577fc41294d0683a10d11d7d19b85bdf2d9358e23c15b82e544cfb42
-DIST dasher-4.6.1.tar.bz2 6473483 RMD160 77a765ddc623895a2a121732848f00c5a82652d0 SHA1 6efeb3fdd160e203b60e5d2b9faca0d243a68ed3 SHA256 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8
-DIST dasher-4.7.3.tar.bz2 6773132 RMD160 cef9e14e53cd29244aa5e84de32cffe75cde2c76 SHA1 962cec3050e6a0b0f3670971734bd0595076b959 SHA256 44a2fdd1dde5c4fc499090f61aa3ee8939c9df40d5a009ecac8441f633b85e9f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST dasher-4.10.1.tar.bz2 6679084 RMD160 0ed314ba5717f129168e315e02389259dc28532c SHA1 bc2bd8c8c8f078f5290527f1525563d098f53b5d SHA256 0164819cb53889e83cf7869bf18af14a419308838884b8ec8cc45b869de7a269
 DIST dasher-4.9.0.tar.bz2 6734895 RMD160 7540daeeb48f97dccd50c45593e20f228f57a3f7 SHA1 c897804aa4701cee00b50c6dd83bf8003a3ae4a5 SHA256 abb15328c95c786390fc9ea5f7470a247880f05b2aacdd3cd083067a0e374a3e
-EBUILD dasher-4.6.1.ebuild 2219 RMD160 edf37e017b0ab0a13ff11c91f7fe09e511110896 SHA1 42b2a000b42cc190c07cb5fee025d88871324f82 SHA256 cbcee2b328c3adce8eeedc0ae0cb6972480b818dd1379c787295b737bb89d13e
-EBUILD dasher-4.7.3.ebuild 2272 RMD160 9ea7cb0465d4e8cad0ef5391cbfc1f0399d0031a SHA1 9cbc9dd6aacf5ca5c85dedfffc6d9b4e81b4ad9c SHA256 2d3465b166e0c6efb27b259986c249e5bbe09dd52e370e72d23b844f33b3efc6
+EBUILD dasher-4.10.1.ebuild 1630 RMD160 6533fca3485457936a2b26e6a8198bdd496d34ef SHA1 e7760b5490e45e418c154f75e2071a548ba419d6 SHA256 e5f81d9225f93fa7b7b0d15d2e01486708fafcb97b39fdd83da16b4a2e2e6d08
 EBUILD dasher-4.9.0.ebuild 1621 RMD160 c0b7e55bdfa006265260ea0c28b7e66e462ecd9f SHA1 c4ab2c0282b3bda7244925649a2a39fb2879c70f SHA256 3e430bb7da1f88559dfae4a4eca7389c7df0145d948c9db69dc462a5c00a6c8e
-MISC ChangeLog 17691 RMD160 e46dcf744690269d29472f2728c13b09ac8f422f SHA1 82aa14173766e65cd7cb48bfd37d6bdd136ada27 SHA256 f25d9f7d22cd63bdebc85a2d41037eaca01c003d27f33bfec24391fe45c076d4
+MISC ChangeLog 18271 RMD160 b04ddc7af6eb956f79ac1347488c332c8bd0e8e1 SHA1 1a4175e398a2d227a5e040e3dba8e1006d9f6e65 SHA256 c7806b8affe43b211a73efb0f7a66495f29f85346ff2597fffd8f53652929cbe
 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn8O+wACgkQ1fmVwcYIWAbP1ACg1hEBceex+5owRykTmlA9lChW
+pqwAoMQXV+RYkYVKcZDe45kFXkXfnWCf
+=vf+Y
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/dasher/dasher-4.7.3.ebuild b/app-accessibility/dasher/dasher-4.10.1.ebuild
index 38b5476b3e80..2ea331bfc75f 100644
--- a/app-accessibility/dasher/dasher-4.7.3.ebuild
+++ b/app-accessibility/dasher/dasher-4.10.1.ebuild
@@ -1,33 +1,29 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.7.3.ebuild,v 1.9 2008/11/13 19:38:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.10.1.ebuild,v 1.1 2009/05/02 12:26:08 eva Exp $
 
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="1.8"
-
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
 HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="accessibility cairo gnome"
 
 # The package claims to support 'qte', but it hasn't been tested.
 # Any patches from someone who can test it are welcome.
 # <leonardop@gentoo.org>
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND=">=dev-libs/glib-2.16
 	dev-libs/expat
 	>=x11-libs/gtk+-2.6
 	>=gnome-base/gconf-2
 	>=gnome-base/libglade-2
 	gnome? (
 		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-base/gnome-vfs-2 )
+		>=gnome-base/libgnomeui-2 )
 	accessibility? (
 		app-accessibility/gnome-speech
 		>=gnome-base/libbonobo-2
@@ -37,8 +33,7 @@ RDEPEND=">=dev-libs/glib-2.6
 		dev-libs/atk )
 	cairo? ( >=x11-libs/gtk+-2.8 )
 	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt"
+	x11-libs/libXtst"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
@@ -56,31 +51,11 @@ pkg_setup() {
 	# --enable-chinese
 	# --enable-tilt (tilt sensor support)
 
-	G2CONF="--disable-scrollkeeper
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--with-gvfs
 		$(use_enable accessibility a11y)
 		$(use_enable accessibility speech)
 		$(use_with cairo)
 		$(use_with gnome)"
 }
-
-src_unpack() {
-	gnome2_src_unpack
-
-	sed -i -e 's:gtk-update-icon-cache:true:' ./Data/Makefile.am
-
-	# Fix build with --as-needed (upstream bug #525028)
-	epatch "${FILESDIR}/${PN}-4.7.0-as-needed.patch"
-
-	# https://bugs.gentoo.org/211589
-	# https://bugzilla.gnome.org/522121
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-
-	# Fix compilation with -gnome, upstream bug #398103
-	epatch "${FILESDIR}/${P}-no-gnome.patch"
-
-	# Fix compilation with -cairo, from upstream bug #490876
-	epatch "${FILESDIR}/${P}-cairo.patch"
-
-	intltoolize --force || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/app-accessibility/dasher/dasher-4.6.1.ebuild b/app-accessibility/dasher/dasher-4.6.1.ebuild
deleted file mode 100644
index 73f51a219765..000000000000
--- a/app-accessibility/dasher/dasher-4.6.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.1.ebuild,v 1.9 2007/11/29 05:01:46 jer Exp $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="1.8"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
-HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-IUSE="accessibility cairo gnome"
-
-# The package claims to support 'qte', but it hasn't been tested.
-# Any patches from someone who can test it are welcome.
-# <leonardop@gentoo.org>
-RDEPEND=">=dev-libs/glib-2.6
-	dev-libs/expat
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-base/gnome-vfs-2 )
-	accessibility? (
-		app-accessibility/gnome-speech
-		>=gnome-base/libbonobo-2
-		>=gnome-base/orbit-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-extra/at-spi-1
-		dev-libs/atk )
-	cairo? ( >=x11-libs/gtk+-2.8 )
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	gnome? (
-		>=app-text/gnome-doc-utils-0.3.2
-		app-text/scrollkeeper )
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-pkg_setup() {
-	# we might want to support japanese and chinese input at some point
-	# --enable-japanese
-	# --enable-chinese
-
-	G2CONF="--disable-scrollkeeper \
-		$(use_enable accessibility a11y)   \
-		$(use_enable accessibility speech) \
-		$(use_with cairo) \
-		$(use_with gnome)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	sed -i -e 's:gtk-update-icon-cache:true:' ./Data/Makefile.am
-
-	epatch "${FILESDIR}/${PN}-4.5.2-as-needed.patch"
-
-	# Patches to fix compilation when USE=-gnome is used
-	# (bug #165154 and bug #189307)
-	epatch "${FILESDIR}/${PN}-4.4.0-gnome_help.patch"
-	epatch "${FILESDIR}/${PN}-4.6.1-gnome.patch"
-
-	# Fix compilation with gcc-4
-	epatch "${FILESDIR}/${PN}-4.5.2-gcc4-speech-fix.patch"
-
-	# Fix compilation with glibc-2.5
-	epatch "${FILESDIR}/${P}-lldiv.patch"
-
-	cp aclocal.m4 old-macros.m4
-	AT_M4DIR="." eautoreconf
-}
diff --git a/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch b/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch
deleted file mode 100644
index c1be612ede96..000000000000
--- a/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN dasher-4.4.0.orig/Data/Help/Makefile.am dasher-4.4.0/Data/Help/Makefile.am
---- dasher-4.4.0.orig/Data/Help/Makefile.am	2007-03-12 10:13:18.000000000 -0400
-+++ dasher-4.4.0/Data/Help/Makefile.am	2007-03-15 15:43:50.000000000 -0400
-@@ -1 +1,5 @@
--SUBDIRS = Gnome
-+SUBDIRS =
-+
-+if GNOME_HELP
-+SUBDIRS += Gnome
-+endif
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN dasher-4.4.0.orig/configure.in dasher-4.4.0/configure.in
---- dasher-4.4.0.orig/configure.in	2007-03-12 13:27:10.000000000 -0400
-+++ dasher-4.4.0/configure.in	2007-03-15 15:44:36.000000000 -0400
-@@ -348,6 +348,7 @@ AM_CONDITIONAL(DOGTK2, test x$BUILDGTK2 
- AM_CONDITIONAL(DOQTE, test x$WITHQTE = xtrue)
- AM_CONDITIONAL(GNOME_SPEECH, test x$WITHSPEECH = xtrue)
- AM_CONDITIONAL(GNOME_A11Y, test x$WITHA11Y = xtrue)
-+AM_CONDITIONAL(GNOME_HELP, test x$WITHGNOME = xtrue)
- AM_CONDITIONAL(WITH_GPE, test x$WITHGPE = xtrue)
- AM_CONDITIONAL(WITH_MAEMO, test x$WITHMAEMO = xtrue)
- AM_CONDITIONAL(WITH_MAEMOFULLSCREEN, test x$WITHMAEMOFULLSCREEN = xtrue)
diff --git a/app-accessibility/dasher/files/dasher-4.5.2-as-needed.patch b/app-accessibility/dasher/files/dasher-4.5.2-as-needed.patch
deleted file mode 100644
index 3c3c76bdeb76..000000000000
--- a/app-accessibility/dasher/files/dasher-4.5.2-as-needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN dasher-4.5.2.orig/Src/Makefile.am dasher-4.5.2/Src/Makefile.am
---- dasher-4.5.2.orig/Src/Makefile.am	2007-07-09 13:06:53.000000000 -0400
-+++ dasher-4.5.2/Src/Makefile.am	2007-07-11 15:40:18.000000000 -0400
-@@ -24,10 +24,6 @@ AM_CXXFLAGS = \
- 	-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\"
- 
- dasher_LDADD = \
--	$(GTK2BUILD_LIBS) \
--	-lexpat \
--	$(POPT_LIBS) \
--	$(GPELIB) \
- 	Common/libdashermisc.a \
- 	Gtk2/libdashergtk.a \
- 	Gtk2/libdashercontrol.a \
-@@ -35,7 +31,11 @@ dasher_LDADD = \
- 	DasherCore/libdasherprefs.a \
- 	DasherCore/LanguageModelling/libdasherlm.a \
- 	DasherCore/Alphabet/libdasheralphabet.a \
--	Common/libdashermisc.a
-+	Common/libdashermisc.a \
-+	$(GTK2BUILD_LIBS) \
-+	-lexpat \
-+	$(POPT_LIBS) \
-+	$(GPELIB)
- #endif
- 
- #if DOQTE
diff --git a/app-accessibility/dasher/files/dasher-4.5.2-gcc4-speech-fix.patch b/app-accessibility/dasher/files/dasher-4.5.2-gcc4-speech-fix.patch
deleted file mode 100644
index 51bfdcfdd26f..000000000000
--- a/app-accessibility/dasher/files/dasher-4.5.2-gcc4-speech-fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- Src/Gtk2/dasher_action_speech.cpp	2007/09/25 22:31:10	1.1
-+++ Src/Gtk2/dasher_action_speech.cpp	2007/09/25 22:33:16
-@@ -28,8 +28,8 @@ typedef struct _DasherActionSpeechPrivat
- 
- G_DEFINE_TYPE(DasherActionSpeech, dasher_action_speech, TYPE_DASHER_ACTION);
- 
--static gboolean dasher_action_speech_execute(DasherAction *pSelf, DasherEditorInternal *pEditor, int iIdx);
--static gboolean dasher_action_speech_preview(DasherAction *pSelf, DasherEditorInternal *pEditor);
-+static gboolean dasher_action_speech_execute(DasherAction *pSelf, DasherEditor *pEditor, int iIdx);
-+static gboolean dasher_action_speech_preview(DasherAction *pSelf, DasherEditor *pEditor);
- static const gchar *dasher_action_speech_get_name(DasherAction *pSelf);
- static int dasher_action_speech_get_sub_count(DasherAction *pSelf);
- static const gchar *dasher_action_speech_get_sub_name(DasherAction *pSelf, int iIdx);
-@@ -66,17 +66,17 @@ dasher_action_speech_new() {
- }
- 
- static gboolean 
--dasher_action_speech_execute(DasherAction *pSelf, DasherEditorInternal *pEditor, int iIdx) {
-+dasher_action_speech_execute(DasherAction *pSelf, DasherEditor *pEditor, int iIdx) {
-   DasherActionSpeechPrivate *pDasherActionSpeechPrivate = DASHER_ACTION_SPEECH_GET_PRIVATE(pSelf);
- 
-   const char *szData;
- 
-   switch(iIdx) {
-   case 0:
--    szData = dasher_editor_internal_get_all_text(pEditor);
-+    szData = dasher_editor_get_all_text(pEditor);
-     break;
-   case 1:
--    szData = dasher_editor_internal_get_new_text(pEditor);
-+    szData = dasher_editor_get_new_text(pEditor);
-     break;
-   case 2:
-     szData = pDasherActionSpeechPrivate->szLast;
-@@ -107,8 +107,8 @@ dasher_action_speech_execute(DasherActio
- }
- 
- static gboolean 
--dasher_action_speech_preview(DasherAction *pSelf, DasherEditorInternal *pEditor) {
--  const gchar *szData = dasher_editor_internal_get_all_text(pEditor);
-+dasher_action_speech_preview(DasherAction *pSelf, DasherEditor *pEditor) {
-+  const gchar *szData = dasher_editor_get_all_text(pEditor);
- 
-   if(!szData)
-     return false;
diff --git a/app-accessibility/dasher/files/dasher-4.6.1-gnome.patch b/app-accessibility/dasher/files/dasher-4.6.1-gnome.patch
deleted file mode 100644
index b31f5c1e9c3b..000000000000
--- a/app-accessibility/dasher/files/dasher-4.6.1-gnome.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru dasher-4.6.1/Src/Gtk2/dasher_editor.cpp dasher-4.6.1-patched/Src/Gtk2/dasher_editor.cpp
---- dasher-4.6.1/Src/Gtk2/dasher_editor.cpp	2007-11-03 19:47:26.000000000 -0400
-+++ dasher-4.6.1-patched/Src/Gtk2/dasher_editor.cpp	2007-11-03 19:46:08.000000000 -0400
-@@ -23,9 +23,9 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- /* TODO: r4epair gnome libs flags (or get rid of entirely) */
--//#ifdef GNOME_LIBS 
-+#ifdef GNOME_LIBS 
- #include <libgnomevfs/gnome-vfs.h> 
--//#endif
-+#endif
- 
- #include "dasher_action_keyboard.h"
- #ifdef WITH_MAEMO
-Only in dasher-4.6.1/Src/Gtk2: dasher_editor.cpp.orig
-Only in dasher-4.6.1-patched/Src/Gtk2: dasher_editor.cpp.rej
-diff -ru dasher-4.6.1/Src/Gtk2/dasher_editor_internal.cpp dasher-4.6.1-patched/Src/Gtk2/dasher_editor_internal.cpp
---- dasher-4.6.1/Src/Gtk2/dasher_editor_internal.cpp	2007-10-15 09:55:06.000000000 -0400
-+++ dasher-4.6.1-patched/Src/Gtk2/dasher_editor_internal.cpp	2007-11-03 19:47:58.000000000 -0400
-@@ -3,9 +3,9 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- /* TODO: r4epair gnome libs flags (or get rid of entirely) */
--//#ifdef GNOME_LIBS 
-+#ifdef GNOME_LIBS 
- #include <libgnomevfs/gnome-vfs.h> 
--//#endif
-+#endif
- 
- 
- #ifdef WITH_MAEMO
-diff -ru dasher-4.6.1/Src/Gtk2/dasher_main.cpp dasher-4.6.1-patched/Src/Gtk2/dasher_main.cpp
---- dasher-4.6.1/Src/Gtk2/dasher_main.cpp	2007-11-03 19:47:26.000000000 -0400
-+++ dasher-4.6.1-patched/Src/Gtk2/dasher_main.cpp	2007-11-03 19:46:08.000000000 -0400
-@@ -8,7 +8,9 @@
- #ifdef WITH_MAEMOFULLSCREEN
- #include <hildon-widgets/hildon-program.h>
- #endif
-+#ifdef GNOME_LIBS
- #include <libgnome/libgnome.h>
-+#endif
- 
- #include "GtkDasherControl.h"
- #include "KeyboardHelper.h"
diff --git a/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch b/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch
deleted file mode 100644
index 04f70a576d90..000000000000
--- a/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/DasherCore/DasherViewSquare.cpp. 2007-10-15 15:55:00.000000000 +0200
-+++ Src/DasherCore/DasherViewSquare.cpp  2007-11-28 17:18:08.000000000 +0100
-@@ -802,7 +802,7 @@
-   else
-     return quot;
- #else
--  lldiv_t res = __gnu_cxx::lldiv(iNumerator, iDenominator);
-+  lldiv_t res = lldiv(iNumerator, iDenominator);
-   
-   if(res.rem < 0)
-     return res.quot - 1;
diff --git a/app-accessibility/dasher/files/dasher-4.7.0-as-needed.patch b/app-accessibility/dasher/files/dasher-4.7.0-as-needed.patch
deleted file mode 100644
index 0487f67dc60c..000000000000
--- a/app-accessibility/dasher/files/dasher-4.7.0-as-needed.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nura dasher-4.7.0.old/Src/Makefile.am dasher-4.7.0/Src/Makefile.am
---- dasher-4.7.0.old/Src/Makefile.am	2008-03-29 22:11:18.000000000 +0100
-+++ dasher-4.7.0/Src/Makefile.am	2008-03-29 22:12:27.000000000 +0100
-@@ -24,17 +24,17 @@
- 	-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\"
- 
- dasher_LDADD = \
--	$(GTK2BUILD_LIBS) \
--	-lexpat \
--	$(POPT_LIBS) \
--	$(GPELIB) \
- 	Common/libdashermisc.a \
- 	Gtk2/libdashergtk.a \
- 	Gtk2/libdashercontrol.a \
- 	DasherCore/libdashercore.a \
- 	DasherCore/libdasherprefs.a \
- 	DasherCore/LanguageModelling/libdasherlm.a \
--	Common/libdashermisc.a
-+	Common/libdashermisc.a \
-+	$(GTK2BUILD_LIBS) \
-+	-lexpat \
-+	$(POPT_LIBS) \
-+	$(GPELIB)
- #endif
- 
- #if DOQTE
diff --git a/app-accessibility/dasher/files/dasher-4.7.3-cairo.patch b/app-accessibility/dasher/files/dasher-4.7.3-cairo.patch
deleted file mode 100644
index 04df957cb524..000000000000
--- a/app-accessibility/dasher/files/dasher-4.7.3-cairo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Src/Gtk2/Canvas.cpp 
-+++ b/Src/Gtk2/Canvas.cpp 
-@@ -88,7 +88,9 @@
-   g_object_unref(m_pOnscreenBuffer);
- #endif
- 
-+#if WITH_CAIRO
-   delete[] cairo_colours;
-+#endif
-   delete m_pPangoInk;
- }
- 
diff --git a/app-accessibility/dasher/files/dasher-4.7.3-gcc-4.3.patch b/app-accessibility/dasher/files/dasher-4.7.3-gcc-4.3.patch
deleted file mode 100644
index 32a49491b936..000000000000
--- a/app-accessibility/dasher/files/dasher-4.7.3-gcc-4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dasher-4.7.3/Src/Gtk2/dasher_action_speech.cpp.old	2008-06-06 20:54:34.098275404 +0200
-+++ dasher-4.7.3/Src/Gtk2/dasher_action_speech.cpp	2008-06-06 20:55:38.331005219 +0200
-@@ -8,6 +8,7 @@
- #include <glib/gi18n.h>
- #include <gnome-speech/gnome-speech.h>
- #include <libbonobo.h>
-+#include <cstring>
- //#include <libintl.h>
- //#include <string.h>
-
diff --git a/app-accessibility/dasher/files/dasher-4.7.3-no-gnome.patch b/app-accessibility/dasher/files/dasher-4.7.3-no-gnome.patch
deleted file mode 100644
index 341667e9792d..000000000000
--- a/app-accessibility/dasher/files/dasher-4.7.3-no-gnome.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 3450)
-+++ configure.in	(working copy)
-@@ -412,13 +412,16 @@
- AC_SUBST(GTK2BUILD_CFLAGS)
- AC_SUBST(GTK2BUILD_LIBS)
- 
--if [[ x"$WITHGNOME" = xtrue ]]; then
--  GNOME_DOC_INIT
--else
--  # Allows compilation if --without-gnome is passed
--  AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
-+AC_MSG_CHECKING([for gnome-doc-utils])
-+GNOME_DOC_INIT([0.9.0],[have_gdu=yes],[have_gdu=no])
-+AC_MSG_RESULT($have_gdu)
-+
-+if [[ x"$WITHGNOME" = xtrue ]] && [[ "$have_gdu" = xno ]]; then
-+    AC_MSG_ERROR([gnome-doc-utils not found!])
- fi
- 
-+AM_CONDITIONAL(ENABLE_SK, test x"$WITHGNOME" = xfalse -a "x$enable_scrollkeeper" = "xyes")
-+
- AC_CONFIG_FILES([Data/dasher.desktop.in
- 		 Data/Makefile
- 		 Data/training/Makefile