Version bump

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

5 files changed, 670 insertions, 18 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index fd28a0196ca3..88d732c81453 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.535 2014/10/13 10:10:44 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.536 2014/10/14 10:36:44 eras Exp $
+
+*postfix-2.12_pre20141013 (14 Oct 2014)
+*postfix-2.10.4 (14 Oct 2014)
+*postfix-2.11.2 (14 Oct 2014)
+
+  14 Oct 2014; Eray Aslan <eras@gentoo.org> +postfix-2.10.4.ebuild,
+  +postfix-2.11.2.ebuild, +postfix-2.12_pre20141013.ebuild,
+  -postfix-2.12_pre20141011.ebuild:
+  Version bump
 
 *postfix-2.12_pre20141011 (13 Oct 2014)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 41c77f679f07..66570480893a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,31 +8,35 @@ AUX smtp.pass 141 SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bf
 AUX smtp.sasl 147 SHA256 0ef6a2a7846498f56b9a8879f561a51c1e3a203ba90b2991d499afa69fd85629 SHA512 0beba4baecb4c4abdd3d2dd61e9e56d3abbc0035184992c98c57538b9244c6a07470974afe663775c3f3f10354e64457aa07e657dfd212e31a0920e3f04a6000 WHIRLPOOL 0c3eef040dd4486e007c31111b965725d3e9cf5a896881e0c927a715598dcc936dbf1034d6add2e6fb8ef4bd0114a7a49a8bba6f27b14aac30023457a1da12a3
 DIST postfix-2.10.2.tar.gz 3828326 SHA256 f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4 SHA512 fa6c123da040a8e332c0bf2430f5b098523c2eff42a6cf4bfe6618b82d59be8e5a7f5c85b09ab8fd0312058b2135b174e00890423e4d3f8f732c3dc3c91f01c3 WHIRLPOOL 4e1e453ecd653058faf7420d6bfb6ac6a6c343f03f9c1a4213c403a7164d99f659a0b9ba744b803c3d94cfaf3216d3505f44d22069421f6cc4a4651b6be1f316
 DIST postfix-2.10.3.tar.gz 3828808 SHA256 7815d8ad88af76e0962f18bf1e80b1aa5a0d096a00dac1d313fbab3e824b3f5b SHA512 f21ae36f9fa7fd8ad1727f5595e0f65fe49a3a5937269ad68b0a96e666e61d49cf6c72303d84c81ae7fc902146121443f9e27b876b447594557a756f239937d1 WHIRLPOOL b7a7c6f31a78a9ce92ca072c11e1ecc44c72cd5c37fb2067f91a4bcb2a92556e60f41ba23e065c31acd58a97f5497d4f62af01edd3003de5e6c6879a304a4a9f
+DIST postfix-2.10.4.tar.gz 3829427 SHA256 e5233438420fbd6b49a64f007bd8da7dd046777436fb82dd50eadcd8901e7201 SHA512 619b6e2cfa0bd50148fe7ad7df09c13b9e5e8e43fe9331ce03010911f02b9daac16df863cc3ce604375f7e3ae076bf316fed7ffb6f424f873c869d3797d5c81f WHIRLPOOL c7b23975484383be1001f5da96a98614ac96f50c9083fff0986c8303933f51c673c1cd389dbaaa92c17b0f3c087f7979ef9d2a03cfa03c1d5f6c771554269cad
 DIST postfix-2.11.1.tar.gz 4035026 SHA256 487f98a73b95a5799409caf21ec065efea91c1dcdfb84c038a0e3a265d6489e2 SHA512 988659ed7f256fdc831c6a211c33aede922d5baf32da7129afe0ec2fe5011ac95dacb21e59c92f658323b6ea773ebf2bcd66a796d9271c1e7b949d5d9b9ee977 WHIRLPOOL 902eff1304b9d0d52a759f0a0804cd5e34d44b8f1acde26f60db6ddc69d84ff93c70c7b27b9c39318b124582b13d61685fc46c2513044fd4c7511370a33efde7
