version bump and remove old

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

5 files changed, 25 insertions, 651 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 7d3e5e101002..27313b604bfa 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.359 2012/05/21 09:07:22 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.360 2012/05/21 09:18:38 eras Exp $
+
+*postfix-2.10_pre20120520 (21 May 2012)
+
+  21 May 2012; Eray Aslan <eras@gentoo.org> -postfix-2.9.0.ebuild,
+  -postfix-2.9.0-r1.ebuild, -postfix-2.10_pre20120426.ebuild,
+  +postfix-2.10_pre20120520.ebuild:
+  version bump and remove old
 
   21 May 2012; Eray Aslan <eras@gentoo.org> postfix-2.8.7.ebuild,
   postfix-2.8.8.ebuild, postfix-2.8.9.ebuild, postfix-2.8.10.ebuild,
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 7a37f599c078..91397de79cce 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -7,7 +7,7 @@ AUX postfix.rc6.2.7 2217 RMD160 0f46f7fe1fa8e2e3ec4c5461789c5f2708cd94f8 SHA1 b3
 AUX postfix_no-berkdb.patch 2729 RMD160 2e80e5c446b58afe8cda35991ac3af5f3db3f7eb SHA1 8c6d8695bf347769f957a79f3320fcff8d844315 SHA256 c21e9582346c913b3033ec6d3567d0b0bd3576ad64052fed48a5cf78d7ad92fc
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
 AUX smtp.sasl 147 RMD160 8565ca413ec1a9e369be227643d3610124b34566 SHA1 565035b230d4997a207d146609336dfe643c6ed3 SHA256 0ef6a2a7846498f56b9a8879f561a51c1e3a203ba90b2991d499afa69fd85629
-DIST postfix-2.10-20120426.tar.gz 3773206 RMD160 14977ad152b7fb5821eebf0388d63ea6341b0881 SHA1 ca97562f4dcd6aa3f840795c3beea996a1c64b46 SHA256 86b79a39c338c42fa82351a79faf7415926fb382bad1aef8222fb0ff71bfbd58
+DIST postfix-2.10-20120520.tar.gz 3775212 RMD160 5b34aff06afac042e4987f3fe6b69638c15d5116 SHA1 d56ded5f1c153c12fbcfed9229e5e9d204bc2ec5 SHA256 4ca927f8a1932080a5c87e4babd5b024c5ca45c3572c6d51c64e5f9fb4ed3305
 DIST postfix-2.7.4.tar.gz 3423968 RMD160 4f3e0db43c55cd50b3fb4493dbc698ff3f343294 SHA1 c755ceb3a5ee983f3b72f08e1fffb6384b1f1865 SHA256 9bad5851e8a7c97890ee9465e7f675f7826d56361369d3e792a79eaf98ed2b11
 DIST postfix-2.7.5.tar.gz 3425071 RMD160 a900ff09c0a54382a4af62b609f6ddaba17963fc SHA1 066cc87f602f2daf1d3207de92ca08de9eb16bab SHA256 2fe408f49bc8540bc41b44f1b7ee7a27561f1baa4e25ef55645778ba96d15932
 DIST postfix-2.7.6.tar.gz 3425286 RMD160 9961b959ae34a1fe1d3bf70acce1f16e5ada255d SHA1 9a2cd652abdc0d3cf29563261d5c0f407d8d7bf9 SHA256 4f7546d25463c5fc300eccd05c302a44458b1cc8dfda02c7205daa0038d5ab17
@@ -18,7 +18,6 @@ DIST postfix-2.8.10.tar.gz 3640084 RMD160 5bbf698988ba491ba2ce3937918381be9fc2e3
 DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
 DIST postfix-2.8.8.tar.gz 3648317 RMD160 eb71b542af2a00da5f12220946731560ff20377d SHA1 b712b25a105c132b40b63aef49268ea117b86f03 SHA256 77dc98e21da48901d326e98f918ea50d6cad66ee5812033b5aab342c9578328c
 DIST postfix-2.8.9.tar.gz 3648498 RMD160 db540c199ca66457e0ca65b1f95c9745249a1254 SHA1 2404d369e7ae90cdd9a0e4e185c4699a16c9fe81 SHA256 6a63bafad1002abbab2d2592a40dc4b3e35defd97f2026d6ccc398e5d7ee9bf3
