Version bump and remove old

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

5 files changed, 44 insertions, 360 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 7dcd95d16cf0..be7e0663993e 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # 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.502 2014/04/07 05:55:50 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.503 2014/05/09 12:12:13 eras Exp $
+
+*postfix-2.12_pre20140508 (09 May 2014)
+*postfix-2.11.1 (09 May 2014)
+
+  09 May 2014; Eray Aslan <eras@gentoo.org> +postfix-2.11.1.ebuild,
+  +postfix-2.12_pre20140508.ebuild, -postfix-2.10.0.ebuild,
+  -postfix-2.10.1.ebuild, -postfix-2.12_pre20140406.ebuild:
+  Version bump and remove old
 
 *postfix-2.12_pre20140406 (07 Apr 2014)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 4f6b9816063e..30a435492a9f 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,37 +5,34 @@ AUX postfix.rc6.2.7 2217 SHA256 51f4bffa535d891f94d4a20ca2a4a42cc99189f3de78cee1
 AUX postfix.service 267 SHA256 5d6aa3489e8d66a29d132d7170d1fd3b4c36374486c76764df8efc42457739ee SHA512 83def57dd70caca1c07d8493289573342c341c2fe2b376f68df3647be7a3bace9fa57ad07e3b52fc0ca56ea4c7cdfb094e74775c335d18ddd5fdc4632f721915 WHIRLPOOL f1faf22f0c0b8c33f9ae327a81792508e53101eca8c7d7db985d8898f10e985118f2231c09c444e907580061a4adee1de1788f74b7af3ffaafca22c07dee474b
 AUX smtp.pass 141 SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9 SHA512 652b43be887109bf162647e9c0f08dc4283c9fa8795c11c14e88c60984e07593a4cff9e0e6c5dc92c484f547ae0be50a078599fc2fd67a66903b3ac7a8854b55 WHIRLPOOL f075d66d8ae7a13645066e572ab634721aada5aa828380afc5d45f26a6dd34165069bdc7b2edb89357330863f5aac40ee105bbef284392043589a2921381eb1f
 AUX smtp.sasl 147 SHA256 0ef6a2a7846498f56b9a8879f561a51c1e3a203ba90b2991d499afa69fd85629 SHA512 0beba4baecb4c4abdd3d2dd61e9e56d3abbc0035184992c98c57538b9244c6a07470974afe663775c3f3f10354e64457aa07e657dfd212e31a0920e3f04a6000 WHIRLPOOL 0c3eef040dd4486e007c31111b965725d3e9cf5a896881e0c927a715598dcc936dbf1034d6add2e6fb8ef4bd0114a7a49a8bba6f27b14aac30023457a1da12a3
-DIST postfix-2.10.0.tar.gz 3826655 SHA256 4a42a6029af418cbd4a8668b4f8c7e1ea9975cbe9756df760649c0a941bfeb7b SHA512 88689c2b18aeecd6e363525955c8e3506acf7702eb7fabe148b72a149020c29a76b3f6ed57109380ebb2106cf798a0ce78d470bc4a104a8ecde6c1c4cd0da07e WHIRLPOOL b47559ff91651c699581757976628ab87ffda91ef85f2ccb86ddc4982de68fe7f6dedc419a2708e879969081a7d54681f88763500cd816aed51958bbe0880b70
-DIST postfix-2.10.1.tar.gz 3827595 SHA256 2e85a62e97418bbb022b4d4433098a7f25adc7dc707c37d9984db2c2f314b1c1 SHA512 34d5923748b38dd93609657011adc1371ab738ee86558aa4822cce6e879ccdd426bb4de994ab425b3a2745c8ca10a01b2d1c5f310872e839f9627afa8dcccdf0 WHIRLPOOL d1e6c029429e6ec2249b58cfa035a8819456557655711fe8d81ea9cfbd22fd66837be509e8b0f458ee6680330b1c5cf1c6fc580b75b2df6aeb30cb94cf478031
 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.11.0.tar.gz 4034741 SHA256 ca1d9d32d5662678dc4e3f700cce82f5d7bed6a614852b17b1a5166936330c38 SHA512 3bd98a6d573ee5f326ceb11546de28731c36f5e6671db30072b2ce3662956f0ba77cb165450a8d69f485b3ed9ac8b520c064775fdee35425a6e457ee31a1d953 WHIRLPOOL d3b1264c078091296f3da1ad0f715ebdaf3f234c9d29e453641a72d6de9b92c19a5a75d723e7d6e21a5fe6658ea244ec0f46d5ca0b6307c3761fea3210a111df
