bump to 4.6.1 and include patch to fix compilation with USE="accessibility"

Package-Manager: portage-2.1.3.16

7 files changed, 175 insertions, 20 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index b60b3ce53370..681eaba3a56b 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,13 @@
 # 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.110 2007/10/14 23:17:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.111 2007/10/28 18:59:39 eva Exp $
+
+*dasher-4.6.1 (28 Oct 2007)
+
+  28 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/dasher-4.5.2-gcc4-speech-fix.patch, dasher-4.6.0.ebuild,
+  +dasher-4.6.1.ebuild:
+  fix compilation with USE="accessibility" and bump to 4.6.1
 
 *dasher-4.6.0 (14 Oct 2007)
 
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 5eeb89731103..e6e8c984bf89 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -25,10 +25,15 @@ AUX dasher-4.5.2-as-needed.patch 801 RMD160 b89483d0e7b84de0be454db9709d6dab7d14
 MD5 adc652a0776b724398991e37a40aa54c files/dasher-4.5.2-as-needed.patch 801
 RMD160 b89483d0e7b84de0be454db9709d6dab7d141a7b files/dasher-4.5.2-as-needed.patch 801
 SHA256 dcee5d5b918db49e38f32cedc0d0c9c6e34da79db9bcd2363a8612bd2eb4e8c6 files/dasher-4.5.2-as-needed.patch 801
+AUX dasher-4.5.2-gcc4-speech-fix.patch 2029 RMD160 ccd0efc75fc29c5b327f0d7ba9e9ffe2e529a7c2 SHA1 c006a97f8953da5b1d69bac1806edc190f126d37 SHA256 d87ad6cb85a71e8dd0b8ec7afd8b0d2af265c37f9147c9343b74024733edfb12
+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
 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
+DIST dasher-4.4.2.tar.bz2 5836783 RMD160 170b374d4e36e0fb74bdb5d1b3c3dbd05008bc02 SHA1 e6c3e89bbf62def71d5b5778690063ebff7c6984 SHA256 57d2a6eedccb4b10a5b571a3067f9fba9af827fcb39fbb609a4f4df3c2a746af
 DIST dasher-4.6.0.tar.bz2 6476900 RMD160 d7874fa299ced668ecd121c76d94f801a4a05e4a SHA1 be1eff4d3506db92e1666c059b836be4dbf3d7a4 SHA256 5c1b5ba9011ce2e31118cd25138dc4c4e8269a51d61c38788f797555cc6b5089
+DIST dasher-4.6.1.tar.bz2 6473483 RMD160 77a765ddc623895a2a121732848f00c5a82652d0 SHA1 6efeb3fdd160e203b60e5d2b9faca0d243a68ed3 SHA256 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8
 EBUILD dasher-4.2.2.ebuild 1824 RMD160 ddd0c66cfb66999907704a84fac7e64aa13e86ec SHA1 19ce4cb0045b9dfbc2fb8f6e04a78c25986617c8 SHA256 2e98623761d567b505fa42ab1540c8e091bead0bb150c1f3498e67e072cce021
 MD5 a6a2c9c140ec7f08d24b2c2171b0fb31 dasher-4.2.2.ebuild 1824
 RMD160 ddd0c66cfb66999907704a84fac7e64aa13e86ec dasher-4.2.2.ebuild 1824
@@ -41,14 +46,18 @@ EBUILD dasher-4.4.2.ebuild 1950 RMD160 6d381295003f83e02c7f9cacfe16616781a547f4
 MD5 b66d516b934257615c1637459a733cc5 dasher-4.4.2.ebuild 1950
 RMD160 6d381295003f83e02c7f9cacfe16616781a547f4 dasher-4.4.2.ebuild 1950
 SHA256 9418e18a8ce84f12aa672f4acb1a99fcadf8843901fc792d4aa8107b416a20a1 dasher-4.4.2.ebuild 1950
