amd64 stable wrt #199740, apply patch from #189307, thanks to David Barnett.

Package-Manager: portage-2.1.3.19

4 files changed, 64 insertions, 17 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 44035821b3f5..eea50cc0498e 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,12 +1,10 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.115 2007/11/20 16:10:30 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.116 2007/11/20 16:38:05 drac Exp $
 
-  20 Nov 2007; Samuli Suominen <drac@gentoo.org> dasher-4.6.1.ebuild:
-  Reverting back to ~amd64 wrt #189307
-
-  20 Nov 2007; Samuli Suominen <drac@gentoo.org> dasher-4.6.1.ebuild:
-  amd64 stable wrt #199740
+  20 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  +files/dasher-4.6.1-gnome.patch, dasher-4.6.1.ebuild:
+  amd64 stable wrt #199740, apply patch from #189307, thanks to David Barnett.
 
   06 Nov 2007; Raúl Porcel <armin76@gentoo.org> dasher-4.4.2.ebuild:
   sparc stable wrt #193339
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 68169ab1b9e8..fde5fc2251b6 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -26,6 +26,10 @@ AUX dasher-4.5.2-gcc4-speech-fix.patch 2029 RMD160 ccd0efc75fc29c5b327f0d7ba9e9f
 MD5 2493bce498d7b62e26df517335806efb files/dasher-4.5.2-gcc4-speech-fix.patch 2029
 RMD160 ccd0efc75fc29c5b327f0d7ba9e9ffe2e529a7c2 files/dasher-4.5.2-gcc4-speech-fix.patch 2029
 SHA256 d87ad6cb85a71e8dd0b8ec7afd8b0d2af265c37f9147c9343b74024733edfb12 files/dasher-4.5.2-gcc4-speech-fix.patch 2029
+AUX dasher-4.6.1-gnome.patch 1685 RMD160 8767be5fa679862e0a793062eff491d32704afe9 SHA1 cb0768f4d98ed6d2c2432042673d04506008a107 SHA256 6462d01b3ce27e89a2d44ba9e1461d21da6490485bddfce87a82e9a549165d84
+MD5 bb864e66505f8abd00bd9bf6673f178c files/dasher-4.6.1-gnome.patch 1685
+RMD160 8767be5fa679862e0a793062eff491d32704afe9 files/dasher-4.6.1-gnome.patch 1685
+SHA256 6462d01b3ce27e89a2d44ba9e1461d21da6490485bddfce87a82e9a549165d84 files/dasher-4.6.1-gnome.patch 1685
 DIST dasher-4.2.2.tar.bz2 5625199 RMD160 33fccd70dbe9d977a1c6efd7037e939d28acbdcf SHA1 b2258080cc6480c2173148e09013e7efd0307914 SHA256 a51a3bf9a3a1b28a5e9dacc82bad14903a93389a0df92b289e8c2f4180e8bdcf
 DIST dasher-4.4.2.tar.bz2 6880246 RMD160 17d33eb2db6f2e7dc9e7e227509f8254ae732baf SHA1 9b82e11ef0104e7acf9add78e48d59a67516c531 SHA256 0ee0d5e7f867bd21f0ab13dcd72dd2dd7eb6bb0d7918c18971ece81d3c2a76ed
 DIST dasher-4.6.1.tar.bz2 6473483 RMD160 77a765ddc623895a2a121732848f00c5a82652d0 SHA1 6efeb3fdd160e203b60e5d2b9faca0d243a68ed3 SHA256 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8
@@ -37,14 +41,14 @@ EBUILD dasher-4.4.2.ebuild 1947 RMD160 a8b601fd680774639287c64c42e90e78e0774f73
 MD5 8bc1bafdd4d23c05935d348e3d4b0278 dasher-4.4.2.ebuild 1947
 RMD160 a8b601fd680774639287c64c42e90e78e0774f73 dasher-4.4.2.ebuild 1947
 SHA256 055b2260ad19618cb92edd07f2fbeef2e7510e1836d5aaf20942a667d7a7d9ee dasher-4.4.2.ebuild 1947
