Add patch to fix mozilla-js.pc to have the correct path. Changes no code, unbreaks a lot of apps (like bug 275318), and will not break anything. Straight to stable! Muahahaha. (arch teams don't really have anything to do here)

Package-Manager: portage-2.2_rc33/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 42 insertions, 14 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index b9b4f23aa455..de7321c21bac 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,16 @@
 # 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.213 2009/06/26 00:23:12 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.214 2009/06/29 16:42:04 nirbheek Exp $
+
+*xulrunner-1.9.0.11-r1 (29 Jun 2009)
+
+  29 Jun 2009; <nirbheek@gentoo.org>
+  +files/066-fix-includedir-mozilla-js.patch, -xulrunner-1.9.0.11.ebuild,
+  +xulrunner-1.9.0.11-r1.ebuild:
+  Add patch to fix mozilla-js.pc to have the correct path. Changes no code,
+  unbreaks a lot of apps (like bug 275318), and will not break anything.
+  Straight to stable! Muahahaha. (arch teams don't really have anything to
+  do here)
 
   26 Jun 2009; Richard Freeman <rich0@gentoo.org> xulrunner-1.9.0.11.ebuild:
   amd64 stable - 273918
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index d39c893b65d2..8f30ac15b721 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036fccac1a7bb0 SHA1 9a1a09ee9bdca8ab9aeec6408baf207da9abe88a SHA256 069f6b1a43662e417e7f0194ceb039941c209409f8fb788914f862595cdf52f4
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73
 DIST xulrunner-1.8.1.19-source.tar.bz2 38110248 RMD160 2b742243c6370a2790f48d2ceae2be756b4737ce SHA1 fb1b85088000142e24609d5ab9e6e483a82f8917 SHA256 3c1873b3e6c660acdae9e102391bbc64274cea3ed6238d9d693ab09fcf2b53ee
@@ -9,13 +7,6 @@ DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea6608
 DIST xulrunner-1.9.0.11.tar.bz2 34209785 RMD160 63ace56728ceac5d54b8613c842d69791a87be3d SHA1 9e64464303eef215c11793ac1c096abac58215f6 SHA256 142aa222bbf800867f6301f05ca8c158edc17bfb3ad11c73c38a57ca7da3c5a2
 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.ebuild 4713 RMD160 58910de767a37cb6f940869bc62b9de7c00f6666 SHA1 74cb8f3d8e559a005d40f0593a758370eb4bfd3f SHA256 27191aaf126ccb6cf1c6122e6e0b514eeb536f295092593edaf85d4feac6cdea
-MISC ChangeLog 27233 RMD160 125162115871f493e6ddbd2beee96beacb72f9e4 SHA1 cb94334e53cf495989206e2d4fa3332e61f10d71 SHA256 b8d66c718fda5d35742d5f8d290fadccc53db8c4dff6037ba65a3b6ef326c3c8
+EBUILD xulrunner-1.9.0.11-r1.ebuild 4829 RMD160 bab59a48bda5b5e98d4353309bf8d5c777374734 SHA1 9d3f2170975d30c9356a6f47d81c7e8a540ac7e3 SHA256 ebc9495cdeac42cca8d288ac8d8771732e36e5ef1e561e4860e271d2018fe750
+MISC ChangeLog 27654 RMD160 b408bd62199b08352a4364553f7994a8d1d0c7a8 SHA1 8f90b531ea411655d0329b906a2f99afb492a0ea SHA256 d195f8cb18d42a453e4c48be01ccbaffa289470018c7dd981667d49cb00972e9
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpEFP0ACgkQG4/rWKZmVWl90gCghtcfymHoeP9A+XtJmIA2VTcv
-TAUAoM+zZ/+/0woYXwcDO1LpECz5nvCS
-=laBZ
------END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch b/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch
new file mode 100644
index 000000000000..490042730cd9
--- /dev/null
+++ b/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch
@@ -0,0 +1,24 @@
+mozjs stuff is actually in /unstable not in /stable
+
+Causes bugs like http://bugs.gentoo.org/275318
+
+Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=500645
+
+Will likely be fixed in 1.9.2
+
+---
+--- xulrunner/installer/mozilla-js.pc.in	2009-06-26 08:37:34.458635913 -0500
++++ xulrunner/installer/mozilla-js.pc.in	2009-06-26 08:38:13.623656097 -0500
+@@ -1,10 +1,11 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
++includetypes=unstable
+ 
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir}/${includetypes} -DXP_UNIX -DJS_THREADSAFE
diff --git a/net-libs/xulrunner/xulrunner-1.9.0.11.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild
index e4abcbec4a80..db23b5e0daa5 100644
--- a/net-libs/xulrunner/xulrunner-1.9.0.11.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.0.11-r1.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.0.11.ebuild,v 1.6 2009/06/26 00:23:12 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild,v 1.1 2009/06/29 16:42:04 nirbheek Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
@@ -52,6 +52,9 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patch
 
+	# Bad mozilla-js.pc, causes stuff like bug 275318
+	epatch "${FILESDIR}/066-fix-includedir-mozilla-js.patch"
+
 	eautoreconf || die "failed  running eautoreconf"
 
 	# We need to re-patch this because autoreconf overwrites it