bump to 4.6.0

Package-Manager: portage-2.1.3.12

5 files changed, 141 insertions, 5 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 3f5af7b7f70d..b60b3ce53370 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.109 2007/10/08 02:52:20 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.110 2007/10/14 23:17:17 eva Exp $
+
+*dasher-4.6.0 (14 Oct 2007)
+
+  14 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/dasher-4.5.2-as-needed.patch, +dasher-4.6.0.ebuild:
+  bump to 4.6.0
 
   08 Oct 2007; Leonardo Boshell <leonardop@gentoo.org>
   +files/dasher-4.4.2-gnome.patch, dasher-4.4.2.ebuild:
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 2e264aa244aa..5eeb89731103 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dasher-4.1.10-as-needed.patch 732 RMD160 d3a8c88088bded971a552fa82e2ed638c9bd6bd8 SHA1 17487ffe6a3ea9f5cfba9e3615c5648f2db51894 SHA256 0bb7bf4fd9d69e2791044f38683a894b6bc47de4959b19a6a4f6ee805acff9c5
 MD5 3718a8521c8431dca8c1ee2c046ead8b files/dasher-4.1.10-as-needed.patch 732
 RMD160 d3a8c88088bded971a552fa82e2ed638c9bd6bd8 files/dasher-4.1.10-as-needed.patch 732
@@ -18,9 +21,14 @@ AUX dasher-4.4.2-gnome.patch 1029 RMD160 9493322f65d1ad71fc56e585910f754520e23d8
 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
+AUX dasher-4.5.2-as-needed.patch 801 RMD160 b89483d0e7b84de0be454db9709d6dab7d141a7b SHA1 1f09ae61f92a5192c847022554b08222646673f9 SHA256 dcee5d5b918db49e38f32cedc0d0c9c6e34da79db9bcd2363a8612bd2eb4e8c6
+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
 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.6.0.tar.bz2 6476900 RMD160 d7874fa299ced668ecd121c76d94f801a4a05e4a SHA1 be1eff4d3506db92e1666c059b836be4dbf3d7a4 SHA256 5c1b5ba9011ce2e31118cd25138dc4c4e8269a51d61c38788f797555cc6b5089
 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
@@ -33,10 +41,14 @@ 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
-MISC ChangeLog 13973 RMD160 78fd1c26f6191ac8246ed000ed1ee8bcf8cbfd81 SHA1 46906b7f24485edd2a01d3400f8249c27fd9a368 SHA256 c46fdd0dcc65941c1e95f842c32346c0551340b1e1722aaab8145d242ffc41b0
-MD5 ae2b0719d6c936c31a4d8a391f2db3c9 ChangeLog 13973
-RMD160 78fd1c26f6191ac8246ed000ed1ee8bcf8cbfd81 ChangeLog 13973
-SHA256 c46fdd0dcc65941c1e95f842c32346c0551340b1e1722aaab8145d242ffc41b0 ChangeLog 13973
+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
 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
 MD5 76d666e6399f7768a17fe572e9a3096e metadata.xml 718
 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 metadata.xml 718
@@ -50,3 +62,13 @@ SHA256 8ab9d2541fbb86df0707029cfa384143c3940d6f7d7e8d535dd08f879e6bd772 files/di
 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 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHEqOL1fmVwcYIWAYRAuy4AJ0exQC1CrYtYUy3Oe58ptsCUkEVLACfQb/T
+gOVxnZ79iwgKsEeO6GCmwJg=
+=KACi
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/dasher/dasher-4.6.0.ebuild b/app-accessibility/dasher/dasher-4.6.0.ebuild
new file mode 100644
index 000000000000..c881e760883f
--- /dev/null
+++ b/app-accessibility/dasher/dasher-4.6.0.ebuild
@@ -0,0 +1,78 @@
+# 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 $
+
+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() {
+	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"
+
+	cp aclocal.m4 old-macros.m4
+	AT_M4DIR="." eautoreconf
+}
diff --git a/app-accessibility/dasher/files/dasher-4.5.2-as-needed.patch b/app-accessibility/dasher/files/dasher-4.5.2-as-needed.patch
new file mode 100644
index 000000000000..3c3c76bdeb76
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.5.2-as-needed.patch
@@ -0,0 +1,27 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN dasher-4.5.2.orig/Src/Makefile.am dasher-4.5.2/Src/Makefile.am
+--- dasher-4.5.2.orig/Src/Makefile.am	2007-07-09 13:06:53.000000000 -0400
++++ dasher-4.5.2/Src/Makefile.am	2007-07-11 15:40:18.000000000 -0400
+@@ -24,10 +24,6 @@ AM_CXXFLAGS = \
+ 	-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\"
+ 
+ dasher_LDADD = \
+-	$(GTK2BUILD_LIBS) \
+-	-lexpat \
+-	$(POPT_LIBS) \
+-	$(GPELIB) \
+ 	Common/libdashermisc.a \
+ 	Gtk2/libdashergtk.a \
+ 	Gtk2/libdashercontrol.a \
+@@ -35,7 +31,11 @@ dasher_LDADD = \
+ 	DasherCore/libdasherprefs.a \
+ 	DasherCore/LanguageModelling/libdasherlm.a \
+ 	DasherCore/Alphabet/libdasheralphabet.a \
+-	Common/libdashermisc.a
++	Common/libdashermisc.a \
++	$(GTK2BUILD_LIBS) \
++	-lexpat \
++	$(POPT_LIBS) \
++	$(GPELIB)
+ #endif
+ 
+ #if DOQTE
diff --git a/app-accessibility/dasher/files/digest-dasher-4.6.0 b/app-accessibility/dasher/files/digest-dasher-4.6.0
new file mode 100644
index 000000000000..d28cbcd232d1
--- /dev/null
+++ b/app-accessibility/dasher/files/digest-dasher-4.6.0
@@ -0,0 +1,3 @@
+MD5 ab9fce024bb2b1ea3cb479e82819d57d dasher-4.6.0.tar.bz2 6476900
+RMD160 d7874fa299ced668ecd121c76d94f801a4a05e4a dasher-4.6.0.tar.bz2 6476900
+SHA256 5c1b5ba9011ce2e31118cd25138dc4c4e8269a51d61c38788f797555cc6b5089 dasher-4.6.0.tar.bz2 6476900