Glibc-2.4 fix wrt bug#125832

(Portage version: 2.1_pre6-r4)

5 files changed, 575 insertions, 12 deletions

diff --git a/www-client/mozilla/ChangeLog b/www-client/mozilla/ChangeLog
index 7bd43186fedb..84f3b8b5a6a0 100644
--- a/www-client/mozilla/ChangeLog
+++ b/www-client/mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.87 2005/10/02 16:37:13 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.88 2006/03/20 02:04:13 anarchy Exp $
+
+*mozilla-1.7.12-r3 (20 Mar 2006)
+
+  20 Mar 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +files/010_glibc-2.4.patch, +mozilla-1.7.12-r3.ebuild:
+  Glibc-2.4 fix wrt bug#125832
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.12-r2.ebuild:
   Mark 1.7.12-r2 stable on ia64
diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest
index 4284df99abd3..4cf4a87e73ce 100644
--- a/www-client/mozilla/Manifest
+++ b/www-client/mozilla/Manifest
@@ -1,49 +1,126 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 af9b84a21416fc0431f2a7aea19922e8 ChangeLog 53173
+RMD160 8de57124380aa7066fda2a08d38baa627313f517 ChangeLog 53173
+SHA256 7679a2d1a6752b5b20d863c6c975f4551d856a224a99b088184a84849da97302 ChangeLog 53173
+MD5 1bbe55892586ddbce300e5abb134a681 files/010_glibc-2.4.patch 2628
+RMD160 77d35dec11624ef1b3ad84d72eb437068cbc9f0f files/010_glibc-2.4.patch 2628
+SHA256 5a64ffadb56c3c2316202e57ce82b6439c3037c6f4a5a1d4783d03173741e5cd files/010_glibc-2.4.patch 2628
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+RMD160 37834d7eafe6e3bb54867bbaea00a8685132b757 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+SHA256 0ad5d45928b057d72dfa29818d74d0048157c8d25ebc063bc023cb8e49bdb449 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+RMD160 cd5910f9e6c07bc36c11ff81b0157709e0b77df0 files/10mozilla 105
+SHA256 4b8a060e8e9e20a0d291e72e31006fb924540d9245455f61b97a02854201a42e files/10mozilla 105
 MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432
+RMD160 2873294f1038e7d81b2a20849d9e5641cf4c2b1b files/digest-mozilla-1.7.10-r1 432
+SHA256 4e92e498ffeaa33f24d0dcc85ca563c98a02dcbcc012b109d8d91d5ac396469e files/digest-mozilla-1.7.10-r1 432
 MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432
+RMD160 2873294f1038e7d81b2a20849d9e5641cf4c2b1b files/digest-mozilla-1.7.10-r2 432
+SHA256 4e92e498ffeaa33f24d0dcc85ca563c98a02dcbcc012b109d8d91d5ac396469e files/digest-mozilla-1.7.10-r2 432
 MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428
+RMD160 93ffac74ce49bb90837ba3b77fcfc97a49fb578d files/digest-mozilla-1.7.10-r3 428
+SHA256 b99bffd7314138b492f03494f15e0ffe000bbb32cd1f7d793d63fa2ffa663621 files/digest-mozilla-1.7.10-r3 428
 MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428
+RMD160 9f07bad5469d71b3c4daaf406312c271227267f0 files/digest-mozilla-1.7.11 428
+SHA256 054d91c0b18b5e170400ac0d41ae8b1333a4d30a4eb9cd14658765c846aad758 files/digest-mozilla-1.7.11 428
 MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428
+RMD160 9f07bad5469d71b3c4daaf406312c271227267f0 files/digest-mozilla-1.7.11-r1 428
+SHA256 054d91c0b18b5e170400ac0d41ae8b1333a4d30a4eb9cd14658765c846aad758 files/digest-mozilla-1.7.11-r1 428
 MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428
+RMD160 9f07bad5469d71b3c4daaf406312c271227267f0 files/digest-mozilla-1.7.11-r2 428
+SHA256 054d91c0b18b5e170400ac0d41ae8b1333a4d30a4eb9cd14658765c846aad758 files/digest-mozilla-1.7.11-r2 428
 MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r3 428
+RMD160 9f07bad5469d71b3c4daaf406312c271227267f0 files/digest-mozilla-1.7.11-r3 428
+SHA256 054d91c0b18b5e170400ac0d41ae8b1333a4d30a4eb9cd14658765c846aad758 files/digest-mozilla-1.7.11-r3 428
 MD5 3beb280426b5afc68a2a132edf1b58f7 files/digest-mozilla-1.7.12-r2 360
