Fix system myspell dictionary dectection, add support for ppc

(Portage version: 2.1.10.3/cvs/Linux x86_64)

3 files changed, 11 insertions, 31 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index fe2231b3ff74..c4d639a0aca6 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.77 2011/06/26 18:06:45 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.78 2011/06/27 00:42:11 anarchy Exp $
+
+*firefox-5.0-r1 (27 Jun 2011)
+
+  27 Jun 2011; Jory A. Pratt <anarchy@gentoo.org> -firefox-5.0.ebuild,
+  +firefox-5.0-r1.ebuild, -files/firefox-5.0-fix-title.patch:
+  Fix system myspell dictionary dectection, add support for ppc
 
   26 Jun 2011; Jory A. Pratt <anarchy@gentoo.org> firefox-5.0.ebuild:
   Workaround misc hardened issues
diff --git a/www-client/firefox/files/firefox-5.0-fix-title.patch b/www-client/firefox/files/firefox-5.0-fix-title.patch
deleted file mode 100644
index 01baa9597498..000000000000
--- a/www-client/firefox/files/firefox-5.0-fix-title.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/372843
-
---- mozilla-release/browser/base/Makefile.in
-+++ mozilla-release/browser/base/Makefile.in
-@@ -62,7 +62,7 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--PRE_RELEASE_SUFFIX := ""
-+PRE_RELEASE_SUFFIX :=
- 
- DEFINES += \
- 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
---- mozilla-release/browser/installer/windows/Makefile.in
-+++ mozilla-release/browser/installer/windows/Makefile.in
-@@ -51,7 +51,7 @@
- SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
- APP_VERSION := $(shell cat $(srcdir)/../../config/version.txt)
- DEFINES += -DAPP_VERSION=$(APP_VERSION)
--PRE_RELEASE_SUFFIX := ""
-+PRE_RELEASE_SUFFIX :=
- DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
- 
- INSTALLER_FILES = \
-
diff --git a/www-client/firefox/firefox-5.0.ebuild b/www-client/firefox/firefox-5.0-r1.ebuild
index 7600bc6f47dc..6b3d50feecf2 100644
--- a/www-client/firefox/firefox-5.0.ebuild
+++ b/www-client/firefox/firefox-5.0-r1.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/www-client/firefox/firefox-5.0.ebuild,v 1.4 2011/06/26 18:06:45 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0-r1.ebuild,v 1.1 2011/06/27 00:42:11 anarchy Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -15,7 +15,7 @@ FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
 FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
 FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
 CHANGESET="e56ecd8b3a68"
-PATCH="${PN}-5.0-patches-0.4"
+PATCH="${PN}-5.0-patches-0.5"
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
@@ -39,6 +39,7 @@ RDEPEND="
 	gconf? ( >=gnome-base/gconf-1.2.1:2 )
 	>=dev-libs/glib-2.26
 	media-libs/libpng[apng]
+	dev-libs/libffi
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
 	webm? ( media-libs/libvpx
 		media-libs/alsa-lib )"
@@ -156,6 +157,7 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our patches
+	EPATCH_EXCLUDE="5001_use_system_libffi.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
@@ -185,9 +187,6 @@ src_prepare() {
 		-i "${S}"/nsprpub/configure{.in,} \
 		|| die
 
-	# https://bugs.gentoo.org/372843
-	epatch "${FILESDIR}/${P}-fix-title.patch"
-
 	eautoreconf
 
 	cd js/src