Trivially modify port-to-xulrunner-2 patch for backwards compatibility with xulrunner-1.9, requested by robbat2.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 19 insertions, 14 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 09614a279166..18cf10564286 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.270 2011/11/04 06:02:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.271 2011/11/24 03:49:04 tetromino Exp $
+
+  24 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  yelp-2.30.2-r6.ebuild, -files/yelp-2.30.2-port-to-xulrunner-2-r1.patch,
+  +files/yelp-2.30.2-port-to-xulrunner-2-r2.patch:
+  Trivially modify port-to-xulrunner-2 patch for backwards compatibility with
+  xulrunner-1.9, requested by robbat2.
 
 *yelp-3.2.1 (04 Nov 2011)
 
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 2af332350c91..563de7b622b6 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -8,7 +8,7 @@ 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-r1.patch 7941 RMD160 4c6209c1ec309225b1939d643dc5039b6498958f SHA1 592e2e78c8afdcc27d320657e1213ac6080bcf50 SHA256 47a1b624dd911ee982be2c676f1dcb2064757d7d2059609c9f61a2df49abb846
+AUX yelp-2.30.2-port-to-xulrunner-2-r2.patch 7982 RMD160 30dd6ce4ef79e537915bcfdc7868aa60f2a35330 SHA1 0a6f471fc9638132d7ff76c6e1d68178a2b70597 SHA256 3d251544d4c0c931551bb331a03031cd8f1f1928886fccfbd038be2c611f768d
 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
 AUX yelp-3.0.3-man-compatibility.patch 4226 RMD160 6620b4a546f3be6fa7bde62a3757eafca6a80f9f SHA1 4772bce1e30f14aeb7c5f5ab53bd68a4bb9fb8bd SHA256 9b76f13236170ccbfa24060a18bdfaaad9bfe3490dc42abd9a1dee106f82c1f1
@@ -16,14 +16,14 @@ DIST yelp-2.30.2.tar.bz2 1159521 RMD160 a92fde9f64489c5dee6a249964245b087aab5981
 DIST yelp-3.2.1.tar.xz 855804 RMD160 69a17688daf6303cc2a20d5f144a44dd04d4043c SHA1 2cd1d68b36f7944ab8f840e8beccb8ba0d42d5d5 SHA256 f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d
 EBUILD yelp-2.30.2-r1.ebuild 1655 RMD160 011dd64ea3380ad3406af0bcf8cb2f35b61a39a4 SHA1 53111e9c7396ada0bfab370a0e6c3de755d093cf SHA256 1de6153e89eb37a9609adfbc25f36e4857f916cbde80c987950642352e6ca3b1
 EBUILD yelp-2.30.2-r5.ebuild 2404 RMD160 4123d73d879f07c15a9f48ee0145f8a63fa65dba SHA1 748b326fcc7adfae38925bc0d792bc1de92dff80 SHA256 2816fd8bfdb7335d2c359b0268f15af18de22af3c52cc7e0768665cac2e1377e
-EBUILD yelp-2.30.2-r6.ebuild 2392 RMD160 bf197ba055a5998e7e0a4e5c04dc5bf889d54e2e SHA1 c4c09d7396ea2f23b1cf54aed90fbf0868c23636 SHA256 de53f5837cb8bfe92374d460fcda0cf03e7a81b8ae7df2f96e5c8c31b32c18fe
+EBUILD yelp-2.30.2-r6.ebuild 2385 RMD160 dc7a2cdb5e218f272f6548754774cb4648d2ad58 SHA1 894766a9306c5fd64053cf11b127bd305266e377 SHA256 eda2f0bd5f8c11cc3b2545106da8bf2771ef9db138d6d526eee4eb50a431d694
 EBUILD yelp-3.2.1.ebuild 1466 RMD160 49ae52d2715649aa5b97bcc81275f988c773d18a SHA1 307c81d4c3c2dd84c87d95c7a908c9c2a22f24bf SHA256 698dccbb1aeae44dfc7b1ca50ad1905de56c274f9c50cd4929af00959f846c9e
-MISC ChangeLog 34357 RMD160 9c343cac1a117489db2cd57ef4736c55cfdd6e72 SHA1 1be14851c5167be6f1e97a3a6bd8cdac331eace8 SHA256 1fc72e027ed5064e16d91b1859c6dac9fdbef49101d75ffa0c33b8b4f17246fe
+MISC ChangeLog 34659 RMD160 7d4be57f477cf72e5f1934049a22e27b1c950c1e SHA1 451ece7a854fe57fa98a0635cc40c3eade12ab9c SHA256 0d340c5b0d68b0dff434dfffb502298318f48b8ae77e7a034f32093b8f0e8c32
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6zgAEACgkQdjK8w9WeBnCyXQD/UgUY3XYcY3qOjXPyAzOKeSw0
-qBCON6crCTH0b+c8mZcA/1GQNSR6qmRV5ggXBaX04BzpK5ACQKdxNzpFOeArwDED
-=wkCU
+iF4EAREIAAYFAk7Nvr4ACgkQdjK8w9WeBnBbcQEAhaRPg8/rb9iGeVWEHijRIcGS
+CLxfL0CdD9oW0QrgwQQA+gNNehqXaDQEAq8TRX1E2Y213Q2VHrrASmfnJ55WiNvO
+=gxte
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r1.patch b/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r2.patch
index a4e7df9882ed..95904eae84d3 100644
--- a/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r1.patch
+++ b/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r2.patch
@@ -2,6 +2,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
+Updated to extend lower bound of greVersion in yelp_gecko_init() down to 1.9a
 
 Index: yelp-2.30.2/m4/gecko.m4
 ===================================================================
@@ -230,13 +231,11 @@ Index: yelp-2.30.2/src/yelp-gecko-utils.cpp
 ===================================================================
 --- yelp-2.30.2.orig/src/yelp-gecko-utils.cpp
 +++ yelp-2.30.2/src/yelp-gecko-utils.cpp
-@@ -213,8 +213,8 @@ yelp_gecko_init (void)
- 	nsresult rv;
+@@ -214,7 +214,7 @@ yelp_gecko_init (void)
  #ifdef XPCOM_GLUE
      static const GREVersionRange greVersion = {
--    "1.9a", PR_TRUE,
+     "1.9a", PR_TRUE,
 -    "2", PR_TRUE
-+    "2.0a", PR_TRUE,
 +    "2.0.*", PR_TRUE
      };
      char xpcomLocation[PATH_MAX];
diff --git a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
index 94322dece1c5..3463175cc5b1 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r6.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-r6.ebuild,v 1.2 2011/08/09 18:56:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.3 2011/11/24 03:49:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -25,7 +25,7 @@ RDEPEND=">=gnome-base/gconf-2:2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/dbus-glib-0.71
-	>=net-libs/xulrunner-2.0:1.9
+	net-libs/xulrunner:1.9
 	sys-libs/zlib
 	app-arch/bzip2
 	>=app-text/rarian-0.7
@@ -56,7 +56,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-r1.patch"
+	epatch "${FILESDIR}/${P}-port-to-xulrunner-2-r2.patch"
 
 	# Use g_build_filename to avoid missing slash problem
 	epatch "${FILESDIR}/${P}-missing-slash.patch"