+RMD160 057a2a032af40ee80794a97dad00122a0ef52e58 files/digest-mozilla-1.7.12-r2 360
+SHA256 dba9eebed66775b08c1230229eb36128491c03f556924dc14e346f99423b3abb files/digest-mozilla-1.7.12-r2 360
+MD5 4efed08007b248c4956315b5c586c889 files/digest-mozilla-1.7.12-r3 1310
+RMD160 2ab8c346cea9eb1290b63595340322022deb6703 files/digest-mozilla-1.7.12-r3 1310
+SHA256 704d380199707cfb06eb4f6387e617e2cb7f9f054ce8919409f70be5893a82b0 files/digest-mozilla-1.7.12-r3 1310
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 files/google.src 706
+SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a files/google.src 706
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+RMD160 450a78d2d31915eb6b5722125013de7d73c8326a files/icon/mozilla-icon.png 2350
+SHA256 6dccb80517b5b58344ec3d668034dd689b1cf7abd7116cc8053c99a988b9c2d6 files/icon/mozilla-icon.png 2350
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
+RMD160 74ab97c01adf6e1b3a91364a7a0cbf072f51bc61 files/icon/mozilla.desktop 153
+SHA256 ad4f97b5920449e94ad869d7d4d120e8f372870ebcd6d19531fd13044ade8bf3 files/icon/mozilla.desktop 153
 MD5 787437939618daf271673626f6414b15 files/mozilla-1.7.11-GLSA105396.patch 4049
+RMD160 703ff560d0a5a7d6af56ab78f495805e1fa32a1c files/mozilla-1.7.11-GLSA105396.patch 4049
+SHA256 e9d84f78bf121ae6508fa1732adb3509166498f3369aa856fbab975723ac7f7e files/mozilla-1.7.11-GLSA105396.patch 4049
 MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
+RMD160 c0955bf06763d91322e50012487698e4b919e6b9 files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
+SHA256 f801785b303e68439bd781e25038db99d7c753ecfd4e678d4b49ee4419205112 files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
 MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+RMD160 eb8d4e5bf83d3997dec93c1e51e4b4b02bdf064e files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+SHA256 e13fdd216f1746ff5c0e217c4f2e763f5b1c6393b54723ea35b5534044b30d9b files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
 MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
+RMD160 dfbe1717346ce27d9834d423d890e28fbc165a5f files/mozilla-1.7.12-libart-freetype.patch 2412
+SHA256 e0145b919750c0a0c418a1d905863f8b0c24bfb0d6947c92eecb512031b3b601 files/mozilla-1.7.12-libart-freetype.patch 2412
 MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752
+RMD160 98f66862f7e53d12004f387bf43ece3c4b01763d files/mozilla-1.7.12-rpath.patch 1752
+SHA256 841f46d7d38963dcdc18867cc7baf61c8cafbc6cc9a877cb80ede14e52364b49 files/mozilla-1.7.12-rpath.patch 1752
 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+RMD160 7be7c0f39933dcad5c45909ef6099ad3a170d40e files/mozilla-1.7.6-gcc4.patch 1818
+SHA256 09bf6b2d51c27eccbf3b6c21aafb7f6263b723b3e526419f81a90db7bc203046 files/mozilla-1.7.6-gcc4.patch 1818
 MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
+RMD160 312e41a02f755ded2ad9d4cb556899086b10b311 files/mozilla-1.7.6-ppc64.patch 3651
+SHA256 ef4731d5d2cd960591ae1358c3a15f245652485e91c7510bab381908134a18c0 files/mozilla-1.7.6-ppc64.patch 3651
 MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+RMD160 8233071590d4237288923dba664d7da62853b70c files/mozilla-1.7.8-amd64.patch 4020
+SHA256 d1244c42644ff428228e7dcfc6d9f9f7251bc9ca06172053e6456379fd73c824 files/mozilla-1.7.8-amd64.patch 4020
 MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
+RMD160 746b76958538089eff6e05404237068006bda14e files/mozilla-1.7.8-objectframefix.diff 673
+SHA256 e222f935eb2e23c8ca4117dd4af4862579e8110c46534603bdcaff7b36568dfa files/mozilla-1.7.8-objectframefix.diff 673
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+RMD160 8703ed9d22d35fc6a95ca1607c3dedcfb377c267 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+SHA256 7ad36d16f9811742bdb95e838afb5f2d1cc9c58a7d180fc8f304b4d10bf53197 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
+RMD160 e45ff21ec6bb4a947c20f5ec9a7252375e91bff4 files/mozilla-hppa.patch 7863
+SHA256 5e407a6f34ad2eb9e49f2d15db373df05afcc52676469a4d8066f3536cca771b files/mozilla-hppa.patch 7863
 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+RMD160 b26da16d31a6713a162abbf2d2d44fc57c5877ae files/mozilla-rebuild-databases.pl 2310