-EBUILD dasher-4.6.1.ebuild 2154 RMD160 4be471fa9b734561dfa3c9b30eff2de89ed0df51 SHA1 d433e2d8d0890441fb38a1321948899a56c19270 SHA256 d5c5198e31eb8cb39800aabe96a410dde17dd22a952a5cd2400af5a6c531f6bd
-MD5 8ca40c4b5e967c6b710a377c26bb44ad dasher-4.6.1.ebuild 2154
-RMD160 4be471fa9b734561dfa3c9b30eff2de89ed0df51 dasher-4.6.1.ebuild 2154
-SHA256 d5c5198e31eb8cb39800aabe96a410dde17dd22a952a5cd2400af5a6c531f6bd dasher-4.6.1.ebuild 2154
-MISC ChangeLog 14670 RMD160 74735b43ae722572b4d379bce48a66eb40275ca7 SHA1 afb094c8470c886a1fbed71d6965aa1a77be6c9d SHA256 b36b1f3f6584104f97242873b4bc5992876605b1894ec95944c1f502f5493cec
-MD5 085944e2dafd861743e190bac825cf66 ChangeLog 14670
-RMD160 74735b43ae722572b4d379bce48a66eb40275ca7 ChangeLog 14670
-SHA256 b36b1f3f6584104f97242873b4bc5992876605b1894ec95944c1f502f5493cec ChangeLog 14670
+EBUILD dasher-4.6.1.ebuild 2153 RMD160 1b27f56996d6cc334ea400c038b32a6b6e448de0 SHA1 d9cedbd26e2fc05ead1be0dfe5e92b2686205ea9 SHA256 9d6cdbdbd9075407de6488081b865a52570ca713dcfc72d37ef34dac43343c42
+MD5 4e0a85da2bc6141f4aea2bb8c14858e7 dasher-4.6.1.ebuild 2153
+RMD160 1b27f56996d6cc334ea400c038b32a6b6e448de0 dasher-4.6.1.ebuild 2153
+SHA256 9d6cdbdbd9075407de6488081b865a52570ca713dcfc72d37ef34dac43343c42 dasher-4.6.1.ebuild 2153
+MISC ChangeLog 14647 RMD160 5df19981d022e21ea4d701bb097159db75fcc9bc SHA1 64dc9a1428d810095bd662f1986d5fa0f7873593 SHA256 31d704150531b2490c5ad27383282de2dd0083184baa2c8d3a44f1d9a8daddd9
+MD5 85cef621d1cdb97adcfd0c883bf13760 ChangeLog 14647
+RMD160 5df19981d022e21ea4d701bb097159db75fcc9bc ChangeLog 14647
+SHA256 31d704150531b2490c5ad27383282de2dd0083184baa2c8d3a44f1d9a8daddd9 ChangeLog 14647
 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
 MD5 76d666e6399f7768a17fe572e9a3096e metadata.xml 718
 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 metadata.xml 718
diff --git a/app-accessibility/dasher/dasher-4.6.1.ebuild b/app-accessibility/dasher/dasher-4.6.1.ebuild
index ee0a8f4e6703..04f3e6f43b48 100644
--- a/app-accessibility/dasher/dasher-4.6.1.ebuild
+++ b/app-accessibility/dasher/dasher-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2007/11/20 15:44:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.1.ebuild,v 1.4 2007/11/20 16:38:05 drac Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.8"
@@ -12,7 +12,7 @@ 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"
 
@@ -72,7 +72,7 @@ src_unpack() {
 	# 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.4.2-gnome.patch"
+	epatch "${FILESDIR}/${PN}-4.6.1-gnome.patch"
 
 	# Fix compilation with gcc-4
 	epatch "${FILESDIR}/${PN}-4.5.2-gcc4-speech-fix.patch"
diff --git a/app-accessibility/dasher/files/dasher-4.6.1-gnome.patch b/app-accessibility/dasher/files/dasher-4.6.1-gnome.patch
new file mode 100644
index 000000000000..b31f5c1e9c3b
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.6.1-gnome.patch
@@ -0,0 +1,45 @@
+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"