-EBUILD dasher-4.6.0.ebuild 1958 RMD160 219666fba7decf5ad3099ba27c755bad8aeba1ea SHA1 560beff4129e43281fb0c4eb33960697363da6af SHA256 eb4cbfa1864d572d9006c72fb936de0ee3dec0dd42ae75db256db3ed86881d93
-MD5 f3feddeb44cdd65ed2b55af3fd4b3778 dasher-4.6.0.ebuild 1958
-RMD160 219666fba7decf5ad3099ba27c755bad8aeba1ea dasher-4.6.0.ebuild 1958
-SHA256 eb4cbfa1864d572d9006c72fb936de0ee3dec0dd42ae75db256db3ed86881d93 dasher-4.6.0.ebuild 1958
-MISC ChangeLog 14128 RMD160 2197699eb6be0b459652b970da1334e69ae10285 SHA1 483f1830dd837749a6f4dbef3897f9ae555c494b SHA256 ff37fcc7472512f0bf989f653258320f674f7ca70979811f3f5112f5884fd371
-MD5 5f4503b8fb1dc002d0edd44cab8f69bb ChangeLog 14128
-RMD160 2197699eb6be0b459652b970da1334e69ae10285 ChangeLog 14128
-SHA256 ff37fcc7472512f0bf989f653258320f674f7ca70979811f3f5112f5884fd371 ChangeLog 14128
+EBUILD dasher-4.6.0.ebuild 2045 RMD160 6ac51d81fa8d6bc27749e0b483fb15c10646b3ce SHA1 8ee4a95a868b357ca1bf03cc6f803f7a9e528153 SHA256 6157106fec184d2c8b8c0f8cdcab2f985c24c66bfbd085527dc0e108c7111ee1
+MD5 14a451c23840ab94436db0c71faf0944 dasher-4.6.0.ebuild 2045
+RMD160 6ac51d81fa8d6bc27749e0b483fb15c10646b3ce dasher-4.6.0.ebuild 2045
+SHA256 6157106fec184d2c8b8c0f8cdcab2f985c24c66bfbd085527dc0e108c7111ee1 dasher-4.6.0.ebuild 2045
+EBUILD dasher-4.6.1.ebuild 2156 RMD160 2224fb9988cc14ac7e595b3d45a630a28baae16f SHA1 1d14e99ef6839be838eeffedaeba6ca75d6038e7 SHA256 d129a9c19d22cb62749ba8cb855170663bd330ba15a2874cc31676f95db8e01d
+MD5 5eb0332e40c914ff4d3a4b849a088d4d dasher-4.6.1.ebuild 2156
+RMD160 2224fb9988cc14ac7e595b3d45a630a28baae16f dasher-4.6.1.ebuild 2156
+SHA256 d129a9c19d22cb62749ba8cb855170663bd330ba15a2874cc31676f95db8e01d dasher-4.6.1.ebuild 2156
+MISC ChangeLog 14363 RMD160 1ab0b1be99dff1ed842f3eebb4094cae727b21c4 SHA1 cfa5f40b814ee490cc68c74b43f1d679ac089101 SHA256 45fd909d927d61b009688a00a7bcd9fa92740569d81d6eba854dad80324fab5b
+MD5 de7b9389da2803ea23e1a1a46bd2294c ChangeLog 14363
+RMD160 1ab0b1be99dff1ed842f3eebb4094cae727b21c4 ChangeLog 14363
+SHA256 45fd909d927d61b009688a00a7bcd9fa92740569d81d6eba854dad80324fab5b ChangeLog 14363
 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
 MD5 76d666e6399f7768a17fe572e9a3096e metadata.xml 718
 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 metadata.xml 718
@@ -59,16 +68,19 @@ SHA256 fa624af375680736ef221bd5a5c81441d9151a972afb6306fce3736ecaa1378c files/di
 MD5 8c0cd4eb6d50d77bc4354c8faadae432 files/digest-dasher-4.4.1 244
 RMD160 c587c80043d416976acf8d35f2f2ca91d84bc83f files/digest-dasher-4.4.1 244
 SHA256 8ab9d2541fbb86df0707029cfa384143c3940d6f7d7e8d535dd08f879e6bd772 files/digest-dasher-4.4.1 244
-MD5 8d78f116e306c4acbaa3799b2440326d files/digest-dasher-4.4.2 244
-RMD160 9c138e57af7641c2e633c66646bed3edd0537fe4 files/digest-dasher-4.4.2 244
-SHA256 b12e35e112be23ff625930954e9a47156ee04638e30221391decbecc3f38c733 files/digest-dasher-4.4.2 244
+MD5 d8aea52e5654e40a766726ff064ca638 files/digest-dasher-4.4.2 244
+RMD160 3465782e2805c557e13402f333c8833f0be7dbd7 files/digest-dasher-4.4.2 244
+SHA256 66c169f395be8c394223d265e7443fcfc9a88c847a2f75abf25a96eddaea13ea files/digest-dasher-4.4.2 244
 MD5 c6b62d57b41246b769669d094cb39204 files/digest-dasher-4.6.0 244
 RMD160 858392e775690d3c35425a019d64fa40525bb592 files/digest-dasher-4.6.0 244
 SHA256 87260209722bd3399a4f74594edd1d729559de401a407d506c9c676b46a8424a files/digest-dasher-4.6.0 244