+SHA256 5832e4f6e162f90fe9f6046182e45a24500b4502b01baaa012d6f556636cd7f9 files/mozilla-rebuild-databases.pl 2310
 MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
+RMD160 23bf20d57b996f6c86658aad378682497a07544c files/mozilla-rpath-1.patch 1716
+SHA256 e34d5bae7787b76253add7ec03de19a85919d42dd949f6dd4d8e0fe3ed7fc620 files/mozilla-rpath-1.patch 1716
 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
+RMD160 c2b81d96f968e3cae36462bd4b567fe60b1a83e0 files/mozilla-stackgrowth.patch 931
+SHA256 80dcdfd2feda3ec59a715b59e86e54a6110ccac4ad499cfaa032151606682605 files/mozilla-stackgrowth.patch 931
 MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+RMD160 70653936eac849f95151b14972d8b8fe67607887 files/svg-cairo-0.3.0-fix.patch 1063
+SHA256 c4281db59cfb67c052a677f909c0be843a0812fa5253838784fbf3877844f219 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+RMD160 ace4fbdb541bb73890f89bded3c24db3ede6c0ba files/xft.js 135
+SHA256 b31467ca939e473b5898190b067c705eb04a3f293a97bcf2fe0abcd2fb34274b files/xft.js 135
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
+SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160
 MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594
+RMD160 2653bdeb9d254699821f4e10972046fc1b212f07 mozilla-1.7.10-r1.ebuild 12594
+SHA256 a08aa33681f8d77730e0dddbcc31040f80f12f581b9546d81d12990cba10a1b8 mozilla-1.7.10-r1.ebuild 12594
 MD5 00cce95a37df57816d9bf357e04c3b73 mozilla-1.7.10-r2.ebuild 11834
+RMD160 e4177e3d0ae62390cccefce3ff889e81de6d4cd3 mozilla-1.7.10-r2.ebuild 11834
+SHA256 a3ef640049decfd9c25d10384147c22226ff49501b1b7e0ee5f7eb676ee6ab6f mozilla-1.7.10-r2.ebuild 11834
 MD5 585e249f746a24ae127ff7a39b12133e mozilla-1.7.10-r3.ebuild 12179
+RMD160 375afbfe055cd12e4f2207c885b1556e1131296b mozilla-1.7.10-r3.ebuild 12179
+SHA256 1a510098b1974cdd86c35adc7cc6298f16550808cb50e506ba1542f9e6633ed3 mozilla-1.7.10-r3.ebuild 12179
 MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179
+RMD160 1b4de63226ee1c1a62feae4b4b3f0ee9730510e5 mozilla-1.7.11-r1.ebuild 12179
+SHA256 bf03f9773bfa928db87215a7ca179048b9f3a4856b16cc292e3deafa4d91472c mozilla-1.7.11-r1.ebuild 12179
 MD5 efb11836f2b5c8f484f743a401229c53 mozilla-1.7.11-r2.ebuild 12246
+RMD160 4ed6e2b7f47d20dc2bda3af1b447c671fddc914d mozilla-1.7.11-r2.ebuild 12246
+SHA256 1ea03789494f01419f525616be51a081a17dcfd468101cfea4af257b54b4071c mozilla-1.7.11-r2.ebuild 12246
 MD5 999feebd8d74bccf4fe0b8efaaf474b1 mozilla-1.7.11-r3.ebuild 12327
+RMD160 0e66ec6a639d788dc8d3998ff0ecae0534963561 mozilla-1.7.11-r3.ebuild 12327
+SHA256 b9db57b8299873d47e90f62e286e4370eca7969eaa10994e7a92abf5e2c1ad0d mozilla-1.7.11-r3.ebuild 12327
 MD5 d93266fa522c8503a5c3c8563b799968 mozilla-1.7.11.ebuild 12172
