Add blocker on net-mail/mailwrapper if mailwrapper use-flag isn't used, #231052

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

9 files changed, 39 insertions, 782 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 6a9b958c01e8..01b11178c50a 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.163 2008/07/16 16:41:00 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.164 2008/07/22 17:44:21 dertobi123 Exp $
+
+  22 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  postfix-2.2.11-r1.ebuild, postfix-2.3.8-r1.ebuild,
+  postfix-2.4.6-r2.ebuild, postfix-2.4.7.ebuild, -postfix-2.5.0.ebuild,
+  -postfix-2.5.1.ebuild, postfix-2.5.2.ebuild:
+  Add blocker on net-mail/mailwrapper if mailwrapper use-flag isn't used,
+  #231052
 
   16 Jul 2008; Luca Longinotti <chtekk@gentoo.org> postfix-2.2.11-r1.ebuild,
   postfix-2.3.8-r1.ebuild, postfix-2.4.6-r2.ebuild, postfix-2.4.7.ebuild,
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b322c0e4ede1..67eb5df1d3a8 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -12,17 +12,12 @@ DIST postfix-2.3.8.tar.gz 2787761 RMD160 2984ca8e81375a3124801c999d23637e745de54
 DIST postfix-2.4.6-vda-ng-r2.patch.gz 12397 RMD160 a03f29df52eb5c2974206cd3ee32305c24d4be73 SHA1 71c9b71a238093f944865fbc90704a25710d3f3f SHA256 d8186d4c0f19b0a989d98305d9bd1c8e27223c3a4fb549d5581f279e567fadf5
 DIST postfix-2.4.6.tar.gz 2935249 RMD160 115b3a4eb982701e29db2e52e294ec8ee69bdae5 SHA1 226222707fd8d963d3173070cac96370c453ffa7 SHA256 00d079d6354bb3979b186da6bbe281b42eea2716620da781bcdb36dd558edcca
 DIST postfix-2.4.7.tar.gz 2937251 RMD160 aea8314d39e2ee3802a814c9efd2b0c5f1b8474d SHA1 9957b6ee0abdc15749655b1f00a3d0c084c28712 SHA256 1d3fcb784d21cd93567e94e8cb244445465b9a1d0e6c2589bb1ed4ab90d536dc
-DIST postfix-2.5.0-vda-ng-r1.patch.gz 28964 RMD160 35527bf9358ce35ca9cc863d1e5fe71ce0e3814e SHA1 134e9973c09fa2c137d4b4a4295eed6c209a43b5 SHA256 36e47b7b57317c1055c48481261bdccd4688fdad3ae26c7a2988ea812ac068d5
-DIST postfix-2.5.0.tar.gz 3153152 RMD160 2f7c29d63a747bce259ed5596e4b59f279aa8196 SHA1 d611ac3b6f0536a9320b355a76bd345997f08b7b SHA256 da757ac8181f258ad2ce4532a092e1c3e74bd65a73a75eec6c00130bffd53d99
 DIST postfix-2.5.1-vda-ng-r1.patch.gz 28964 RMD160 35527bf9358ce35ca9cc863d1e5fe71ce0e3814e SHA1 134e9973c09fa2c137d4b4a4295eed6c209a43b5 SHA256 36e47b7b57317c1055c48481261bdccd4688fdad3ae26c7a2988ea812ac068d5
-DIST postfix-2.5.1.tar.gz 3153629 RMD160 cf414306742d642ccab78212ee33af955d7a9023 SHA1 4ceb805b78aff4c872b7e55554d2364e06f695b3 SHA256 bad7ed98d1bbc8fd27d4b4d6d65a8dfe21794c109bc923e5fe45abea5b484037
 DIST postfix-2.5.2.tar.gz 3155511 RMD160 f16bb7ed2f4990c5f39931f3a604b5a235c03828 SHA1 6589c590b2e2a955bce5615bde1a86c37c572ce0 SHA256 6ce9cf14338b55ecf3a81d774d406ff7dfead9413d78dc8b423d72497d7a9f53