-DIST postfix-2.12-20141011.tar.gz 4183215 SHA256 4680bbefd9bd1fa950b6d257025f082fd35d22a7d2d162266da51677f7783bca SHA512 95507579f4b20229d0e79eeab3e23494b7fc25ed98367eb00201f4a4e74b555c5d49d1c9bd4fcab18aee335a298a7792b4a6a71b9ac462bc9e3c34287192b360 WHIRLPOOL 235d6355d6f797978ddcdb9604f4106db92e5df6e1c694c946569fb0268f5980811072d93f3647be1c8697da14df9dcd5432ea5b2eb6d524e4c278a941bd5b48
+DIST postfix-2.11.2.tar.gz 4039038 SHA256 aa6eba4842457c88c48fb65faeb4fc6496cb3e9ceb9e0ddcb3c13b501821a258 SHA512 065688e2d95616dec5111a46d0e2a564d8617a5001156da79833b56056dccad411b5205ab4c304ffa49519dd810539543978f0babd7daba0e5618d8e448c9fcb WHIRLPOOL d15ed1456b4905ced04afaeee13150aff36c971fd1cdc4e19be18740249c188e071d353004728ca5474727e7eccc35eb61cbbf07ad8a1e5fd15261d31a134c92
+DIST postfix-2.12-20141013.tar.gz 4185611 SHA256 ae8166b98ca33489c02c401dbbffaf5b6de55c86f862f891ff1dacf0a0837474 SHA512 a7441756c748a7b94e21c494c30195bab5b73985970d330bf86049f3fae8ca5473f5adf982a60ea02242d3014fd65908e7d5cee837de4d5d5a52595b0dafd5fb WHIRLPOOL 55ff0325dd9f57842314ac555c001a49b2a482f9c7f4f2994a361330ae0cc50e73494b73501227e67c3d01a63f5438863c5f761d93278288a75b6da67b8172e0
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
 EBUILD postfix-2.10.2.ebuild 9627 SHA256 b5a63215a67c7a0e6a7bd5e362fe5d3020dcf422cbf84fcfbac1caa1162115ae SHA512 377677e5db222c98454a1e18cc93f79638272069cad39d49c6fb5a5a58b84c993f2212e744ea8f0bec413bf40556ad4ba2a446703ef4dd37ea632c29b1812786 WHIRLPOOL 061857c625d90d6ae0f84deecd4203790dbc785d3643504f6f08cbf2da380e7faf8aadc63ede59bde73f297c19a337d32759f184e6fa3ad79d86f449c53ce514
 EBUILD postfix-2.10.3.ebuild 9626 SHA256 fa300b3b8fa952620ff44815c23c5145ad9dfe54e7ccf3a31ea66039baa50d24 SHA512 16c41698d703853dc8536b11ba84d8f7c7eb1e7fe402dd8c7c45be2f49b3bccf29f3ddbc5be00610472eb2c3eafe271709a751e63f191ce187329cd2932b8c75 WHIRLPOOL 84543aed5fda5b3f881ff7ec44e70b0a6956f68fe1b0358f2be911ca49a073f0d6c88ae430655a66a47aabff01cfacc26321461618a4018afa227e77d584e26a
+EBUILD postfix-2.10.4.ebuild 9678 SHA256 5c152910b010f03526315b39cc2f1e686f7a0055160068d41cf40b6e600461cf SHA512 9c00e16b0221a38d45f4e56b4152a596f82031094b2580ef62362fd6688765dcdee44a5c8bab49765119458ca056dcf30471e977bb9012c451601481cbd63b78 WHIRLPOOL 6252e38aed5aed9b0eedc92b74b9a76b0ad31bfc0a3093db68087bf03c12aaf8b3be58b7f157c5928a900cdb466574fecbd3c599899e5838a868dea8b61a4bcb
 EBUILD postfix-2.11.1-r1.ebuild 9766 SHA256 ee9793e0bac46ab1a53497d5ce4d33e7416720bfcd7612006f2d414ecc3d6a51 SHA512 fc6f35fc0b8f1bdb7a74517ce8b61f9035d358327db03a33cab120e5c3e5a867eea0591ce0e6bba83287495898324ed251ce08a0936d2cde515a969e5821e1c0 WHIRLPOOL 2d5729ffd59d6ae414057679104885e86e63452e516c22aae3ae73f1cffa2f4cab337f49fac6254d1287bc10448b0f2875205b7c3a39b323b0ba1891708ab167
 EBUILD postfix-2.11.1.ebuild 9712 SHA256 62db63ee2c6493f4019077606710d6c4eb5e7444a3be53d8d8691f6161532fe4 SHA512 9f0c4062466189964161ccd19a3cc7442aaef9a01b9c27652c37bf5ce375c78b314ff33ec61eace30aa4b463f93b34b81b61d850c766c20d2f17e68c8b3dc3c6 WHIRLPOOL df19f8cc6aabbcadc8cc750c8b3f33858d0784086d4a62cf50cc41cb19d7128d458b99953195a3fc671cc7bc3fc5ec6725165d7560d4e7385afa530751b0b883