+MD5 4dbe6ad37ca96ab18957c201822c0868 files/digest-dasher-4.6.1 244
+RMD160 d8be6429ee36fb8f9ce5d5315382a7ee9b7d6837 files/digest-dasher-4.6.1 244
+SHA256 2560e6934bc7be8e7a9b41a4601a004a10ed8ab2c61f259032174f0b6c506615 files/digest-dasher-4.6.1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHEqOL1fmVwcYIWAYRAuy4AJ0exQC1CrYtYUy3Oe58ptsCUkEVLACfQb/T
-gOVxnZ79iwgKsEeO6GCmwJg=
-=KACi
+iD8DBQFHJNwx1fmVwcYIWAYRAp+QAJ9sakbB/GepX8ylYvG6SFAuU7YUtACdEliy
+SOwrZ8z9cxVR5B3E8iLwFhA=
+=TRo2
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/dasher/dasher-4.6.0.ebuild b/app-accessibility/dasher/dasher-4.6.0.ebuild
index c881e760883f..eea72e6a8fcd 100644
--- a/app-accessibility/dasher/dasher-4.6.0.ebuild
+++ b/app-accessibility/dasher/dasher-4.6.0.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.0.ebuild,v 1.1 2007/10/14 23:17:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.0.ebuild,v 1.2 2007/10/28 18:59:39 eva Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.8"
@@ -73,6 +73,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-4.4.0-gnome_help.patch"
 	epatch "${FILESDIR}/${PN}-4.4.2-gnome.patch"
 
+	# Fix compilation with gcc-4
+	epatch "${FILESDIR}/${PN}-4.5.2-gcc4-speech-fix.patch"
+
 	cp aclocal.m4 old-macros.m4
 	AT_M4DIR="." eautoreconf
 }
diff --git a/app-accessibility/dasher/dasher-4.6.1.ebuild b/app-accessibility/dasher/dasher-4.6.1.ebuild
new file mode 100644
index 000000000000..76af6238bb17
--- /dev/null
+++ b/app-accessibility/dasher/dasher-4.6.1.ebuild
@@ -0,0 +1,85 @@
+# 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.1 2007/10/28 18:59:39 eva 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.4.2-gnome.patch"
+
+	# Fix compilation with gcc-4
+	epatch "${FILESDIR}/${PN}-4.5.2-gcc4-speech-fix.patch"
+
+	cp aclocal.m4 old-macros.m4
+	AT_M4DIR="." eautoreconf
+}
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
new file mode 100644
index 000000000000..51bfdcfdd26f
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.5.2-gcc4-speech-fix.patch
@@ -0,0 +1,45 @@
+--- 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/digest-dasher-4.4.2 b/app-accessibility/dasher/files/digest-dasher-4.4.2
index d44c4ea1ab51..2cd4893ee736 100644
--- a/app-accessibility/dasher/files/digest-dasher-4.4.2
+++ b/app-accessibility/dasher/files/digest-dasher-4.4.2
@@ -1,3 +1,3 @@
-MD5 ca50a357d5043e4e5f114ecda7cd1c73 dasher-4.4.2.tar.bz2 6880246
-RMD160 17d33eb2db6f2e7dc9e7e227509f8254ae732baf dasher-4.4.2.tar.bz2 6880246
-SHA256 0ee0d5e7f867bd21f0ab13dcd72dd2dd7eb6bb0d7918c18971ece81d3c2a76ed dasher-4.4.2.tar.bz2 6880246
+MD5 df2ed1e9cdf3b89262e4f38e05449e1a dasher-4.4.2.tar.bz2 5836783
+RMD160 170b374d4e36e0fb74bdb5d1b3c3dbd05008bc02 dasher-4.4.2.tar.bz2 5836783
+SHA256 57d2a6eedccb4b10a5b571a3067f9fba9af827fcb39fbb609a4f4df3c2a746af dasher-4.4.2.tar.bz2 5836783
diff --git a/app-accessibility/dasher/files/digest-dasher-4.6.1 b/app-accessibility/dasher/files/digest-dasher-4.6.1
new file mode 100644
index 000000000000..eee999215df8
--- /dev/null
+++ b/app-accessibility/dasher/files/digest-dasher-4.6.1
@@ -0,0 +1,3 @@
+MD5 1457df5075477d757f7df5693947464d dasher-4.6.1.tar.bz2 6473483
+RMD160 77a765ddc623895a2a121732848f00c5a82652d0 dasher-4.6.1.tar.bz2 6473483
+SHA256 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8 dasher-4.6.1.tar.bz2 6473483