Version bump and remove old

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

6 files changed, 127 insertions, 634 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index bb7e6ed74f1d..e612923f45d5 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.416 2013/01/26 16:46:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.417 2013/02/09 10:12:40 eras Exp $
+
+*postfix-2.9.6 (09 Feb 2013)
+*postfix-2.10_pre20130204 (09 Feb 2013)
+
+  09 Feb 2013; Eray Aslan <eras@gentoo.org> +postfix-2.10_pre20130204.ebuild,
+  +postfix-2.9.6.ebuild, -postfix-2.10_pre20130113.ebuild,
+  -postfix-2.8.12.ebuild, -postfix-2.8.13.ebuild, -postfix-2.8.9.ebuild:
+  Version bump and remove old
 
   26 Jan 2013; Jeroen Roovers <jer@gentoo.org> postfix-2.9.5.ebuild:
   Stable for HPPA (bug #452590).
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 25d197ed53f1..38b6ae16bb8a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -6,27 +6,31 @@ AUX postfix.rc6.2.7 2217 SHA256 51f4bffa535d891f94d4a20ca2a4a42cc99189f3de78cee1
 AUX postfix_no-berkdb.patch 2729 SHA256 c21e9582346c913b3033ec6d3567d0b0bd3576ad64052fed48a5cf78d7ad92fc SHA512 9dac26ca60ed340428909b108b1d12c6bd98de959e2a92089f26cb3fda54d989ca9c1e657f03bff39e9c646a3ef4ef7d744baf1b39074956ef049da26333e790 WHIRLPOOL 5ed77ab7fc11dcd912950f477d9ce72a53886cdb4999c0791af948cc2f079937c77cbd36b1f362742249366d92ff31175ea028bd23af05839f1ef6916cab68d6
 AUX smtp.pass 141 SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9 SHA512 652b43be887109bf162647e9c0f08dc4283c9fa8795c11c14e88c60984e07593a4cff9e0e6c5dc92c484f547ae0be50a078599fc2fd67a66903b3ac7a8854b55 WHIRLPOOL f075d66d8ae7a13645066e572ab634721aada5aa828380afc5d45f26a6dd34165069bdc7b2edb89357330863f5aac40ee105bbef284392043589a2921381eb1f
 AUX smtp.sasl 147 SHA256 0ef6a2a7846498f56b9a8879f561a51c1e3a203ba90b2991d499afa69fd85629 SHA512 0beba4baecb4c4abdd3d2dd61e9e56d3abbc0035184992c98c57538b9244c6a07470974afe663775c3f3f10354e64457aa07e657dfd212e31a0920e3f04a6000 WHIRLPOOL 0c3eef040dd4486e007c31111b965725d3e9cf5a896881e0c927a715598dcc936dbf1034d6add2e6fb8ef4bd0114a7a49a8bba6f27b14aac30023457a1da12a3
-DIST postfix-2.10-20130113.tar.gz 3823921 SHA256 3fde4d4a0296c26a24b69d63fe376b4e01fd01d65ef36ab12c56ac57a450bca3 SHA512 b0f12c4f6af6ce05011e72188fa0e56d99b5b717b5b796a25c96e83c31d59f3a3cb42b010abb2ffcc5cdf3654cfafd7a47c065b5eb18548ba61978802a759897 WHIRLPOOL 500ce3cd2048f6fca20a7f8a41b85757a05d8e4ea1c267c911a275e069665313f74c99f33ebc00c1f6164873311e57589517a125f880f5859d7aa19ccc759541
-DIST postfix-2.8.12.tar.gz 3641269 SHA256 f46b0117cab52e862b12869810327e2bd248a60f209079a875818ee2653de087 SHA512 55141e75da43b13975f85af636dceeed7783440fb5f7b83642e5a146d8a06af3a847beff77fe0dd495c58c7caed492dbb2dc52f542f44b9388f2ded30e37acee WHIRLPOOL 1d3c454fc938546c74b666feb109229a71b4e55d72c6f3833a15a81ec8eb3b48e318df69611fe4c40ac970332a8fcdfe98fa235863ae44bdf952b2b74537100c
-DIST postfix-2.8.13.tar.gz 3641782 SHA256 66d278471b790eed663d6fe991403395e6340d45c92c8d0c445f7e9d77881502 SHA512 f316b27371d56fc1ae6c51966ff60ec5fab658b92053aaf45093f6f3fc421637e00d9c75bf4140e66ed3300ace2453b5449ec356008cd057a550cee21eb95262 WHIRLPOOL edede2fdace67aa9cefe8f9c044b86a4fc152c9108ec0b83471152bbcdec4b8255a627edcfb75962157e5cb75383d2569fa668234741f60f811cfa0a0890cecc
-DIST postfix-2.8.9.tar.gz 3648498 SHA256 6a63bafad1002abbab2d2592a40dc4b3e35defd97f2026d6ccc398e5d7ee9bf3 SHA512 74c3735e8e701f223c2730345fb3d2876e839579d431d21c9b5ae870eac06c17978e2071dd31e3e08f947d2a20281e644af011749407f9bd7afaf53ce278ca6a WHIRLPOOL 1809ece94697c7ae6a8e9dfaf3a89ddc7e1f2e049e51d02f6772f554b4af5040cc07538886ec32491cc40b57c17e03e32663ef3f811324f7a2a0cbe926ff7c8a
+DIST postfix-2.10-20130204.tar.gz 3831905 SHA256 8ba5025207ea6386a9d5f92295bba2c7d8df00cd747947c5caae65f436de4bc5 SHA512 4ef9dcedbd558243b5c1d53e039694422ca7c19866d722d93a33aba739cb691aa62d992ac3695bd44fa24d3bff30423ea47fb6a3f4bc5246a0255f9589bd1113 WHIRLPOOL 88005f0585eb5f6b42226c2d24eff1d2c041c733dcee6fb4483b1a13e09af718bc41b75a0669405b9cbf8929f93579f7b14bf639ac9533acb3d2e4a5d6ab2a91
 DIST postfix-2.9.4.tar.gz 3760718 SHA256 58343afcc727594cc1f9a3980562d8199aa55fc2cf2330da6b9ddfbf31502679 SHA512 f8932ae510805261b4a6c204bd4bba41d50e1833f87326b986ef174b51eb695cf0588d7d98850bb7b83ba56f1257406da072c423cc768f68d3723daf645b9490 WHIRLPOOL 7d7d619e0fa8375f1b653b9e1a0a2fa723929ab87db05445f2c2a73c213e91476d202806a439dd9792499e6a4d43c86f84133e90ffbd3bc9828ba1a925d8d11c
 DIST postfix-2.9.5.tar.gz 3761272 SHA256 590381cc0705a6d3fd2279760e79aff625adab6000cb895cf5336ae6a11ee6e4 SHA512 935f0eb653169d77d5902e1046d195d412a6c83271376b6450ddd647d250cc85d5ccd2427ad581f0d65bc57840db4c98f4976faedbe596573be590ea7433a1d4 WHIRLPOOL d57c29683ce389452c55d26ff8f2245f361a9cf6284ce6c2475fd2da1cdea7b9f9ca18376fef8c17f53e19cd29ce624dfd2b0eb5ff3983445ce4de8ea2fb736f
-DIST postfix-vda-v10-2.8.8.patch 56777 SHA256 40e32a1c159fe3d12836f81e4871e4a628a87623b80402e90f7465eb39f89a86
-DIST postfix-vda-v10-2.8.9.patch 56777 SHA256 e671f7349173349d66f1b091359761ed5a5d517f8a58c86a42ff461997d2cd7e
+DIST postfix-2.9.6.tar.gz 3767309 SHA256 790542a238f64d2620c26e787c98b07fb6e75a7620ce0584a7932b089dc5367c SHA512 ed53d835814368de9c6de7fe6d24cea36890273acbe62bbbb2c0b4a730765cf5662e8886d6095d8915d1774004c6b5cb278f640c81c63b564a8bfa3bee736912 WHIRLPOOL 24bbacada140e413ca628d9ad8b5eb55a0e3258dc9cef4bf407ebd8b8aac670379a785e60acd14c08f7a94f5058de899014e273634cd52a15a4c8003375a687d
 DIST postfix-vda-v11-2.9.1.patch 55009 SHA256 611283a932577944bcdde36e5fe1a80ca750a0a66eb5f3490666e2adafd2bf84 SHA512 ce34b533c2f50cf714d8bd51791c3e30ba91f49861e3c1dcfb08d21d2d38be970b3e3040c7e224142d085c7b11b6b14bfa230844e21daa2eb0bf59641dcc29b9 WHIRLPOOL 0668cafec5678d09504220e31ce60344fc0cb46cfec449db2aade89ee09c598484012c5ef0536a0dfea24df51c6bc86d1a9e491f136312afdab90725e5efe86e
-EBUILD postfix-2.10_pre20130113.ebuild 10458 SHA256 f6ed7803c71913bbcb357945d17dbfcdd328fcf6f967cb6919ce43e9da42197c SHA512 c8999d2331dd24b4de4b3e8e6665c2a3a420719a68b989ee7a31351171b1d2382a6fbe47913dd3458c489c209145f4e7b1e0ab7cf99db14ef48bb94d6cc78d8e WHIRLPOOL 0dd830a908d0999dd79fcc3c84cae594011d1fdf4f851d938576ece2c838fd133a8c4147767dcdfe9f6d2115d6728e922bfd6ec063df0d1c5431ecdeb72a35b0
-EBUILD postfix-2.8.12.ebuild 8413 SHA256 aac6bec6efd85068603a15aa986ceb6a81e88a5796e66d20558cd9029ceba584 SHA512 62a3f3a126cb2c2e7760b447182d6eab4bed72eba2a37e2a2d3b0d0610baf0f9dd16cb59299d97b23427b8978563ce8f26ad8793a8fc7458fe1d4e3348beac2d WHIRLPOOL 5648e4f491b994c566a21804037abcfa37ac7eb107a427156d8c421d2b4bceecd69fdee0f88a34aac791876a5d7fe27d7a986f79c857684e2496c03ad9c114d9
-EBUILD postfix-2.8.13.ebuild 8413 SHA256 149946b8663c424762259df3b5834ecea37929c01b2b1d0b9b4009b03071e067 SHA512 d119fdf98c020cb9c0c7f0ffa17b944e753572ca7c66956717643a5ca51b51944e03dcf523eaaded9601d86b7c4c7abe81a6179cc689abacc4d0b50c5e124deb WHIRLPOOL 1794b42bc034d1486988d69b001b3818ae19ecf7a2c743a88295906ecdb35969fb9d33dfe1288be50357d4cfa774568fd217ca82cc094602e4ddb5a78d50487e
-EBUILD postfix-2.8.9.ebuild 8403 SHA256 4edc51588230aeee33e810e22ddbb8ffc5c3da757e3515cb1a81961a7bf1d0c4 SHA512 a020cf415c21b1353d76a8d07fa7324535ad170aa754db8f6ff021df68e04504d8fbf5e69364eadbb8898d4cdc08652f474f5c51c92e080f2cbf23721b1acbf8 WHIRLPOOL 4190c18cf6d2ade78717b0f13abf450467a7e2872c12f44e07ccbd5421878f1b36ba7269bddd5d0962e2d2e73fb607268b278ed1a32382fbd197e5289ad046f5
+EBUILD postfix-2.10_pre20130204.ebuild 10458 SHA256 9a25c000e40152e577a4a6ffad3ee31591beb7411bf6427362b6507a1d119110 SHA512 a4bb598d78750d53b7f339f32b826fe2601206ac47761b59dcaf23fb6e7989f8fa65e4390ca606d55f150c13187dd74d7fe28d07fcdecc19e0a051b4e5e5a562 WHIRLPOOL e800a1b1dc0a3b5b9fde90bfb954a6564c5118d8ac2ef3a257a5ebac3f7127b2ccd8bb4e95cf1dced0c05b6cc14ca5d238624494afbb62f7eda5d507fde7bc41
 EBUILD postfix-2.9.4.ebuild 9607 SHA256 fc5adc3752832a6eb890cd09f455d19cf5f46be90b9506dc0a62941a8a2bd3c2 SHA512 2113abad4c72af6a87587abfcf5e45c757d1ce28e92011ecefdfa7a1803fb14e4b448086de11d13deb7f075448003664b6e7576de1cc20ad733ae04b739fc814 WHIRLPOOL 0fe266bc1597991606d2a3c71834ab62b9abdce161ed5a9bd0f155c6ea25e5ec0c0ed3d46d5667efde42569c514eb12875646b0d7768370dd3bb606b9db12632
 EBUILD postfix-2.9.5.ebuild 9608 SHA256 13824aac4df3396a46290706144fb64dd06a27e2482b7c308786a25d7fc836b0 SHA512 9349dd758a9178eb4d39a4b960b6944084e37534a7ed569ce2da3969d8d43f529351b6432c271bca01e85bcce906f4d2b5da108015a76df82c3a2262d1fed485 WHIRLPOOL f26ec58f68c5156216b064970df584757d04fa88204abed0b0d88a799d4f25df6463f9bb18654ec3c67bca74d05d12a0253041220f94d8efef993191259ba1fb
-MISC ChangeLog 90320 SHA256 8a75982c1539ddc11ee1d243d421f6b88ea5a7241b4009d3e82fdf575bbd3994 SHA512 047515b0434d43285051c1ee3cedc23e8db27e7e25e8e73ccc75a8ec9c35011770696487646b76a413bb3276f720d3841b6a0b56a659bd074db9abbc194e08eb WHIRLPOOL c3993fea8477b8a1646bca5c774a06ef024d939d0b91a523f2a2f1723616ea5f55fa093d978c9a944530835f7e57dc14d5027b1f6e49584003e4dcd90df6658d
+EBUILD postfix-2.9.6.ebuild 9617 SHA256 bfa4d311ce0016c5cb3b2566711ebd89aad0c6556bf24c2655e78d380ceaafd6 SHA512 2512a3984cc1052e218903a30d47660df7b3eb3ac83c8d8e67947da48f2fe6aacc56f189ff45eb02f41a73f8e61bbb7e0354cc5ede8fb3a7e5c3b8e7257179fc WHIRLPOOL e892ba7cca6f5e6c2607e065b1b959f49151f09d8793f7195aaf97e02427f96684ef66b091e217e74bbea28db9c900630ba112d6021cf731862ec2a4c7b1526d
+MISC ChangeLog 90632 SHA256 5a0b7ddcc42693ccfd9e5e823230d3248810308c54d103d086cd466bc23afef9 SHA512 6065e8ff9bf39e82722725fdea6754c4883391bcd36383caffd1b898e44635cafd675c26a9ca942cd84342dc38e48818c61b89b24d6de329c3ee5664da558c8c WHIRLPOOL f4f527502db6bcbc808c7ef244b9a0a8e6fcb6718d797f6e136fc52f982162f52be3c01b3285c592759a6a8b9fef10082f9a10389fcafed36d7befe88994729b
 MISC metadata.xml 610 SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88 SHA512 fd446f288b11070e2d6b5dad3ec259a889508c3c7f4755ea2ceda18500844e065ddc2bbce5f4108b30ebacff76443ea8a23805c21d39c2bf72210f801adcfe06 WHIRLPOOL 815ae4ddbaca96871454d44adbe3bec4a081d857c61b07cd0e382ce0d44503421a4ad156da6009cc91f24855b7c1d8adfe3fbd48c82833f9d82c1afaf798072e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEECFgACgkQVWmRsqeSphPfNQCdHZRHBpTT55hVcVgqnS3cVzJB
-hGgAn1tOEL44brKeGkyLBez7zAS9175Y
-=X4tv
+iQIcBAEBCAAGBQJRFiEiAAoJEHfx8XVYajsffZEQALVx2RcV5A99qcFPB5deT1B5
+9DVqAyAnFlJzjuM9tNImfGLWo2ZhXBZnDov3l0oIte5Hquc+GBQYWl22kYyxS1y4
+MDCt0OWYnStEXwXX1V79Y0/uiWgwI7nudSckU7poSssDkZ+2TVvBiX3Svkupygem
+JxQbS5kEaAOJ0iS7jr11Hn28P5JROS71ZETtMC6QS87nFGK3cgrDk7dB5E8EcZ38
+qWWyzaX/Ycx1XWjFF4rEKdELoW038zCNl52wlPaC2CozUn4/yIxPKC8V3UcbFnRn
+KUSu1SKZ/3WNNPcFMft84LfwOW3Sy6h/w2IuXgMi6efcFhbOQuMiGr3SHyq4oibC
+nMR2M9MAMi2cVS61L3nfH5ptqpDIGXlFh4eW8jcizjxIcCjMXJH7zYO1aXUnFN7P
+6bzU+Kv7Nl2XykJMW0/+MUFE28QQV0Iq1VcF1AxKHmLT5VCMkw1mkmzCw59itskJ
+0LlnafChwSF6IXEpCNnnnR3Rkx5W5qw7/Ht0F1BmZhK8b+8qqdbNW30jaSpyHwMz
+DV4A6nrKSEvPb75L87Xi9JGxd4TopPeSmckn1Pee2ZnrW6jJAwIKClteX4kMXRSO
+oD5S8ro8H7qKx3/+ykbUW8SzeTKvNxmmpKj+8i5NRrtDWLFjaVK8NmCsP46Fy2oq
+UZ8QuGCMIeI7YaNiA5j4
+=sRDz
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10_pre20130113.ebuild b/mail-mta/postfix/postfix-2.10_pre20130204.ebuild
index 9851b6474b8a..24504f4ce055 100644
--- a/mail-mta/postfix/postfix-2.10_pre20130113.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20130204.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20130113.ebuild,v 1.1 2013/01/16 18:38:39 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20130204.ebuild,v 1.1 2013/02/09 10:12:40 eras Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
 
 MY_PV="${PV/_pre/-}"
diff --git a/mail-mta/postfix/postfix-2.8.13.ebuild b/mail-mta/postfix/postfix-2.8.13.ebuild
deleted file mode 100644
index 5ccda181872a..000000000000
--- a/mail-mta/postfix/postfix-2.8.13.ebuild
+++ /dev/null
@@ -1,278 +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.8.13.ebuild,v 1.1 2012/12/13 07:05:49 eras Exp $
-
-EAPI=4
-
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.8.9"
-VDA_P="${PN}-vda-v10-${VDA_PV}"
-RC_VER="2.5"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cdb doc dovecot-sasl hardened ipv6 ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	dev-lang/perl
-	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 )
-	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/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"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-group_user_check() {
-	einfo "Checking for postfix group ..."
-	enewgroup postfix 207
-	einfo "Checking for postdrop group ..."
-	enewgroup postdrop 208
-	einfo "Checking for postfix user ..."
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
-}
-
-src_prepare() {
-	if use vda ; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		mylibs="${mylibs} $(mysql_config --libs)"
-	fi
-
-	if use postgres ; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
-	fi
-
-	if use 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
-		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 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_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_COMMAND_DIR=\\\"/usr/sbin\\\""
-	mycc="${mycc} -DDEF_SENDMAIL_PATH=\\\"/usr/sbin/sendmail\\\""
-	mycc="${mycc} -DDEF_NEWALIS_PATH=\\\"/usr/bin/newaliases\\\""
-	mycc="${mycc} -DDEF_MAILQ_PATH=\\\"/usr/bin/mailq\\\""
-	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\\\""
-	mycc="${mycc} -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\""
-	mycc="${mycc} -DDEF_DATA_DIR=\\\"/var/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MAIL_OWNER=\\\"postfix\\\""
-	mycc="${mycc} -DDEF_SGID_GROUP=\\\"postdrop\\\""
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened ; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-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" \
-		daemon_directory="/usr/$(get_libdir)/postfix" \
-		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
-	# 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"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-}
-
-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
-
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-}
diff --git a/mail-mta/postfix/postfix-2.8.9.ebuild b/mail-mta/postfix/postfix-2.8.9.ebuild
deleted file mode 100644
index dc2b74a9e53f..000000000000
--- a/mail-mta/postfix/postfix-2.8.9.ebuild
+++ /dev/null
@@ -1,278 +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.8.9.ebuild,v 1.10 2012/11/06 11:19:44 eras Exp $
-
-EAPI=4
-
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.8.8"
-VDA_P="${PN}-vda-v10-${VDA_PV}"
-RC_VER="2.5"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="cdb doc dovecot-sasl hardened ipv6 ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	dev-lang/perl
-	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 )
-	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/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"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-group_user_check() {
-	einfo "Checking for postfix group ..."
-	enewgroup postfix 207
-	einfo "Checking for postdrop group ..."
-	enewgroup postdrop 208
-	einfo "Checking for postfix user ..."
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
-}
-
-src_prepare() {
-	if use vda ; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		mylibs="${mylibs} $(mysql_config --libs)"
-	fi
-
-	if use postgres ; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
-	fi
-
-	if use 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
-		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 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_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_COMMAND_DIR=\\\"/usr/sbin\\\""
-	mycc="${mycc} -DDEF_SENDMAIL_PATH=\\\"/usr/sbin/sendmail\\\""
-	mycc="${mycc} -DDEF_NEWALIS_PATH=\\\"/usr/bin/newaliases\\\""
-	mycc="${mycc} -DDEF_MAILQ_PATH=\\\"/usr/bin/mailq\\\""
-	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\\\""
-	mycc="${mycc} -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\""
-	mycc="${mycc} -DDEF_DATA_DIR=\\\"/var/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MAIL_OWNER=\\\"postfix\\\""
-	mycc="${mycc} -DDEF_SGID_GROUP=\\\"postdrop\\\""
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened ; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-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" \
-		daemon_directory="/usr/$(get_libdir)/postfix" \
-		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
-	# 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"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-}
-
-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
-
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-}
diff --git a/mail-mta/postfix/postfix-2.8.12.ebuild b/mail-mta/postfix/postfix-2.9.6.ebuild
index f42a692bb158..190e9dcdb29c 100644
--- a/mail-mta/postfix/postfix-2.8.12.ebuild
+++ b/mail-mta/postfix/postfix-2.9.6.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.8.12.ebuild,v 1.2 2012/11/06 11:19:44 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.6.ebuild,v 1.1 2013/02/09 10:12:40 eras Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user 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.9"
-VDA_P="${PN}-vda-v10-${VDA_PV}"
-RC_VER="2.5"
+VDA_PV="2.9.1"
+VDA_P="${PN}-vda-v11-${VDA_PV}"
+RC_VER="2.7"
 
 DESCRIPTION="A fast and secure drop-in replacement for sendmail."
 HOMEPAGE="http://www.postfix.org/"
@@ -20,12 +20,12 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cdb doc dovecot-sasl hardened ipv6 ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
+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] )
@@ -38,6 +38,7 @@ DEPEND=">=sys-libs/db-3.2
 
 RDEPEND="${DEPEND}
 	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
 	net-mail/mailbase
 	selinux? ( sec-policy/selinux-postfix )
 	!mail-mta/courier
@@ -57,25 +58,22 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
 
 S="${WORKDIR}/${MY_SRC}"
 
-group_user_check() {
-	einfo "Checking for postfix group ..."
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
 	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
+	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"
 
@@ -89,54 +87,67 @@ src_configure() {
 
 	use pam && mylibs="${mylibs} -lpam"
 
-	if use ldap ; then
+	if use ldap; then
 		mycc="${mycc} -DHAS_LDAP"
 		mylibs="${mylibs} -lldap -llber"
 	fi
 
-	if use mysql ; then
+	if use mysql; then
 		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
 		mylibs="${mylibs} $(mysql_config --libs)"
 	fi
 
-	if use postgres ; then
+	if use postgres; then
 		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
 		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
 	fi
 
-	if use sqlite ; then
+	if use sqlite; then
 		mycc="${mycc} -DHAS_SQLITE"
 		mylibs="${mylibs} -lsqlite3"
 	fi
 
-	if use ssl ; then
+	if use ssl; then
 		mycc="${mycc} -DUSE_TLS"
 		mylibs="${mylibs} -lssl -lcrypto"
 	fi
 
-	if use sasl ; then
-		if use dovecot-sasl ; then
+	# 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
+		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
+	elif use dovecot-sasl; then
 		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
 	fi
 
-	if ! use nis ; then
+	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
+	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"
@@ -148,50 +159,42 @@ src_configure() {
 				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_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_COMMAND_DIR=\\\"/usr/sbin\\\""
-	mycc="${mycc} -DDEF_SENDMAIL_PATH=\\\"/usr/sbin/sendmail\\\""
-	mycc="${mycc} -DDEF_NEWALIS_PATH=\\\"/usr/bin/newaliases\\\""
-	mycc="${mycc} -DDEF_MAILQ_PATH=\\\"/usr/bin/mailq\\\""
-	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\\\""
-	mycc="${mycc} -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\""
-	mycc="${mycc} -DDEF_DATA_DIR=\\\"/var/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MAIL_OWNER=\\\"postfix\\\""
-	mycc="${mycc} -DDEF_SGID_GROUP=\\\"postdrop\\\""
-
 	# 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
+	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
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
 	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
 }
 
 src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
 	/bin/sh postfix-install \
 		-non-interactive \
 		install_root="${D}" \
 		config_directory="/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" \
-		daemon_directory="/usr/$(get_libdir)/postfix" \
 		mailq_path="/usr/bin/mailq" \
 		newaliases_path="/usr/bin/newaliases" \
 		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
 		|| die "postfix-install failed"
 
 	# Fix spool removal on upgrade
@@ -215,14 +218,13 @@ src_install () {
 	# 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}
+	fowners -R postfix:postfix /var/lib/postfix
 	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
+	if use mbox; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	else
 		mypostconf="home_mailbox=.maildir/"
@@ -235,27 +237,49 @@ src_install () {
 	fperms 600 /etc/postfix/saslpass
 
 	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# bug #359913
+	# 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"
 
 	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
 	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
 
 	pamd_mimic_system smtp auth account
 
-	if use sasl ; then
+	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 \
@@ -273,6 +297,19 @@ pkg_postinst() {
 		ewarn
 	fi
 
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
+	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
 }