From 0614d5a806887e87985af0b98f8551ddeef827ab Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Tue, 27 Mar 2007 17:17:43 +0000 Subject: [PATCH] gnome 2.18.0 Package-Manager: portage-2.1.2.2 --- app-accessibility/dasher/ChangeLog | 9 ++- app-accessibility/dasher/Manifest | 34 ++++++++- app-accessibility/dasher/dasher-4.4.0.ebuild | 75 +++++++++++++++++++ .../dasher/files/dasher-4.3.4-as-needed.patch | 26 +++++++ .../files/dasher-4.4.0-gnome_help.patch | 29 +++++++ .../dasher/files/digest-dasher-4.4.0 | 3 + 6 files changed, 171 insertions(+), 5 deletions(-) create mode 100644 app-accessibility/dasher/dasher-4.4.0.ebuild create mode 100644 app-accessibility/dasher/files/dasher-4.3.4-as-needed.patch create mode 100644 app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch create mode 100644 app-accessibility/dasher/files/digest-dasher-4.4.0 diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog index fae2c9ed4294..51aa16b300a0 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.89 2007/02/06 01:38:51 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.90 2007/03/27 17:17:43 dang Exp $ + +*dasher-4.4.0 (27 Mar 2007) + + 27 Mar 2007; Daniel Gryniewicz + +files/dasher-4.3.4-as-needed.patch, +files/dasher-4.4.0-gnome_help.patch, + +dasher-4.4.0.ebuild: + gnome 2.18.0 06 Feb 2007; Leonardo Boshell +files/dasher-4.2.2-gnome_help.patch, dasher-4.2.2.ebuild: diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest index e2560f7d7f1e..ba8884826cde 100644 --- a/app-accessibility/dasher/Manifest +++ b/app-accessibility/dasher/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + 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 @@ -18,9 +21,18 @@ AUX dasher-4.2.2-gnome_help.patch 1178 RMD160 eb8e4a279c5b22099eeb0999eafb9cfe1b MD5 b0c83c049b8b9f4ec520a962b776dbb9 files/dasher-4.2.2-gnome_help.patch 1178 RMD160 eb8e4a279c5b22099eeb0999eafb9cfe1b76118c files/dasher-4.2.2-gnome_help.patch 1178 SHA256 8f4c127aba50729c21ab23083ee98c53dc6d4d876e976e9dd3a79265c36ebeaf files/dasher-4.2.2-gnome_help.patch 1178 +AUX dasher-4.3.4-as-needed.patch 766 RMD160 380567a48ad66a4887d60fdec7bdef906735fa45 SHA1 cf53fac9bce80d3e7a63ab1271b67bb90703e286 SHA256 81306e9defaaf114b03aff2fae1ec7549f19a21e816d86ee4803e702385750ff +MD5 e4285c7b536746f9b52171c13bea5719 files/dasher-4.3.4-as-needed.patch 766 +RMD160 380567a48ad66a4887d60fdec7bdef906735fa45 files/dasher-4.3.4-as-needed.patch 766 +SHA256 81306e9defaaf114b03aff2fae1ec7549f19a21e816d86ee4803e702385750ff files/dasher-4.3.4-as-needed.patch 766 +AUX dasher-4.4.0-gnome_help.patch 1267 RMD160 d1b8d5ce34f288c27b700476f12992b26737f0ce SHA1 8901e9dd12a3bd360da8ff3a846a265f8d408109 SHA256 5b3cc56f66628b26dfb984f77c723a68c2d20fd7133dc51b0b5b50884bafb33e +MD5 5bec3ed948f3f683e2e86ca1f4804d4f files/dasher-4.4.0-gnome_help.patch 1267 +RMD160 d1b8d5ce34f288c27b700476f12992b26737f0ce files/dasher-4.4.0-gnome_help.patch 1267 +SHA256 5b3cc56f66628b26dfb984f77c723a68c2d20fd7133dc51b0b5b50884bafb33e files/dasher-4.4.0-gnome_help.patch 1267 DIST dasher-4.0.2.tar.bz2 5802684 RMD160 90d54eca8474bc46cd2f11d76b56e3d62811b598 SHA1 28e17d932ce37ec29c3537fc9ae934d0e640cea0 SHA256 4a4adb18ca80641319ffdb63c8cbd69f2faa0698b4d275a2b3ccae467de8d73c DIST dasher-4.2.1.tar.bz2 5624904 RMD160 93e219bda543d8efd295ca5ca161c06be529368a SHA1 39948001db7e4a481703c390ce7d352b2df8b7d2 SHA256 96c529316f877ff0bd55be487af5d629d84eaf212d8587b2a583822121e1b4fc DIST dasher-4.2.2.tar.bz2 5625199 RMD160 33fccd70dbe9d977a1c6efd7037e939d28acbdcf SHA1 b2258080cc6480c2173148e09013e7efd0307914 SHA256 a51a3bf9a3a1b28a5e9dacc82bad14903a93389a0df92b289e8c2f4180e8bdcf +DIST dasher-4.4.0.tar.bz2 6741569 RMD160 e07ea2fa977f08c83bec209505ee86018ab05729 SHA1 f00f0c1c08f59d1a0679ec6467fea472f67d9885 SHA256 66fab7ac772fa1cb2fad1fe9183effa73d345fec364942e1dbc8084600d1d73a EBUILD dasher-4.0.2.ebuild 1736 RMD160 550cafb680ef38df133ca82a2bc25c511f8644c9 SHA1 8aa3d3f0267d24d7f4269ab64664c1e3e0e7708b SHA256 8eee6878f0f1028c25fd975fb94bf9422135586a1611a5a1ccc88eb2d8dd149c MD5 6135f2d0a20f14a87ae7228393bc6455 dasher-4.0.2.ebuild 1736 RMD160 550cafb680ef38df133ca82a2bc25c511f8644c9 dasher-4.0.2.ebuild 1736 @@ -33,10 +45,14 @@ EBUILD dasher-4.2.2.ebuild 1826 RMD160 e6e1a41d501198ebd5e3f4e499453d8fed6b8386 MD5 89b0f7e9240a7b82cd4c92d7b74c4d9d dasher-4.2.2.ebuild 1826 RMD160 e6e1a41d501198ebd5e3f4e499453d8fed6b8386 dasher-4.2.2.ebuild 1826 SHA256 63dbe8ae37f6059f17433ae92d40fc3ae1965ad0748601d714dbbdbb3f2b9938 dasher-4.2.2.ebuild 1826 -MISC ChangeLog 11178 RMD160 1634110179bc8bbe28ccfd5bc23e0b599eac981e SHA1 89f85da1dd40f2f07c7daa663b2fd3ff4c5fc103 SHA256 23972b5a1bff6446babf7456e5a7aab1e63c494cac9d2e4753e5fc073c6c24cb -MD5 0045f1519fc4423fa5a69c4b3a5c5472 ChangeLog 11178 -RMD160 1634110179bc8bbe28ccfd5bc23e0b599eac981e ChangeLog 11178 -SHA256 23972b5a1bff6446babf7456e5a7aab1e63c494cac9d2e4753e5fc073c6c24cb ChangeLog 11178 +EBUILD dasher-4.4.0.ebuild 1826 RMD160 5099d12d3ceb3be620377f915c45e34e4c95ca8d SHA1 8d2b3cc707aceec8b4e15b44237eb7b18ffb30d1 SHA256 d59c9dae4ab8ab1799b26dd2a3488f5b5e893bb1bbb860b055e6835312208c74 +MD5 51ccf79de38879b4cfd47f85f05e6ecc dasher-4.4.0.ebuild 1826 +RMD160 5099d12d3ceb3be620377f915c45e34e4c95ca8d dasher-4.4.0.ebuild 1826 +SHA256 d59c9dae4ab8ab1799b26dd2a3488f5b5e893bb1bbb860b055e6835312208c74 dasher-4.4.0.ebuild 1826 +MISC ChangeLog 11370 RMD160 de8837fde45d02796ce8dd7129b1c8afefc24bb6 SHA1 4852bde8495a4130751b7bcc23b45e6b4ff54bdb SHA256 daadc086d5797d661ff557ca8918f1540d10b7f810ed419e7750e362fe3b4ec1 +MD5 f6ecd96ad2e9c2cca9a522748bec5d6b ChangeLog 11370 +RMD160 de8837fde45d02796ce8dd7129b1c8afefc24bb6 ChangeLog 11370 +SHA256 daadc086d5797d661ff557ca8918f1540d10b7f810ed419e7750e362fe3b4ec1 ChangeLog 11370 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca MD5 76d666e6399f7768a17fe572e9a3096e metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 metadata.xml 718 @@ -50,3 +66,13 @@ SHA256 3d657524867a516bf793c1f94d59cdc844a3d3fdab7fa6251d67710e8b7a0de0 files/di MD5 2e094774cb3d3eb29af3a251ae1b33da files/digest-dasher-4.2.2 244 RMD160 441e2a6cd51525496b7ce19c2b20f3cbff6fac3c files/digest-dasher-4.2.2 244 SHA256 fa624af375680736ef221bd5a5c81441d9151a972afb6306fce3736ecaa1378c files/digest-dasher-4.2.2 244 +MD5 7af870bb42448843898d4edbddbef059 files/digest-dasher-4.4.0 244 +RMD160 43fd12d711fedacdc1dc4ed8e814bee0c420b395 files/digest-dasher-4.4.0 244 +SHA256 c44e91c788f0939475d27687de7c1c9743d59fc0ef1b19bd672e66c83b916d7d files/digest-dasher-4.4.0 244 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGCVFVomPajV0RnrERArRhAJ90oQHavskAKEtbPcgdJ/Yt4TzSVACffoiF +5HzpdVrK+ZD1u9q3qG6/b3c= +=vsHg +-----END PGP SIGNATURE----- diff --git a/app-accessibility/dasher/dasher-4.4.0.ebuild b/app-accessibility/dasher/dasher-4.4.0.ebuild new file mode 100644 index 000000000000..c20ccbad0a84 --- /dev/null +++ b/app-accessibility/dasher/dasher-4.4.0.ebuild @@ -0,0 +1,75 @@ +# 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.4.0.ebuild,v 1.1 2007/03/27 17:17:43 dang 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. +# +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" + +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 + x11-libs/libXt" + +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.3.4-as-needed.patch" + + # Patch to fix compilation when USE=-gnome is used (bug #165154) + epatch "${FILESDIR}/${P}-gnome_help.patch" + + eautoreconf +} diff --git a/app-accessibility/dasher/files/dasher-4.3.4-as-needed.patch b/app-accessibility/dasher/files/dasher-4.3.4-as-needed.patch new file mode 100644 index 000000000000..8ed7d58e6789 --- /dev/null +++ b/app-accessibility/dasher/files/dasher-4.3.4-as-needed.patch @@ -0,0 +1,26 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN dasher-4.3.4.orig/Src/Makefile.am dasher-4.3.4/Src/Makefile.am +--- dasher-4.3.4.orig/Src/Makefile.am 2007-02-12 13:09:31.000000000 -0500 ++++ dasher-4.3.4/Src/Makefile.am 2007-02-16 20:36:34.000000000 -0500 +@@ -24,17 +24,17 @@ AM_CXXFLAGS = \ + -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/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/dasher-4.4.0-gnome_help.patch b/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch new file mode 100644 index 000000000000..d8ee607b0ddc --- /dev/null +++ b/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch @@ -0,0 +1,29 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN dasher-4.4.0.orig/Data/Help/Makefile.am dasher-4.4.0/Data/Help/Makefile.am +--- dasher-4.4.0.orig/Data/Help/Makefile.am 2007-03-12 10:13:18.000000000 -0400 ++++ dasher-4.4.0/Data/Help/Makefile.am 2007-03-15 15:43:50.000000000 -0400 +@@ -1 +1,5 @@ +-SUBDIRS = Gnome ++SUBDIRS = ++ ++if GNOME_HELP ++SUBDIRS += Gnome ++endif +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN dasher-4.4.0.orig/configure.in dasher-4.4.0/configure.in +--- dasher-4.4.0.orig/configure.in 2007-03-12 13:27:10.000000000 -0400 ++++ dasher-4.4.0/configure.in 2007-03-15 15:44:36.000000000 -0400 +@@ -348,6 +348,7 @@ AM_CONDITIONAL(DOGTK2, test x$BUILDGTK2 + AM_CONDITIONAL(DOQTE, test x$WITHQTE = xtrue) + AM_CONDITIONAL(GNOME_SPEECH, test x$WITHSPEECH = xtrue) + AM_CONDITIONAL(GNOME_A11Y, test x$WITHA11Y = xtrue) ++AM_CONDITIONAL(GNOME_HELP, test x$WITHGNOME = xtrue) + AM_CONDITIONAL(WITH_GPE, test x$WITHGPE = xtrue) + AM_CONDITIONAL(WITH_MAEMO, test x$WITHMAEMO = xtrue) + AM_CONDITIONAL(WITH_MAEMOFULLSCREEN, test x$WITHMAEMOFULLSCREEN = xtrue) +@@ -401,6 +402,7 @@ if [[ x"$WITHGNOME" = xtrue ]]; then + GNOME_DOC_INIT + else + AM_CONDITIONAL(ENABLE_SK, false) ++AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, false) + fi + + AC_CONFIG_FILES([Makefile diff --git a/app-accessibility/dasher/files/digest-dasher-4.4.0 b/app-accessibility/dasher/files/digest-dasher-4.4.0 new file mode 100644 index 000000000000..40091df00c00 --- /dev/null +++ b/app-accessibility/dasher/files/digest-dasher-4.4.0 @@ -0,0 +1,3 @@ +MD5 e47684793d29904f64370393234cf604 dasher-4.4.0.tar.bz2 6741569 +RMD160 e07ea2fa977f08c83bec209505ee86018ab05729 dasher-4.4.0.tar.bz2 6741569 +SHA256 66fab7ac772fa1cb2fad1fe9183effa73d345fec364942e1dbc8084600d1d73a dasher-4.4.0.tar.bz2 6741569 -- 2.26.2