apply patch from upstream bug to fix #134410

Package-Manager: portage-2.1_rc2-r2

4 files changed, 61 insertions, 22 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index ca7decc116c1..a593914becfb 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.61 2006/05/10 02:16:59 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.62 2006/05/27 13:43:44 allanonjl Exp $
+
+  27 May 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/dasher-4.0.2-fix_enable_flags.patch, dasher-4.0.2.ebuild:
+  apply patch from upstream bug to fix #134410
 
 *dasher-4.0.2 (10 May 2006)
 
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 78dc306402ee..daca37e0c16b 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -1,30 +1,34 @@
-AUX dasher-3.2.15-buildwindowtree.patch 499 RMD160 772adb87c05e34e996467d0e90e2b090d853f182 SHA1 73939c2426906ea8af470f22f26039834068f6d6 SHA256 dd69c7f44c1722c54a40d725cdeb8e3c92e3f5d0aa687f70b481f2877d42299c size 499
+AUX dasher-3.2.15-buildwindowtree.patch 499 RMD160 772adb87c05e34e996467d0e90e2b090d853f182 SHA1 73939c2426906ea8af470f22f26039834068f6d6 SHA256 dd69c7f44c1722c54a40d725cdeb8e3c92e3f5d0aa687f70b481f2877d42299c
 MD5 29b515c44bcfdd79db45f38f65879994 files/dasher-3.2.15-buildwindowtree.patch 499
 RMD160 772adb87c05e34e996467d0e90e2b090d853f182 files/dasher-3.2.15-buildwindowtree.patch 499
 SHA256 dd69c7f44c1722c54a40d725cdeb8e3c92e3f5d0aa687f70b481f2877d42299c files/dasher-3.2.15-buildwindowtree.patch 499
-AUX dasher-3.2.18-gcc41.patch 1286 RMD160 d730502e8e36eb0830811fa99c727f5dba58488d SHA1 3dbcc20e3810957216108f025875d1f1d60d7ead SHA256 c5dc1087f7aecf53fa037146a6910697e5b731e37052c698e5441923ca675b8d size 1286
+AUX dasher-3.2.18-gcc41.patch 1286 RMD160 d730502e8e36eb0830811fa99c727f5dba58488d SHA1 3dbcc20e3810957216108f025875d1f1d60d7ead SHA256 c5dc1087f7aecf53fa037146a6910697e5b731e37052c698e5441923ca675b8d
 MD5 73559b858e1157838f8da65896ce9162 files/dasher-3.2.18-gcc41.patch 1286
 RMD160 d730502e8e36eb0830811fa99c727f5dba58488d files/dasher-3.2.18-gcc41.patch 1286
 SHA256 c5dc1087f7aecf53fa037146a6910697e5b731e37052c698e5441923ca675b8d files/dasher-3.2.18-gcc41.patch 1286
-AUX dasher-4.0.2-without_gnome.patch 860 RMD160 7545c7338f09e6714ead9fc28c99c43244448f0d SHA1 5a229fa30fd081a0fcaf63b47452d47de345c7d0 SHA256 d24037e98a04eb35c0370f53bc55341e0313238eaafcccd26f71754236fc8fe1 size 860
+AUX dasher-4.0.2-fix_enable_flags.patch 1079 RMD160 7c7a70ad67f7d8bf1cc99981fc369060d748a54b SHA1 891430e18c184bd591e7a993c419d8c4c6cd1272 SHA256 e401cee39bd64935b856e4a9d8cd9bbcdf4d024ad33e277a865e35e1f42eb3ed
+MD5 741fa3e586a2cbf6c9de9735f65506aa files/dasher-4.0.2-fix_enable_flags.patch 1079
+RMD160 7c7a70ad67f7d8bf1cc99981fc369060d748a54b files/dasher-4.0.2-fix_enable_flags.patch 1079
+SHA256 e401cee39bd64935b856e4a9d8cd9bbcdf4d024ad33e277a865e35e1f42eb3ed files/dasher-4.0.2-fix_enable_flags.patch 1079
+AUX dasher-4.0.2-without_gnome.patch 860 RMD160 7545c7338f09e6714ead9fc28c99c43244448f0d SHA1 5a229fa30fd081a0fcaf63b47452d47de345c7d0 SHA256 d24037e98a04eb35c0370f53bc55341e0313238eaafcccd26f71754236fc8fe1
 MD5 bedc686856fcd6568e1571f21a2b6557 files/dasher-4.0.2-without_gnome.patch 860
 RMD160 7545c7338f09e6714ead9fc28c99c43244448f0d files/dasher-4.0.2-without_gnome.patch 860
 SHA256 d24037e98a04eb35c0370f53bc55341e0313238eaafcccd26f71754236fc8fe1 files/dasher-4.0.2-without_gnome.patch 860
