Cleanup some stale files.

24 files changed, 16 insertions, 1882 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index 9cc947c34203..2f9a0b803d79 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.105 2004/01/23 15:06:46 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.106 2004/02/06 16:09:39 max Exp $
+
+  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)
 
diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index 37c8ba12ac7b..b75e2b6731a2 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -1,42 +1,21 @@
-MD5 9a76c00dc374c58cb48acdd1a7a15c4b postfix-2.0.10-r1.ebuild 6162
 MD5 54603105677ede67f8dd6a3234417109 postfix-2.0.18.ebuild 6794
-MD5 9dbec295c346a13a09fc91a1814755cb postfix-2.0.13-r1.ebuild 6347
-MD5 2fe228e8ea41468c95d28d6f166aa0dc postfix-2.0.9.ebuild 6236
 MD5 814186572595eb376ac5febb83c50d00 postfix-1.1.11.20020917-r1.ebuild 4593
-MD5 50c37701912b43e8672854795a6f4d1c postfix-2.0.17.ebuild 6794
 MD5 cbf8f19236850c42e47b7994b5cdc258 postfix-2.0.16-r1.ebuild 6800
-MD5 c156cd1b607a905125f9f1ca47177b16 postfix-2.0.12-r1.ebuild 6029
-MD5 a5f1d33d6b5226ed81cf7be55aa8f9c9 postfix-2.0.14.ebuild 6381
-MD5 75487fe50e2b5d4cbd68b5d2a91bf0aa postfix-2.0.15-r1.ebuild 6385
 MD5 400a22e05dec5d8e36b41c0f64a46a16 ChangeLog 21354
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 a515b7a5d1f6e1ac3d05ac9a1de560b3 postfix-2.0.11.ebuild 6033
+MD5 1513a378e3445fc257dd5217d9164ead postfix-2.0.11.ebuild 6040
 MD5 af54dd63ae7235856a5cc25284ac40c8 postfix-1.1.11.20020917.ebuild 4574
-MD5 a3eadfcfa0bf6f88ccff41e2d065745b files/postfix-2.0.8_patch.patch 552
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
 MD5 c96b069e399dd4c8d21faddcb6274de6 files/postfix.rc6 585
 MD5 ffb7badd0a9041f2bf61287c0e881d4f files/smtp.pass 134
 MD5 6a0281eb56da3530d3208ccbed185c4c files/smtp.sasl 124
-MD5 569f1c46350b2718419b72bb9c443c3f files/saslpass 135
 MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
 MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
-MD5 b16da80a639afb1445a78346a3469d17 files/digest-postfix-2.0.14 296
-MD5 6550bbb115dee08f8540feb21b46b0b3 files/digest-postfix-2.0.17 445
 MD5 8f5603efbad85663da0743288bcec3ba files/digest-postfix-2.0.18 445
 MD5 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
 MD5 ff6584c14212d383b742fe5fc0aceed5 files/postfix-2.0.9-get-FQDN.patch 993
 MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
-MD5 e126c8295dad90d20bf2d6a47086ab0e files/digest-postfix-2.0.9 220
-MD5 61fc23026a194c592078961b7da6455c files/postfix-pg.postfix-2.0.0.2.patch.bz2 7526
 MD5 41b1fd28cf1cb7ea752968c0fdd5cc84 files/smtp.pam 250
-MD5 3004148a32063214f57f0316b9f46116 files/postfix 517
-MD5 499f6d9f2295ba6e359ce568842d050c files/digest-postfix-2.0.10-r1 295
-MD5 6264e15636614de0cce39a66de79db5f files/digest-postfix-2.0.12-r1 295
-MD5 fbf57b537c7f42a7bf96f073ee3d22bf files/digest-postfix-2.0.13-r1 297
-MD5 e38041c4e48c3b1f858b60a7cc200844 files/digest-postfix-2.0.15-r1 296
 MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
-MD5 7dea3c30c3550cbbcdf4aac0b6d8dffa files/smtpd-2.0.conf 138
-MD5 2451d1fd691c1e31e2d979e4c25f8d7e files/postfix-2.0.14/main.cf.diff 2382
-MD5 cada6258fd7febc632fd333523fa00d5 files/postfix-2.0.0/master.cf.diff 883
 MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/net-mail/postfix/files/digest-postfix-2.0.10-r1 b/net-mail/postfix/files/digest-postfix-2.0.10-r1
