Fix building when dev-python/ply is installed, bug 276018. Patch thanks to Hector Martin

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 29 insertions, 4 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index d4d8ff10dcff..7ccd66f70842 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.217 2009/06/30 19:45:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.218 2009/07/02 06:17:02 nirbheek Exp $
+
+  02 Jul 2009; <nirbheek@gentoo.org> +files/067-force-bundled-ply.patch,
+  xulrunner-1.9.1.ebuild:
+  Fix building when dev-python/ply is installed, bug 276018
+  Patch thanks to Hector Martin
 
   30 Jun 2009; <nirbheek@gentoo.org> xulrunner-1.9.1.ebuild:
   Add warning about possible issue with xpcom and nss
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index ad459ca64720..c6832fcdfe80 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,4 +1,5 @@
 AUX 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036fccac1a7bb0 SHA1 9a1a09ee9bdca8ab9aeec6408baf207da9abe88a SHA256 069f6b1a43662e417e7f0194ceb039941c209409f8fb788914f862595cdf52f4
+AUX 067-force-bundled-ply.patch 560 RMD160 ed07a71c278e80546781387067435b779f3cc2d8 SHA1 040fbfa00135454b51dac33878bf787db5d1bbbe SHA256 a11818c09ab074145b3722bb53095f52d73a8ce84b14a696db01bd2d1eae4090
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST firefox-3.5-source.tar.bz2 46444013 RMD160 00e862a86fad716b5c9b8c6ad25daa65e245a421 SHA1 acf223f2ba3b5e601f8832a3870a5d9034ac8d10 SHA256 15f80f5cc83ebcd559975019837d12f8cda0b7130337d352410195689915b23a
 DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73
@@ -10,6 +11,6 @@ DIST xulrunner-1.9.1-patches-0.1.tar.bz2 6077 RMD160 8837d4c7a0440b6e2d4e12316aa
 EBUILD xulrunner-1.8.1.19.ebuild 5022 RMD160 22bdb064b24d37257aebb27335243f2a6703e7c4 SHA1 52870fb58e61cd22d8b5cd459a7002201125d64d SHA256 7888b47136eab95aee6da57942b653df474732ce7c9ef1b73842d2900a9b10c9
 EBUILD xulrunner-1.9.0.10.ebuild 4704 RMD160 4c9c1bd079a72df2da35ce654d42b4a8ef230a3f SHA1 59758a181a9b94fce9cf7b5f6fa11af77d56b2c1 SHA256 c88b9f9a01e10ecae1fb072c320771384f56f772e9c6cce8cf7e89b438aae7df
 EBUILD xulrunner-1.9.0.11-r1.ebuild 4829 RMD160 bab59a48bda5b5e98d4353309bf8d5c777374734 SHA1 9d3f2170975d30c9356a6f47d81c7e8a540ac7e3 SHA256 ebc9495cdeac42cca8d288ac8d8771732e36e5ef1e561e4860e271d2018fe750
-EBUILD xulrunner-1.9.1.ebuild 6661 RMD160 89b20645beb67b35b4949cddfd6c1c72357b6e69 SHA1 1c18bf06d5204f6d9d9bb39402b6639c7ee4e5d7 SHA256 1cf8789d1e877d6d6010387c9f9977ea5828d819d93f5c084ab7b3e4b338208d
-MISC ChangeLog 28116 RMD160 2b8d58fd130f81a5dffe0293fce4aa4f465b1368 SHA1 5d8d44de2cceb494a04b34e67b8b48f57b4f7967 SHA256 50ef48a3a05b012f981795c68d754956c61e90ccd7c52fbf1022a4c863ea5466
+EBUILD xulrunner-1.9.1.ebuild 6754 RMD160 6a65ee94af4e77eed2ab6b80c0a45fc607a9f3eb SHA1 e9ecbc7ac80490ca6da43652d383a738305bcada SHA256 d843812e7389a251f8596a679e457861d23fdc8199eb4665d849114a15b4bfcf
+MISC ChangeLog 28308 RMD160 a27b14569eeb59a0fca982903e6633138743dcef SHA1 2d7238fac5e46b28ef315a36e79512876ae680b0 SHA256 ef34c5dcc40ac3b15007fa6be4097d52c356c6e3fe2bbd04185e8269f062c593
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/067-force-bundled-ply.patch b/net-libs/xulrunner/files/067-force-bundled-ply.patch
new file mode 100644
index 000000000000..6382ae70efa4
--- /dev/null
+++ b/net-libs/xulrunner/files/067-force-bundled-ply.patch
@@ -0,0 +1,16 @@
+# Patch submitted to force ply support bundled with source.
+# Hector Martin <hector@marcansoft.com>
+# Further info can be found at http://bugs.gentoo.org/show_bug.cgi?id=276018
+
+--- mozilla-1.9.1/xpcom/idl-parser/xpidl.py
++++ mozilla-1.9.1/xpcom/idl-parser/xpidl.py
+@@ -42,7 +42,7 @@
+ 
+ import sys, os.path, re
+ 
+-sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
++sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
+                              'other-licenses', 'ply'))
+ from ply import lex, yacc
+ 
+
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.ebuild
index aa8dd89f019c..0a01e5b1838d 100644
--- a/net-libs/xulrunner/xulrunner-1.9.1.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.ebuild,v 1.4 2009/06/30 19:45:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.ebuild,v 1.5 2009/07/02 06:17:02 nirbheek Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -64,6 +64,9 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
+	# bug 276018 upstreamed, remove in 1.9.2
+	epatch "${FILESDIR}/067-force-bundled-ply.patch"
+
 	# Same as in config/autoconf.mk.in
 	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
 	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"