From a66ead5250f95cc7df4be25da0bb9d166d09383f Mon Sep 17 00:00:00 2001
From: Andrej Kacian <ticho@gentoo.org>
Date: Fri, 23 Mar 2007 22:55:14 +0000
Subject: [PATCH] Version bump. Requested by Alexander Stoll <as at
 ha-networks.com> in bug #171769. Removed unneeded 2.3.x ebuilds.
 Package-Manager: portage-2.1.2.2

---
 mail-mta/postfix/ChangeLog                    |  10 +-
 mail-mta/postfix/Manifest                     |  71 +---
 mail-mta/postfix/files/digest-postfix-2.3.0   |   3 -
 .../postfix/files/digest-postfix-2.3.0-r1     |   3 -
 mail-mta/postfix/files/digest-postfix-2.3.2   |   6 -
 .../postfix/files/digest-postfix-2.3.2-r1     |   6 -
 mail-mta/postfix/files/digest-postfix-2.3.4   |   6 -
 ...est-postfix-2.3.5 => digest-postfix-2.3.8} |   6 +-
 mail-mta/postfix/postfix-2.3.0-r1.ebuild      | 388 -----------------
 mail-mta/postfix/postfix-2.3.0.ebuild         | 390 ------------------
 mail-mta/postfix/postfix-2.3.2-r1.ebuild      | 386 -----------------
 mail-mta/postfix/postfix-2.3.2.ebuild         | 386 -----------------
 mail-mta/postfix/postfix-2.3.4.ebuild         | 386 -----------------
 ...tfix-2.3.5.ebuild => postfix-2.3.8.ebuild} |   6 +-
 14 files changed, 31 insertions(+), 2022 deletions(-)
 delete mode 100644 mail-mta/postfix/files/digest-postfix-2.3.0
 delete mode 100644 mail-mta/postfix/files/digest-postfix-2.3.0-r1
 delete mode 100644 mail-mta/postfix/files/digest-postfix-2.3.2
 delete mode 100644 mail-mta/postfix/files/digest-postfix-2.3.2-r1
 delete mode 100644 mail-mta/postfix/files/digest-postfix-2.3.4
 rename mail-mta/postfix/files/{digest-postfix-2.3.5 => digest-postfix-2.3.8} (50%)
 delete mode 100644 mail-mta/postfix/postfix-2.3.0-r1.ebuild
 delete mode 100644 mail-mta/postfix/postfix-2.3.0.ebuild
 delete mode 100644 mail-mta/postfix/postfix-2.3.2-r1.ebuild
 delete mode 100644 mail-mta/postfix/postfix-2.3.2.ebuild
 delete mode 100644 mail-mta/postfix/postfix-2.3.4.ebuild
 rename mail-mta/postfix/{postfix-2.3.5.ebuild => postfix-2.3.8.ebuild} (98%)

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index a69b68a6b178..a6472fe71e66 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.120 2007/02/22 12:06:42 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.121 2007/03/23 22:55:14 ticho Exp $
+
+*postfix-2.3.8 (23 Mar 2007)
+
+  23 Mar 2007; Andrej Kacian <ticho@gentoo.org> -postfix-2.3.0.ebuild,
+  -postfix-2.3.0-r1.ebuild, -postfix-2.3.2.ebuild, -postfix-2.3.2-r1.ebuild,
+  -postfix-2.3.4.ebuild, -postfix-2.3.5.ebuild, +postfix-2.3.8.ebuild:
+  Version bump. Requested by Alexander Stoll <as at ha-networks.com> in bug
+  #171769. Removed unneeded 2.3.x ebuilds.
 
   22 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> postfix-2.3.6.ebuild:
   Stable on alpha as per bug #165326
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 000bf143bc72..3d225934ec50 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -59,14 +59,10 @@ DIST postfix-2.2.5.tar.gz 2428594 RMD160 5508f9662319e655daf8ec8b70fb508f0bb15bb
 DIST postfix-2.2.8-vda.patch.gz 7741 RMD160 c74969b300232900d816df5f5dad7e3178db43ed SHA1 149ad8fc82cc7aad5f5d86b89694efbb79bfef9b SHA256 b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac
 DIST postfix-2.2.8.tar.gz 2434615 RMD160 449a6b417bafbcd598a96979b5de5af40b3f663e SHA1 1949863d07b4590208359c2e81b270c107514e51 SHA256 eb6c5aebafe873b0a9b27fc6abc38ee3fb3b51465c5d5b73318ab15bebfd216b
 DIST postfix-2.2.9.tar.gz 2442158 RMD160 d8da9d83156f4d26e94723398f19570121c62b23 SHA1 f373e2a6c0d3a973644d463590f9845e1b3dc65b SHA256 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