deleted file mode 100644
index 8c690728e794..000000000000
--- a/net-mail/postfix/files/digest-postfix-2.0.10-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 80ebfc319640a5dec2fedf4945561b88 postfix-2.0.10.tar.gz 1348298
-MD5 31f1e830882025957f735e5e9b7dd2fd pfixtls-0.8.13-2.0.10-0.9.7b.tar.gz 226122
-MD5 bb865343d759990365e1e07e3f2331c2 ipv6-1.14-pf-2.0.10.patch.gz 35997
-MD5 e69175477e7921931a2e2841ce83c2fb tls+ipv6-1.14-pf-2.0.10.patch.gz 99529
diff --git a/net-mail/postfix/files/digest-postfix-2.0.12-r1 b/net-mail/postfix/files/digest-postfix-2.0.12-r1
deleted file mode 100644
index 4fde1688899b..000000000000
--- a/net-mail/postfix/files/digest-postfix-2.0.12-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 94ce611b6f3e169caee2b4634c6b5370 postfix-2.0.12.tar.gz 1349796
-MD5 42533d651553e97920b011dbf5812f4e pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz 227935
-MD5 6a3974a97cde56af94e8c0f9ab92c59e ipv6-1.14-pf-2.0.12.patch.gz 36038
-MD5 54fc03f23bad5a061e9bf254e1a3c3cb tls+ipv6-1.14-pf-2.0.12.patch.gz 99578
diff --git a/net-mail/postfix/files/digest-postfix-2.0.13-r1 b/net-mail/postfix/files/digest-postfix-2.0.13-r1
deleted file mode 100644
index 889f9d24a611..000000000000
--- a/net-mail/postfix/files/digest-postfix-2.0.13-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 f4f2b4b930a7a32b1df475d87143269f postfix-2.0.13.tar.gz 1350854
-MD5 298f55e2d896a0240f5913a3b611e623 pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz 233962
-MD5 ffdb090f8b826fb8217429a6d7ce555e ipv6-1.15-pf-2.0.13.patch.gz 36474
-MD5 b3a9ec333c88a315d540b2ca76ef7666 tls+ipv6-1.15a-pf-2.0.13.patch.gz 105381
diff --git a/net-mail/postfix/files/digest-postfix-2.0.14 b/net-mail/postfix/files/digest-postfix-2.0.14
deleted file mode 100644
index d039f4208e17..000000000000
--- a/net-mail/postfix/files/digest-postfix-2.0.14
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 d0f1d1382958f3ce918d4d690be22229 postfix-2.0.14.tar.gz 1351520
-MD5 0f2faa625053b92ba579232bea97cac5 pfixtls-0.8.15-2.0.14-0.9.7b.tar.gz 233924
-MD5 5dbafae86744c1893d1d3c52b3cdbcb7 ipv6-1.17-pf-2.0.14.patch.gz 42085
-MD5 aba3c1d230f1591e7f7f8c426ce6b2fc tls+ipv6-1.17-pf-2.0.14.patch.gz 116182
diff --git a/net-mail/postfix/files/digest-postfix-2.0.15-r1 b/net-mail/postfix/files/digest-postfix-2.0.15-r1
deleted file mode 100644
index e9083ca0d607..000000000000
--- a/net-mail/postfix/files/digest-postfix-2.0.15-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 723c2b7f67016e0c19b0e1aa08dad246 postfix-2.0.15.tar.gz 1351964
-MD5 6823c6645d64c80b63597db8b4a29d16 pfixtls-0.8.16-2.0.15-0.9.7b.tar.gz 234027
-MD5 63228fbba5c6b2e8f808eec2ea67649a ipv6-1.18-pf-2.0.15.patch.gz 42095
-MD5 49a1a7890015425243a98f87413ab172 tls+ipv6-1.18-pf-2.0.15.patch.gz 110577
diff --git a/net-mail/postfix/files/digest-postfix-2.0.17 b/net-mail/postfix/files/digest-postfix-2.0.17
deleted file mode 100644
index 9c06cf490955..000000000000
--- a/net-mail/postfix/files/digest-postfix-2.0.17
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 482e3912e4e910bd62f1a2d74bfa3b77 postfix-2.0.17.tar.gz 1353628
-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 e59b9d580bd0299bc0ed76902984c2c4 ipv6-1.20-pf-2.0.16.patch.gz 46978
-MD5 9e26a2bb0cf36d6a9739c501ec26246a tls+ipv6-1.20-pf-2.0.16.patch.gz 254580
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/net-mail/postfix/files/digest-postfix-2.0.9 b/net-mail/postfix/files/digest-postfix-2.0.9
deleted file mode 100644
index 65a9ea9bebbe..000000000000
--- a/net-mail/postfix/files/digest-postfix-2.0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c1ad12edfa19c23579b251078c464651 postfix-2.0.9.tar.gz 1347572
-MD5 42e3c15c5d9b59eb4cd15304f9c11627 pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz 226006
-MD5 b2bec23a55360ac5bfa55426ecb5f1e3 tls+ipv6-1.13-pf-2.0.7.patch.gz 95608
diff --git a/net-mail/postfix/files/postfix b/net-mail/postfix/files/postfix
deleted file mode 100755
index 98f376c276f1..000000000000
--- a/net-mail/postfix/files/postfix
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/files/postfix,v 1.4 2003/04/19 02:55:27 drobbins Exp $
-
-depend() {
-	need net
-	use logger dns
-	provide mta
-}
-
-PIDFILE=/var/spool/postfix/pid/master.pid
-
-start() {
-	ebegin "Starting postfix"
-	/usr/sbin/postfix start &>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping postfix"
-	/usr/sbin/postfix stop &>/dev/null
-	eend $?
-}
diff --git a/net-mail/postfix/files/postfix-2.0.0/master.cf.diff b/net-mail/postfix/files/postfix-2.0.0/master.cf.diff
deleted file mode 100644
index e2f3a68c72d8..000000000000
--- a/net-mail/postfix/files/postfix-2.0.0/master.cf.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- master.cf	2003-08-15 22:11:59.000000000 -0400
-+++ master.cf-modified	2003-08-15 22:14:12.000000000 -0400
-@@ -102,10 +102,10 @@
- # The Cyrus deliver program has changed incompatibly, multiple times.
- #
- old-cyrus unix  -       n       n       -       -       pipe
--  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
-+  flags=R user=cyrus argv=/usr/cyrus/bin/deliver -e -m ${extension} ${user}
- # Cyrus 2.1.5 (Amos Gouaux)
- cyrus     unix  -       n       n       -       -       pipe
--  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
-+  flags=hu user=cyrus argv=/usr/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
- uucp      unix  -       n       n       -       -       pipe
-   flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
- ifmail    unix  -       n       n       -       -       pipe
diff --git a/net-mail/postfix/files/postfix-2.0.14/main.cf.diff b/net-mail/postfix/files/postfix-2.0.14/main.cf.diff
deleted file mode 100644
index a1f950660b10..000000000000
--- a/net-mail/postfix/files/postfix-2.0.14/main.cf.diff
+++ /dev/null
@@ -1,75 +0,0 @@
---- ../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 = 20
-+local_destination_concurrency_limit = 2
-+default_destination_concurrency_limit = 20
- 
- # 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/net-mail/postfix/files/postfix-2.0.8_patch.patch b/net-mail/postfix/files/postfix-2.0.8_patch.patch
deleted file mode 100644
index 4bf63086e3e6..000000000000
--- a/net-mail/postfix/files/postfix-2.0.8_patch.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tls+ipv6-1.13-pf-2.0.7.patch	2003-04-16 10:21:26.000000000 -0500
-+++ tls+ipv6-1.13-pf-2.0.8.patch	2003-04-16 10:29:21.000000000 -0500
-@@ -10308,7 +10308,7 @@
-  /* match_parse_mask - parse net/mask pattern */
-  
-  static int match_parse_mask(const char *pattern, unsigned long *net_bits,
--@@ -198,27 +504,55 @@
-+@@ -198,28 +504,56 @@
-      return (mask != 0);
-  }
-  
-@@ -10328,6 +10328,7 @@
-      unsigned long mask_bits;
-      unsigned long net_bits;
-      unsigned long addr_bits;
-+     struct in_addr net_addr;
- +#endif
-  
-      if (msg_verbose)
diff --git a/net-mail/postfix/files/postfix-pg.postfix-2.0.0.2.patch.bz2 b/net-mail/postfix/files/postfix-pg.postfix-2.0.0.2.patch.bz2
deleted file mode 100644
index 91d3ddcefe64..000000000000
--- a/net-mail/postfix/files/postfix-pg.postfix-2.0.0.2.patch.bz2
+++ /dev/null
diff --git a/net-mail/postfix/files/saslpass b/net-mail/postfix/files/saslpass
deleted file mode 100644
index 06a50b3e4938..000000000000
--- a/net-mail/postfix/files/saslpass
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/files/saslpass,v 1.1 2002/07/13 20:17:14 raker Exp $
-#
-# remotehost user:password
diff --git a/net-mail/postfix/files/smtpd-2.0.conf b/net-mail/postfix/files/smtpd-2.0.conf
deleted file mode 100644
index 1c686d1fcb3b..000000000000
--- a/net-mail/postfix/files/smtpd-2.0.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/files/smtpd-2.0.conf,v 1.1 2003/07/18 20:34:39 lanius Exp $
-pwcheck_method:saslauthd
diff --git a/net-mail/postfix/postfix-2.0.10-r1.ebuild b/net-mail/postfix/postfix-2.0.10-r1.ebuild
deleted file mode 100644
index 565d6c1a4c0f..000000000000
--- a/net-mail/postfix/postfix-2.0.10-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.10-r1.ebuild,v 1.8 2004/01/14 20:38:12 max Exp $
-
-inherit eutils
-
-TLS_P="pfixtls-0.8.13-${PV}-0.9.7b"
-IPV6="1.14"
-IPV6_P="ipv6-${IPV6}-pf-${PV}"
-IPV6_TLS_P="tls+${IPV6_P}"
-IUSE="ssl mysql sasl ldap ipv6 maildir mbox"
-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/${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 )"
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~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 || die "ipv6/tls patch died"
-		else
-			unpack ${TLS_P}.tar.gz
-			epatch ${WORKDIR}/${P}/${TLS_P}/pfixtls.diff || die "tls patch died"
-		fi
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
-	elif [ "`use ipv6`" ]; then
-		epatch ${DISTDIR}/${IPV6_P}.patch.gz || die "ipv6 patch died"
-	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 \
-		/var/spool/postfix/tmp
-	touch ${D}/var/spool/postfix/.keep
-
-	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 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 ${FILESDIR}/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
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	if [ "`use sasl`" ] ; then
-		# sasl 2
-		if [ -f /usr/include/sasl/sasl.h ] ; then
-			insinto /usr/lib/sasl2
-			doins ${FILESDIR}/smtpd.conf
-		else
-			insinto /etc/sasl
-			doins ${FILESDIR}/smtpd.conf
-		fi
-	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/net-mail/postfix/postfix-2.0.11.ebuild b/net-mail/postfix/postfix-2.0.11.ebuild
index 8cabf22382ee..203f62a6336c 100644
--- a/net-mail/postfix/postfix-2.0.11.ebuild
+++ b/net-mail/postfix/postfix-2.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.11.ebuild,v 1.13 2004/01/11 03:53:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.11.ebuild,v 1.14 2004/02/06 16:09:39 max Exp $
 
 IUSE="ssl mysql sasl ldap ipv6 maildir mbox"
 
