Fixes for bugs #193433 #181514 and #189307

Package-Manager: portage-2.1.3.11

5 files changed, 65 insertions, 27 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 99864e0872cb..3f5af7b7f70d 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,16 @@
 # 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.108 2007/09/27 11:53:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.109 2007/10/08 02:52:20 leonardop Exp $
+
+  08 Oct 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/dasher-4.4.2-gnome.patch, dasher-4.4.2.ebuild:
+  Added x11-libs/libXtst dependency (bug #193433). Added patch to fix
+  compilation with USE=-gnome again (bug #189307).
+
+  08 Oct 2007; Leonardo Boshell <leonardop@gentoo.org>
+  files/dasher-4.4.0-gnome_help.patch, dasher-4.4.2.ebuild:
+  Remove unnecessary macro from patch. Use bundled aclocal.m4 when
+  eautoreconf is run (bug #181514).
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> dasher-4.4.2.ebuild:
   alpha/ia64 stable wrt #193339
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 0c95239a30b3..2e264aa244aa 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -10,10 +10,14 @@ AUX dasher-4.3.4-as-needed.patch 766 RMD160 380567a48ad66a4887d60fdec7bdef906735
 MD5 e4285c7b536746f9b52171c13bea5719 files/dasher-4.3.4-as-needed.patch 766
 RMD160 380567a48ad66a4887d60fdec7bdef906735fa45 files/dasher-4.3.4-as-needed.patch 766
 SHA256 81306e9defaaf114b03aff2fae1ec7549f19a21e816d86ee4803e702385750ff files/dasher-4.3.4-as-needed.patch 766
-AUX dasher-4.4.0-gnome_help.patch 1267 RMD160 d1b8d5ce34f288c27b700476f12992b26737f0ce SHA1 8901e9dd12a3bd360da8ff3a846a265f8d408109 SHA256 5b3cc56f66628b26dfb984f77c723a68c2d20fd7133dc51b0b5b50884bafb33e
-MD5 5bec3ed948f3f683e2e86ca1f4804d4f files/dasher-4.4.0-gnome_help.patch 1267
-RMD160 d1b8d5ce34f288c27b700476f12992b26737f0ce files/dasher-4.4.0-gnome_help.patch 1267
-SHA256 5b3cc56f66628b26dfb984f77c723a68c2d20fd7133dc51b0b5b50884bafb33e files/dasher-4.4.0-gnome_help.patch 1267
+AUX dasher-4.4.0-gnome_help.patch 1076 RMD160 91e637ea1db3184431d7d33036e63298f3a8651d SHA1 914a543280b53a86e60a7ab3bfc0edcb90e49b21 SHA256 d4afe24f6cbb98d1c308713406ae0b8ef097749c749e6fa0f6d2921def736fb0
+MD5 116ef3e57472b73240f03e1cec173c19 files/dasher-4.4.0-gnome_help.patch 1076
+RMD160 91e637ea1db3184431d7d33036e63298f3a8651d files/dasher-4.4.0-gnome_help.patch 1076
+SHA256 d4afe24f6cbb98d1c308713406ae0b8ef097749c749e6fa0f6d2921def736fb0 files/dasher-4.4.0-gnome_help.patch 1076
+AUX dasher-4.4.2-gnome.patch 1029 RMD160 9493322f65d1ad71fc56e585910f754520e23d85 SHA1 db09e32dc4c944ff833082d2d9ef272e806b16ab SHA256 40be0c2d329603e8aeac698799a0c4403e4adc8ac327b0d66a6eb400afa9ad01
+MD5 c5b2af60febfbcaa8ed8ddb95c2815f8 files/dasher-4.4.2-gnome.patch 1029
+RMD160 9493322f65d1ad71fc56e585910f754520e23d85 files/dasher-4.4.2-gnome.patch 1029
+SHA256 40be0c2d329603e8aeac698799a0c4403e4adc8ac327b0d66a6eb400afa9ad01 files/dasher-4.4.2-gnome.patch 1029
 DIST dasher-4.2.2.tar.bz2 5625199 RMD160 33fccd70dbe9d977a1c6efd7037e939d28acbdcf SHA1 b2258080cc6480c2173148e09013e7efd0307914 SHA256 a51a3bf9a3a1b28a5e9dacc82bad14903a93389a0df92b289e8c2f4180e8bdcf
 DIST dasher-4.4.1.tar.bz2 6779949 RMD160 182793011215bb9bfb515fc4d60c829d1372c705 SHA1 ecf3864e246e09e938c8b8c87518965a43a0695c SHA256 ac16ef01b5c12d8ef700a705b5f12e4755ba9d0bee7b24175728f8efc42a6026
 DIST dasher-4.4.2.tar.bz2 6880246 RMD160 17d33eb2db6f2e7dc9e7e227509f8254ae732baf SHA1 9b82e11ef0104e7acf9add78e48d59a67516c531 SHA256 0ee0d5e7f867bd21f0ab13dcd72dd2dd7eb6bb0d7918c18971ece81d3c2a76ed
@@ -25,14 +29,14 @@ EBUILD dasher-4.4.1.ebuild 1824 RMD160 727f6c1e8f135436a09b83eb8c2c0f0f985d59a7
 MD5 88cf3e17bec1f2f0d245ba4d321b9360 dasher-4.4.1.ebuild 1824
 RMD160 727f6c1e8f135436a09b83eb8c2c0f0f985d59a7 dasher-4.4.1.ebuild 1824
 SHA256 742ef55cad0a36dc8f927d73fc9b8d8bfd4c24faa73e642e720ed54ee0b0a92b dasher-4.4.1.ebuild 1824
-EBUILD dasher-4.4.2.ebuild 1828 RMD160 768c36b7007f699a8ab072f90f842c00612e7830 SHA1 66737c8ac5a51ac041d1222937e745f33cc89f28 SHA256 e7a20c088035a9f3b5960314df6dca1cc4af96ee126e4ce4886cfb5e95a1c6ce
-MD5 5efcac4d4ec6b9ab559a19333f30e6f1 dasher-4.4.2.ebuild 1828
-RMD160 768c36b7007f699a8ab072f90f842c00612e7830 dasher-4.4.2.ebuild 1828
-SHA256 e7a20c088035a9f3b5960314df6dca1cc4af96ee126e4ce4886cfb5e95a1c6ce dasher-4.4.2.ebuild 1828
-MISC ChangeLog 13519 RMD160 047368a1aff8311cda769cfd0956267337db27d8 SHA1 46325902b143866f4801fa71b4ab95bda970d6c6 SHA256 79905695ee64d702ddac6130a2d89e4973a49df99f3ab8942241966369f2ff5c
-MD5 0b47cedb2ab713b21bb29f3caa682267 ChangeLog 13519
-RMD160 047368a1aff8311cda769cfd0956267337db27d8 ChangeLog 13519
-SHA256 79905695ee64d702ddac6130a2d89e4973a49df99f3ab8942241966369f2ff5c ChangeLog 13519
+EBUILD dasher-4.4.2.ebuild 1950 RMD160 6d381295003f83e02c7f9cacfe16616781a547f4 SHA1 62553709788e1e18023eadb88cad1af88851d68b SHA256 9418e18a8ce84f12aa672f4acb1a99fcadf8843901fc792d4aa8107b416a20a1
+MD5 b66d516b934257615c1637459a733cc5 dasher-4.4.2.ebuild 1950
+RMD160 6d381295003f83e02c7f9cacfe16616781a547f4 dasher-4.4.2.ebuild 1950
+SHA256 9418e18a8ce84f12aa672f4acb1a99fcadf8843901fc792d4aa8107b416a20a1 dasher-4.4.2.ebuild 1950
+MISC ChangeLog 13973 RMD160 78fd1c26f6191ac8246ed000ed1ee8bcf8cbfd81 SHA1 46906b7f24485edd2a01d3400f8249c27fd9a368 SHA256 c46fdd0dcc65941c1e95f842c32346c0551340b1e1722aaab8145d242ffc41b0
+MD5 ae2b0719d6c936c31a4d8a391f2db3c9 ChangeLog 13973
+RMD160 78fd1c26f6191ac8246ed000ed1ee8bcf8cbfd81 ChangeLog 13973
+SHA256 c46fdd0dcc65941c1e95f842c32346c0551340b1e1722aaab8145d242ffc41b0 ChangeLog 13973
 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.4.2.ebuild b/app-accessibility/dasher/dasher-4.4.2.ebuild
index f7d3b1c346f1..490d92bdb36f 100644
--- a/app-accessibility/dasher/dasher-4.4.2.ebuild
+++ b/app-accessibility/dasher/dasher-4.4.2.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.4.2.ebuild,v 1.7 2007/09/27 11:53:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.4.2.ebuild,v 1.8 2007/10/08 02:52:20 leonardop Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.8"
@@ -37,7 +37,9 @@ RDEPEND=">=dev-libs/glib-2.6
 		dev-libs/atk )
 	cairo? ( >=x11-libs/gtk+-2.8 )
 
-	x11-libs/libX11"
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXt"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
@@ -47,8 +49,7 @@ DEPEND="${RDEPEND}
 		app-text/scrollkeeper )
 
 	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXt"
+	x11-proto/xproto"
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 
@@ -67,8 +68,11 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-4.3.4-as-needed.patch"
 
-	# Patch to fix compilation when USE=-gnome is used (bug #165154)
+	# 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}/${P}-gnome.patch"
 
-	eautoreconf
+	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
index d8ee607b0ddc..c1be612ede96 100644
--- a/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch
+++ b/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch
@@ -19,11 +19,3 @@ diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN dasher-4.4.0.orig/con
  AM_CONDITIONAL(WITH_GPE, test x$WITHGPE = xtrue)
  AM_CONDITIONAL(WITH_MAEMO, test x$WITHMAEMO = xtrue)
  AM_CONDITIONAL(WITH_MAEMOFULLSCREEN, test x$WITHMAEMOFULLSCREEN = xtrue)
-@@ -401,6 +402,7 @@ if [[ x"$WITHGNOME" = xtrue ]]; then
- GNOME_DOC_INIT
- else
- AM_CONDITIONAL(ENABLE_SK, false)
-+AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, false)
- fi
- 
- AC_CONFIG_FILES([Makefile
diff --git a/app-accessibility/dasher/files/dasher-4.4.2-gnome.patch b/app-accessibility/dasher/files/dasher-4.4.2-gnome.patch
new file mode 100644
index 000000000000..6486ec1fdaa5
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.4.2-gnome.patch
@@ -0,0 +1,28 @@
+diff -NurdpB dasher-4.4.2/Src/Gtk2/dasher_editor.cpp dasher-4.4.2-patched/Src/Gtk2/dasher_editor.cpp
+--- dasher-4.4.2/Src/Gtk2/dasher_editor.cpp	2007-03-12 09:13:13.000000000 -0500
++++ dasher-4.4.2-patched/Src/Gtk2/dasher_editor.cpp	2007-10-07 20:55:14.000000000 -0500
+@@ -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
+ 
+ #include "dasher_action_keyboard.h"
+ #ifdef WITH_MAEMO
+diff -NurdpB dasher-4.4.2/Src/Gtk2/dasher_main.cpp dasher-4.4.2-patched/Src/Gtk2/dasher_main.cpp
+--- dasher-4.4.2/Src/Gtk2/dasher_main.cpp	2007-05-08 09:02:03.000000000 -0500
++++ dasher-4.4.2-patched/Src/Gtk2/dasher_main.cpp	2007-10-07 20:56:44.000000000 -0500
+@@ -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"