Fix Yelp to work with xulrunner-2.0.x (bug #369787 by Jani Kananen, fix taken from opensuse). Remove broken version as it won't work with any xulrunner in the tree.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

3 files changed, 14 insertions, 4 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index eb60abac1d04..d422b88e0aff 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.260 2011/04/20 13:41:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.261 2011/06/03 19:16:36 pacho Exp $
+
+*yelp-2.30.2-r4 (03 Jun 2011)
+
+  03 Jun 2011; Pacho Ramos <pacho@gentoo.org> -yelp-2.30.2-r3.ebuild,
+  +yelp-2.30.2-r4.ebuild, +files/yelp-2.30.2-port-to-xulrunner-2-r1.patch,
+  -files/yelp-2.30.2-port-to-xulrunner-2.patch:
+  Fix Yelp to work with xulrunner-2.0.x (bug #369787 by Jani Kananen, fix taken
+  from opensuse). Remove broken version as it won't work with any xulrunner in
+  the tree.
 
   20 Apr 2011; Pacho Ramos <pacho@gentoo.org> -yelp-2.30.2-r2.ebuild,
   yelp-2.30.2-r3.ebuild:
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2.patch b/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r1.patch
index d3b39afa37f2..a4e7df9882ed 100644
--- a/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2.patch
+++ b/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r1.patch
@@ -1,6 +1,7 @@
 https://bugs.gentoo.org/show_bug.cgi?id=330847
 
 Patch by the OpenSUSE folks, found by pacho.
+Updated with https://build.opensuse.org/request/show/69983
 
 Index: yelp-2.30.2/m4/gecko.m4
 ===================================================================
@@ -236,7 +237,7 @@ Index: yelp-2.30.2/src/yelp-gecko-utils.cpp
 -    "1.9a", PR_TRUE,
 -    "2", PR_TRUE
 +    "2.0a", PR_TRUE,
-+    "2.0", PR_TRUE
++    "2.0.*", PR_TRUE
      };
      char xpcomLocation[PATH_MAX];
      rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation));
diff --git a/gnome-extra/yelp/yelp-2.30.2-r3.ebuild b/gnome-extra/yelp/yelp-2.30.2-r4.ebuild
index 1ee340df706e..072afc984131 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r3.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r3.ebuild,v 1.2 2011/04/20 13:41:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r4.ebuild,v 1.1 2011/06/03 19:16:36 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -55,7 +55,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
 
 	# Fix build with xulrunner-2.0 (we really need to get rid of this package)
-	epatch "${FILESDIR}/${P}-port-to-xulrunner-2.patch"
+	epatch "${FILESDIR}/${P}-port-to-xulrunner-2-r1.patch"
 
 	# Use g_build_filename to avoid missing slash problem
 	epatch "${FILESDIR}/${P}-missing-slash.patch"