Version bump and remove old

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

10 files changed, 207 insertions, 1451 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 879d153367b8..bd7e89270a4c 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.375 2012/07/27 01:21:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.376 2012/08/02 14:02:39 eras Exp $
+
+*postfix-2.10_pre20120801 (02 Aug 2012)
+*postfix-2.9.4 (02 Aug 2012)
+*postfix-2.8.12 (02 Aug 2012)
+
+  02 Aug 2012; Eray Aslan <eras@gentoo.org> -postfix-2.7.4.ebuild,
+  -postfix-2.7.5.ebuild, -postfix-2.7.6.ebuild, -postfix-2.7.7.ebuild,
+  -postfix-2.7.8.ebuild, -postfix-2.7.9.ebuild, -postfix-2.7.10.ebuild,
+  +postfix-2.8.12.ebuild, +postfix-2.9.4.ebuild,
+  -postfix-2.10_pre20120715.ebuild, +postfix-2.10_pre20120801.ebuild:
+  Version bump and remove old
 
   27 Jul 2012; Anthony G. Basile <blueness@gentoo.org> postfix-2.9.3.ebuild:
   Stable arm, bug #426760
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 93c6b935627f..cf874e771b2a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,38 +8,25 @@ 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-20120715.tar.gz 3794181 SHA256 7e9f5fde719a2edcbd7997b2593dcceecc12e3d2716b533203f07a31142bbeed SHA512 7279d64932093029225c623fdf36a2489036b64ce9f5058d1af0c8ec57c3982328ee3dbc0a7771d2cb013adccaedd28dcdb88bc02c369b797b4e3784f9b7e228 WHIRLPOOL 9932da240b43757fd7731530f75c9e8427dcd4e4f65f6357b42bfe036b36a9abaa745d4e2da764b4f05385894830b2db1d6caa1590a4d39747a8c24bb8018b45
-DIST postfix-2.7.10.tar.gz 3418495 SHA256 1e64c844dddb5a8f0c7cec2547104c6e549ae4111983ffe9b4251c8c00ada98b
-DIST postfix-2.7.4.tar.gz 3423968 SHA256 9bad5851e8a7c97890ee9465e7f675f7826d56361369d3e792a79eaf98ed2b11
-DIST postfix-2.7.5.tar.gz 3425071 SHA256 2fe408f49bc8540bc41b44f1b7ee7a27561f1baa4e25ef55645778ba96d15932
-DIST postfix-2.7.6.tar.gz 3425286 SHA256 4f7546d25463c5fc300eccd05c302a44458b1cc8dfda02c7205daa0038d5ab17
-DIST postfix-2.7.7.tar.gz 3425665 SHA256 3e4a6f6ffd55ce8f2f535f9ce2f50090526c9710d0aed888fed151b2cabef605
-DIST postfix-2.7.8.tar.gz 3426172 SHA256 7fa1df2c7422df08e88ce2837e6389b8f8fd7f9c007d956e43775b1c6acaaadf
-DIST postfix-2.7.9.tar.gz 3418820 SHA256 f818f29e6e3c59ec0ce8cf0fe0437845fb1f87af1ec4d7276c80c04dfe2dda92
+DIST postfix-2.10-20120801.tar.gz 3784702 SHA256 b0f076e0fae9faaa7302f66e693f1485a2d6c47c6174f697f64df37821756bd6 SHA512 bf36f60bd9cf237f9d28a6e0847bf85f88413ce20a6e23c28c2f2bd82872d03ea7bff0e2436ac36bb4f1cf5d79a7fbe50fb31f40381214893225c9de9883679f WHIRLPOOL 97b1c5f1cc48fe29bc719a8d544109506e2779de2c27a1ac20c6cc69f90428ce288021e680b6bf774d02b6c120c7207e75a9e678521333ca96b96f3f028a9f3f
 DIST postfix-2.8.10.tar.gz 3640084 SHA256 2984005ca77457992b133eefc16f788e1eacd2c10b7626678bd24a53240ad3f2
 DIST postfix-2.8.11.tar.gz 3641059 SHA256 15997ff5c9a9cd95dd381c3faa1a0d4812a158c14eab229e8f81fd7b5dbfcac4
