apply patch to allow compilation against libbeagle, bug #215026

Package-Manager: portage-2.1.5_rc5

4 files changed, 70 insertions, 10 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 82546e05be4f..bacf804f440e 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.180 2008/04/10 23:02:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.181 2008/04/21 21:53:48 eva Exp $
+
+*yelp-2.22.1-r1 (21 Apr 2008)
+
+  21 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/yelp-2.22-with-beagle-0.3.patch, -yelp-2.22.0.ebuild,
+  +yelp-2.22.1-r1.ebuild:
+  apply patch to allow compilation against libbeagle, bug #215026
 
 *yelp-2.22.1 (10 Apr 2008)
 
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index e796e2009e5a..8c2952ce411f 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX yelp-2.22-with-beagle-0.3.patch 1534 RMD160 b35a62b419497c91ab6348259f87c0d30953ad57 SHA1 bee78d88d8d6908100d69ab7e288bc4ab8098fa2 SHA256 7a39a45370849720f5e3f147809c114bfc38743ed56a9caff8325297b701fb0f
 DIST yelp-2.16.2.tar.bz2 858693 RMD160 5c33700f40c6f533406d99f06731f2ffcb31d448 SHA1 d165a6a31eed3f6f2c251b9217299cd5e04ac6e0 SHA256 d3582665af98c8f4fd2f3c62d378360ea4de699bfe9e7213054071462f0650d5
 DIST yelp-2.18.1.tar.bz2 900142 RMD160 8aaf7e5f7f37369fa6822eed615f110babbecd28 SHA1 66e446596c22902290d6614b2d356b64d5bd304c SHA256 3add75de19550015a526a875bca66be81f73910561f1a84493d76d990717d1fa
 DIST yelp-2.20.0.tar.bz2 903106 RMD160 381b71583bc98dcce52a3de19407cc7f7e123ab0 SHA1 29c99793174c24f86ad34373ed5798b534aaac9e SHA256 0f4e1c5f3c4bf8d5109794b4d0a340ed847d49381d42968beb405f14b68c61ed
-DIST yelp-2.22.0.tar.bz2 978777 RMD160 711ae5d819513ad36f5418e8397bc22b11001690 SHA1 afb629ac17478982449ebac56dfe28a113617238 SHA256 211b05ff153efff714b7767c4d5bce068562bf242e5f935a703f54d899e30cd0
 DIST yelp-2.22.1.tar.bz2 995734 RMD160 236acd566b5e0cde0cc1365b1fdae75b2451bcce SHA1 29586dd5415fc6470c43dbd68fdb491f91778231 SHA256 6e990b35d914869dc82ada4790e2215ef71c884f6ccb8acf2e7a1c7d4b6f7614
 EBUILD yelp-2.16.2.ebuild 1078 RMD160 447c272d74b726cb01c8d6d6c5e9ebd1b10cba94 SHA1 5d3ae35ab0cc8533298929b73e63251d42d9b508 SHA256 9ed192e3c97fdfbebf42154c05c495fd7a14956fe6665b2395850c80af4d90b5
 EBUILD yelp-2.18.1.ebuild 1231 RMD160 d004768614c3e5e673b617b2bad5303b10ece780 SHA1 104ce5cf40331a033667bf962805e11f1f86f289 SHA256 a9aa5a617e0f83fb493209db4d9d3109fc53d7d35878bdd8550469f623fb44f1
 EBUILD yelp-2.20.0.ebuild 1626 RMD160 4b100f76cdd30e91e9bdc85d9e817fed68283a14 SHA1 9b2acc031b0fc923f736ce963ae0a195ff8a1c0c SHA256 e00b52b39b0943f903fb6180ec7b69062f71a20cb8db6b004b12c9f3bf629f78
-EBUILD yelp-2.22.0.ebuild 1662 RMD160 da73d50465ab0f4ee4d5f42cfe88719ed91ab186 SHA1 79c8900ce02cb8f03d4d422f3d73a8a593b543c3 SHA256 4bea66dd84b5867f68735ba55a44d417692b33e9f0d1007fb6bd7dc3ca728527
+EBUILD yelp-2.22.1-r1.ebuild 1859 RMD160 65ffb6c2849cf652e73bda334424c383cdcd3701 SHA1 b73f68191426e911c6b314bb59fc11d6f764d3b6 SHA256 15673cedc65a359f54f2642bee65fc8b8eb4c56f7438e91cba70ab32b4661e44
 EBUILD yelp-2.22.1.ebuild 1661 RMD160 7b8c25efd8e7139ffce157d670e8ae191567be9f SHA1 c30e24ebfeea3334e5cfc292eda0b24664f96d5b SHA256 268b8619a1ab40f0056d0a043fe54409575bc0cfa7ca8cfea65dc5e079b5db90