-EBUILD postfix-2.2.11-r1.ebuild 10451 RMD160 baf6b314aab03a8f634ae9213cd37b521b8c822d SHA1 86b3977de50872e4c1687fd3638b7d3dca887ae3 SHA256 7e0a6f868d71c5bdec75fe09652da1d068da587f60e63a46ba208626e78aecc6
-EBUILD postfix-2.3.8-r1.ebuild 11784 RMD160 9a5c55053ca42d9ed423892dba83565ca55105bf SHA1 6abb9a28e48f012834b9a8c2a8d2c3dd9ca6af72 SHA256 c8b59e410735926c1a968773ed7c99602ac017860784ef864a8cd10703ba877e
-EBUILD postfix-2.4.6-r2.ebuild 11831 RMD160 92355e71ff4ded88e39929b10d6efc7e915c94eb SHA1 a92d1c4ab96e0aabb17a774679f25d2f9de6c0e7 SHA256 c99a884be4498fd07d90d2aac9590d1e76ebef2249cc13e1483ac8937965be82
-EBUILD postfix-2.4.7.ebuild 11835 RMD160 0af724c7722dde86003a3631a2f05abf4c292161 SHA1 3ec939e8d76e04a6cc3712e01784ddbcf22f8061 SHA256 3cbd3c5823353f63ba14bf34eccab50afd86c0f8981e5d785f450cf13d398606
-EBUILD postfix-2.5.0.ebuild 12018 RMD160 585675dd343602fd22991d0b3ac9e5cc0c931449 SHA1 be605815e9e652d2d5ce2a3e548503bbf8d304fe SHA256 d8eae78ea3bed709ff1c963eb7eb6a93f52417b0bae863c8cbefae67dcc01153
-EBUILD postfix-2.5.1.ebuild 11912 RMD160 d84a1619c2f28e22181ee8e4a7520e27c43c798d SHA1 434b7187f889d3702295842d5ab45e6b36eb4d98 SHA256 251606888b65b99643e465bf87ea93f383cc05790748a8aab0d35dafe94f3000
-EBUILD postfix-2.5.2.ebuild 11943 RMD160 cc8b0778a7769afd0991a9e956a3f1b3ca911e27 SHA1 1b50876ec3803cfb372c487eb70c1b42e105e651 SHA256 8c2d903deda565e7b697ab408a6f502cbf4f6a408fdc504646a122c6d6be4276
-MISC ChangeLog 49575 RMD160 c36a9489f7abaad9525e97c21d1d45a63dd533fa SHA1 6632708b90ef69488fa012b0c336e3ec4ba97d12 SHA256 b54e411e199260f030583b771e62980f7e303c35a7e9436eafdba749c15366b6
+EBUILD postfix-2.2.11-r1.ebuild 10482 RMD160 38a30850a1d3be0327aaf61eaf3ec085a65c75ed SHA1 e86c048743816eb80cf4a86ce9f7aef977efaab4 SHA256 886a8fa626c202b9eda143aa1d76c052abfdf8722da39072bd4f7abc63ac8f46
+EBUILD postfix-2.3.8-r1.ebuild 11815 RMD160 1ff0b58312bbe3daaa2972b25c8a1f86815a5b4a SHA1 45a577bb284e99e48905b7f3e39496002e85c08a SHA256 720e3c5f359cccc9655c48340b0d7383c3e836ecd7c8b71eba264c99bc03b117
+EBUILD postfix-2.4.6-r2.ebuild 11865 RMD160 7055177b96401e61a89f3fe1440d2489dc2389df SHA1 3e9fa6bbc787d9989d95ec9a2ae1c90556c35053 SHA256 1c3fc1a9c1dc3207794217748055ecefabb149c9ad3ec19dd071444f6669444d
+EBUILD postfix-2.4.7.ebuild 11869 RMD160 bb93f5800f18174d6a8f45ea1e4c386280bf8f1f SHA1 49aee93b67215ef973de6be54a18d16299f9bbb2 SHA256 14e9d1d6e61fd999d5b00a56a0b7d530ab8529757d8127b885218a81cda88f1e
+EBUILD postfix-2.5.2.ebuild 11977 RMD160 ccfe93c89e30ef83d3cc88c1eb4c04e5dcdc8ec4 SHA1 4591adf319625123570d0d44fea5d60e73c1ee23 SHA256 b08caeca07f6d8720ad2982a94ebfdd37caa525acf42833044d6d4e872e7fa33
+MISC ChangeLog 49892 RMD160 b57f068f8779c3c09cdbe47170b667af2791dc69 SHA1 1e1a029f19dc27e965e5e086c7b725e90d7bd597 SHA256 0a7cb7136e3ed7ed76413f41700d8157aaf61697ec91e9270a4b606b48680f2f
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
diff --git a/mail-mta/postfix/postfix-2.2.11-r1.ebuild b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
index 29b8caf8de2e..caa4815ee83d 100644
--- a/mail-mta/postfix/postfix-2.2.11-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11-r1.ebuild,v 1.10 2008/07/16 16:41:00 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11-r1.ebuild,v 1.11 2008/07/22 17:44:21 dertobi123 Exp $
 
 inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
 IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened cdb"
