bump to 4.7.0

Package-Manager: portage-2.1.4.4

4 files changed, 129 insertions, 7 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 2c1d30ed9b66..d544b0e8cdab 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,12 @@
 # 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.121 2007/11/29 05:01:46 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.122 2008/03/29 21:37:30 eva Exp $
+
+*dasher-4.7.0 (29 Mar 2008)
+
+  29 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/dasher-4.7.0-as-needed.patch, +dasher-4.7.0.ebuild:
+  bump to 4.7.0
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org>
   +files/dasher-4.6.1-lldiv.patch, dasher-4.6.1.ebuild:
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 29287c548471..bc77ce7b8145 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -6,14 +6,17 @@ AUX dasher-4.5.2-as-needed.patch 801 RMD160 b89483d0e7b84de0be454db9709d6dab7d14
 AUX dasher-4.5.2-gcc4-speech-fix.patch 2029 RMD160 ccd0efc75fc29c5b327f0d7ba9e9ffe2e529a7c2 SHA1 c006a97f8953da5b1d69bac1806edc190f126d37 SHA256 d87ad6cb85a71e8dd0b8ec7afd8b0d2af265c37f9147c9343b74024733edfb12
 AUX dasher-4.6.1-gnome.patch 1685 RMD160 8767be5fa679862e0a793062eff491d32704afe9 SHA1 cb0768f4d98ed6d2c2432042673d04506008a107 SHA256 6462d01b3ce27e89a2d44ba9e1461d21da6490485bddfce87a82e9a549165d84
 AUX dasher-4.6.1-lldiv.patch 367 RMD160 2ea3a9f822e27c8fbc68b7ffcd63cd0153501876 SHA1 cfc2193d0b98f9ede818241d5b1d53205a7dec7f SHA256 9d4d814d6e13190f3677f3cf08dbf8a729bbab80d48f0451c6de91572dde879c
+AUX dasher-4.7.0-as-needed.patch 690 RMD160 9a33ecd5ccce8edef2478288775dd9e9a908d57a SHA1 90f12dde417adc072c36b48686136b3081fec97e SHA256 15531b4cf1ed129ff094700e5818c2cb4c38ab9de9163518d1ce1282a0ae38b7
 DIST dasher-4.6.1.tar.bz2 6473483 RMD160 77a765ddc623895a2a121732848f00c5a82652d0 SHA1 6efeb3fdd160e203b60e5d2b9faca0d243a68ed3 SHA256 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8
+DIST dasher-4.7.0.tar.bz2 6483077 RMD160 64323feeee6cb99fc71eb7b0e31edfdb3806ec14 SHA1 3c98835986f1db541fe681f470c7345eaa66421a SHA256 3c4a8fb69f5710be1ad52c2260d5af49857ca10c4dd66322c70c79c3b701a745
 EBUILD dasher-4.6.1.ebuild 2219 RMD160 edf37e017b0ab0a13ff11c91f7fe09e511110896 SHA1 42b2a000b42cc190c07cb5fee025d88871324f82 SHA256 cbcee2b328c3adce8eeedc0ae0cb6972480b818dd1379c787295b737bb89d13e
-MISC ChangeLog 15237 RMD160 201c777ab127ce331c8d7552215a585b53430785 SHA1 0aa621bdac9732ec26c5831afff06e2ac9743818 SHA256 43e9b2569de2c73a4d37adb0b07cb7ece5cea3b0158a3d34a56b67c02ee7f61c
+EBUILD dasher-4.7.0.ebuild 2322 RMD160 041134aad9d0be84a373cdbc6de5a9c3693df695 SHA1 8740a696eb55cd9f877dd3c7d37bb2e42fc61b08 SHA256 55108f4806c4282ee68c8b4e0fcf4231fbf0a8cea2a9f8e995a75a61eb7d7a83
+MISC ChangeLog 15398 RMD160 7bb2f8904fd86ca7f9103c8b1e9164dd602881a4 SHA1 f35b1110b843c938a893334ba5afaeb48e5af04d SHA256 1817d112f58fca3238c20bce041dfa53fceb7f25dd2a6b24676474cb04301d46
 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfVs20ACgkQkeYb6olFHJdhwgCfc6EFCb4vyY3m0S4sJdXsaQSd
-9FcAnj5CfpjEhGKknKIV9Dj46fhtrae4
-=/46O
+iEYEARECAAYFAkfutqMACgkQ1fmVwcYIWAaAPACfR65GQPgKDDodG+DAIccLs3Sd
+YN0AoNdUbcx7dYtlHGC9/kdZrkZ6EHIR
+=Be1j
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/dasher/dasher-4.7.0.ebuild b/app-accessibility/dasher/dasher-4.7.0.ebuild
new file mode 100644
index 000000000000..158af3dfbe2b
--- /dev/null
+++ b/app-accessibility/dasher/dasher-4.7.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.7.0.ebuild,v 1.1 2008/03/29 21:37:30 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
+	# --enable-tilt (tilt sensor support)
+
+	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
+
+	# Fix build with --as-needed (upstream bug #525028)
+	epatch "${FILESDIR}/${PN}-4.7.0-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.6.1-gnome.patch"
+
+	# Fix compilation with glibc-2.5
+	epatch "${FILESDIR}/${PN}-4.6.1-lldiv.patch"
+
+	# Fix tests (upstream bug #525035)
+	echo "Data/dasher.desktop.in" >> po/POTFILES.in
+
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
diff --git a/app-accessibility/dasher/files/dasher-4.7.0-as-needed.patch b/app-accessibility/dasher/files/dasher-4.7.0-as-needed.patch
new file mode 100644
index 000000000000..0487f67dc60c
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.7.0-as-needed.patch
@@ -0,0 +1,26 @@
+diff -Nura dasher-4.7.0.old/Src/Makefile.am dasher-4.7.0/Src/Makefile.am
+--- dasher-4.7.0.old/Src/Makefile.am	2008-03-29 22:11:18.000000000 +0100
++++ dasher-4.7.0/Src/Makefile.am	2008-03-29 22:12:27.000000000 +0100
+@@ -24,17 +24,17 @@
+ 	-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\"
+ 
+ dasher_LDADD = \
+-	$(GTK2BUILD_LIBS) \
+-	-lexpat \
+-	$(POPT_LIBS) \
+-	$(GPELIB) \
+ 	Common/libdashermisc.a \
+ 	Gtk2/libdashergtk.a \
+ 	Gtk2/libdashercontrol.a \
+ 	DasherCore/libdashercore.a \
+ 	DasherCore/libdasherprefs.a \
+ 	DasherCore/LanguageModelling/libdasherlm.a \
+-	Common/libdashermisc.a
++	Common/libdashermisc.a \
++	$(GTK2BUILD_LIBS) \
++	-lexpat \
++	$(POPT_LIBS) \
++	$(GPELIB)
+ #endif
+ 
+ #if DOQTE