-DIST postfix-2.3.0.tar.gz 2770810 RMD160 41a0f3ea81189dfa2225d22475510e65449c7bef SHA1 fd29896f054c530c6e19a60b3379a277ce90c9b2 SHA256 719ad43cfb032fc94272f63b0bb4bc6930bdf9b48bd539927dbe403a1d53d786
-DIST postfix-2.3.1-vda.patch.gz 7956 RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b SHA1 c006d2d0c2c1d221c183fb8c78bb7eba19adcda4 SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4
-DIST postfix-2.3.2.tar.gz 2774600 RMD160 ce561dcc03e7f6bc1bb3bdd9426175b18571c625 SHA1 cb56e7f8f0d4335cc8beb572ab7aa0423aab2dcf SHA256 151b766389fc8453be01700220e9fb726e202d539f055ce83b9c928b27d44413
 DIST postfix-2.3.3-vda.patch.gz 7944 RMD160 bdbd0798ca4d23c6e8443b26b957b8d0d252da1d SHA1 70c2d41363ead6d9129849e09df551d6ed77920a SHA256 4fdff601e0b2653025c9b9ca8875e995b8052e2e362c3a5e035c3d2859bd4fa2
-DIST postfix-2.3.4.tar.gz 2778860 RMD160 94f38585f12b409270c59241ff0a01c4ff460d96 SHA1 fc928c366bfc181db78173569b53dedd1bedebc6 SHA256 34894637337d260725e2b58666dd6e6d95bfc9c1d1b27d8bdc4cfddcb0818803
-DIST postfix-2.3.5.tar.gz 2782283 RMD160 19215ee77b82ed2235cb669c0704df200fe0ea0f SHA1 f92c55f3e78bb39e78153e14895bb2e718b3c182 SHA256 fcb22c93633ac7949dcd744ba4a8a7a7135554bf60a45d1fad33bde944c43a9c
 DIST postfix-2.3.6.tar.gz 2783743 RMD160 075abdb127ebef529388dcbfe36af277bab9d7d1 SHA1 6675da860f92237357c0f23214131500951d99a8 SHA256 2ae5d7d6d03d26a7f7b4b4aa1f1ab87017352a8bf9541171e318393fe5309fce
 DIST postfix-2.3.7.tar.gz 2785739 RMD160 5d3c1074f2ab02fba60cc5d7251af45bb15c9068 SHA1 caac1243ea3cbb5f60380d5614f48cc21d3cff33 SHA256 5ea8f9f9b205145b23764b226eea0e4cdfd6489cd5fbacadd61580982e46538d
+DIST postfix-2.3.8.tar.gz 2787761 RMD160 2984ca8e81375a3124801c999d23637e745de54c SHA1 c40ebae5cdcd53e13ae8ba5cac1a70167576859b SHA256 f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6
 DIST tls+ipv6-1.26-pf-2.1.5.patch.gz 256725 RMD160 ff2fb005681659476383fe4f32fd1d14e51fa9d9 SHA1 6813eb7d1c1ac9a76a04b7495d540236aa0aa625 SHA256 9ce416069f8dec16a9fc31aee875f8832cd97c167ceee0e572ef10b94ae4849d
 EBUILD postfix-2.1.5-r2.ebuild 7514 RMD160 0a4556b746acf0ed7091aaa528942437fa257bec SHA1 14f3e6dbe45dcb62a9b4de9727c0b24de55d63b3 SHA256 3f0159356689cf4bc7b983d873afb202a7b577a97ed1f3c636fefa3f3aa2efa7
 MD5 d2c39889964cc8084cce24e836797fdb postfix-2.1.5-r2.ebuild 7514
@@ -112,30 +108,6 @@ EBUILD postfix-2.2.9.ebuild 10394 RMD160 a7fc78a07d925b2c769aa9877230b9066042d79
 MD5 44ce7a784b350ebb48fad7412b7c8a0c postfix-2.2.9.ebuild 10394
 RMD160 a7fc78a07d925b2c769aa9877230b9066042d792 postfix-2.2.9.ebuild 10394
 SHA256 922a0983e9eaa028ead6175e100871da62a1fa94321d5c412706a1adbb994c50 postfix-2.2.9.ebuild 10394
