move net-mail/postfix to mail-mta/postfix

29 files changed, 3065 insertions, 0 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
new file mode 100644
index 000000000000..3391eabc5cbe
--- /dev/null
+++ b/mail-mta/postfix/ChangeLog
@@ -0,0 +1,587 @@
+# ChangeLog for net-mail/postfix
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+  12 May 2004; Michael McCabe <randy@gentoo.org> postfix-2.0.19-r2.ebuild:
+  Added s390 keywords
+
+  31 Mar 2004; Max Kalika <max@gentoo.org> files/postfix.rc6:
+  Set $opts properly in init script. Fixes bug #46304.
+
+  26 Mar 2004; <tuxus@gentoo.org> postfix-2.0.19.ebuild:
+  Added mips to KEYWORDS.
+
+  22 Mar 2004; Max Kalika <max@gentoo.org> postfix-2.0.19-r1.ebuild,
+  postfix-2.0.19-r2.ebuild, postfix-2.0.19.ebuild:
+  Make sure spool only gets created in pkg_postinst(). Fixes bug #45142.
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> postfix-2.0.19.ebuild:
+  Marked stable on sparc.
+
+  18 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> postfix-2.0.19-r2.ebuild:
+  Whoops, forgot to create sendmail.postfix (bug 44989).
+
+*postfix-2.0.19-r2 (17 Mar 2004)
+
+  17 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> postfix-2.0.16-r1.ebuild,
+  postfix-2.0.18.ebuild, postfix-2.0.19-r1.ebuild, postfix-2.0.19-r2.ebuild,
+  postfix-2.0.19.ebuild, files/mailer.conf:
+  Lots of keyword fixes for bad sasl depends.
+
+*postfix-2.0.19-r2 (17 Mar 2004)
+
+  17 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> postfix-2.0.19-r2.ebuild,
+  files/mailer.conf:
+  New revision that uses mailwrapper.
+
+*postfix-2.0.19-r1 (15 Mar 2004)
+*postfix-2.0.19 (15 Mar 2004)
+
+  15 Mar 2004; Max Kalika <max@gentoo.org> postfix-2.0.19-r1.ebuild,
+  postfix-2.0.19.ebuild:
+  Bump to version 2.0.19 and mark stable x86. Add new testing version 2.0.19-r1
+  which includes some use command cleanup and the vda patch, fixing bug 31819.
+
+  23 Feb 2004; Jason Wever <weeve@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Stable on sparc.
+
+  19 Feb 2004; Aron Griffis <agriffis@gentoo.org> postfix-2.0.16-r1.ebuild,
+  postfix-2.0.18.ebuild:
+  Mark 2.0.16-r1 stable on alpha and ia64. Mark 2.0.18 testing on ~ia64 (it
+  already had ~alpha)
+
+  09 Feb 2004; Max Kalika <max@gentoo.org> postfix-2.0.18.ebuild:
+  Bump TLS patch to 2.0.18, IPV6+TLS patch to 1.21.
+
+  06 Feb 2004; Max Kalika <max@gentoo.org> postfix-2.0.10-r1.ebuild,
+  postfix-2.0.11.ebuild, postfix-2.0.12-r1.ebuild, postfix-2.0.13-r1.ebuild,
+  postfix-2.0.14.ebuild, postfix-2.0.15-r1.ebuild, postfix-2.0.17.ebuild,
+  postfix-2.0.9.ebuild, files/postfix, files/postfix-2.0.8_patch.patch,
+  files/postfix-pg.postfix-2.0.0.2.patch.bz2, files/saslpass,
+  files/smtpd-2.0.conf, files/postfix-2.0.0/master.cf.diff,
+  files/postfix-2.0.14/main.cf.diff:
+  Cleanup some stale files.
+
+*postfix-2.0.18 (23 Jan 2004)
+
+  23 Jan 2004; Max Kalika <max@gentoo.org> postfix-2.0.18.ebuild:
+  Bump version to 2.0.18.
+
+*postfix-2.0.17 (20 Jan 2004)
+
+  20 Jan 2004; Max Kalika <max@gentoo.org> postfix-2.0.17.ebuild:
+  Bump version to 2.0.17.
+
+  18 Jan 2004; <tuxus@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  16 Jan 2004; Max Kalika <max@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Provide proper include path for PostgreSQL depending on which version is
+  installed. Fixes bug #38401.
+
+  14 Jan 2004; Max Kalika <max@gentoo.org> postfix-1.1.11.20020917-r1.ebuild,
+  postfix-1.1.11.20020917.ebuild, postfix-2.0.10-r1.ebuild,
+  postfix-2.0.12-r1.ebuild, postfix-2.0.13-r1.ebuild, postfix-2.0.14.ebuild,
+  postfix-2.0.15-r1.ebuild, postfix-2.0.16-r1.ebuild, postfix-2.0.9.ebuild,
+  files/gentestcrt.sh, files/tls+ipv6-1.4-pf-1.1.11-20020917.patch.bz2:
+  Bump 2.0.16-r1 to stable x86. Add FSH link /usr/sbin/sendmail ->
+  /usr/lib/sendmail. Do not keepdir on the queue directories to minimize bogus
+  errors in the mail log. Only install the sasl conf to /etc/sasl2 as the latest
+  sasl looks there for the config files.
+
+  10 Jan 2004; Jason Wever <weeve@gentoo.org> postfix-2.0.11.ebuild:
+  Marked stable on sparc.
+
+  20 Dec 2003; Martin Schlemmer <azarah@gentoo.org> files/smtp.pam:
+  Update pam.d file to use system-auth.
+
+  14 Dec 2003; <spider@gentoo.org> postfix-1.1.11.20020917-r1.ebuild,
+  postfix-1.1.11.20020917.ebuild:
+  QA: fixing chown user.group to user:group, bug #35127
+
+  10 Nov 2003; <max@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Put back keepdirs for the spool directories.  Allows clean unmerge.
+
+  10 Nov 2003; <max@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Properly fix spool permissions after merge, take 2.
+
+  08 Nov 2003; <max@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Properly fix spool after merging. Fixes bug 31797.
+
+  07 Nov 2003; Seemant Kulleen <seemant@gentoo.org> postfix-2.0.16-r1.ebuild:
+  keepdir to keep the subdirs in /var/spool/postfix
+
+  03 Nov 2003; Max Kalika <max@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Allow user to set SSL_ORGANIZATION in make.conf.
+
+  03 Nov 2003; Max Kalika <max@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Switch to ssl-cert.eclass.
+
+*postfix-2.0.16-r1 (25 Sep 2003)
+
+  25 Sep 2003; Max Kalika <max@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Add the Verisign patch from Wietse.
+
+  24 Sep 2003; Max Kalika <max@gentoo.org> postfix-2.0.16.ebuild:
+  Die if postfix-install or postconf fail.
+
+  24 Sep 2003; Max Kalika <max@gentoo.org> postfix-2.0.16.ebuild:
+  Add -lpthread to libs. Fixes bug 28044.
+
+*postfix-2.0.16 (23 Sep 2003)
+
+  23 Sep 2003; Max Kalika <max@gentoo.org> postfix-2.0.16.ebuild,
+  files/gentestcrt.sh, files/postfix.rc6, files/smtp.pass, files/smtp.sasl:
+  This is new/testing/experimental: Bump to version 2.0.16 with the latest
+  available TLS, IPV6, and IPV6+TLS patches. Major cleanup/rewrite: quote
+  variables where possible; whitespace consistancy; drop creation of postfix
+  user -- already in baselayout; require >=dev-libs/cyrus-sasl-2; drop support
+  for cyrus-sasl-1.*; drop is_postfix_installed() routine; move most of the
+  compilation decisions to src_compile() out of src_unpack(); only use cd once
+  throughout the whole ebuild; make it die on sed errors; drop CC=gcc hack for
+  a cleaner bash solution; use /bin/sh postfix-install instead of manually
+  installing all the files -- simplifies the src_install() routine enormously;
+  install samples to the doc/defaults instead of /etc/postfix/sample; use newly
+  installed postconf to set defaults instead of custom patch/sed calls -- makes
+  it much more resilient to upstream changes; if USE=ssl, install default cert,
+  key, and pem files similar to net-mail/cyrus-imapd.
+
+  12 Sep 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.15.ebuild:
+  Cleanup
+
+*postfix-2.0.15-r1 (12 Sep 2003)
+
+  12 Sep 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.15-r1.ebuild:
+  Bump patch versions cuz they aren't on the servers any more GRR
+
+*postfix-2.0.15 (08 Sep 2003)
+
+  08 Sep 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.15.ebuild:
+  Bump
+
+*postfix-2.0.14 (01 Sep 2003)
+
+  01 Sep 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.14.ebuild:
+  Bump
+
+  15 Aug 2003; Nick Hadaway <raker@gentoo.org>  
+  files/2.0.0/master.cf.diff, files/postfix-2.0.13-r1.ebuild:
+  Added a patch for the master.cf based on suggestions by Alexander
+  Holler on bug #26130.  Also made changes to deal with bug #25265.
+
+  13 Aug 2003; Nick Hadaway <raker@gentoo.org> files/postfix.rc6:
+  Added ypbind to the use list so NIS-related services are started
+  before the mail server is started.  See bug #26405.
+
+  21 Jul 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.13-r1.ebuild:
+  Only install the smtpd.conf if sasl is in USE.
+
+  18 Jul 2003; lanius@gentoo.org postfix-2.0.11.ebuild,
+  postfix-2.0.12-r1.ebuild, postfix-2.0.13-r1.ebuild, postfix-2.0.13.ebuild,
+  files/smtpd-2.0.conf:
+  fixed smtpd.conf for postfix 2.0 (bug #24556)
+
+*postfix-2.0.13-r1 (14 Jul 2003)
+
+  14 Jul 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.13-r1.ebuild:
+  Just update the TLS and IPV6 patches
+
+  11 Jul 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.13.ebuild,
+  files/postfix-pg.postfix-2.0.0.2.patch.bz2:
+  Added postgres support and associated patch.  Also installs a
+  PGSQL_README.  Closes bug #23996
+
+*postfix-2.0.13 (30 Jun 2003)
+
+  30 Jun 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.13.ebuild:
+  Bump, update tls and ipv6 patches
+
+  20 Jun 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.12.ebuild:
+  This version no longer has all required distfiles available. 
+
+*postfix-2.0.12-r1 (20 Jun 2003)
+
+  20 Jun 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.12-r1.ebuild:
+  Bump TLS version
+
+  16 Jun 2003; Seemant Kulleen <seemant@gentoo.org> postfix-2.0.9.ebuild:
+  mark stable on sparc
+
+  14 Jun 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.10-r1.ebuild,
+  postfix-2.0.11.ebuild, postfix-2.0.12.ebuild, postfix-2.0.9.ebuild:
+  Ok, so apparently putting the user's original config file from the wrong
+  location in a ._cfg file was a Bad Thing (TM) because too many people don't
+  merge their config files. I therefore have changed it so that the OTHER file
+  (the blank original config file, if it existed) is saved in a ._cfg which the
+  user can ignore as seems to be standard proceedure.
+
+  13 Jun 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.10-r1.ebuild,
+  postfix-2.0.9.ebuild:
+  Fix bug 15252 in stable versions as well
+
+*postfix-2.0.12 (13 Jun 2003)
+
+  13 Jun 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.12.ebuild:
+  Bump, bug 15252 still needs looking at so be careful with this one if you use
+  sasl2
+
+  13 Jun 2003; Seemant Kulleen <seemant@gentoo.org> postfix-2.0.11.ebuild:
+  smtpd.conf for sasl in USE is now moved to /etc/sasl -- and it should do it
+  safely. This closes bug #15252 by Nahor <nahorBugzilla@bravobrava.com>
+
+*postfix-2.0.11 (11 Jun 2003)
+
+  11 Jun 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.11.ebuild:
+  Easy bump
+
+  09 Jun 2003; <msterret@gentoo.org> postfix-2.0.10-r1.ebuild:
+  DEPEND on sed >= 4
+
+*postfix-2.0.10-r1 (31 May 2003)
+
+  31 May 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.10-r1.ebuild,
+  postfix-2.0.10.ebuild:
+  Bump versions of tls, ipv6 patches
+
+*postfix-2.0.10 (22 May 2003)
+
+  22 May 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.10.ebuild:
+  New postfix, this is mostly just a bump, but also we now have better split out
+  TLS, IPV6 and IPV6+TLS patches, enjoy
+
+*postfix-2.0.9 (28 Apr 2003)
+
+  28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> postfix-2.0.9-r1.ebuild,
+  postfix-2.0.9-get-FQDN.patch :
+  Postfix do not get the FQDN if no hostname is specified, and thus do not
+  handle the hostname change in latest baselayout gracefully.  Patch it to
+  fix this issue.
+
+*postfix-2.0.9 (18 Apr 2003)
+
+  18 Apr 2003; Daniel Robbins <drobbins@gentoo.org>: New release of postfix.
+  Added /usr/bin/rmail to close bug #19127. Added "provide mta" to postfix
+  initscript to abide with the recommendation in bug #11455 (not closing since
+  other MTAs are affected.) set CC in ebuild to close bugs #16547 and #17275.
+  Unmasking for x86 since so many bugs are fixed.
+
+*postfix-2.0.7 (22 Mar 2003)
+
+  16 Apr 2003; Brandon Low <lostlogic@gentoo.org> Manifest,
+  postfix-1.1.11-r5.ebuild, postfix-1.1.11-r5.ebuild, postfix-2.0.0.ebuild,
+  postfix-2.0.0.ebuild, postfix-2.0.2-r1.ebuild, postfix-2.0.2-r1.ebuild,
+  postfix-2.0.2.ebuild, postfix-2.0.2.ebuild, postfix-2.0.7.ebuild,
+  postfix-2.0.7.ebuild, files/postfix-1.1.11-saslv2.diff,
+  files/postfix-2.0.8_patch.patch, files/postfix-2.0.0/main.cf.diff:
+  Clean up a ton of old stuff, and bump to the latest version.
+
+  24 Mar 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.7.ebuild:
+  Update the TLS+IPV6 patch for this version. No need to -r bump, because this
+  was a compile stopper
+
+  22 Mar 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.6.ebuild,
+  postfix-2.0.6.ebuild, postfix-2.0.7.ebuild:
+  Bumpage still unstable
+
+*postfix-2.0.6 (06 Mar 2003)
+
+  06 Mar 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.6.ebuild:
+  Version bump
+
+*postfix-2.0.3 (28 Jan 2003)
+
+  13 Feb 2003; Matt Keadle <mkeadle@gentoo.org> postfix-2.0.3.ebuild :
+  Moved 'inherit eutils' statement back to the top of the ebuild.
+  Being placed midway through was causing the package description
+  to be replaced with "Based on the eutils eclass" instead of one
+  suitable for Postfix.
+
+  12 Feb 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.3.ebuild :
+  Changed CC=cc to CC=${CC}.  Thanks to Paul Prince on bug #15477
+  for the suggestion.
+
+  09 Feb 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.3.ebuild :
+  moved the post-install file to the doc directory.
+
+  02 Feb 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.3.ebuild :
+  Removed spurious main.cf{~,orig}.  Thanks to Phil Richards on bug
+  #14725 for noticing this.
+
+  30 Jan 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.3.ebuild :
+  Marked stable.
+
+  28 Jan 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.3.ebuild,
+  files/digest-postfix-2.0.3 :
+  Version bump.  tls and ipv6+tls patches have also been updated for
+  this new version.
+
+*postfix-2.0.2-r1 (19 Jan 2003)
+
+  24 Jan 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.2-r1.ebuild :
+  Marked stable for x86.
+
+  19 Jan 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.2-r1.ebuild,
+  files/digest-postfix-2.0.2-r1 :
+  I made so many individual changes on the last bug I figure I better
+  release a new revision.  added maildir and mbox to IUSE.
+  Added -lz for linking to mysql.
+
+*postfix-2.0.2 (19 Jan 2003)
+
+  19 Jan 2003; Nick Hadaway <raker@gentoo.org> postfix-2.0.2.ebuild,
+  files/digest-postfix-2.0.2 :
+  Version bump.  Re-incorporated tls functionality.  IPV6 is next.
+  10 minutes later... ipv6 added. :) Changed so
+  /var/spool/postfix/tmp is created.  Added some sed logic
+  for the editing of main.cf based on maildir or mbox use variable as
+  suggested on bug #10356.
+
+
+*postfix-2.0.0 (23 Dec 2002)
+
+  23 Dec 2002; Maik Schreiber <blizzy@gentoo.org> : New upstream version.
+
+  23 Dec 2002; Maik Schreiber <blizzy@gentoo.org> files/postfix.rc6: Added
+  "use dns" to depend().
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*postfix-1.1.11.20020917-r1 (14 Nov 2002)
+
+  14 Nov 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020917-r1.ebuild,
+  files/digest-postfix-1.1.11.20020917 :
+  New ebuild which places the smtpd.conf for sasl2 in /usr/lib/sasl2
+  instead of /etc/sasl2.  See bug #10650
+
+  25 Sep 2002; Maik Schreiber <blizzy@gentoo.org>
+  postfix-1.1.11-r5.ebuild, files/digest-postfix-1.1.11-r5:
+  Fixed URL of TLS patch.
+
+*postfix-1.1.11.20020917 (19 Sep 2002)
+
+  23 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020917.ebuild :
+  Added /var/spool/postfix/hold directory to install.  This seems to fix
+  some postfix start problems.
+
+  20 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020917.ebuild :
+  Updated postfix SRC_URI to the pfixtls site.  I have also copied files
+  to gentoo distfiles so it propagates across mirrors.  Postfix mirrors
+  appear to be too erratic with the "experimental builds"
+
+  19 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020917.ebuild, files/digest-postfix-1.1.11.20020917,
+  files/tls+ipv6-1.4-pf-1.1.11-20020917.patch.bz2 :
+  Version bump.  Lots of bug fixes(+features)  from the 20020822
+  version.  Important fixes include ldap and berkdb related fixes.
+  See...
+  http://archive.progeny.com/postfix/experimental/postfix-1.1.11-20020918.HISTORY
+  for the changelog.
+
+*postfix-1.1.11.20020822 (11 Sep 2002)
+
+  17 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020822.ebuild :
+  Added saslv1 and saslv2 support.  This should be back to a full
+  featured postfix ebuild.
+
+  11 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020822.ebuild :
+  provide virtual/mda.  Moved tls+ipv6 patch to ${FILESDIR} and bzipped
+  it.  SASL support is next.
+
+  11 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020822.ebuild, files/digest-postfix-1.1.11.20020822 :
+  New postfix ebuild.  Currently masked.  Testing ipv6 patch.
+
+*postfix-1.1.11.200206013-r1 (13 Aug 2002)
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  It appears that this ebuild and digest have magically disappeared from CVS.
+
+  15 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020613-r1.ebuild :
+  Updated CCARGS and AUXLIBS variables for a proper TLS enabled postfix.
+  Fixed a syntax error with the tls+ipv6 patch.
+
+  13 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020613-r1.ebuild, files/digest-postfix-1.1.11.20020613-r1 :
+  Many changes have been made to the ebuild so I created a -r1.  This
+  ebuild should copy smtpd.conf into /etc/sasl2 to match the latest
+  cyrus-sasl ebuild.  This should hopefully fix some of the sasl problems
+  people have been having with postfix.
+
+*postfix-1.1.11-r5 (23 Jul 2002)
+
+  11 Sep 2002; Nick Hadaway <raker@gentoo.org> postfix-1.1.11-r5.ebuild :
+  provide virtual/mda
+
+  29 Aug 2002; Nick Hadaway <raker@gentoo.org> postfix-1.1.11-r5.ebuild :
+  Fixed an logic for applying sasl2 related patch
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org> postfix-1.1.11-r5.ebuild :
+  Fixed typo in pkg_postinst, sasl, and ssl detection code.
+
+  23 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Use the /etc/postfix/master.cf from the source *again*, as
+  they tend to differ between version.  Do NOT change, or if
+  you really need to use a custom version, please keep a version
+  updated from that version's source.  This should fix the:
+
+   warning: connect #3 to subsystem public/cleanup: Connection refused
+
+  problem.
+
+*postfix-1.1.11.20020613 (22 Jul 2002)
+
+  24 Jul 2002; Nick Hadaway <raker@gentoo.org> :
+
+  Updated ebuild to install the ipv6+tls patch if the ipv6 OR ssl use
+  flag is enabled.  This is a temporary hack until I get the patches
+  separated from each other and I can enable each addon functionality
+  separately.
+
+  23 Jul 2002; Nick Hadaway <raker@gentoo.org> :
+  Updated all ebuilds to include the pam dependancy.  Closes bug #5148.
+
+  22 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  postfix-1.1.11.20020613.ebuild, files/digest-postfix-1.1.11.20020613,
+  files/tls+ipv6.diff, files/saslv2.diff
+  New ebuild with tls and ipv6 support.  Also added support for saslv2.
+  Thanks to Philipp Morger for a start on the ebuilds and patches.
+
+  21 Jul 2002; Maik Schreiber <blizzy@gentoo.org> postfix-1.1.11-r4.ebuild,
+  ChangeLog:
+  Cleaned up ebuild once again. Added post-installation note from
+  bug #4652 once again. Also fixed ChangeLog since it appeared to
+  really got broken.
+
+*postfix-1.1.8-r1 (19 Jul 2002)
+
+  19 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> :
+  removed /usr/bin/mail symlink in postfix-1.1.8
+
+*postfix-1.1.11-r4 (19 Jul 2002)
+
+  19 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> :
+  removed /usr/bin/mail symlink; that's what mailx and nail are for.
+  Removed old versions.  Bumped -r since that symlink really should be yanked.
+  Closes bug #5096
+
+*postfix-1.1.11-r1 (09 Jul 2002)
+
+  09 Jul 2002; Maik Schreiber <blizzy@gentoo.org> postfix-1.1.11-r1.ebuild:
+  Added post-installation note about /etc/mail/aliases. No need to update
+  if your Postfix installation works correctly. This closes bug #4652.
+
+*postfix-1.1.11 (08 Jul 2002)
+
+  08 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
+  New version + TLS patch, closes bug #4215.
+
+  20 May 2002; Daniel Robbins <drobbins@gentoo.org> postfix-1.1.8.ebuild:
+  made "sasl" a USE var (disabled by default) since this seems most appropriate
+  and since cyrus-sasl appears to be broken if you merge it on a fresh system.
+  Postfix should work again.
+
+*postfix-1.1.8 (13 May 2002)
+
+  13 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Updated to latest postfix + tls patch.
+
+*postfix-1.1.7-r4 (3 May 2002)
+
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Added LICENSE, SLOT, $Headers.
+
+*postfix-1.1.7-r3 (19 Apr 2002)
+
+  19 Apr 2002; Ryan Phillips <rphillips@gentoo.org> postfix-1.1.7-r3.ebuild,
+  files/digest-postfix-1.1.7-r3 :
+  Added INSTALL to dodoc statement.  Closes #1923
+
+*postfix-1.1.7-r2 (15 Apr 2002)
+
+  15 Apr 2002; Seemant Kulleen <seemant@gentoo.org> postfix-1.1.7-r2.ebuild,
+  files/digest-postfix-1.1.7-r2 :
+  Changed the USE flags from mta-ldap, mta-tls, and mta-mysql to ldap, ssl, and
+  mysql respectively.  Also, changed the checks to the official use foo &&
+  syntax.  This has the added advantage of showing the USE flags being used
+  during the emerge process.
+
+  11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> files/digest-postfix-1.1.7-r1 :
+  digest contains the md5 sums for the postfix tarball and the alternate
+  tarball.
+
+*postfix-1.1.7-r1 (8 Apr 2002)
+
+  9 Apr 2002; Jon Nelson <jnelson@gentoo.org> postfix-1.1.7-r1.ebuild:
+  Clean up some tabbing and use official form of 'if use foo' constructs
+
+*postfix-1.1.7 (8 Apr 2002)
+
+  9 Apr 2002; Jon Nelson <jnelson@gentoo.org> postfix-1.1.7.ebuild:
+  Updated to postfix 1.1.7, and altered how the 'if use foo' constructs
+  are used. Closes #1612
+
+*postfix-1.1.6-r1 (1 Apr 2002)
+
+  1 Apr 2002; Grant Goodyear <g2boojum@gentoo.org>  :
+  Modified the ebuild to link in -lcrypt, -lpam (if pam is in USE),
+  and -ldl.  Thanks to Jon Nelson.
+
+*postfix-1.1.6 (30 Mar 2002)
+
+  30 Mar 2002; Seemant Kulleen <seemant@gentoo.org> postfix-1.1.6.ebuild :
+  Version bump, using previous ebuild, and adjusting the mta-tls filename to
+  fetch.
+
+*postfix-1.1.3-r3 (24 Mar 2002)
+
+  24 Mar 2002; Donny Davies <woodchip@gentoo.org> postfix-1.1.3-r3.ebuild :
+  Fix compile problem with USE mta-mysql.  Thanks to fkooman@zeelandnet.nl (F. Kooman)
+  for the report.  Closes #1328.
+
+  17 March 2002; Donny Davies <woodchip@gentoo.org> postfix-1.1.3-r2.ebuild :
+  Clarify the pkg_postinst() message about updating master.cf.  Cosmetic fix only.
+  Not bumping package revision.  Closes #1153.
+
+*postfix-1.1.3-r2 (20 Feb 2002)
+
+  20 Feb 2002; Donny Davies <woodchip@gentoo.org> postfix-1.1.3-r2.ebuild :
+  This update fixes the permissions and ownership on /usr/sbin/postdrop and
+  /usr/sbin/postqueue, which were not set correctly last time.  Moved the
+  postdrop group detection/creation into pkg_setup() to facilitate this.
+  *Really* fix the CCARGS and AUXLIBS getting nuked this time.  Hooray!
+
+*postfix-1.1.3-r1 (18 Feb 2002)
+
+  18 Feb 2002; Donny Davies <woodchip@gentoo.org> ChangeLog, postfix-1.1.3-r1.ebuild,
+  files/postfix.rc6 files/smtp.pam files/smtpd.conf:
+  Lots of changes, ok here we go:  First, we now compile with cyrus-sasl library
+  support, which gives us smtp authentication.  Next, there is support for the mta-tls
+  USE variable which gives you secure connection support.  There are sample files in
+  the files directory for smtp authentication.  This version fixes a glitch with the
+  maildrop directory (we now let postfix create it itself, which it will do when you
+  run 'postfix check' for the first time after installing this.  We create the postdrop
+  group now, in pkg_postinst() if its not already on the user's system.  Some small
+  cosmetic changes in the initscript, changing spaces for tabs.  The /var/spool/postfix
+  directory is dropped into the system permanently now, which is good.  Fixed a small
+  bug with CCARGS getting nuked.  Special thanks goto Ingo Luetkebohle
+  <gentoo@blank.pages.de> for an *excellent* bug report.  Thanks Ingo!
+
+  NB: I have successfully tested *outbound* authentication, and leave inbound
+  authentication to those using it.  If you find bugs, please report them.  Enjoy.
+
+*postfix-1.1.3 (3 Feb 2002)
+
+*postfix-1.1.2-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/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
new file mode 100644
index 000000000000..65a769711af5
--- /dev/null
+++ b/mail-mta/postfix/Manifest
@@ -0,0 +1,28 @@
+MD5 610e4eef9766e80adc72714de7b01f15 ChangeLog 23746
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 814186572595eb376ac5febb83c50d00 postfix-1.1.11.20020917-r1.ebuild 4593
+MD5 4c4377dfe501bf2a981176f09c98fede postfix-1.1.11.20020917.ebuild 4578
+MD5 203fa874ac60ebfd492d00215963aac4 postfix-2.0.11.ebuild 6042
+MD5 9caa85e7ab35992b3eb513006ac19937 postfix-2.0.16-r1.ebuild 6793
+MD5 27fe74a078816742b6413fbfabadb4d8 postfix-2.0.18.ebuild 6793
+MD5 1a70c6bcf0c1964ce940ed036a3c7682 postfix-2.0.19-r1.ebuild 5978
+MD5 7ef36e439e6ec84e8ab54e3918ac2187 postfix-2.0.19-r2.ebuild 6185
+MD5 d9379e6fa5aa227558d6c6fa36b35802 postfix-2.0.19.ebuild 6841
+MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
+MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
+MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
+MD5 86074a74de686c68c34e40b36c1188b6 files/digest-postfix-2.0.18 445
+MD5 20fa9d533a75c392127160b6b83d4229 files/digest-postfix-2.0.19 445
+MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r1 511
+MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r2 511
+MD5 2ab4ae9066b82e25800818cc0beb5908 files/mailer.conf 753
+MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
+MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
+MD5 ff6584c14212d383b742fe5fc0aceed5 files/postfix-2.0.9-get-FQDN.patch 993
+MD5 73feb2eaa1ff5065fb73405e9e9c6523 files/postfix.rc6 583
+MD5 41b1fd28cf1cb7ea752968c0fdd5cc84 files/smtp.pam 250
+MD5 ffb7badd0a9041f2bf61287c0e881d4f files/smtp.pass 134
+MD5 6a0281eb56da3530d3208ccbed185c4c files/smtp.sasl 124
+MD5 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
+MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/mail-mta/postfix/files/digest-postfix-1.1.11.20020917 b/mail-mta/postfix/files/digest-postfix-1.1.11.20020917
new file mode 100644
index 000000000000..01d2b9027adb
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-1.1.11.20020917
@@ -0,0 +1,2 @@
+MD5 d5c4edd83db08a4306840fef321bb42a postfix-1.1.11-20020917.tar.gz 1287821
+MD5 1fc29989315ab5570486929c24187626 pfixtls-0.8.11a-1.1.11-20020917-0.9.6g.tar.gz 196206
diff --git a/mail-mta/postfix/files/digest-postfix-1.1.11.20020917-r1 b/mail-mta/postfix/files/digest-postfix-1.1.11.20020917-r1
new file mode 100644
index 000000000000..01d2b9027adb
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-1.1.11.20020917-r1
@@ -0,0 +1,2 @@
+MD5 d5c4edd83db08a4306840fef321bb42a postfix-1.1.11-20020917.tar.gz 1287821
+MD5 1fc29989315ab5570486929c24187626 pfixtls-0.8.11a-1.1.11-20020917-0.9.6g.tar.gz 196206
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.11 b/mail-mta/postfix/files/digest-postfix-2.0.11
new file mode 100644
index 000000000000..d7c0b57edce0
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.0.11
@@ -0,0 +1,4 @@
+MD5 a6bb9809a29c7e00a576491e1b57b79a postfix-2.0.11.tar.gz 1349765
+MD5 31f1e830882025957f735e5e9b7dd2fd pfixtls-0.8.13-2.0.10-0.9.7b.tar.gz 226122
+MD5 f338521aaccd7a15deaf606c1bab4d16 ipv6-1.14-pf-2.0.11.patch.gz 36029
+MD5 c33700d22bd1bc612413a48899bd7896 tls+ipv6-1.14-pf-2.0.11.patch.gz 99562
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.16-r1 b/mail-mta/postfix/files/digest-postfix-2.0.16-r1
new file mode 100644
index 000000000000..f430e5510bb2
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.0.16-r1
@@ -0,0 +1,6 @@
+MD5 ac13776442ba7708e683bc1bfbadab2f postfix-2.0.16.tar.gz 1353520
+MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
+MD5 b39c08eabe807db4af5bcb1cafc9761e pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz 234105
+MD5 8e0b85c6c131d367dc5b0d0d95e7e2c1 ipv6-1.18a-pf-2.0.16.patch.gz 45398
+MD5 d029e85aba3f7610ca3437aefa9c1e60 tls+ipv6-1.18a-pf-2.0.16.patch.gz 253429
+MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.18 b/mail-mta/postfix/files/digest-postfix-2.0.18
new file mode 100644
index 000000000000..fdec3fc613ce
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.0.18
@@ -0,0 +1,6 @@
+MD5 3e5baf2cc497a5fb1aaa6ba11aa6491e postfix-2.0.18.tar.gz 1353649
+MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
+MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
+MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
+MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
+MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19 b/mail-mta/postfix/files/digest-postfix-2.0.19
new file mode 100644
index 000000000000..2e44b784a13d
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.0.19
@@ -0,0 +1,6 @@
+MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
+MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
+MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
+MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
+MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
+MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19-r1 b/mail-mta/postfix/files/digest-postfix-2.0.19-r1
new file mode 100644
index 000000000000..64cc417361b7
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.0.19-r1
@@ -0,0 +1,7 @@
+MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
+MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
+MD5 8fe4bee5b9f221a6d71c6fc888c37569 postfix-2.0.18.patch.gz 6738
+MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
+MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
+MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
+MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19-r2 b/mail-mta/postfix/files/digest-postfix-2.0.19-r2
new file mode 100644
index 000000000000..64cc417361b7
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.0.19-r2
@@ -0,0 +1,7 @@
+MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
+MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
+MD5 8fe4bee5b9f221a6d71c6fc888c37569 postfix-2.0.18.patch.gz 6738
+MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
+MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
+MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
+MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/mailer.conf b/mail-mta/postfix/files/mailer.conf
new file mode 100644
index 000000000000..57455276910d
--- /dev/null
+++ b/mail-mta/postfix/files/mailer.conf
@@ -0,0 +1,24 @@
+#	$OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
+#
+# Execute the "real" sendmail program from postfix, 
+# named /usr/sbin/sendmail.postfix
+#
+sendmail	/usr/sbin/sendmail.postfix
+send-mail	/usr/sbin/sendmail.postfix
+mailq		/usr/sbin/sendmail.postfix
+newaliases	/usr/sbin/sendmail.postfix
+
+# Execute the "real" sendmail program from ssmtp, 
+# named /usr/sbin/ssmtp
+#
+#sendmail	/usr/sbin/ssmtp
+#mailq		/usr/sbin/ssmtp
+#newaliases	/usr/sbin/ssmtp
+# Execute the "real" sendmail program, named /usr/sbin/sendmail
+#
+#sendmail	/usr/sbin/sendmail.sendmail
+#send-mail	/usr/sbin/sendmail.sendmail
+#mailq		/usr/sbin/sendmail.sendmail
+#newaliases	/usr/sbin/sendmail.sendmail
+#hoststat	/usr/sbin/sendmail.sendmail
+#purgestat	/usr/sbin/sendmail.sendmail
diff --git a/mail-mta/postfix/files/main.cf b/mail-mta/postfix/files/main.cf
new file mode 100644
index 000000000000..7ce7e4aa4498
--- /dev/null
+++ b/mail-mta/postfix/files/main.cf
@@ -0,0 +1,453 @@
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/main.cf,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+#
+# Global Postfix configuration file. This file lists only a subset
+# of all 100+ parameters. See the sample-xxx.cf files for a full list.
+# 
+# The general format is lines with parameter = value pairs. Lines
+# that begin with whitespace continue the previous line. A value can
+# contain references to other $names or ${name}s.
+#
+
+# SOFT BOUNCE
+#
+# The soft_bounce parameter provides a limited safety net for
+# testing.  When soft_bounce is enabled, mail will remain queued that
+# would otherwise bounce. This parameter disables locally-generated
+# bounces, and prevents the SMTP server from rejecting mail permanently
+# (by changing 5xx replies into 4xx replies). However, soft_bounce
+# is no cure for address rewriting mistakes or mail routing mistakes.
+#
+#soft_bounce = no
+
+# LOCAL PATHNAME INFORMATION
+#
+# The queue_directory specifies the location of the Postfix queue.
+# This is also the root directory of Postfix daemons that run chrooted.
+# See the files in examples/chroot-setup for setting up Postfix chroot
+# environments on different UNIX systems.
+#
+queue_directory = /var/spool/postfix
+
+# The command_directory parameter specifies the location of all
+# postXXX commands.  The default value is $program_directory.
+#
+command_directory = /usr/sbin
+
+# The daemon_directory parameter specifies the location of all Postfix
+# daemon programs (i.e. programs listed in the master.cf file). The
+# default value is $program_directory. This directory must be owned
+# by root.
+#
+daemon_directory = /usr/lib/postfix
+
+# QUEUE AND PROCESS OWNERSHIP
+#
+# The mail_owner parameter specifies the owner of the Postfix queue
+# and of most Postfix daemon processes.  Specify the name of a user
+# account THAT DOES NOT SHARE A GROUP WITH OTHER ACCOUNTS AND THAT
+# OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In particular,
+# don't specify nobody or daemon. PLEASE USE A DEDICATED USER.
+#
+mail_owner = postfix
+
+# The default_privs parameter specifies the default rights used by
+# the local delivery agent for delivery to external file or command.
+# These rights are used in the absence of a recipient user context.
+# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
+#
+#default_privs = nobody
+
+# INTERNET HOST AND DOMAIN NAMES
+# 
+# The myhostname parameter specifies the internet hostname of this
+# mail system. The default is to use the fully-qualified domain name
+# from gethostname(). $myhostname is used as a default value for many
+# other configuration parameters.
+#
+#myhostname = host.domain.name
+#myhostname = virtual.domain.name
+
+# The mydomain parameter specifies the local internet domain name.
+# The default is to use $myhostname minus the first component.
+# $mydomain is used as a default value for many other configuration
+# parameters.
+#
+#mydomain = domain.name
+
+# SENDING MAIL
+# 
+# The myorigin parameter specifies the domain that locally-posted
+# mail appears to come from. The default is to append $myhostname,
+# which is fine for small sites.  If you run a domain with multiple
+# machines, you should (1) change this to $mydomain and (2) set up
+# a domain-wide alias database that aliases each user to
+# user@that.users.mailhost.
+#
+#myorigin = $myhostname
+#myorigin = $mydomain
+
+# RECEIVING MAIL
+
+# The inet_interfaces parameter specifies the network interface
+# addresses that this mail system receives mail on.  By default,
+# the software claims all active interfaces on the machine. The
+# parameter also controls delivery of mail to user@[ip.address].
+#
+#inet_interfaces = all
+#inet_interfaces = $myhostname
+#inet_interfaces = $myhostname, localhost
+
+# The mydestination parameter specifies the list of domains that this
+# machine considers itself the final destination for. That does not
+# include domains that are hosted on this machine. Those domains are
+# specified elsewhere (see sample-virtual.cf, and sample-transport.cf).
+#
+# The default is $myhostname + localhost.$mydomain.  On a mail domain
+# gateway, you should also include $mydomain. Do not specify the
+# names of domains that this machine is backup MX host for. Specify
+# those names via the relay_domains or permit_mx_backup settings for
+# the SMTP server (see sample-smtpd.cf.
+#
+# The local machine is always the final destination for mail addressed
+# to user@[the.net.work.address] of an interface that the mail system
+# receives mail on (see the inet_interfaces parameter).
+#
+# Specify a list of host or domain names, /file/name or type:table
+# patterns, separated by commas and/or whitespace. A /file/name
+# pattern is replaced by its contents; a type:table is matched when
+# a name matches a lookup key.  Continue long lines by starting the
+# next line with whitespace.
+#
+# DO NOT LIST VIRTUAL DOMAINS HERE. LIST THEM IN THE VIRTUAL FILE
+# INSTEAD. BE SURE TO READ THE ENTIRE VIRTUAL MANUAL PAGE.
+#
+#mydestination = $myhostname, localhost.$mydomain
+#mydestination = $myhostname, localhost.$mydomain $mydomain
+#mydestination = $myhostname, localhost.$mydomain, $mydomain,
+#	mail.$mydomain, www.$mydomain, ftp.$mydomain
+
+# INTERNET OR INTRANET
+
+# The relayhost parameter specifies the default host to send mail to
+# when no entry is matched in the optional transport(5) table. When
+# no relayhost is given, mail is routed directly to the destination.
+#
+# On an intranet, specify the organizational domain name. If your
+# internal DNS uses no MX records, specify the name of the intranet
+# gateway host instead.
+#
+# In the case of SMTP, specify a domain, host, host:port, [host]:port,
+# [address] or [address]:port; the form [host] turns off MX lookups.
+# If you specify multiple SMTP destinations, Postfix will try them
+# in the specified order.
+#
+# If you're connected via UUCP, see also the default_transport parameter.
+#
+# relayhost = $mydomain
+# relayhost = gateway.my.domain
+# relayhost = uucphost
+# relayhost = [an.ip.add.ress]
+
+# REJECTING UNKNOWN LOCAL USERS
+#
+# The local_recipient_maps parameter specifies optional lookup tables
+# with all users that are local with respect to $mydestination and
+# $inet_interfaces.  If this parameter is defined, then the SMTP server
+# will reject mail for unknown local users.
+#
+# The local_recipient_maps parameter accepts tables with bare usernames
+# such as unix:passwd.byname and alias maps.
+#
+# Beware: if the Postfix SMTP server runs chrooted, you may have to
+# copy the passwd database into the jail. This is system dependent.
+#
+# FOR THIS TO WORK, DO NOT SPECIFY VIRTUAL DOMAINS IN MYDESTINATION.
+# MYDESTINATION MUST LIST NON-VIRTUAL DOMAINS ONLY.
+#
+#local_recipient_maps = $alias_maps unix:passwd.byname
+
+# ADDRESS REWRITING
+#
+# Insert text from sample-rewrite.cf if you need to do address
+# masquerading.
+#
+# Insert text from sample-canonical.cf if you need to do address
+# rewriting, or if you need username->Firstname.Lastname mapping.
+
+# ADDRESS REDIRECTION (VIRTUAL DOMAIN)
+#
+# Insert text from sample-virtual.cf if you need virtual domain support.
+
+# "USER HAS MOVED" BOUNCE MESSAGES
+#
+# Insert text from sample-relocated.cf if you need "user has moved"
+# style bounce messages. Alternatively, you can bounce recipients
+# with an SMTP server access table. See sample-smtpd.cf.
+
+# TRANSPORT MAP
+#
+# Insert text from sample-transport.cf if you need explicit routing.
+
+# ALIAS DATABASE
+#
+# The alias_maps parameter specifies the list of alias databases used
+# by the local delivery agent. The default list is system dependent.
+# On systems with NIS, the default is to search the local alias
+# database, then the NIS alias database. See aliases(5) for syntax
+# details.
+# 
+# If you change the alias database, run "postalias /etc/aliases" (or
+# wherever your system stores the mail alias file), or simply run
+# "newaliases" to build the necessary DBM or DB file.
+#
+# It will take a minute or so before changes become visible.  Use
+# "postfix reload" to eliminate the delay.
+#
+#alias_maps = dbm:/etc/aliases
+#alias_maps = hash:/etc/aliases
+#alias_maps = hash:/etc/aliases, nis:mail.aliases
+#alias_maps = netinfo:/aliases
+alias_maps = hash:/etc/mail/aliases
+
+# The alias_database parameter specifies the alias database(s) that
+# are built with "newaliases" or "sendmail -bi".  This is a separate
+# configuration parameter, because alias_maps (see above) may specify
+# tables that are not necessarily all under control by Postfix.
+#
+#alias_database = dbm:/etc/aliases
+#alias_database = dbm:/etc/mail/aliases
+#alias_database = hash:/etc/aliases
+#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
+alias_database = hash:/etc/mail/aliases
+
+# ADDRESS EXTENSIONS (e.g., user+foo)
+#
+# The recipient_delimiter parameter specifies the separator between
+# user names and address extensions (user+foo). See canonical(5),
+# local(8), relocated(5) and virtual(5) for the effects this has on
+# aliases, canonical, virtual, relocated and .forward file lookups.
+# Basically, the software tries user+foo and .forward+foo before
+# trying user and .forward.
+#
+# recipient_delimiter = +
+
+# DELIVERY TO MAILBOX
+#
+# The home_mailbox parameter specifies the optional pathname of a
+# mailbox file relative to a user's home directory. The default
+# mailbox file is /var/spool/mail/user or /var/mail/user.  Specify
+# "Maildir/" for qmail-style delivery (the / is required).
+#
+#home_mailbox = Mailbox
+#home_mailbox = Maildir/
+home_mailbox = .maildir/
+ 
+# The mail_spool_directory parameter specifies the directory where
+# UNIX-style mailboxes are kept. The default setting depends on the
+# system type.
+#
+# mail_spool_directory = /var/mail
+# mail_spool_directory = /var/spool/mail
+
+# The mailbox_command parameter specifies the optional external
+# command to use instead of mailbox delivery. The command is run as
+# the recipient with proper HOME, SHELL and LOGNAME environment settings.
+# Exception:  delivery for root is done as $default_user.
+#
+# Other environment variables of interest: USER (recipient username),
+# EXTENSION (address extension), DOMAIN (domain part of address),
+# and LOCAL (the address localpart).
+#
+# Unlike other Postfix configuration parameters, the mailbox_command
+# parameter is not subjected to $parameter substitutions. This is to
+# make it easier to specify shell syntax (see example below).
+#
+# Avoid shell meta characters because they will force Postfix to run
+# an expensive shell process. Procmail alone is expensive enough.
+#
+# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
+# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
+#
+#mailbox_command = /some/where/procmail
+#mailbox_command = /some/where/procmail -a "$EXTENSION"
+
+# The mailbox_transport specifies the optional transport in master.cf
+# to use after processing aliases and .forward files. This parameter
+# has precedence over the mailbox_command, fallback_transport and
+# luser_relay parameters.
+#
+# Specify a string of the form transport:nexthop, where transport is
+# the name of a mail delivery transport defined in master.cf.  The
+# :nexthop part is optional. For more details see the sample transport
+# configuration file.
+#
+#mailbox_transport = lmtp:unix:/file/name
+#mailbox_transport = cyrus
+
+# The fallback_transport specifies the optional transport in master.cf
+# to use for recipients that are not found in the UNIX passwd database.
+# This parameter has precedence over the luser_relay parameter.
+#
+# Specify a string of the form transport:nexthop, where transport is
+# the name of a mail delivery transport defined in master.cf.  The
+# :nexthop part is optional. For more details see the sample transport
+# configuration file.
+#
+#fallback_transport = lmtp:unix:/file/name
+#fallback_transport = cyrus
+#fallback_transport =
+
+# The luser_relay parameter specifies an optional destination address
+# for unknown recipients.  By default, mail for unknown local recipients
+# is bounced.
+#
+# The following expansions are done on luser_relay: $user (recipient
+# username), $shell (recipient shell), $home (recipient home directory),
+# $recipient (full recipient address), $extension (recipient address
+# extension), $domain (recipient domain), $local (entire recipient
+# localpart), $recipient_delimiter. Specify ${name?value} or
+# ${name:value} to expand value only when $name does (does not) exist.
+#
+# luser_relay = $user@other.host
+# luser_relay = $local@other.host
+# luser_relay = admin+$local
+  
+# JUNK MAIL CONTROLS
+# 
+# The controls listed here are only a very small subset. See the file
+# sample-smtpd.cf for an elaborate list of anti-UCE controls.
+
+# The header_checks parameter restricts what may appear in message
+# headers. This requires that POSIX or PCRE regular expression support
+# is built-in. Specify "/^header-name: stuff you do not want/ REJECT"
+# in the pattern file. Patterns are case-insensitive by default. Note:
+# specify only patterns ending in REJECT (reject entire message) or
+# IGNORE (silently discard this header). Patterns ending in OK are
+# mostly a waste of cycles.
+#
+#header_checks = regexp:/etc/postfix/filename
+#header_checks = pcre:/etc/postfix/filename
+
+# The relay_domains parameter restricts what clients this mail system
+# will relay mail from, or what destinations this system will relay
+# mail to.  See the smtpd_recipient_restrictions restriction in the
+# file sample-smtpd.cf.
+#
+# By default, Postfix relays mail
+# - from trusted clients whose IP address matches $mynetworks, 
+# - from trusted clients matching $relay_domains or subdomains thereof,
+# - from untrusted clients to destinations that match $relay_domains
+#   or subdomains thereof, except addresses with sender-specified routing.
+# The default relay_domains value is $mydestination.
+# 
+# In addition to the above, the Postfix SMTP server by default accepts mail
+# that Postfix is final destination for:
+# - destinations that match $inet_interfaces,
+# - destinations that match $mydestination
+# - destinations that match $virtual_maps.
+# These destinations do not need to be listed in $relay_domains.
+# 
+# Specify a list of hosts or domains, /file/name patterns or type:name
+# lookup tables, separated by commas and/or whitespace.  Continue
+# long lines by starting the next line with whitespace. A file name
+# is replaced by its contents; a type:name table is matched when a
+# (parent) domain appears as lookup key.
+#
+# NOTE: Postfix will not automatically forward mail for domains that
+# list this system as their primary or backup MX host. See the
+# permit_mx_backup restriction in the file sample-smtpd.cf.
+#
+#relay_domains = $mydestination
+
+# The mynetworks parameter specifies the list of networks that are
+# local to this machine.  The list is used by the anti-UCE software
+# to distinguish local clients from strangers. See permit_mynetworks
+# and smtpd_recipient_restrictions in the file sample-smtpd.cf file.
+#
+# The default is a list of all networks attached to the machine:  a
+# complete class A network (X.0.0.0/8), a complete class B network
+# (X.X.0.0/16), and so on. If you want stricter control, specify a
+# list of network/mask patterns, where the mask specifies the number
+# of bits in the network part of a host address. You can also specify
+# the absolute pathname of a pattern file instead of listing the
+# patterns here.
+#
+#mynetworks = 168.100.189.0/28, 127.0.0.0/8
+#mynetworks = $config_directory/mynetworks
+
+# FAST ETRN SERVICE
+#
+# Postfix maintains per-destination logfiles with information about
+# deferred mail, so that mail can be flushed quickly with the SMTP
+# "ETRN domain.name" command, or by executing "sendmail -qRdomain.name".
+# 
+# By default, Postfix maintains deferred mail logfile information
+# only for destinations that Postfix is willing to relay to (as
+# specified in the relay_domains parameter). For other destinations,
+# Postfix attempts to deliver ALL queued mail after receiving the
+# SMTP "ETRN domain.name" command, or after execution of "sendmail
+# -qRdomain.name". This can be slow when a lot of mail is queued.
+# 
+# The fast_flush_domains parameter controls what destinations are
+# eligible for this "fast ETRN/sendmail -qR" service.
+# 
+#fast_flush_domains = $relay_domains
+#fast_flush_domains =
+
+# SHOW SOFTWARE VERSION OR NOT
+#
+# The smtpd_banner parameter specifies the text that follows the 220
+# code in the SMTP server's greeting banner. Some people like to see
+# the mail version advertised. By default, Postfix shows no version.
+#
+# You MUST specify $myhostname at the start of the text. That is an
+# RFC requirement. Postfix itself does not care.
+#
+#smtpd_banner = $myhostname ESMTP $mail_name
+#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
+
+# PARALLEL DELIVERY TO THE SAME DESTINATION
+#
+# How many parallel deliveries to the same user or domain? With local
+# delivery, it does not make sense to do massively parallel delivery
+# to the same user, because mailbox updates must happen sequentially,
+# and expensive pipelines in .forward files can cause disasters when
+# too many are run at the same time. With SMTP deliveries, 10
+# simultaneous connections to the same domain could be sufficient to
+# raise eyebrows.
+# 
+# Each message delivery transport has its XXX_destination_concurrency_limit
+# parameter.  The default is $default_destination_concurrency_limit.
+
+local_destination_concurrency_limit = 2
+default_destination_concurrency_limit = 10
+
+# DEBUGGING CONTROL
+#
+# The debug_peer_level parameter specifies the increment in verbose
+# logging level when an SMTP client or server host name or address
+# matches a pattern in the debug_peer_list parameter.
+#
+debug_peer_level = 2
+
+# The debug_peer_list parameter specifies an optional list of domain
+# or network patterns, /file/name patterns or type:name tables. When
+# an SMTP client or server host name or address matches a pattern,
+# increase the verbose logging level by the amount specified in the
+# debug_peer_level parameter.
+#
+# debug_peer_list = 127.0.0.1
+# debug_peer_list = some.domain
+
+# The debugger_command specifies the external command that is executed
+# when a Postfix daemon program is run with the -D option.
+#
+# Use "command .. & sleep 5" so that the debugger can attach before
+# the process marches on. If you use an X-based debugger, be sure to
+# set up your XAUTHORITY environment variable before starting Postfix.
+#
+debugger_command =
+	 PATH=/usr/bin:/usr/X11R6/bin
+	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
+
+# Other configurable parameters.
diff --git a/mail-mta/postfix/files/master.cf b/mail-mta/postfix/files/master.cf
new file mode 100644
index 000000000000..a1c772bba0ea
--- /dev/null
+++ b/mail-mta/postfix/files/master.cf
@@ -0,0 +1,92 @@
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/master.cf,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+#
+# Postfix master process configuration file.  Each line describes how
+# a mailer component program should be run. The fields that make up
+# each line are described below. A "-" field value requests that a
+# default value be used for that field.
+#
+# Service: any name that is valid for the specified transport type
+# (the next field).  With INET transports, a service is specified as
+# host:port.  The host part (and colon) may be omitted. Either host
+# or port may be given in symbolic form or in numeric form. Examples
+# for the SMTP server:  localhost:smtp receives mail via the loopback
+# interface only; 10025 receives mail on port 10025.
+#
+# Transport type: "inet" for Internet sockets, "unix" for UNIX-domain
+# sockets, "fifo" for named pipes.
+#
+# Private: whether or not access is restricted to the mail system.
+# Default is private service.  Internet (inet) sockets can't be private.
+#
+# Unprivileged: whether the service runs with root privileges or as
+# the owner of the Postfix system (the owner name is controlled by the
+# mail_owner configuration variable in the main.cf file).
+#
+# Chroot: whether or not the service runs chrooted to the mail queue
+# directory (pathname is controlled by the queue_directory configuration
+# variable in the main.cf file). Presently, all Postfix daemons can run
+# chrooted, except for the pipe and local daemons. The files in the
+# examples/chroot-setup subdirectory describe how to set up a Postfix
+# chroot environment for your type of machine.
+#
+# Wakeup time: automatically wake up the named service after the
+# specified number of seconds. A ? at the end of the wakeup time
+# field requests that wake up events be sent only to services that
+# are actually being used.  Specify 0 for no wakeup. Presently, only
+# the pickup, queue manager and flush daemons need a wakeup timer.
+#
+# Max procs: the maximum number of processes that may execute this
+# service simultaneously. Default is to use a globally configurable
+# limit (the default_process_limit configuration parameter in main.cf).
+#
+# Command + args: the command to be executed. The command name is
+# relative to the Postfix program directory (pathname is controlled by
+# the program_directory configuration variable). Adding one or more
+# -v options turns on verbose logging for that service; adding a -D
+# option enables symbolic debugging (see the debugger_command variable
+# in the main.cf configuration file). See individual command man pages
+# for specific command-line options, if any.
+#
+# In order to use the "uucp" message tranport below, set up entries
+# in the transport table.
+#
+# In order to use the "cyrus" message transport below, configure it
+# in main.cf as the mailbox_transport.
+#
+# SPECIFY ONLY PROGRAMS THAT ARE WRITTEN TO RUN AS POSTFIX DAEMONS.
+# ALL DAEMONS SPECIFIED HERE MUST SPEAK A POSTFIX-INTERNAL PROTOCOL.
+#
+# DO NOT CHANGE THE ZERO PROCESS LIMIT FOR CLEANUP/BOUNCE/DEFER OR
+# POSTFIX WILL BECOME STUCK UP UNDER HEAVY LOAD
+#
+# DO NOT CHANGE THE ONE PROCESS LIMIT FOR PICKUP/QMGR OR POSTFIX WILL
+# DELIVER MAIL MULTIPLE TIMES.
+#
+# DO NOT SHARE THE POSTFIX QUEUE BETWEEN MULTIPLE POSTFIX INSTANCES.
+#
+# ==========================================================================
+# service type	private	unpriv	chroot	wakeup	maxproc	command + args
+# 		(yes)	(yes)	(yes)	(never)	(50)
+# ==========================================================================
+smtp	  inet	n	-	n	-	-	smtpd
+pickup	  fifo	n	n	n	60	1	pickup
+cleanup	  unix	-	-	n	-	0	cleanup
+qmgr	  fifo	n	-	n	300	1	qmgr
+#qmgr	  fifo	n	-	n	300	1	nqmgr
+rewrite	  unix	-	-	n	-	-	trivial-rewrite
+bounce	  unix	-	-	n	-	0	bounce
+defer	  unix	-	-	n	-	0	bounce
+flush	  unix	-	-	n	1000?	0	flush
+smtp	  unix	-	-	n	-	-	smtp
+showq     unix	n	-	n	-	-	showq
+error     unix	-	-	n	-	-	error
+local	  unix	-	n	n	-	-	local
+lmtp	  unix	-	-	n	-	-	lmtp
+cyrus	  unix	-	n	n	-	-	pipe
+    flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+uucp	  unix	-	n	n	-	-	pipe
+    flags=F user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
+ifmail    unix  -       n       n       -       -       pipe
+    flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
+bsmtp     unix  -       n       n       -       -       pipe
+    flags=F. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
diff --git a/mail-mta/postfix/files/postfix-2.0.0/main.cf.diff b/mail-mta/postfix/files/postfix-2.0.0/main.cf.diff
new file mode 100644
index 000000000000..6b17c288637b
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-2.0.0/main.cf.diff
@@ -0,0 +1,75 @@
+--- ../sample/main.cf	2002-12-23 21:22:16.000000000 +0100
++++ main.cf	2002-12-23 21:48:47.000000000 +0100
+@@ -365,6 +365,7 @@
+ #alias_maps = hash:/etc/aliases
+ #alias_maps = hash:/etc/aliases, nis:mail.aliases
+ #alias_maps = netinfo:/aliases
++alias_maps = hash:/etc/mail/aliases
+ 
+ # The alias_database parameter specifies the alias database(s) that
+ # are built with "newaliases" or "sendmail -bi".  This is a separate
+@@ -375,6 +376,7 @@
+ #alias_database = dbm:/etc/mail/aliases
+ #alias_database = hash:/etc/aliases
+ #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
++alias_database = hash:/etc/mail/aliases
+ 
+ # ADDRESS EXTENSIONS (e.g., user+foo)
+ #
+@@ -396,6 +398,7 @@
+ #
+ #home_mailbox = Mailbox
+ #home_mailbox = Maildir/
++home_mailbox = .maildir/
+  
+ # The mail_spool_directory parameter specifies the directory where
+ # UNIX-style mailboxes are kept. The default setting depends on the
+@@ -548,6 +551,8 @@
+ 
+ #local_destination_concurrency_limit = 2
+ #default_destination_concurrency_limit = 10
++local_destination_concurrency_limit = 2
++default_destination_concurrency_limit = 10
+ 
+ # DEBUGGING CONTROL
+ #
+@@ -590,32 +595,32 @@
+ # sendmail_path: The full pathname of the Postfix sendmail command.
+ # This is the Sendmail-compatible mail posting interface.
+ # 
+-sendmail_path =
++sendmail_path = /usr/sbin/sendmail
+ 
+ # newaliases_path: The full pathname of the Postfix newaliases command.
+ # This is the Sendmail-compatible command to build alias databases.
+ #
+-newaliases_path =
++newaliases_path = /usr/bin/newaliases
+ 
+ # mailq_path: The full pathname of the Postfix mailq command.  This
+ # is the Sendmail-compatible mail queue listing command.
+ # 
+-mailq_path =
++mailq_path = /usr/bin/mailq
+ 
+ # setgid_group: The group for mail submission and queue management
+ # commands.  This must be a group name with a numerical group ID that
+ # is not shared with other accounts, not even with the Postfix account.
+ #
+-setgid_group =
++setgid_group = postdrop
+ 
+ # manpage_directory: The location of the Postfix on-line manual pages.
+ #
+-manpage_directory =
++manpage_directory = /usr/share/man
+ 
+ # sample_directory: The location of the Postfix sample configuration files.
+ #
+-sample_directory =
++sample_directory = /etc/postfix/sample
+ 
+ # readme_directory: The location of the Postfix README files.
+ #
+-readme_directory =
++readme_directory = /usr/share/doc/POSTFIX
diff --git a/mail-mta/postfix/files/postfix-2.0.9-get-FQDN.patch b/mail-mta/postfix/files/postfix-2.0.9-get-FQDN.patch
new file mode 100644
index 000000000000..f12a1668e086
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-2.0.9-get-FQDN.patch
@@ -0,0 +1,32 @@
+--- postfix-2.0.9/src/util/get_hostname.c.orig	2003-04-28 13:15:08.000000000 +0200
++++ postfix-2.0.9/src/util/get_hostname.c	2003-04-28 13:36:47.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <sys/param.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <netdb.h>
+ 
+ #if (MAXHOSTNAMELEN < 256)
+ #undef MAXHOSTNAMELEN
+@@ -55,6 +56,7 @@
+ const char *get_hostname(void)
+ {
+     char    namebuf[MAXHOSTNAMELEN + 1];
++	struct hostent *hp;
+ 
+     /*
+      * The gethostname() call is not (or not yet) in ANSI or POSIX, but it is
+@@ -66,9 +68,11 @@
+ 	if (gethostname(namebuf, sizeof(namebuf)) < 0)
+ 	    msg_fatal("gethostname: %m");
+ 	namebuf[MAXHOSTNAMELEN] = 0;
+-	if (valid_hostname(namebuf, DO_GRIPE) == 0)
++	if (!(hp = gethostbyname(namebuf)))
++	    msg_fatal("gethostbyname: %m");
++	if (valid_hostname(hp->h_name, DO_GRIPE) == 0)
+ 	    msg_fatal("unable to use my own hostname");
+-	my_host_name = mystrdup(namebuf);
++	my_host_name = mystrdup(hp->h_name);
+     }
+     return (my_host_name);
+ }
diff --git a/mail-mta/postfix/files/postfix.rc6 b/mail-mta/postfix/files/postfix.rc6
new file mode 100644
index 000000000000..218415651bb2
--- /dev/null
+++ b/mail-mta/postfix/files/postfix.rc6
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+opts="${opts} reload"
+
+depend() {
+	need net
+	use logger dns ypbind
+	provide mta
+}
+
+start() {
+	ebegin "Starting postfix"
+	/usr/sbin/postfix start &>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping postfix"
+	/usr/sbin/postfix stop &>/dev/null
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading postfix"
+	/usr/sbin/postfix reload &>/dev/null
+	eend $?
+}
diff --git a/mail-mta/postfix/files/smtp.pam b/mail-mta/postfix/files/smtp.pam
new file mode 100644
index 000000000000..16dff7dd47b7
--- /dev/null
+++ b/mail-mta/postfix/files/smtp.pam
@@ -0,0 +1,4 @@
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/smtp.pam,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+auth    required        /lib/security/pam_stack.so service=system-auth
+account required        /lib/security/pam_stack.so service=system-auth
+
diff --git a/mail-mta/postfix/files/smtp.pass b/mail-mta/postfix/files/smtp.pass
new file mode 100644
index 000000000000..310fca93e49f
--- /dev/null
+++ b/mail-mta/postfix/files/smtp.pass
@@ -0,0 +1,3 @@
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/smtp.pass,v 1.1 2004/05/30 09:38:32 robbat2 Exp $
+#
+# remotehost user:password
diff --git a/mail-mta/postfix/files/smtp.sasl b/mail-mta/postfix/files/smtp.sasl
new file mode 100644
index 000000000000..471abc9d9cf8
--- /dev/null
+++ b/mail-mta/postfix/files/smtp.sasl
@@ -0,0 +1,2 @@
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/smtp.sasl,v 1.1 2004/05/30 09:38:32 robbat2 Exp $
+pwcheck_method:pam
diff --git a/mail-mta/postfix/files/smtpd.conf b/mail-mta/postfix/files/smtpd.conf
new file mode 100644
index 000000000000..b76c536fae95
--- /dev/null
+++ b/mail-mta/postfix/files/smtpd.conf
@@ -0,0 +1,2 @@
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/smtpd.conf,v 1.1 2004/05/30 09:38:32 robbat2 Exp $
+pwcheck_method:pam
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/mail-mta/postfix/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>net-mail</herd>
+</pkgmetadata>
diff --git a/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild b/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild
new file mode 100644
index 000000000000..3c23739778a7
--- /dev/null
+++ b/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+IUSE="ssl mysql sasl ldap ipv6"
+
+PF_PV=1.1.11-20020917
+PF_P=postfix-${PF_PV}
+S=${WORKDIR}/${PF_P}
+TLS_P=pfixtls-0.8.11a-${PF_PV}-0.9.6g
+IPV6_P=tls+ipv6-1.4-pf-${PF_PV}
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/related/postfix/${PF_P}.tar.gz
+	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~alpha ~ppc"
+
+PROVIDE="virtual/mta
+	 virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( dev-libs/cyrus-sasl )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta"
+
+postfix_installed=no
+
+pkg_setup() {
+
+	if ! grep -q ^postdrop: /etc/group ; then
+		groupadd postdrop || die "problem adding group postdrop"
+	fi
+
+	if [ -d /etc/postfix ] ; then
+		postfix_installed=yes
+	fi
+
+}
+
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${DISTFILES}/${PF_P}.tar.gz
+
+	if [ `use ssl` ] && [ `use ipv6` ]
+	then
+		cd ${S}
+		bzcat ${FILESDIR}/${IPV6_P}.patch.bz2 | patch -p1 || die "patch failed"
+		CCARGS="${CCARGS} -DHAS_SSL"
+		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
+	elif [ `use ssl` ]
+	then
+		unpack ${DISTFILES}/${TLS_P}.tar.gz
+		cd ${S}
+		patch -p1 < ${WORKDIR}/${TLS_P}/pfixtls.diff || die "patch failed"
+		CCARGS="${CCARGS} -DHAS_SSL"
+		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
+	fi
+
+	cd ${S}/conf
+	cp main.cf main.cf.orig
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
+
+	if [ "`use sasl`" ]
+	then
+			if [ -e /usr/include/sasl/sasl.h ]
+			then
+					# saslv2
+					AUXLIBS="${AUXLIBS} -lsasl2"
+					CCARGS="${CCARGS} -I/usr/include/sasl -DUSE_SASL_AUTH"
+			else
+					# saslv1
+					AUXLIBS="${AUXLIBS} -lsasl"
+					CCARGS="${CCARGS} -DUSE_SASL_AUTH"
+			fi
+	fi
+
+	cd ${S}/src/global
+	cp mail_params.h mail_params.h.orig
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
+
+	use mysql && CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
+		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
+
+	use ldap && CCARGS="${CCARGS} -DHAS_LDAP" \
+		&& AUXLIBS="${AUXLIBS} -lldap -llber"
+
+	use pam && AUXLIBS="${AUXLIBS} -lpam"
+
+	CCARGS="${CCARGS} -DHAS_PCRE"
+	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
+	DEBUG=""
+
+	cd ${S}
+	make tidy || die
+	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
+		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
+}
+
+src_compile() {
+
+	emake || die "compile problem"
+
+}
+
+src_install () {
+
+	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample \
+		/var/spool/postfix/hold
+
+	cd ${S}/bin
+	dosbin post* sendmail
+	chown root:postdrop ${D}/usr/sbin/{postdrop,postqueue}
+	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
+
+	dosym /usr/sbin/sendmail /usr/bin/mailq
+	dosym /usr/sbin/sendmail /usr/bin/newaliases
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	cd ${S}/libexec
+	exeinto /usr/lib/postfix
+	doexe *
+
+	cd ${S}/man
+	doman man*/*
+
+	cd ${S}
+	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
+	dohtml html/*
+
+	cd ${S}/conf
+	insinto /etc/postfix/sample
+	doins access aliases canonical relocated transport \
+		pcre_table regexp_table postfix-script* *.cf
+
+	exeinto /etc/postfix
+	doexe postfix-script post-install postfix-files || die
+
+	insinto /etc/postfix
+	doins ${FILESDIR}/main.cf ${S}/conf/master.cf ${FILESDIR}/saslpass || die
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
+	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
+
+	if [ "`use sasl`" ]
+	then
+			if [ -e /usr/include/sasl.h ]
+			then
+					# saslv1
+					insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
+			fi
+			if [ -e /usr/include/sasl/sasl.h ]
+			then
+					# saslv2
+					insinto /usr/lib/sasl2 ; doins ${FILESDIR}/smtpd.conf
+			fi
+	fi
+
+}
+
+pkg_postinst() {
+
+	install -d -m 0755 ${ROOT}/var/spool/postfix
+
+	if [ "${postfix_installed}" = "yes" ] ; then
+		ewarn "If you have upgraded from <postfix-1.1.8, you must update"
+		ewarn "/etc/postfix/master.cf to the latest version"
+		ewarn "(/etc/postfix/._cfg*_master.cf). Otherwise Postfix will"
+		ewarn "not work correctly."
+	fi
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+
+}
diff --git a/mail-mta/postfix/postfix-1.1.11.20020917.ebuild b/mail-mta/postfix/postfix-1.1.11.20020917.ebuild
new file mode 100644
index 000000000000..f8acda5c22a9
--- /dev/null
+++ b/mail-mta/postfix/postfix-1.1.11.20020917.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-1.1.11.20020917.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+IUSE="ssl mysql sasl ldap"
+
+PF_PV=1.1.11-20020917
+PF_P=postfix-${PF_PV}
+S=${WORKDIR}/${PF_P}
+TLS_P=pfixtls-0.8.11a-${PF_PV}-0.9.6g
+IPV6_P=tls+ipv6-1.4-pf-${PF_PV}
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/related/postfix/${PF_P}.tar.gz
+	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="x86 sparc ppc"
+
+PROVIDE="virtual/mta
+	 virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( dev-libs/cyrus-sasl )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta"
+
+postfix_installed=no
+
+pkg_setup() {
+
+	if ! grep -q ^postdrop: /etc/group ; then
+		groupadd postdrop || die "problem adding group postdrop"
+	fi
+
+	if [ -d /etc/postfix ] ; then
+		postfix_installed=yes
+	fi
+
+}
+
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${DISTFILES}/${PF_P}.tar.gz
+
+	if [ `use ssl` ] && [ `use ipv6` ]
+	then
+		cd ${S}
+		bzcat ${FILESDIR}/${IPV6_P}.patch.bz2 | patch -p1 || die "patch failed"
+		CCARGS="${CCARGS} -DHAS_SSL"
+		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
+	elif [ `use ssl` ]
+	then
+		unpack ${DISTFILES}/${TLS_P}.tar.gz
+		cd ${S}
+		patch -p1 < ${WORKDIR}/${TLS_P}/pfixtls.diff || die "patch failed"
+		CCARGS="${CCARGS} -DHAS_SSL"
+		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
+	fi
+
+	cd ${S}/conf
+	cp main.cf main.cf.orig
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
+
+	if [ "`use sasl`" ]
+	then
+			if [ -e /usr/include/sasl/sasl.h ]
+			then
+					# saslv2
+					AUXLIBS="${AUXLIBS} -lsasl2"
+					CCARGS="${CCARGS} -I/usr/include/sasl -DUSE_SASL_AUTH"
+			else
+					# saslv1
+					AUXLIBS="${AUXLIBS} -lsasl"
+					CCARGS="${CCARGS} -DUSE_SASL_AUTH"
+			fi
+	fi
+
+	cd ${S}/src/global
+	cp mail_params.h mail_params.h.orig
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
+
+	use mysql && CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
+		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
+
+	use ldap && CCARGS="${CCARGS} -DHAS_LDAP" \
+		&& AUXLIBS="${AUXLIBS} -lldap -llber"
+
+	use pam && AUXLIBS="${AUXLIBS} -lpam"
+
+	CCARGS="${CCARGS} -DHAS_PCRE"
+	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
+	DEBUG=""
+
+	cd ${S}
+	make tidy || die
+	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
+		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
+}
+
+src_compile() {
+
+	emake || die "compile problem"
+
+}
+
+src_install () {
+
+	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample \
+		/var/spool/postfix/hold
+
+	cd ${S}/bin
+	dosbin post* sendmail
+	chown root:postdrop ${D}/usr/sbin/{postdrop,postqueue}
+	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
+
+	dosym /usr/sbin/sendmail /usr/bin/mailq
+	dosym /usr/sbin/sendmail /usr/bin/newaliases
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	cd ${S}/libexec
+	exeinto /usr/lib/postfix
+	doexe *
+
+	cd ${S}/man
+	doman man*/*
+
+	cd ${S}
+	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
+	dohtml html/*
+
+	cd ${S}/conf
+	insinto /etc/postfix/sample
+	doins access aliases canonical relocated transport \
+		pcre_table regexp_table postfix-script* *.cf
+
+	exeinto /etc/postfix
+	doexe postfix-script post-install postfix-files || die
+
+	insinto /etc/postfix
+	doins ${FILESDIR}/main.cf ${S}/conf/master.cf ${FILESDIR}/saslpass || die
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
+	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
+
+	if [ "`use sasl`" ]
+	then
+			if [ -e /usr/include/sasl.h ]
+			then
+					# saslv1
+					insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
+			fi
+			if [ -e /usr/include/sasl/sasl.h ]
+			then
+					# saslv2
+					insinto /etc/sasl2 ; doins ${FILESDIR}/smtpd.conf
+			fi
+	fi
+
+}
+
+pkg_postinst() {
+
+	install -d -m 0755 ${ROOT}/var/spool/postfix
+
+	if [ "${postfix_installed}" = "yes" ] ; then
+		ewarn "If you have upgraded from <postfix-1.1.8, you must update"
+		ewarn "/etc/postfix/master.cf to the latest version"
+		ewarn "(/etc/postfix/._cfg*_master.cf). Otherwise Postfix will"
+		ewarn "not work correctly."
+	fi
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+
+}
diff --git a/mail-mta/postfix/postfix-2.0.11.ebuild b/mail-mta/postfix/postfix-2.0.11.ebuild
new file mode 100644
index 000000000000..ca3edab1fd23
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.0.11.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.11.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+IUSE="ssl mysql sasl ldap ipv6 maildir mbox"
+
+inherit eutils
+
+TLS_P="pfixtls-0.8.13-2.0.10-0.9.7b"
+IPV6="1.14"
+IPV6_P="ipv6-${IPV6}-pf-${PV}"
+IPV6_TLS_P="tls+${IPV6_P}"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org"
+SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
+	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/old/${TLS_P}.tar.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )"
+
+SLOT="0"
+LICENSE="IPL-1"
+KEYWORDS="x86 sparc ppc amd64 ~alpha"
+
+PROVIDE="virtual/mta
+	virtual/mda"
+
+DEPEND=">=sys-libs/db-3.2
+	>=sys-apps/sed-4
+	>=dev-libs/libpcre-3.4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( dev-libs/cyrus-sasl )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta"
+
+is_postfix_installed() {
+	if [ -d /etc/postfix ] ; then
+		return 1
+	fi
+
+	return 0
+}
+
+pkg_setup() {
+	if ! grep -q ^postdrop: /etc/group ; then
+		groupadd postdrop || die "problem adding group postdrop"
+	fi
+
+	if ! grep -q ^mail:.*postfix /etc/group ; then
+		usermod -G mail postfix || die "problem adding user postfix to group mail"
+	fi
+
+	# Prevent mangling the smtpd.conf file
+	if [ ! -L ${ROOT}/usr/lib/sasl2/smtpd.conf ]
+	then
+		if [ -f ${ROOT}/usr/lib/sasl2/smtpd.conf ]
+		then
+			ebegin "Protecting your smtpd.conf file"
+			if [ ! -d ${ROOT}/etc/sasl2 ]
+			then
+				mkdir -p ${ROOT}/etc/sasl2
+			fi
+
+			# This shouldn't be necessary, but apparently
+			# Without it things can still get messy.
+			if [ -L ${ROOT}/etc/sasl2/smtpd.conf ]
+			then
+				rm ${ROOT}/etc/sasl2/smtpd.conf
+			fi
+
+			# If both files exist, make sure that we
+			# preserve a copy of each with the ._cfg
+			# system
+			if [ -f ${ROOT}/etc/sasl2/smtpd.conf ]
+			then
+				mv ${ROOT}/etc/sasl2/smtpd.conf \
+					${ROOT}/etc/sasl2/._cfg0000_smtpd.conf
+			fi
+			mv ${ROOT}/usr/lib/sasl2/smtpd.conf ${ROOT}/etc/sasl2
+			eend
+		fi
+	fi
+
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	if [ "`use ssl`" ]; then
+		if [ "`use ipv6`" ]; then
+			epatch ${DISTDIR}/${IPV6_TLS_P}.patch.gz
+		else
+			unpack ${TLS_P}.tar.gz
+			epatch ${WORKDIR}/${P}/${TLS_P}/pfixtls.diff
+		fi
+		CCARGS="${CCARGS} -DHAS_SSL"
+		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
+	elif [ "`use ipv6`" ]; then
+		epatch ${DISTDIR}/${IPV6_P}.patch.gz
+	fi
+	cd ${S}/conf
+	sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf
+
+	if [ "`use sasl`" ] ; then
+		# sasl 2
+		if [ -f /usr/include/sasl/sasl.h ]; then
+			AUXLIBS="${AUXLIBS} -lsasl2"
+			CCARGS="${CCARGS} -I/usr/include/sasl -DUSE_SASL_AUTH"
+		# sasl 1
+		elif [ -f /usr/include/sasl.h ]; then
+			AUXLIBS="${AUXLIBS} -lsasl"
+			CCARGS="${CCARGS} -DUSE_SASL_AUTH"
+		fi
+	fi
+
+	cd ${S}/src/global
+	sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h
+
+	if [ "`use mysql`" ] ; then
+		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
+		AUXLIBS="${AUXLIBS} -lmysqlclient -lm -lz"
+	fi
+
+	if [ "`use ldap`" ] ; then
+		CCARGS="${CCARGS} -DHAS_LDAP"
+		AUXLIBS="${AUXLIBS} -lldap -llber"
+	fi
+
+	if [ "`use pam`" ] ; then
+		AUXLIBS="${AUXLIBS} -lpam"
+	fi
+
+	CCARGS="${CCARGS} -DHAS_PCRE"
+	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
+
+	DEBUG=""
+
+	cd ${S}
+	make makefiles CC="${CC}" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
+		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \
+		|| die "creating makefiles failed"
+
+	# Postfix do not get the FQDN if no hostname is configured
+	epatch ${FILESDIR}/${PN}-2.0.9-get-FQDN.patch
+}
+
+src_compile() {
+	#this is a bug fix for gcc-2.95.3-r5 (bug 16547)
+	export CC=gcc
+	emake || die "compile problem"
+}
+
+src_install () {
+	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
+	keepdir /var/spool/postfix/tmp
+
+	cd ${S}/bin
+	dosbin post* sendmail
+	fowners root:postdrop /usr/sbin/{postdrop,postqueue}
+	fperms 2755 /usr/sbin/{postdrop,postqueue}
+
+	dosym /usr/sbin/sendmail /usr/bin/mailq
+	dosym /usr/sbin/sendmail /usr/bin/newaliases
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	cd ${S}/libexec
+	exeinto /usr/lib/postfix
+	doexe *
+
+	cd ${S}/man
+	doman man*/*
+
+	cd ${S}
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	cd README_FILES
+	find . -type l |xargs rm
+	dodoc *
+
+	cd ${S}
+	dohtml html/*
+
+	cd ${S}/conf
+	insinto /etc/postfix/sample
+	doins access aliases canonical pcre_table regexp_table \
+		relocated transport virtual *.cf
+
+	exeinto /etc/postfix
+	doexe postfix-script post-install postfix-files
+
+	insinto /etc/postfix
+	doins ${S}/conf/{main,master}.cf
+	newins ${FILESDIR}/smtp.pass saslpass
+	cd ${D}/etc/postfix
+	epatch ${FILESDIR}/postfix-2.0.0/main.cf.diff
+	sed -i -e "s|/usr/share/doc/POSTFIX|/usr/share/doc/${PF}|" main.cf
+	chmod 644 main.cf
+	rm -f main.cf~
+	fperms 600 /etc/postfix/saslpass
+
+	exeinto /etc/init.d ; doexe ${FILESDIR}/postfix.rc6
+	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
+
+	insinto /etc/sasl2
+	doins ${FILESDIR}/smtpd.conf
+	if [ "`use sasl`" ] ; then
+		dodir /usr/lib/sasl2
+		dosym ../../../etc/sasl2/smtpd.conf /usr/lib/sasl2/smtpd.conf
+	fi
+
+	cd ${D}/etc/postfix
+	if [ "`use maildir`" ]; then
+		sed -i -e "s:^#\(home_mailbox = \)Maildir/:\1.maildir/:" main.cf
+	elif [ "`use mbox`" ]; then
+		sed -i -e "s:^#\(mail_spool_directory = /var/spool/mail\):\1:" main.cf
+	fi
+
+	#install an rmail for UUCP, closing bug #19127
+	cd ${S}/auxiliary/rmail
+	dobin rmail
+}
+
+pkg_postinst() {
+	install -d -m 0755 ${ROOT}/var/spool/postfix
+
+	ewarn "If you upgraded from <postfix-2, you must revisit your configuration files."
+	ewarn "See /usr/share/doc/${PF}/RELEASE_NOTES for a list of changes."
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs and then run"
+		ewarn "/usr/bin/newaliases. Postfix will not work correctly without it."
+	fi
+}
diff --git a/mail-mta/postfix/postfix-2.0.16-r1.ebuild b/mail-mta/postfix/postfix-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..0b2e63577141
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.0.16-r1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.16-r1.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+inherit eutils ssl-cert
+
+TLS_P="pfixtls-0.8.16-2.0.16-0.9.7b"
+IPV6="1.18a"
+IPV6_P="ipv6-${IPV6}-pf-2.0.16"
+IPV6_TLS_P="tls+${IPV6_P}"
+PGSQL_P="postfix-pg.postfix-2.0.0.2"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
+	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
+	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/old/${TLS_P}.tar.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
+	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="x86 sparc ~ppc"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
+
+PROVIDE="virtual/mta virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	>=sys-apps/sed-4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta"
+
+# Is this still necessary since gentoo sasl looks
+# in /etc/sasl2 for it's config files?
+pkg_setup() {
+	# Prevent mangling the smtpd.conf file.
+	if [ ! -L "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
+		if [ -f "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
+			ebegin "Protecting your smtpd.conf file"
+			if [ ! -d "${ROOT}/etc/sasl2" ] ; then
+				mkdir -p "${ROOT}/etc/sasl2"
+			fi
+
+			# This shouldn't be necessary, but apparently
+			# without it things can still get messy.
+			if [ -L "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
+				rm "${ROOT}/etc/sasl2/smtpd.conf"
+			fi
+
+			# If both files exist, make sure that we preserve
+			# a copy of each with the ._cfg system.
+			if [ -f "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
+				mv "${ROOT}/etc/sasl2/smtpd.conf" \
+					"${ROOT}/etc/sasl2/._cfg0000_smtpd.conf"
+			fi
+			mv "${ROOT}/usr/lib/sasl2/smtpd.conf" "${ROOT}/etc/sasl2"
+			eend
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	if [ "`use ssl`" ] ; then
+		if [ "`use ipv6`" ] ; then
+			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
+		else
+			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
+		fi
+	elif [ "`use ipv6`" ]; then
+		epatch "${WORKDIR}/${IPV6_P}.patch"
+	fi
+
+	if [ "`use postgres`" ] ; then
+		epatch "${DISTDIR}/${PGSQL_P}.patch"
+	fi
+
+	# Verisign name services fixes.
+	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
+
+	# Postfix does not get the FQDN if no hostname is configured.
+	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
+
+	# Fix install paths.
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
+		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
+}
+
+src_compile() {
+	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
+
+	if [ "`use pam`" ] ; then
+		mylibs="${mylibs} -lpam"
+	fi
+	if [ "`use ldap`" ] ; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+	if [ "`use mysql`" ] ; then
+		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+	if [ "`use postgres`" ] ; then
+		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
+		else
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
+		fi
+		mylibs="${mylibs} -lpq"
+	fi
+	if [ "`use ssl`" ] ; then
+		mycc="${mycc} -DUSE_SSL"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+	if [ "`use sasl`" ] ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	fi
+
+	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
+
+	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		daemon_directory="/usr/lib/postfix" \
+		program_directory="/usr/lib/postfix" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		sample_directory="/usr/share/doc/${PF}/sample" \
+		manpage_directory="/usr/share/man" \
+		mail_owner="postfix" \
+		setgid_group="postdrop" || die "postfix-install failed"
+
+	# Provide another link for legacy FSH.
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	# Install an rmail for UUCP, closing bug #19127.
+	dobin auxiliary/rmail/rmail
+
+	# Set proper permissions on required files/directories.
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
+	if [ "`use maildir`" ] ; then
+		mypostconf="home_mailbox=.maildir/"
+	elif [ "`use mbox`" ] ; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	fi
+	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
+		"alias_maps=hash:/etc/mail/aliases" \
+		"alias_database=hash:/etc/mail/aliases" \
+		"local_destination_concurrency_limit=2" \
+		"default_destination_concurrency_limit=2" \
+		${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}/smtp.pass" saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/postfix.rc6" postfix
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dohtml html/*
+
+	if [ "`use pam`" ] ; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/smtp.pam" smtp
+	fi
+	if [ "`use ssl`" ] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		insinto /etc/ssl/postfix
+		docert server
+		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
+	fi
+	if [ "`use sasl`" ] ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}/smtp.sasl" smtpd.conf
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/etc/postfix/post-install" upgrade-permissions
+	eend $?
+	echo
+
+	ewarn "If you upgraded from postfix-1.x, you must revisit"
+	ewarn "your configuration files.  See"
+	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
+	ewarn "for a list of changes."
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+}
diff --git a/mail-mta/postfix/postfix-2.0.18.ebuild b/mail-mta/postfix/postfix-2.0.18.ebuild
new file mode 100644
index 000000000000..13bcc5c1b8ea
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.0.18.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.18.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+inherit eutils ssl-cert
+
+TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
+IPV6="1.21"
+IPV6_P="ipv6-${IPV6}-pf-2.0.18"
+IPV6_TLS_P="tls+${IPV6_P}"
+PGSQL_P="postfix-pg.postfix-2.0.0.2"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
+	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
+	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
+	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
+
+PROVIDE="virtual/mta virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	>=sys-apps/sed-4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta"
+
+# Is this still necessary since gentoo sasl looks
+# in /etc/sasl2 for it's config files?
+pkg_setup() {
+	# Prevent mangling the smtpd.conf file.
+	if [ ! -L "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
+		if [ -f "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
+			ebegin "Protecting your smtpd.conf file"
+			if [ ! -d "${ROOT}/etc/sasl2" ] ; then
+				mkdir -p "${ROOT}/etc/sasl2"
+			fi
+
+			# This shouldn't be necessary, but apparently
+			# without it things can still get messy.
+			if [ -L "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
+				rm "${ROOT}/etc/sasl2/smtpd.conf"
+			fi
+
+			# If both files exist, make sure that we preserve
+			# a copy of each with the ._cfg system.
+			if [ -f "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
+				mv "${ROOT}/etc/sasl2/smtpd.conf" \
+					"${ROOT}/etc/sasl2/._cfg0000_smtpd.conf"
+			fi
+			mv "${ROOT}/usr/lib/sasl2/smtpd.conf" "${ROOT}/etc/sasl2"
+			eend
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	if [ "`use ssl`" ] ; then
+		if [ "`use ipv6`" ] ; then
+			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
+		else
+			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
+		fi
+	elif [ "`use ipv6`" ]; then
+		epatch "${WORKDIR}/${IPV6_P}.patch"
+	fi
+
+	if [ "`use postgres`" ] ; then
+		epatch "${DISTDIR}/${PGSQL_P}.patch"
+	fi
+
+	# Verisign name services fixes.
+	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
+
+	# Postfix does not get the FQDN if no hostname is configured.
+	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
+
+	# Fix install paths.
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
+		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
+}
+
+src_compile() {
+	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
+
+	if [ "`use pam`" ] ; then
+		mylibs="${mylibs} -lpam"
+	fi
+	if [ "`use ldap`" ] ; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+	if [ "`use mysql`" ] ; then
+		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+	if [ "`use postgres`" ] ; then
+		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
+		else
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
+		fi
+		mylibs="${mylibs} -lpq"
+	fi
+	if [ "`use ssl`" ] ; then
+		mycc="${mycc} -DUSE_SSL"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+	if [ "`use sasl`" ] ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	fi
+
+	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
+
+	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		daemon_directory="/usr/lib/postfix" \
+		program_directory="/usr/lib/postfix" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		sample_directory="/usr/share/doc/${PF}/sample" \
+		manpage_directory="/usr/share/man" \
+		mail_owner="postfix" \
+		setgid_group="postdrop" || die "postfix-install failed"
+
+	# Provide another link for legacy FSH.
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	# Install an rmail for UUCP, closing bug #19127.
+	dobin auxiliary/rmail/rmail
+
+	# Set proper permissions on required files/directories.
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
+	if [ "`use maildir`" ] ; then
+		mypostconf="home_mailbox=.maildir/"
+	elif [ "`use mbox`" ] ; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	fi
+	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
+		"alias_maps=hash:/etc/mail/aliases" \
+		"alias_database=hash:/etc/mail/aliases" \
+		"local_destination_concurrency_limit=2" \
+		"default_destination_concurrency_limit=2" \
+		${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}/smtp.pass" saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/postfix.rc6" postfix
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dohtml html/*
+
+	if [ "`use pam`" ] ; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/smtp.pam" smtp
+	fi
+	if [ "`use ssl`" ] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		insinto /etc/ssl/postfix
+		docert server
+		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
+	fi
+	if [ "`use sasl`" ] ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}/smtp.sasl" smtpd.conf
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/etc/postfix/post-install" upgrade-permissions
+	eend $?
+	echo
+
+	ewarn "If you upgraded from postfix-1.x, you must revisit"
+	ewarn "your configuration files.  See"
+	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
+	ewarn "for a list of changes."
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+}
diff --git a/mail-mta/postfix/postfix-2.0.19-r1.ebuild b/mail-mta/postfix/postfix-2.0.19-r1.ebuild
new file mode 100644
index 000000000000..22d19c0bbb94
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.0.19-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r1.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+inherit eutils ssl-cert
+
+VDA_P="${PN}-2.0.18"
+TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
+IPV6="1.21"
+IPV6_P="ipv6-${IPV6}-pf-2.0.18"
+IPV6_TLS_P="tls+${IPV6_P}"
+PGSQL_P="postfix-pg.postfix-2.0.0.2"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
+	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
+	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
+	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
+	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl vda maildir mbox"
+
+PROVIDE="virtual/mta virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	>=sys-apps/sed-4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	if use ssl ; then
+		if use ipv6 ; then
+			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
+		else
+			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
+		fi
+	elif use ipv6; then
+		epatch "${WORKDIR}/${IPV6_P}.patch"
+	fi
+
+	if use vda ; then
+		epatch "${WORKDIR}/${VDA_P}.patch"
+	fi
+
+	if use postgres ; then
+		epatch "${DISTDIR}/${PGSQL_P}.patch"
+	fi
+
+	# Verisign name services fixes.
+	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
+
+	# Postfix does not get the FQDN if no hostname is configured.
+	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
+
+	# Fix install paths.
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
+		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
+}
+
+src_compile() {
+	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
+
+	if use pam ; then
+		mylibs="${mylibs} -lpam"
+	fi
+	if use ldap ; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+	if use mysql ; then
+		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+	if use postgres ; then
+		if best_version '=dev-db/postgresql-7.3*' ; then
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
+		else
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
+		fi
+		mylibs="${mylibs} -lpq"
+	fi
+	if use ssl ; then
+		mycc="${mycc} -DUSE_SSL"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+	if use sasl ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	fi
+
+	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
+
+	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		daemon_directory="/usr/lib/postfix" \
+		program_directory="/usr/lib/postfix" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		sample_directory="/usr/share/doc/${PF}/sample" \
+		manpage_directory="/usr/share/man" \
+		mail_owner="postfix" \
+		setgid_group="postdrop" || die "postfix-install failed"
+
+	rm -rf "${D}/var"
+	keepdir /var/spool/postfix
+
+	# Provide another link for legacy FSH.
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	# Install an rmail for UUCP, closing bug #19127.
+	dobin auxiliary/rmail/rmail
+
+	# Set proper permissions on required files/directories.
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
+	if use maildir ; then
+		mypostconf="home_mailbox=.maildir/"
+	elif use mbox ; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	fi
+	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
+		"alias_maps=hash:/etc/mail/aliases" \
+		"alias_database=hash:/etc/mail/aliases" \
+		"local_destination_concurrency_limit=2" \
+		"default_destination_concurrency_limit=2" \
+		${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}/smtp.pass" saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/postfix.rc6" postfix
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dohtml html/*
+
+	if use pam ; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/smtp.pam" smtp
+	fi
+	if use ssl ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		insinto /etc/ssl/postfix
+		docert server
+		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
+	fi
+	if use sasl ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}/smtp.sasl" smtpd.conf
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/etc/postfix/post-install" upgrade-permissions
+	eend $?
+	echo
+
+	ewarn "If you upgraded from postfix-1.x, you must revisit"
+	ewarn "your configuration files.  See"
+	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
+	ewarn "for a list of changes."
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+}
diff --git a/mail-mta/postfix/postfix-2.0.19-r2.ebuild b/mail-mta/postfix/postfix-2.0.19-r2.ebuild
new file mode 100644
index 000000000000..80a8ac4fd2f6
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.0.19-r2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r2.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+inherit eutils ssl-cert
+
+VDA_P="${PN}-2.0.18"
+TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
+IPV6="1.21"
+IPV6_P="ipv6-${IPV6}-pf-2.0.18"
+IPV6_TLS_P="tls+${IPV6_P}"
+PGSQL_P="postfix-pg.postfix-2.0.0.2"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
+	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
+	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
+	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
+	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 s390"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl vda maildir mbox"
+
+PROVIDE="virtual/mta virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	>=sys-apps/sed-4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	net-mail/mailwrapper"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	if use ssl ; then
+		if use ipv6 ; then
+			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
+		else
+			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
+		fi
+	elif use ipv6; then
+		epatch "${WORKDIR}/${IPV6_P}.patch"
+	fi
+
+	if use vda ; then
+		epatch "${WORKDIR}/${VDA_P}.patch"
+	fi
+
+	if use postgres ; then
+		epatch "${DISTDIR}/${PGSQL_P}.patch"
+	fi
+
+	# Verisign name services fixes.
+	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
+
+	# Postfix does not get the FQDN if no hostname is configured.
+	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
+
+	# Fix install paths.
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
+		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
+}
+
+src_compile() {
+	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
+
+	if use pam ; then
+		mylibs="${mylibs} -lpam"
+	fi
+	if use ldap ; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+	if use mysql ; then
+		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+	if use postgres ; then
+		if best_version '=dev-db/postgresql-7.3*' ; then
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
+		else
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
+		fi
+		mylibs="${mylibs} -lpq"
+	fi
+	if use ssl ; then
+		mycc="${mycc} -DUSE_SSL"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+	if use sasl ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	fi
+
+	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
+
+	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		daemon_directory="/usr/lib/postfix" \
+		program_directory="/usr/lib/postfix" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		sample_directory="/usr/share/doc/${PF}/sample" \
+		manpage_directory="/usr/share/man" \
+		mail_owner="postfix" \
+		setgid_group="postdrop" || die "postfix-install failed"
+
+	# Fix spool removal on upgrade.
+	rm -rf "${D}/var"
+	keepdir /var/spool/postfix
+
+	# Remove the /usr/sbin/sendmail symlink
+	mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
+
+	# Provide another link for legacy FSH.
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	# Install an rmail for UUCP, closing bug #19127.
+	dobin auxiliary/rmail/rmail
+
+	# Set proper permissions on required files/directories.
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
+	if use maildir ; then
+		mypostconf="home_mailbox=.maildir/"
+	elif use mbox ; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	fi
+	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
+		"alias_maps=hash:/etc/mail/aliases" \
+		"alias_database=hash:/etc/mail/aliases" \
+		"local_destination_concurrency_limit=2" \
+		"default_destination_concurrency_limit=2" \
+		${mypostconf} || die "postconf failed"
+
+	insinto /etc
+	doins "${FILESDIR}/mailer.conf"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}/smtp.pass" saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/postfix.rc6" postfix
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dohtml html/*
+
+	if use pam ; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/smtp.pam" smtp
+	fi
+	if use ssl ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		insinto /etc/ssl/postfix
+		docert server
+		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
+	fi
+	if use sasl ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}/smtp.sasl" smtpd.conf
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/etc/postfix/post-install" upgrade-permissions
+	eend $?
+	echo
+
+	ewarn "If you upgraded from postfix-1.x, you must revisit"
+	ewarn "your configuration files.  See"
+	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
+	ewarn "for a list of changes."
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+}
diff --git a/mail-mta/postfix/postfix-2.0.19.ebuild b/mail-mta/postfix/postfix-2.0.19.ebuild
new file mode 100644
index 000000000000..5c3f9b9ea82c
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.0.19.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+
+inherit eutils ssl-cert
+
+TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
+IPV6="1.21"
+IPV6_P="ipv6-${IPV6}-pf-2.0.18"
+IPV6_TLS_P="tls+${IPV6_P}"
+PGSQL_P="postfix-pg.postfix-2.0.0.2"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
+	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
+	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
+	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
+	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="x86 sparc ~ppc ~alpha mips"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
+
+PROVIDE="virtual/mta virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	>=sys-apps/sed-4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta"
+
+# Is this still necessary since gentoo sasl looks
+# in /etc/sasl2 for it's config files?
+pkg_setup() {
+	# Prevent mangling the smtpd.conf file.
+	if [ ! -L "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
+		if [ -f "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
+			ebegin "Protecting your smtpd.conf file"
+			if [ ! -d "${ROOT}/etc/sasl2" ] ; then
+				mkdir -p "${ROOT}/etc/sasl2"
+			fi
+
+			# This shouldn't be necessary, but apparently
+			# without it things can still get messy.
+			if [ -L "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
+				rm "${ROOT}/etc/sasl2/smtpd.conf"
+			fi
+
+			# If both files exist, make sure that we preserve
+			# a copy of each with the ._cfg system.
+			if [ -f "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
+				mv "${ROOT}/etc/sasl2/smtpd.conf" \
+					"${ROOT}/etc/sasl2/._cfg0000_smtpd.conf"
+			fi
+			mv "${ROOT}/usr/lib/sasl2/smtpd.conf" "${ROOT}/etc/sasl2"
+			eend
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	if [ "`use ssl`" ] ; then
+		if [ "`use ipv6`" ] ; then
+			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
+		else
+			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
+		fi
+	elif [ "`use ipv6`" ]; then
+		epatch "${WORKDIR}/${IPV6_P}.patch"
+	fi
+
+	if [ "`use postgres`" ] ; then
+		epatch "${DISTDIR}/${PGSQL_P}.patch"
+	fi
+
+	# Verisign name services fixes.
+	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
+
+	# Postfix does not get the FQDN if no hostname is configured.
+	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
+
+	# Fix install paths.
+	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
+		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
+}
+
+src_compile() {
+	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
+
+	if [ "`use pam`" ] ; then
+		mylibs="${mylibs} -lpam"
+	fi
+	if [ "`use ldap`" ] ; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+	if [ "`use mysql`" ] ; then
+		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+	if [ "`use postgres`" ] ; then
+		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
+		else
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
+		fi
+		mylibs="${mylibs} -lpq"
+	fi
+	if [ "`use ssl`" ] ; then
+		mycc="${mycc} -DUSE_SSL"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+	if [ "`use sasl`" ] ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	fi
+
+	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
+
+	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		daemon_directory="/usr/lib/postfix" \
+		program_directory="/usr/lib/postfix" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		sample_directory="/usr/share/doc/${PF}/sample" \
+		manpage_directory="/usr/share/man" \
+		mail_owner="postfix" \
+		setgid_group="postdrop" || die "postfix-install failed"
+
+	rm -rf "${D}/var"
+	keepdir /var/spool/postfix
+
+	# Provide another link for legacy FSH.
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	# Install an rmail for UUCP, closing bug #19127.
+	dobin auxiliary/rmail/rmail
+
+	# Set proper permissions on required files/directories.
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
+	if [ "`use maildir`" ] ; then
+		mypostconf="home_mailbox=.maildir/"
+	elif [ "`use mbox`" ] ; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	fi
+	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
+		"alias_maps=hash:/etc/mail/aliases" \
+		"alias_database=hash:/etc/mail/aliases" \
+		"local_destination_concurrency_limit=2" \
+		"default_destination_concurrency_limit=2" \
+		${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}/smtp.pass" saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/postfix.rc6" postfix
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dohtml html/*
+
+	if [ "`use pam`" ] ; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/smtp.pam" smtp
+	fi
+	if [ "`use ssl`" ] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		insinto /etc/ssl/postfix
+		docert server
+		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
+	fi
+	if [ "`use sasl`" ] ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}/smtp.sasl" smtpd.conf
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/etc/postfix/post-install" upgrade-permissions
+	eend $?
+	echo
+
+	ewarn "If you upgraded from postfix-1.x, you must revisit"
+	ewarn "your configuration files.  See"
+	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
+	ewarn "for a list of changes."
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+}