-DIST dasher-3.2.18.tar.bz2 4758337 size 4758337
-DIST dasher-4.0.2.tar.bz2 5802684 RMD160 90d54eca8474bc46cd2f11d76b56e3d62811b598 SHA256 4a4adb18ca80641319ffdb63c8cbd69f2faa0698b4d275a2b3ccae467de8d73c size 5802684
-EBUILD dasher-3.2.18.ebuild 1784 RMD160 cba2e2a181b2b997bc71240ebe8fa267784a2e08 SHA1 de60fc8c58af7802e15c2559e619f2ec4673d9a1 SHA256 624698e50120a41128a4e2952762b3b9676b446983ebd166acbd21184a2058d4 size 1784
+DIST dasher-3.2.18.tar.bz2 4758337
+DIST dasher-4.0.2.tar.bz2 5802684 RMD160 90d54eca8474bc46cd2f11d76b56e3d62811b598 SHA1 28e17d932ce37ec29c3537fc9ae934d0e640cea0 SHA256 4a4adb18ca80641319ffdb63c8cbd69f2faa0698b4d275a2b3ccae467de8d73c
+EBUILD dasher-3.2.18.ebuild 1784 RMD160 cba2e2a181b2b997bc71240ebe8fa267784a2e08 SHA1 de60fc8c58af7802e15c2559e619f2ec4673d9a1 SHA256 624698e50120a41128a4e2952762b3b9676b446983ebd166acbd21184a2058d4
 MD5 2af4fc2d8765b20def397d52da5b1dd1 dasher-3.2.18.ebuild 1784
 RMD160 cba2e2a181b2b997bc71240ebe8fa267784a2e08 dasher-3.2.18.ebuild 1784
 SHA256 624698e50120a41128a4e2952762b3b9676b446983ebd166acbd21184a2058d4 dasher-3.2.18.ebuild 1784
-EBUILD dasher-4.0.2.ebuild 1751 RMD160 38b2fb783a422b9381daac1eb7c858206a4fa988 SHA1 b78566de30fe42301e1eca7065f13b5aa3d9604d SHA256 8d09d16048c80e13aa30444cba3a8f1635721057b90b7a5eb19f387bf1b19150 size 1751
-MD5 3da51630880142b170bf15528f455e2c dasher-4.0.2.ebuild 1751
-RMD160 38b2fb783a422b9381daac1eb7c858206a4fa988 dasher-4.0.2.ebuild 1751
-SHA256 8d09d16048c80e13aa30444cba3a8f1635721057b90b7a5eb19f387bf1b19150 dasher-4.0.2.ebuild 1751
-MISC ChangeLog 7689 RMD160 23da50beae43b6b0ee3cb39c48061240fa96f0df SHA1 0b35082c0b69412022019f84a3ff2ef6e428be4e SHA256 7e405775b8d01a9194171b959f314af0e85588eff2e63bfa9ea7d386c5076310 size 7689
-MD5 3d628dfed1c314b1a7d87baf58634184 ChangeLog 7689
-RMD160 23da50beae43b6b0ee3cb39c48061240fa96f0df ChangeLog 7689
-SHA256 7e405775b8d01a9194171b959f314af0e85588eff2e63bfa9ea7d386c5076310 ChangeLog 7689
-MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca size 718
+EBUILD dasher-4.0.2.ebuild 1744 RMD160 1502b0b862951030a41543a0b7a51b45b2bed7d2 SHA1 86753e6fde1d7b608a547c1e2539a5e280190748 SHA256 23f93542d8326ae7011c12f17c95fb3dfd951c30548cccd4fd1b28ef9c30682d
+MD5 296e6de18abbe0129fd4ab5106a0d0da dasher-4.0.2.ebuild 1744
+RMD160 1502b0b862951030a41543a0b7a51b45b2bed7d2 dasher-4.0.2.ebuild 1744
+SHA256 23f93542d8326ae7011c12f17c95fb3dfd951c30548cccd4fd1b28ef9c30682d dasher-4.0.2.ebuild 1744
+MISC ChangeLog 7860 RMD160 f2b38ff87d3ed1d53de10e6143bf8019fa217462 SHA1 00a395278f7fd27f61a1c9f20262a583fab9c66f SHA256 1041e1ca5191d18b0d2aa9acbca5751a2c528c30019e747e2ecc13746269c83c
+MD5 37f1a112dadf3ef4ef00ecaa0e4e229f ChangeLog 7860
+RMD160 f2b38ff87d3ed1d53de10e6143bf8019fa217462 ChangeLog 7860
+SHA256 1041e1ca5191d18b0d2aa9acbca5751a2c528c30019e747e2ecc13746269c83c ChangeLog 7860
+MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
 MD5 76d666e6399f7768a17fe572e9a3096e metadata.xml 718
 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 metadata.xml 718
 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca metadata.xml 718
