Added patch to fix compilation if USE=-gnome and gnome-doc-utils is not installed...

Package-Manager: portage-2.1.2-r5

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 4dc40927566c9d4e8c9f048abd23a2865f279c82..fae2c9ed42947bb6cbfc58ad2e70c77f7157daa9 100644 (file)
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,11 @@
 # 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.88 2007/02/04 09:02:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.89 2007/02/06 01:38:51 leonardop Exp $
+
+  06 Feb 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/dasher-4.2.2-gnome_help.patch, dasher-4.2.2.ebuild:
+  Added patch to fix compilation when USE=-gnome and gnome-doc-utils is not
+  installed in the system (bug #165154)..
 
   04 Feb 2007; Markus Rothe <corsair@gentoo.org> dasher-4.2.2.ebuild:
   Stable on ppc64; bug #164978

diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 055ac6d3e9ea2c7963a05c9cb53137aba8c2c619..e2560f7d7f1eb44b7c7f17dfa26f3f1bbf9d7d4c 100644 (file)
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -14,6 +14,10 @@ AUX dasher-4.2.1-sk_conditional_fix.patch 437 RMD160 0eb8104a74eed147196a12d993c
 MD5 aab1af065dad76f1a40e4d1b447f2db6 files/dasher-4.2.1-sk_conditional_fix.patch 437
 RMD160 0eb8104a74eed147196a12d993caaa498b9b27cf files/dasher-4.2.1-sk_conditional_fix.patch 437
 SHA256 74e70a193486b5d777df9105fc613b81884e7bb78d6c48ad0c2027024afe26f2 files/dasher-4.2.1-sk_conditional_fix.patch 437
+AUX dasher-4.2.2-gnome_help.patch 1178 RMD160 eb8e4a279c5b22099eeb0999eafb9cfe1b76118c SHA1 0c60d48b5b24fe8ad68220c93460e323b22c74e5 SHA256 8f4c127aba50729c21ab23083ee98c53dc6d4d876e976e9dd3a79265c36ebeaf
+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
 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
@@ -25,14 +29,14 @@ EBUILD dasher-4.2.1.ebuild 1796 RMD160 9057313e974a4934a93c865d7dd87e6fbc95a095
 MD5 a822847b03e5e12c5d7a61c49c2a7337 dasher-4.2.1.ebuild 1796
 RMD160 9057313e974a4934a93c865d7dd87e6fbc95a095 dasher-4.2.1.ebuild 1796
 SHA256 15485452818879a525888e18d21dccdb16892c69e2d2d54182ca83d24a8f3223 dasher-4.2.1.ebuild 1796
-EBUILD dasher-4.2.2.ebuild 1805 RMD160 00cf6cfab9ad90ffaa735b937e359d211159f392 SHA1 e837b9157ee4c989e61467dd9e47f24ce5797910 SHA256 7715ba6818d35a90a85167a1f89ebf5db1c2561a4d32e938813085799f2ede7b
-MD5 b4559295aa07d950cf5d76390198de9a dasher-4.2.2.ebuild 1805
-RMD160 00cf6cfab9ad90ffaa735b937e359d211159f392 dasher-4.2.2.ebuild 1805
-SHA256 7715ba6818d35a90a85167a1f89ebf5db1c2561a4d32e938813085799f2ede7b dasher-4.2.2.ebuild 1805
-MISC ChangeLog 10941 RMD160 3144dcce0d560c8d4ad4c99661d7996ebce26ff9 SHA1 86fe9b5823a76bb4ff0456406c7108dfb038c9f1 SHA256 6297737d6ce7ecf96baffbaa6f18da33ae44068aec8688932542f1cb96d865df
-MD5 ecb69de205aa6e9357d9957d3435e2db ChangeLog 10941
-RMD160 3144dcce0d560c8d4ad4c99661d7996ebce26ff9 ChangeLog 10941
-SHA256 6297737d6ce7ecf96baffbaa6f18da33ae44068aec8688932542f1cb96d865df ChangeLog 10941
+EBUILD dasher-4.2.2.ebuild 1826 RMD160 e6e1a41d501198ebd5e3f4e499453d8fed6b8386 SHA1 035d1acfd18928dcccaa4d1d2623135ca5ebb8f5 SHA256 63dbe8ae37f6059f17433ae92d40fc3ae1965ad0748601d714dbbdbb3f2b9938
+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
 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
 MD5 76d666e6399f7768a17fe572e9a3096e metadata.xml 718
 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 metadata.xml 718

diff --git a/app-accessibility/dasher/dasher-4.2.2.ebuild b/app-accessibility/dasher/dasher-4.2.2.ebuild
index 1b39b3dfc5def7209c4f75ea7b0e66817833db4c..835a12be6a48b394c4e3bedfa820d0086beb6579 100644 (file)
--- a/app-accessibility/dasher/dasher-4.2.2.ebuild
+++ b/app-accessibility/dasher/dasher-4.2.2.ebuild
@@ -1,7 +1,8 @@
 # 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.2.2.ebuild,v 1.7 2007/02/04 09:02:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.2.2.ebuild,v 1.8 2007/02/06 01:38:51 leonardop Exp $
 
+WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.8"
 
 inherit autotools eutils gnome2
@@ -65,10 +66,10 @@ src_unpack() {
 
        sed -i -e 's:gtk-update-icon-cache:true:' ./Data/Makefile.am
 
-       epatch "${FILESDIR}"/${PN}-4.1.10-as-needed.patch
+       epatch "${FILESDIR}/${PN}-4.1.10-as-needed.patch"
 
-       # Patch to fix compilation when USE=-gnome is used
-       epatch "${FILESDIR}"/${PN}-4.2.1-sk_conditional_fix.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.2.2-gnome_help.patch b/app-accessibility/dasher/files/dasher-4.2.2-gnome_help.patch
new file mode 100644 (file)
index 0000000..7be9882
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.2.2-gnome_help.patch
@@ -0,0 +1,32 @@
+diff -NurdB dasher-4.2.2/Data/Help/Makefile.am dasher-4.2.2-patched/Data/Help/Makefile.am
+--- dasher-4.2.2/Data/Help/Makefile.am 2006-11-20 10:22:57.000000000 -0500
++++ dasher-4.2.2-patched/Data/Help/Makefile.am 2007-02-05 19:50:42.000000000 -0500
+@@ -1 +1,5 @@
+-SUBDIRS = Gnome
++SUBDIRS =
++
++if GNOME_HELP
++SUBDIRS += Gnome
++endif
+diff -NurdB dasher-4.2.2/configure.in dasher-4.2.2-patched/configure.in
+--- dasher-4.2.2/configure.in  2006-11-20 10:22:30.000000000 -0500
++++ dasher-4.2.2-patched/configure.in  2007-02-05 19:50:25.000000000 -0500
+@@ -293,6 +293,7 @@
+ 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)
+@@ -325,7 +326,9 @@
+ AC_SUBST(GTK2BUILD_LIBS)
+ 
+ if [[ x"$WITHGNOME" = xtrue ]]; then
+-GNOME_DOC_INIT
++      GNOME_DOC_INIT
++else
++      AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
+ fi
+ 
+ AC_CONFIG_FILES([Makefile