Good lord please work

7 files changed, 3064 insertions, 0 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
new file mode 100644
index 000000000000..a2d7e95e2567
--- /dev/null
+++ b/net-www/mozilla/ChangeLog
@@ -0,0 +1,908 @@
+# ChangeLog for net-www/mozilla
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.197 2004/09/09 17:31:32 brad Exp $
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> mozilla-1.6-r1.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+*mozilla-1.7.2-r1 (18 Aug 2004)
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> +mozilla-1.7.2-r1.ebuild,
+  -mozilla-1.7.2.ebuild:
+  Bump revision to carry out change in mozilla.eclass (Fix bug 60668: Galeon
+  doesn't build without oji enabled, so enable it regardless of USE=java)
+
+  15 Aug 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild,
+  mozilla-1.7-r1.ebuild, mozilla-1.7.2.ebuild, mozilla-1.7.ebuild:
+  Fix bug 60285: the negated conditions in DEPEND were expressed incorrectly,
+  for example !moznoxft is wrong, it should be !moznoxft?
+
+  14 Aug 2004; <plasmaroo@gentoo.org> mozilla-1.7.2.ebuild:
+  Marking stable on "x86"; bug #59419.
+
+  09 Aug 2004; Jason Wever <weeve@gentoo.org> mozilla-1.7.2.ebuild:
+  Stable on sparc wrt security bug #59419.
+
+  08 Aug 2004; <agriffis@gentoo.org> mozilla-1.7.2.ebuild:
+  Now that mozilla.org has re-released the source tarball, switch to theirs
+  instead of mine, and call it source3. I wouldn't care except that theirs seems
+  to build with mozsvg whereas mine doesn't.
+
+  08 Aug 2004; <agriffis@gentoo.org> mozilla-1.7.2.ebuild:
+  stable on alpha and ia64
+
+  09 Aug 2004; Tom Martin <slarti@gentoo.org> mozilla-1.7.2.ebuild:
+  Stable on amd64 for security bug #59419.
+
+*mozilla-1.7.2 (08 Aug 2004)
+
+  08 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/ipc-1.0.7-nsPipeChannel.patch, +mozilla-1.7.2.ebuild:
+  Bump to 1.7.2 using source2 tarball, completed using 'make -f client.mk
+  checkout'
+
+  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> mozilla-1.7.ebuild:
+  Stable on sparc
+
+  24 Jul 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7-r1.ebuild:
+  Use emake -j1 for security stuff #58049
+
+*mozilla-1.7-r1 (22 Jul 2004)
+
+  22 Jul 2004; Aron Griffis <agriffis@gentoo.org> +mozilla-1.7-r1.ebuild:
+  New ~arch revision to try switching to emake and move mozilla-launcher to
+  RDEPEND #57352
+
+  22 Jul 2004; Travis Tilley <lv@gentoo.org> mozilla-1.7.ebuild:
+  stable on amd64
+
+  22 Jul 2004; Brad Laue <brad@gentoo.org> mozilla-1.7.ebuild:
+  Stable on x86.
+
+  04 Jul 2004; Brad Laue <brad@gentoo.org> mozilla-1.7.ebuild:
+  Remove mozaccess, mozxmlterm USE flags, as these are a hazard. They're not for
+  end-use, and are broken or constantly moving around upstream as it is.
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.ebuild:
+  Fix bug 54519: stop using get_number_of_jobs
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild:
+  QA - fix use invocation
+
+  22 Jun 2004; Brad Laue <brad@gentoo.org> files/icon/mozilla.desktop,
+  mozilla-1.7.ebuild:
+  Move the Mozilla .desktop menu entry to the freedesktop compliant location.
+  Further enhancement including translations to follow.
+
+  20 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> mozilla-1.7.ebuild:
+  Disabled the amd64 patch as it is not necessary any longer.
+
+  19 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild,
+  mozilla-1.7.ebuild, mozilla-1.7_rc1-r1.ebuild, mozilla-1.7_rc2.ebuild,
+  mozilla-1.7_rc3.ebuild:
+  Fix bug 54402: change mozilla description from browser to application suite
+
+  19 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild,
+  mozilla-1.7.ebuild, mozilla-1.7_rc1-r1.ebuild, mozilla-1.7_rc2.ebuild,
+  mozilla-1.7_rc3.ebuild:
+  Fix bug 54402: change mozilla description from browser to application suite
+
+*mozilla-1.7 (19 Jun 2004)
+
+  19 Jun 2004; Brad Laue <brad@gentoo.org> +mozilla-1.7.ebuild:
+  Bump to Mozilla 1.7.
+
+  17 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_rc2.ebuild,
+  mozilla-1.7_rc3.ebuild:
+  Fix bug 54158: enigmail upstream changed the tarball content without bumping
+  the version. Use the new tarball on mirror://gentoo to solve the problem. When
+  the next version of enigmail is released, plan to switch back to the upstream
+  tarball.
+
+*mozilla-1.7_rc3 (09 Jun 2004)
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> +mozilla-1.7_rc3.ebuild:
+  Update to 1.7_rc3
+
+*mozilla-1.7_rc2 (09 Jun 2004)
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/ipc-1.0.6-nsPipeChannel.patch, -mozilla-1.7_beta-r1.ebuild,
+  mozilla-1.7_rc1-r1.ebuild, -mozilla-1.7_rc1.ebuild, +mozilla-1.7_rc2.ebuild:
+  Update to 1.7_rc2.  Trim older 1.7 versions
+
+  07 May 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_beta-r1.ebuild,
+  mozilla-1.7_rc1-r1.ebuild, mozilla-1.7_rc1.ebuild:
+  Depend on mozilla-launcher-1.7-r1 which installs in /usr/libexec
+
+  02 May 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_rc1-r1.ebuild:
+  Update to >=mozilla-launcher-1.5 since it has more 1.7 fixes
+
+  02 May 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_rc1-r1.ebuild:
+  Use >=mozilla-launcher-1.3 since it has the 1.7 fixes
+
+*mozilla-1.7_rc1-r1 (29 Apr 2004)
+
+  29 Apr 2004; Aron Griffis <agriffis@gentoo.org> +mozilla-1.7_rc1-r1.ebuild:
+  - Fixed bug 31581 (xprint disabled in mozilla ebuild)
+  - Fixed bug 24522 (re-enable SVG support on mozilla)
+  - Fixed bug 25332 (pentium4 should be fixed in gcc-3.2.3)
+  - Re-organized src_compile into sections and cleaned up
+    ENABLE_OPTIMIZE handling using flag-o-matic functions; no more
+	finagling CFLAGS with bash substitutions in the ebuild
+  - Move all CFLAGS and arch handling into src_compile to correct QA errors
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_rc1.ebuild:
+  - Fix bug 21667 (replacing -march=pentium4 in mozilla ebuilds
+    outdated) by checking for gcc >= 3.2.3
+  - Fix bug 48878 (mozilla-1.7_rc1 pkg-config files say 1.7b) by
+    overwriting milestone.txt in src_unpack
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/mozilla-1.6-gcc-3.4.patch, mozilla-1.6-r1.ebuild:
+  Fix bug 47870 (mozilla fails to compile with gcc 3.4) with one-line patch. The
+  patch doesn't seem to apply to 1.7, hopefully the problem is already fixed
+  there
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/mozilla-1.7-amd64.patch, mozilla-1.7_beta-r1.ebuild,
+  mozilla-1.7_rc1.ebuild:
+  Update amd64 patch for bug 45378. Thanks to Duncan Hill and Nigel Hannam for
+  the updated patch
+
+*mozilla-1.7_rc1 (26 Apr 2004)
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild,
+  mozilla-1.7_beta-r1.ebuild, mozilla-1.7_rc1.ebuild:
+  - Honor moznomail for enigmail, ipc and gnupg in SRC_URI.
+  - Fix bug 45671 (mozilla 1.6-r1 compiled with -fstack-protector
+    crashes on keyboard input) with filter-flags in both 1.6-r1 and
+    1.7_rc1
+  - Remove entire installed instance from /usr/lib/mozilla in pkg_preinst
+    prior to merging new version. Hopefully this will solve many
+    problems that people have had, and hopefully it won't break
+    anything. Fixes bug 27719
+
+  30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; mozilla-1.6-r1.ebuild,
+  mozilla-1.7_alpha.ebuild, mozilla-1.7_beta-r1.ebuild,
+  mozilla-1.7_beta.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  28 Mar 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_beta-r1.ebuild:
+  Add missing dodir before dosym for bug 46049
+
+  28 Mar 2004; Aron Griffis <agriffis@gentoo.org> -mozilla-1.5-r1.ebuild,
+  -mozilla-1.6.ebuild:
+  Remove older ebuilds for bug 43072: Cross-domain javascript exploit
+
+  29 Mar 2004; Lars Weiler <pylon@gentoo.org> mozilla-1.6-r1.ebuild:
+  stable on ppc
+
+  28 Mar 2004; Jon Portnoy <avenj@gentoo.org> mozilla-1.6-r1.ebuild :
+  Stable on AMD64
+
+*mozilla-1.7_beta-r1 (27 Mar 2004)
+
+  27 Mar 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_beta-r1.ebuild:
+  Add dependency on mozilla-launcher to bring this up to par with firefox
+  capabilities.  Shorten the ebuild from 621 to 553 lines.  Also update
+  syntax: replace [...] with [[...]]; replace backticks with $(...); replace
+  if [ -n `use ...` ] with if use ...; employ use_enable/use_with when
+  possible
+
+*mozilla-1.7_beta (23 Mar 2004)
+
+  23 Mar 2004; Brad Laue <brad@gentoo.org> mozilla-1.7_beta.ebuild:
+  Add Mozilla 1.7 beta. Currently needing the most testing is the new GNOME-VFS
+  support for smb:// URLs.
+
+  21 Mar 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.5-r1.ebuild,
+  mozilla-1.6-r1.ebuild, mozilla-1.6.ebuild, mozilla-1.7_alpha.ebuild:
+  Fix bug 33159 by making virtual/xft dependant on !moznoxft. This is really
+  kinda silly since mozilla requires xfree, which provides virtual/xft, but
+  whatever. Also remove deprecated ? : syntax from DEPEND
+
+  18 Mar 2004; Aron Griffis <agriffis@gentoo.org> files/mozilla.sh:
+  Fix bug 25556 by using "$@" instead of $* in mozilla.sh, thanks to Zhen Lin
+  who reported this on 2003-07-30
+
+  09 Mar 2004; <agriffis@gentoo.org> mozilla-1.6-r1.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> mozilla-1.6-r1.ebuild:
+  stable on sparc
+
+  07 Mar 2004; Brad Laue <brad@gentoo.org> mozilla-1.6-r1.ebuild:
+  Stable on x86. New version of enigmail, and Xinerama support.
+
+*mozilla-1.7_alpha (25 Feb 2004)
+
+  25 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-1.7_alpha.ebuild,
+  files/mozilla-rebuild-databases.pl, files/icon/mozilla-icon.png,
+  files/icon/mozilla.desktop:
+  Mozilla 1.7 alpha, masked for testing.
+
+*mozilla-1.6-r1 (15 Feb 2004)
+
+  15 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-1.6-r1.ebuild:
+  Bump to the next version of enigmail, and enable experimental (for now)
+  xinerama support.
+
+  15 Feb 2004; Brad Laue <brad@gentoo.org> files/10mozilla:
+  Add /usr/lib/mozilla/defaults/pref to CONFIG_PROTECT, saving local
+  administrative changes to mozilla behaviour across upgrades.
+  
+  Be careful to update the files in this directory, as they're sure to change
+  often.
+
+  09 Feb 2004; <gustavoz@gentoo.org> mozilla-1.6.ebuild:
+  Marked stable on sparc
+
+  06 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-1.6.ebuild:
+  Bump to stable on x86.
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.5-r1.ebuild:
+  stable on alpha and ia64
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> mozilla-1.5-r1.ebuild:
+  set ppc in keywords
+
+*mozilla-1.6 (16 Jan 2004)
+
+  16 Jan 2004; Brad Laue <brad@gentoo.org> mozilla-1.6.ebuild:
+  Bump to Mozilla 1.6. Many new features/bugfixes.
+
+  29 Dec 2003; Jason Wever <weeve@gentoo.org> :
+  removed stray digest file.
+
+*mozilla-1.6b (14 Dec 2003)
+
+  14 Dec 2003; Brad Laue <brad@gentoo.org> mozilla-1.6b.ebuild:
+  Bump masked version to 1.6b.
+
+  27 Nov 2003; Brad Laue <brad@gentoo.org> mozilla-1.5-r1.ebuild:
+  Remove the mozaccess USE flag, as the warning isn't enough to prevent people
+  from valiantly trying to build it :P
+
+  22 Nov 2003; Jason Wever <weeve@gentoo.org> mozilla-1.5-r1.ebuild:
+  Marked stable on sparc.
+
+  21 Nov 2003; Aron Griffis <agriffis@gentoo.org> mozilla-1.5-r1.ebuild,
+  mozilla-1.6a.ebuild:
+  Another fix to alpha/ia64 CFLAGS handling
+
+*mozilla-1.6a (20 Nov 2003)
+
+  20 Nov 2003; Brad Laue <brad@gentoo.org> mozilla-1.6a.ebuild:
+  Introducing Mozilla 1.6a, to aid in the release of new final versions.
+
+  20 Nov 2003; Aron Griffis <agriffis@gentoo.org> mozilla-1.5-r1.ebuild:
+  Minor fix to alpha/ia64 CFLAGS handling
+
+  18 Nov 2003; Aron Griffis <agriffis@gentoo.org> mozilla-1.5-r1.ebuild:
+  Merge arch-specific CFLAGS into a single case statement. Make it work for ia64
+  and alpha
+
+  18 Nov 2003; Brad Laue <brad@gentoo.org> mozilla-1.5-r1.ebuild:
+  At long last, move 1.5 into stable.
+  
+  There are a number of upstream QA issues, such as the non-default extension
+  access-builtin failing to build properly. Please read all the ebuild messages
+  before proceeding with your build, as you may need to alter your moz* USE
+  flags slightly.
+  
+  mozsvg support has been removed from this release, as the code in the mozilla 
+  trunk is  old. Discussion of merging the new branch SVG code into the
+  mozilla ebuilds is taking place with the Mozilla SVG project people, and will
+  result in far better SVG support than has been available in previous Mozilla
+  builds.
+
+*mozilla-1.5-r1 (16 Nov 2003)
+
+  16 Nov 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.1.ebuild,
+  mozilla-1.5-r1.ebuild:
+  Bump version for new enigmail, import mozilla 1.4.1
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> mozilla-1.4-r3.ebuild:
+  Stable on ia64
+
+  25 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-1.5.ebuild:
+  Add a warning about the non-default extensions, as they're not guaranteed to
+  build and will break the mozilla compile from time to time. Use at your own
+  risk.
+
+  20 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-1.5.ebuild:
+  Re-enable support for SMP, clean up some commentary in the ebuild, fix moz*
+  local USE flags to reflect the new defaults for mozilla 1.5
+
+  18 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-1.5.ebuild:
+  Fix ipc download site for mozilla 1.5
+
+  18 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-1.0.1-r3.ebuild,
+  mozilla-1.1-r1.ebuild, mozilla-1.2.1-r5.ebuild, mozilla-1.3-r2.ebuild,
+  mozilla-1.4-r3.ebuild, mozilla-1.4-r4.ebuild:
+  Fix SRC_URI to reflect the new ftp.mozilla.org directory structure
+
+  17 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-1.5.ebuild:
+  Fix package URL for the tarball - ftp.mozilla.org directory structure has
+  changed since the move to oregonstate.
+
+*mozilla-1.5 (17 Oct 2003)
+
+  17 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-1.5.ebuild:
+  Version bump - Mozilla 1.5
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> mozilla-1.4-r4.ebuild,
+  files/mozilla-1.4-amd64.patch:
+  amd64 build fixes based on mandrakes patch set
+
+  25 Sep 2003; Tavis Ormandy <taviso@gentoo.org> mozilla-1.4-r4.ebuild:
+  add -L/usr/X11R6/lib on alpha.
+
+*mozilla-1.4-r4 (21 Sep 2003)
+
+  21 Sep 2003; Brad Laue <brad@gentoo.org> mozilla-1.3-r2.ebuild,
+  mozilla-1.4-r2.ebuild, mozilla-1.4-r4.ebuild:
+  Enigmail version bump
+
+  11 Sep 2003; Luca Barbato <lu_zero@gentoo.org> mozilla-1.4-r3.ebuild:
+  Added a fix for ppc and reordered a bit
+
+  20 Aug 2003; Luca Barbato <lu_zero@gentoo.org> mozilla-1.4-r3.ebuild:
+  Marked ppc
+
+  12 Aug 2003; Jason Wever <weeve@gentoo.org> mozilla-1.4-r3.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  04 Aug 2003; Aron Griffis <agriffis@gentoo.org> mozilla-1.4-r3.ebuild:
+  Stable on alpha
+
+  04 Aug 2003; Brad Laue <brad@gentoo.org> mozilla-1.4-r3.ebuild:
+  Stable on x86
+
+  03 Aug 2003; Brad Laue <brad@gentoo.org> mozilla-1.4-r3.ebuild:
+  Filter the same flags firebird does.
+
+*mozilla-1.4-r3 (31 Jul 2003)
+
+  31 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4-r3.ebuild:
+  New enigmail version (again)
+
+*mozilla-1.4-r2 (26 Jul 2003)
+
+  26 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4-r2.ebuild:
+  Stable on x86.
+
+*mozilla-1.4-r2 (24 Jul 2003)
+
+  24 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4-r2.ebuild:
+  Another enigmail version bump.
+
+*mozilla-1.4-r1 (18 Jul 2003)
+
+  18 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4-r1.ebuild:
+  Enigmail version bump, track download sites
+
+  18 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild:
+  Build fix on 2.6 series kernels.
+
+  13 Jul 2003; Martin Schlemmer <azarah@gentoo.org> files/1.2/mozilla-1.2-image-reload-memleak.patch :
+  Fix trailing CRs cause patch to fail with latest patch (2.5.9).
+  
+  12 Jul 2003; foser <foser@gentoo.org> mozilla-1.4.ebuild :
+  Make orbit dep gtk1 only (#18153)
+
+  12 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild:
+  Stable on x86
+
+  12 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild:
+  Re-enable mozcalendar, as this builds with no dependencies anymore.
+
+  11 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild:
+  Remove the mozinterfaceinfo keyword, as this is built by default as part of
+  webservices. Possible addition of moznowebservices by Azarah to come.
+
+  10 Jul 2003; Christian Birchinger <joker@gentoo.org> mozilla-1.4.ebuild:
+  Use replace-sparc64-flags from flag-o-matic.eclass to replace the sparc64
+  CFLAGS
+
+  09 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild,
+  files/enigmail-0.76.1-Makefile:
+  Remove makemake from the ebuild and return to the practice of a prebuilt
+  makefile for enigmail - too many dependency problems were caused by one simple
+  script.
+
+  08 Jul 2003; Tavis Ormandy <taviso@gentoo.org> mozilla-1.4.ebuild:
+  explicitly link with libX11 on alpha.
+
+  08 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild:
+  Add dependency on tcsh if USE="crypt", as ./makemake requires it.
+
+  08 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild:
+  Bring Mozilla 1.4 with enigmail out into the open now that mozdev is back and
+  the files are on our mirrors.
+  
+  Small change to the enigmail sources, which seem not to include a Makefile
+  anymore. Oh well.
+
+*mozilla-1.4 (06 Jul 2003)
+
+  06 Jul 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.4.ebuild:
+  New version.  Some cleanups; enigmail needs fixing as I cannot connect
+  to mozdev.org.
+
+  29 Jun 2003; Tavis Ormandy <taviso@gentoo.org> mozilla-1.3-r2.ebuild:
+  stable on alpha
+
+  20 Jun 2003; Jason Wever <weeve@gentoo.org> mozilla-1.3-r2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*mozilla-1.3-r2 (09 Jun 2003)
+
+  09 Jun 2003; Brad Laue <brad@gentoo.org> mozilla-1.3-r2.ebuild:
+  Compile fix for Pentium 4 users - filter out -msse2 if it's present in CFLAGS
+
+  21 May 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.3-r1.ebuild :
+  Mark stable for x86.  Update enigmail bug #20234.
+
+  27 Apr 2003; Martin Schlemmer <azarah@gentoo.org> mozilla.sh :
+  Fix it to run with bash and not sh, as it have bash specific features,
+  bug #19782.
+
+  18 Apr 2003; foser <foser@gentoo.org> mozilla-1.3-r1.ebuild :
+  Fixed xft dep to be virtual
+
+  10 Apr 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.3-r1.ebuild :
+  Change permissions on compreg.dat in hope to fix bug #19034.
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.3-r1.ebuild :
+  Seems like the mail component have issues if the composer is disabled,
+  so only disable if we disable mail.
+
+*mozilla-1.3-r1 (22 Mar 2003)
+
+  22 Mar 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.3-r1.ebuild :
+  Add Gtk2 patch.  Add default/prefs/xft.js when Xft is enabled.  Some other
+  long overdue cleanups.
+
+*mozilla-1.3 (18 Mar 2003)
+
+  21 Mar 2003; Jay Kwak <jayskwak@gentoo.org> mozilla-1.3.ebuild :
+  Add XIM input patch for GTK
+  
+  18 Mar 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.3.ebuild :
+  New version.
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> mozilla-1.2.1-r5.ebuild :
+  Marked ppc stable
+
+*mozilla-1.3_beta (23 Feb 2003)
+
+  23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.3_beta.ebuild :
+  New version.
+
+*mozilla-1.2.1-r5 (19 Jan 2003)
+
+  04 Mar 2003; Jason Wever <weeve@gentoo.org> mozilla-1.2.1-r5.ebuild:
+  Changing ~sparc to sparc as this works well, has no reported bugs, and the
+  current stable mozilla (1.0.1-r3) breaks during compile.
+
+  29 Jan 2003; Jack Morgan <jmorgan@gentoo.org> mozilla-1.2.1-r*.ebuild :
+  Fixed replace-flags 
+
+  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r5.ebuild :
+  Fix a memory leak when reloading images:
+ 
+    http://bugs.gentoo.org/show_bug.cgi?id=13667
+    http://bugzilla.mozilla.org/show_bug.cgi?id=179498
+  
+  09 Jan 2003; Jack Morgan <jmorgan@gentoo.org> mozilla-1.2.1-r4.ebuild :
+  Added sparc support with replace-flags (bug #13554 - thanks to Kumba)
+
+  09 Jan 2003; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r4.ebuild :
+  We set -O in ./configure to -O1, as -O2 cause crashes on startup ...
+  (bug #13287)
+
+*mozilla-1.2.1-r4 (26 Dec 2002)
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r4.ebuild :
+  Same as last -r3, just created to make sure we have all the fixes, and
+  marked stable for x86.
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
+  Update google search plugin, closing bug #10605.
+  Fix my braindead stuff up with the "WANT_GTK2" fix of yesterday.
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
+  Add pkg_setup() to not build with gtk2 support if the user did not export
+  WANT_GTK2="yes".  I did this due to the multitude of problems with gtk2
+  support (plugins do not work, crashes, etc).
+
+  23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
+  Some cleanups for the java-config stuff in an effort to resolve bug #12610.
+
+  17 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
+  Update mozilla-1.2.1-Xrender-includes.patch.bz2 to hopefully (?) fix #12223.
+
+  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
+  Update mozilla-1.2.1-Xrender-includes.patch.bz2 to truely fix #12223.
+
+  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
+  Currently --enable-elf-dynstr-gc only works for x86 and ppc, thanks
+  to Jason Wever <weeve@gentoo.org> for the fix.
+
+*mozilla-1.2.1-r3 (16 Dec 2002)
+
+  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
+
+  Fix include problem with Xrender if the updated headers are not installed
+  system wide.  Should close bug #12223.
+
+  15 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r2.ebuild :
+
+  Add missing dirs for Xrender includes and libs.
+
+*mozilla-1.2.1-r2 (14 Dec 2002)
+
+  15 Dec 2002; Martin Holzer <mholzer@gentoo.org> mozilla-1.2.1-r2.ebuild :
+        
+  Fixed SRC_URI for the patch.
+
+
+  14 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r2.ebuild :
+
+  Update to use fontconfig-2.1 tarball (Xft2.0.1, bugfixed Xrender).  Modify
+  Xft and Xrender to install libXft_moz.so* and libXrender_moz.so*, and mozilla
+  to link to those.  This should hopefully fix bugs where mozilla do not start.
+
+  09 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r1.ebuild :
+
+  Just add more checks to see if we should apply patches/whatever that are
+  Xft2.0 related.  Fix NSS headers that was not all installed ...
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*mozilla-1.2.1-r1 (08 Dec 2002)
+
+  15 Dec 2002; Martin Holzer <mholzer@gentoo.org> mozilla-1.2.1-r1.ebuild :
+        
+  Fixed SRC_URI for the patch.
+
+
+  08 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r1.ebuild :
+
+  Add 'moznoxft' USE flag, closing bug #11680.  Remove cutnpaste-limit-fix
+  patch, as it seems flaky with 1.2.1.  Remove '--disable-jsd' configure
+  flag, as it disabled venkman.
+
+  05 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1.ebuild :
+
+  Add pango-1.1 detection back to Xft detection if 'gtk2' in USE, else
+  mozilla segfaults, as its linked to both Xft1.1 and Xft2.0.
+
+  Fix digest again.  Hope mozilla devs dont make changing the tarball a
+  habit ..
+
+  Seems gcc-3.2.1 is not stable enouth yet to handle -march=pentium4, so
+  change pentium4 to pentium3 again for all gcc3's
+
+*mozilla-1.2.1 (05 Dec 2002)
+
+  05 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1.ebuild :
+
+  Update version.
+
+  04 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.ebuild :
+
+  Also add Xft2.0 to pango-1.1 check, possibly fixing bug #11576.
+
+  Add inherit flag-o-matic to 1.0-r3 and 1.1-r1, closing bug #11584.
+
+  02 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.ebuild :
+
+  Change --with-extensions to --enable-extensions.  Add "mznoirc"
+  USE flag.  This closes 11452.
+
+  02 Dec 2002; Maik Schreiber <blizzy@gentoo.org> files/digest-mozilla-1.2:
+  Fixed digest.  This closes bug #11427.
+
+  02 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.ebuild :
+
+  Mozilla people updated the tarball, so no need for the branch update.
+  Add get_number_of_jobs() stuff, thanks to nall <nall@gentoo.org>.
+
+  01 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.ebuild :
+
+  Do not disable Xft for gtk2, as we depend on gtk+-2.1 (hopefully we
+  can get this into portage real soon).  Comment out calendar stuff
+  for now.
+
+*mozilla-1.2 (30 Nov 2002)
+
+  30 Nov 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.ebuild :
+
+  New version.  People that use DHTML should rather avoid this version, as
+  its broken in 1.2:
+   
+    http://slashdot.org/article.pl?sid=02/11/30/0029226
+
+  This should resolve bugs #11285 and #11395.
+
+  21 Nov 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2_beta.ebuild :
+
+  Add pkgconfig to DEPEND, closing bug #11036.
+
+  20 Nov 2002; Martin Schlemmer <azarah@gentoo.org> *.ebuild :
+  
+  Change to new shared nsplugin scheme, bug #10056.  Add strip-flags,
+  closing bug #10772.
+
+  19 Nov 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2_beta.ebuild :
+
+  Add DEPEND on !gtk2? dev-libs/libIDL, closing bug #10955.
+
+  19 Nov 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2_beta.ebuild :
+
+  Do not enable Xft2.0 if we are building with gtk2, as it causes mozilla to
+  segfault do to it being linked to libXft.so.1.1 *and* libXft.so.2.0.
+
+  Change the perl sed's for mozilla-config and pkgconfig files to use $MY_PV2
+  and *not* $PV.
+
+*mozilla-1.2_beta (18 Nov 2002)
+
+  18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2_beta.ebuild :
+
+  New version of 1.2b.  This adds Xft2.0 support without having to install
+  Xft2.0 (and possibly break other things), as Xft2.0 is build with mozilla
+  and installed in /usr/lib/mozilla.  Hope this makes up for the long wait :)
+  Thanks to Jelmer Jaarsma <dis-k@diska.dyndns.org> (bug #9319) for the
+  gtk2 patch.
+
+*mozilla-1.0.1-r3 (12 Nov 2002)
+
+  15 Dec 2002; Martin Holzer <mholzer@gentoo.org> mozilla-1.0.1-r3.ebuild :
+
+  Fixed SRC_URI for the patch.
+
+  18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.0.1-r3.ebuild :
+
+  Mark as stable.
+
+  12 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Update some patches from Redhat.  Disable short-wchar.  Disable libmng.
+  Disable xprint.  All these to try and stabilize things a bit.  Test seem
+  better.
+
+*mozilla-1.0.1-r2 (19 Oct 2002)
+
+  24 Oct 2002; Seemant Kulleen <seemant@gentoo.org> mozilla-1.0.1-r2.ebuild :
+
+  Added a patch to remove reading the PLATFORM environment variable as this
+  broke compilation on sparc64.  This patch was provided by:
+  wtc@netscape.com (Wan-Teh Chang) in this bug report:
+  http://bugzilla.mozilla.org/show_bug.cgi?id=174143 as it is an upstream
+  bugfix.
+
+  19 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add the abi-compat patch back, thanks to Tony Clark.
+
+  18 Oct 2002; Seemant Kulleen <seemant@gentoo.org> :
+  Add an ABI fix for sparc/sparc64 gcc-3.x based systems.
+
+  17 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add a fix for bug #7656.  This fix the missing headers from
+  X11/extensions/ in the X include dir.
+
+  13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add five patches from Mandrake (actually for moz-1.1 that I hacked
+  to work for 1.0.1) that fixes various crashes.  This seems to fix
+  the "crash on form submit bug" (bug #4715).
+
+*mozilla-1.0.1-r1 (03 Oct 2002)
+  03 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Remove '--disable-dtd-debug' from configure, as it seems
+  to fix the unstability in mozilla.  Bug #4715 related.
+
+*mozilla-1.0.1 (28 Sep 2002)
+  28 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  New version.
+
+*mozilla-1.1-r1 (7 Sep 2002)
+  9 Sep 2002; Spider <spider@gentoo.org> mozilla-1.1-r1.ebuild :
+  added the patch to make galeon cvs head build with "use gtk2" 
+
+  
+  7 Sep Martin Schlemmer <azarah@gentoo.org> mozilla-1.1-r1.ebuild :
+
+  Install pkgconfig files (*.pc).  This should resolve bug #7571.
+
+*mozilla-1.1 (30 Aug 2002)
+
+  30 Aug 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.1.ebuild :
+
+  Update version.  Also cleaned up the build some what.  Gtk+-2.0 support
+  seems usable for a change, and it also installs mozilla-remote-client,
+  thus our script will open additional URL's in the same session for
+  gtk2 version.
+
+  Added Enigmail support if "crypt" in USE, and the mail addon is built,
+  thanks to J Robert Ray <jrray@jrray.org>, closing bug #7149.
+
+  27 Aug 2002; Wout Mertens <wmertens@gentoo.org> mozilla-1.1_beta :
+
+  Changed install so that the emerge process needs rougly 80MB harddisk space
+  less. (Which brings it down to a mere 550MB :) ) Only applied to the beta
+  because I don't want to break stuff unintentionally, but it should work for
+  the 1.0 ebuilds as well. Feel free to add it to them.
+
+  11 Aug 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-{1.0-r3,1.1_beta} :
+
+  Update DEPEND to use portage-2.0.14 or later.
+
+  30 Jul 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-{1.0-r3,1.1_beta} :
+
+  Some gcc-3 fixes for pentium 4.
+
+  02 Aug 2002; Mark Guertin <gerk@gentoo.org> mozilla-{1.0-r3,1.1_beta} :
+  Added PPC ABI gcc 3.1 patches by Franz Sirl, see url for details
+  http://bugzilla.mozilla.org/show_bug.cgi?id=142594
+  Tested on gcc 3.2_pre PPC ok w/ 1.0 and 1.1a (there is no 3.1.x ppc setup)
+
+*mozilla-1.1_beta (30 Jul 2002)
+
+  30 Jul 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.1_beta :
+  Enable the mozilla-1.0-asm-fixes.patch again, as it fixes some
+  build problems with gcc-3.x.
+
+*mozilla-1.0-r4 (25 Jul 2002)
+  25 Jul 2002; Spider <spider@gentoo.org> mozilla-1.0-r4.ebuild:
+  minor changes to the build process, uses experimental makeedit.eclass
+  this version shouldn't be unmasked except for testing, as it doesn't do
+  anything constructive except make the build a bit leaner and smaller in
+  RAM requirements. 
+
+  13 Jul 2002; Martin Schlemmer <azarah@gentoo.org> mozilla.sh :
+  Update to fix a bug with gtk2 (mozilla-xremote-client are not created).
+  This cause mozilla not to run, or some wierd stuff in the browser window.
+  Should close bug #4758.
+
+*mozilla-1.0-r3 (7 Jul 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> mozilla-1.0-r3.ebuild :
+  Added KEYWORDS.
+
+  7 Jul 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.0-r3 :
+  Add gcc-3.1.1 support.  Add support for at least the flash and realmedia
+  plugins.  Add gtk2 support.
+
+  26 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add support to set NO_MAIL=YES to disable the mail and news components.
+  This hopefully resolves bug #3575.
+
+*mozilla-1.0-r2 (7 Jun 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> mozilla-1.0-r2.ebuild :
+  Added KEYWORDS.
+  7 Jun 2002; Spider <spider@gentoo.org> :
+  modify the gtk+ dependencies. we dont want gtk2 deps just yet.
+
+   
+*mozilla-1.0-r2 (6 Jun 2002)
+  6 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add xfree-4.2.0-r11 suppport.
+
+*mozilla-1.0-r1 (5 Jun 2002)
+  5 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  The 1.0_rc3-r5* adds gtk+-2.0 support, but breaks galeon, nautilus
+  and co.
+
+*mozilla-1.0 (5 Jun 2002)
+  5 Jun 2002; Brandon Low <lostlogic@gentoo.org> :
+  Took 1.0_rc3-r51 and made it 1.0 werksferme, give it a try!
+
+*mozilla-1.0_rc3-r50 (31 May 2002)
+  01 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add all my comments and stuff back.  Great work Spider!, but
+  some of these are bookmarks, etc.
+
+*mozilla-1.0_rc3-r50 (31 May 2002)
+  31 May 2002; Spider <spider@gentoo.org> :
+  very experimental gtk2 version of mozilla. Handle with care.
+  will break galeon 1!
+
+*mozilla-1.0_rc3-r2 (28 May 2002)
+
+  28 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Update to compile with freetype-2.0.9.
+
+*mozilla-1.0_rc{2,3}-r1 (26 May 2002)
+
+  29 May 2002; Wout Mertens< wmertens@gentoo.org> digest-mozilla-1.0_rc3-r1:
+
+  Committed new digest, since it seems the tarball changed
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Added dev-libs/expat to DEPEND, resolves bug #3033.
+
+*mozilla-1.0_rc3 (24 May 2002)
+
+  24 May 2002; William McArthur <sandymac@gentoo.org> mozilla-1.0_rc3.ebuild:
+
+  Updated to 1.0rc3. (Simply bumped the ebuild filename.
+
+*mozilla-1.0_rc2 (13 May 2002)
+
+  13 May 2002; Arcady Genkin <agenkin@thpoon.com> mozilla-1.0_rc2.ebuild:
+
+  Updated to 1.0rc2.
+
+*mozilla-1.0_rc1-r1 (1 May 2002)
+
+  1 Apr 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.0_rc1-r1.ebuild :
+
+  Added XFT support.
+
+  27 Apr 2002; pvdabeel <pvdabeel@gentoo.org> :
+
+  ppc(/sparc) fix 0.9.9 and 1.0-rc1
+  older ebuild should be masked out or fixed
+
+  24 Apr 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Slotted the latest ones.
+
+  13 Apr 2002; M.Schlemmer <azarah@gentoo.org> mozilla-0.9.9-r[12].ebuild :
+
+  Disable xterm updating.  Hopefully this will fix the "beep" during console
+  problem.
+
+*mozilla-0.9.9-r2 (12 Apr 2002)
+
+  12 Apr 2002; Spider <spider@gentoo.org>
+  Update all glib dependencies to use glib-1.2*  in preparation of
+  unmasking the glib-2.0.1 packages. Update libpng dependency
+
+  20 Mar 2002; Chad Huneycutt <chadh@gentoo.org> mozilla-0.9.9-r1.ebuild :
+  -changed virtual jdk depend to virtual/jre-r1 per karltk's advice for new
+  java-config functionality
+  -added java-config to DEPEND
+
+  15 Feb 2002; M.Schlemmer <azarah@gentoo.org> mozilla-0.9.8-r3.ebuild :
+
+  Hopefully fix package building dud mozilla binary.  Further fixes to stale
+  components and chrome problem.
+
+*mozilla-0.9.8-r2 (7 Feb 2002)
+
+  7 Feb 2002; M.Schlemmer <azarah@gentoo.org> mozilla-0.9.8-r2.ebuild :
+
+  Rip out libtimer_gtk.so source again, as we just do not need it around
+  when generating components.reg.  Add support for ebuild to remove 
+  libtimer_gtk.so if it is around.
+
+*mozilla-0.9.8-r1 (6 Feb 2002)
+
+  6 Feb 2002; M.Schlemmer <azarah@gentoo.org> mozilla-0.9.8-r1.ebuild :
+
+  Add source for missing libtimer_gtk.so library (timer-0.9.7.tar.bz2).
+
+*mozilla-0.9.7-r2 (3 Feb 2002)
+
+  3 Feb 2002; M.Schlemmer <azarah@gentoo.org> mozilla-0.9.7-r2.ebuild :
+
+  Add ${FILESDIR}/mozilla-0.9.7-post.patch to fix a bug in the current version
+  of mozilla not posting forms in all cases.  Resolves bug #349.
+
+*mozilla-0.9.7-r1 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
new file mode 100644
index 000000000000..3774d9971d52
--- /dev/null
+++ b/net-www/mozilla/Manifest
@@ -0,0 +1,55 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 baa134bede50138e28948993fbeb2624 mozilla-1.7-r1.ebuild 16621
+MD5 97f84c7168c47ee8c805612c5a251a01 ChangeLog 34082
+MD5 b21a98f72ae26996e2ddf64d38d42de5 mozilla-1.6-r1.ebuild 16982
+MD5 d6835f4202cbb8aaff05ca8e28063adb mozilla-1.7.2-r1.ebuild 8878
+MD5 fc2a1870cb1140a500a9608fe5720d20 mozilla-1.7.ebuild 16478
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+MD5 01b356d7ff1afde7e091ed10b251b940 files/digest-mozilla-1.7.2-r1 204
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
+MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7-r1 204
+MD5 3ad7410bd680964096c84eee3fa21abf files/mozilla-1.6-gcc-3.4.patch 460
+MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
+MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
+MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204
+MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
+MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
+MD5 a5fb876c8ca4e8dbd0208db31897f39d files/ipc-1.0.7-nsPipeChannel.patch 445
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
+MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
+MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
+MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
+MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
+MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
+MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
+MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
+MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
+MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBPMjULLFUmVNQ7rkRAqz6AJ9jdbjGcQ/qt5+IlW+frS3kMeJ5/QCggTsH
+zt908BoI5yc4238kUICE6qQ=
+=sNED
+-----END PGP SIGNATURE-----
diff --git a/net-www/mozilla/metadata.xml b/net-www/mozilla/metadata.xml
new file mode 100644
index 000000000000..74d9257900cf
--- /dev/null
+++ b/net-www/mozilla/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mozilla</herd>
+</pkgmetadata>
diff --git a/net-www/mozilla/mozilla-1.6-r1.ebuild b/net-www/mozilla/mozilla-1.6-r1.ebuild
new file mode 100644
index 000000000000..36eaae13f8e2
--- /dev/null
+++ b/net-www/mozilla/mozilla-1.6-r1.ebuild
@@ -0,0 +1,627 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.18 2004/09/09 17:31:32 brad Exp $
+
+IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
+# Internal USE flags that I do not really want to advertise ...
+IUSE="${IUSE} mozcalendar mozaccess mozxmlterm"
+IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
+
+inherit flag-o-matic gcc eutils nsplugins
+
+# Strip over-aggressive CFLAGS - Mozilla supplies its own fine-tuned CFLAGS and shouldn't be interfered with
+strip-flags
+
+# Strip flags which create more documented instability
+filter-flags -fstack-protector		# see bug 45671
+filter-flags "-fomit-frame-pointer"
+filter-flags -ffast-math
+append-flags -s -fforce-addr
+
+# Merged ARCH stuff into a single case statement.  But shouldn't this
+# stuff go in src_compile? (18 Nov 2003 agriffis)
+case "${ARCH}" in
+	alpha|ia64)
+		# Anything more than this causes segfaults on startup on 64-bit
+		# (bug 33767)
+		export CFLAGS="${CFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe"
+		export CXXFLAGS="${CXXFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe"
+		;;
+	amd64)
+		# Anything more than this causes segfaults on startup on amd64
+		# [Note: I think amd64 could use the same as above in the
+		# alpha/ia64 section, but I'll let the amd64 devs choose. -agriffis]
+		export CFLAGS="-O -Wall -fPIC -pipe"
+		export CXXFLAGS="${CFLAGS}"
+		;;
+	ppc)
+		# Fix to avoid gcc-3.3.x micompilation issues.
+		if [ "$(gcc-major-version).$(gcc-minor-version)" = "3.3" ]; then
+			append-flags -fno-strict-aliasing
+		fi
+		;;
+	sparc)
+		# Sparc support ...
+		replace-sparc64-flags
+		;;
+	*)
+		# We set -O in ./configure to -O1, as -O2 cause crashes on
+		# startup (bug 13287)
+		export CFLAGS="${CFLAGS//-O?}"
+		export CXXFLAGS="${CFLAGS//-O?}"
+		;;
+esac
+
+EMVER="0.83.3"
+IPCVER="1.0.5"
+
+PATCH_VER="1.0"
+
+# handle _rc versions
+MY_PV1="${PV/_}"
+MY_PV2="${MY_PV1/eta}"
+S="${WORKDIR}/mozilla"
+DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV2}/src/${PN}-source-${MY_PV2}.tar.bz2
+	crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+			 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+#	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+HOMEPAGE="http://www.mozilla.org"
+
+KEYWORDS="x86 ppc sparc alpha amd64 ia64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+RDEPEND="virtual/x11
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/fontconfig-2.1
+	!moznoxft? ( virtual/xft )
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.14
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? (
+		>=x11-libs/gtk+-2.2.0
+		>=dev-libs/glib-2.2.0
+		>=x11-libs/pango-1.2.1
+		>=dev-libs/libIDL-0.8.0 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2*
+		=gnome-base/orbit-0* )
+	java?  ( virtual/jre )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/perl
+	java? ( >=dev-java/java-config-0.2.0 )
+	>=sys-devel/autoconf-2.58"
+
+
+moz_setup() {
+
+	# Set MAKEOPTS to have proper -j? option ..
+	get_number_of_jobs
+	# This should enable parallel builds, I hope
+	export MAKE="emake"
+
+	# needed by src_compile() and src_install()
+	export MOZILLA_OFFICIAL=1
+	export BUILD_OFFICIAL=1
+
+	# make sure the nss module gets build (for NSS support)
+	if use ssl
+	then
+		export MOZ_PSM="1"
+	fi
+
+}
+
+src_unpack() {
+
+	moz_setup
+
+	unpack ${A}
+
+	cd ${S}
+
+	if [ "$(gcc-major-version)" -eq "3" ]
+	then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [ "${ARCH}" = "alpha" ]
+		then
+			cd ${S}; epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
+		fi
+		if [ "${ARCH}" = "amd64" ]
+		then
+			cd ${S}; epatch ${FILESDIR}/${PN}-1.4-amd64.patch
+		fi
+	fi
+
+	epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2
+	epatch ${FILESDIR}/1.2/${PN}-1.2b-over-the-spot.patch.bz2
+
+	# Fix logic error when using RAW target
+	# <azarah@gentoo.org> (23 Feb 2003)
+	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
+
+	# Fix compilation with gcc-3.4, bug 47870
+	# (26 Apr 2004 agriffis)
+	epatch ${FILESDIR}/mozilla-1.6-gcc-3.4.patch
+
+	export WANT_AUTOCONF=2.1
+	autoconf &> /dev/null
+	unset WANT_AUTOCONF
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail
+	then
+		mv -f ${WORKDIR}/ipc ${S}/extensions/
+		mv -f ${WORKDIR}/enigmail ${S}/extensions/
+		cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+		cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+	fi
+
+}
+
+src_compile() {
+
+	moz_setup
+
+	local myconf=
+	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
+	#       tested ok -- azarah
+	if use gtk2
+	then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+		                  --enable-default-toolkit=gtk2 \
+		                  --disable-toolkit-qt \
+		                  --disable-toolkit-xlib \
+		                  --disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+			              --enable-default-toolkit=gtk \
+			              --disable-toolkit-qt \
+			              --disable-toolkit-xlib \
+			              --disable-toolkit-gtk2"
+	fi
+
+	if ! use ldap
+	then
+		myconf="${myconf} --disable-ldap"
+	fi
+
+	if ! use debug
+	then
+		myconf="${myconf} --enable-strip-libs \
+			              --disable-debug \
+			              --disable-tests \
+						  --enable-reorder \
+						  --enable-strip"
+#						  --enable-cpp-rtti"
+
+		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
+		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
+		if use x86 || use ppc
+		then
+			myconf="${myconf} --enable-elf-dynstr-gc"
+		fi
+	fi
+
+	# Check if we should enable Xft support ...
+	if ! use moznoxft
+	then
+		if use gtk2
+		then
+			local pango_version=""
+
+			# We need Xft2.0 localy installed
+			if (test -x /usr/bin/pkg-config) && (pkg-config xft)
+			then
+				pango_version="`pkg-config --modversion pango | cut -d. -f1,2`"
+				pango_version="`echo ${pango_version} | sed -e 's:\.::g'`"
+
+				# We also need pango-1.1, else Mozilla links to both
+				# Xft1.1 *and* Xft2.0, and segfault...
+				if [ "${pango_version}" -gt "10" ]
+				then
+					einfo "Building with Xft2.0 (Gtk+-2.0) support!"
+					myconf="${myconf} --enable-xft --disable-freetype2"
+					touch ${WORKDIR}/.xft
+				else
+					ewarn "Building without Xft2.0 support!"
+					myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
+				fi
+			else
+				ewarn "Building without Xft2.0 support!"
+				myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
+			fi
+		else
+			einfo "Building with Xft2.0 (Gtk+-1.0) support!"
+			myconf="${myconf} --enable-xft --disable-freetype2"
+			touch ${WORKDIR}/.xft
+		fi
+	else
+		myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
+	fi
+
+	if use ipv6
+	then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+
+	# NB!!:  Due to the fact that the non default extensions do not always
+	#        compile properly, using them is considered unsupported, and
+	#        is just here for completeness.  Please do not use if you
+	#        do not know what you are doing!
+	#
+	# The defaults are:
+	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix
+	# venkman inspector irc universalchardet typeaheadfind webservices
+	# spellcheck
+	# Non-defaults are:
+	#     xmlterm access-builtin datetime finger cview
+	use mozxmlterm || use mozaccess && \
+		ewarn "" && \
+		ewarn "The use of the non-default extensions is considered unsupported, and these" && \
+		ewarn "may not always compile properly." && \
+		ewarn "Please do not use if you do not know what you're doing!" && \
+		ewarn "" && \
+		epause 3
+
+	local myext="default"
+	if use mozxmlterm
+	then
+		myext="${myext},xmlterm"
+	fi
+	if use mozaccess
+	then
+		myext="${myext},access-builtin"
+	fi
+	if use moznoirc
+	then
+		myext="${myext},-irc"
+	fi
+
+# Disable SVG until it's properly implemented
+#	if use mozsvg
+#	then
+#		export MOZ_INTERNAL_LIBART_LGPL="1"
+#		myconf="${myconf} --enable-svg"
+#	else
+#		myconf="${myconf} --disable-svg"
+#	fi
+	if use mozcalendar
+	then
+		myconf="${myconf} --enable-calendar"
+	fi
+
+	if use moznomail
+	then
+		myconf="${myconf} --disable-mailnews"
+	fi
+	if use moznocompose && use moznomail
+	then
+		myconf="${myconf} --disable-composer"
+	fi
+
+	if [ "$(gcc-major-version)" -eq "3" ]
+	then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+		if [ "${ARCH}" = "x86" ]
+		then
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+	fi
+
+	if use alpha
+	then
+		# mozilla wont link with X11 on alpha, for some crazy reason.
+		# set it to link explicitly here.
+		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
+			${S}/gfx/src/gtk/Makefile.in
+	fi
+
+	# Check for xinerama - closes #19369
+	if use xinerama ; then
+		myconf="${myconf} --enable-xinerama=yes"
+	else
+		myconf="${myconf} --enable-xinerama=no"
+	fi
+
+	# *********************************************************************
+	#
+	#  Configure and build Mozilla
+	#
+	# *********************************************************************
+
+	export BUILD_MODULES=all
+	export BUILD_OPT=1
+
+	# Get it to work without warnings on gcc3
+	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+
+	# On 64-bit we statically set 'safe' CFLAGS. Use those only.
+	# using the standard -O2 will cause segfaults on startup
+	case "${ARCH}" in
+		alpha|amd64|ia64)
+			ENABLE_OPTIMIZE="${CFLAGS}"
+			;;
+		*)
+			ENABLE_OPTIMIZE="-O2"
+			;;
+	esac
+
+	cd ${S}
+	einfo "Configuring Mozilla..."
+	./configure --prefix=/usr/lib/mozilla \
+		--disable-pedantic \
+		--disable-short-wchar \
+		--disable-xprint \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--with-system-zlib \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-extensions="${myext}" \
+		--enable-optimize="${ENABLE_OPTIMIZE}" \
+		--with-default-mozilla-five-home=/usr/lib/mozilla \
+		${myconf} || die
+
+	einfo "Building Mozilla..."
+	make WORKDIR="${WORKDIR}" || die
+
+	# *********************************************************************
+	#
+	#  Build Mozilla NSS
+	#
+	# *********************************************************************
+
+	# Build the NSS/SSL support
+	if use ssl
+	then
+		einfo "Building Mozilla NSS..."
+		cd ${S}/security/coreconf
+
+		# Fix #include problem
+		cp headers.mk headers.mk.orig
+		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
+			>>headers.mk
+
+		# Disable jobserver here ...
+		make MAKE="make" || die
+
+		cd ${S}/security/nss
+
+		# Disable jobserver here ...
+		make MAKE="make" moz_import || die
+		make MAKE="make" || die
+		cd ${S}
+	fi
+
+	# *********************************************************************
+	#
+	#  Build Enigmail plugin
+	#
+	# *********************************************************************
+
+	# Build the enigmail plugin
+	if use crypt && ! use moznomail
+	then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc
+		make || die
+
+		cd ${S}/extensions/enigmail
+		make || die
+	fi
+}
+
+src_install() {
+
+	moz_setup
+
+	# Install, don't create tarball
+	dodir /usr/lib
+	cd ${S}/xpinstall/packager
+	einfo "Installing mozilla into build root..."
+	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die
+	mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla
+
+	einfo "Installing includes and idl files..."
+	# Copy the include and idl files
+	dodir /usr/lib/mozilla/include/idl /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}/usr/lib/mozilla/include
+	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
+	dosym /usr/lib/mozilla/include /usr/include/mozilla
+
+	# Install the development tools in /usr
+	dodir /usr/bin
+	mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
+
+	# 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 /usr/lib/mozilla/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}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h}
+
+		cd ${S}/security/nss
+
+		mkdir -p ${WORKDIR}/nss/{bin,lib}
+		export BUILD_OPT=1
+		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+		make install || die
+		# Gets installed as symbolic links ...
+		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla
+
+		# Need to unset these incase we want to rebuild, else the build
+		# gets newked.
+		unset SOURCE_LIB_DIR
+		unset SOURCE_BIN_DIR
+	fi
+
+	cd ${S}/build/unix
+	# Fix mozilla-config and install it
+	perl -pi -e "s:/lib/mozilla-${MY_PV2}::g" mozilla-config
+	perl -pi -e "s:/mozilla-${MY_PV2}::g" mozilla-config
+	exeinto /usr/lib/mozilla
+	doexe mozilla-config
+	# Fix pkgconfig files and install them
+	insinto /usr/lib/pkgconfig
+	for x in *.pc
+	do
+		if [ -f ${x} ]
+		then
+			perl -pi -e "s:/lib/mozilla-${MY_PV2}::g" ${x}
+			perl -pi -e "s:/mozilla-${MY_PV2}::g" ${x}
+			doins ${x}
+		fi
+	done
+
+	cd ${S}
+	exeinto /usr/bin
+	newexe ${FILESDIR}/mozilla.sh mozilla
+	insinto /etc/env.d
+	doins ${FILESDIR}/10mozilla
+	dodoc LEGAL LICENSE README/mozilla/README*
+
+	# Install rebuild script
+	exeinto /usr/lib/mozilla/
+	newexe ${S}/build/package/rpm/SOURCES/mozilla-rebuild-databases.pl.in \
+		mozilla-rebuild-databases.pl
+	dosed 's|LIBDIR|/usr/lib|g' /usr/lib/mozilla/mozilla-rebuild-databases.pl
+	dosed 's|-MOZILLA_VERSION||g' /usr/lib/mozilla/mozilla-rebuild-databases.pl
+
+	# Move plugins dir
+	src_mv_plugins /usr/lib/mozilla/plugins
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto /usr/lib/mozilla/searchplugins
+	doins ${FILESDIR}/google.src
+
+	if [ -f "${WORKDIR}/.xft" ]
+	then
+		# We are using Xft, so change the default font
+		insinto /usr/lib/mozilla/defaults/pref
+		doins ${FILESDIR}/xft.js
+	fi
+
+	# Fix icons to look the same everywhere
+	insinto /usr/lib/mozilla/icons
+	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
+	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
+
+	# Install icon and .desktop for menu entry
+	if use gnome
+	then
+		insinto /usr/share/pixmaps
+		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
+
+		# Fix comment of menu entry
+		cd ${S}/build/package/rpm/SOURCES
+		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Web Browser:' mozilla.desktop
+		cd ${S}
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
+	fi
+
+	# Take care of non root execution
+	# (seems the problem is that not all files are readible by the user)
+	einfo "Fixing Permissions..."
+	chmod -R g+r,o+r ${D}/usr/lib/mozilla
+	find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
+}
+
+pkg_preinst() {
+	# Stale components and chrome files break when unmerging old
+	if [ -d ${ROOT}/usr/lib/mozilla/components ]
+	then
+		rm -rf ${ROOT}/usr/lib/mozilla/components
+	fi
+	if [ -d ${ROOT}/usr/lib/mozilla/chrome ]
+	then
+		rm -rf ${ROOT}/usr/lib/mozilla/chrome
+	fi
+
+	# Remove stale component registry.
+	if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
+	then
+		rm -f ${ROOT}/usr/lib/mozilla/component.reg
+	fi
+	if [ -e ${ROOT}/usr/lib/mozilla/components/compreg.dat ]
+	then
+		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+	fi
+
+	# Make sure these are removed.
+	rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+
+	# Move old plugins dir
+	pkg_mv_plugins /usr/lib/mozilla/plugins
+}
+
+pkg_postinst() {
+
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+	# Needed to update the run time bindings for REGXPCOM
+	# (do not remove next line!)
+	env-update
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
+
+
+	echo
+	ewarn "Please unmerge old versions of mozilla, as the header"
+	ewarn "layout in /usr/lib/mozilla/include have changed and will"
+	ewarn "result in compile errors when compiling programs that need"
+	ewarn "mozilla headers and libs (galeon, nautilus, ...)"
+}
+
+pkg_postrm() {
+
+	# Regenerate component.reg in case some things changed
+	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ]
+	then
+		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+		if [ -x "${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl" ]
+		then
+			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+			# Fix directory permissions
+			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; || :
+			# Fix permissions on chrome files
+			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
+		fi
+	fi
+}
+
diff --git a/net-www/mozilla/mozilla-1.7-r1.ebuild b/net-www/mozilla/mozilla-1.7-r1.ebuild
new file mode 100644
index 000000000000..e1cbd9e3ccac
--- /dev/null
+++ b/net-www/mozilla/mozilla-1.7-r1.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7-r1.ebuild,v 1.6 2004/09/09 17:31:32 brad Exp $
+
+IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
+# Internal USE flags that I do not really want to advertise ...
+IUSE="${IUSE} mozcalendar mozsvg"
+IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher
+
+EMVER="0.84.1"
+IPCVER="1.0.6"
+
+# 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="The Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
+	crypt? ( !moznomail? (
+		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz
+		mirror://gentoo/enigmail-${EMVER}-r1.tar.gz
+	) )"
+# Normally the following would be used instead of the mirror://gentoo/
+# reference above, but the upstream source tarball changed without
+# changing the filename.  (17 Jun 2004 agriffis)
+#		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+common_depends="virtual/x11
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/fontconfig-2.1
+	!moznoxft? ( virtual/xft )
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.14
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? (
+		>=x11-libs/gtk+-2.2.0
+		>=dev-libs/glib-2.2.0
+		>=x11-libs/pango-1.2.1
+		>=dev-libs/libIDL-0.8.0 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2*
+		=gnome-base/orbit-0* )
+	java?  ( virtual/jre )
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
+	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )"
+
+DEPEND="${common_depends}
+	dev-util/pkgconfig
+	dev-lang/perl
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+RDEPEND="${common_depends}
+	>=net-www/mozilla-launcher-1.7-r1"
+
+S="${WORKDIR}/mozilla"
+
+pkg_setup() {
+	# needed by src_compile() and src_install()
+	export MOZILLA_OFFICIAL=1
+	export BUILD_OFFICIAL=1
+
+	# make sure the nss module gets build (for NSS support)
+	if use ssl; then
+		export MOZ_PSM="1"
+	fi
+}
+
+# Simulate the silly csh makemake script
+makemake() {
+	typeset m topdir
+
+	for m in $(find . -name Makefile.in); do
+		topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
+		sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
+			< ${m} > ${m%.in} || die "sed ${m} failed"
+	done
+}
+
+src_unpack() {
+	typeset x
+
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
+		fi
+		# unecessary now, already in the source
+		# Danny van Dyk <kugelfang@gentoo.org> 2004/06/20
+		#if [[ ${ARCH} == amd64 ]]; then
+		#	epatch ${FILESDIR}/${PN}-1.7-amd64.patch
+		#fi
+	fi
+
+	epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2
+
+	# Fix logic error when using RAW target
+	# <azarah@gentoo.org> (23 Feb 2003)
+	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
+
+	# Fix incorrect version in milestone.txt (1.7rc1 claims 1.7b)
+	# If 1.7rc2 is anything to go by, then milestone.txt should report
+	# the upcoming version number, e.g. 1.7
+	local old_milestone=$(grep '^[0-9]' config/milestone.txt)
+	if [[ ${old_milestone} != ${PV%_*} ]]; then
+		einfo "Updating milestone.txt from ${old_milestone} to ${PV%_*}"
+		sed -i -ne '/^#/p' config/milestone.txt   # maintain comments
+		echo "${PV%_*}" >> config/milestone.txt   # add version line
+	fi
+
+	WANT_AUTOCONF_2_1=1 autoconf &> /dev/null
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die
+			cd ${S}/extensions/${x} || die
+			makemake	# see function above
+		done
+
+		# Fix ipc-1.0.6 compilation problem by updating line from cvs
+		# (09 Jun 2004 agriffis)
+		cd ${S}/extensions/ipc
+		epatch ${FILESDIR}/ipc-1.0.6-nsPipeChannel.patch
+	fi
+}
+
+src_compile() {
+	####################################
+	#
+	# myconf setup
+	#
+	####################################
+
+	local myconf
+
+	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
+	#       tested ok -- azarah
+	if use gtk2; then
+		myconf="${myconf}
+			--enable-toolkit-gtk2 \
+			--enable-default-toolkit=gtk2 \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk"
+	else
+		myconf="${myconf}
+			--enable-toolkit-gtk \
+			--enable-default-toolkit=gtk \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk2"
+	fi
+
+	if ! use debug; then
+		myconf="${myconf} \
+			--disable-debug \
+			--disable-tests \
+			--enable-reorder \
+			--enable-strip \
+			--enable-strip-libs"
+#			--enable-cpp-rtti"
+
+		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
+		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
+		if use x86 || use ppc; then
+			myconf="${myconf} --enable-elf-dynstr-gc"
+		fi
+	fi
+
+	# Check if we should enable Xft support ...
+	if ! use moznoxft; then
+		if use gtk2; then
+			local pango_version=""
+
+			# We need Xft2.0 localy installed
+			if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
+				pango_version=$(pkg-config --modversion pango | cut -d. -f1,2)
+
+				# We also need pango-1.1, else Mozilla links to both
+				# Xft1.1 *and* Xft2.0, and segfault...
+				if [[ ${pango_version//.} -gt 10 ]]; then
+					einfo "Building with Xft2.0 (Gtk+-2.0) support"
+					myconf="${myconf} --enable-xft --disable-freetype2"
+					touch ${WORKDIR}/.xft
+				else
+					ewarn "Building without Xft2.0 support (bad pango)"
+					myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+				fi
+			else
+				ewarn "Building without Xft2.0 support (no pkg-config xft)"
+				myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+			fi
+		else
+			einfo "Building with Xft2.0 (Gtk+-1.0) support"
+			myconf="${myconf} --enable-xft --disable-freetype2"
+			touch ${WORKDIR}/.xft
+		fi
+	else
+		einfo "Building without Xft2.0 support (moznoxft)"
+		myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+	fi
+
+	# Re-enabled per bug 24522 (28 Apr 2004 agriffis)
+	if use mozsvg; then
+		export MOZ_INTERNAL_LIBART_LGPL=1
+		myconf="${myconf} --enable-svg --enable-svg-renderer-libart"
+	else
+		myconf="${myconf} --disable-svg"
+	fi
+
+	if use moznomail && ! use mozcalendar; then
+		myconf="${myconf} --disable-mailnews"
+	fi
+	if use moznocompose && use moznomail; then
+		myconf="${myconf} --disable-composer"
+	fi
+
+	####################################
+	#
+	# myext setup
+	#
+	####################################
+
+	# The defaults are:
+	#     cookie wallet content-packs xml-rpc xmlextras help p3p pref
+	#     transformiix venkman inspector irc universalchardet
+	#     typeaheadfind webservices spellcheck
+	# Non-defaults are:
+	#     xmlterm access-builtin datetime finger cview
+
+	# Remove access and xmlterm as options since they're preventing the build
+	# more than they work. (04 Jul 2004 brad)
+	#if use mozxmlterm || use mozaccess; then
+	#	ewarn ""
+	#	ewarn "NB!!: The use of the non-default extensions is considered"
+	#	ewarn "unsupported, and these may not always compile properly."
+	#	ewarn "Please do not use if you do not know what you're doing!"
+	#	ewarn ""
+	#	sleep 3
+	#fi
+
+	local myext="default"
+	#use mozxmlterm && myext="${myext},xmlterm"
+	#use mozaccess  && myext="${myext},access-builtin"
+	use moznoirc   && myext="${myext},-irc"
+
+	####################################
+	#
+	# CFLAGS setup and ARCH support
+	#
+	####################################
+
+	# Set optimization level based on CFLAGS
+	if is-flag -O0; then
+		enable_optimize=-O0
+	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
+		# Anything more than this causes segfaults on startup on 64-bit
+		# (bug 33767)
+		enable_optimize=-O1
+		append-flags -fPIC
+	elif is-flag -O1; then
+		enable_optimize=-O1
+	else
+		enable_optimize=-O2
+	fi
+
+	# Now strip optimization from CFLAGS so it doesn't end up in the
+	# compile string
+	filter-flags '-O*'
+
+	# Strip over-aggressive CFLAGS - Mozilla supplies its own
+	# fine-tuned CFLAGS and shouldn't be interfered with..  Do this
+	# AFTER setting optimization above since strip-flags only allows
+	# -O -O1 and -O2
+	strip-flags
+
+	# Who added the following line and why?  It doesn't really hurt
+	# anything, but is it necessary??  (28 Apr 2004 agriffis)
+	append-flags -fforce-addr
+
+	# Additional ARCH support
+	case "${ARCH}" in
+	alpha)
+		# Mozilla won't link with X11 on alpha, for some crazy reason.
+		# set it to link explicitly here.
+		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
+			${S}/gfx/src/gtk/Makefile.in
+		;;
+
+	ppc)
+		# Fix to avoid gcc-3.3.x micompilation issues.
+		if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
+			append-flags -fno-strict-aliasing
+		fi
+		;;
+
+	sparc)
+		# Sparc support ...
+		replace-sparc64-flags
+		;;
+
+	x86)
+		if [[ $(gcc-major-version) -eq 3 ]]; then
+			# gcc-3 prior to 3.2.3 doesn't work well for pentium4
+			# see bug 25332
+			if [[ $(gcc-minor-version) -lt 2 ||
+				( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
+			then
+				replace-flags -march=pentium4 -march=pentium3
+				filter-flags -msse2
+			fi
+			# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+		;;
+	esac
+
+	# Needed to build without warnings on gcc-3
+	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+
+	####################################
+	#
+	#  Configure and build Mozilla
+	#
+	####################################
+
+	export BUILD_MODULES=all
+	export BUILD_OPT=1
+
+	cd ${S}
+	einfo "Configuring Mozilla..."
+	./configure --prefix=/usr/lib/mozilla \
+		--with-system-jpeg \
+		--with-system-mng \
+		--with-system-png \
+		--with-system-zlib \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable mozcalendar calendar) \
+		$(use_enable xprint) \
+		$(use_enable xinerama) \
+		--disable-pedantic \
+		--disable-short-wchar \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-extensions="${myext}" \
+		--enable-optimize="${enable_optimize}" \
+		--with-default-mozilla-five-home=/usr/lib/mozilla \
+		${myconf} || die
+
+	einfo "Building Mozilla..."
+	emake WORKDIR="${WORKDIR}" || 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 plugin
+	#
+	####################################
+
+	# Build the enigmail plugin
+	if use crypt && ! use moznomail; then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc || die "cd ipc failed"
+		emake || die "make ipc failed"
+
+		cd ${S}/extensions/enigmail || die "cd enigmail failed"
+		emake || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	# Install, don't create tarball
+	dodir /usr/lib
+	cd ${S}/xpinstall/packager
+	einfo "Installing mozilla into build root..."
+	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die
+	mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla
+
+	einfo "Installing includes and idl files..."
+	# Copy the include and idl files
+	dodir /usr/lib/mozilla/include/idl /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}/usr/lib/mozilla/include
+	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
+	dosym /usr/lib/mozilla/include /usr/include/mozilla
+
+	# Install the development tools in /usr
+	dodir /usr/bin
+	mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
+
+	# 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 /usr/lib/mozilla/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}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h}
+
+		cd ${S}/security/nss
+
+		mkdir -p ${WORKDIR}/nss/{bin,lib}
+		export BUILD_OPT=1
+		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+		make install || die
+		# Gets installed as symbolic links ...
+		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla
+
+		# Need to unset these incase we want to rebuild, else the build
+		# gets newked.
+		unset SOURCE_LIB_DIR
+		unset SOURCE_BIN_DIR
+	fi
+
+	cd ${S}/build/unix
+	# Fix mozilla-config and install it
+	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
+	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
+	exeinto /usr/lib/mozilla
+	doexe mozilla-config
+	# Fix pkgconfig files and install them
+	insinto /usr/lib/pkgconfig
+	for x in *.pc; do
+		if [[ -f ${x} ]]; then
+			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
+			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
+			doins ${x}
+		fi
+	done
+	cd ${S}
+
+	dodir /usr/bin
+	dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla
+	insinto /etc/env.d
+	doins ${FILESDIR}/10mozilla
+	dodoc LEGAL LICENSE README/mozilla/README*
+
+	# Install rebuild script
+	exeinto /usr/lib/mozilla/
+	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+
+	# Move plugins dir
+	src_mv_plugins /usr/lib/mozilla/plugins
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto /usr/lib/mozilla/searchplugins
+	doins ${FILESDIR}/google.src
+
+	if [[ -f "${WORKDIR}/.xft" ]]; then
+		# We are using Xft, so change the default font
+		insinto /usr/lib/mozilla/defaults/pref
+		doins ${FILESDIR}/xft.js
+	fi
+
+	# Fix icons to look the same everywhere
+	insinto /usr/lib/mozilla/icons
+	doins ${S}/widget/src/gtk/mozicon16.xpm
+	doins ${S}/widget/src/gtk/mozicon50.xpm
+
+	# Install icon and .desktop for menu entry
+	if use gnome; then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/icon/mozilla-icon.png
+
+		insinto /usr/share/applications
+		doins ${FILESDIR}/icon/mozilla.desktop
+	fi
+
+	# Take care of non root execution
+	# (seems the problem is that not all files are readible by the user)
+	einfo "Fixing Permissions..."
+	chmod -R g+r,o+r ${D}/usr/lib/mozilla
+	find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
+}
+
+pkg_preinst() {
+	# Move old plugins dir
+	pkg_mv_plugins /usr/lib/mozilla/plugins
+
+	if true; then
+		# Remove entire installed instance to solve various problems,
+		# for example see bug 27719
+		rm -rf ${ROOT}/usr/lib/mozilla
+	else
+		# Stale components and chrome files break when unmerging old
+		rm -rf ${ROOT}/usr/lib/mozilla/components
+		rm -rf ${ROOT}/usr/lib/mozilla/chrome
+
+		# Remove stale component registry.
+		rm -f ${ROOT}/usr/lib/mozilla/component.reg
+		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+
+		# Make sure these are removed.
+		rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+	fi
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+	# Needed to update the run time bindings for REGXPCOM
+	# (do not remove next line!)
+	env-update
+
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \;
+
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
+
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	# Regenerate component.reg in case some things changed
+	if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then
+		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
+			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+			# Fix directory permissions
+			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
+			# Fix permissions on chrome files
+			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
+		fi
+	fi
+
+	update_mozilla_launcher_symlinks
+}
diff --git a/net-www/mozilla/mozilla-1.7.2-r1.ebuild b/net-www/mozilla/mozilla-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..73c792a59dbf
--- /dev/null
+++ b/net-www/mozilla/mozilla-1.7.2-r1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.2-r1.ebuild,v 1.3 2004/09/09 17:31:32 brad Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozilla makeedit
+
+IUSE="java crypt gtk2 ssl"
+# Internal USE flags that I do not really want to advertise ...
+IUSE="${IUSE} mozcalendar moznoirc moznomail moznocompose moznoxft"
+
+EMVER="0.85.0"
+IPCVER="1.0.7"
+
+# 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="mirror://gentoo/${PN}-source3-${MY_PV}.tar.bz2
+	crypt? ( !moznomail? (
+		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz
+		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+	) )"
+# mozilla.org screwed up the source tarball for 1.7.2
+#	http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
+
+KEYWORDS="x86 ppc sparc alpha amd64 ia64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+RDEPEND="java? ( virtual/jre )
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )"
+
+DEPEND="${RDEPEND}
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl"
+
+S="${WORKDIR}/mozilla"
+
+src_unpack() {
+	typeset x
+
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
+		fi
+	fi
+
+	# Fix logic error when using RAW target
+	# <azarah@gentoo.org> (23 Feb 2003)
+	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
+
+	WANT_AUTOCONF_2_1=1 autoconf || die
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die
+			cd ${S}/extensions/${x} || die
+			makemake	# from mozilla.eclass
+		done
+
+		# Fix mozilla-specific ipc-1.0.7 compilation problem
+		# (07 Aug 2004 agriffis)
+		cd ${S}
+		epatch ${FILESDIR}/ipc-1.0.7-nsPipeChannel.patch || die
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	####################################
+	#
+	# myconf, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	# mozilla_conf comes from mozilla.eclass
+	mozilla_conf
+
+	myconf="${myconf} \
+		--prefix=/usr/lib/mozilla \
+		--with-default-mozilla-five-home=/usr/lib/mozilla"
+
+	####################################
+	#
+	#  Configure and build Mozilla
+	#
+	####################################
+
+	./configure ${myconf} || die
+
+	# 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 plugin
+	#
+	####################################
+
+	# Build the enigmail plugin
+	if use crypt && ! use moznomail; then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc || die "cd ipc failed"
+		emake || die "make ipc failed"
+
+		cd ${S}/extensions/enigmail || die "cd enigmail failed"
+		emake || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	# Install, don't create tarball
+	dodir /usr/lib
+	cd ${S}/xpinstall/packager
+	einfo "Installing mozilla into build root..."
+	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die
+	mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla
+
+	einfo "Installing includes and idl files..."
+	# Copy the include and idl files
+	dodir /usr/lib/mozilla/include/idl /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}/usr/lib/mozilla/include
+	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
+	dosym /usr/lib/mozilla/include /usr/include/mozilla
+
+	# Install the development tools in /usr
+	dodir /usr/bin
+	mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
+
+	# 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 /usr/lib/mozilla/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}/usr/lib/mozilla/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
+		# Gets installed as symbolic links ...
+		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla
+
+		# Need to unset these incase we want to rebuild, else the build
+		# gets newked.
+		unset SOURCE_LIB_DIR
+		unset SOURCE_BIN_DIR
+	fi
+
+	cd ${S}/build/unix
+	# Fix mozilla-config and install it
+	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
+	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
+	exeinto /usr/lib/mozilla
+	doexe mozilla-config
+	# Fix pkgconfig files and install them
+	insinto /usr/lib/pkgconfig
+	for x in *.pc; do
+		if [[ -f ${x} ]]; then
+			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
+			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
+			doins ${x}
+		fi
+	done
+	cd ${S}
+
+	dodir /usr/bin
+	dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla
+	insinto /etc/env.d
+	doins ${FILESDIR}/10mozilla
+	dodoc LEGAL LICENSE README/mozilla/README*
+
+	# Install rebuild script
+	exeinto /usr/lib/mozilla/
+	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+
+	# Move plugins dir
+	src_mv_plugins /usr/lib/mozilla/plugins
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto /usr/lib/mozilla/searchplugins
+	doins ${FILESDIR}/google.src
+
+	if [[ -f "${WORKDIR}/.xft" ]]; then
+		# We are using Xft, so change the default font
+		insinto /usr/lib/mozilla/defaults/pref
+		doins ${FILESDIR}/xft.js
+	fi
+
+	# Fix icons to look the same everywhere
+	insinto /usr/lib/mozilla/icons
+	doins ${S}/widget/src/gtk/mozicon16.xpm
+	doins ${S}/widget/src/gtk/mozicon50.xpm
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/mozilla-icon.png
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozilla.desktop
+
+	# Take care of non root execution
+	# (seems the problem is that not all files are readible by the user)
+	einfo "Fixing Permissions..."
+	chmod -R g+r,o+r ${D}/usr/lib/mozilla
+	find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
+}
+
+pkg_preinst() {
+	# Move old plugins dir
+	pkg_mv_plugins /usr/lib/mozilla/plugins
+
+	if true; then
+		# Remove entire installed instance to solve various problems,
+		# for example see bug 27719
+		rm -rf ${ROOT}/usr/lib/mozilla
+	else
+		# Stale components and chrome files break when unmerging old
+		rm -rf ${ROOT}/usr/lib/mozilla/components
+		rm -rf ${ROOT}/usr/lib/mozilla/chrome
+
+		# Remove stale component registry.
+		rm -f ${ROOT}/usr/lib/mozilla/component.reg
+		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+
+		# Make sure these are removed.
+		rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+	fi
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+	# Needed to update the run time bindings for REGXPCOM
+	# (do not remove next line!)
+	env-update
+
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \;
+
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
+
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	# Regenerate component.reg in case some things changed
+	if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then
+		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
+			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+			# Fix directory permissions
+			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
+			# Fix permissions on chrome files
+			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
+		fi
+	fi
+
+	update_mozilla_launcher_symlinks
+}
diff --git a/net-www/mozilla/mozilla-1.7.ebuild b/net-www/mozilla/mozilla-1.7.ebuild
new file mode 100644
index 000000000000..0de44e7f7ad9
--- /dev/null
+++ b/net-www/mozilla/mozilla-1.7.ebuild
@@ -0,0 +1,576 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.ebuild,v 1.14 2004/09/09 17:31:32 brad Exp $
+
+IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
+# Internal USE flags that I do not really want to advertise ...
+IUSE="${IUSE} mozcalendar mozsvg"
+IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins
+
+EMVER="0.84.1"
+IPCVER="1.0.6"
+
+# 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="The Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
+	crypt? ( !moznomail? (
+		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz
+		mirror://gentoo/enigmail-${EMVER}-r1.tar.gz
+	) )"
+# Normally the following would be used instead of the mirror://gentoo/
+# reference above, but the upstream source tarball changed without
+# changing the filename.  (17 Jun 2004 agriffis)
+#		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+
+KEYWORDS="x86 ~ppc sparc ~alpha amd64 ~ia64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+RDEPEND="virtual/x11
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/fontconfig-2.1
+	!moznoxft? ( virtual/xft )
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.14
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? (
+		>=x11-libs/gtk+-2.2.0
+		>=dev-libs/glib-2.2.0
+		>=x11-libs/pango-1.2.1
+		>=dev-libs/libIDL-0.8.0 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2*
+		=gnome-base/orbit-0* )
+	java?  ( virtual/jre )
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
+	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )
+	>=net-www/mozilla-launcher-1.7-r1"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/perl
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+S="${WORKDIR}/mozilla"
+
+pkg_setup() {
+	# needed by src_compile() and src_install()
+	export MOZILLA_OFFICIAL=1
+	export BUILD_OFFICIAL=1
+
+	# make sure the nss module gets build (for NSS support)
+	if use ssl; then
+		export MOZ_PSM="1"
+	fi
+}
+
+# Simulate the silly csh makemake script
+makemake() {
+	typeset m topdir
+
+	for m in $(find . -name Makefile.in); do
+		topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
+		sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
+			< ${m} > ${m%.in} || die "sed ${m} failed"
+	done
+}
+
+src_unpack() {
+	typeset x
+
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
+		fi
+		# unecessary now, already in the source
+		# Danny van Dyk <kugelfang@gentoo.org> 2004/06/20
+		#if [[ ${ARCH} == amd64 ]]; then
+		#	epatch ${FILESDIR}/${PN}-1.7-amd64.patch
+		#fi
+	fi
+
+	epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2
+
+	# Fix logic error when using RAW target
+	# <azarah@gentoo.org> (23 Feb 2003)
+	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
+
+	# Fix incorrect version in milestone.txt (1.7rc1 claims 1.7b)
+	# If 1.7rc2 is anything to go by, then milestone.txt should report
+	# the upcoming version number, e.g. 1.7
+	local old_milestone=$(grep '^[0-9]' config/milestone.txt)
+	if [[ ${old_milestone} != ${PV%_*} ]]; then
+		einfo "Updating milestone.txt from ${old_milestone} to ${PV%_*}"
+		sed -i -ne '/^#/p' config/milestone.txt   # maintain comments
+		echo "${PV%_*}" >> config/milestone.txt   # add version line
+	fi
+
+	WANT_AUTOCONF_2_1=1 autoconf &> /dev/null
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die
+			cd ${S}/extensions/${x} || die
+			makemake	# see function above
+		done
+
+		# Fix ipc-1.0.6 compilation problem by updating line from cvs
+		# (09 Jun 2004 agriffis)
+		cd ${S}/extensions/ipc
+		epatch ${FILESDIR}/ipc-1.0.6-nsPipeChannel.patch
+	fi
+}
+
+src_compile() {
+	####################################
+	#
+	# myconf setup
+	#
+	####################################
+
+	local myconf
+
+	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
+	#       tested ok -- azarah
+	if use gtk2; then
+		myconf="${myconf}
+			--enable-toolkit-gtk2 \
+			--enable-default-toolkit=gtk2 \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk"
+	else
+		myconf="${myconf}
+			--enable-toolkit-gtk \
+			--enable-default-toolkit=gtk \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk2"
+	fi
+
+	if ! use debug; then
+		myconf="${myconf} \
+			--disable-debug \
+			--disable-tests \
+			--enable-reorder \
+			--enable-strip \
+			--enable-strip-libs"
+#			--enable-cpp-rtti"
+
+		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
+		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
+		if use x86 || use ppc; then
+			myconf="${myconf} --enable-elf-dynstr-gc"
+		fi
+	fi
+
+	# Check if we should enable Xft support ...
+	if ! use moznoxft; then
+		if use gtk2; then
+			local pango_version=""
+
+			# We need Xft2.0 localy installed
+			if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
+				pango_version=$(pkg-config --modversion pango | cut -d. -f1,2)
+
+				# We also need pango-1.1, else Mozilla links to both
+				# Xft1.1 *and* Xft2.0, and segfault...
+				if [[ ${pango_version//.} -gt 10 ]]; then
+					einfo "Building with Xft2.0 (Gtk+-2.0) support"
+					myconf="${myconf} --enable-xft --disable-freetype2"
+					touch ${WORKDIR}/.xft
+				else
+					ewarn "Building without Xft2.0 support (bad pango)"
+					myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+				fi
+			else
+				ewarn "Building without Xft2.0 support (no pkg-config xft)"
+				myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+			fi
+		else
+			einfo "Building with Xft2.0 (Gtk+-1.0) support"
+			myconf="${myconf} --enable-xft --disable-freetype2"
+			touch ${WORKDIR}/.xft
+		fi
+	else
+		einfo "Building without Xft2.0 support (moznoxft)"
+		myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+	fi
+
+	# Re-enabled per bug 24522 (28 Apr 2004 agriffis)
+	if use mozsvg; then
+		export MOZ_INTERNAL_LIBART_LGPL=1
+		myconf="${myconf} --enable-svg --enable-svg-renderer-libart"
+	else
+		myconf="${myconf} --disable-svg"
+	fi
+
+	if use moznomail && ! use mozcalendar; then
+		myconf="${myconf} --disable-mailnews"
+	fi
+	if use moznocompose && use moznomail; then
+		myconf="${myconf} --disable-composer"
+	fi
+
+	####################################
+	#
+	# myext setup
+	#
+	####################################
+
+	# The defaults are:
+	#     cookie wallet content-packs xml-rpc xmlextras help p3p pref
+	#     transformiix venkman inspector irc universalchardet
+	#     typeaheadfind webservices spellcheck
+	# Non-defaults are:
+	#     xmlterm access-builtin datetime finger cview
+
+	# Remove access and xmlterm as options since they're preventing the build
+	# more than they work. (04 Jul 2004 brad)
+	#if use mozxmlterm || use mozaccess; then
+	#	ewarn ""
+	#	ewarn "NB!!: The use of the non-default extensions is considered"
+	#	ewarn "unsupported, and these may not always compile properly."
+	#	ewarn "Please do not use if you do not know what you're doing!"
+	#	ewarn ""
+	#	sleep 3
+	#fi
+
+	local myext="default"
+	#use mozxmlterm && myext="${myext},xmlterm"
+	#use mozaccess  && myext="${myext},access-builtin"
+	use moznoirc   && myext="${myext},-irc"
+
+	####################################
+	#
+	# CFLAGS setup and ARCH support
+	#
+	####################################
+
+	# Set optimization level based on CFLAGS
+	if is-flag -O0; then
+		enable_optimize=-O0
+	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
+		# Anything more than this causes segfaults on startup on 64-bit
+		# (bug 33767)
+		enable_optimize=-O1
+		append-flags -fPIC
+	elif is-flag -O1; then
+		enable_optimize=-O1
+	else
+		enable_optimize=-O2
+	fi
+
+	# Now strip optimization from CFLAGS so it doesn't end up in the
+	# compile string
+	filter-flags '-O*'
+
+	# Strip over-aggressive CFLAGS - Mozilla supplies its own
+	# fine-tuned CFLAGS and shouldn't be interfered with..  Do this
+	# AFTER setting optimization above since strip-flags only allows
+	# -O -O1 and -O2
+	strip-flags
+
+	# Who added the following line and why?  It doesn't really hurt
+	# anything, but is it necessary??  (28 Apr 2004 agriffis)
+	append-flags -fforce-addr
+
+	# Additional ARCH support
+	case "${ARCH}" in
+	alpha)
+		# Mozilla won't link with X11 on alpha, for some crazy reason.
+		# set it to link explicitly here.
+		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
+			${S}/gfx/src/gtk/Makefile.in
+		;;
+
+	ppc)
+		# Fix to avoid gcc-3.3.x micompilation issues.
+		if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
+			append-flags -fno-strict-aliasing
+		fi
+		;;
+
+	sparc)
+		# Sparc support ...
+		replace-sparc64-flags
+		;;
+
+	x86)
+		if [[ $(gcc-major-version) -eq 3 ]]; then
+			# gcc-3 prior to 3.2.3 doesn't work well for pentium4
+			# see bug 25332
+			if [[ $(gcc-minor-version) -lt 2 ||
+				( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
+			then
+				replace-flags -march=pentium4 -march=pentium3
+				filter-flags -msse2
+			fi
+			# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+		;;
+	esac
+
+	# Needed to build without warnings on gcc-3
+	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+
+	####################################
+	#
+	#  Configure and build Mozilla
+	#
+	####################################
+
+	export BUILD_MODULES=all
+	export BUILD_OPT=1
+
+	cd ${S}
+	einfo "Configuring Mozilla..."
+	./configure --prefix=/usr/lib/mozilla \
+		--with-system-jpeg \
+		--with-system-mng \
+		--with-system-png \
+		--with-system-zlib \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable mozcalendar calendar) \
+		$(use_enable xprint) \
+		$(use_enable xinerama) \
+		--disable-pedantic \
+		--disable-short-wchar \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-extensions="${myext}" \
+		--enable-optimize="${enable_optimize}" \
+		--with-default-mozilla-five-home=/usr/lib/mozilla \
+		${myconf} || die
+
+	einfo "Building Mozilla..."
+	make WORKDIR="${WORKDIR}" || 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
+		make || die "make security headers failed"
+
+		cd ${S}/security/nss || die "cd nss failed"
+		make moz_import || die "make moz_import failed"
+		make || die "make nss failed"
+	fi
+
+	####################################
+	#
+	#  Build Enigmail plugin
+	#
+	####################################
+
+	# Build the enigmail plugin
+	if use crypt && ! use moznomail; then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc || die "cd ipc failed"
+		make || die "make ipc failed"
+
+		cd ${S}/extensions/enigmail || die "cd enigmail failed"
+		make || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	# Install, don't create tarball
+	dodir /usr/lib
+	cd ${S}/xpinstall/packager
+	einfo "Installing mozilla into build root..."
+	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die
+	mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla
+
+	einfo "Installing includes and idl files..."
+	# Copy the include and idl files
+	dodir /usr/lib/mozilla/include/idl /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}/usr/lib/mozilla/include
+	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
+	dosym /usr/lib/mozilla/include /usr/include/mozilla
+
+	# Install the development tools in /usr
+	dodir /usr/bin
+	mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
+
+	# 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 /usr/lib/mozilla/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}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h}
+
+		cd ${S}/security/nss
+
+		mkdir -p ${WORKDIR}/nss/{bin,lib}
+		export BUILD_OPT=1
+		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+		make install || die
+		# Gets installed as symbolic links ...
+		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla
+
+		# Need to unset these incase we want to rebuild, else the build
+		# gets newked.
+		unset SOURCE_LIB_DIR
+		unset SOURCE_BIN_DIR
+	fi
+
+	cd ${S}/build/unix
+	# Fix mozilla-config and install it
+	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
+	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
+	exeinto /usr/lib/mozilla
+	doexe mozilla-config
+	# Fix pkgconfig files and install them
+	insinto /usr/lib/pkgconfig
+	for x in *.pc; do
+		if [[ -f ${x} ]]; then
+			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
+			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
+			doins ${x}
+		fi
+	done
+	cd ${S}
+
+	dodir /usr/bin
+	dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla
+	insinto /etc/env.d
+	doins ${FILESDIR}/10mozilla
+	dodoc LEGAL LICENSE README/mozilla/README*
+
+	# Install rebuild script
+	exeinto /usr/lib/mozilla/
+	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+
+	# Move plugins dir
+	src_mv_plugins /usr/lib/mozilla/plugins
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto /usr/lib/mozilla/searchplugins
+	doins ${FILESDIR}/google.src
+
+	if [[ -f "${WORKDIR}/.xft" ]]; then
+		# We are using Xft, so change the default font
+		insinto /usr/lib/mozilla/defaults/pref
+		doins ${FILESDIR}/xft.js
+	fi
+
+	# Fix icons to look the same everywhere
+	insinto /usr/lib/mozilla/icons
+	doins ${S}/widget/src/gtk/mozicon16.xpm
+	doins ${S}/widget/src/gtk/mozicon50.xpm
+
+	# Install icon and .desktop for menu entry
+	if use gnome; then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/icon/mozilla-icon.png
+
+		insinto /usr/share/applications
+		doins ${FILESDIR}/icon/mozilla.desktop
+	fi
+
+	# Take care of non root execution
+	# (seems the problem is that not all files are readible by the user)
+	einfo "Fixing Permissions..."
+	chmod -R g+r,o+r ${D}/usr/lib/mozilla
+	find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
+}
+
+pkg_preinst() {
+	# Move old plugins dir
+	pkg_mv_plugins /usr/lib/mozilla/plugins
+
+	if true; then
+		# Remove entire installed instance to solve various problems,
+		# for example see bug 27719
+		rm -rf ${ROOT}/usr/lib/mozilla
+	else
+		# Stale components and chrome files break when unmerging old
+		rm -rf ${ROOT}/usr/lib/mozilla/components
+		rm -rf ${ROOT}/usr/lib/mozilla/chrome
+
+		# Remove stale component registry.
+		rm -f ${ROOT}/usr/lib/mozilla/component.reg
+		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+
+		# Make sure these are removed.
+		rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+	fi
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+	# Needed to update the run time bindings for REGXPCOM
+	# (do not remove next line!)
+	env-update
+
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
+
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
+}
+
+pkg_postrm() {
+	# Regenerate component.reg in case some things changed
+	if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then
+		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
+			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+			# Fix directory permissions
+			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
+			# Fix permissions on chrome files
+			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
+		fi
+	fi
+}