@@ -35,7 +35,10 @@ DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )"
 RDEPEND="${DEPEND}
 	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
+	!mailwrapper? (
+		!virtual/mta
+		!net-mail/mailwrapper
+	)
 	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 	selinux? ( sec-policy/selinux-postfix )"
 
diff --git a/mail-mta/postfix/postfix-2.3.8-r1.ebuild b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
index f6309bb47121..961424479786 100644
--- a/mail-mta/postfix/postfix-2.3.8-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8-r1.ebuild,v 1.10 2008/07/16 16:41:00 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8-r1.ebuild,v 1.11 2008/07/22 17:44:21 dertobi123 Exp $
 
 # NOTE: this ebuild is regular ebuild without mailer-config support
 # comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -52,7 +52,10 @@ DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
 # regular ebuild.
 RDEPEND="${DEPEND}
 	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
+	!mailwrapper? (
+		!virtual/mta
+		!net-mail/mailwrapper
+	)
 	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 	selinux? ( sec-policy/selinux-postfix )"
 
diff --git a/mail-mta/postfix/postfix-2.4.6-r2.ebuild b/mail-mta/postfix/postfix-2.4.6-r2.ebuild
index 5a19c4ca9390..e4bb21199d79 100644
--- a/mail-mta/postfix/postfix-2.4.6-r2.ebuild
+++ b/mail-mta/postfix/postfix-2.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.6-r2.ebuild,v 1.12 2008/07/16 16:41:00 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.6-r2.ebuild,v 1.13 2008/07/22 17:44:21 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -50,7 +50,10 @@ DEPEND=">=sys-libs/db-3.2
 # regular ebuild
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
+		!mailwrapper? (
+			!virtual/mta
+			!net-mail/mailwrapper
+		)
 		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 		selinux? ( sec-policy/selinux-postfix )"
 
diff --git a/mail-mta/postfix/postfix-2.4.7.ebuild b/mail-mta/postfix/postfix-2.4.7.ebuild
index 9d789caa20da..e6dc55b8e8f0 100644
--- a/mail-mta/postfix/postfix-2.4.7.ebuild
+++ b/mail-mta/postfix/postfix-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.7.ebuild,v 1.3 2008/07/16 16:41:00 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.7.ebuild,v 1.4 2008/07/22 17:44:21 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -50,7 +50,10 @@ DEPEND=">=sys-libs/db-3.2
 # regular ebuild
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
+		!mailwrapper? (
+			!virtual/mta
+			!net-mail/mailwrapper
+		)
 		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 		selinux? ( sec-policy/selinux-postfix )"
 