-DIST postfix-2.12-20140406.tar.gz 4027906 SHA256 4639c8ede85310d6381d019cee459e636ac71b62e6fadb43467ee283027b00ed SHA512 f19ab3b0cc545428d83459e32e7d788d690701ea107c0f5719bdeac74c9604a37fb57440490c8d49d789b2b751b9da4dc2b30c39933407d78b0883195ccb69af WHIRLPOOL 9b842bf30e0de7d60fd9a168a9f5f6e5a09fcb45f392a15c6cebc8c6697592c5f2dbd9eee788adc6f3e61d360befccbb814ec1a885ac2e4a0586060053e7bb62
-DIST postfix-vda-v11-2.9.5.patch 55009 SHA256 df30379c456971a514ae5587531bb5cd8492921a6a27e6d23f5014a1434945aa SHA512 c44497536e2bc313f2301e799a6614f396fc7bb06ef31493460edc59b0922b4d9a24802a84e2b8cf158277f5b0c8c59b53a4f8ef6896ee1e2ba538c562687010 WHIRLPOOL 70c438d2e98aaae6ebd37fadb5d5d0cbe3b31baf2119657009802be62bfeef7dc6a6e62fc8259bfe635ccbf4b0c8ffa17b35a04648c6c138575dda8314a28744
+DIST postfix-2.11.1.tar.gz 4035026 SHA256 487f98a73b95a5799409caf21ec065efea91c1dcdfb84c038a0e3a265d6489e2 SHA512 988659ed7f256fdc831c6a211c33aede922d5baf32da7129afe0ec2fe5011ac95dacb21e59c92f658323b6ea773ebf2bcd66a796d9271c1e7b949d5d9b9ee977 WHIRLPOOL 902eff1304b9d0d52a759f0a0804cd5e34d44b8f1acde26f60db6ddc69d84ff93c70c7b27b9c39318b124582b13d61685fc46c2513044fd4c7511370a33efde7
+DIST postfix-2.12-20140508.tar.gz 4034691 SHA256 2e3f28ed6e5a875fe77c4d8f6a16a58d5aa79029641601c53dcd242432c09d5c SHA512 29d3bd4b87e62122adccf33c25f1cfc4aec46acd79d0c9a75d3b01d39e381ec822f0295cb9684258cf8daa11c3a3d94dd2975d7c7598a19778eba2b1e0711877 WHIRLPOOL 5c80e7175ea7902d98b55839ce2e3f872a554c3d314e636b2589dde33f7d42d5f574f8208c49caabe24c6ed5845b1456c54c23ece61f796cf5c41c96d6589b7f
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
-EBUILD postfix-2.10.0.ebuild 10381 SHA256 e2bfafb98afdfc9c8f3e36a2dbfb0bb466d3e2f2bb0c188c3af7f34d684754d9 SHA512 9a7ff4685cc69095c527314d70003cb543c9b6951c92129bfd91def0bd0e84bcee666404a36f00b6f75290ce79784146a049bdb5009ea3f346afb5608c325623 WHIRLPOOL 3fc14e1b125f81ea11d420448718d050cabe1da95e823fcd7ee4267a9a3fd6b8c8955f5601d236f649ad819d0acf0cb27e0f9d49bf5c9f7865c1ceadd457a816
-EBUILD postfix-2.10.1.ebuild 9624 SHA256 d47ac79a5780d62239f23f1802b40326e9f39e459110d298dfc997523a415219 SHA512 c53e7010626bef1ca334dfa56e917fc68faf53f4bef3f922717f1f922871bcbba61c6cc5b86678993235ea9ee51b3ad446c12eadf5a88b790d10176700c41728 WHIRLPOOL 91d3b373cbc19603d785f6c07a1dfc2f7155e2bf3680a4503afa7d6f0219398593105f6eefb7b2a7f97b3add41313f2c8bdd201e8b3ea434083fa6828faf02c7
 EBUILD postfix-2.10.2.ebuild 9625 SHA256 fb54cd49a8ac2f55e17f4a996acc7cbe240d49a783d777fe5bfece4a95cf7c81 SHA512 6e7103715a5e115ba95a4b3d7a8937c120bce99a2a144f10f06167c892ea85db36a576e7344e5c45bc9a4177d811450f380a2473b79e428d43a3eb3b57c24c3a WHIRLPOOL dbab1c13c6cc69c4319adf63840225fe254d99114a625f83dcf5bf127589d35d74f41d2e10c5c2e7eda597347d239f35e21cc5a59d62644204d2a9fb6d29925d
 EBUILD postfix-2.10.3.ebuild 9633 SHA256 85802ec18416c850a1ab527caa0b64090a3b84c34a6892df132177f421e95588 SHA512 dbe4dcb3d6f08f2494e9b3d90d3ffdfdd44584435adf4cd6f99fb037fa17e7bed6ec8f588e42409fd94dff1aa4b70f9a24354c756ae2f5f12efae85fdf329503 WHIRLPOOL f1bb7a23d5399746b76a9def89b323e25bebeeaf6b77be4590e60c3466337372b587a7ef9698e7cf50e1c4d6742b3d3999b30938d0e1c987948cab9062735271
 EBUILD postfix-2.11.0.ebuild 9690 SHA256 4f96e4c0015aeb66564a612732efe15da6d799175d9454907539c6555784bd8e SHA512 8343dbade61d6b284ae099aa38120e0de9c855beb836d265fdd4f6684bf8c98736c0b1e3f4bdf4818c46f3e48eda953ea240ed1de426ad6acb2e8c0c469b1b06 WHIRLPOOL 5dc62d597b70f86d99681bdae483c1e3a166bc95c93d6453d798565fb5192716627fbe033ccb82f59e2570ee32e0b545005eb99ba07b007aacf40ddda252ffd8