+DIST postfix-2.8.12.tar.gz 3641269 SHA256 f46b0117cab52e862b12869810327e2bd248a60f209079a875818ee2653de087 SHA512 55141e75da43b13975f85af636dceeed7783440fb5f7b83642e5a146d8a06af3a847beff77fe0dd495c58c7caed492dbb2dc52f542f44b9388f2ded30e37acee WHIRLPOOL 1d3c454fc938546c74b666feb109229a71b4e55d72c6f3833a15a81ec8eb3b48e318df69611fe4c40ac970332a8fcdfe98fa235863ae44bdf952b2b74537100c
 DIST postfix-2.8.7.tar.gz 3647643 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
 DIST postfix-2.8.8.tar.gz 3648317 SHA256 77dc98e21da48901d326e98f918ea50d6cad66ee5812033b5aab342c9578328c
 DIST postfix-2.8.9.tar.gz 3648498 SHA256 6a63bafad1002abbab2d2592a40dc4b3e35defd97f2026d6ccc398e5d7ee9bf3
 DIST postfix-2.9.1.tar.gz 3768329 SHA256 d1dbe901f76ab6fd51f9c8c61eb46bd6fe0bc8b13823330e397eb1b00e940cbe
 DIST postfix-2.9.2.tar.gz 3759595 SHA256 ed66f5406056267ce21dbf48c6f4e3b53bf8fad46d799d314445353f42b5c902
 DIST postfix-2.9.3.tar.gz 3760555 SHA256 3b4ae6d7715ccd23396d83a65ad83c7639065a125c87393013cc0514186a55da SHA512 32a4a8f994347762f65f798c57bbfe6fb00af3238aca9500b4b50ffaaaa9893753954fb7fc69082e163025bf1274948827b96e8d1019fb1f50a8603b97c4e782 WHIRLPOOL c0d4ce44b8da2b7557fa103b17bafe8d87e168c046af12b932e3762f531a0c1e8d1adff1ba87961526b0917cff51ad3fd1cf3b1fd4fb7948405a1b5851829591
-DIST postfix-vda-2.7.2.patch 59667 SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
-DIST postfix-vda-v10-2.7.8.patch 56777 SHA256 10738a30f2cb00cd05c593caf5b4b9d4ca44927432c1995a9db5c3557d0528db
+DIST postfix-2.9.4.tar.gz 3760718 SHA256 58343afcc727594cc1f9a3980562d8199aa55fc2cf2330da6b9ddfbf31502679 SHA512 f8932ae510805261b4a6c204bd4bba41d50e1833f87326b986ef174b51eb695cf0588d7d98850bb7b83ba56f1257406da072c423cc768f68d3723daf645b9490 WHIRLPOOL 7d7d619e0fa8375f1b653b9e1a0a2fa723929ab87db05445f2c2a73c213e91476d202806a439dd9792499e6a4d43c86f84133e90ffbd3bc9828ba1a925d8d11c
 DIST postfix-vda-v10-2.8.5.patch 56777 SHA256 0106e0bfdea8bb3888e8f33e7cb4b1530d171abbf2d3ac91567f91240e4b6b5a
 DIST postfix-vda-v10-2.8.8.patch 56777 SHA256 40e32a1c159fe3d12836f81e4871e4a628a87623b80402e90f7465eb39f89a86
 DIST postfix-vda-v10-2.8.9.patch 56777 SHA256 e671f7349173349d66f1b091359761ed5a5d517f8a58c86a42ff461997d2cd7e
 DIST postfix-vda-v11-2.9.1.patch 55009 SHA256 611283a932577944bcdde36e5fe1a80ca750a0a66eb5f3490666e2adafd2bf84 SHA512 ce34b533c2f50cf714d8bd51791c3e30ba91f49861e3c1dcfb08d21d2d38be970b3e3040c7e224142d085c7b11b6b14bfa230844e21daa2eb0bf59641dcc29b9 WHIRLPOOL 0668cafec5678d09504220e31ce60344fc0cb46cfec449db2aade89ee09c598484012c5ef0536a0dfea24df51c6bc86d1a9e491f136312afdab90725e5efe86e