+RMD160 2e8fec839c5f75bcd73287377ad7239fa18c52ca mozilla-1.7.11.ebuild 12172
+SHA256 5af13f28e59eb140a20ac954de10f2185cb93ac32dd7f3d8f61db27dc459607b mozilla-1.7.11.ebuild 12172
 MD5 091cdbde677ba08bcf0b1a286668a228 mozilla-1.7.12-r2.ebuild 12155
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDw1GI2+ySkm8kpY0RAhPyAJ4/9ZXI9UXeU9l4LfmiUq9G9hC3YwCdHuKQ
-nQxo4bekyREep9ii7tqna4M=
-=YCb5
------END PGP SIGNATURE-----
+RMD160 9415a5fe39fbc0fbf35b912857537e0d45bf2a01 mozilla-1.7.12-r2.ebuild 12155
+SHA256 c362dd46cba5a62caf0e239da6cbace21f29fb94dcb59481f84c5aa5be1ba37b mozilla-1.7.12-r2.ebuild 12155
+MD5 dc2748499a1de664038b5a1761261c95 mozilla-1.7.12-r3.ebuild 12222
+RMD160 cb4d763bdd2144032f3343b9e1b8c032404a209c mozilla-1.7.12-r3.ebuild 12222
+SHA256 93d90956c529d8d2f24c9d2c19713c9c7b15dc983b1f9e107a411fb101776db4 mozilla-1.7.12-r3.ebuild 12222
diff --git a/www-client/mozilla/files/010_glibc-2.4.patch b/www-client/mozilla/files/010_glibc-2.4.patch
new file mode 100644
index 000000000000..e4b56d30dd48
--- /dev/null
+++ b/www-client/mozilla/files/010_glibc-2.4.patch
@@ -0,0 +1,84 @@
+diff -u -p -8 -r1.12 nsStackFrameUnix.cpp
+--- xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
++++ xpcom/base/nsStackFrameUnix.cpp	23 Jan 2006 09:23:04 -0000
+@@ -77,19 +77,30 @@ void DemangleSymbol(const char * aSymbol
+     if (demangled)
+     {
+         strncpy(aBuffer,demangled,aBufLen);
+         free(demangled);
+     }
+ #endif // MOZ_DEMANGLE_SYMBOLS
+ }
+ 
++#if defined(linux) // Linux
++#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)) // use glibc backtrace()
++#include <execinfo.h>
++void DumpStackToFile(FILE* aStream)
++{
++  void *array[20];
++  size_t size;
+ 
+-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
++  fflush(aStream);
++  size = backtrace (array, 20);
++  backtrace_symbols_fd (array, size, fileno(aStream));
++}
+ 
++#elif defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // old style i386 or PPC Linux stackwalking code
+ #include <setjmp.h>
+ //
+ 
+ void DumpStackToFile(FILE* aStream)
+ {
+   jmp_buf jb;
+   setjmp(jb);
+ 
+@@ -135,16 +146,23 @@ void DumpStackToFile(FILE* aStream)
+ 
+       PRUint32 off = (char*)pc - (char*)info.dli_saddr;
+       fprintf(aStream, "%s+0x%08X [%s +0x%08X]\n",
+               symbol, off, info.dli_fname, foff);
+     }
+   }
+ }
+ 
++#else // not implemented
++void DumpStackToFile(FILE* aStream)
++{
++  fprintf(aStream, "Info: Stacktrace not implemented for this Linux platform\n");
++}
++#endif // Linux
++
+ #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))
+ 
+ /*
+  * Stack walking code for Solaris courtesy of Bart Smaalder's "memtrak".
+  */
+ 
+ #include <synch.h>
+ #include <ucontext.h>
+
+diff -u -p -8 -r1.96 nsTraceRefcntImpl.cpp
+--- xpcom/base/nsTraceRefcntImpl.cpp	24 Jun 2005 00:24:41 -0000	1.96
++++ xpcom/base/nsTraceRefcntImpl.cpp	23 Jan 2006 09:24:05 -0000
+@@ -823,18 +823,18 @@ static void InitTraceLog(void)
+ #include "nsStackFrameWin.h"
+ void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+   DumpStackToFile(aStream);
+ }
+ 
+ // WIN32 x86 stack walking code
+-// i386 or PPC Linux stackwalking code or Solaris
+-#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
++// Linux stackwalking code or Solaris
++#elif (defined(linux) && defined(__GLIBC__)) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+ #include "nsStackFrameUnix.h"
+ void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+   DumpStackToFile(aStream);
+ }
+ 
+ #else // unsupported platform.
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.12-r3 b/www-client/mozilla/files/digest-mozilla-1.7.12-r3
new file mode 100644
index 000000000000..434fce0930d2
--- /dev/null
+++ b/www-client/mozilla/files/digest-mozilla-1.7.12-r3
@@ -0,0 +1,15 @@
+MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
+RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
+SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
+MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
+RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
+SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
+MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+RMD160 c1ab4b41fe40e3f63dbf95476a1cc125d5537be7 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+SHA256 8cc868780a0763a5afaa36f92d7c5f9efe248b4e05440f645e4e91ddfdd6d1b5 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+MD5 8260c8412cda7f33b0a4dade34494772 mozilla-1.7.12-patches-1.1.tar.bz2 107977
+RMD160 b191c7713273bea08bfd5dd520cf1ecfaa4d0a3f mozilla-1.7.12-patches-1.1.tar.bz2 107977
+SHA256 710f5ac06caa01a6a9e1a59f9d252744ccfe350cd97ce25c67d2b68e3bfb67cd mozilla-1.7.12-patches-1.1.tar.bz2 107977
+MD5 f1ad6adbbc0510eb76d352c94c801fac mozilla-1.7.12-source.tar.bz2 30446836
+RMD160 8881779a39f360a814177ed948fab5a8330193aa mozilla-1.7.12-source.tar.bz2 30446836
+SHA256 9fcbcdd0d72775659817cd0d826c2f59356e07545e4cc8d14086cd96cec7c200 mozilla-1.7.12-source.tar.bz2 30446836
diff --git a/www-client/mozilla/mozilla-1.7.12-r3.ebuild b/www-client/mozilla/mozilla-1.7.12-r3.ebuild
new file mode 100644
index 000000000000..edc1bb6b72d4
--- /dev/null
+++ b/www-client/mozilla/mozilla-1.7.12-r3.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.12-r3.ebuild,v 1.1 2006/03/20 02:04:13 anarchy 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.
+MOZ_PANGO="yes"      # Need to enable 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
+
+PVER="1.1"
+EMVER="0.92.0"
+IPCVER="1.1.3"
+SVGVER="2.3.10p1"
+
+# handle _rc versions
+MY_PV=${PV/_alpha/a} 	# handle alpha
+MY_PV=${MY_PV/_beta/b}	# handle beta
+MY_PV=${MY_PV/_rc/rc}	# handle rc
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.${PN}.org/pub/${PN}.org/${PN}/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
+	crypt? ( !moznomail? (
+		http://www.${PN}-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
+		http://www.${PN}-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
+	) )
+	mozsvg? (
+		mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2
+		http://dev.gentoo.org/~azarah/${PN}/moz_libart_lgpl-${SVGVER}.tar.bz2
+	)
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~azarah/${PN}/${P}-patches-${PVER}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
+
+# 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 )
+	mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2 )
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
+	>=www-client/mozilla-launcher-1.42"
+
+DEPEND="${RDEPEND}
+	~sys-devel/autoconf-2.13
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl
+	postgres? ( >=dev-db/postgresql-7.2.0 )"
+
+S=${WORKDIR}/${PN}
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+#
+# NB: We can't export these vars until enigmail is installed separately instead
+# of integrated into this ebuild.
+#
+#export BUILD_OFFICIAL=1
+#export MOZILLA_OFFICIAL=1
+
+src_unpack() {
+	unpack ${PN}-${MY_PV}-source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
+	cd ${S} || die
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		cd ${S}/extensions || die
+		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
+		for x in ipc enigmail; do
+			cd ${S}/extensions/${x} || die "cd failed"
+			makemake	# from mozconfig.eclass
+		done
+	fi
+	if use mozsvg; then
+		cd ${S}/other-licenses
+		unpack moz_libart_lgpl-${SVGVER}.tar.bz2
+	fi
+	cd ${S}
+
+	####################################
+	#
+	# patch collection
+	#
+	####################################
+
+	# Firefox only patches
+	rm -f ${WORKDIR}/patch/{093,094,402,407}*
+	# Need pango-1.10.0 stable
+	rm -f ${WORKDIR}/patch/03[67]*
+	epatch ${WORKDIR}/patch
+
+	# Without 03[67]* patches, we need to link to pangoxft
+	epatch ${FILESDIR}/${PN}-1.7.12-gtk2xft-link-pangoxft.patch
+
+	# Glibc-2.4 fix
+	epatch "${FILESDIR}/010_glibc-2.4.patch"
+
+	# Fix scripts that call for /usr/local/bin/perl #51916
+	ebegin "Patching smime to call perl from /usr/bin"
+	sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
+	eend $? || die "sed failed"
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, mozilla detects a ppc64 system.
+	# -- hansmi, 2005-10-02
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure.in
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+
+	# 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}
+	declare x
+
+	####################################
+	#
+	# 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
+
+	# Other moz-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_extension !moznoirc irc
+	mozconfig_use_extension postgres sql
+	if use postgres ; then
+		export MOZ_ENABLE_PGSQL=1
+		export MOZ_PGSQL_INCLUDES=/usr/include
+		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
+	fi
+	mozconfig_use_enable mozcalendar calendar
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	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=.mozilla
+
+	if use moznomail && ! use mozcalendar; then
+		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
+	fi
+	if use moznocompose && use moznomail; then
+		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
+	fi
+
+	# 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
+
+	# Fixup the RPATH
+	sed -i -e \
+		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
+		${S}/config/rules.mk \
+		${S}/nsprpub/config/rules.mk \
+		${S}/security/coreconf/rules.mk \
+		${S}/security/coreconf/rules.mk
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+
+	####################################
+	#
+	#  Build Mozilla NSS
+	#
+	####################################
+
+	# Build the NSS/SSL support
+	if use ssl; then
+		einfo "Building Mozilla NSS..."
+
+		# Fix #include problem
+		cd ${S}/security/coreconf || die "cd coreconf failed"
+		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
+			>>headers.mk
+		emake -j1 || die "make security headers failed"
+
+		cd ${S}/security/nss || die "cd nss failed"
+		emake -j1 moz_import || die "make moz_import failed"
+		emake -j1 || die "make nss failed"
+	fi
+
+	####################################
+	#
+	#  Build Enigmail extension
+	#
+	####################################
+
+	if use crypt && ! use moznomail; then
+		for x in ipc enigmail; do
+			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
+		done
+	fi
+}
+
+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}
+
+	# 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
+
+	# Create /usr/bin/mozilla
+	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/${PN}-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/${PN}.desktop
+
+	# Fix icons to look the same everywhere
+	insinto ${MOZILLA_FIVE_HOME}/icons
+	doins ${S}/widget/src/gtk/mozicon16.xpm
+	doins ${S}/widget/src/gtk/mozicon50.xpm
+
+	####################################
+	#
+	# Install files necessary for applications to build against mozilla
+	#
+	####################################
+
+	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
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl
+
+	# Install the NSS/SSL libs, headers and tools
+	if use ssl; then
+		einfo "Installing Mozilla NSS..."
+		# Install the headers ('make install' do not work for headers ...)
+		insinto ${MOZILLA_FIVE_HOME}/include/nss
+		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
+		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
+		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
+		# These come with zlib ...
+		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
+
+		cd ${S}/security/nss
+
+		mkdir -p ${WORKDIR}/nss/{bin,lib}
+		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+		make install || die "make failed"
+		# Gets installed as symbolic links ...
+		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
+
+		# Need to unset these incase we want to rebuild, else the build
+		# gets newked.
+		unset SOURCE_LIB_DIR
+		unset SOURCE_BIN_DIR
+	fi
+
+	# Fix mozilla-config and install it
+	sed -i -e "s|/usr/$(get_libdir)/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}|g
+		s|/usr/include/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g
+		s|/usr/share/idl/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g
+		s|\(echo -L.*\)\($\)|\1 -Wl,-rpath,${MOZILLA_FIVE_HOME}\2|" \
+		${S}/build/unix/${PN}-config
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${S}/build/unix/${PN}-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|
+			s|^idldir=.*|idldir=${MOZILLA_FIVE_HOME}/idl|
+			s|\(Libs:.*\)\($\)|\1 -Wl,-rpath,\${libdir}\2|" ${x}
+		doins ${x}
+	done
+
+	# Install env.d snippet, which isn't necessary for running mozilla, but
+	# might be necessary for programs linked against firefox
+	insinto /etc/env.d
+	doins ${FILESDIR}/10${PN}
+	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN}
+
+	# Install rebuild script since mozilla-bin doesn't support registration yet
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${FILESDIR}/${PN}-rebuild-databases.pl
+	dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl
+
+	# Install docs
+	dodoc ${S}/{LEGAL,LICENSE}
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto ${MOZILLA_FIVE_HOME}/searchplugins
+	doins ${FILESDIR}/google.src
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Remove entire installed instance to solve various problems,
+	# for example see bug 27719
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+		/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
+	if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then
+		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+			/usr/libexec/mozilla-launcher -register
+	fi
+
+	update_mozilla_launcher_symlinks
+}