-EBUILD postfix-2.3.0-r1.ebuild 11675 RMD160 6364784754791237f3cc05eb7666d8fbcc5e0cfb SHA1 12dc9569150ab8198c0a4776ce663319a90ca9ed SHA256 8d8a5f17d7b2c363f2b212fa1466848964e5b5cf6c4350f0dec21143183e7344
-MD5 2103c3cb1b347d857eac8fb28001a01f postfix-2.3.0-r1.ebuild 11675
-RMD160 6364784754791237f3cc05eb7666d8fbcc5e0cfb postfix-2.3.0-r1.ebuild 11675
-SHA256 8d8a5f17d7b2c363f2b212fa1466848964e5b5cf6c4350f0dec21143183e7344 postfix-2.3.0-r1.ebuild 11675
-EBUILD postfix-2.3.0.ebuild 11825 RMD160 1696ddf19b4456c5e0606902c42042a394c50cb3 SHA1 efa316527d0c8b8c1dc43e50b691a415a6e936ca SHA256 ec110d5026db0e07925015dc27e2b271923bf03fdffb5adcda7700c7eb76eef7
-MD5 cf64dd0d93ec0eefba9b61ed225fd98c postfix-2.3.0.ebuild 11825
-RMD160 1696ddf19b4456c5e0606902c42042a394c50cb3 postfix-2.3.0.ebuild 11825
-SHA256 ec110d5026db0e07925015dc27e2b271923bf03fdffb5adcda7700c7eb76eef7 postfix-2.3.0.ebuild 11825
-EBUILD postfix-2.3.2-r1.ebuild 11692 RMD160 fb1f8d43d3d24fc7caab904b8c128660222aceb9 SHA1 88f76e10f01cd7af90f0adef1b275fc61b51837d SHA256 cba59d1549e9db416985cb27d1890b344dd0926be202de53eeb864ebb36ae8e5
-MD5 7d19d39e7aa9aaa3cf489e132c6d9feb postfix-2.3.2-r1.ebuild 11692
-RMD160 fb1f8d43d3d24fc7caab904b8c128660222aceb9 postfix-2.3.2-r1.ebuild 11692
-SHA256 cba59d1549e9db416985cb27d1890b344dd0926be202de53eeb864ebb36ae8e5 postfix-2.3.2-r1.ebuild 11692
-EBUILD postfix-2.3.2.ebuild 11676 RMD160 696631c14f50ef1fa99cefda43a4f31df3403af5 SHA1 86d05fed48ad64a422cfac157eedd56199fa6546 SHA256 1d700c7a126d996edd33a2fd6896cc4858f5e59cba93e12f7d1f4d5d637d7857
-MD5 d1a4f1a61bc4704f5be14b71b43d2ad5 postfix-2.3.2.ebuild 11676
-RMD160 696631c14f50ef1fa99cefda43a4f31df3403af5 postfix-2.3.2.ebuild 11676
-SHA256 1d700c7a126d996edd33a2fd6896cc4858f5e59cba93e12f7d1f4d5d637d7857 postfix-2.3.2.ebuild 11676
-EBUILD postfix-2.3.4.ebuild 11676 RMD160 52d6c3ef24b048d924de1a5be7cf0078ae3a6264 SHA1 433b2e76ebd34bd634c7b439789adcad5f8b6510 SHA256 083c38e876ec54f31fc5d90248e18bbd9b0ceeaa849f85491033fd72e5e114b1
-MD5 95078cc29e8cd18210f779bfd660c6ff postfix-2.3.4.ebuild 11676
-RMD160 52d6c3ef24b048d924de1a5be7cf0078ae3a6264 postfix-2.3.4.ebuild 11676
-SHA256 083c38e876ec54f31fc5d90248e18bbd9b0ceeaa849f85491033fd72e5e114b1 postfix-2.3.4.ebuild 11676
-EBUILD postfix-2.3.5.ebuild 11677 RMD160 70e325351857816d37481912f34818244d747c25 SHA1 f7c9d820d95758fd077d98d65f11f7ff0fdba5d1 SHA256 4ceb5db79cad5d54a5a5978751f197606ad24420372d6743c9d095952653e2d8
-MD5 8de84129a7f5c9f1af34107e4e07832a postfix-2.3.5.ebuild 11677
-RMD160 70e325351857816d37481912f34818244d747c25 postfix-2.3.5.ebuild 11677
-SHA256 4ceb5db79cad5d54a5a5978751f197606ad24420372d6743c9d095952653e2d8 postfix-2.3.5.ebuild 11677
 EBUILD postfix-2.3.6.ebuild 11672 RMD160 938efa0772b6abd1433e3ce0f691006876ff1093 SHA1 affae7361c2a8e867ff11b1f8eff07ace0d605a9 SHA256 a7cbe00742a28915582b09989cbc32de3537c8f45fbf95962fade77cf2be1866
 MD5 0cc86cb90b5a37bcf360a29b29b787e4 postfix-2.3.6.ebuild 11672
 RMD160 938efa0772b6abd1433e3ce0f691006876ff1093 postfix-2.3.6.ebuild 11672
