Version bump. Requested by Alexander Stoll <as at ha-networks.com> in bug #171769. Removed unneeded 2.3.x ebuilds.

(Portage version: 2.1.2.2)

13 files changed, 15 insertions, 1967 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index a69b68a6b178..a6472fe71e66 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.120 2007/02/22 12:06:42 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.121 2007/03/23 22:55:14 ticho Exp $
+
+*postfix-2.3.8 (23 Mar 2007)
+
+  23 Mar 2007; Andrej Kacian <ticho@gentoo.org> -postfix-2.3.0.ebuild,
+  -postfix-2.3.0-r1.ebuild, -postfix-2.3.2.ebuild, -postfix-2.3.2-r1.ebuild,
+  -postfix-2.3.4.ebuild, -postfix-2.3.5.ebuild, +postfix-2.3.8.ebuild:
+  Version bump. Requested by Alexander Stoll <as at ha-networks.com> in bug
+  #171769. Removed unneeded 2.3.x ebuilds.
 
   22 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> postfix-2.3.6.ebuild:
   Stable on alpha as per bug #165326
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.0 b/mail-mta/postfix/files/digest-postfix-2.3.0
deleted file mode 100644
index 1a0409c99320..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72a714e0cc8a5fdbe770359ae965e09b postfix-2.3.0.tar.gz 2770810
-RMD160 41a0f3ea81189dfa2225d22475510e65449c7bef postfix-2.3.0.tar.gz 2770810
-SHA256 719ad43cfb032fc94272f63b0bb4bc6930bdf9b48bd539927dbe403a1d53d786 postfix-2.3.0.tar.gz 2770810
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.0-r1 b/mail-mta/postfix/files/digest-postfix-2.3.0-r1
deleted file mode 100644
index 1a0409c99320..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72a714e0cc8a5fdbe770359ae965e09b postfix-2.3.0.tar.gz 2770810
-RMD160 41a0f3ea81189dfa2225d22475510e65449c7bef postfix-2.3.0.tar.gz 2770810
-SHA256 719ad43cfb032fc94272f63b0bb4bc6930bdf9b48bd539927dbe403a1d53d786 postfix-2.3.0.tar.gz 2770810
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.2 b/mail-mta/postfix/files/digest-postfix-2.3.2
deleted file mode 100644
index 6bb968542f6e..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fc7c1676ceecbfb414353af1dafe11de postfix-2.3.1-vda.patch.gz 7956
-RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b postfix-2.3.1-vda.patch.gz 7956
-SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4 postfix-2.3.1-vda.patch.gz 7956
-MD5 b1e482eea6a340041b8a637e62b15e3c postfix-2.3.2.tar.gz 2774600
-RMD160 ce561dcc03e7f6bc1bb3bdd9426175b18571c625 postfix-2.3.2.tar.gz 2774600
-SHA256 151b766389fc8453be01700220e9fb726e202d539f055ce83b9c928b27d44413 postfix-2.3.2.tar.gz 2774600
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.2-r1 b/mail-mta/postfix/files/digest-postfix-2.3.2-r1
deleted file mode 100644
index 6bb968542f6e..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fc7c1676ceecbfb414353af1dafe11de postfix-2.3.1-vda.patch.gz 7956
-RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b postfix-2.3.1-vda.patch.gz 7956
-SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4 postfix-2.3.1-vda.patch.gz 7956
-MD5 b1e482eea6a340041b8a637e62b15e3c postfix-2.3.2.tar.gz 2774600
-RMD160 ce561dcc03e7f6bc1bb3bdd9426175b18571c625 postfix-2.3.2.tar.gz 2774600
-SHA256 151b766389fc8453be01700220e9fb726e202d539f055ce83b9c928b27d44413 postfix-2.3.2.tar.gz 2774600
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.4 b/mail-mta/postfix/files/digest-postfix-2.3.4
deleted file mode 100644
index 8d8f463143f1..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fc7c1676ceecbfb414353af1dafe11de postfix-2.3.1-vda.patch.gz 7956
-RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b postfix-2.3.1-vda.patch.gz 7956
-SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4 postfix-2.3.1-vda.patch.gz 7956
-MD5 78942b38639aee30b637f1c15c0b3fc9 postfix-2.3.4.tar.gz 2778860
-RMD160 94f38585f12b409270c59241ff0a01c4ff460d96 postfix-2.3.4.tar.gz 2778860
-SHA256 34894637337d260725e2b58666dd6e6d95bfc9c1d1b27d8bdc4cfddcb0818803 postfix-2.3.4.tar.gz 2778860
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.5 b/mail-mta/postfix/files/digest-postfix-2.3.8
index fe111afd1694..60f803964071 100644
--- a/mail-mta/postfix/files/digest-postfix-2.3.5
+++ b/mail-mta/postfix/files/digest-postfix-2.3.8
@@ -1,6 +1,6 @@
 MD5 3506ab432360766b6a2708042b29943a postfix-2.3.3-vda.patch.gz 7944
 RMD160 bdbd0798ca4d23c6e8443b26b957b8d0d252da1d postfix-2.3.3-vda.patch.gz 7944
 SHA256 4fdff601e0b2653025c9b9ca8875e995b8052e2e362c3a5e035c3d2859bd4fa2 postfix-2.3.3-vda.patch.gz 7944
-MD5 ccdaccbf4c77abbab039a44f9e92a560 postfix-2.3.5.tar.gz 2782283
-RMD160 19215ee77b82ed2235cb669c0704df200fe0ea0f postfix-2.3.5.tar.gz 2782283
-SHA256 fcb22c93633ac7949dcd744ba4a8a7a7135554bf60a45d1fad33bde944c43a9c postfix-2.3.5.tar.gz 2782283
+MD5 a6c560657788fc7a5444fa9ea32f5513 postfix-2.3.8.tar.gz 2787761
+RMD160 2984ca8e81375a3124801c999d23637e745de54c postfix-2.3.8.tar.gz 2787761
+SHA256 f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6 postfix-2.3.8.tar.gz 2787761
diff --git a/mail-mta/postfix/postfix-2.3.0-r1.ebuild b/mail-mta/postfix/postfix-2.3.0-r1.ebuild
deleted file mode 100644
index 30376b3bf3d6..000000000000
--- a/mail-mta/postfix/postfix-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,388 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.0-r1.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this is ebuild is for mailer-config support
-
-# regular ebuild
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb"
-# mailer-config support.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.2.8
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-#	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-#PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	!mailwrapper? ( !virtual/mta )
-#	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-#	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# SASL_README patch. remove when upstream release new revision.
-	epatch "${FILESDIR}/${P}-SASL_README.patch"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	# not yet available as of 07/13/06.
-	#if use vda ; then
-	#	epatch "${WORKDIR}/${VDA_P}.patch"
-	#fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" src/util/sys_defs.h || \
-			die "sed failed"
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a
-				do CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_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_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_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}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		#insinto /etc/mail
-		#doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# 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 mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; 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() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	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
-
-	# regular ebuild
-	#if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	#then
-	#	einfo
-	#	einfo "Since you emerged $PN without mailwrapper in USE,"
-	#	einfo "you probably want to 'emerge -C mailwrapper' now."
-	#	einfo
-	#fi
-	# mailer-config support
-	mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.0.ebuild b/mail-mta/postfix/postfix-2.3.0.ebuild
deleted file mode 100644
index 810336af785b..000000000000
--- a/mail-mta/postfix/postfix-2.3.0.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.0.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this ebuild is regular ebuild without mailer-config support
-# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to mailer-config supported ebuild.
-
-# regular ebuild
-inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb"
-# mailer-config support.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.2.8
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-#	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# SASL_README patch. remove when upstream release new revision.
-	epatch "${FILESDIR}/${P}-SASL_README.patch"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	# not yet available as of 07/13/06.
-	#if use vda ; then
-	#	epatch "${WORKDIR}/${VDA_P}.patch"
-	#fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" src/util/sys_defs.h || \
-			die "sed failed"
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a
-				do CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_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_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_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}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		#mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# 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 mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; 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() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	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
-
-	# regular ebuild
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-	# mailer-config support
-	#mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.2-r1.ebuild b/mail-mta/postfix/postfix-2.3.2-r1.ebuild
deleted file mode 100644
index 7ec06d04c661..000000000000
--- a/mail-mta/postfix/postfix-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.2-r1.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this ebuild is regular ebuild without mailer-config support
-# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to mailer-config supported ebuild.
-
-# regular ebuild
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb vda"
-# mailer-config support.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb vda"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.3.1
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-#PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	!mailwrapper? ( !virtual/mta )
-#	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-#	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" src/util/sys_defs.h || \
-			die "sed failed"
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a
-				do CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_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_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_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}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		#insinto /etc/mail
-		#doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# 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 mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; 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() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	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
-
-	# regular ebuild
-	#if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	#then
-	#	einfo
-	#	einfo "Since you emerged $PN without mailwrapper in USE,"
-	#	einfo "you probably want to 'emerge -C mailwrapper' now."
-	#	einfo
-	#fi
-	# mailer-config support
-	mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.2.ebuild b/mail-mta/postfix/postfix-2.3.2.ebuild
deleted file mode 100644
index c5ffb4d15028..000000000000
--- a/mail-mta/postfix/postfix-2.3.2.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.2.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this ebuild is regular ebuild without mailer-config support
-# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to mailer-config supported ebuild.
-
-# regular ebuild
-inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb vda"
-# mailer-config support.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.3.1
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" src/util/sys_defs.h || \
-			die "sed failed"
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a
-				do CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_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_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_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}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		#mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# 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 mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; 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() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	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
-
-	# regular ebuild
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-	# mailer-config support
-	#mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.4.ebuild b/mail-mta/postfix/postfix-2.3.4.ebuild
deleted file mode 100644
index 055917d38ca9..000000000000
--- a/mail-mta/postfix/postfix-2.3.4.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.4.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this ebuild is regular ebuild without mailer-config support
-# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to mailer-config supported ebuild.
-
-# regular ebuild
-inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb vda"
-# mailer-config support.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.3.1
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" src/util/sys_defs.h || \
-			die "sed failed"
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a
-				do CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_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_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_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}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		#mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# 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 mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; 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() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	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
-
-	# regular ebuild
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-	# mailer-config support
-	#mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.5.ebuild b/mail-mta/postfix/postfix-2.3.8.ebuild
index a44e6ead7563..44577fb3135c 100644
--- a/mail-mta/postfix/postfix-2.3.5.ebuild
+++ b/mail-mta/postfix/postfix-2.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.5.ebuild,v 1.1 2006/12/24 18:36:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8.ebuild,v 1.1 2007/03/23 22:55:14 ticho Exp $
 
 # NOTE: this ebuild is regular ebuild without mailer-config support
 # comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -73,7 +73,7 @@ group_user_check() {
 	einfo "checking for postdrop group...	create if missing."
 	enewgroup postdrop 208
 	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
 }
 
 pkg_setup() {