diff --git a/app-accessibility/dasher/dasher-4.0.2.ebuild b/app-accessibility/dasher/dasher-4.0.2.ebuild
index ea8be62bc5f3..6bdd419ae445 100644
--- a/app-accessibility/dasher/dasher-4.0.2.ebuild
+++ b/app-accessibility/dasher/dasher-4.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.0.2.ebuild,v 1.1 2006/05/10 02:16:59 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.0.2.ebuild,v 1.2 2006/05/27 13:43:44 allanonjl Exp $
 
-inherit eutils gnome2
+inherit eutils gnome2 autotools
 
 DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
 HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
@@ -59,12 +59,13 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
-	cd "${S}"
+	gnome2_src_unpack
 
 	# Fix compilation with USE=-gnome (bug #132510)
 	epatch "${FILESDIR}"/${P}-without_gnome.patch
 
-	gnome2_omf_fix
-	sed -i -e 's:gtk-update-icon-cache:true:' ./Data/Makefile.am ./Data/Makefile.in
+	# fix configure flags
+	epatch "${FILESDIR}"/${P}-fix_enable_flags.patch
+
+	eautoreconf
 }
diff --git a/app-accessibility/dasher/files/dasher-4.0.2-fix_enable_flags.patch b/app-accessibility/dasher/files/dasher-4.0.2-fix_enable_flags.patch
new file mode 100644
index 000000000000..3304ee617fb5
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.0.2-fix_enable_flags.patch
@@ -0,0 +1,30 @@
+diff -NurdB dasher-4.0.2/configure.in dasher-4.0.2-patched/configure.in
+--- dasher-4.0.2/configure.in	2006-04-01 15:33:33.000000000 -0500
++++ dasher-4.0.2-patched/configure.in	2006-05-27 03:07:26.000000000 -0500
+@@ -46,7 +46,7 @@
+ 
+ AC_ARG_ENABLE([speech],
+ 	 AC_HELP_STRING([--enable-speech],[build with speech support (default is NO)]),
+-	 if test $withval = "no"; then
++	 if test $enableval = "no"; then
+ 	   WITHSPEECH=false; 
+ 	 else
+ 	   WITHSPEECH=true;
+@@ -73,7 +73,7 @@
+ 
+ AC_ARG_ENABLE([a11y],
+ 	 AC_HELP_STRING([--enable-a11y],[build with support for the GNOME accessibility framework (default is YES)]),
+-	 if test $withval = "no"; then
++	 if test $enableval = "no"; then
+ 	   WITHA11Y=false; 
+ 	 else
+ 	   WITHA11Y=true;
+@@ -82,7 +82,7 @@
+ 
+ AC_ARG_ENABLE([japanese],
+ 	 AC_HELP_STRING([--enable-japanese],[build with support for Japanese Kanji entry (experimental -- default is NO)]),
+-	 if test $withval = "no"; then
++	 if test $enableval = "no"; then
+ 	   WITHJAPANESE=false; 
+ 	 else
+ 	   AC_CHECK_LIB(canna, RkBgnBun,, AC_MSG_ERROR([Canna library not found.]))