Bump to 3.5.1 (aka 1.9.1-r1) + new patch tarball

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

5 files changed, 20 insertions, 59 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index a820abc58d4b..61b5b4a4f6bc 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,13 @@
 # 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.219 2009/07/07 15:03:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.220 2009/07/21 14:01:40 nirbheek Exp $
+
+*xulrunner-1.9.1-r1 (21 Jul 2009)
+
+  21 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -files/066-fix-includedir-mozilla-js.patch, -xulrunner-1.9.1.ebuild,
+  -files/067-force-bundled-ply.patch, +xulrunner-1.9.1-r1.ebuild:
+  Bump to 3.5.1 (aka 1.9.1-r1) + new patch tarball
 
   07 Jul 2009; <nirbheek@gentoo.org> +files/xulrunner-1.8-gcc-4.4.patch,
   xulrunner-1.8.1.19.ebuild:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 81f6c1f26cf5..4bfc8738c331 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,17 +1,15 @@
-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-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a4e5 SHA1 741a8679bb6d65d83dfdc1ea0cd277c08b3bcc7e SHA256 2bb5b927e11307daf14b4cdab381fba27c6fcb0ba8631e7952d38821282e2c6f
 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 firefox-3.5.1-source.tar.bz2 46438473 RMD160 a7fe7bba679160b1b6c995acbc1cb69b4dcad334 SHA1 8659dd873e8a82a9f39fcb1f0add8afb39cb7274 SHA256 935a84aa07e40e342e178c31287cfa7d314db882b23997bffc220222f0b5e883
 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
 DIST xulrunner-1.9.0.10-patches-0.1.tar.bz2 7077 RMD160 73612f1b619fef5d02e8c8f8318afe192e435e42 SHA1 8a48e53951216c330d4908def93a5c0201f5a890 SHA256 bc0c0d26258bc17ffa5cd513089fe94395ff8f6c17023cd363fac30cdd675410
 DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea660870a8c096 SHA1 926d9042557e2d767db91b1d183327713fb090d3 SHA256 fe4091f4de50278567b4e26effea66a998dd41f455077e1e37cff8b3417a8f34
 DIST xulrunner-1.9.0.11.tar.bz2 34209785 RMD160 63ace56728ceac5d54b8613c842d69791a87be3d SHA1 9e64464303eef215c11793ac1c096abac58215f6 SHA256 142aa222bbf800867f6301f05ca8c158edc17bfb3ad11c73c38a57ca7da3c5a2
-DIST xulrunner-1.9.1-patches-0.1.tar.bz2 6077 RMD160 8837d4c7a0440b6e2d4e12316aa243bd73334dcf SHA1 e8fc552acb5fa981c64d8e9d9b03ac893f18b253 SHA256 61b35e55889c16633684e6b9ac645a9a427c21931925137261feb576a781a404
+DIST xulrunner-1.9.1-patches-0.2.tar.bz2 6489 RMD160 2515a20cbee831d070f6d60f04f09841fb34554f SHA1 d3a7d3dc6e230c478511fe9a4217966fde679a30 SHA256 84d997e226935012664574c5fa7d8730e3675d5d6c8e4c9dc08b2f90e4994ae0
 EBUILD xulrunner-1.8.1.19.ebuild 5112 RMD160 ae56c846a18f9edd396aa18169619250a2c3d293 SHA1 af67a48b3c7690d996aef1caf0ce71a4bab1d4d6 SHA256 cbef00c1ae6f23becdad8b9754ed7d4a034a152e17e87334ac4f7dce483dc385
 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 6754 RMD160 6a65ee94af4e77eed2ab6b80c0a45fc607a9f3eb SHA1 e9ecbc7ac80490ca6da43652d383a738305bcada SHA256 d843812e7389a251f8596a679e457861d23fdc8199eb4665d849114a15b4bfcf
-MISC ChangeLog 28488 RMD160 3e2bfb7f629e6115a5fd7a6212d86d0d752be94a SHA1 a1a88e0cf810d2b775606d760444a6abca96df45 SHA256 e2b33d6a768f6fd231a1325ad94710ff5fecb74e310e0eb010f8bea174f5997d
+EBUILD xulrunner-1.9.1-r1.ebuild 6560 RMD160 fbe1531ef8b5d708a223aafe997698a2d2f05ccf SHA1 e2ef18545deacc69c882e61a65e918bc672909b4 SHA256 3c668cec862f878e21745d9ce6a2745e0a4475ed52e625f7ae469873ed7fd2d1
+MISC ChangeLog 28766 RMD160 5e6f4ff23635e14900666c5b9779825e3390f982 SHA1 379cfef666fd4d1f112def90ac3d79c55b1893d8 SHA256 0bd07f50c9f489b0aa56f409e0f4dd1e3dfd7d99d14e316c6a69c4c06056bb3d
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch b/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch
deleted file mode 100644
index 490042730cd9..000000000000
--- a/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/067-force-bundled-ply.patch b/net-libs/xulrunner/files/067-force-bundled-ply.patch
deleted file mode 100644
index 6382ae70efa4..000000000000
--- a/net-libs/xulrunner/files/067-force-bundled-ply.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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-r1.ebuild
index 0a01e5b1838d..9017fdc6c614 100644
--- a/net-libs/xulrunner/xulrunner-1.9.1.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.1-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.1.ebuild,v 1.5 2009/07/02 06:17:02 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1-r1.ebuild,v 1.1 2009/07/21 14:01:40 nirbheek Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -9,9 +9,9 @@ inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-p
 
 MY_PV="${PV/_beta/b}" # Handle betas
 MY_PV="${PV/_/}" # Handle rc1, rc2 etc
-MY_PV="${MY_PV/1.9.1/3.5}"
+MY_PV="${MY_PV/1.9.1/3.5.1}"
 MAJ_PV="${PV/_*/}"
-PATCH="${PN}-${MAJ_PV}-patches-0.1"
+PATCH="${PN}-${MAJ_PV}-patches-0.2"
 
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
@@ -64,9 +64,6 @@ 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"
@@ -74,17 +71,16 @@ src_prepare() {
 	sed -e "s/@PV@/${MAJ_PV}/" -i "${S}/config/autoconf.mk.in" \
 		|| die "\${MAJ_PV} sed failed!"
 
-	# enable gnomebreakpad by default
-	sed -i -e 's/GNOME_DISABLE_CRASH_DIALOG=1/GNOME_DISABLE_CRASH_DIALOG=0/g' \
-		"${S}/build/unix/run-mozilla.sh"
+	# Enable gnomebreakpad
+	if use debug; then
+		sed -i -e 's/GNOME_DISABLE_CRASH_DIALOG=1/GNOME_DISABLE_CRASH_DIALOG=0/g' \
+			"${S}/build/unix/run-mozilla.sh"
+	fi
 
 	eautoreconf
 
 	cd js/src
 	eautoreconf
-
-	# We need to re-patch this because autoreconf overwrites it
-#	epatch "${FILESDIR}"/patch/000_flex-configure-LANG.patch
 }
 
 src_configure() {