@@ -144,10 +116,14 @@ EBUILD postfix-2.3.7.ebuild 11682 RMD160 76a98d9da7ece2df1fcb1712948039fc22d3a1a
 MD5 b175fcb97a401316bb4807706bd4b81f postfix-2.3.7.ebuild 11682
 RMD160 76a98d9da7ece2df1fcb1712948039fc22d3a1a8 postfix-2.3.7.ebuild 11682
 SHA256 6103e0e6f1b941ae73b284b87a2b28f06d5ef7b91a8faa5bc3afdeb68a81e8ff postfix-2.3.7.ebuild 11682
-MISC ChangeLog 41894 RMD160 97ed1cfe013128976eefdabe4ba2598593abaaf7 SHA1 3fcf694eca7d96971472b94ae30ec47f6aa26880 SHA256 416921ddd7e941e2780ad522620132da8fddbec7573bd220e9521be306dc8e7b
-MD5 68d7ef40e0993448cd3fadde96d6f7d7 ChangeLog 41894
-RMD160 97ed1cfe013128976eefdabe4ba2598593abaaf7 ChangeLog 41894
-SHA256 416921ddd7e941e2780ad522620132da8fddbec7573bd220e9521be306dc8e7b ChangeLog 41894
+EBUILD postfix-2.3.8.ebuild 11682 RMD160 c9e82ff8ddb0a6ed02ec899b2a4e55551f803ff6 SHA1 e8063c011197200ca6ecd484d6b3fa3c6931512e SHA256 7e3c0961fc6b97ecf01bb2057ab6beb27688bc323f0c65debc84ec203a0c6bdc
+MD5 d481060a5fbd927a62e15547ebbd5348 postfix-2.3.8.ebuild 11682
+RMD160 c9e82ff8ddb0a6ed02ec899b2a4e55551f803ff6 postfix-2.3.8.ebuild 11682
+SHA256 7e3c0961fc6b97ecf01bb2057ab6beb27688bc323f0c65debc84ec203a0c6bdc postfix-2.3.8.ebuild 11682
+MISC ChangeLog 42263 RMD160 6fbfe6c88ce814ad9495cb9940f531db5f13e494 SHA1 84a638da363ffe2b36029fd6c21ede5fb6005dc4 SHA256 24bb2408a6efaa5b1fadc01ce916f3676661da1fd61889f59e306c16f10badcb
+MD5 fddb6eee643d73d7ec112af464aa3644 ChangeLog 42263
+RMD160 6fbfe6c88ce814ad9495cb9940f531db5f13e494 ChangeLog 42263
+SHA256 24bb2408a6efaa5b1fadc01ce916f3676661da1fd61889f59e306c16f10badcb ChangeLog 42263
 MISC metadata.xml 253 RMD160 27155323556701c38934832ee9970634a088bb5b SHA1 6c1c3f1fda858526944eb427f5bec79da119da0d SHA256 38f168ad00f8b59ee75efaf002d442b2793f280dafc70955c70920e974c6dfe0
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 RMD160 27155323556701c38934832ee9970634a088bb5b metadata.xml 253
@@ -185,34 +161,19 @@ SHA256 87e695782c1576b03d3df22343492407cdc3d2bb70f259df7c108ccda29fdd54 files/di
 MD5 dca94aada71eb97635d0f7cd638fb386 files/digest-postfix-2.2.9-r1 497
 RMD160 f092a227a28b062391e481a7239f82c7e841283b files/digest-postfix-2.2.9-r1 497
 SHA256 87e695782c1576b03d3df22343492407cdc3d2bb70f259df7c108ccda29fdd54 files/digest-postfix-2.2.9-r1 497