-EBUILD postfix-2.10_pre20120715.ebuild 9464 SHA256 a31ecc1b77a065782ed85a07ec765563febff75c7aac74391d088d5e44d4316e SHA512 9b0c571ea9ded8abcf3b2d17c3fad0c806a121028a6bf6830e36e6c89bfaa8a5f6a07ae004f37c7b07d2c37f2696b465199fc7d1be88afc4e8595fdba65f883c WHIRLPOOL 0dd821629046c93e6b23050b29d1bbac70bb6eb74385325f2fa8675897df17cbc6fb8c0e611d2f581157b73fb83eb362c5291a2318ff3f5362187c74c4d11489
-EBUILD postfix-2.7.10.ebuild 7586 SHA256 3e65a732f762eab0730235d2bfa70563a957361ea47bbc2d7caa53852a12d903 SHA512 06b1cc230180831d902d275a6df62fab8cf75848e165c1b60f1b4499aab7ac6c8b374459c75f6d96ab24240530bf398b9f8f977ee0a31c39a3049036f21a1fe3 WHIRLPOOL 6edc33b9098fd60cd7472878979f8a419f324a55bcc1113c31bac21592e877e0677932b5217c42eef481e54236e5f9eaf8be75c9fb1de0155706d61d7b42b13e
-EBUILD postfix-2.7.4.ebuild 7570 SHA256 5ca392b85e20271b1e8169ae3548b3cd33ee92b5f19f070c3843981580f73538 SHA512 35791dc95fe2732b3141f8fede133786abb9d7de36b6fb3e2e9123ef78147ad3698a57700100d6930e1d29fc2c62aeb3fffa5f4bcc6894fed85e9125e560f7dd WHIRLPOOL ea7ac0a5a24c31690194a7a5569ddabcf83e99da015e95169960416b3c72c235ca1065e9af10bcdd2aebee4576c89df4a0d3e33e11699986889fcc04c8fe700f
-EBUILD postfix-2.7.5.ebuild 7581 SHA256 721b79a672291f22f3dace70fa4dbbc90346dc04f6f012320be218324755804b SHA512 3b71ddad114526956a63fe97053299abc3a657ee39cb3f7b7b467e6de62d24a30f06ae35449591f5ad336ddad19b00828e2cdc02225ea62733fdc9c7e29c933a WHIRLPOOL 4f21369cc073839881091a122f52a952289c67eff1ed7a756574a183dce90c5a203fd381f990c42ff9a2e41659353701efb2c924f4dbc7cb24d29cbdd88f35f8
-EBUILD postfix-2.7.6.ebuild 7581 SHA256 5064090155c5f684e13190cfc3f9e23429d80ecf3ec9ddd2c7531de9e8968dba SHA512 3ea3defd6f9030345c9188490081756f073b393f288bc304cff6be0953242a4dde25abfa7068fa021627830788991685627b8324d7246cc2579a4ecaf69e8669 WHIRLPOOL d22a02a704651adcc04350f6098b414826f79d24b696f6bcc0d508cc15f980dce83bc1507f81c3d411fae5095862552c137a5bfe1e56c78cbf676b89afd2e706
-EBUILD postfix-2.7.7.ebuild 7581 SHA256 3d65a97a335e0913c56c8819a2c1d53eb038ffe8265d0d059021d011404542a5 SHA512 9899f9f341d17f67851c7823da68bd5b7db7460fdfdb39547606bd9fd44d4fdf2ee1b7f4d6f8423cfa04b87e12484a45992280040022a803d8df3ce34fe2f286 WHIRLPOOL 7381bc84a7dd7bd723a64e3308b94b8ecac00c85bf009eb83be22cb30b029ed9b83432a54a9bc4350bc259968b1668d6b58d629c73525ef28bf4540f24d18c0d
-EBUILD postfix-2.7.8.ebuild 7585 SHA256 b59c60f8839fc68b863f070b98af305c8983842f6a7e8d84de94f94805d933e5 SHA512 5706d7cd346fcae1fc11696ef431b7c5bc0224a202b2e71e721d8062e8ba3ce0bb7daa8a19dfed8afcc601ef183df700a313fa067005c11234eb24f97e8d7160 WHIRLPOOL 94da1e94b1873387f3c57ca0aac8088757a4543d89e6e8dd9b30b216717a808007da846242f8e89864e62dcc3c0c8f85841bc25e2e3afbb965ea1d54db86ea2e
-EBUILD postfix-2.7.9.ebuild 7585 SHA256 de2f960ff5e9f6677335eca3c558cefa4e6c8e957c1058679edae32771f62e34 SHA512 b11fca1c5584ff96005954504d994dd41814169c03a66cd54547aa2e51737d987cab1ffc0d36a5704614c1a72f8c960b51b41899d1ff3f097eef520e1e07afa4 WHIRLPOOL f385c3e38d44a797901a4a14d4e4307ed20ea8a942aac2b2c34209bb275e04381da5fe1543c6b8122c712331357a08ccdb3c068206cb5e5d814ca17eb8db8fc6
+EBUILD postfix-2.10_pre20120801.ebuild 9524 SHA256 3d7ecb5f0ec60c4597279e5c443754aaf316ea8c31ab4e681eeec47002408c9a SHA512 22ad0e622f5ef273cb4d32c8979a218903b8043044b3fea00f9e1aaf82bf3f94e908532b3a97578b47a0b3bbb3339918561ba1f2d7df52cae11484fddf313420 WHIRLPOOL 4c4760de9c902333d103cda3efe4c50b54d9b7523620851d15e54225bcb8c7a85d85cb1992510f6e96aa67b5595d77de0de741057eda192a1b311c8993e462a4
 EBUILD postfix-2.8.10.ebuild 8434 SHA256 e05909a4806ae0b20bfdb194a330c000d408fa059dae489349020f069463c40c SHA512 28c8ef14a225c1a437c65c778b77516e2ac99c1e18d903fd11ba2c0b373d7218554299c0a6808eaf60817d20d1e2afb0714a67b71ba1b470b6ada10ba5ff3846 WHIRLPOOL 55b057230deeacc2dd679661eb02f1015802de675c994839037e5a6bc88f9aac792274fb7f68da460901e299716bf2598a435c9e6c672cb6dc0e6e2f56613fc1
 EBUILD postfix-2.8.11.ebuild 8434 SHA256 d1a8e20e5ede8934a7b94a1d9406dbadefad93a2fcb60eb66148abc7e305bb88 SHA512 257a9522ebdc1ba4c80e565a6315be69c175ab48846da894f8842db2fbfe2340779277490aa57df4219105e31bfa3e1c093ffa240184e958fb1d31b0f0b644eb WHIRLPOOL 03fe8933b41049848db898165d1e2e0773f7580d95e82330a9d62850257039a668cb42bc2bac79299046b17a303775777820c6b27c0569ca90f6c1f38f17d42e