-DIST postfix-2.9.0.tar.gz 3768091 RMD160 0454dce2e82edb11f7e61f8038154c32a47bc605 SHA1 a04a72a8b9436279a30b7d1b62197be63124a132 SHA256 aed9b360eb74f46bfd6c6efe4eb724ce013cb8c6d4ad43888dd940aa2d33e6ec
 DIST postfix-2.9.1.tar.gz 3768329 RMD160 5a97bcfe16a5ed343e449e73cde99c62b47c4aeb SHA1 d4f6572ab1ac5fc15626ac2de6d18c340aae2cef SHA256 d1dbe901f76ab6fd51f9c8c61eb46bd6fe0bc8b13823330e397eb1b00e940cbe
 DIST postfix-2.9.2.tar.gz 3759595 RMD160 512fb6fcb42d628b14a7153f3a5f2e03b7b6a8c6 SHA1 fda7ec5ac79300577f61a68561171bd501b1b20c SHA256 ed66f5406056267ce21dbf48c6f4e3b53bf8fad46d799d314445353f42b5c902
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
@@ -27,7 +26,7 @@ DIST postfix-vda-v10-2.8.5.patch 56777 RMD160 fc1622a91c88d6d91782b9d4e9dfecd3f6
 DIST postfix-vda-v10-2.8.8.patch 56777 RMD160 960d5b2e6ff45ae376ba9e98ab74ec712badfcd3 SHA1 9bfbbb6278301ac11082c9a9e685ad6e90b24e6a SHA256 40e32a1c159fe3d12836f81e4871e4a628a87623b80402e90f7465eb39f89a86
 DIST postfix-vda-v10-2.8.9.patch 56777 RMD160 acf05f56f1dfb7f4628c7b95be92cabc41538b5e SHA1 8e55e2fea8392f2e64e05e9cd84c712cc489031c SHA256 e671f7349173349d66f1b091359761ed5a5d517f8a58c86a42ff461997d2cd7e
 DIST postfix-vda-v11-2.9.1.patch 55009 RMD160 fc35876f4c48accca785f412a4d9a2f1a250f05d SHA1 f259c489d76271ac1780510e20a60962f97ac36f SHA256 611283a932577944bcdde36e5fe1a80ca750a0a66eb5f3490666e2adafd2bf84
-EBUILD postfix-2.10_pre20120426.ebuild 9485 RMD160 cbefec8284d70a47e1c5cad3edb6f9df79db8dd1 SHA1 2dfd25f1b0c9ccf1cfc2cef3e994556a0155e740 SHA256 28aa18beee695a9a0c8dc2cc516d36dd5722e5298641a231f8864f5923b22c72
+EBUILD postfix-2.10_pre20120520.ebuild 9485 RMD160 34beec9009ec35c454b5c8c9788a7f76ba87615e SHA1 6e069a11f8d75df3a6439aa221389430e362ae44 SHA256 511768904f36c2abff3a9696bca75512b8be81e7fd12394ca6608377863b7cfa
 EBUILD postfix-2.7.4.ebuild 7562 RMD160 7b1874aa1c5fb0357ab8bafd740e38ec00ecdb45 SHA1 db22462d85927f3afc7c172597842d1fc0ac5fb5 SHA256 aaa33b10ecc21d9dcd8256b12974912bf3481544c5f7cb5119da7b52fcefc9d9
 EBUILD postfix-2.7.5.ebuild 7573 RMD160 767bf6a470af95a14e1e725fc77287d3f3907ffd SHA1 2f897791234a3c2bfbcb3fe39406c60e2f7e9b09 SHA256 b348d000438cae031fa48e04a938aa623dd722120699a9969cccc99d05842122
 EBUILD postfix-2.7.6.ebuild 7573 RMD160 6e8c3b59101d7d4d19f20f0df24b5f53d2a23957 SHA1 f703ec9a31a1a6a2e3930fbd7660f998d1753c27 SHA256 7ade993dbeba99be1ab0f97d35227fbb0d208f70e4a718bf3d2a56bc4983f512