-EBUILD postfix-2.12_pre20141011.ebuild 9672 SHA256 cffae96efb526861f1b57f16bc82d694087936a62b675b91198a6422b33221c2 SHA512 5d4e9b844940884e48e0a0561ecd2ab6a9f57a5ffec8b99c18d5961f795ae66e07230573b8b14d8e4d6e965d9c934f876118cfd26c602a73ee2e0b2c31e8be8d WHIRLPOOL 07f2243d4b3f4cb9a23689df3cb567a9d15c2baadf749df7c7350a114ece7f1b2ae5a7048ad6cd0f275f3098ff369feb1e3da6421a47c442bb738049203dead2
-MISC ChangeLog 7910 SHA256 acee08a517cf869535a4162e5d455f39b2843fc847ae29f6ad581199159a804c SHA512 fceff14da25896c7e6c2a5da8658421219a1f8b413eca11b1ed6d56310db5be957e59a857c7f1212976c3025b781e27c376388320e15f507872e543959b5418d WHIRLPOOL 48e08cba183f44957702c95450b35c895bbc7d8c586fc0051b24dc717758e75d44cd3fd3bddbe709200fb1b302c291d1cd2cc33c10ec24ca6fb937a58cc01c09
+EBUILD postfix-2.11.2.ebuild 9767 SHA256 d4a5109a51575f51559dd92b147ee27c185af4054ee28fac9c6fb6c3d056fc6e SHA512 a19df13946f3aa1d440074dfe695d5826f39d95bc7280445aef7af0571696b62f7e5009b8be55e6d47af11bb6fc79052b1a6abe2be57fcec90142404c68f284b WHIRLPOOL add9e8b874aa8b741523b8440e57bf7145bd842f595537bfab4affd3ab25c64aaf6e63736fe0c6ce1865d619c0c78f2ec8721d3a9910673fb50b898981d327eb
+EBUILD postfix-2.12_pre20141013.ebuild 9672 SHA256 e6ab06f8b6ca696c6012b78f5f06c76e9160fedf3f2c162cc986fcf7e80c7cdd SHA512 82588a647b0a5faceda324e48c2db02635fff93567b7d045b5e3f4084827cdf8a5039f8dfc74467b47abdd4b0c2d4447da5f486f95cd622881ea43708ba9e517 WHIRLPOOL b18b1a7efd41313f85b956f579c42f5129b3d9c6f9313bdc46a070438cc0b3ee055c9411735f3770ff79e32019be873bb2b37bc5277acec10d5675f2facb5e0f
+MISC ChangeLog 8191 SHA256 ef92ccb5b107443a1a41b07dc434eaf01c434d7649af98e10b678cf1718a6272 SHA512 9fa681137c7a25d365897234dac8d4e6a9522713afa221a46e0c7ae1d54c82e5e990ac9c2dd1361f43d68ddb8623cc3ecaf4ed020e2d2f7c45144e1dafba0887 WHIRLPOOL 22e47fc696aa12b8dd9d4c21250b422753becb4096dfc223e18043ccf2d92fa4da30256fc6a1aecad42d92bf7e718e01c43f1ff54b8891e0f7b78c4887e30102
 MISC ChangeLog-2013 100301 SHA256 439e93c3f6ea08471888157d2347da51181aa9031d4bfdeef2197a6b26680246 SHA512 c678433163e86def50d59e47d7a1a0e8f4c4af860f80932255a7c95544e1f5b55a70b68905b02a417b2332bcf3aaa59281814d8504d70085f0874a23faa2bf02 WHIRLPOOL 15a12897a576cf98d856c551157b72b47aa45fd61d05c6ed55033ce37ce247045c6bcc8143b7ccce4666900d85e0a04087c977a311e31c20f554a991bec74fbc
 MISC metadata.xml 754 SHA256 52b30e7748a792a156ad44b46878b67cb1a359c882e03f76b1d7b3b0bf111129 SHA512 bef165b527524efdcabce97c2fc0735f784dfc014ae810294e6a19b534edc6a01e14e532d730c8b8c2b76c99dafac672074317ec6dc23942285ad27895fd7220 WHIRLPOOL 702d14bd15db16217c664a39534bd1b19774d5f6c5a4a2a43e6595f400c06332c56849fd0d722c7982f5c40398b4bb0b3398b96c6f370a57d99d323d0e84ab51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUO6U1AAoJEHfx8XVYajsfNfYQAIxvDFlKMIXWB6PnLJpZZhON
-a/h0mgDuOxgxyqAIC85NFTGUuQC1PZaf5Yuznf/fxtcOJL0EEZTwFX2D7yKLu/5N
-BRizCRj33W6FNdn7rfnjusneb8RXp4fhz2TI0IQHXT4NZOPFZC+Wz6tVj/cugjVC
-G+gpjjPUau/Edu53b7XmQ1QfuFvfGCq1po1zNnruIOQrYwwJdcUwzpUn21fI/iWy
-UxdN+qtdW5zWHuEBlAyfUGdiOtoaQfN9igHvfDyJ3BUolN3wEHWKYeqM98gFRNTh
-L8adTvRB75QJSba5lMglWCaJX/WZosC0i8+Y6OrlpaHNFgLMJch033vn8DkyoGvK
-soSvOPuTS47yQ1mWklkHCfGeZLXL+I6NGS2brhzm/9iZADA562VXR7hc/sDmymZe
-RcCa1DJcJ8vKIq9/0yNWBAIiDCG8GYJr0ijI4716SbIf+EVxrNz89e8GK5gM67B4
-4YMBpafDVXGMdLSy2cQoToS2ACWxnXadmIn/4Ar4pkxOr0cAwUOXcEwudAnM0osp
-B4Ul+mYZu6PTlA1hEt8MyLd5whn36HLD+swB+zs5HADMQx2z4wXIy4NRE1I+Q2Ye
-7IrEaxPTpznOOoKGLZdq/PMrxokNcsMC7YxDrMlDdeel9s6rnuh4hbSnEXPGmHr4
-tgt75RVFlNg2O87J8YQU
-=PnGp
+iQIcBAEBCAAGBQJUPPzPAAoJEHfx8XVYajsfuiAP/0iI3EeJYoIKg834L1K1K9rM
+6vjR3koQyLcgAOeYfg2HL7HwF0Jt9mBOouDGn7TGtPzqGK8rZLJEscNTadcHaH81
+PCuXotiiNDHXGDlCzZql/OLqVOg5FutcyEeIqYfMIEjQE1uUWN6s3g3jbJHaBc8I
+2z65wmf55+7Ct4WMMrbLfvUoqqTu0fL6A6unoZRkQfAT46kZ/LZ3V3TQd+2+zGyy
+2mzPuV3Gh6z3YVeNb3TEyCLszdXBY8cVR8cFeqHvp+b28z+z1livIE9zOrNVd0aQ
+s/vOBWV+sLK4JAhH9owzcU0nxdH2xnf5Jemr/Lri+LneMEzQmVv2DFK6t4/IRueb
+gvuNmlwbAha/8G2seqOfR5fZuAg4Ek9F4cY5sKKu4+BkdTVxsUQjqD2bLrtdA8wk
+ooI4DhiAvUmPBRV6z70cIxFkyEvVuWrnjyTuwDj8jKlIg6cwIr4jMSd4kImqZm6t
+tbddSnXU8NLVYTywtGw/Cs/fdhRE7GKsKGuCSVVfL1KitnQ+1M9uQjczZe6S8hTo
+4IyIYx1f4AS9Ulh4CScMjADzPc1YiXcu6LeHOutX0fg7oahmj1wMRsTRX0HOSLXV
+FQGR/gDmWoFulWr/qO2oNOvYnuRnj7gxnbDsAIJkjpNwAU5riiMLo9aqFjevn/53
+73nyeIERzbd3udKNMGUI
+=zVcT
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10.4.ebuild b/mail-mta/postfix/postfix-2.10.4.ebuild
new file mode 100644
index 000000000000..79d2c34bb56c
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.10.4.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10.4.ebuild,v 1.1 2014/10/14 10:36:44 eras Exp $
+
+EAPI=5
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator systemd
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+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 ~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=">=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/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<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}"
+
+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() {
+	epatch "${FILESDIR}/${PN}-2.11.1-db6.patch"
+	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
+
+	# 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
+
+	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" \
+		command_directory="/usr/sbin" \
+		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
+	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 -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
+		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"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	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
+		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}
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	# Postfix 2.9.
+	# 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 -n 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 if you need hash or"
+			ewarn "btree table lookups.\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.11.2.ebuild b/mail-mta/postfix/postfix-2.11.2.ebuild
new file mode 100644
index 000000000000..aee4efefb243
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.11.2.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11.2.ebuild,v 1.1 2014/10/14 10:36:44 eras Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb 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] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	selinux? ( sec-policy/selinux-postfix )
+	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
+	!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/opensmtpd
+	!<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}"
+
+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() {
+	epatch "${FILESDIR}/${PN}-2.11.1-db6.patch"
+	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"
+
+	epatch_user
+}
+
+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 lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		mylibs="${mylibs} -llmdb"
+	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
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		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
+
+	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" \
+		command_directory="/usr/sbin" \
+		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
+	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 and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.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 -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
+		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"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	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
+		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}
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	# Postfix 2.9.
+	# 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 -n 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 if you need hash or"
+			ewarn "btree table lookups.\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.12_pre20141011.ebuild b/mail-mta/postfix/postfix-2.12_pre20141013.ebuild
index 871b6776c6ce..a0d40c41a0f3 100644
--- a/mail-mta/postfix/postfix-2.12_pre20141011.ebuild
+++ b/mail-mta/postfix/postfix-2.12_pre20141013.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20141011.ebuild,v 1.1 2014/10/13 10:10:44 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20141013.ebuild,v 1.1 2014/10/14 10:36:44 eras Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator