New release, GLSA105396. Use libart rather than cairo, bug #106713. Update

gtk2 and xft code from upstream to fix various freetype-2.1.9 issues
including printing non-latin. Same for the libart renderer code. Update gcc4
patches to allow building on gcc4.

Package-Manager: portage-2.0.52-r1

9 files changed, 574 insertions, 44 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index c7f38e34d2ce..836b12a54801 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.80 2005/09/17 23:02:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.81 2005/09/25 23:31:47 azarah Exp $
+
+*mozilla-firefox-1.0.7 (25 Sep 2005)
+
+  25 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/mozilla-1.7.6-gcc4.patch, +files/mozilla-1.7.8-amd64.patch,
+  +files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch,
+  +files/mozilla-1.7.12-libart-freetype.patch,
+  +mozilla-firefox-1.0.7.ebuild:
+  New release, GLSA105396. Use libart rather than cairo, bug #106713. Update
+  gtk2 and xft code from upstream to fix various freetype-2.1.9 issues
+  including printing non-latin. Same for the libart renderer code. Update gcc4
+  patches to allow building on gcc4.
 
   17 Sep 2005; Jason Wever <weeve@gentoo.org>
   mozilla-firefox-1.0.6-r7.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index b28b82492289..e4e23f5e814f 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,31 +1,47 @@
-MD5 ca58f331ec08b2b1cd3518721a7a6087 ChangeLog 30653
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 27212c3bfc3d15dc4bb42454380c533b mozilla-firefox-1.0.6-r5.ebuild 9631
-MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318
-MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154
 MD5 7f073b544e7967d3453ab8579292ef3e mozilla-firefox-1.0.6-r4.ebuild 9543
-MD5 d8c6c3085e4fc8d06ef878579dddf116 mozilla-firefox-1.0.6-r6.ebuild 11233
+MD5 d13936acb06028ebcf2bdaae476989b4 ChangeLog 31211
 MD5 8a30120dc035d60c58db0a9dc8c3b91b mozilla-firefox-1.0.6-r7.ebuild 9771
+MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154
+MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318
+MD5 d8c6c3085e4fc8d06ef878579dddf116 mozilla-firefox-1.0.6-r6.ebuild 11233
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 dc22edb224ce80c4c542d87837ea20cd mozilla-firefox-1.0.7.ebuild 10460
+MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131
+MD5 6da2b9dec8c7fbe104122a424727fb39 files/digest-mozilla-firefox-1.0.6-r3 451
 MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32
-MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r5 447
 MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382
-MD5 6da2b9dec8c7fbe104122a424727fb39 files/digest-mozilla-firefox-1.0.6-r3 451
-MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548
+MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101
+MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
+MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r5 447
+MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r7 447
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
-MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
-MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520
-MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
-MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308
-MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
-MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
-MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131
-MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818
 MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r4 447
-MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r6 447
+MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
 MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
-MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r7 447
+MD5 f8e76316e656f43d103616a3045b4961 files/digest-mozilla-firefox-1.0.7 523
+MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406
+MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r6 447
+MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520
+MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548
+MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308
 MD5 787437939618daf271673626f6414b15 files/mozilla-firefox-1.0.6-GLSA105396.patch 4049
+MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNzPQ1ZcsMnZjRyIRAmVMAKCHkwD03eDqqUuYqqu8bftCJEaiDQCcDvAl
+f6ezXBJH+3IXMQbeaTlmWHY=
+=8Jai
+-----END PGP SIGNATURE-----
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7
new file mode 100644
index 000000000000..ec39071d00a8
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7
@@ -0,0 +1,7 @@
+MD5 5704a8c36de84b408e069afb0c5bc1df firefox-1.0.7-source.tar.bz2 32793876
+MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+MD5 855fcb4f3e40bbcc608113ceb11e2ceb mozilla-1.7.12-gtk2xft.patch.bz2 40416
+MD5 39c7b08477b68fe0cb3fba75970c8125 mozilla-firefox-1.0.3-ia64.patch.bz2 2531
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
+MD5 e0442e619add9045d0d04e97c274bc85 embed-typeaheadfind.patch 41038
diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch
new file mode 100644
index 000000000000..3b2b58a549cf
--- /dev/null
+++ b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch
@@ -0,0 +1,15 @@
+--- mozilla/configure.in.az	2005-09-26 00:07:40.000000000 +0200
++++ mozilla/configure.in	2005-09-26 00:10:56.000000000 +0200
+@@ -3430,9 +3430,10 @@
+ if test "$MOZ_ENABLE_XFT"
+ then
+     AC_DEFINE(MOZ_ENABLE_XFT)
+-    PKG_CHECK_MODULES(MOZ_XFT, xft)
+     if test "$MOZ_ENABLE_GTK2"; then
+-        PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0)
++        PKG_CHECK_MODULES(MOZ_XFT, xft pangoxft >= 1.1.0)
++    else
++        PKG_CHECK_MODULES(MOZ_XFT, xft)
+     fi
+ fi
+ 
diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-libart-freetype.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-libart-freetype.patch
new file mode 100644
index 000000000000..84392bd4acdf
--- /dev/null
+++ b/www-client/mozilla-firefox/files/mozilla-1.7.12-libart-freetype.patch
@@ -0,0 +1,50 @@
+$NetBSD: patch-by,v 1.2 2004/07/05 14:22:42 taya Exp $
+
+diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
+--- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-03-19 10:36:16.000000000 +0900
++++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-07-04 22:59:19.000000000 +0900
+@@ -155,15 +155,15 @@
+ 
+   static NS_NAMED_LITERAL_STRING(arial, "arial");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
+-                                              &arial);
++                                              (nsDependentString *)&arial);
+ 
+   static NS_NAMED_LITERAL_STRING(courier, "courier new");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
+-                                              &courier);
++                                              (nsDependentString *)&courier);
+ 
+   static NS_NAMED_LITERAL_STRING(times, "times new roman");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
+-                                              &times);
++                                              (nsDependentString *)&times);
+ }
+ 
+ void NS_FreeSVGLibartGlyphMetricsFTGlobals()
+@@ -440,19 +440,19 @@
+     return;
+   }
+ 
+-  FTC_Image_Desc imageDesc;
+-  imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
++  FTC_ImageType imageDesc;
++  imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
+   float twipstopixel = GetTwipsToPixels();
+   float scale = GetPixelScale();
+-  imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
+-  imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
+-  imageDesc.image_type |= ftc_image_grays;
++  imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
++  imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
++  imageDesc->flags = 0;
+ 
+   // get the face
+   nsresult rv;
+   FTC_Manager mgr;
+   nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
+-  rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
++  rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
+   NS_ASSERTION(mFace, "failed to get face/size");
+ }
+ 
diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.6-gcc4.patch b/www-client/mozilla-firefox/files/mozilla-1.7.6-gcc4.patch
new file mode 100644
index 000000000000..2d0a04949072
--- /dev/null
+++ b/www-client/mozilla-firefox/files/mozilla-1.7.6-gcc4.patch
@@ -0,0 +1,46 @@
+diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
+--- mozilla-orig/security/nss/lib/pki1/oiddata.h	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oiddata.h	2005-03-13 19:15:19.000000000 -0500
+@@ -43,12 +43,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ extern const NSSOID *NSS_OID_RFC1274_UID;
+ extern const NSSOID *NSS_OID_RFC1274_EMAIL;
+ extern const NSSOID *NSS_OID_RFC2247_DC;
+diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
+--- mozilla-orig/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:15:19.000000000 -0500
+@@ -233,12 +233,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ EOD
+     ;
+ 
+diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
+--- mozilla-orig/security/nss/lib/pki1/pki1.h	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/pki1.h	2005-03-13 19:15:19.000000000 -0500
+@@ -55,7 +55,9 @@
+ 
+ PR_BEGIN_EXTERN_C
+ 
+-/* fgmr 19990505 moved these here from oiddata.h */
++extern const NSSOID nss_builtin_oids[];
++extern const PRUint32 nss_builtin_oid_count;
++
+ extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
+ extern const PRUint32 nss_attribute_type_alias_count;
+ 
diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.8-amd64.patch b/www-client/mozilla-firefox/files/mozilla-1.7.8-amd64.patch
new file mode 100644
index 000000000000..96215fb292d5
--- /dev/null
+++ b/www-client/mozilla-firefox/files/mozilla-1.7.8-amd64.patch
@@ -0,0 +1,71 @@
+--- gfx/src/freetype/nsFreeType.cpp	7 Feb 2004 15:22:30 -0000	1.24
++++ mozilla/gfx/src/freetype/nsFreeType.cpp	4 Mar 2005 19:59:53 -0000
+@@ -96,7 +96,7 @@
+ // Define the FreeType2 functions we resolve at run time.
+ // see the comment near nsFreeType2::DoneFace() for more info
+ //
+-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
++#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
+ FtFuncList nsFreeType2::FtFuncs [] = {
+   {"FT_Done_Face",            NS_FT2_OFFSET(nsFT_Done_Face),            PR_TRUE},
+   {"FT_Done_FreeType",        NS_FT2_OFFSET(nsFT_Done_FreeType),        PR_TRUE},
+--- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	1 Sep 2004 23:31:03 -0000	1.7.20.1
++++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	4 Mar 2005 19:59:57 -0000
+@@ -834,8 +834,8 @@
+ void
+ nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
+ {
+-    PRUint16 name  = (PRUint32(param) & 0xFFFF0000) >> 16;
+-    PRUint16 value =  PRUint32(param) & 0x0000FFFF;
++    PRUint16 name  = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
++    PRUint16 value =  NS_PTR_TO_INT32(param) & 0x0000FFFF;
+ 
+     switch (name) {
+     case MAX_CONNECTIONS:
+--- widget/src/gtk2/nsDragService.cpp	30 Oct 2003 01:48:41 -0000	1.5
++++ mozilla/widget/src/gtk2/nsDragService.cpp	4 Mar 2005 20:00:01 -0000
+@@ -838,7 +838,7 @@
+             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+         listTarget->target = g_strdup(gMimeListType);
+         listTarget->flags = 0;
+-        listTarget->info = (guint)listAtom;
++        listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
+         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                ("automatically adding target %s with id %ld\n",
+                listTarget->target, listAtom));
+@@ -877,7 +877,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             listTarget->target = g_strdup(gTextUriListType);
+                             listTarget->flags = 0;
+-                            listTarget->info = (guint)listAtom;
++                            listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", listTarget->target, listAtom));
+@@ -914,7 +914,7 @@
+                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                         target->target = g_strdup(flavorStr);
+                         target->flags = 0;
+-                        target->info = (guint)atom;
++                        target->info = (guint)NS_PTR_TO_INT32(atom);
+                         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                ("adding target %s with id %ld\n",
+                                target->target, atom));
+@@ -931,7 +931,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             plainTarget->target = g_strdup(kTextMime);
+                             plainTarget->flags = 0;
+-                            plainTarget->info = (guint)plainAtom;
++                            plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", plainTarget->target, plainAtom));
+@@ -948,7 +948,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             urlTarget->target = g_strdup(gMozUrlType);
+                             urlTarget->flags = 0;
+-                            urlTarget->info = (guint)urlAtom;
++                            urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", urlTarget->target, urlAtom));
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.7.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.7.ebuild
new file mode 100644
index 000000000000..c4cd0f18901c
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.7.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.7.ebuild,v 1.1 2005/09/25 23:31:47 azarah Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
+	                 # when older is removed from tree.
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+
+SVGVER="2.3.10p1"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firefox/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2
+	mozsvg? (
+		mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2
+		http://dev.gentoo.org/~azarah/mozilla/moz_libart_lgpl-${SVGVER}.tar.bz2
+	)
+	mirror://gentoo/mozilla-1.7.12-gtk2xft.patch.bz2
+	http://dev.gentoo.org/~azarah/mozilla/mozilla-1.7.12-gtk2xft.patch.bz2
+	mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2
+	mirror://gentoo/mozilla-jslibmath-alpha.patch
+	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch
+	http://dev.gentoo.org/~anarchy/dist/embed-typeaheadfind.patch"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="gnome java mozdevelop mozsvg mozcalendar"
+
+# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
+# and is required to build with support for cairo.  #71504
+RDEPEND="java? ( virtual/jre )
+	>=media-libs/libmng-1.0.0
+	mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2 )
+	>=www-client/mozilla-launcher-1.39"
+
+DEPEND="${RDEPEND}
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+S=${WORKDIR}/mozilla
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_PHOENIX=1
+
+src_unpack() {
+	unpack firefox-${PV}-source.tar.bz2
+	cd ${S} || die "cd failed"
+
+	if use mozsvg; then
+		cd ${S}/other-licenses
+		unpack moz_libart_lgpl-${SVGVER}.tar.bz2
+	fi
+	cd ${S}
+
+	####################################
+	#
+	# architecture patches
+	#
+	####################################
+
+	# alpha stubs patch from lfs project.
+	# <taviso@gentoo.org> (26 Jun 2003)
+	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
+
+	# hppa patches from Ivar <orskaug@stud.ntnu.no>
+	# <gmsoft@gentoo.org> (22 Dec 2004)
+	epatch ${FILESDIR}/mozilla-hppa.patch
+
+	# patch to solve segfaults on ia64, from Debian, originally from David
+	# Mosberger
+	epatch ${DISTDIR}/mozilla-firefox-1.0.3-ia64.patch.bz2
+
+	# patch to fix math operations on alpha, makes maps.google.com work!
+	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
+
+	# Fix building on amd64 with gcc4 (patch from Debian)
+	epatch ${FILESDIR}/mozilla-1.7.8-amd64.patch
+
+	####################################
+	#
+	# general compilation and run-time fixes
+	#
+	####################################
+
+	# GCC4 compile fix, bug #87800
+	epatch ${FILESDIR}/mozilla-1.7.6-gcc4.patch
+
+	# Rather use gtk2+xft than freetype for font rendering, and add patch
+	# from mozilla bugzilla to improve printing.
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=215219#c113
+	epatch ${DISTDIR}/mozilla-1.7.12-gtk2xft.patch.bz2
+	# Fix for above
+	epatch ${FILESDIR}/mozilla-1.7.12-gtk2xft-link-pangoxft.patch
+
+	# Fix libart SVG renderer building against newer freetype2
+	epatch ${FILESDIR}/mozilla-1.7.12-libart-freetype.patch
+
+	####################################
+	#
+	# behavioral fixes
+	#
+	####################################
+
+	# patch to fix separate character on euro keyboards, bug 68995
+	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
+
+	# some patches from Debian to set default preferences:
+	# - inherit LANG from env
+	# - shut off SSLv2 and 40-bit ciphers by default
+	# - disable application auto-updating
+	epatch ${FILESDIR}/mozilla-firefox-1.0.3-prefs.patch
+
+	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
+	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
+
+	# patch to fix crash in GtkPromptService::Prompt
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=265599
+	epatch ${FILESDIR}/gtk-prompt-service.patch
+
+	# patch to make prompts window modal instead of application modal
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=224454
+	epatch ${FILESDIR}/embedprompter-modal.patch
+
+	# patch to fix typeahead find for browsers which embed Firefox
+	# http://bugzilla.gnome.org/show_bug.cgi?id=157435
+	epatch ${DISTDIR}/embed-typeaheadfind.patch
+
+	# patch to make the interface requestor give out its nsIDOMWindow
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=277587
+	epatch ${FILESDIR}/securebrowserui-iirq.patch
+
+	# patch to add border to tooltips
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=238052
+	epatch ${FILESDIR}/gtk-tooltips.patch
+
+	###################################
+	#
+	# security fixes
+	#
+	###################################
+
+	# Needed by some of the patches
+	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml --enable-extensions=typeaheadfind
+
+	# Other ff-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+	mozconfig_use_enable gnome gnomevfs
+	mozconfig_use_extension gnome gnomevfs
+	mozconfig_use_enable mozcalendar calendar
+	mozconfig_use_enable mozsvg svg
+	mozconfig_use_enable mozsvg svg-renderer-libart
+	use mozsvg && export MOZ_INTERNAL_LIBART_LGPL=1
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	#mozconfig_annotate '' --with-user-appdir=.firefox
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/nsprpub/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME} || die "Failed to Copy"
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt || die "Failed to Copy"
+
+	# Create /usr/bin/firefox
+	install_mozilla_launcher_stub firefox ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/firefox-icon.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillafirefox.desktop
+
+	# Fix icons to look the same everywhere
+	insinto ${MOZILLA_FIVE_HOME}/icons
+	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
+	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
+
+	####################################
+	#
+	# Install files necessary for applications to build against firefox
+	#
+	####################################
+
+	einfo "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "Failed to Copy"
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl || die "Failed to Copy"
+
+	# Dirty hack to get some applications using this header running
+	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
+		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
+
+	# Compatibility symlink so that applications can still build against firefox
+	# even though it has moved.  To remove this symlink, grep -r MozillaFirefox
+	# /usr/portage and fix those ebuilds
+	dosym ${MOZILLA_FIVE_HOME##*/} ${MOZILLA_FIVE_HOME%/*}/MozillaFirefox
+
+	# Fix firefox-config and install it
+	sed -i -e "s|/usr/lib/firefox-${PV}|${MOZILLA_FIVE_HOME}|g
+		s|/usr/include/firefox-${PV}|${MOZILLA_FIVE_HOME}/include|g" \
+		${S}/build/unix/firefox-config
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${S}/build/unix/firefox-config
+
+	# Fix pkgconfig files and install them
+	insinto /usr/$(get_libdir)/pkgconfig
+	for x in ${S}/build/unix/*.pc; do
+		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
+			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
+		doins ${x}
+	done
+
+	# Install env.d snippet, which isn't necessary for running firefox, but
+	# might be necessary for programs linked against firefox
+	insinto /etc/env.d
+	doins ${FILESDIR}/10MozillaFirefox
+	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10MozillaFirefox
+
+	# Install docs
+	dodoc LEGAL LICENSE
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \
+		/usr/libexec/mozilla-launcher -register
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \
+		/usr/libexec/mozilla-launcher -register
+
+	update_mozilla_launcher_symlinks
+}
diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest
index 9ed9ae3cb823..dd2065cb80aa 100644
--- a/www-client/mozilla/Manifest
+++ b/www-client/mozilla/Manifest
@@ -1,34 +1,38 @@
-MD5 f1184f75d04faa0237f747e09e877749 ChangeLog 51041
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179
+MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594
 MD5 efb11836f2b5c8f484f743a401229c53 mozilla-1.7.11-r2.ebuild 12246
+MD5 f2ceeaf27fc4010779fa83d3e6f52064 ChangeLog 51465
+MD5 d93266fa522c8503a5c3c8563b799968 mozilla-1.7.11.ebuild 12172
 MD5 5ac1d6e61327816f403bd186db788f7a mozilla-1.7.11-r3.ebuild 12321
-MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594
-MD5 00cce95a37df57816d9bf357e04c3b73 mozilla-1.7.10-r2.ebuild 11834
 MD5 585e249f746a24ae127ff7a39b12133e mozilla-1.7.10-r3.ebuild 12179
-MD5 d93266fa522c8503a5c3c8563b799968 mozilla-1.7.11.ebuild 12172
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428
-MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
-MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+MD5 a56be94dca3c6639215ed4f8fca45768 mozilla-1.7.12.ebuild 12971
+MD5 00cce95a37df57816d9bf357e04c3b73 mozilla-1.7.10-r2.ebuild 11834
+MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428
 MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
-MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
+MD5 787437939618daf271673626f6414b15 files/mozilla-1.7.11-GLSA105396.patch 4049
+MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432
 MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428
+MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
-MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
-MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
-MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
 MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r3 428
-MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432
-MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432
-MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428
+MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
+MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
 MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428
-MD5 787437939618daf271673626f6414b15 files/mozilla-1.7.11-GLSA105396.patch 4049
-MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
-MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428
+MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 8047a3fb75a7615d8c40e82de392468f files/digest-mozilla-1.7.12 504
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
+MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328