-MD5 1822c39a5e1fb331c5a851b3bec380d7 files/digest-postfix-2.3.0 244
-RMD160 c30245e65a83590d13fa9521293d964ceee41d6b files/digest-postfix-2.3.0 244
-SHA256 78de95c0458c01817f10eb8571dbbc2abc8402b996d9b5dba0a020baa9a664b1 files/digest-postfix-2.3.0 244
-MD5 1822c39a5e1fb331c5a851b3bec380d7 files/digest-postfix-2.3.0-r1 244
-RMD160 c30245e65a83590d13fa9521293d964ceee41d6b files/digest-postfix-2.3.0-r1 244
-SHA256 78de95c0458c01817f10eb8571dbbc2abc8402b996d9b5dba0a020baa9a664b1 files/digest-postfix-2.3.0-r1 244
-MD5 42265b1f69d2eb61de005c14c3f3fb42 files/digest-postfix-2.3.2 497
-RMD160 00b75d6c8eb2dc1ae2752f5821ae78f3519ac2fc files/digest-postfix-2.3.2 497
-SHA256 d7269905f65bd19fb4e45e019e21c187a44a45b90c657bd85481ae8d2af31812 files/digest-postfix-2.3.2 497
-MD5 42265b1f69d2eb61de005c14c3f3fb42 files/digest-postfix-2.3.2-r1 497
-RMD160 00b75d6c8eb2dc1ae2752f5821ae78f3519ac2fc files/digest-postfix-2.3.2-r1 497
-SHA256 d7269905f65bd19fb4e45e019e21c187a44a45b90c657bd85481ae8d2af31812 files/digest-postfix-2.3.2-r1 497
-MD5 ee0147c0d30f8189a460f8dee9747491 files/digest-postfix-2.3.4 497
-RMD160 217f1bb81614d171aae3228197feda5997f0cc8f files/digest-postfix-2.3.4 497
-SHA256 c267be4088f3b39c4bda57d1fb40ce62274ce0d7556506d9511e1861497f9420 files/digest-postfix-2.3.4 497
-MD5 a8d1408c995d0bed73def99a4c4af2f9 files/digest-postfix-2.3.5 497
-RMD160 53d7f5c9507048d907669b6927201da1eba787b0 files/digest-postfix-2.3.5 497
-SHA256 1336b2c5aaf8a7d742ae934d03d45c6dbae8115c726f4ab55b64ab59a7371b4e files/digest-postfix-2.3.5 497
 MD5 dd8759f7f27a498270fdad66b5d69ebd files/digest-postfix-2.3.6 497
 RMD160 d41cec854b920342888d252c4bc412323962cef8 files/digest-postfix-2.3.6 497
 SHA256 c2ad49d669c0a970ea3af7c3485898e0cfd7762418d526e8654b84c9efc1d820 files/digest-postfix-2.3.6 497
 MD5 debce05fa9fb2bd1e3985ed30dfb44cb files/digest-postfix-2.3.7 497
 RMD160 3ee7f86ba4b8e3b3e26d7937cd7d9b611788ab03 files/digest-postfix-2.3.7 497
 SHA256 6d3dddedea52c61a4f900d33601f1343521a68185ecb18a65e09fb1173b26bbc files/digest-postfix-2.3.7 497
+MD5 8e03a4793fdbe095803afcdef12ea9c6 files/digest-postfix-2.3.8 497
+RMD160 3557801f5b54683dacb56a00614b8ea46e865ad0 files/digest-postfix-2.3.8 497
+SHA256 b8294770197613e1d50b69e88044824637c2de976ec848e9f3e749a331471382 files/digest-postfix-2.3.8 497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF3YdkViELBEf1JB0RAtngAJ4gqAnpdXUaHwjClMs6WhEhvFWGxQCfa3ys
-mkK45LgHIDaszpV26W6qVIQ=
-=2Pmi
+iD8DBQFGBFrZQlM6RnzZP+IRAlMkAKCKaolbV3bv0tmFBkpeWtBqb/eIzwCgwi/b
+2qBsYVx1QCsad3H6Gws7sRI=
+=V4oB
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.0 b/mail-mta/postfix/files/digest-postfix-2.3.0
deleted file mode 100644
index 1a0409c99320..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72a714e0cc8a5fdbe770359ae965e09b postfix-2.3.0.tar.gz 2770810
-RMD160 41a0f3ea81189dfa2225d22475510e65449c7bef postfix-2.3.0.tar.gz 2770810
-SHA256 719ad43cfb032fc94272f63b0bb4bc6930bdf9b48bd539927dbe403a1d53d786 postfix-2.3.0.tar.gz 2770810
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.0-r1 b/mail-mta/postfix/files/digest-postfix-2.3.0-r1
deleted file mode 100644
index 1a0409c99320..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72a714e0cc8a5fdbe770359ae965e09b postfix-2.3.0.tar.gz 2770810
-RMD160 41a0f3ea81189dfa2225d22475510e65449c7bef postfix-2.3.0.tar.gz 2770810
-SHA256 719ad43cfb032fc94272f63b0bb4bc6930bdf9b48bd539927dbe403a1d53d786 postfix-2.3.0.tar.gz 2770810
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.2 b/mail-mta/postfix/files/digest-postfix-2.3.2
deleted file mode 100644
index 6bb968542f6e..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fc7c1676ceecbfb414353af1dafe11de postfix-2.3.1-vda.patch.gz 7956
-RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b postfix-2.3.1-vda.patch.gz 7956
-SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4 postfix-2.3.1-vda.patch.gz 7956
-MD5 b1e482eea6a340041b8a637e62b15e3c postfix-2.3.2.tar.gz 2774600
-RMD160 ce561dcc03e7f6bc1bb3bdd9426175b18571c625 postfix-2.3.2.tar.gz 2774600
-SHA256 151b766389fc8453be01700220e9fb726e202d539f055ce83b9c928b27d44413 postfix-2.3.2.tar.gz 2774600
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.2-r1 b/mail-mta/postfix/files/digest-postfix-2.3.2-r1
deleted file mode 100644
index 6bb968542f6e..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fc7c1676ceecbfb414353af1dafe11de postfix-2.3.1-vda.patch.gz 7956
-RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b postfix-2.3.1-vda.patch.gz 7956
-SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4 postfix-2.3.1-vda.patch.gz 7956
-MD5 b1e482eea6a340041b8a637e62b15e3c postfix-2.3.2.tar.gz 2774600
-RMD160 ce561dcc03e7f6bc1bb3bdd9426175b18571c625 postfix-2.3.2.tar.gz 2774600
-SHA256 151b766389fc8453be01700220e9fb726e202d539f055ce83b9c928b27d44413 postfix-2.3.2.tar.gz 2774600
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.4 b/mail-mta/postfix/files/digest-postfix-2.3.4
deleted file mode 100644
index 8d8f463143f1..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.3.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fc7c1676ceecbfb414353af1dafe11de postfix-2.3.1-vda.patch.gz 7956
-RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b postfix-2.3.1-vda.patch.gz 7956
-SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4 postfix-2.3.1-vda.patch.gz 7956
-MD5 78942b38639aee30b637f1c15c0b3fc9 postfix-2.3.4.tar.gz 2778860
-RMD160 94f38585f12b409270c59241ff0a01c4ff460d96 postfix-2.3.4.tar.gz 2778860
-SHA256 34894637337d260725e2b58666dd6e6d95bfc9c1d1b27d8bdc4cfddcb0818803 postfix-2.3.4.tar.gz 2778860
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.5 b/mail-mta/postfix/files/digest-postfix-2.3.8
similarity index 50%
rename from mail-mta/postfix/files/digest-postfix-2.3.5
rename to mail-mta/postfix/files/digest-postfix-2.3.8
index fe111afd1694..60f803964071 100644
--- a/mail-mta/postfix/files/digest-postfix-2.3.5
+++ b/mail-mta/postfix/files/digest-postfix-2.3.8
@@ -1,6 +1,6 @@
 MD5 3506ab432360766b6a2708042b29943a postfix-2.3.3-vda.patch.gz 7944
 RMD160 bdbd0798ca4d23c6e8443b26b957b8d0d252da1d postfix-2.3.3-vda.patch.gz 7944
 SHA256 4fdff601e0b2653025c9b9ca8875e995b8052e2e362c3a5e035c3d2859bd4fa2 postfix-2.3.3-vda.patch.gz 7944
-MD5 ccdaccbf4c77abbab039a44f9e92a560 postfix-2.3.5.tar.gz 2782283
-RMD160 19215ee77b82ed2235cb669c0704df200fe0ea0f postfix-2.3.5.tar.gz 2782283
-SHA256 fcb22c93633ac7949dcd744ba4a8a7a7135554bf60a45d1fad33bde944c43a9c postfix-2.3.5.tar.gz 2782283
+MD5 a6c560657788fc7a5444fa9ea32f5513 postfix-2.3.8.tar.gz 2787761
+RMD160 2984ca8e81375a3124801c999d23637e745de54c postfix-2.3.8.tar.gz 2787761
+SHA256 f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6 postfix-2.3.8.tar.gz 2787761
diff --git a/mail-mta/postfix/postfix-2.3.0-r1.ebuild b/mail-mta/postfix/postfix-2.3.0-r1.ebuild
deleted file mode 100644
index 30376b3bf3d6..000000000000
--- a/mail-mta/postfix/postfix-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,388 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.0-r1.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this is ebuild is for mailer-config support
-
-# regular ebuild
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb"
-# mailer-config support.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.2.8
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-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://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-#PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	!mailwrapper? ( !virtual/mta )
-#	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-#	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# SASL_README patch. remove when upstream release new revision.
-	epatch "${FILESDIR}/${P}-SASL_README.patch"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	# not yet available as of 07/13/06.
-	#if use vda ; then
-	#	epatch "${WORKDIR}/${VDA_P}.patch"
-	#fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -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 -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	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"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			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/lib/postfix\\\""
-	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\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		#insinto /etc/mail
-		#doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	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.
-	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,post*-*} ${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"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		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."
-	fi
-
-	# regular ebuild
-	#if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	#then
-	#	einfo
-	#	einfo "Since you emerged $PN without mailwrapper in USE,"
-	#	einfo "you probably want to 'emerge -C mailwrapper' now."
-	#	einfo
-	#fi
-	# mailer-config support
-	mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.0.ebuild b/mail-mta/postfix/postfix-2.3.0.ebuild
deleted file mode 100644
index 810336af785b..000000000000
--- a/mail-mta/postfix/postfix-2.3.0.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.0.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this ebuild is regular ebuild without mailer-config support
-# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to mailer-config supported ebuild.
-
-# regular ebuild
-inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb"
-# mailer-config support.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.2.8
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-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://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# SASL_README patch. remove when upstream release new revision.
-	epatch "${FILESDIR}/${P}-SASL_README.patch"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	# not yet available as of 07/13/06.
-	#if use vda ; then
-	#	epatch "${WORKDIR}/${VDA_P}.patch"
-	#fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -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 -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	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"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			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/lib/postfix\\\""
-	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\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		#mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	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.
-	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,post*-*} ${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"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		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."
-	fi
-
-	# regular ebuild
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-	# mailer-config support
-	#mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.2-r1.ebuild b/mail-mta/postfix/postfix-2.3.2-r1.ebuild
deleted file mode 100644
index 7ec06d04c661..000000000000
--- a/mail-mta/postfix/postfix-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.2-r1.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this ebuild is regular ebuild without mailer-config support
-# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to mailer-config supported ebuild.
-
-# regular ebuild
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb vda"
-# mailer-config support.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb vda"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.3.1
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-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://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-#PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	!mailwrapper? ( !virtual/mta )
-#	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-#	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -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 -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	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"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			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/lib/postfix\\\""
-	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\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		#insinto /etc/mail
-		#doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	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.
-	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,post*-*} ${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"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		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."
-	fi
-
-	# regular ebuild
-	#if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	#then
-	#	einfo
-	#	einfo "Since you emerged $PN without mailwrapper in USE,"
-	#	einfo "you probably want to 'emerge -C mailwrapper' now."
-	#	einfo
-	#fi
-	# mailer-config support
-	mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.2.ebuild b/mail-mta/postfix/postfix-2.3.2.ebuild
deleted file mode 100644
index c5ffb4d15028..000000000000
--- a/mail-mta/postfix/postfix-2.3.2.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.2.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this ebuild is regular ebuild without mailer-config support
-# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to mailer-config supported ebuild.
-
-# regular ebuild
-inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb vda"
-# mailer-config support.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.3.1
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-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://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -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 -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	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"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			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/lib/postfix\\\""
-	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\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		#mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	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.
-	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,post*-*} ${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"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		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."
-	fi
-
-	# regular ebuild
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-	# mailer-config support
-	#mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.4.ebuild b/mail-mta/postfix/postfix-2.3.4.ebuild
deleted file mode 100644
index 055917d38ca9..000000000000
--- a/mail-mta/postfix/postfix-2.3.4.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.4.ebuild,v 1.2 2006/11/23 20:28:34 vivo Exp $
-
-# NOTE: this ebuild is regular ebuild without mailer-config support
-# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
-# to turn this ebuild to mailer-config supported ebuild.
-
-# regular ebuild
-inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
-# mailer-config support.
-#inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
-
-# regular ebuild.
-IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb vda"
-# mailer-config support.
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
-
-MY_PV=${PV/_rc/-RC}
-MY_SRC=${PN}-${MY_PV}
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_VER=2.3.1
-VDA_P="${PN}-${VDA_VER}-vda"
-RC_VER="2.2.9"
-
-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://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
-#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
-
-LICENSE="IPL-1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# regular ebuild.
-PROVIDE="virtual/mta virtual/mda"
-# mailer-config support.
-#PROVIDE="${PROVIDE} virtual/mda"
-
-DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )"
-
-# regular ebuild.
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	selinux? ( sec-policy/selinux-postfix )"
-
-# mailer-config support.
-#RDEPEND="${DEPEND}
-#	>=net-mail/mailbase-0.00
-#	selinux? ( sec-policy/selinux-postfix )"
-
-#if use devel; then
-#	MY_SRC=${DEV_SRC}
-#fi
-
-S=${WORKDIR}/${MY_SRC}
-
-group_user_check() {
-	einfo "checking for postfix group...	create if missing."
-	enewgroup postfix 207
-	einfo "checking for postdrop group...	create if missing."
-	enewgroup postdrop 208
-	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
-}
-
-pkg_setup() {
-	# do not upgrade live from postfix <2.3.
-	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.3.0' ; then
-			if [ "${FORCE_UPGRADE}" ]; then
-				echo
-				ewarn "You are upgrading from a incompatible version and"
-				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
-				ewarn "You MUST stop postfix BEFORE install it to your system."
-				echo
-			else
-				echo
-				eerror "You are upgrading from a incompatible version."
-				eerror "You MUST stop postfix BEFORE install it to your system."
-				eerror "If you want a minimal downtime, emerge postfix with:"
-				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
-				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
-				eerror "run etc-update or dispatch-conf and merge the configuration files."
-				eerror "Next /etc/init.d/postfix start"
-				die "upgrade from an incompatible version!"
-				echo
-			fi
-
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 5 seconds before continuing."
-			echo
-			epause 5
-		fi
-	fi
-
-	echo
-	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
-	ewarn "for incompatible changes before continue."
-	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
-	ewarn "assign to \"net-mail@gentoo.org\"."
-	echo
-	#epause 5
-
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	#epause 5
-	fi
-
-	#TLS non-prod warn
-	if use ssl; then
-		echo
-		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
-		ewarn "This service entry is incompatible with previous TLS patch."
-		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		echo
-	#epause 5
-	fi
-
-	# IPV6 non-prod warn
-	if use ipv6; then
-		echo
-		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
-		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
-		echo
-	fi
-
-	if use sasl ; then
-		echo
-		elog "postfix 2.3 supports two SASL implementations."
-		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
-		elog "detail at http://www.postfix.org/SASL_README.html"
-		echo
-	fi
-
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-master.cf.patch"
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-}
-
-src_compile() {
-	cd ${S}
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -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 -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	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"
-		CDB_LIBS=""
-
-		# tinycdb is preferred.
-		if has_version dev-db/tinycdb; then
-			einfo "build with dev-db/tinycdb"
-			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
-				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
-			CDB_LIBS="-ltinycdb"
-		else
-			CDB_PATH="/usr/lib"
-			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/lib/postfix\\\""
-	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\\\""
-
-	ebegin "Starting make makefiles..."
-
-	local my_cc=$(tc-getCC)
-	einfo "CC=${my_cc:=gcc}"
-
-	# workaround for bug #76512
-	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
-
-	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# mailwrapper stuff
-	if use mailwrapper ; then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
-		# mailer-config support
-		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-postfix.1"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-postfix.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-postfix.1"
-		mv "${D}/usr/share/man/man5/aliases.5" \
-			"${D}/usr/share/man/man5/aliases-postfix.5"
-
-		# regular ebuild.
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-		# mailer-config support
-		#mailer_install_conf
-	else
-		# Provide another link for legacy FSH.
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# performance tuning tools.
-	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.
-	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,post*-*} ${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"
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	# add postfix, postdrop user/group. Bug #77565.
-	group_user_check || die "failed to check/add needed user/group"
-
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		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."
-	fi
-
-	# regular ebuild
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-	# mailer-config support
-	#mailer_pkg_postinst
-}
diff --git a/mail-mta/postfix/postfix-2.3.5.ebuild b/mail-mta/postfix/postfix-2.3.8.ebuild
similarity index 98%
rename from mail-mta/postfix/postfix-2.3.5.ebuild
rename to mail-mta/postfix/postfix-2.3.8.ebuild
index a44e6ead7563..44577fb3135c 100644
--- a/mail-mta/postfix/postfix-2.3.5.ebuild
+++ b/mail-mta/postfix/postfix-2.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.5.ebuild,v 1.1 2006/12/24 18:36:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8.ebuild,v 1.1 2007/03/23 22:55:14 ticho Exp $
 
 # NOTE: this ebuild is regular ebuild without mailer-config support
 # comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -73,7 +73,7 @@ group_user_check() {
 	einfo "checking for postdrop group...	create if missing."
 	enewgroup postdrop 208
 	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
 }
 
 pkg_setup() {
-- 
2.26.2