Version bump to new security release (bug #358085) and remove old. Backport ebuild changes from 2.8.* series.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

7 files changed, 284 insertions, 1093 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index a3098e01378a..e0c55cf93b8e 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.234 2011/03/05 12:31:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.235 2011/03/10 03:42:47 radhermit Exp $
+
+*postfix-2.7.3 (10 Mar 2011)
+
+  10 Mar 2011; Tim Harder <radhermit@gentoo.org> -postfix-2.6.5.ebuild,
+  -postfix-2.6.6.ebuild, -postfix-2.6.7.ebuild, +postfix-2.7.3.ebuild,
+  -files/mailer.conf:
+  Version bump to new security release (bug #358085) and remove old. Backport
+  ebuild changes from 2.8.* series.
 
   05 Mar 2011; Brent Baude <ranger@gentoo.org> postfix-2.7.2.ebuild:
   Marking postfix-2.7.2 ppc for bug 352654
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 4adc34446905..5f66991f2816 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,25 +1,33 @@
-AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postfix.rc6.2.5 1415 RMD160 9d9b7240b1bfb7bcf53d6914dfc5aea2b150572e SHA1 ba08faaa70311605d2b869519ce876c71ce47a5d SHA256 11f79d4a84acfe0c34ebba11b6d1afde9c6dffcf44e8aba8dc895d4fcd0adcac
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
 AUX smtp.sasl 131 RMD160 6831f9bbfd76be0d39fdda4270120824ebb9f52f SHA1 613dff95ac21bd306c2917e5360430772efbb146 SHA256 954ba1e80537ca01b935b856e31ec4e3e41c138f04b7cf99ccb969876b8b78e7
-DIST postfix-2.6.2-vda-ng.patch.gz 12661 RMD160 e5e1ad8447cc4d8476e8826b4784069ff0b6e6fe SHA1 3274de41ffc64c1b20028793b4b37383f1847b99 SHA256 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4
-DIST postfix-2.6.5-vda-ng.patch.gz 12435 RMD160 c7ac9fbc5c4c5e36dfce17f87fd3c5cae45d75ea SHA1 350ade3fa1baa6033a956e033a5541267f42a618 SHA256 e1c04e9d268dc84832334997e1f593af9877dbd5030708280427a0dc4452e797
-DIST postfix-2.6.5.tar.gz 3325444 RMD160 f9b308457b9d3dcc05eb30c47b8267450a552a23 SHA1 98b04c719869b4bd61bec8749e2d57a219eb69a7 SHA256 5b5c8d3c98d7dffece1d30ed4dc1cfbd3220842fd626a324ce038d7d795e4102
-DIST postfix-2.6.6.tar.gz 3327136 RMD160 f3358b1aa330f7c68fb8c8ba778493dd2667d63c SHA1 e59235c0b1ba2a557ea2ba1009cc7c23f79ed044 SHA256 03b08a4a93065ffd07b2abd1e461575215cc8e0ba90595145c0e2e86ea3f0a36
-DIST postfix-2.6.7.tar.gz 3327583 RMD160 c923613d4af15a4d7011af861dba67512abcbac1 SHA1 aa863ca4c141bd1ebb31c4c556b640b619cf2c16 SHA256 7070003cb8d2e89e9c018220c5cac54ab91f68519d9daa3126bf32f5bbcf0594
 DIST postfix-2.7.1.tar.gz 3418747 RMD160 dba0622cf6e21908f27bee0c9da42ab3c189d4bd SHA1 94259e8f008b5b1853292e3de5e0ae3abcfe8c81 SHA256 12301aa8dae18d333c8c96dbf7673f8f05139f10406e7afe278cfd4a1f132df0
 DIST postfix-2.7.2.tar.gz 3421671 RMD160 e07a59f2f663b286a6c24e75b98952a51d2234fe SHA1 2415c63c98ba0e0273bcb490ee7753a3891f5a73 SHA256 46e2e7a7fcc45da43aff5362632ad5e7cc6a17740fda88bfd9db489b15b20840
+DIST postfix-2.7.3.tar.gz 3423755 RMD160 fb4bf033568ef934a656ff1efffb7b189a59910b SHA1 46713f335f19754839d70d76099eac3f24ce1f0b SHA256 c600b9ee5417a050d002d7245410592808d6c14af9a3de4df2b93394efce26dc
 DIST postfix-2.8.0.tar.gz 3643132 RMD160 b7d5c5e6972c1cba6296c23bf4f7cb8a943cfb15 SHA1 d7a4fb5ee1f5d12aa1abd6cf8ce8254b4805486d SHA256 4b6c44601e2ed591b0863ddac43fbe04e30caf9ae0ec65089cb13e9a92aa37ed
 DIST postfix-2.8.1.tar.gz 3643859 RMD160 21a7a46c2e62d98108271423129589bff30ee248 SHA1 c2b5aa6ed3520fd9298b140a71a09fee8ee40f4d SHA256 a1faf7184d5a841cf1dbd8ea412f4282edff106138abf381a9cacce4c0895499
 DIST postfix-vda-2.7.0.patch 59667 RMD160 6c3f3b2253cd1d55a888e7483bd3bd19e0481dc5 SHA1 d6d1eb1456e84468a3718770502b5228f2596c4a SHA256 6a81aadc21ddd9ffa22fd3a64c924a241b92fc5f2b3bafd352075e830e086e0b
 DIST postfix-vda-2.7.1.patch 59667 RMD160 6b45a3b988595b872556d5b5bec7518fb746b847 SHA1 0a6459449d6c11e0ddf3a09bae54481be44fa545 SHA256 67e4fe48a8ceba710d9b4e7e2a73f875e82b7acc5ab66ed42e8d2c7a3061495c
+DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-2.8.0.patch 59667 RMD160 49c7207366b44095cea351631b326c8aae64a014 SHA1 3ef6f4a82fdbdf75746545f4876f7a72a50ce5c8 SHA256 d5f546751a620bf200e8857311f50d11f9a1beaa234f4b25532b6dfdb5e933e5
-EBUILD postfix-2.6.5.ebuild 11147 RMD160 77a2602097af3990bdafd42a9bd89e88fe189b88 SHA1 598a0fe366455226428697c873633f0a91abcd54 SHA256 db1d28e016facae241f54c75b9242f213e39b6eae7dde09a1ddca5ba49194db6
-EBUILD postfix-2.6.6.ebuild 11146 RMD160 d7390b7f07215ab3ae9337fe8db78ecff12b38ed SHA1 1382a3cf8a38951796a12e2d2a8e39f3163afad1 SHA256 91ccd59e6ebf755cdc7190b409333f65ac5d24d195440565ea75e514bd66d30d
-EBUILD postfix-2.6.7.ebuild 11157 RMD160 16120ab5902a693029c4343acbec11354c6f4255 SHA1 f3b9bc53a71a7b045d5a2b39e4599a219bdb2685 SHA256 c86afbc0f8b4b8178ec99414832adbdda9f9be6959484b270de9c8c078ce8f54
 EBUILD postfix-2.7.1.ebuild 8424 RMD160 a60f9b994844b573a13bf0e37c43bb2e1a8eaf54 SHA1 bd2dca962f933e5b186124df0f186c1b8931576d SHA256 739f4e8f13617b6ee0a8ee4cf947147b5cc40b8f26eeee61044dd23a934abb22
 EBUILD postfix-2.7.2.ebuild 7789 RMD160 f00d8e052b7fb7f7921622ae81a544daec738930 SHA1 416b0baa5a58404f96908532b907a59bbd4a93b9 SHA256 a6276a6be1073672a43354a15510392444741e0fd84744278ee7c36be1f16646
+EBUILD postfix-2.7.3.ebuild 7438 RMD160 58b3caaaf20ce8ffd8c027d799ff76cf44170108 SHA1 01f771fd86a125ec5b0e3f15ae61229f7ca72469 SHA256 f1b2cfb1be4190a3f607f6604136cc48c41d30eca1eda8db50e88b8a5d2a951e
 EBUILD postfix-2.8.0-r1.ebuild 7512 RMD160 b53952b765155e412ee212fed4cd01547063638e SHA1 d0feca470f334429ac38156ae6a2d491fbd23d6d SHA256 6b248d6de31f37e2c5cdcbef3045ef801d0aa85380f9a37695fdb81768428809
 EBUILD postfix-2.8.1.ebuild 7562 RMD160 578632dee155b819f160e7b4b6673cc83b2150ad SHA1 f5cd40d5075c8c9bbc1b0e66d0d0bd9f464553ec SHA256 86304fe69eb6712163fa020d58353007bbbad0c1c5023d61e78a3ec6c775cf4b
-MISC ChangeLog 61273 RMD160 6328f43fdac4097178f45f5971af26a5d024c139 SHA1 1cd0d3a89b83f25e9f331f7a85599cab0709235d SHA256 b16cf0174ebbecbe587bab79683ce44f389e1dc123730114a907fdf8ff744eab
+MISC ChangeLog 61586 RMD160 5ee8f3be5fac27c075078ff1a16dfb0a85be1a7d SHA1 d1ee9a8eaef8f709ca71b1d04ae92f6af16d1c9a SHA256 e5024d3040ecbb5fa73f7476935ea96b6c3c432d2ed9633b688d8df9d144421e
 MISC metadata.xml 388 RMD160 2a199814dde538c1a3b770310a5ee151488b3e2e SHA1 5b247853d93835655d9713d1f90350035d29e307 SHA256 4a27cb38992ea5bc17952c35aa5af32f77f994e69cb8580014ab267a996d79a1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNeEjAAAoJEEqz6FtPBkyjGi4IALHMkE2mFy5UMfknDzuxnSBw
+iC11CclHBY+mMQn3Yx4ijEoG171med5wFXiO+sfIK3YehizBeCN2sqtqwXKnhFRo
+CEv35LQFNMGZR1QgDhLTkHWNxC/VBw4Z4Cv48Wo8BKorqUw696kGN5hWL8U3fiRJ
+waS7nydXw5+b7uZ1/R207LLT9bwyHQVHQfdR0rGdRCGCK22o2ImKCUJQUSv4+tR5
+96VYg4txuqqohbrvJbHoFRvd4XOIhqysMyHzQWEN/VYNuygimDZzey59mYQkKY3b
+Q901p3M7VuzN93cRh6rbVWrUnf4I1pf5zRknrN8MlJvXRkZ+YRT+y2Uo76Bi8os=
+=//KE
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/mailer.conf b/mail-mta/postfix/files/mailer.conf
deleted file mode 100644
index 466295877bde..000000000000
--- a/mail-mta/postfix/files/mailer.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/mailer.conf,v 1.5 2005/07/05 01:04:50 ticho Exp $
-# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
-
-# Execute the "real" sendmail program from postfix, 
-# named /usr/sbin/sendmail.postfix
-#
-sendmail	/usr/sbin/sendmail.postfix
-send-mail	/usr/sbin/sendmail.postfix
-mailq		/usr/sbin/sendmail.postfix
-newaliases	/usr/sbin/sendmail.postfix
-rmail		/usr/bin/rmail.postfix
diff --git a/mail-mta/postfix/postfix-2.6.5.ebuild b/mail-mta/postfix/postfix-2.6.5.ebuild
deleted file mode 100644
index 240efde44f41..000000000000
--- a/mail-mta/postfix/postfix-2.6.5.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.6.5.ebuild,v 1.10 2010/06/17 20:26:46 patrick Exp $
-
-# NOTE: this ebuild is a regular ebuild without mailer-config support!
-# Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to a mailer-config enabled ebuild.
-
-# regular ebuild
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support
-#inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-# regular ebuild
-IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-# mailer-config support
-#IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.6.2"
-VDA_P="${PN}-${VDA_PV}-vda-ng"
-RC_VER="2.5"
-
-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://vda.sourceforge.net/VDA/${VDA_P}.patch.gz ) "
-
-LICENSE="IBM"
-SLOT="0"
-
-# regular ebuild
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND=">=sys-libs/db-3.2
-		>=dev-libs/libpcre-3.4
-		cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-		ldap? ( >=net-nds/openldap-1.2 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )
-		sasl? (  >=dev-libs/cyrus-sasl-2 )
-		ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-# regular ebuild
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!virtual/mta
-		!net-mail/mailwrapper
-		selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support
-#RDEPEND="${DEPEND}
-#		>=net-mail/mailbase-0.00
-#		selinux? ( sec-policy/selinux-postfix )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-group_user_check() {
-	einfo "Checking for postfix group ..."
-	enewgroup postfix 207
-	einfo "Checking for postdrop group ..."
-	enewgroup postdrop 208
-	einfo "Checking for postfix user ..."
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-pkg_setup() {
-	# Do not upgrade live from Postfix <2.5
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.5.0' ; then
-			if [[ "${FORCE_UPGRADE}" ]] ; then
-				echo
-				ewarn "You are upgrading from an incompatible version and you have"
-				ewarn "FORCE_UPGRADE set, will build this package while Postfix is running."
-				ewarn "You MUST stop Postfix BEFORE installing this version to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from an incompatible version."
-				eerror "You MUST stop Postfix BEFORE installing this version to your system."
-				eerror "If you want minimal downtime, emerge postfix with:"
-				eerror "    FORCE_UPGRADE=1 emerge --buildpkgonly postfix"
-				eerror "    /etc/init.d/postfix stop"
-				eerror "    emerge --usepkgonly postfix"
-				eerror "Then run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Then restart Postfix with: /etc/init.d/postfix start"
-				die "Upgrade from an incompatible version!"
-				echo
-			fi
-		else
-			echo
-			ewarn "It's 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 continueing."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org/\" and"
-	ewarn "assigned to \"net-mail@gentoo.org\"."
-	echo
-
-	# 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, some of the empty queue"
-		ewarn "directories get deleted while unmerging the older version (see bug #45764)."
-		ewarn "Please run '/etc/postfix/post-install upgrade-source' to recreate them."
-		echo
-	fi
-
-	# TLS non-prod warning
-	if use ssl ; then
-		echo
-		ewarn "You have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service is incompatible with the previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	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
-
-	# SASL non-prod warning
-	if use sasl ; then
-		echo
-		elog "Postfix 2.3 and newer supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "Visit http://www.postfix.org/SASL_README.html for more info."
-		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}"
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_compile() {
-	# 1) Added -Wl,-z,now wrt bug #62674
-	# 2) Remove -ldl as it is not necessary, solves bug #106446
-	# 3) -Wl,-z,now replaced by $(bindnow-flags)
-	# 4) Then bindnow-flags has been simply dropped according to
-	# http://www.mail-archive.com/gentoo-dev@lists.gentoo.org/msg23679.html
-	# 5) Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -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 $(mysql_config --include)"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
-	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 -I/usr/include/cdb"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			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/$(get_libdir)/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\\\""
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# Workaround for bug #76512
-	if use hardened ; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	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 rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape tool
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-
-	# Performance tuning tools and their manuals
-	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
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
-	fperms 0750 /var/lib/postfix
-	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 "${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 PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	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"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/usr/$(get_libdir)/postfix/post-install" upgrade-permissions \
-		daemon_directory=${ROOT}/usr/$(get_libdir)/postfix
-	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 [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.6.6.ebuild b/mail-mta/postfix/postfix-2.6.6.ebuild
deleted file mode 100644
index 5ee36f111180..000000000000
--- a/mail-mta/postfix/postfix-2.6.6.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.6.6.ebuild,v 1.10 2010/09/06 21:11:36 ranger Exp $
-
-# NOTE: this ebuild is a regular ebuild without mailer-config support!
-# Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to a mailer-config enabled ebuild.
-
-# regular ebuild
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support
-#inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-# regular ebuild
-IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-# mailer-config support
-#IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.6.5"
-VDA_P="${PN}-${VDA_PV}-vda-ng"
-RC_VER="2.5"
-
-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://vda.sourceforge.net/VDA/${VDA_P}.patch.gz ) "
-
-LICENSE="IBM"
-SLOT="0"
-
-# regular ebuild
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND=">=sys-libs/db-3.2
-		>=dev-libs/libpcre-3.4
-		cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-		ldap? ( >=net-nds/openldap-1.2 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )
-		sasl? (  >=dev-libs/cyrus-sasl-2 )
-		ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-# regular ebuild
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!virtual/mta
-		!net-mail/mailwrapper
-		selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support
-#RDEPEND="${DEPEND}
-#		>=net-mail/mailbase-0.00
-#		selinux? ( sec-policy/selinux-postfix )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-group_user_check() {
-	einfo "Checking for postfix group ..."
-	enewgroup postfix 207
-	einfo "Checking for postdrop group ..."
-	enewgroup postdrop 208
-	einfo "Checking for postfix user ..."
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-pkg_setup() {
-	# Do not upgrade live from Postfix <2.5
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.5.0' ; then
-			if [[ "${FORCE_UPGRADE}" ]] ; then
-				echo
-				ewarn "You are upgrading from an incompatible version and you have"
-				ewarn "FORCE_UPGRADE set, will build this package while Postfix is running."
-				ewarn "You MUST stop Postfix BEFORE installing this version to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from an incompatible version."
-				eerror "You MUST stop Postfix BEFORE installing this version to your system."
-				eerror "If you want minimal downtime, emerge postfix with:"
-				eerror "    FORCE_UPGRADE=1 emerge --buildpkgonly postfix"
-				eerror "    /etc/init.d/postfix stop"
-				eerror "    emerge --usepkgonly postfix"
-				eerror "Then run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Then restart Postfix with: /etc/init.d/postfix start"
-				die "Upgrade from an incompatible version!"
-				echo
-			fi
-		else
-			echo
-			ewarn "It's 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 continueing."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org/\" and"
-	ewarn "assigned to \"net-mail@gentoo.org\"."
-	echo
-
-	# 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, some of the empty queue"
-		ewarn "directories get deleted while unmerging the older version (see bug #45764)."
-		ewarn "Please run '/etc/postfix/post-install upgrade-source' to recreate them."
-		echo
-	fi
-
-	# TLS non-prod warning
-	if use ssl ; then
-		echo
-		ewarn "You have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service is incompatible with the previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	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
-
-	# SASL non-prod warning
-	if use sasl ; then
-		echo
-		elog "Postfix 2.3 and newer supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "Visit http://www.postfix.org/SASL_README.html for more info."
-		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}"
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_compile() {
-	# 1) Added -Wl,-z,now wrt bug #62674
-	# 2) Remove -ldl as it is not necessary, solves bug #106446
-	# 3) -Wl,-z,now replaced by $(bindnow-flags)
-	# 4) Then bindnow-flags has been simply dropped according to
-	# http://www.mail-archive.com/gentoo-dev@lists.gentoo.org/msg23679.html
-	# 5) Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -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 $(mysql_config --include)"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
-	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 -I/usr/include/cdb"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			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/$(get_libdir)/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\\\""
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# Workaround for bug #76512
-	if use hardened ; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	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 rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape tool
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-
-	# Performance tuning tools and their manuals
-	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
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
-	fperms 0750 /var/lib/postfix
-	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 "${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 PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	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"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/usr/$(get_libdir)/postfix/post-install" upgrade-permissions \
-		daemon_directory=${ROOT}/usr/$(get_libdir)/postfix
-	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 [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.6.7.ebuild b/mail-mta/postfix/postfix-2.6.7.ebuild
deleted file mode 100644
index 7b362b823952..000000000000
--- a/mail-mta/postfix/postfix-2.6.7.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.6.7.ebuild,v 1.2 2010/06/17 20:26:46 patrick Exp $
-
-# NOTE: this ebuild is a regular ebuild without mailer-config support!
-# Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to a mailer-config enabled ebuild.
-
-# regular ebuild
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support
-#inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-# regular ebuild
-IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-# mailer-config support
-#IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.6.5"
-VDA_P="${PN}-${VDA_PV}-vda-ng"
-RC_VER="2.5"
-
-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://vda.sourceforge.net/VDA/${VDA_P}.patch.gz ) "
-
-LICENSE="IBM"
-SLOT="0"
-
-# regular ebuild
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND=">=sys-libs/db-3.2
-		>=dev-libs/libpcre-3.4
-		cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-		ldap? ( >=net-nds/openldap-1.2 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )
-		sasl? (  >=dev-libs/cyrus-sasl-2 )
-		ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-# regular ebuild
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!virtual/mta
-		!net-mail/mailwrapper
-		selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support
-#RDEPEND="${DEPEND}
-#		>=net-mail/mailbase-0.00
-#		selinux? ( sec-policy/selinux-postfix )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-group_user_check() {
-	einfo "Checking for postfix group ..."
-	enewgroup postfix 207
-	einfo "Checking for postdrop group ..."
-	enewgroup postdrop 208
-	einfo "Checking for postfix user ..."
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-pkg_setup() {
-	# Do not upgrade live from Postfix <2.5
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.5.0' ; then
-			if [[ "${FORCE_UPGRADE}" ]] ; then
-				echo
-				ewarn "You are upgrading from an incompatible version and you have"
-				ewarn "FORCE_UPGRADE set, will build this package while Postfix is running."
-				ewarn "You MUST stop Postfix BEFORE installing this version to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from an incompatible version."
-				eerror "You MUST stop Postfix BEFORE installing this version to your system."
-				eerror "If you want minimal downtime, emerge postfix with:"
-				eerror "    FORCE_UPGRADE=1 emerge --buildpkgonly postfix"
-				eerror "    /etc/init.d/postfix stop"
-				eerror "    emerge --usepkgonly postfix"
-				eerror "Then run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Then restart Postfix with: /etc/init.d/postfix start"
-				die "Upgrade from an incompatible version!"
-				echo
-			fi
-		else
-			echo
-			ewarn "It's 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 continueing."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org/\" and"
-	ewarn "assigned to \"net-mail@gentoo.org\"."
-	echo
-
-	# 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, some of the empty queue"
-		ewarn "directories get deleted while unmerging the older version (see bug #45764)."
-		ewarn "Please run '/etc/postfix/post-install upgrade-source' to recreate them."
-		echo
-	fi
-
-	# TLS non-prod warning
-	if use ssl ; then
-		echo
-		ewarn "You have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service is incompatible with the previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	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
-
-	# SASL non-prod warning
-	if use sasl ; then
-		echo
-		elog "Postfix 2.3 and newer supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "Visit http://www.postfix.org/SASL_README.html for more info."
-		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}"
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_compile() {
-	# 1) Added -Wl,-z,now wrt bug #62674
-	# 2) Remove -ldl as it is not necessary, solves bug #106446
-	# 3) -Wl,-z,now replaced by $(bindnow-flags)
-	# 4) Then bindnow-flags has been simply dropped according to
-	# http://www.mail-archive.com/gentoo-dev@lists.gentoo.org/msg23679.html
-	# 5) Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -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 $(mysql_config --include)"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
-	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 -I/usr/include/cdb"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			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/$(get_libdir)/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\\\""
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# Workaround for bug #76512
-	if use hardened ; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	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 rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape tool
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-
-	# Performance tuning tools and their manuals
-	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
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
-	fperms 0750 /var/lib/postfix
-	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 "${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 PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	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"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/usr/$(get_libdir)/postfix/post-install" upgrade-permissions \
-		daemon_directory=${ROOT}/usr/$(get_libdir)/postfix
-	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 [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.7.3.ebuild b/mail-mta/postfix/postfix-2.7.3.ebuild
new file mode 100644
index 000000000000..86af8a4e067b
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.7.3.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.7.3.ebuild,v 1.1 2011/03/10 03:42:47 radhermit Exp $
+
+EAPI=3
+
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.7.2"
+VDA_P="${PN}-vda-${VDA_PV}"
+RC_VER="2.5"
+
+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://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cdb doc dovecot-sasl examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
+
+PROVIDE="virtual/mta virtual/mda"
+
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	!virtual/mta
+	!net-mail/mailwrapper
+	selinux? ( sec-policy/selinux-postfix )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+group_user_check() {
+	einfo "Checking for postfix group ..."
+	enewgroup postfix 207
+	einfo "Checking for postdrop group ..."
+	enewgroup postdrop 208
+	einfo "Checking for postfix user ..."
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	group_user_check || die "Failed to check/add needed user/group"
+}
+
+src_prepare() {
+	if use vda ; then
+		epatch "${DISTDIR}"/${VDA_P}.patch
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -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 $(mysql_config --include)"
+		mylibs="${mylibs} $(mysql_config --libs)"
+	fi
+
+	if use postgres ; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+	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 -I/usr/include/cdb"
+		CDB_LIBS=""
+
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			CDB_LIBS="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			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/$(get_libdir)/postfix\\\""
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened ; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		manpage_directory="/usr/share/man" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Install qshape tool
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+
+	# Performance tuning tools and their manuals
+	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
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
+	fperms 0750 /var/lib/postfix
+	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 "${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"
+
+	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# Remove unnecessary files
+	rm -f "${D}"/usr/$(get_libdir)/postfix/*.cf
+
+	# Don't install a new config file if one already exists (bug #349944)
+	if [[ -e "${ROOT}"/etc/postfix/main.cf ]] ; then
+		rm -f "${D}"/etc/postfix/main.cf
+	fi
+}
+
+pkg_postinst() {
+	# Add postfix, postdrop user/group (bug #77565)
+	group_user_check || die "Failed to check/add needed user/group"
+
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}"/usr/$(get_libdir)/postfix/post-install upgrade-permissions \
+		daemon_directory="${ROOT}/usr/$(get_libdir)/postfix"
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		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."
+		ewarn
+	fi
+
+	if [[ -e /etc/mailer.conf ]] ; then
+		einfo
+		einfo "mailwrapper support is discontinued."
+		einfo "You may want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+
+	elog
+	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
+	elog "for incompatibilities and other major changes between releases."
+	elog
+}