@@ -38,28 +37,26 @@ EBUILD postfix-2.8.10.ebuild 8426 RMD160 9375bde8664a2a529920954fc51b808f70f22d2
 EBUILD postfix-2.8.7.ebuild 8415 RMD160 136befb1c8c0adbd312ab11439b5761d24e87cd0 SHA1 4d0f4a654ea5cbb03dc7db2611c0fb788705f677 SHA256 969f07e8ae3206416527132d8669a114380d3c1b1e12c05cfafffde11da2df9e
 EBUILD postfix-2.8.8.ebuild 8425 RMD160 74c826a0bf5894414b9e1355df6f1e5e3d266563 SHA1 9985a6edbd660eaff9c51b014f1c0ab32239d314 SHA256 278137f08438a5ccbf1b358231b60e4a99b0e3d956760c8d64993ba753614ac6
 EBUILD postfix-2.8.9.ebuild 8421 RMD160 eaf58ec7a084e0968015ed6d951979e3015b5cd6 SHA1 f073b918024bbe641fc6b43a09bc24344322d6ec SHA256 5ef2c0f40d0285199c4de479eb445c90415843091a974b7af58415d5ae11d500
-EBUILD postfix-2.9.0-r1.ebuild 9549 RMD160 7df975f75c6b4f6503ccc7dbf0bae3631bf9e698 SHA1 c42b1026b6634398b436a1ea3cfbcbe5ecaae4bc SHA256 0111f9fda88a25972015d1a610e6e3950f3dc07bff4ba7e439899124092270a0
-EBUILD postfix-2.9.0.ebuild 9546 RMD160 e0bd6543ae95e02afa0f4d130b1164cd56f3cb7c SHA1 5d0c550da63b034ad34e891a10adf2e1ace45c17 SHA256 8a97dc97de82fe71f430ea098f7c1e8ff5a7a394814976c6954fb8b115823ef4
 EBUILD postfix-2.9.1-r1.ebuild 9478 RMD160 0a6d67f3f63f7e9825e40712f88c481e7b706c1e SHA1 f4a991ad1ca102725aa5117c0e3dcae55a7c3c4e SHA256 b12fdcfaac4b9fe425b2e5cfa6c56e1ffc3807dd42cce1dc4f223efdb8ec2803
 EBUILD postfix-2.9.1-r2.ebuild 9478 RMD160 d1b1539b14bbbc2ba65f2362275378884ed13b87 SHA1 6e18ad0d82f9ff405512582326a9709f7c43e5be SHA256 c45282bf90f29ee86e97095728b303b2bfcccfe6f24b05ea688ec1355965d315
 EBUILD postfix-2.9.1.ebuild 9475 RMD160 97123ce49c257cf0368e741a57190e9a66c24605 SHA1 5573f8ffe9a33295351882aa4793e8b3bddec90d SHA256 2cb3fdf02182f937503737345ecafb7eb851871dfb49e215cea86ee16baff2f8
 EBUILD postfix-2.9.2.ebuild 9475 RMD160 b6db483bcfab74233d7025d5ae40255c0f8b6273 SHA1 4387c9d057435fbfa2dd3632a44427fe0289b0f3 SHA256 756056225635705d5d70c1b038e31fd7c2e5ee4d8c8efdba34f738ffa7515fe2
-MISC ChangeLog 81522 RMD160 75b69baa90d0b3032e96f27471bd0bc3a1fb098a SHA1 e215e64e86f0997b849332a47c35540a221a75d0 SHA256 94a96e3ebe6310c1be21d8c9204962c46dc31708ff86ded258966000231e37f3
+MISC ChangeLog 81759 RMD160 f6b7efa17e7f5f03f000d908afff58d6a8e89857 SHA1 3f6688a3c8cf815e24e004f745903c0fd00750cc SHA256 aed75254aba5973d0f969ea3dbb57c32bc9714156cce6b53f50cb4781ae5adbe
 MISC metadata.xml 610 RMD160 095d8cd529350f58c64d6d2eb40e8534d3dddfae SHA1 d53048933e7490f3f342ccf8972c191ee8030ccd SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPugXbAAoJEHfx8XVYajsfmkoP+wajbFhC9HxKuK5VK5kiESgC
-99ir984fnctFvgny2NE5gvs3RTxuICNFEp4pQyxxAxZqmv+0GJgKuH5rKpP/YJwU
-reDwoUyl7B/aluj9s5IdFF7jqUCgchIaNXMQZTuehJdqG4llE5KayEbA4SOAH0fb
-Lsb6izo2sl3i9GjJborgiklWp2i8ZOoY45dxr403ZweUOTByaLN9oyqMFDZgV9tS
-6R+lm9AklvvgwTvv9unBQ6NezrayohwTvpY6fGvDLaSvT2podCCSFK4hSrIh16Jv
-aEDrlRACyiEm+26kZN/OH7v0pFCQjt3OWZz+q2BqYFbb/kP3kr30QWWHi7OOpL7M
-Vwmkk9wfNwyQLOGaZX9yoNncvfavhV1J5rNGwOZPecJiQAfiZkgzf446Nt4RZByD
-cg1Rz7VAghWuQIzZmBcGZzNl2d2pXviOmb3Q8PnMe/9KNWc9DgYLb6/xhdI9mYju
-XvVXJjA5977TpOg484fg0cpNC3yq3hOgFlMe9VXwvXe4xmEkOZIOJJ0Azm2CD+Ut
-/yyPtRh3tCXTFkAouZiqirONy2J7h1T5vVcDot4Qt6lVSVKbDUj3ZKp1ukrDZprJ
-Ns1cti4czkYmnYsZ41v72nQfQx05CXeva5d+G995IxVXutYNyO/wc8hgKCK2AG8x
-kWb9Ng5Up/C930OL/9Me
-=MeLR
+iQIcBAEBCAAGBQJPughzAAoJEHfx8XVYajsf3FkP/iDh9bOs54wuO3UUxOLG+ykG
+0NKDYnuyHaP4v9yMCwpVOdGlqnrvLfpYWOfLniLeI+5CMwrbWj7nY6u7e5ZZyGCk
+/xbIIWziEqw1gL1wB9kfISUKGqVP9xxE410HR6hX8rkGnszeiyIRJ7wjs5mH+ibi
+2Bs29QKrVS9dI4YwX8Epeu73viiPIaH/f3uFzUj7qKluDWKKtKWAUcLtunU+4wjs
+3/Hj+Qzbs8/51M2VGuqFH7JELV6cs55oeFw+HRvfrVwmbyAHwVL9UEz07zV07rZ2
+vcPvDitFLi6vmtdbqtgtUpSlDmrQZBW0BM3LkiDxRwP5ZRA6vsU/PM6HDZ7wEaZY
+j1ZBF8Wjjxo4XDWeiUN9JmyzDvzgOQTXndL6wjJuNj7csnjq4qWVCBWl01sKL1iJ
+MtrypTz7RuoPVd95FKs3UwwbjwbkfhZSfeFw7A/vNlbx2Gl4ZB+GHweShQPbxax/
+6RNCNJcJO/a/dtq4B+T6yHdA/ZevjzFWGA4Y/zQvT1CzuPqSsaTXuOcKLCmILu3L
+l6yY3sE1n0gillmi3FAuspjpDniuqJLVas4ILDBCiDVm8YtYwyTWMB2pwNGo/JYl
+CuF1iYs4qlBnhsB12aUVGDMhEibokTS9q5fTOi64obWSc0shxjULkdpZ5N++RIbR
+UJ7zV2ZzVG2zwiEguHa8
+=msvR
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10_pre20120426.ebuild b/mail-mta/postfix/postfix-2.10_pre20120520.ebuild
index e9c968f76697..176e1a8b90ea 100644
--- a/mail-mta/postfix/postfix-2.10_pre20120426.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20120520.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120426.ebuild,v 1.2 2012/05/21 09:07:22 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120520.ebuild,v 1.1 2012/05/21 09:18:38 eras Exp $
 
 EAPI=4
 
diff --git a/mail-mta/postfix/postfix-2.9.0-r1.ebuild b/mail-mta/postfix/postfix-2.9.0-r1.ebuild
deleted file mode 100644
index 91bc7b903ac3..000000000000
--- a/mail-mta/postfix/postfix-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0-r1.ebuild,v 1.4 2012/05/21 09:07:22 eras Exp $
-
-EAPI=4
-
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam versionator
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.8.5"
-VDA_P="${PN}-vda-v10-${VDA_PV}"
-RC_VER="2.6"
-
-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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2 )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	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}
-	dovecot-sasl? ( net-mail/dovecot )
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	selinux? ( sec-policy/selinux-postfix )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nbsmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward"
-
-# vda patch is broken in 2.9
-REQUIRED_USE="ldap-bind? ( ldap sasl )
-	!vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	if use vda; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	if ! use berkdb; then
-		epatch "${FILESDIR}/${PN}_no-berkdb.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 sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		mylibs="${mylibs} -lsqlite3"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		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 berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
-		fi
-	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
-
-	# 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
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		html_directory="/usr/share/doc/${PF}/html" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| 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
-	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
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-}
-
-pkg_preinst() {
-	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
-	# check inet_protocols setting in main.cf and modify if necessary to prevent
-	# performance loss with useless DNS lookups and useless connection attempts.
-	[[ -d ${ROOT}/etc/postfix ]] && {
-	if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
-		if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -nh inet_protocols)" ]];
-		then
-			ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
-			ewarn "That will keep the same behaviour as previous postfix versions."
-			ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
-		else
-			# delete inet_protocols setting. there is already one in /etc/postfix
-			sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
-		fi
-	fi
-	}
-}
-
-pkg_postinst() {
-	# 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
-
-	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 [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
-		elog "If you are using old style postfix instances by symlinking"
-		elog "startup scripts in ${ROOT}etc/init.d, please consider"
-		elog "upgrading your config for postmulti support. For more info:"
-		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
-		if ! use berkdb; then
-			ewarn "\nPostfix is installed without BerkeleyDB support."
-			ewarn "Please turn on berkdb USE flag for hash or btree table"
-			ewarn "lookup support.\n"
-		fi
-		ewarn "Postfix daemons now live under /usr/libexec/postfix"
-		ewarn "Please adjust your main.cf accordingly by running"
-		ewarn "etc-update/dispatch-conf or similar and accepting the new"
-		ewarn "daemon_directory setting."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.9.0.ebuild b/mail-mta/postfix/postfix-2.9.0.ebuild
deleted file mode 100644
index 68bc28e18204..000000000000
--- a/mail-mta/postfix/postfix-2.9.0.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0.ebuild,v 1.5 2012/05/21 09:07:22 eras Exp $
-
-EAPI=4
-
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam versionator
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.8.5"
-VDA_P="${PN}-vda-v10-${VDA_PV}"
-RC_VER="2.6"
-
-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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2 )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	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}
-	dovecot-sasl? ( net-mail/dovecot )
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	selinux? ( sec-policy/selinux-postfix )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nbsmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward"
-
-# vda patch is broken in 2.9
-REQUIRED_USE="ldap-bind? ( ldap sasl )
-	!vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	if use vda; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	if ! use berkdb; then
-		epatch "${FILESDIR}/${PN}_no-berkdb.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 sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		mylibs="${mylibs} -lsqlite3"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		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 berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
-		fi
-	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
-
-	# 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
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		html_directory="/usr/share/doc/${PF}/html" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| 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
-	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
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-}
-
-pkg_preinst() {
-	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
-	# check inet_protocols setting in main.cf and modify if necessary to prevent
-	# performance loss with useless DNS lookups and useless connection attempts.
-	[[ -d ${ROOT}/etc/postfix ]] && {
-	if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
-		if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -nh inet_protocols)" ]];
-		then
-			ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
-			ewarn "That will keep the same behaviour as previous postfix versions."
-			ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
-		else
-			# delete inet_protocols setting. there is already one in /etc/postfix
-			sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
-		fi
-	fi
-	}
-}
-
-pkg_postinst() {
-	# 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
-
-	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 [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
-		elog "If you are using old style postfix instances by symlinking"
-		elog "startup scripts in ${ROOT}etc/init.d, please consider"
-		elog "upgrading your config for postmulti support. For more info:"
-		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
-		if ! use berkdb; then
-			ewarn "\nPostfix is installed without BerkeleyDB support."
-			ewarn "Please turn on berkdb USE flag for hash or btree table"
-			ewarn "lookup support.\n"
-		fi
-		ewarn "Postfix daemons now live under /usr/libexec/postfix"
-		ewarn "Please adjust your main.cf accordingly by running"
-		ewarn "etc-update/dispatch-conf or similar and accepting the new"
-		ewarn "daemon_directory setting."
-	fi
-}