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

(Portage version: 2.1.3.16)

6 files changed, 148 insertions, 5 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/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