@@ -192,7 +192,8 @@ src_install () {
 	doexe postfix-script post-install postfix-files
 
 	insinto /etc/postfix
-	doins ${S}/conf/{main,master}.cf ${FILESDIR}/saslpass
+	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
@@ -200,11 +201,11 @@ src_install () {
 	rm -f main.cf~
 	fperms 600 /etc/postfix/saslpass
 
-	exeinto /etc/init.d ; doexe ${FILESDIR}/postfix
+	exeinto /etc/init.d ; doexe ${FILESDIR}/postfix.rc6
 	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
 
 	insinto /etc/sasl2
-	doins ${FILESDIR}/smtpd-2.0.conf smtpd.conf
+	doins ${FILESDIR}/smtpd.conf
 	if [ "`use sasl`" ] ; then
 		dodir /usr/lib/sasl2
 		dosym ../../../etc/sasl2/smtpd.conf /usr/lib/sasl2/smtpd.conf
diff --git a/net-mail/postfix/postfix-2.0.12-r1.ebuild b/net-mail/postfix/postfix-2.0.12-r1.ebuild
deleted file mode 100644
index a0ec6f3634f6..000000000000
--- a/net-mail/postfix/postfix-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.12-r1.ebuild,v 1.5 2004/01/14 20:38:12 max Exp $
-
-IUSE="ssl mysql sasl ldap ipv6 maildir mbox"
-
-inherit eutils
-
-TLS_P="pfixtls-0.8.14-${PV}-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/${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 ~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 ${FILESDIR}/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
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	insinto /etc/sasl2
-	doins ${FILESDIR}/smtpd-2.0.conf 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/net-mail/postfix/postfix-2.0.13-r1.ebuild b/net-mail/postfix/postfix-2.0.13-r1.ebuild
deleted file mode 100644
index 7d17000aa8a9..000000000000
--- a/net-mail/postfix/postfix-2.0.13-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.13-r1.ebuild,v 1.8 2004/01/14 20:38:12 max Exp $
-
-IUSE="ssl mysql sasl ldap ipv6 maildir mbox postgres"
-
-inherit eutils
-
-TLS_P="pfixtls-0.8.15-2.0.13-0.9.7b"
-IPV6="1.15"
-IPV6_P="ipv6-${IPV6}-pf-2.0.13"
-IPV6_TLS_P="tls+ipv6-${IPV6}a-pf-2.0.13"
-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
-	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 )"
-
-SLOT="0"
-LICENSE="IPL-1"
-KEYWORDS="~x86 ~sparc ~ppc ~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 )
-	postgres? ( >=dev-db/postgresql-7.1 )"
-
-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
-	fi
-
-	if ! grep -q ^mail:.*postfix /etc/group ; then
-		usermod -G mail postfix
-	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
-
-	if [ "`use postgres`" ]; then
-		epatch ${FILESDIR}/${PGSQL_P}.patch.bz2
-		CCARGS="${CCARGS} -DHAS_PGSQL -I/usr/include/postgresql"
-		AUXLIBS="${AUXLIBS} -lpq"
-	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 ${FILESDIR}/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
-	epatch ${FILESDIR}/postfix-2.0.0/master.cf.diff
-
-	exeinto /etc/init.d ; doexe ${FILESDIR}/postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	if [ "`use sasl`" ]; then
-		insinto /etc/sasl2
-		doins ${FILESDIR}/smtpd-2.0.conf smtpd.conf
-		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
-
-	if [ "`use postgres`" ]; then
-		cd ${S}/README_FILES
-		dodoc PGSQL_README
-		cd ${S}
-	fi
-}
-
-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/net-mail/postfix/postfix-2.0.14.ebuild b/net-mail/postfix/postfix-2.0.14.ebuild
deleted file mode 100644
index 997022da7629..000000000000
--- a/net-mail/postfix/postfix-2.0.14.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.14.ebuild,v 1.4 2004/01/14 20:38:12 max Exp $
-
-IUSE="ssl mysql sasl ldap ipv6 maildir mbox postgres"
-
-inherit eutils
-TLS_P="pfixtls-0.8.15-${PV}-0.9.7b"
-IPV6="1.17"
-IPV6_P="ipv6-${IPV6}-pf-${PV}"
-IPV6_TLS_P="tls+ipv6-${IPV6}-pf-${PV}"
-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
-	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 )"
-
-SLOT="0"
-LICENSE="IPL-1"
-KEYWORDS="~x86 ~sparc ~ppc ~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 )
-	postgres? ( >=dev-db/postgresql-7.1 )"
-
-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
-
-	if [ "`use postgres`" ]; then
-		epatch ${FILESDIR}/${PGSQL_P}.patch.bz2
-		CCARGS="${CCARGS} -DHAS_PGSQL -I/usr/include/postgresql"
-		AUXLIBS="${AUXLIBS} -lpq"
-	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 ${FILESDIR}/saslpass
-	cd ${D}/etc/postfix
-	epatch ${FILESDIR}/postfix-2.0.14/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
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	if [ "`use sasl`" ]; then
-		insinto /etc/sasl2
-		doins ${FILESDIR}/smtpd-2.0.conf smtpd.conf
-		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
-
-	if [ "`use postgres`" ]; then
-		cd ${S}/README_FILES
-		dodoc PGSQL_README
-		cd ${S}
-	fi
-}
-
-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/net-mail/postfix/postfix-2.0.15-r1.ebuild b/net-mail/postfix/postfix-2.0.15-r1.ebuild
deleted file mode 100644
index 2137d688197b..000000000000
--- a/net-mail/postfix/postfix-2.0.15-r1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.15-r1.ebuild,v 1.3 2004/01/14 20:38:12 max Exp $
-
-IUSE="ssl mysql sasl ldap ipv6 maildir mbox postgres"
-
-inherit eutils
-TLS_P="pfixtls-0.8.16-${PV}-0.9.7b"
-IPV6="1.18"
-IPV6_P="ipv6-${IPV6}-pf-2.0.15"
-IPV6_TLS_P="tls+ipv6-${IPV6}-pf-${PV}"
-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
-	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 )"
-
-SLOT="0"
-LICENSE="IPL-1"
-KEYWORDS="~x86 ~sparc ~ppc ~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 )
-	postgres? ( >=dev-db/postgresql-7.1 )"
-
-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
-
-	if [ "`use postgres`" ]; then
-		epatch ${FILESDIR}/${PGSQL_P}.patch.bz2
-		CCARGS="${CCARGS} -DHAS_PGSQL -I/usr/include/postgresql"
-		AUXLIBS="${AUXLIBS} -lpq"
-	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 ${FILESDIR}/saslpass
-	cd ${D}/etc/postfix
-	epatch ${FILESDIR}/postfix-2.0.14/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
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	if [ "`use sasl`" ]; then
-		insinto /etc/sasl2
-		doins ${FILESDIR}/smtpd-2.0.conf smtpd.conf
-		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
-
-	if [ "`use postgres`" ]; then
-		cd ${S}/README_FILES
-		dodoc PGSQL_README
-		cd ${S}
-	fi
-}
-
-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/net-mail/postfix/postfix-2.0.17.ebuild b/net-mail/postfix/postfix-2.0.17.ebuild
deleted file mode 100644
index 9d485c2d8f20..000000000000
--- a/net-mail/postfix/postfix-2.0.17.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.17.ebuild,v 1.1 2004/01/20 21:27:19 max Exp $
-
-inherit eutils ssl-cert
-
-TLS_P="pfixtls-0.8.16-2.0.16-0.9.7b"
-IPV6="1.20"
-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/${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"
-
-	# 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/net-mail/postfix/postfix-2.0.9.ebuild b/net-mail/postfix/postfix-2.0.9.ebuild
deleted file mode 100644
index 252745a38ad6..000000000000
--- a/net-mail/postfix/postfix-2.0.9.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.9.ebuild,v 1.7 2004/01/14 20:38:12 max Exp $
-
-inherit eutils
-
-TLS_P="pfixtls-0.8.13-2.0.6-0.9.7a"
-IPV6_P="tls+ipv6-1.13-pf-2.0.7"
-IUSE="ssl mysql sasl ldap ipv6 maildir mbox"
-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/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/${IPV6_P}.patch.gz )"
-
-SLOT="0"
-LICENSE="IPL-1"
-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"
-
-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 ${A}
-	cd ${S}
-	if [ "`use ssl`" ] && [ "`use ipv6`" ]; then
-		patch ${WORKDIR}/${IPV6_P}.patch < ${FILESDIR}/postfix-2.0.8_patch.patch || die
-		epatch ${WORKDIR}/${IPV6_P}.patch || die
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
-	elif [ "`use ssl`" ]; then
-		epatch ${WORKDIR}/${TLS_P}/pfixtls.diff || die
-		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
-		# 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
-	mv mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		< mail_params.h.orig > 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"
-}
-
-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 \
-		/var/spool/postfix/tmp
-	touch ${D}/var/spool/postfix/.keep
-
-	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 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 ${FILESDIR}/saslpass
-	cd ${D}/etc/postfix
-	epatch ${FILESDIR}/postfix-2.0.0/main.cf.diff
-	mv main.cf main.cf.orig
-	sed <main.cf.orig >main.cf \
-		-e "s|/usr/share/doc/POSTFIX|/usr/share/doc/${PF}|"
-	chmod 644 main.cf
-	rm main.cf.orig
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d ; doexe ${FILESDIR}/postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	if [ "`use sasl`" ] ; then
-		# sasl 2
-		if [ -f /usr/include/sasl/sasl.h ] ; then
-			insinto /usr/lib/sasl2
-			doins ${FILESDIR}/smtpd.conf
-		else
-			insinto /etc/sasl
-			doins ${FILESDIR}/smtpd.conf
-		fi
-	fi
-	cd ${D}/etc/postfix
-	if [ "`use maildir`" ]; then
-		cp main.cf main.cf.premaildir
-		sed -e "s:#home_mailbox = Maildir/:home_mailbox = .maildir/:" \
-			< main.cf.premaildir > main.cf
-		rm main.cf.premaildir
-	elif [ "`use mbox`" ]; then
-		cp main.cf main.cf.prembox
-		sed -e "s:#mail_spool_directory = /var/spool/mail:mail_spool_directory = /var/spool/mail:" \
-			< main.cf.prembox > main.cf
-		rm main.cf.prembox
-	fi
-	rm main.cf~
-
-	#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
-}