-MISC ChangeLog 20624 RMD160 c99e060946c5bc550d6f49eb768b38deab5bba87 SHA1 4433b431abc41810a84806f5314a0f338aed2678 SHA256 c759d1a1da075a817e45f1e701ab987f0ebb3c4f2e85b9b7a0a462cf0146879b
+MISC ChangeLog 20865 RMD160 0852250eeb1c71b598e3efe81f380d0a732de054 SHA1 dc84bb89e261ba5fddab1578d1a5e3f75b57aa22 SHA256 1119bd7a014697b1ca16f9e2c65570457a5d647a0952da2b329fa6af9cec8e8d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf+nIgACgkQ1fmVwcYIWAbejQCg28VoAPh/zjRrZoYUpTkGfsJo
-luwAnjds0uruRnnyrITgTk7jFGcxt/+1
-=BNtw
+iEYEARECAAYFAkgNDRYACgkQ1fmVwcYIWAaJEwCeI9Ujpxayq5IAU00oCBPxUlz+
+yc4AoKIvSQZlaBtmM+TZtB3WZEyNQprf
+=4C2n
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch b/gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch
new file mode 100644
index 000000000000..d9e99a98d996
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch
@@ -0,0 +1,48 @@
+diff -urN yelp-2.20.0-orig/configure.in yelp-2.20.0/configure.in
+--- yelp-2.20.0-orig/configure.in	2008-03-12 10:17:17.000000000 +0530
++++ yelp-2.20.0/configure.in	2008-03-12 10:19:22.000000000 +0530
+@@ -133,7 +133,12 @@
+ dnl beagle
+ dnl ******
+ 
+-BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4"
++BEAGLE_MODULES=
++if $PKG_CONFIG --exists libbeagle-1.0; then
++	BEAGLE_MODULES="libbeagle-1.0 >= 0.3.0"
++else
++	BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4"
++fi
+ 
+ AC_ARG_WITH([search],
+ 	[AC_HELP_STRING([--with-search=basic|beagle|auto],
+diff -urN yelp-2.20.0-orig/src/yelp-search-parser.c yelp-2.20.0/src/yelp-search-parser.c
+--- yelp-2.20.0-orig/src/yelp-search-parser.c	2008-03-12 10:17:16.000000000 +0530
++++ yelp-2.20.0/src/yelp-search-parser.c	2008-03-12 10:19:54.000000000 +0530
+@@ -304,7 +313,8 @@
+     g_free (check);
+     xmlNewTextChild (parser->root, NULL, BAD_CAST "online1", BAD_CAST split[1]);
+ 
+-    parser->finished = TRUE;
++    if (parser->snippet_request_count == 0)
++      parser->finished = TRUE;
+ 
+ }
+ 
+@@ -357,7 +367,7 @@
+ 
+     const char *xml = beagle_snippet_response_get_snippet (response);
+ 
+-    if (xml == NULL) {
++    if (xml == NULL || strlen (xml) == 0) {
+ 	debug_print (DB_DEBUG, "snippet_response empty\n");
+ 	return;
+     }
+@@ -552,7 +562,7 @@
+ 
+ 	beagle_query_set_max_hits (query, 10000);
+ 	beagle_query_add_text (query, parser->search_terms);
+-	beagle_query_add_source (query, "documentation");
++	beagle_query_add_text (query, "source:documentation OR source:manpages");
+ 
+ 	parser->hits = g_ptr_array_new ();
+ 
diff --git a/gnome-extra/yelp/yelp-2.22.0.ebuild b/gnome-extra/yelp/yelp-2.22.1-r1.ebuild
index 5f51edc6e3a9..7529494404e1 100644
--- a/gnome-extra/yelp/yelp-2.22.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.22.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.0.ebuild,v 1.1 2008/03/23 15:55:49 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r1.ebuild,v 1.1 2008/04/21 21:53:48 eva Exp $
 
-inherit gnome2
+inherit eutils autotools gnome2
 
 DESCRIPTION="Help browser for GNOME"
 HOMEPAGE="http://www.gnome.org/"
@@ -24,7 +24,7 @@ RDEPEND=">=gnome-base/gconf-2
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/glib-2
 	>=dev-libs/dbus-glib-0.71
-	beagle? ( >=app-misc/beagle-0.2.4 )
+	beagle? ( || ( >=dev-libs/libbeagle-0.3.0 =app-misc/beagle-0.2* ) )
 	!xulrunner? ( =www-client/mozilla-firefox-2* )
 	xulrunner? ( =net-libs/xulrunner-1.8* )
 	sys-libs/zlib
@@ -42,6 +42,11 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 src_unpack() {
 	gnome2_src_unpack
 
+	# patch to work with >=libbeagle-0.3, bug #215026
+	epatch "${FILESDIR}"/yelp-2.22-with-beagle-0.3.patch
+
+	AT_M4DIR="${AT_M4DIR} m4" eautoreconf
+
 	# strip stupid options in configure, see bug #196621
 	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
 }