+EBUILD postfix-2.8.12.ebuild 8431 SHA256 c9d9c2b0d69bbb8a6082c4563db5e55da7520dfb377f8b16ce1edd67112dc9e8 SHA512 1a47f9aac55fd913eaf8bd443768b7b5c4bcb30cdee31ce1643a1821c33f700b1fb574e0f4632b6061d7d52099b04ea3b9db4e4262433cde225d06f6e5c5cb4b WHIRLPOOL d1f7ab5837f4d88ea6a3d6db58ae7522f0010059815424216817f425f5d120bf622328d5df157d49b68cdc8f97fbf436ef33cf96792d21905a96908319d20b55
 EBUILD postfix-2.8.7.ebuild 8423 SHA256 db58b5927969b0c6a1450e547243137e5f36cac13e9bed52c75f492cf316c1fb SHA512 608693aeb98f858901f2ab681f71027138f1e12118fd2e5ff597dd0d56aa48febc5a460f891783aa3130dd3f160050ab2f098e95893c2281f73271a3efff4746 WHIRLPOOL f23881f131c4820a5ca3b5b554a5952b574539735d1290724988e66628103248b37dc89d6f8f7e1adc3e7ae2aa2a6243e85265509f2c71af0a6410b3cd897de6
 EBUILD postfix-2.8.8.ebuild 8433 SHA256 889e07d8f67aebe278a119b8fb0a5868e8e5e19c1f5691eee0f6560ff5e43831 SHA512 6a930f9662b412f921c8be489ca339d85c640056766c490d355806047ee91d48260dd12be5216c57b060586c123a26118bab6d4e33b62ea7c4bf233eae087309 WHIRLPOOL 6b611e8dbf055642ac5578483db12b46a7477ead2f971d884fcd67664fc62f8fd7b41d0819d860ffb246d460032fc857ce013e170e147c7660edaf3faf1b4dd8
 EBUILD postfix-2.8.9.ebuild 8423 SHA256 f9bf38dbeb5b50c4d19e80bdd4ca10c2e7d1933256dee24e871c1754ec4b56b3 SHA512 0430e97b8bd00aad292f5862de14376ad21c6056a3866c81b33c5d41b59a285b99122f6515f343a0addad83d5c68e72a0626b707acbb885e72d48bec8b804a28 WHIRLPOOL 012caabe54c65cca9d436acfddcf716d49eea2a24435e3a0a6b0d939669e2a994e37ae7ba2fbb7a4a0947348c6b20ab773d3c40ce160d1da5e7de025235f10b8
@@ -48,12 +35,23 @@ EBUILD postfix-2.9.1-r2.ebuild 9486 SHA256 7ff3633e49eef4e1e937f4f9b8313861b97cd
 EBUILD postfix-2.9.1.ebuild 9483 SHA256 738eb25df04125e5f998820b3706630d43c98fca4c62e752e46759897de9c425 SHA512 40acb4b547b9918119c64f00445dde5fb4c9fad80e1381b64daad447ebd1a19a4ef4b325b0d042b40bdbeae59ba13e7bed7897adc9d7cca3b7e156b4eece46bf WHIRLPOOL 826a1aac10a5dac95d71b02026a4a498774a599460aa04fc2e6299abc9d45d9f3b31068dbfd742d4a96e8ac788a58f5083bf1b8a0cc35460300c49c2150b8ca0
 EBUILD postfix-2.9.2.ebuild 9483 SHA256 650655bf24029254a06472eead551fcb2bfc12832e4da1fa47bd37d5f21e29ed SHA512 cd7f2934951b0bba6324e0d6e1db3898498eb9c8dc309c36c822438c371d97cee3f88692c78c59774010a9352529744b40f04a7fe420ce260ab3bc01a03b0b6e WHIRLPOOL eb992674641151c986a02d8c55d453c00937ae9e417c9b4c384f5efa66430384aa46c8d83d6456b47806e2414121433894aee20153351ec12379a387fa3dd258
 EBUILD postfix-2.9.3.ebuild 9523 SHA256 cfec2de2173a5561eaa75e642ed2efda8b9fa4dd89e5ff22c4dbb80526eeed02 SHA512 4fff463b3fe46dbd0299363d6bccfaadb87fc1ce1b78abcac64c4c95a5d2ce81dbeaf8ed964efb5c0cf1836e5a95fb8f563be6add50f577af8470751b3145f01 WHIRLPOOL 6dc5bad6b283ba56b916d6620758bb4d1fe15eb04f7a8947569b5d118a19f056ec0950c46dfcc9d5dd0d209a01d7dd3d616394ee6eb662361bbd077d56b81a59
