change to new style virtual/mda. remove old.

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

7 files changed, 16 insertions, 560 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index f79d7ae9f3ea..247b34a1127f 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,11 @@
 # 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.241 2011/03/15 03:39:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.242 2011/03/16 10:44:27 eras Exp $
+
+  16 Mar 2011; Eray Aslan <eras@gentoo.org> -postfix-2.7.1.ebuild,
+  postfix-2.7.2.ebuild, postfix-2.7.3.ebuild, -postfix-2.8.0-r1.ebuild,
+  postfix-2.8.1.ebuild:
+  change to new style virtual/mda. remove old.
 
   15 Mar 2011; Tim Harder <radhermit@gentoo.org> postfix-2.7.3.ebuild,
   postfix-2.8.1.ebuild:
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 911814cfab62..53eb0f26b3d6 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,19 +1,14 @@
 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.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.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 7271 RMD160 0f6388ad7e824b876a2b0a9920e4d5d988ef374f SHA1 81544f6c00f387296cf40623f7d150d95b47e469 SHA256 dade5f3d7e08eda75f1187b73cb6fde1cb502160069fe0f36be6702ea795070e
-EBUILD postfix-2.8.0-r1.ebuild 7512 RMD160 b53952b765155e412ee212fed4cd01547063638e SHA1 d0feca470f334429ac38156ae6a2d491fbd23d6d SHA256 6b248d6de31f37e2c5cdcbef3045ef801d0aa85380f9a37695fdb81768428809
-EBUILD postfix-2.8.1.ebuild 7401 RMD160 665dcadf1c1121b1c2479e652e56bf59ba62ee4c SHA1 bfc2d8c2112c37e4cb380cce11a8d6d20e66d107 SHA256 2cac6021375cf72b211b9841b762723ba710b632d86540656dec9a4497250878
-MISC ChangeLog 62293 RMD160 3ec3b0045e9efda9fde9fa1d292173aa601b4020 SHA1 07f82dbb5d9f1b802d1e6c5283496db5f5d8580e SHA256 52973083ccca3b35661b9956ec14320267c4a2fbcf216ad59bea84056ce39fbc
+EBUILD postfix-2.7.2.ebuild 7775 RMD160 bbb3b33c9649137b9b5969e42c2b1e9a8caa077a SHA1 b2c5156ca22d60051ade333ef7ed28c5e3d60b8b SHA256 0a90f1552aa342f83b2d1f7ca99412e08e1e55f2cadfdc3d4888b2eda3275141
+EBUILD postfix-2.7.3.ebuild 7254 RMD160 0cedce5a34f492b7221704a92a11f67e79241f20 SHA1 f0977f91aae9d206e89a1353117603b5a25621dd SHA256 bd1042e8a0434184d4d72d068cec64fbb2fdc279b0dbe7a5c429120eadf6d226
+EBUILD postfix-2.8.1.ebuild 7384 RMD160 8b6336e3e981a7b0d01e811c9622aa9ecd78a557 SHA1 b2d277df3a40ddd00f658845e0a2835231162bf5 SHA256 85ccd7d71df650a1487084f1b025e035e320f7b431c2f93ba2cc24ec30fad10b
+MISC ChangeLog 62499 RMD160 6284d1f71bf0bfdec719ddadcdabe9b0c0c53518 SHA1 a30fa7ff2db9f103cd124f3379b3916c8ee083fa SHA256 0ab2ab9db6a786b05d89748345d40e2c86f2bae99e8cf59cf0d0e9858ff8ac2e
 MISC metadata.xml 388 RMD160 2a199814dde538c1a3b770310a5ee151488b3e2e SHA1 5b247853d93835655d9713d1f90350035d29e307 SHA256 4a27cb38992ea5bc17952c35aa5af32f77f994e69cb8580014ab267a996d79a1
diff --git a/mail-mta/postfix/postfix-2.7.1.ebuild b/mail-mta/postfix/postfix-2.7.1.ebuild
deleted file mode 100644
index 2db7782348fe..000000000000
--- a/mail-mta/postfix/postfix-2.7.1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# 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.1.ebuild,v 1.7 2011/01/22 18:43:45 xarthisius 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.0"
-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 dovecot-sasl 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-0.00
-	!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() {
-	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
-
-	# 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_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} -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"
-}
-
-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.2.ebuild b/mail-mta/postfix/postfix-2.7.2.ebuild
index 84eb580e5de8..2a22cf52fa7f 100644
--- a/mail-mta/postfix/postfix-2.7.2.ebuild
+++ b/mail-mta/postfix/postfix-2.7.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.6 2011/03/05 12:31:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.7.2.ebuild,v 1.7 2011/03/16 10:44:27 eras Exp $
 
 EAPI=3
 
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
 
-PROVIDE="virtual/mta virtual/mda"
+PROVIDE="virtual/mta"
 
 DEPEND=">=sys-libs/db-3.2
 	>=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-2.7.3.ebuild b/mail-mta/postfix/postfix-2.7.3.ebuild
index 08dc2befb057..bdee90346f84 100644
--- a/mail-mta/postfix/postfix-2.7.3.ebuild
+++ b/mail-mta/postfix/postfix-2.7.3.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2011/03/15 03:39:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.7.3.ebuild,v 1.8 2011/03/16 10:44:27 eras Exp $
 
 EAPI=3
 
@@ -23,7 +23,7 @@ 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"
+PROVIDE="virtual/mta"
 
 DEPEND=">=sys-libs/db-3.2
 	>=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-2.8.0-r1.ebuild b/mail-mta/postfix/postfix-2.8.0-r1.ebuild
deleted file mode 100644
index 7f0aa8a2d914..000000000000
--- a/mail-mta/postfix/postfix-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# 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.8.0-r1.ebuild,v 1.1 2011/01/24 07:20:42 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.1"
-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 dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux sqlite 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 )
-	sqlite? ( dev-db/sqlite:3 )
-	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} -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 sqlite ; then
-		mycc="${mycc} -DHAS_SQLITE"
-		mylibs="${mylibs} -lsqlite3"
-	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
-
-	emake DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure 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
-
-	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
-
-	elog
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-	elog
-}
diff --git a/mail-mta/postfix/postfix-2.8.1.ebuild b/mail-mta/postfix/postfix-2.8.1.ebuild
index 59b2df4f3a73..218cc311f518 100644
--- a/mail-mta/postfix/postfix-2.8.1.ebuild
+++ b/mail-mta/postfix/postfix-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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.8.1.ebuild,v 1.2 2011/03/15 03:39:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.8.1.ebuild,v 1.3 2011/03/16 10:44:27 eras Exp $
 
 EAPI=3
 
@@ -23,7 +23,7 @@ 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 sqlite ssl vda"
 
-PROVIDE="virtual/mta virtual/mda"
+PROVIDE="virtual/mta"
 
 DEPEND=">=sys-libs/db-3.2
 	>=dev-libs/libpcre-3.4