tidy up

Package-Manager: portage-2.0.53_rc4

17 files changed, 25 insertions, 2343 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 2c709f86cb38..e8bc5a6a0173 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.79 2005/10/04 12:47:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.80 2005/10/11 02:08:30 langthang Exp $
+
+  11 Oct 2005; Tuấn Văn <langthang@gentoo.org> -files/postfix.rc6.2.2.3,
+  -postfix-2.2.1.ebuild, -postfix-2.2.1-r1.ebuild, -postfix-2.2.2.ebuild,
+  -postfix-2.2.2-r1.ebuild, -postfix-2.2.2-r2.ebuild, -postfix-2.2.3.ebuild,
+  -postfix-2.2.3-r1.ebuild:
+  tidy up.
 
   04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> postfix-2.1.5-r2.ebuild:
   Stable on sh.
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 631d9ed38800..d0a6535b905c 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,28 +1,23 @@
-MD5 e6126738fd82def5f3a931ecde6ad519 postfix-2.2.3-r1.ebuild 10089
-MD5 864931d2d36d709cbb10508eff67ee40 postfix-2.2.1.ebuild 9289
-MD5 c680e396df72231738e21a07258c7df1 postfix-2.2.3.ebuild 9709
-MD5 1d9e71df53902c527a59cf17878e23e5 postfix-2.2.2-r1.ebuild 9954
-MD5 17cc55ab3c0fc0f203edaccf0f8de60e postfix-2.2.1-r1.ebuild 9937
-MD5 3e3e4d2f5732871ecb198288d6962ab2 postfix-2.2.2.ebuild 9934
-MD5 5bc455167d0c5903e0ea329ec20ba6dd ChangeLog 35052
-MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
-MD5 c43e347d49e165904a2cc6ac498cb6f8 postfix-2.1.5-r2.ebuild 7521
-MD5 bd879e41d2b201d9d42f9fde7084e2cc postfix-2.2.4.ebuild 9229
-MD5 7880250859c1a0d58cd6de6a920a7c60 postfix-2.2.2-r2.ebuild 9706
-MD5 98872da0bd186c6e0d2b884b0fa28b78 files/postfix.rc6 610
-MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
-MD5 43e9368a07952c4aae9e370b59ce1450 files/smtp.sasl 131
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e5b5e2dd1646fbd8e61ab29037737ea1 ChangeLog 35322
 MD5 c2fd2c8cd7f31c4c876db365a98b972e files/digest-postfix-2.1.5-r2 363
-MD5 ecc87f9acb3c2395d2d7fe1a673755aa files/digest-postfix-2.2.1-r1 135
-MD5 02b7565b5fbc0a13418b4588da048882 files/digest-postfix-2.2.2-r1 135
-MD5 02b7565b5fbc0a13418b4588da048882 files/digest-postfix-2.2.2-r2 135
-MD5 0726f3fb8ba3f25ea5bfc251d2d96cfb files/digest-postfix-2.2.3-r1 135
-MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
-MD5 ecc87f9acb3c2395d2d7fe1a673755aa files/digest-postfix-2.2.1 135
-MD5 9419f5dcc490b61ca76278d744bd878f files/digest-postfix-2.2.2 135
-MD5 0726f3fb8ba3f25ea5bfc251d2d96cfb files/digest-postfix-2.2.3 135
 MD5 ff949f18a6d77e67fba4ed20907d0592 files/digest-postfix-2.2.4 135
 MD5 a3c32f8c9d1344be08f018d377a61f59 files/mailer.conf 438
-MD5 a50597e80d6dc757bbeffcd17ec5332d files/postfix.rc6.2.2.3 633
+MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
+MD5 98872da0bd186c6e0d2b884b0fa28b78 files/postfix.rc6 610
 MD5 8d7d372a5e867ebc0b1644ee19105e4e files/postfix.rc6.2.2.4 637
 MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
+MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
+MD5 43e9368a07952c4aae9e370b59ce1450 files/smtp.sasl 131
+MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
+MD5 c43e347d49e165904a2cc6ac498cb6f8 postfix-2.1.5-r2.ebuild 7521
+MD5 bd879e41d2b201d9d42f9fde7084e2cc postfix-2.2.4.ebuild 9229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSx605FrxP71izLARAk6CAKDWW2aOA7hV38vyGVyGTLj7P/bkdACeIYTz
+rWo6kD5lEV0L53HejWnsxEA=
+=AoEd
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.1 b/mail-mta/postfix/files/digest-postfix-2.2.1
deleted file mode 100644
index 2aeee0fe4256..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 36b982392b2a490f3c861e5e609124cc postfix-2.2.1.tar.gz 2407157
-MD5 894915546a4e2bc378d69798dabd58d1 postfix-2.2.0-vda.patch.gz 7785
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.1-r1 b/mail-mta/postfix/files/digest-postfix-2.2.1-r1
deleted file mode 100644
index 2aeee0fe4256..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 36b982392b2a490f3c861e5e609124cc postfix-2.2.1.tar.gz 2407157
-MD5 894915546a4e2bc378d69798dabd58d1 postfix-2.2.0-vda.patch.gz 7785
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.2 b/mail-mta/postfix/files/digest-postfix-2.2.2
deleted file mode 100644
index b0648c72b048..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1f5f54ec8a832af7faaa71607475b19b postfix-2.2.2.tar.gz 2408375
-MD5 d4ee910876119dde7635d0d6ae27351d postfix-2.2.1-vda.patch.gz 7798
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.2-r1 b/mail-mta/postfix/files/digest-postfix-2.2.2-r1
deleted file mode 100644
index 9fc1ad555441..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1f5f54ec8a832af7faaa71607475b19b postfix-2.2.2.tar.gz 2408375
-MD5 816fb00f211de8f8d3703ecd4ccf40a5 postfix-2.2.2-vda.patch.gz 7752
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.2-r2 b/mail-mta/postfix/files/digest-postfix-2.2.2-r2
deleted file mode 100644
index 9fc1ad555441..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2.2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1f5f54ec8a832af7faaa71607475b19b postfix-2.2.2.tar.gz 2408375
-MD5 816fb00f211de8f8d3703ecd4ccf40a5 postfix-2.2.2-vda.patch.gz 7752
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.3 b/mail-mta/postfix/files/digest-postfix-2.2.3
deleted file mode 100644
index 812c86905c93..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f164b701c3e97b950d4cc64aff4de3c0 postfix-2.2.3.tar.gz 2409888
-MD5 fcc8b7e7d94a9ce2d97453da0e6cd7c9 postfix-2.2.3-vda.patch.gz 7748
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.3-r1 b/mail-mta/postfix/files/digest-postfix-2.2.3-r1
deleted file mode 100644
index 812c86905c93..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f164b701c3e97b950d4cc64aff4de3c0 postfix-2.2.3.tar.gz 2409888
-MD5 fcc8b7e7d94a9ce2d97453da0e6cd7c9 postfix-2.2.3-vda.patch.gz 7748
diff --git a/mail-mta/postfix/files/postfix.rc6.2.2.3 b/mail-mta/postfix/files/postfix.rc6.2.2.3
deleted file mode 100644
index 5108811f7ef1..000000000000
--- a/mail-mta/postfix/files/postfix.rc6.2.2.3
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.2.3,v 1.3 2005/07/07 02:34:55 ticho Exp $
-
-opts="${opts} reload"
-
-depend() {
-	need net
-	use logger dns ypbind amavisd mysql postgresql antivirus postfix_greylist
-	provide mta
-}
-
-start() {
-	ebegin "Starting postfix"
-	/usr/sbin/postfix start &>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping postfix"
-	/usr/sbin/postfix stop &>/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading postfix"
-	/usr/sbin/postfix reload &>/dev/null
-	eend $?
-}
diff --git a/mail-mta/postfix/postfix-2.2.1-r1.ebuild b/mail-mta/postfix/postfix-2.2.1-r1.ebuild
deleted file mode 100644
index 095f542050be..000000000000
--- a/mail-mta/postfix/postfix-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.1-r1.ebuild,v 1.3 2005/10/04 12:47:48 matsuu Exp $
-
-inherit eutils ssl-cert toolchain-funcs flag-o-matic
-IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened"
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened devel"
-
-MY_PV=${PV}
-MY_SRC=${PN}-${MY_PV}
-#DEV_SRC=${MY_SRC}-newdb-nonprod
-VDA_P="${PN}-2.2.0-vda"
-
-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/${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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-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
-	selinux? ( sec-policy/selinux-postfix )
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-#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 from postfix-2.1. logic to fix bug #53324
-	if [[ $(ps h -u postfix) ]]; then
-		if has_version '<mail-mta/postfix-2.2' ; 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
-
-	# VDA error
-	#if use vda; then
-	#	eerror "VDA patch is not available yet for this snapshot"
-	#	eerror "If you still want to update to this snapshot"
-	#	eerror "please remove \"vda\" from your USE flags."
-	#	die "VDA support is not available at this time!"
-	#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}"
-
-	#ht_fix_all
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch" || die "failed to patch VDA"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
-
-	# 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"
-	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
-	sed -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		-i.orig src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	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
-
-	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_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
-
-	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
-	#epause 60
-
-	make 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}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# 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
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# 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 \
-		"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
-
-	newinitd "${FILESDIR}/postfix.rc6" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	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() {
-
-	# 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
-
-	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
-}
diff --git a/mail-mta/postfix/postfix-2.2.1.ebuild b/mail-mta/postfix/postfix-2.2.1.ebuild
deleted file mode 100644
index a8aee15694c7..000000000000
--- a/mail-mta/postfix/postfix-2.2.1.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.1.ebuild,v 1.3 2005/10/04 12:47:48 matsuu Exp $
-
-inherit eutils ssl-cert toolchain-funcs flag-o-matic
-IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened"
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened devel"
-
-MY_PV=${PV}
-MY_SRC=${PN}-${MY_PV}
-#DEV_SRC=${MY_SRC}-newdb-nonprod
-VDA_P="${PN}-2.2.0-vda"
-
-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/${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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-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
-	selinux? ( sec-policy/selinux-postfix )
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-#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 from postfix-2.1. logic to fix bug #53324
-	if [[ $(ps h -u postfix) ]]; then
-		if has_version '<mail-mta/postfix-2.2' ; then
-			echo
-			eerror "You are upgrading from the incompatible version."
-			eerror "Please stop Postfix then emerge again."
-			die "Upgrade from incompatible version."
-		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"
-		ewarn "TLS will be enabled. This is a work in progress."
-		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"
-		ewarn "TLS will be enabled. This is a work in progress."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	# VDA error
-	#if use vda; then
-	#	eerror "VDA patch is not available yet for this snapshot"
-	#	eerror "If you still want to update to this snapshot"
-	#	eerror "please remove \"vda\" from your USE flags."
-	#	die "VDA support is not available at this time!"
-	#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}"
-
-	#ht_fix_all
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch" || die "failed to patch VDA"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
-
-	# 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"
-	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
-	sed -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		-i.orig src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	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
-
-	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_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
-
-	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
-	#epause 60
-
-	make 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}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# 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
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# 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 \
-		"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
-
-	newinitd "${FILESDIR}/postfix.rc6" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	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() {
-
-	# 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
-
-	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
-}
diff --git a/mail-mta/postfix/postfix-2.2.2-r1.ebuild b/mail-mta/postfix/postfix-2.2.2-r1.ebuild
deleted file mode 100644
index 6d58887f92eb..000000000000
--- a/mail-mta/postfix/postfix-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.2-r1.ebuild,v 1.4 2005/10/04 12:47:48 matsuu Exp $
-
-inherit eutils ssl-cert toolchain-funcs flag-o-matic
-IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened"
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened devel"
-
-MY_PV=${PV}
-MY_SRC=${PN}-${MY_PV}
-#DEV_SRC=${MY_SRC}-newdb-nonprod
-VDA_P="${PN}-2.2.2-vda"
-
-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/${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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-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
-	selinux? ( sec-policy/selinux-postfix )
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-#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 from postfix-2.1. logic to fix bug #53324
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.2' ; 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
-
-	# VDA error
-	#if use vda; then
-	#	eerror "VDA patch is not available yet for this snapshot"
-	#	eerror "If you still want to update to this snapshot"
-	#	eerror "please remove \"vda\" from your USE flags."
-	#	die "VDA support is not available at this time!"
-	#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}"
-
-	#ht_fix_all
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch" || die "failed to patch VDA"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
-
-	# 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"
-	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
-	sed -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		-i.orig src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	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
-
-	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_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
-
-	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
-	#epause 60
-
-	make 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}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# 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
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# 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 \
-		"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
-
-	newinitd "${FILESDIR}/postfix.rc6" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	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() {
-
-	# 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
-
-	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
-}
diff --git a/mail-mta/postfix/postfix-2.2.2-r2.ebuild b/mail-mta/postfix/postfix-2.2.2-r2.ebuild
deleted file mode 100644
index 5e9768511baa..000000000000
--- a/mail-mta/postfix/postfix-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.2-r2.ebuild,v 1.4 2005/10/04 12:47:48 matsuu Exp $
-
-inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer
-IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened"
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened devel"
-
-MY_PV=${PV}
-MY_SRC=${PN}-${MY_PV}
-#DEV_SRC=${MY_SRC}-newdb-nonprod
-VDA_P="${PN}-2.2.2-vda"
-
-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/${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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-PROVIDE="${PROVIDE} 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
-	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 from postfix-2.1. logic to fix bug #53324
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.2' ; 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
-
-	# VDA error
-	#if use vda; then
-	#	eerror "VDA patch is not available yet for this snapshot"
-	#	eerror "If you still want to update to this snapshot"
-	#	eerror "please remove \"vda\" from your USE flags."
-	#	die "VDA support is not available at this time!"
-	#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}"
-
-	#ht_fix_all
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch" || die "failed to patch VDA"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
-
-	# 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"
-	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
-	sed -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		-i.orig src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -L/usr/lib -lpcre -ldl -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
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	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
-
-	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_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
-
-	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
-	#epause 60
-
-	make 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}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-		mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# 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 \
-		"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
-
-	newinitd "${FILESDIR}/postfix.rc6" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	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() {
-
-	# 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
-
-	mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.2.2.ebuild b/mail-mta/postfix/postfix-2.2.2.ebuild
deleted file mode 100644
index ab2a5c2c2aac..000000000000
--- a/mail-mta/postfix/postfix-2.2.2.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.2.ebuild,v 1.3 2005/10/04 12:47:48 matsuu Exp $
-
-inherit eutils ssl-cert toolchain-funcs flag-o-matic
-IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened"
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened devel"
-
-MY_PV=${PV}
-MY_SRC=${PN}-${MY_PV}
-#DEV_SRC=${MY_SRC}-newdb-nonprod
-VDA_P="${PN}-2.2.1-vda"
-
-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/${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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-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
-	selinux? ( sec-policy/selinux-postfix )
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-#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 from postfix-2.1. logic to fix bug #53324
-	if [[ $(ps h -u postfix) ]]; then
-		if has_version '<mail-mta/postfix-2.2' ; 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
-
-	# VDA error
-	#if use vda; then
-	#	eerror "VDA patch is not available yet for this snapshot"
-	#	eerror "If you still want to update to this snapshot"
-	#	eerror "please remove \"vda\" from your USE flags."
-	#	die "VDA support is not available at this time!"
-	#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}"
-
-	#ht_fix_all
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch" || die "failed to patch VDA"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
-
-	# 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"
-	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
-	sed -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		-i.orig src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -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_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	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
-
-	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_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
-
-	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
-	#epause 60
-
-	make 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}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# 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
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# 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 \
-		"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
-
-	newinitd "${FILESDIR}/postfix.rc6" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	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() {
-
-	# 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
-
-	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
-}
diff --git a/mail-mta/postfix/postfix-2.2.3-r1.ebuild b/mail-mta/postfix/postfix-2.2.3-r1.ebuild
deleted file mode 100644
index de43719fca88..000000000000
--- a/mail-mta/postfix/postfix-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.3-r1.ebuild,v 1.7 2005/10/04 12:47:48 matsuu Exp $
-
-inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened"
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened devel"
-
-MY_PV=${PV}
-MY_SRC=${PN}-${MY_PV}
-#DEV_SRC=${MY_SRC}-newdb-nonprod
-VDA_P="${PN}-2.2.3-vda"
-
-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/${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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-PROVIDE="${PROVIDE} virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	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
-	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 from postfix-2.1. logic to fix bug #53324
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.2' ; 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
-
-	# VDA error
-	#if use vda; then
-	#	eerror "VDA patch is not available yet for this snapshot"
-	#	eerror "If you still want to update to this snapshot"
-	#	eerror "please remove \"vda\" from your USE flags."
-	#	die "VDA support is not available at this time!"
-	#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}"
-
-	#ht_fix_all
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch" || die "failed to patch VDA"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
-
-	# Fix install paths.
-	sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		src/global/mail_params.h conf/main.cf || die "sed failed"
-	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
-	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.
-	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -L/usr/lib -lpcre -ldl -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
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	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
-
-	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_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
-
-	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
-	#epause 60
-
-	make 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}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# 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"
-		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"
-
-		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
-
-	# 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 \
-		"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
-
-	newinitd "${FILESDIR}/postfix.rc6.${PV}" 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
-
-	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() {
-
-	# 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
-
-	mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.2.3.ebuild b/mail-mta/postfix/postfix-2.2.3.ebuild
deleted file mode 100644
index ee44144e71c7..000000000000
--- a/mail-mta/postfix/postfix-2.2.3.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.3.ebuild,v 1.4 2005/10/04 12:47:48 matsuu Exp $
-
-inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer
-IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened"
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened devel"
-
-MY_PV=${PV}
-MY_SRC=${PN}-${MY_PV}
-#DEV_SRC=${MY_SRC}-newdb-nonprod
-VDA_P="${PN}-2.2.3-vda"
-
-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/${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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-PROVIDE="${PROVIDE} 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
-	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 from postfix-2.1. logic to fix bug #53324
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.2' ; 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
-
-	# VDA error
-	#if use vda; then
-	#	eerror "VDA patch is not available yet for this snapshot"
-	#	eerror "If you still want to update to this snapshot"
-	#	eerror "please remove \"vda\" from your USE flags."
-	#	die "VDA support is not available at this time!"
-	#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}"
-
-	#ht_fix_all
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch" || die "failed to patch VDA"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
-
-	# 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"
-	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
-	sed -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		-i.orig src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -L/usr/lib -lpcre -ldl -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
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	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
-
-	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_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
-
-	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
-	#epause 60
-
-	make 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}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-		mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# 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 \
-		"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
-
-	newinitd "${FILESDIR}/postfix.rc6.${PV}" postfix || \
-		die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	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() {
-
-	# 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
-
-	mailer_pkg_postinst
-}