diff --git a/mail-mta/postfix/postfix-2.5.0.ebuild b/mail-mta/postfix/postfix-2.5.0.ebuild
deleted file mode 100644
index 6ea2b631b911..000000000000
--- a/mail-mta/postfix/postfix-2.5.0.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.0.ebuild,v 1.4 2008/07/16 16:41:00 chtekk 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 mailwrapper 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_P="${P}-vda-ng-r1"
-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://gentoo.longitekk.com/${VDA_P}.patch.gz ) "
-
-LICENSE="IPL-1"
-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? ( virtual/postgresql-base )
-		sasl? (  >=dev-libs/cyrus-sasl-2 )
-		ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-# regular ebuild
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
-		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-		selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support
-#RDEPEND="${DEPEND}
-#		>=net-mail/mailbase-0.00
-#		selinux? ( sec-policy/selinux-postfix )"
-
-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 -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		if best_version '=virtual/postgresql-base-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-
-	if use ssl ; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis ; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
-			src/util/sys_defs.h || die "sed failed"
-	fi
-
-	if use cdb ; then
-		mycc="${mycc} -DHAS_CDB"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "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
-	[[ "$(gcc-version)" == "3.4" ]] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		#mailer_install_conf
-	else
-		# Provide another link for legacy FSH
-		dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-	fi
-
-	# Install qshape tool
-	dobin auxiliary/qshape/qshape.pl
-
-	# 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,post*-*} "${D}"/etc/postfix
-	if use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL 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}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from Postfix-1.x, you must revisit"
-	ewarn "your configuration files. See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-	# regular ebuild
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "Since you emerged Postfix without mailwrapper in USE,"
-		einfo "you may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-	# mailer-config support
-	#mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.5.1.ebuild b/mail-mta/postfix/postfix-2.5.1.ebuild
deleted file mode 100644
index d8c80dd6e43c..000000000000
--- a/mail-mta/postfix/postfix-2.5.1.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.1.ebuild,v 1.5 2008/07/16 16:41:00 chtekk 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 mailwrapper 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_P="${P}-vda-ng-r1"
-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://gentoo.longitekk.com/${VDA_P}.patch.gz ) "
-
-LICENSE="IPL-1"
-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? ( virtual/postgresql-base )
-		sasl? (  >=dev-libs/cyrus-sasl-2 )
-		ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-# regular ebuild
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
-		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-		selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support
-#RDEPEND="${DEPEND}
-#		>=net-mail/mailbase-0.00
-#		selinux? ( sec-policy/selinux-postfix )"
-
-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 -I/usr/include/mysql"
-		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"
-		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
-	[[ "$(gcc-version)" == "3.4" ]] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		#mailer_install_conf
-	else
-		# Provide another link for legacy FSH
-		dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-	fi
-
-	# Install qshape tool
-	dobin auxiliary/qshape/qshape.pl
-
-	# 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,post*-*} "${D}"/etc/postfix
-	if use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || die "newinitd failed"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL 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}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from Postfix-1.x, you must revisit"
-	ewarn "your configuration files. See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-	# regular ebuild
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "Since you emerged Postfix without mailwrapper in USE,"
-		einfo "you may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-	# mailer-config support
-	#mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.5.2.ebuild b/mail-mta/postfix/postfix-2.5.2.ebuild
index 578f3ca45abc..38207d86eecc 100644
--- a/mail-mta/postfix/postfix-2.5.2.ebuild
+++ b/mail-mta/postfix/postfix-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.2.ebuild,v 1.3 2008/07/16 16:41:00 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.2.ebuild,v 1.4 2008/07/22 17:44:21 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -51,7 +51,10 @@ DEPEND=">=sys-libs/db-3.2
 # regular ebuild
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
+		!mailwrapper? (
+			!virtual/mta
+			!net-mail/mailwrapper
+		)
 		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 		selinux? ( sec-policy/selinux-postfix )"