-MISC ChangeLog 84275 SHA256 538cbebbf6703f700282f13414a6ddf68297b34fd8ed538fd0919cc47941c228 SHA512 52796b6f34c187e9f546996bebd0faa39724e559f82144bb0a77fd848a482d1d6e88ba64e46018ac337c340350bb0273e4d48f352a983752e03983644264ec4b WHIRLPOOL 7fc404c284db1925be40514849f64269cd4685985b0cf44caedc8bbf95a371afde0a3ae4a6c462236be564863602ddfa65bf3953c28a04c14620580b9f9ea34f
+EBUILD postfix-2.9.4.ebuild 9511 SHA256 dcec72341f0350c8f3845d04255a53cd8144aed2cc8b04cd0113c7cea520952c SHA512 aa5ebbf8614c202667bd191b2f0bfdeec47ed787bfd5468a578d1225a33af7cec2c2b6e00c9b73c746920b00a827cc4743e1f023862fd3d42e41683879670575 WHIRLPOOL e436a698a51e86aed7a20c3f819347742ebb0446b7672644a2b12cd80d2f8f61a6e27f6f232e2e39bd5b575aeec1d117511f5f53a0b1063ff7212d62afb74abc
+MISC ChangeLog 84731 SHA256 e6a03a069b1ffe27475af59d5d10b9d18dfc4438f790bbe7025522d68d8d05f2 SHA512 db4df2835c9d2b9dba2c87d6642f3beac75cdb47f3b6091275fdddc704239845651e66ccf8d5f2eb02c6ce002c13fc3c8bcaf525f62a00a79714755213fd13cc WHIRLPOOL 4b1c692f8d55f4fc796d7e7057f1f808ce822e6889e3bf13e88adce8a7edbe0b0c827caec7bd9628456e4b10e86c9a85ca0196b7dbb985ffc17903d507d54efc
 MISC metadata.xml 610 SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88 SHA512 fd446f288b11070e2d6b5dad3ec259a889508c3c7f4755ea2ceda18500844e065ddc2bbce5f4108b30ebacff76443ea8a23805c21d39c2bf72210f801adcfe06 WHIRLPOOL 815ae4ddbaca96871454d44adbe3bec4a081d857c61b07cd0e382ce0d44503421a4ad156da6009cc91f24855b7c1d8adfe3fbd48c82833f9d82c1afaf798072e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAR7QoACgkQl5yvQNBFVTWFvwCfXYXL2hl1S8lKgOAR3Q437aUj
-z0sAn0VQ0yuHKUZhqYj1h0uuW0wszHrE
-=AmrU
+iQIcBAEBCAAGBQJQGoiOAAoJEHfx8XVYajsfX9IQAKa04t7zbDF3CR9cE/a0TLpc
+i6lEjv5spkmFmMgPEGSzu85wbhhCTDnWFHKX2VjtjObwvEeAqB6IFA/1l8XKglz1
+T0OgTLAkI8Vmm6pAIJvsqZjFvkTjQIrAkuKUc5Wwy/CO8Xr2hlzKm3365OVWev4a
+EfR4yXM7jKmURkJw6gEbJszfOgfiBoxeFJUjVMaab4hCsB7B9RF7ggux9r7x6u0d
+Jcr+7LgEIjI3VT3FJiCly4gAGhdMeKc6sn+QbSr2mD/N/VJCinl8qQS6Wir6zyDJ
+wzwmMIKPuZXIiJjyGG+YSeHNik5jXwJiLDSr++T13uMWo3v0I2pQ5JTtdpz6PuC5
+7D2d4G8cjtEBviAvqYvcHQpcFkkI5EvAU5WkgYI4ijfZ5HCUu4apIyfetSgNjutC
+Y86V/O5s+s8exhesLiK28xYwwLALgF3FkigXzMacNbFJfO/ld6CWNDWYc9+OOADt
+6+vviJrAaVSnCUvIwcHIPZzH1QmTHXZBgutmfT+AVyzz28YFkFrYVz0YBcZ29O6Z
+fVXeVa2QpcmqtK2Q/4KB5Lbp04RdF6eHTBdJmq5x7im34bNQ/HBTj/iBkAF7JFby
+SJ/1OsYicPEJjdEPGEsPR7q3WEGDF6VQwggD0Etf6A3ou2XNQV9UYFB23RqrSdjC
+d7Mf0SKDhzGxy/iWFZro
+=glwM
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10_pre20120715.ebuild b/mail-mta/postfix/postfix-2.10_pre20120801.ebuild
index 6501bd26e081..7a152511815d 100644
--- a/mail-mta/postfix/postfix-2.10_pre20120715.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20120801.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120715.ebuild,v 1.1 2012/07/17 12:00:50 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120801.ebuild,v 1.1 2012/08/02 14:02:39 eras Exp $
 
 EAPI=4
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
@@ -179,17 +179,20 @@ src_configure() {
 }
 
 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" \
 		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