-EBUILD postfix-2.12_pre20140406.ebuild 9704 SHA256 9c4917c9794f64720765bdd4e1f7478158efe78c8662762090806ab7e9cd2cde SHA512 e1fb7c1d8f5c74acb03634d9201c89982dddfb09a335b56badeb76c5982f8c4dc44ed1a06195f76544bf563373a464bc02a52c0969c6caeebb6b91f8f4db2c02 WHIRLPOOL ff38f99cde031b55dafad93a19bfbb5b85636c88eeee60eb8419007fb35f3a740885dec63da93a2a4f2464719457233a2ca244b218af0a56532a28d14fd984ad
-MISC ChangeLog 2649 SHA256 924695e913ae78572ec6f940e7fb43efd9c040d975dee3c8ecc5758748eefb61 SHA512 877c96bc423f7f1d5edc265200824ac2365109c062e21695b06f2d9b9ed25e3c4dae3ff53f1f58f4171f8b66924eb3c7ad1438858f9bb3a3a02b7848c26b5f66 WHIRLPOOL 444a3dad0826eadc92bce28e8cb4cbeb6eeedf1fda3ffbc5ab0f7c1dae64d8f7369678dd782da0a81dd36e0fe844a009b41a92f332ffda81a244ec19c04f090f
+EBUILD postfix-2.11.1.ebuild 9690 SHA256 7d4f9ed098569547e64ad1af940982c7dcd238885cc1b7cba92a45752325aa2f SHA512 cdb7e54a36447561191bd069d6b019da8bf59fcbea0530d912241bdd6a2fd2e44671c40cd73454b60b9ba221732fc0ae90d747c9afaedc59e7c8cf86aa4997d6 WHIRLPOOL db6dbf280dd54a4fb510926b15a4c3bf3cf56729e7991cf7200540ce2b40ab5c0e36efb4e21737d051afdf208a63d79dc8d8dd458976f34dcfacfdc38b9d7cee
+EBUILD postfix-2.12_pre20140508.ebuild 9704 SHA256 e7634e07e052906d71a540c634238b4cc5447a4767d2a26b4a4c43b989e12783 SHA512 5a777abc0fb63850e7a3fc183eb4259296504669dfad0eb3e544e38bc2a564b962c9c0d0ffe842eb183aeb97d3ed319b85b027f68087a58ca13cb17cac2c3eac WHIRLPOOL 06104b682121b07467d88a0dc226ac238a5814564b49dc9ee75b8ead5e95f78d3f592505355a292c0f0cadf17062bd6d87990a97ae81d13fc98bd126efe978d3
+MISC ChangeLog 2939 SHA256 a890833ddb8a527c0a9a96d23a09d1789790f114b30e9ee788aac0d1f088558b SHA512 63ef6e888c4c7b5e020deee4e4ab9652ab1157507496ff330bb671a7c9d4471f7927f16ab7237e94937dbe67156e55c5f8478359c42ab12d3d033b5460b114f4 WHIRLPOOL d5ec6b8a213fc3ba1d21e26fe1f66b2291b124a6e2ddc7beb4f1363553aaa6549f56d3189600249de0899c9d492edf2f580fb971a0a1aee7c753318be2a5b3d3
 MISC ChangeLog-2013 100301 SHA256 439e93c3f6ea08471888157d2347da51181aa9031d4bfdeef2197a6b26680246 SHA512 c678433163e86def50d59e47d7a1a0e8f4c4af860f80932255a7c95544e1f5b55a70b68905b02a417b2332bcf3aaa59281814d8504d70085f0874a23faa2bf02 WHIRLPOOL 15a12897a576cf98d856c551157b72b47aa45fd61d05c6ed55033ce37ce247045c6bcc8143b7ccce4666900d85e0a04087c977a311e31c20f554a991bec74fbc
 MISC metadata.xml 707 SHA256 1b5bd2fd60bed0349973daf64aacc58442f8a6bded2670785a0291ebe8881eda SHA512 20a4578acd5a5ed18faa564f3be1e7fdbb91997b487911cca0d3013c3453d5a23b6e3fe281efd364cff676be2eee95356e61c0444b2d8b537356fc40a1828ce9 WHIRLPOOL 3b6c960f6198cc885244bf46afa98c13b02f3516ccbf846f34325b548cb49db9135807d6f5fae99375830ea513e100f318ab1960061bad154c9f5721c2551652
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTQj3zAAoJEHfx8XVYajsfb+QQAJOVSz2VPx7Tfw1SV6xddoLS
-iKg2t0i/t0vfrajl66ocJ5QmnSrD+Y3Vnr/xihUadVWkOtca1/dc5cry6rv7YGqF
-2ameoFr3VWtClb2fRtWCgUYknCCon18lnaBj8xR2Yz4127ILF2UmEC9NL8vRqYtv
-IlRvEVUt9vDyId5+VrKxRWkW0/vrz1pKvGYylFltJGYU1qTKy1aYApHhbTLfYuP1
-gCfVy5ebAVmEJM5YXChI6yxeaowJX8P1tsw5LgwOc+pnbP3km8DlkwM4i6Jw9BDX
-GK81HFs+ykZrEH0uJNuZKKZdHJyXX9QpIs8GzboDtPKlGThz2NQWtOeWOUoDsLKn
-cg4CbItd8sQC6BXQUy/DEBiVXEZvunVdwR1YrLvmXThfosoBk9h+KWufMqXV8OF/
-qrSzuUBcJbiIF9J9qoJHIJIDQoB3/4zxDtsocgpllM5oVTVd6RCa7lSVbIvD3pC+
-8nZgYctL697V+d/SuJzjsP8rDXVJMG0oJXgW1jM8Jc+qitdHdwAkb/uGC9O2+C3c
-xQpzMYaEWFyRsPqIQJsImFqmOCn/mpSCrrkx5zRqY0lpaPdX/3EQVM8Ezxnq6eTy
-XQNgntSY5NSwoY75i/cZsbu9DFpqibuwsXAnTwUCZUjht7lwCE/LCDzAjiBSkeNn
-1gT15lGvyHYewyJVtgyX
-=b/Fj
+iQIcBAEBCAAGBQJTbMYoAAoJEHfx8XVYajsfjVQP/2LucbMS9mezVsRvsGVE0AGA
+IcVB1modU2ruzgQsQS2xFXolkAusDR9RI4wkfZlAydCJoZSx8cjrjFMbu+PfImPD
+Dq7LkWTGrltzxcTKjQbi6/IZWaCdU/+8hVAEOO/9NGezfsZJE/RAMjQAYZlHm01u
+hmMeM3qpTVOCJZb+6Qv33cnfbx71DAvH03VAPVE0mDcE3GQY73lKie3WGWyQIBA/
+boJgnRJrEiignYe07FlArzKhqQvnbt6lNxiz/Jav8C4pvY+CIQdOzDUApC4tOjo3
+JFMF+afjVdbvSM8k6is5j0aFwcb7DmvOw3TH3XgSXi2FLOXwUFNKiW9P2aQciOk6
+bZJdvrOKJU8gwDQsU/AQTT+o54kx2LtdHWjeSpV7SrtXHv+MK4siG7bxmdvcI2WJ
+WjTt2NwIjWdGVVSZQW2uzXN4+I8rn+DLOcw8GP6K4WHTHwLzGY67nPXgCsxdoy/G
+A39tSfT7sdrH/mjNUAc25+H6H1G91VwoGudHDpodtlBDTxDUbz+b9kfXy0F1SrNm
+HhYeE0CVAJP9hKl5C9sfh8mFf57RwDlOem4kNR/IS396p6xQ3cMrLVdZMg7JAsSH
+odieA8bVub7KiVNoxfu3dk2X89MuOg3UnP2KrvgRCh+uY6YbnPVSEb5h0j7fZh1B
+kTnZV0NlxqQ+9sN5ua7F
+=rwV1
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10.0.ebuild b/mail-mta/postfix/postfix-2.10.0.ebuild
deleted file mode 100644
index cbb42e894c6d..000000000000
--- a/mail-mta/postfix/postfix-2.10.0.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# 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.0.ebuild,v 1.14 2013/04/14 11:42:39 ago Exp $
-
-EAPI=5
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.9.5"
-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/"
-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() {
-	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}
-}
-
-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
-	}
-
-	# Postfix 2.10.
-	# Safety net for incompatible changes due to the introduction
-	# of the smtpd_relay_restrictions feature to separate the
-	# mail relay policy from the spam blocking policy.
-	[[ -d ${ROOT}/etc/postfix ]] && has_version '<=mail-mta/postfix-2.9.99' && {
-	if [[ -z "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n smtpd_relay_restrictions)" ]];
-	then
-		local myconf="smtpd_relay_restrictions=permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination"
-		ewarn "\nCOMPATIBILITY: adding smtpd_relay_restrictions to main.cf"
-		ewarn "to prevent inbound mail from unexpectedly bouncing."
-		ewarn "Specify an empty smtpd_relay_restrictions value to keep using"
-		ewarn "smtpd_recipient_restrictions as before.\n"
-		"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix -e ${myconf} || die
-	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.10.1.ebuild b/mail-mta/postfix/postfix-2.11.1.ebuild
index 62ef44303f13..0a9eb810b510 100644
--- a/mail-mta/postfix/postfix-2.10.1.ebuild
+++ b/mail-mta/postfix/postfix-2.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1.ebuild,v 1.12 2013/08/06 13:13:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11.1.ebuild,v 1.1 2014/05/09 12:12:13 eras Exp $
 
 EAPI=5
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator systemd
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
 
 MY_PV="${PV/_pre/-}"
 MY_SRC="${PN}-${MY_PV}"
@@ -19,8 +19,8 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 
 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"
+KEYWORDS="~amd64 ~arm ~hppa ~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
@@ -28,6 +28,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 	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 )
@@ -108,6 +109,11 @@ src_configure() {
 		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
@@ -129,15 +135,14 @@ src_configure() {
 	fi
 
 	if ! use nis; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
-			src/util/sys_defs.h || die "sed failed"
+		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
-			sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
 		fi
 	fi
 
@@ -203,9 +208,11 @@ src_install () {
 	# Provide another link for legacy FSH
 	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
 
-	# Install qshape tool
+	# 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}
diff --git a/mail-mta/postfix/postfix-2.12_pre20140406.ebuild b/mail-mta/postfix/postfix-2.12_pre20140508.ebuild
index e828db4a2251..1321f7aa5ee5 100644
--- a/mail-mta/postfix/postfix-2.12_pre20140406.ebuild
+++ b/mail-mta/postfix/postfix-2.12_pre20140508.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_pre20140406.ebuild,v 1.1 2014/04/07 05:55:50 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20140508.ebuild,v 1.1 2014/05/09 12:12:13 eras Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator