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.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 20 insertions, 10 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/Manifest b/gnome-extra/yelp/Manifest
index d6523bcaa7f5..f436172857ff 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -8,18 +8,18 @@ AUX yelp-2.30.1-open-link.patch 1364 RMD160 341a95d078d260d45baafb3f9518b5c760c6
 AUX yelp-2.30.2-freeze-move.patch 3504 RMD160 7e1202134f60a1f0465a8b44ae6473b9b8a4b084 SHA1 0faf850eaebc4a4a7ba1b79021662cec7e02d395 SHA256 8c0c6bd3b730de1a372ecc74373bc7ac1607ed668f48764250fd3c9e36998806
 AUX yelp-2.30.2-html-print.patch 1332 RMD160 5559e82155d5a0263917999addc56f0420ee48c7 SHA1 57ed22d46080f96a116909514d101782a7e04538 SHA256 5ca3cbd977d766744216c6b0f30e03de2d347bac97bdac6d54800dc179ebbbb1
 AUX yelp-2.30.2-missing-slash.patch 1694 RMD160 cf528b134ce1ebf988a65e5dfd23c43574324b04 SHA1 02c71063428a01ea9020abea22efe62f9ef55fe1 SHA256 1f7e55ba8fd0788942321fe3f0b0c68e0aede467e03464d5cc96e928b45144ab
-AUX yelp-2.30.2-port-to-xulrunner-2.patch 7880 RMD160 85128ebe4f508174309eed0f480d61137f1fead2 SHA1 0db26d8097bf766de7b15596717413fdf03f2aed SHA256 9842c26db1d9aec1bd73cab100e3a061f340e36994806404765607f377d4ccb2
+AUX yelp-2.30.2-port-to-xulrunner-2-r1.patch 7941 RMD160 4c6209c1ec309225b1939d643dc5039b6498958f SHA1 592e2e78c8afdcc27d320657e1213ac6080bcf50 SHA256 47a1b624dd911ee982be2c676f1dcb2064757d7d2059609c9f61a2df49abb846
 AUX yelp-2.30.2-print-crash.patch 1528 RMD160 9d3d298d5a1f8652f21b712b36793e3da37244df SHA1 f1a583b03d39ee2dd5691929ecd6b4d89e10a942 SHA256 e09129d48fae34be923be82e3c880c14ff6ad79112c1fbc8760b431caf501dd3
 AUX yelp-2.30.2-uri-handler.patch 860 RMD160 4b9d9bf1d2e666094e2b287d54bd99c952c179c0 SHA1 1e034f014f8d7976505a75c2b90b578dc53b0454 SHA256 91e05fc3c5eb36c12e28cd7d2c058baf7395105f56826e1012a50e0b7882af65
 DIST yelp-2.30.2.tar.bz2 1159521 RMD160 a92fde9f64489c5dee6a249964245b087aab5981 SHA1 b36d36449ff19844a429b4e2bd5eaad0a7537281 SHA256 5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165
 EBUILD yelp-2.30.2-r1.ebuild 1655 RMD160 011dd64ea3380ad3406af0bcf8cb2f35b61a39a4 SHA1 53111e9c7396ada0bfab370a0e6c3de755d093cf SHA256 1de6153e89eb37a9609adfbc25f36e4857f916cbde80c987950642352e6ca3b1
-EBUILD yelp-2.30.2-r3.ebuild 2241 RMD160 0a76a9e909c2f24eff92874a96207f2316e4e9fb SHA1 9902f28286418e05473c67131920f8171b8c211e SHA256 01fc25b812edfdf55e2a14fbe4e5b2f4d46dd0f5212b23df5ae95cfb3690a49f
-MISC ChangeLog 32445 RMD160 d4cbefdb12af9dff14586c356b8a3d435d63859c SHA1 a4958ad220ac045788063662119514f86b058406 SHA256 50c94dd0d3200004f0baca8df2c8142e4596a4f46d1ba31dab36366e8d3813eb
+EBUILD yelp-2.30.2-r4.ebuild 2244 RMD160 b6dd4defb72200917cd58dd05f8f56ed9147e790 SHA1 e13769e18d06443cc2b54f3cc31048fd5a218d35 SHA256 d835651e321394f5f6e0f784cfd5aae91603fd593e78f4600b35d32415d10d17
+MISC ChangeLog 32841 RMD160 e04d29a9eed9ee1e1b9d89e71cf3f9b8a50b9ae5 SHA1 274670bfb5f2a4f5b8d048eed6dca2d15243707b SHA256 476f2de94c074b3d84541e3bb730722e77e84147638d17e203500c7396f6dac4
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2u4oMACgkQCaWpQKGI+9SVewCfePDDgNyOx/8onYmVOjclv/xs
-EpEAnizwEMpM8S265lyrSlD1cUjSjefC
-=0ZMD
+iEYEARECAAYFAk3pMxoACgkQCaWpQKGI+9QexgCeLkV9pn7Ib8VhTlAeOGI5usdK
+MlAAn0LVVwKx6B0PgkurU3e4LdDX+3Mw
+=x9wP
 -----END PGP SIGNATURE-----
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"