@@ -236,10 +239,9 @@ src_install () {
 	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
 	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
 
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
-
 	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	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
 
diff --git a/mail-mta/postfix/postfix-2.7.4.ebuild b/mail-mta/postfix/postfix-2.7.4.ebuild
deleted file mode 100644
index f4b0807d57ea..000000000000
--- a/mail-mta/postfix/postfix-2.7.4.ebuild
+++ /dev/null
@@ -1,264 +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.7.4.ebuild,v 1.9 2012/06/04 21:09:58 zmedico Exp $
-
-EAPI=3
-
-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.7.2"
-VDA_P="${PN}-vda-${VDA_PV}"
-RC_VER="2.5"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="cdb doc dovecot-sasl examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	selinux? ( sec-policy/selinux-postfix )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nbsmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward"
-
-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 ssl ; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis ; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
-			src/util/sys_defs.h || die "sed failed"
-	fi
-
-	if use cdb ; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
-
-	# 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 || die "configure problem"
-}
-
-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="/usr/share/doc/${PF}/defaults" \
-		manpage_directory="/usr/share/man" \
-		${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 postfix:postfix /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix
-	if use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix || die "newinitd failed"
-
-	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
-
-	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}"/usr/$(get_libdir)/postfix/*.cf
-}
-
-pkg_postinst() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}"/usr/$(get_libdir)/postfix/post-install upgrade-permissions \
-		daemon_directory="${ROOT}/usr/$(get_libdir)/postfix"
-
-	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 [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-
-	elog
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-	elog
-}
diff --git a/mail-mta/postfix/postfix-2.7.5.ebuild b/mail-mta/postfix/postfix-2.7.5.ebuild
deleted file mode 100644
index c969ed5ed1e3..000000000000
--- a/mail-mta/postfix/postfix-2.7.5.ebuild
+++ /dev/null
@@ -1,264 +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.7.5.ebuild,v 1.3 2012/06/04 21:09:58 zmedico Exp $
-
-EAPI=3
-
-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.7.2"
-VDA_P="${PN}-vda-${VDA_PV}"
-RC_VER="2.5"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cdb doc dovecot-sasl examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	selinux? ( sec-policy/selinux-postfix )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nbsmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward"
-
-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 ssl ; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis ; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
-			src/util/sys_defs.h || die "sed failed"
-	fi
-
-	if use cdb ; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
-
-	# 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 || die "configure problem"
-}
-
-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="/usr/share/doc/${PF}/defaults" \
-		manpage_directory="/usr/share/man" \
-		${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 postfix:postfix /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix
-	if use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix || die "newinitd failed"
-
-	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
-
-	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}"/usr/$(get_libdir)/postfix/*.cf
-}
-
-pkg_postinst() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}"/usr/$(get_libdir)/postfix/post-install upgrade-permissions \
-		daemon_directory="${ROOT}/usr/$(get_libdir)/postfix"
-
-	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 [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-
-	elog
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-	elog
-}
diff --git a/mail-mta/postfix/postfix-2.7.6.ebuild b/mail-mta/postfix/postfix-2.7.6.ebuild
deleted file mode 100644
index a1931a9dab2f..000000000000
--- a/mail-mta/postfix/postfix-2.7.6.ebuild
+++ /dev/null
@@ -1,264 +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.7.6.ebuild,v 1.2 2012/06/04 21:09:58 zmedico Exp $
-
-EAPI=3
-
-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.7.2"
-VDA_P="${PN}-vda-${VDA_PV}"
-RC_VER="2.5"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cdb doc dovecot-sasl examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	selinux? ( sec-policy/selinux-postfix )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nbsmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward"
-
-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 ssl ; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis ; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
-			src/util/sys_defs.h || die "sed failed"
-	fi
-
-	if use cdb ; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
-
-	# 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 || die "configure problem"
-}
-
-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="/usr/share/doc/${PF}/defaults" \
-		manpage_directory="/usr/share/man" \
-		${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 postfix:postfix /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix
-	if use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix || die "newinitd failed"
-
-	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
-
-	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}"/usr/$(get_libdir)/postfix/*.cf
-}
-
-pkg_postinst() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}"/usr/$(get_libdir)/postfix/post-install upgrade-permissions \
-		daemon_directory="${ROOT}/usr/$(get_libdir)/postfix"
-
-	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 [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-
-	elog
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-	elog
-}
diff --git a/mail-mta/postfix/postfix-2.7.7.ebuild b/mail-mta/postfix/postfix-2.7.7.ebuild
deleted file mode 100644
index cbe119fbeb08..000000000000
--- a/mail-mta/postfix/postfix-2.7.7.ebuild
+++ /dev/null
@@ -1,264 +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.7.7.ebuild,v 1.2 2012/06/04 21:09:58 zmedico Exp $
-
-EAPI=3
-
-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.7.2"
-VDA_P="${PN}-vda-${VDA_PV}"
-RC_VER="2.5"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cdb doc dovecot-sasl examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	selinux? ( sec-policy/selinux-postfix )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nbsmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward"
-
-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 ssl ; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis ; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
-			src/util/sys_defs.h || die "sed failed"
-	fi
-
-	if use cdb ; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
-
-	# 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 || die "configure problem"
-}
-
-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="/usr/share/doc/${PF}/defaults" \
-		manpage_directory="/usr/share/man" \
-		${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 postfix:postfix /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix
-	if use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix || die "newinitd failed"
-
-	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
-
-	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}"/usr/$(get_libdir)/postfix/*.cf
-}
-
-pkg_postinst() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}"/usr/$(get_libdir)/postfix/post-install upgrade-permissions \
-		daemon_directory="${ROOT}/usr/$(get_libdir)/postfix"
-
-	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 [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-
-	elog
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-	elog
-}
diff --git a/mail-mta/postfix/postfix-2.7.9.ebuild b/mail-mta/postfix/postfix-2.7.9.ebuild
deleted file mode 100644
index d77ca993319d..000000000000
--- a/mail-mta/postfix/postfix-2.7.9.ebuild
+++ /dev/null
@@ -1,264 +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.7.9.ebuild,v 1.2 2012/06/04 21:09:58 zmedico Exp $
-
-EAPI=3
-
-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.7.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 examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	selinux? ( sec-policy/selinux-postfix )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nbsmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward"
-
-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 ssl ; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use sasl ; then
-		if use dovecot-sasl ; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis ; then
-		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
-			src/util/sys_defs.h || die "sed failed"
-	fi
-
-	if use cdb ; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		CDB_LIBS=""
-
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
-
-	# 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 || die "configure problem"
-}
-
-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="/usr/share/doc/${PF}/defaults" \
-		manpage_directory="/usr/share/man" \
-		${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 postfix:postfix /var/lib/postfix
-	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix
-	if use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix || die "newinitd failed"
-
-	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
-
-	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}"/usr/$(get_libdir)/postfix/*.cf
-}
-
-pkg_postinst() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}"/usr/$(get_libdir)/postfix/post-install upgrade-permissions \
-		daemon_directory="${ROOT}/usr/$(get_libdir)/postfix"
-
-	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 [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-
-	elog
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-	elog
-}
diff --git a/mail-mta/postfix/postfix-2.7.8.ebuild b/mail-mta/postfix/postfix-2.8.12.ebuild
index 6ad92b2411ed..87d674486754 100644
--- a/mail-mta/postfix/postfix-2.7.8.ebuild
+++ b/mail-mta/postfix/postfix-2.8.12.ebuild
@@ -1,15 +1,15 @@
 # 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.7.8.ebuild,v 1.2 2012/06/04 21:09:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.8.12.ebuild,v 1.1 2012/08/02 14:02:39 eras Exp $
 
-EAPI=3
+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.7.8"
+VDA_PV="2.8.9"
 VDA_P="${PN}-vda-v10-${VDA_PV}"
 RC_VER="2.5"
 
@@ -21,19 +21,23 @@ 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 examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
+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
-	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-	ldap? ( >=net-nds/openldap-1.2 )
+	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
@@ -50,6 +54,8 @@ RDEPEND="${DEPEND}
 	!>=mail-mta/ssmtp-2.64-r2[mta]
 	!net-mail/fastforward"
 
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
 S="${WORKDIR}/${MY_SRC}"
 
 group_user_check() {
@@ -99,6 +105,11 @@ src_configure() {
 		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"
@@ -109,6 +120,9 @@ src_configure() {
 			# 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
@@ -140,6 +154,18 @@ src_configure() {
 	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.
@@ -151,21 +177,22 @@ src_configure() {
 		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
 	fi
 
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
+	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="/usr/share/doc/${PF}/defaults" \
+		config_directory="/etc/postfix" \
 		manpage_directory="/usr/share/man" \
-		${myconf} \
+		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
@@ -196,7 +223,6 @@ src_install () {
 	fperms 02711 /usr/sbin/post{drop,queue}
 
 	keepdir /etc/postfix
-	mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix
 	if use mbox ; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	else
@@ -209,11 +235,15 @@ src_install () {
 	newins "${FILESDIR}"/smtp.pass saslpass
 	fperms 600 /etc/postfix/saslpass
 
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix || die "newinitd failed"
+	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"
 
-	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
 
-	dodoc *README COMPATIBILITY HISTORY INSTALL 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
 
@@ -223,13 +253,11 @@ src_install () {
 	fi
 
 	# Remove unnecessary files
-	rm -f "${D}"/usr/$(get_libdir)/postfix/*.cf
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
 }
 
 pkg_postinst() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
-
 	# Do not install server.{key,pem) SSL certificates if they already exist
 	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
 		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
@@ -238,10 +266,6 @@ pkg_postinst() {
 		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
 	fi
 
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}"/usr/$(get_libdir)/postfix/post-install upgrade-permissions \
-		daemon_directory="${ROOT}/usr/$(get_libdir)/postfix"
-
 	if [[ ! -e /etc/mail/aliases.db ]] ; then
 		ewarn
 		ewarn "You must edit /etc/mail/aliases to suit your needs"
@@ -250,15 +274,6 @@ pkg_postinst() {
 		ewarn
 	fi
 
-	if [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-
-	elog
 	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
 	elog "for incompatibilities and other major changes between releases."
-	elog
 }
diff --git a/mail-mta/postfix/postfix-2.7.10.ebuild b/mail-mta/postfix/postfix-2.9.4.ebuild
index 87dfcc5918a2..260d2117d948 100644
--- a/mail-mta/postfix/postfix-2.7.10.ebuild
+++ b/mail-mta/postfix/postfix-2.9.4.ebuild
@@ -1,17 +1,17 @@
 # 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.7.10.ebuild,v 1.2 2012/06/04 21:09:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.4.ebuild,v 1.1 2012/08/02 14:02:39 eras Exp $
 
-EAPI=3
+EAPI=4
 
-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.7.8"
-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,20 +20,25 @@ 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 examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
-	ldap? ( >=net-nds/openldap-1.2 )
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2 )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql-base )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( >=dev-libs/openssl-0.9.6g )"
 
 RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
 	net-mail/mailbase
 	selinux? ( sec-policy/selinux-postfix )
 	!mail-mta/courier
@@ -50,27 +55,26 @@ RDEPEND="${DEPEND}
 	!>=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 ..."
+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"
 
@@ -84,46 +88,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 ssl ; then
+	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
+	# 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
+	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"
@@ -135,24 +160,23 @@ 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\\\""
-
 	# 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
 
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
 }
 
 src_install () {
@@ -163,8 +187,12 @@ src_install () {
 	/bin/sh postfix-install \
 		-non-interactive \
 		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
+		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"
 
@@ -189,15 +217,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
-	mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix
-	if use mbox ; then
+	if use mbox; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	else
 		mypostconf="home_mailbox=.maildir/"
@@ -209,27 +235,51 @@ src_install () {
 	newins "${FILESDIR}"/smtp.pass saslpass
 	fperms 600 /etc/postfix/saslpass
 
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix || die "newinitd failed"
+	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"
 
-	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
+	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
+	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}"/usr/$(get_libdir)/postfix/*.cf
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
 }
 
-pkg_postinst() {
-	# Add postfix, postdrop user/group (bug #77565)
-	group_user_check || die "Failed to check/add needed user/group"
+pkg_preinst() {
+	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
+	# check inet_protocols setting in main.cf and modify if necessary to prevent
+	# performance loss with useless DNS lookups and useless connection attempts.
+	[[ -d ${ROOT}/etc/postfix ]] && {
+	if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
+		if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -nh inet_protocols)" ]];
+		then
+			ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
+			ewarn "That will keep the same behaviour as previous postfix versions."
+			ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
+		else
+			# delete inet_protocols setting. there is already one in /etc/postfix
+			sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
+		fi
+	fi
+	}
+}
 
+pkg_postinst() {
 	# Do not install server.{key,pem) SSL certificates if they already exist
 	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
 		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
@@ -238,10 +288,6 @@ pkg_postinst() {
 		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
 	fi
 
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}"/usr/$(get_libdir)/postfix/post-install upgrade-permissions \
-		daemon_directory="${ROOT}/usr/$(get_libdir)/postfix"
-
 	if [[ ! -e /etc/mail/aliases.db ]] ; then
 		ewarn
 		ewarn "You must edit /etc/mail/aliases to suit your needs"
@@ -250,15 +296,19 @@ pkg_postinst() {
 		ewarn
 	fi
 
-	if [[ -e /etc/mailer.conf ]] ; then
-		einfo
-		einfo "mailwrapper support is discontinued."
-		einfo "You may want to 'emerge -C mailwrapper' now."
-		einfo
+	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
-
-	elog
-	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-	elog "for incompatibilities and other major changes between releases."
-	elog
 }