General cleanup. Fix bugs. See ChangeLog for details.

Package-Manager: portage-2.1.2.3

31 files changed, 722 insertions, 1636 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 63078c6a955a..cdf010db8a57 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.146 2007/03/30 16:52:17 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.147 2007/04/07 01:08:00 chtekk Exp $
+
+*courier-imap-4.1.2-r1 (07 Apr 2007)
+*courier-imap-4.0.6-r2 (07 Apr 2007)
+
+  07 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-3.0.7-db4-configure.in.patch,
+  -files/courier-imap-3.0.7-disable-fam-configure.in.patch,
+  +files/courier-imap-4.0.6-aclocal-fix.patch,
+  files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
+  files/courier-imap-4.0.6-db4-configure.in.patch,
+  files/courier-imap-4.0.6-r1-courier-imapd.indirect,
+  files/courier-imap-4.0.6-r1-courier-imapd.rc6,
+  files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,
+  files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
+  files/courier-imap-4.0.6-r1-courier-pop3d.rc6,
+  files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,
+  files/courier-imap-4.0.6-r1-gentoo-imapd.rc,
+  files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,
+  files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,
+  files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-4.1.2-aclocal-fix.patch,
+  -files/courier-imap-4.1.2-db4-configure.in.patch, metadata.xml,
+  -courier-imap-3.0.7.ebuild, -courier-imap-4.0.6.ebuild,
+  -courier-imap-4.0.6-r1.ebuild, +courier-imap-4.0.6-r2.ebuild,
+  -courier-imap-4.1.2.ebuild, +courier-imap-4.1.2-r1.ebuild:
+  Remove old/unused versions with redundant/unstable keywords. General ebuild
+  cleanup for 4.0.6-r2 and 4.1.2-r1. Cleanup of init-scripts and patches. Fix
+  security bug #168196 and autotools handling bug #160037.
 
   30 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
   courier-imap-4.1.2.ebuild:
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 04f643d248e7..5d7d3fdedb02 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX authdaemond-3.0.4-r1 1062 RMD160 5e9184dc8c8ccbb528252c0795b5cd62b1d1b9c8 SHA1 55180242453ee47c951d265615da7a0902a5dc1f SHA256 2731b87fec98ae4ecdb5cfdb5917894e28eaf768f68555462d801c116cfa2a0d
 MD5 71a551a4f772f4299f9752f3d043b8c5 files/authdaemond-3.0.4-r1 1062
 RMD160 5e9184dc8c8ccbb528252c0795b5cd62b1d1b9c8 files/authdaemond-3.0.4-r1 1062
@@ -9,18 +6,6 @@ AUX authdaemond.conf-3.0.4-r1 544 RMD160 52c3d3ec3c720ef36d03b531e9f4408149769d1
 MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
 RMD160 52c3d3ec3c720ef36d03b531e9f4408149769d19 files/authdaemond.conf-3.0.4-r1 544
 SHA256 6bbf884df95152b5f8e1b0cd404a1833c1e337ccd44360156296122d2c9bb72f files/authdaemond.conf-3.0.4-r1 544
-AUX courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 SHA1 72cc2d43835efe8833ece60602ebd839d5480729 SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73
-MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263
-RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263
-SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73 files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263
-AUX courier-imap-3.0.7-db4-configure.in.patch 1337 RMD160 61f09bd94189576acc3b41a5aee9605d1f0c95de SHA1 e06ef1f954e0c0deaabe548abe559525d2fe918a SHA256 5f749b10f53d3a631af65f3766f3d72e54603761b164a2a656a59aee78c67939
-MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.7-db4-configure.in.patch 1337
-RMD160 61f09bd94189576acc3b41a5aee9605d1f0c95de files/courier-imap-3.0.7-db4-configure.in.patch 1337
-SHA256 5f749b10f53d3a631af65f3766f3d72e54603761b164a2a656a59aee78c67939 files/courier-imap-3.0.7-db4-configure.in.patch 1337
-AUX courier-imap-3.0.7-disable-fam-configure.in.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
-MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
-RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
-SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
 AUX courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 SHA1 72cc2d43835efe8833ece60602ebd839d5480729 SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73
 MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263
 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263
@@ -117,70 +102,66 @@ AUX courier-imap-4.0.4-courier-pop3d.rc6 937 RMD160 aa08726aefd6fd3dad6cf2003de8
 MD5 39f278a2acfa843594dc20efedefc97f files/courier-imap-4.0.4-courier-pop3d.rc6 937
 RMD160 aa08726aefd6fd3dad6cf2003de853869eb2d71a files/courier-imap-4.0.4-courier-pop3d.rc6 937
 SHA256 70c526347c8c53888df1bc6602d242376e9ef885a2b125d5292363c082dc4fca files/courier-imap-4.0.4-courier-pop3d.rc6 937
-AUX courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1596 RMD160 4181b19b76f32a215ba128008a05debabad8550c SHA1 ee09d483434368ce6332eb8cf36a0f220f448bd8 SHA256 9c715dccaac533e151c194aaf0900cc89d6650c3704b7e87125cf6b2cd10a5a3
-MD5 e96a64b0b8a1ea09ba59b9f79dfbd829 files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1596
-RMD160 4181b19b76f32a215ba128008a05debabad8550c files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1596
-SHA256 9c715dccaac533e151c194aaf0900cc89d6650c3704b7e87125cf6b2cd10a5a3 files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1596
-AUX courier-imap-4.0.6-db4-configure.in.patch 1623 RMD160 10dcea6643be49b1be4241a02cd153a508898332 SHA1 8d3b10d1ba88f7714831a0908d177c0a21e658bd SHA256 809e730d6fb147bc1e8b59c6f23127cf3a38b14a00d723161cd6c85b1ab5e957
-MD5 c1fdae0da5552decc362bc031c3a4b5b files/courier-imap-4.0.6-db4-configure.in.patch 1623
-RMD160 10dcea6643be49b1be4241a02cd153a508898332 files/courier-imap-4.0.6-db4-configure.in.patch 1623
-SHA256 809e730d6fb147bc1e8b59c6f23127cf3a38b14a00d723161cd6c85b1ab5e957 files/courier-imap-4.0.6-db4-configure.in.patch 1623
+AUX courier-imap-4.0.6-aclocal-fix.patch 237 RMD160 005a1b1bcff427b747b5fdae0fbe678367e7ebfa SHA1 9593c438e8b6be719d1685f5398659bb841f115b SHA256 2bc930268fd9c1565f2dfc341557de4a6e4f867131b279d52d47d285e5f62579
+MD5 6bc6bdd51134d2e511c32ba363a5c513 files/courier-imap-4.0.6-aclocal-fix.patch 237
+RMD160 005a1b1bcff427b747b5fdae0fbe678367e7ebfa files/courier-imap-4.0.6-aclocal-fix.patch 237
+SHA256 2bc930268fd9c1565f2dfc341557de4a6e4f867131b279d52d47d285e5f62579 files/courier-imap-4.0.6-aclocal-fix.patch 237
+AUX courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1558 RMD160 ae5866697c98a760e11927faa69687b942795ff3 SHA1 e6fd4defb33644d806679e00f2eb056e7f72170e SHA256 208e443f2730237ee8ae858eb21c3895c83651fbaacda881bdf46076b5182db7
+MD5 b46f583246cc13380e238597f9549550 files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1558
+RMD160 ae5866697c98a760e11927faa69687b942795ff3 files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1558
+SHA256 208e443f2730237ee8ae858eb21c3895c83651fbaacda881bdf46076b5182db7 files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1558
+AUX courier-imap-4.0.6-db4-configure.in.patch 1497 RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 SHA1 349ad8d16c05ba0c7a7231b092286f48fecca54b SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c
+MD5 3d90d6cacf8a4c23c09d3a198f509c62 files/courier-imap-4.0.6-db4-configure.in.patch 1497
+RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 files/courier-imap-4.0.6-db4-configure.in.patch 1497
+SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c files/courier-imap-4.0.6-db4-configure.in.patch 1497
 AUX courier-imap-4.0.6-db4-tcpd_configure.in.patch 264 RMD160 49e1deaa1d006b1f3bd8d68ebad037fd934d3d06 SHA1 836208b414a72cf426a17e27f4c6dcf3c88138f3 SHA256 553b9b20afad380b2901318b6b2152b14c1f26ed3bfe26126364284f143cdd21
 MD5 4571f9dc2735dd1f8e53eaafe4c4bdf9 files/courier-imap-4.0.6-db4-tcpd_configure.in.patch 264
 RMD160 49e1deaa1d006b1f3bd8d68ebad037fd934d3d06 files/courier-imap-4.0.6-db4-tcpd_configure.in.patch 264
 SHA256 553b9b20afad380b2901318b6b2152b14c1f26ed3bfe26126364284f143cdd21 files/courier-imap-4.0.6-db4-tcpd_configure.in.patch 264
-AUX courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1183 RMD160 06e216bac647def373ea24fcef13e22825c3ed17 SHA1 35f814a65e79a87709a57e18fcc1b3f9ea442be8 SHA256 8d80d80cc06cc2855bef882f77dc17ccd06bd0062ce77beb11055c1fd4ccb485
-MD5 182d79e3ae41c713e5292dfb4043fbe5 files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1183
-RMD160 06e216bac647def373ea24fcef13e22825c3ed17 files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1183
-SHA256 8d80d80cc06cc2855bef882f77dc17ccd06bd0062ce77beb11055c1fd4ccb485 files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1183
-AUX courier-imap-4.0.6-r1-courier-imapd.indirect 85 RMD160 3b6790ccee0c7271c23f76a393b9d0a0d0b575ef SHA1 807e2294f80b95f0bae856a64774ffed7175dbef SHA256 96f7cd8cb1f4817be039df630b0e5da3838530955881b7217527307514b1b8a3
-MD5 8e5fabd0adf4a3c6a496e2a220a14e10 files/courier-imap-4.0.6-r1-courier-imapd.indirect 85
-RMD160 3b6790ccee0c7271c23f76a393b9d0a0d0b575ef files/courier-imap-4.0.6-r1-courier-imapd.indirect 85
-SHA256 96f7cd8cb1f4817be039df630b0e5da3838530955881b7217527307514b1b8a3 files/courier-imap-4.0.6-r1-courier-imapd.indirect 85
-AUX courier-imap-4.0.6-r1-courier-imapd.rc6 938 RMD160 94964c9d8763dd53bc64bc764ccb6cb18fbe20b6 SHA1 98aac67bdb3882b8d7e337c43248d93a5e056690 SHA256 86f63733187b408dbcfd173e22f16ac5c0d29ec18971cfe321d3ef1506ca9e4f
-MD5 707a227e7d86690861b2dba5696e74c7 files/courier-imap-4.0.6-r1-courier-imapd.rc6 938
-RMD160 94964c9d8763dd53bc64bc764ccb6cb18fbe20b6 files/courier-imap-4.0.6-r1-courier-imapd.rc6 938
-SHA256 86f63733187b408dbcfd173e22f16ac5c0d29ec18971cfe321d3ef1506ca9e4f files/courier-imap-4.0.6-r1-courier-imapd.rc6 938
-AUX courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1191 RMD160 c87240aa2addfa2a10c588fc2339fedd3a82ef70 SHA1 77b11cca7c911fff9f5de9e55ac95462843504f2 SHA256 6121adab2453464b2c9b112255df4dcb4120dc02305cae6ef881775b128e4a30
-MD5 ce0408bd68bf5fe2d7446f872568beb5 files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1191
-RMD160 c87240aa2addfa2a10c588fc2339fedd3a82ef70 files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1191
-SHA256 6121adab2453464b2c9b112255df4dcb4120dc02305cae6ef881775b128e4a30 files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1191
-AUX courier-imap-4.0.6-r1-courier-pop3d.indirect 85 RMD160 f0750ff2a958b9a24112c9352bdc6a70b4a077f4 SHA1 6b7859075554104f0fe04f1e74fde2565a77e65d SHA256 df03082133b598631c4e47b5f448bba385f5993c0bd55a4eca9637b8176d8593
-MD5 a7541301dc4597f7eb5193b047f00b4b files/courier-imap-4.0.6-r1-courier-pop3d.indirect 85
-RMD160 f0750ff2a958b9a24112c9352bdc6a70b4a077f4 files/courier-imap-4.0.6-r1-courier-pop3d.indirect 85
-SHA256 df03082133b598631c4e47b5f448bba385f5993c0bd55a4eca9637b8176d8593 files/courier-imap-4.0.6-r1-courier-pop3d.indirect 85
-AUX courier-imap-4.0.6-r1-courier-pop3d.rc6 946 RMD160 6a4e665c2a6a501ef31e2020f86bd02b41a40395 SHA1 e805b1dadfbb2be6f06068c01ff7585ee1ca06ff SHA256 a8a7a24fce1e933076bdcfcfdcd417e6357f433852dd879f3ddee54ce341a29e
-MD5 9e28035cda81928e137c4951bb5ffeb6 files/courier-imap-4.0.6-r1-courier-pop3d.rc6 946
-RMD160 6a4e665c2a6a501ef31e2020f86bd02b41a40395 files/courier-imap-4.0.6-r1-courier-pop3d.rc6 946
-SHA256 a8a7a24fce1e933076bdcfcfdcd417e6357f433852dd879f3ddee54ce341a29e files/courier-imap-4.0.6-r1-courier-pop3d.rc6 946
-AUX courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 1162 RMD160 eeef2f4c5690a1dce594da5b9d99b1315c2b5ca7 SHA1 5febf4fc4d568e8ef2250b2ebce16ef44c82ad9a SHA256 2055f9bfe80978aa1e17855a6d1a9a1c903a9c67c67c06e6eba80954f144078a
-MD5 bf7ca5a232429518a7c301f7aa6a9d98 files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 1162
-RMD160 eeef2f4c5690a1dce594da5b9d99b1315c2b5ca7 files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 1162
-SHA256 2055f9bfe80978aa1e17855a6d1a9a1c903a9c67c67c06e6eba80954f144078a files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 1162
-AUX courier-imap-4.0.6-r1-gentoo-imapd.rc 1199 RMD160 5b6239e5d5e2dd4b533ad427364032bc2121b1c3 SHA1 461c2c1f9f6ef872858babc0623f24a6ef199508 SHA256 d0276deff2a43fa7ef553bd0cdad7c3ff7705b7127336bef3b2f897e15ccfc6b
-MD5 2cb29266ee4b1af3622723466c4ba8ca files/courier-imap-4.0.6-r1-gentoo-imapd.rc 1199
-RMD160 5b6239e5d5e2dd4b533ad427364032bc2121b1c3 files/courier-imap-4.0.6-r1-gentoo-imapd.rc 1199
-SHA256 d0276deff2a43fa7ef553bd0cdad7c3ff7705b7127336bef3b2f897e15ccfc6b files/courier-imap-4.0.6-r1-gentoo-imapd.rc 1199
-AUX courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 1137 RMD160 7fe8cb76e23bae125e67783038908d0120f65cc9 SHA1 c24a0a407d037bbce9433a046af25c1cfe93b9eb SHA256 cf938c03d9089ab9d48e76318519d3f37a956b1fe6921675bb68946d34c92883
-MD5 b77769bc30b840b4d3fc53e9032b6b1c files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 1137
-RMD160 7fe8cb76e23bae125e67783038908d0120f65cc9 files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 1137
-SHA256 cf938c03d9089ab9d48e76318519d3f37a956b1fe6921675bb68946d34c92883 files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 1137
-AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 1145 RMD160 ecd07be4f3b1e0fedce91f3389c585211aea3357 SHA1 1e56d8e67c269b11d7428a00ea6e3c3a9f49a332 SHA256 ab32df3ab7a4070b6b6029b59f41b2a144ca44a7f8e3d573e885c58eee8984d8
-MD5 3dcf7c14a50e6d756825de78b1c145a7 files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 1145
-RMD160 ecd07be4f3b1e0fedce91f3389c585211aea3357 files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 1145
-SHA256 ab32df3ab7a4070b6b6029b59f41b2a144ca44a7f8e3d573e885c58eee8984d8 files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 1145
-AUX courier-imap-4.1.2-aclocal-fix.patch 275 RMD160 ebc6b95d267aef24a93cf5dd9b652708e1f60742 SHA1 5f44cbc91bb359547309385919ef599085a47bd0 SHA256 daec57c7ddcae3e70dac9fef192a72f45ebfd9e5b2d329ff94b7525df16af5f3
-MD5 97581e415917bb777ce4a8ee1624599a files/courier-imap-4.1.2-aclocal-fix.patch 275
-RMD160 ebc6b95d267aef24a93cf5dd9b652708e1f60742 files/courier-imap-4.1.2-aclocal-fix.patch 275
-SHA256 daec57c7ddcae3e70dac9fef192a72f45ebfd9e5b2d329ff94b7525df16af5f3 files/courier-imap-4.1.2-aclocal-fix.patch 275
+AUX courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1200 RMD160 cfe0a24af1c4ca8ae1bbeafb25612a790961fd68 SHA1 77363438726d1e2fd7b9afb11b6bd2223fd75775 SHA256 c417f5de1bf2eeb5a7918931c30f1902d9f463279d8aa73ea0e13623923805df
+MD5 5da80472c0419689736df569998a3023 files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1200
+RMD160 cfe0a24af1c4ca8ae1bbeafb25612a790961fd68 files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1200
+SHA256 c417f5de1bf2eeb5a7918931c30f1902d9f463279d8aa73ea0e13623923805df files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1200
+AUX courier-imap-4.0.6-r1-courier-imapd.indirect 81 RMD160 4b495046094a71b18ea17881f59a03fe295a352c SHA1 4b9fb37409877249e2c2cfb8f285d955dd260005 SHA256 390c2c215fc7a39f74b41a4c16372489e3c084a35e8e3ed66bc4548a766fa47d
+MD5 68ba8e887b213c93dee2ad1269aa5ff0 files/courier-imap-4.0.6-r1-courier-imapd.indirect 81
+RMD160 4b495046094a71b18ea17881f59a03fe295a352c files/courier-imap-4.0.6-r1-courier-imapd.indirect 81
+SHA256 390c2c215fc7a39f74b41a4c16372489e3c084a35e8e3ed66bc4548a766fa47d files/courier-imap-4.0.6-r1-courier-imapd.indirect 81
+AUX courier-imap-4.0.6-r1-courier-imapd.rc6 949 RMD160 484cdac2b40e6f8dbad3a604a8ab2d3967226952 SHA1 562a624818140ed324cdaf2cb7d3541f7b5a48f7 SHA256 67406394a81a4ca697b8d08e987a0680b4e7622ac30ea009241b002f1d3adc8e
+MD5 461bbd6f870ca291bb118b4dec7bb6c0 files/courier-imap-4.0.6-r1-courier-imapd.rc6 949
+RMD160 484cdac2b40e6f8dbad3a604a8ab2d3967226952 files/courier-imap-4.0.6-r1-courier-imapd.rc6 949
+SHA256 67406394a81a4ca697b8d08e987a0680b4e7622ac30ea009241b002f1d3adc8e files/courier-imap-4.0.6-r1-courier-imapd.rc6 949
+AUX courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1208 RMD160 8a997b6299c6a3de6dcd3e4b2d7c5171286e466a SHA1 0e007a0a8964e2c0523f187b0aed291008d70c2b SHA256 dec6250978b39b6dd1bfbea0b0dbd108ca60171db04135dff66c5ae73a7a33e6
+MD5 b00e8de858237628a7a075ec21b8d360 files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1208
+RMD160 8a997b6299c6a3de6dcd3e4b2d7c5171286e466a files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1208
+SHA256 dec6250978b39b6dd1bfbea0b0dbd108ca60171db04135dff66c5ae73a7a33e6 files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1208
+AUX courier-imap-4.0.6-r1-courier-pop3d.indirect 81 RMD160 0e144bab4674e4330ba18fa18ecc9b9a8efe4803 SHA1 aea5c225b07eaefb5ac0bf9207cdda12e804640a SHA256 55a49859df2eb85f7ade803f0aa42291ff54047c2e7475ae5598da05943b0dbc
+MD5 39e9e8bcb41c66504834ff4dd5776d1e files/courier-imap-4.0.6-r1-courier-pop3d.indirect 81
+RMD160 0e144bab4674e4330ba18fa18ecc9b9a8efe4803 files/courier-imap-4.0.6-r1-courier-pop3d.indirect 81
+SHA256 55a49859df2eb85f7ade803f0aa42291ff54047c2e7475ae5598da05943b0dbc files/courier-imap-4.0.6-r1-courier-pop3d.indirect 81
+AUX courier-imap-4.0.6-r1-courier-pop3d.rc6 957 RMD160 d1502bbce31fc6a26cb3adf073abfe2b91bf29f3 SHA1 8db1f39de8d4041c96be3a5c04c6ecb763c6b00f SHA256 f3c8996471543ca35a9d4af6f2a7e5bc4fc5c9820dcc461792231236fababa69
+MD5 248e61f4f09a3c7b29a90566422c8a36 files/courier-imap-4.0.6-r1-courier-pop3d.rc6 957
+RMD160 d1502bbce31fc6a26cb3adf073abfe2b91bf29f3 files/courier-imap-4.0.6-r1-courier-pop3d.rc6 957
+SHA256 f3c8996471543ca35a9d4af6f2a7e5bc4fc5c9820dcc461792231236fababa69 files/courier-imap-4.0.6-r1-courier-pop3d.rc6 957
+AUX courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 984 RMD160 93671fcb0eb2660ef41edf9ffc404c864bc369b7 SHA1 fc0c25e11555384db3fb7756a4c6b78d9c8c8e7e SHA256 dd79242bddbd46f7eabbd99da612c4189bbc998e3680bf9d50f6788783ba820e
+MD5 90d9c700a90e31e1dc7d8881f61c852a files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 984
+RMD160 93671fcb0eb2660ef41edf9ffc404c864bc369b7 files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 984
+SHA256 dd79242bddbd46f7eabbd99da612c4189bbc998e3680bf9d50f6788783ba820e files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 984
+AUX courier-imap-4.0.6-r1-gentoo-imapd.rc 1026 RMD160 1bd16e446e10da64352390803cbaa691c11ecc68 SHA1 b8eb095bb6c8b6c970dd60e944ebfd2f36a39b40 SHA256 a54e674a8bfce99cda974e5c2e9bd818440256130f018f1c3412ea29f4e618f1
+MD5 a8e23b95bc68d1beef2667a4e16eb3b8 files/courier-imap-4.0.6-r1-gentoo-imapd.rc 1026
+RMD160 1bd16e446e10da64352390803cbaa691c11ecc68 files/courier-imap-4.0.6-r1-gentoo-imapd.rc 1026
+SHA256 a54e674a8bfce99cda974e5c2e9bd818440256130f018f1c3412ea29f4e618f1 files/courier-imap-4.0.6-r1-gentoo-imapd.rc 1026
+AUX courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 957 RMD160 7dcbfe1e550601ebdd973394ff03f19701425254 SHA1 d5bc5e06275d4082ab9b76c739d9da491a08cafd SHA256 977ddb360fe8a4a2baab932895c1d871b992d33d2837d97af23d7a97f66dc6a6
+MD5 51d1ed2dbe1ec0223f4d02e10d5f74fc files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 957
+RMD160 7dcbfe1e550601ebdd973394ff03f19701425254 files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 957
+SHA256 977ddb360fe8a4a2baab932895c1d871b992d33d2837d97af23d7a97f66dc6a6 files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 957
+AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 999 RMD160 10028f0deafad4b31b12e4006ace1a007b542495 SHA1 5db7530c017c1e0a4cdb02a67bc5256f9b790110 SHA256 e9ec918c6a9f1ac3ad952d7c15392ab73f0a2e6a27f4f8a1f3fe3902c67ea278
+MD5 16b001ae38c9306bd310300702cba6cf files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 999
+RMD160 10028f0deafad4b31b12e4006ace1a007b542495 files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 999
+SHA256 e9ec918c6a9f1ac3ad952d7c15392ab73f0a2e6a27f4f8a1f3fe3902c67ea278 files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 999
 AUX courier-imap-4.1.2-as-needed.patch 398 RMD160 0cda873874a9261cd0f640703fdb0c7cfb79e044 SHA1 53ab7b464ed0daf167066c323827524a653964e0 SHA256 8d1185d1929ab1cce5216f188adeb66a52ede20fbcb95b45d9b7a39287f884e3
 MD5 d27cd20ea99b948a1e0feb88982d5605 files/courier-imap-4.1.2-as-needed.patch 398
 RMD160 0cda873874a9261cd0f640703fdb0c7cfb79e044 files/courier-imap-4.1.2-as-needed.patch 398
 SHA256 8d1185d1929ab1cce5216f188adeb66a52ede20fbcb95b45d9b7a39287f884e3 files/courier-imap-4.1.2-as-needed.patch 398
-AUX courier-imap-4.1.2-db4-configure.in.patch 1497 RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 SHA1 349ad8d16c05ba0c7a7231b092286f48fecca54b SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c
-MD5 3d90d6cacf8a4c23c09d3a198f509c62 files/courier-imap-4.1.2-db4-configure.in.patch 1497
-RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 files/courier-imap-4.1.2-db4-configure.in.patch 1497
-SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c files/courier-imap-4.1.2-db4-configure.in.patch 1497
 AUX courier-imap-gentoo.readme 2827 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 SHA1 72c4f79c6ed08c4423925b05303f97287b8d95d1 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f
 MD5 aebf119b54b485aa50571173566f4a09 files/courier-imap-gentoo.readme 2827
 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 files/courier-imap-gentoo.readme 2827
@@ -225,16 +206,11 @@ AUX mkpop3dcert 996 RMD160 424c61ae95914f267397a1180dcb8fee64586ea3 SHA1 28f43f0
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
 RMD160 424c61ae95914f267397a1180dcb8fee64586ea3 files/mkpop3dcert 996
 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb files/mkpop3dcert 996
-DIST courier-imap-3.0.7.tar.bz2 1702769 RMD160 2fb2b2c5e4837459a9dba4b799b7bc8f4ecb080f SHA1 f17550f8e1c57096047edab2eaa6602c57e72144 SHA256 e730ef7127494df931b51087adeaa59062d2d6d7840fed6b1a88409c692cd024
 DIST courier-imap-3.0.8.tar.bz2 1713447 RMD160 f3637ff037c4c372ab0cc5d13c34a7e71beeb27c SHA1 eca0a53a69b7efaa3850d1556f40ca7f95a8d280 SHA256 e447f0c0ee5f5ccd25a934658256465f52e39049c858f5d849b2f93f2e55c1d2
 DIST courier-imap-4.0.1.tar.bz2 3032350 RMD160 3c22688f51165132f101bff2f77900976fcb40a3 SHA1 747c122c7b7f033ff9f9ab5ba3e4b689aa5d4189 SHA256 510f3d8d9542c103d38fb023e378811e35e109bf5443f5fc885d167a779911bf
 DIST courier-imap-4.0.4.tar.bz2 3156707 RMD160 438559fe800ca47fb2d1cf5c3c3605964bab4cb1 SHA1 101f9d7868842e3cbc700cf7ac32ae32f0ef512b SHA256 21a6bf6228d08c28786e42057e3fbf7e11fa8ad66305cb02be82a5160a78e7c1
 DIST courier-imap-4.0.6.tar.bz2 3157577 RMD160 4006c5ec4db6b2adac393e2ebdf9ee99af3a8b2a SHA1 d7fee884cc0015586459c511dbe03bc2a8466c7f SHA256 27e6847507ddecfab1672fdf52447f8351f4cf046145974768ea93ebfea6ddbb
 DIST courier-imap-4.1.2.tar.bz2 3257311 RMD160 56546e90fc16f92daab6d7540154bc5f7ad06e27 SHA1 73ed09528f440ef07ba98f59a83172f4f6f4106b SHA256 37c3530b31e0b9b5a5bcd639ac3db4862f12e77ec39d8d67f19e630d76853d71
-EBUILD courier-imap-3.0.7.ebuild 9198 RMD160 9bd1aec21c3ed0effa76ad751b7b3fd93f6eb066 SHA1 89557ab4d08e1652f653ea30b1d5a28ba168ba56 SHA256 c1fdfa18aaf28f57cfc208b04feb2b90c6b9bdd89c242d35aa245ea14eb93266
-MD5 f8ebe2103bfd36e25171caa41771660c courier-imap-3.0.7.ebuild 9198
-RMD160 9bd1aec21c3ed0effa76ad751b7b3fd93f6eb066 courier-imap-3.0.7.ebuild 9198
-SHA256 c1fdfa18aaf28f57cfc208b04feb2b90c6b9bdd89c242d35aa245ea14eb93266 courier-imap-3.0.7.ebuild 9198
 EBUILD courier-imap-3.0.8.ebuild 9353 RMD160 fd897363af8212f9990f9b2fefcb891f9c440051 SHA1 e19204735d38baef3feb918cf34ca0963abc23c7 SHA256 29cf37cb88dd7406f438729abeb91ccc757f579a79a6588d563a3d864dc3a666
 MD5 b31f1af1ba6b1252ad32c9f6c6599929 courier-imap-3.0.8.ebuild 9353
 RMD160 fd897363af8212f9990f9b2fefcb891f9c440051 courier-imap-3.0.8.ebuild 9353
@@ -255,29 +231,22 @@ EBUILD courier-imap-4.0.4.ebuild 10107 RMD160 43ea2e5c9fb6b0bd0ff5faba019955a3a5
 MD5 8f84dc3b4ba8ce8a3565e999c4291eb5 courier-imap-4.0.4.ebuild 10107
 RMD160 43ea2e5c9fb6b0bd0ff5faba019955a3a5c640c8 courier-imap-4.0.4.ebuild 10107
 SHA256 4fc0bbf8c26602eb84b6575b1862d875479d72a0c2edec3d2bc96980d536fd50 courier-imap-4.0.4.ebuild 10107
-EBUILD courier-imap-4.0.6-r1.ebuild 9693 RMD160 3b6456cedde071060e7b0022bb09a6a1f649dc36 SHA1 bf1d9153ecece4bbaa4e65a934ae848886f2168e SHA256 8e644a95e361204448bf9589ff0c53ea3b67d932c7e26eaef76e83696c9c4df8
-MD5 b4d6858f63feaf5242e8636a1148b7af courier-imap-4.0.6-r1.ebuild 9693
-RMD160 3b6456cedde071060e7b0022bb09a6a1f649dc36 courier-imap-4.0.6-r1.ebuild 9693
-SHA256 8e644a95e361204448bf9589ff0c53ea3b67d932c7e26eaef76e83696c9c4df8 courier-imap-4.0.6-r1.ebuild 9693
-EBUILD courier-imap-4.0.6.ebuild 10128 RMD160 ef2b87dd3905044dc01721e54bfa6d1c790b5e29 SHA1 5f62d780a0f4c1c59d0932d16d47269f26917e69 SHA256 48623443290cb6095f32eb70967d89213bd2eff2ca61abba164cd6a0d8cb6d10
-MD5 175193eaa4b40b00df0b16acc074c64d courier-imap-4.0.6.ebuild 10128
-RMD160 ef2b87dd3905044dc01721e54bfa6d1c790b5e29 courier-imap-4.0.6.ebuild 10128
-SHA256 48623443290cb6095f32eb70967d89213bd2eff2ca61abba164cd6a0d8cb6d10 courier-imap-4.0.6.ebuild 10128
-EBUILD courier-imap-4.1.2.ebuild 10023 RMD160 751c492bd593a107f96aa011c3a8267658d27c9d SHA1 3ef8ee7926be1915bff70d64ea5c903a56e13882 SHA256 1de3ee62b48d0a9b8562cee344e279a526e0f7a965f87a800f2537c8449bd2b5
-MD5 16a1d8fd02604bfd22d965d7a21997ed courier-imap-4.1.2.ebuild 10023
-RMD160 751c492bd593a107f96aa011c3a8267658d27c9d courier-imap-4.1.2.ebuild 10023
-SHA256 1de3ee62b48d0a9b8562cee344e279a526e0f7a965f87a800f2537c8449bd2b5 courier-imap-4.1.2.ebuild 10023
-MISC ChangeLog 28076 RMD160 6afa91cdee90ef8864ce96096df9ff6f38843f30 SHA1 1988a9ddb97df179935b6854adc8ed9aed8dfbd9 SHA256 a547d83d9fa1709d9f01b1ac4a92662b8907b8c34e89b737bad5cbe2109f984e
-MD5 21c0bb23c844348f81980e6b6b11b3b7 ChangeLog 28076
-RMD160 6afa91cdee90ef8864ce96096df9ff6f38843f30 ChangeLog 28076
-SHA256 a547d83d9fa1709d9f01b1ac4a92662b8907b8c34e89b737bad5cbe2109f984e ChangeLog 28076
-MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
-MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 metadata.xml 280
-SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540 metadata.xml 280
-MD5 7a2cb572506fa6176e04ef9a23bb145a files/digest-courier-imap-3.0.7 262
-RMD160 28b610271878b7bb3f8bce23333876fb099edb70 files/digest-courier-imap-3.0.7 262
-SHA256 a516edacfe138c0ccb829b2fdb89c0d01fa3ff01036267ff4bb7bb22cd0f077c files/digest-courier-imap-3.0.7 262
+EBUILD courier-imap-4.0.6-r2.ebuild 8471 RMD160 8859f65f9782313759dd0cf28d8ed4d0e06bc6de SHA1 873b9e2e4aa99a81afee1328931a0af6f37cdcef SHA256 5e3d31bd7d8ac6b16f2177a381fa773a464aa9cc590fe436d5e58d39fb6fef7b
+MD5 e7bfede9823bda7bc02074d29f641659 courier-imap-4.0.6-r2.ebuild 8471
+RMD160 8859f65f9782313759dd0cf28d8ed4d0e06bc6de courier-imap-4.0.6-r2.ebuild 8471
+SHA256 5e3d31bd7d8ac6b16f2177a381fa773a464aa9cc590fe436d5e58d39fb6fef7b courier-imap-4.0.6-r2.ebuild 8471
+EBUILD courier-imap-4.1.2-r1.ebuild 8585 RMD160 53b2c557090cfb24c03b1bcca0c10bbe65d0a176 SHA1 8b614f3778d11c707b6aced6dcee72633579cb28 SHA256 c2f7e0c0a9f42235b57875e8008fec5cc35d51f3818f4b44d9293c355da54992
+MD5 1f428edce382702a354c113ff5fd6df3 courier-imap-4.1.2-r1.ebuild 8585
+RMD160 53b2c557090cfb24c03b1bcca0c10bbe65d0a176 courier-imap-4.1.2-r1.ebuild 8585
+SHA256 c2f7e0c0a9f42235b57875e8008fec5cc35d51f3818f4b44d9293c355da54992 courier-imap-4.1.2-r1.ebuild 8585
+MISC ChangeLog 29549 RMD160 8ac77ee63d3d0ddd58bea85018ac15d308e66c5e SHA1 629384825bc5ed08c2b2b157dc769a6709fabeab SHA256 bc20befff3572ccdf8486b0a939ce1abd4eb171dfa4531a8203fca7ac42d95d4
+MD5 472ef4eb0b6ce52fad2b6da65a682468 ChangeLog 29549
+RMD160 8ac77ee63d3d0ddd58bea85018ac15d308e66c5e ChangeLog 29549
+SHA256 bc20befff3572ccdf8486b0a939ce1abd4eb171dfa4531a8203fca7ac42d95d4 ChangeLog 29549
+MISC metadata.xml 259 RMD160 772ff54163f1dca9ac7c718f2a5f10dc0ad02da5 SHA1 de85f156ac6360b05328c267c1f400e607ff3e95 SHA256 96a8c14d29e24a07a9cf1f5d84dae6332039444fdcc3ae99a22f8b017473bbc2
+MD5 eaf0c176d7da5250481d1af65c78310b metadata.xml 259
+RMD160 772ff54163f1dca9ac7c718f2a5f10dc0ad02da5 metadata.xml 259
+SHA256 96a8c14d29e24a07a9cf1f5d84dae6332039444fdcc3ae99a22f8b017473bbc2 metadata.xml 259
 MD5 b52173cb437fbadaf14700a422e687c2 files/digest-courier-imap-3.0.8 262
 RMD160 bba9818534b900a852b9fae9e448bbab72dcfb06 files/digest-courier-imap-3.0.8 262
 SHA256 c72e111c95a6c0072425932e27449b5f81352859e4e48d13261f49039173d32e files/digest-courier-imap-3.0.8 262
@@ -293,19 +262,9 @@ SHA256 0a954053115b6c3953c9eaa46c5fa6c1651e08067b1ebe58ae182bd679ed29f7 files/di
 MD5 1d1d1eaead77dcfea00844bfc4b08056 files/digest-courier-imap-4.0.4 262
 RMD160 b4fcc0a112e0b326b72cf813e0bf11ae0ff0c1dc files/digest-courier-imap-4.0.4 262
 SHA256 600c9f86d4fc9f5a5fa19815037042f46f2754d1e4366074e92b63ddca79fb03 files/digest-courier-imap-4.0.4 262
-MD5 a0dd501fdeeb92ac5fca1408ac919288 files/digest-courier-imap-4.0.6 262
-RMD160 9ef1122d21d9d29de6d2ae8f02fb3bd559c9d6b7 files/digest-courier-imap-4.0.6 262
-SHA256 3e0023761481fb070682400be05dfb6c3c02547c4a5db2fe0d8c1beffb37d7bf files/digest-courier-imap-4.0.6 262
-MD5 a0dd501fdeeb92ac5fca1408ac919288 files/digest-courier-imap-4.0.6-r1 262
-RMD160 9ef1122d21d9d29de6d2ae8f02fb3bd559c9d6b7 files/digest-courier-imap-4.0.6-r1 262
-SHA256 3e0023761481fb070682400be05dfb6c3c02547c4a5db2fe0d8c1beffb37d7bf files/digest-courier-imap-4.0.6-r1 262
-MD5 c1fc1514f0256f3976cb49e9d420e478 files/digest-courier-imap-4.1.2 262
-RMD160 931feb25d5903456270bbcbcfae5fa1b4a7e6402 files/digest-courier-imap-4.1.2 262
-SHA256 334d2be842f306f500dd7da00eb8dbb4f433299a2d4f34c40093a28fa702f471 files/digest-courier-imap-4.1.2 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGDUBHGDyatLGpTbYRAhpIAJ9enKAnrwxzBAYqyTdpguJF9ZWjMwCgnNQp
-fa0AZz+/CmzkKFw4NFK7hCM=
-=8sOm
------END PGP SIGNATURE-----
+MD5 a0dd501fdeeb92ac5fca1408ac919288 files/digest-courier-imap-4.0.6-r2 262
+RMD160 9ef1122d21d9d29de6d2ae8f02fb3bd559c9d6b7 files/digest-courier-imap-4.0.6-r2 262
+SHA256 3e0023761481fb070682400be05dfb6c3c02547c4a5db2fe0d8c1beffb37d7bf files/digest-courier-imap-4.0.6-r2 262
+MD5 c1fc1514f0256f3976cb49e9d420e478 files/digest-courier-imap-4.1.2-r1 262
+RMD160 931feb25d5903456270bbcbcfae5fa1b4a7e6402 files/digest-courier-imap-4.1.2-r1 262
+SHA256 334d2be842f306f500dd7da00eb8dbb4f433299a2d4f34c40093a28fa702f471 files/digest-courier-imap-4.1.2-r1 262
diff --git a/net-mail/courier-imap/courier-imap-3.0.7.ebuild b/net-mail/courier-imap/courier-imap-3.0.7.ebuild
deleted file mode 100644
index 04f081c6e004..000000000000
--- a/net-mail/courier-imap/courier-imap-3.0.7.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.7.ebuild,v 1.20 2007/01/05 08:51:40 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips ~alpha hppa amd64 ppc64 ia64"
-IUSE="fam berkdb gdbm debug ipv6 ldap mysql nls pam postgres selinux"
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0
-	fam? ( virtual/fam )
-	selinux? ( sec-policy/selinux-courier-imap )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-lang/perl
-	sys-process/procps"
-PROVIDE="virtual/imapd"
-
-pkg_setup() {
-	if ! use berkdb && ! use gdbm; then
-		echo
-		eerror "either 'berkdb' or 'gdbm' USE flag is required."
-		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
-		eerror "'man 5 portage' for correct syntax usage for '/etc/postage/package.use'"
-		echo
-		die "required USE flag is missing."
-	fi
-}
-
-vpopmail_setup() {
-	VPOPMAIL_INSTALLED=
-	VPOPMAIL_DIR=
-	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-	VPOPMAIL_DIR=`grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6`
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004; langthang@gentoo.org.
-	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch ${FILESDIR}/${P}-disable-fam-configure.in.patch || die "patch failed"
-
-	# These patches should fix problem detecting Berkeley DB.
-	# We now can compile with db4 support.
-	epatch ${FILESDIR}/${P}-db4-bdbobj_configure.in.patch || die "patch failed"
-	epatch ${FILESDIR}/${P}-db4-configure.in.patch || die "patch failed"
-
-	export WANT_AUTOCONF="2.5"
-	ebegin "Recreating configure"
-	autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	cd ${S}/maildir
-	ebegin "Recreating maildir/configure"
-	autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	cd ${S}/bdbobj
-	ebegin "Recreating bdbobj/configure"
-		autoconf || \
-		die "recreate configure failed"
-	eend $?
-}
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `use_with ldap authldap`"
-	myconf="${myconf} `use_with mysql authmysql`"
-	myconf="${myconf} `use_with postgres authpostgresql`"
-	# the --with-ipv6 is broken
-	#myconf="${myconf} --with-ipv6"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	# 19 Aug 2004; langthang@gentoo.org
-	# default to gdbm if both berkdb and gdbm present.
-	if use berkdb; then
-		if use gdbm; then
-			einfo "build with GDBM support."
-			myconf="${myconf} --with-db=gdbm"
-		else
-			einfo "build with Berkeley DB support."
-			myconf="${myconf} --with-db=db"
-		fi
-	else
-		einfo "build with GDBM support."
-		myconf="${myconf} --with-db=gdbm"
-	fi
-
-	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-		einfo "vpopmail found"
-		myconf="${myconf} --with-authvchkpw"
-		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
-		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
-	else
-		einfo "vpopmail not found"
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	local cachefile
-	cachefile=${WORKDIR}/config.cache
-	rm -f ${cachefile}
-
-	# fix for bug #21330
-	CFLAGS="`echo ${CFLAGS} | xargs`"
-	CXXFLAGS="`echo ${CXXFLAGS} | xargs`"
-	LDFLAGS="`echo ${LDFLAGS} | xargs`"
-
-	# fix for bug #27528
-	# they really should use a better way to detect redhat
-	myconf="${myconf} --without-redhat"
-
-	# bug #29879 - FAM support
-	#if has_version 'virtual/fam' && ! use fam; then
-	#	ewarn "FAM will be detected by the package and support will be enabled"
-	#	ewarn "The package presently provides no way to disable fam support if you don't want it"
-	#fi
-	myconf="${myconf} `use_with fam`"
-
-	# fix for non-x86 platforms, bug #38606
-	# courier-imap doesn't respect just --host=$CHOST without --build
-	[ -z "${CBUILD}" ] && export CBUILD="${CHOST}"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS} " econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--cache-file=${cachefile} \
-		${myconf} || die "econf failed"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	vpopmail_setup
-
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN='>> ${service}
-	done
-	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
-	for service in imapd-ssl pop3d-ssl
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	dosym /usr/sbin/courierlogger /usr/lib/courier-imap/courierlogger
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond-3.0.4-r1 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6-3.0.5 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6-3.0.5 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.7.3-r1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.7.3-r1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.7.3-r1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.7.3-r1.rc gentoo-pop3d-ssl.rc
-
-	local authmods
-	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	use mysql && authmods="${authmods} authmysql"
-	use postgres && authmods="${authmods} authpgsql"
-	use pam && authmods="${authmods} authpam"
-	use ldap && authmods="${authmods} authldap"
-	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	exeinto /usr/lib/courier-imap/authlib
-	for i in ${authmods}; do
-		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
-	done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-	# bug #45953, more docs
-	cd ${S}
-	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog}
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-}
diff --git a/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild b/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild
deleted file mode 100644
index 5a8276647fa7..000000000000
--- a/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild,v 1.2 2007/02/23 15:59:32 chutzpah Exp $
-
-inherit eutils multilib
-IUSE="fam berkdb gdbm debug ipv6 nls selinux"
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-#MY_PV=${PV/_rc*/}
-#SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	>=net-libs/courier-authlib-0.57
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	fam? ( virtual/fam )
-	selinux? ( sec-policy/selinux-courier-imap )
-	>=net-mail/mailbase-0.00-r8"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	userland_GNU? ( sys-process/procps )
-	!mail-mta/courier"
-PROVIDE="virtual/imapd"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-#S=${WORKDIR}/${PN}-${MY_PV}
-pkg_setup() {
-	if ! use berkdb && ! use gdbm; then
-		echo
-		eerror "either 'berkdb' or 'gdbm' USE flag is required."
-		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
-		eerror "'man 5 portage' for correct syntax usage for '/etc/portage/package.use'"
-		echo
-		die "required USE flag is missing."
-	fi
-}
-
-vpopmail_setup() {
-	VPOPMAIL_INSTALLED=
-	VPOPMAIL_DIR=
-	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004; langthang@gentoo.org.
-	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch ${FILESDIR}/${PN}-4.0.1-disable-fam-configure.in.patch
-
-	# These patches should fix problem detecting Berkeley DB.
-	# We now can compile with db4 support.
-	if use berkdb; then
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-configure.in.patch
-	fi
-
-	export WANT_AUTOCONF="2.5"
-	libtoolize --copy --force
-	ebegin "Recreating configure"
-	autoconf || die "autoconf on . failed"
-	eend $?
-
-	cd ${S}/maildir
-	libtoolize --copy --force
-	ebegin "Recreating maildir/configure"
-	autoconf || die "autoconf on maildir failed"
-	eend $?
-
-	cd ${S}/bdbobj
-	libtoolize --copy --force
-	ebegin "Recreating bdbobj/configure"
-	autoconf || die "autoconf on bdbobj failed"
-	eend $?
-}
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-
-	# 19 Aug 2004; langthang@gentoo.org
-	# default to gdbm if both berkdb and gdbm present.
-	if use gdbm; then
-		einfo "build with GDBM support."
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb; then
-		einfo "build with Berkeley DB support."
-		myconf="${myconf} --with-db=db"
-	fi
-
-	# This check should be in courier-authlib.
-	# But I am not sure so I commented here
-	# If you are using vpopmail and everything work,
-	# please remove this section.
-	#if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-	#	einfo "vpopmail found"
-	#	myconf="${myconf} --with-authvchkpw"
-	#	tmpLDFLAGS="$(cat ${VPOPMAIL_DIR}/etc/lib_deps)"
-	#	LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-	#	CFLAGS="${CFLAGS} $(cat ${VPOPMAIL_DIR}/etc/inc_deps)"
-	#else
-	#	einfo "vpopmail not found"
-	#	myconf="${myconf} --without-authvchkpw"
-	#fi
-
-	# The default character set is ISO-8859-1/US-ASCII.
-	# use nls will enable all available charater sets.
-	# set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
-	# to include only specified translation table.
-	if use nls && [[ -z "$ENABLE_UNICODE" ]]; then
-		einfo "ENABLE_UNICODE is not set, building with all available character sets"
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		einfo "ENABLE_UNICODE is set, building with unicode=$ENABLE_UNICODE"
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		einfo "disabling unicode support"
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	# fix for bug #21330
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS} " econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/$(get_libdir)/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		$(use_with ipv6) \
-		$(use_with fam) \
-		${myconf} || die "econf failed"
-
-	# change the pem file location..
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist || \
-		die "sed failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	vpopmail_setup
-
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-	rm -rf ${D}/etc/pam.d
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	local name
-	for name in imapd pop3d; do
-		mv ${name} "courier-${name}" || \
-			die "failed to mv $name to courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/$(get_libdir)/courier-imap
-	local service
-	for service in imapd pop3d; do
-		local type
-		for type in "" "-ssl"; do
-			local file
-			file="${service}${type}.rc"
-			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
-			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file} || die "sed failed"
-		done
-	done
-
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl; do
-		mv -v ${D}/etc/courier-imap/${x}.dist \
-			${D}/etc/courier-imap/${x} || \
-			die "failed to mv ${x}.dist to ${x}"
-	done
-
-	#insinto /etc/courier-imap
-	#newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	cd ${D}/etc/courier-imap
-	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
-	for service in imapd-ssl pop3d-ssl imapd pop3d; do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-	done
-	for service in imapd pop3d; do
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN=' >> ${service}
-		echo -e '#Put any program for ${LOGINRUN} here' >> ${service}
-		echo -e '#this is for relay-ctrl-allow in 4*' >> ${service}
-		echo 'LOGINRUN=' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *; do
-		if [[ -L ${x} ]]; then
-			rm -v ${x} || die "failed to rm ${x}"
-		fi
-	done
-
-	cd ../share
-	mv -v * ../sbin
-	mv -v ../sbin/man .
-	cd ..
-
-	for x in mkimapdcert mkpop3dcert; do
-		mv ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}.orig || \
-			die "failed to rm ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}"
-	done
-
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert || \
-			die "doexe failed"
-
-	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
-			die "dosym failed"
-
-	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
-	for initd in {imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${INITD_VER}-courier-${initd}.rc6 > \
-			courier-${initd} || die "libdir-sed failed"
-		doinitd courier-${initd} || die "doinitd courier-${initd} failed"
-	done
-	exeinto /usr/$(get_libdir)/courier-imap
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${RC_VER}-${exe} > \
-			${exe} || die "libdir-sed 2 failed"
-		doexe ${exe} || die "doexe ${exe} failed"
-	done
-
-	#local authmods
-	#authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	#use mysql && authmods="${authmods} authmysql"
-	#use postgres && authmods="${authmods} authpgsql"
-	#use pam && authmods="${authmods} authpam"
-	#use ldap && authmods="${authmods} authldap"
-	#[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	#exeinto /usr/lib/courier-imap/authlib
-	#for i in ${authmods}; do
-	#	[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i} || die "doexe failed"
-	#done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake || \
-		die "mv failed"
-
-	# bug #45953, more docs
-	cd ${S}
-	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} \
-		${FILESDIR}/courier-imap-gentoo.readme
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	einfo "Authdaemond is no longer provided this package."
-	einfo "athentication libraries are from courier-authlib"
-	einfo "for a quick start please refer to"
-	einfo "/usr/share/doc/${P}/courier-imap-gentoo.readme.gz"
-	# some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	chmod 755 ${ROOT}/usr/$(get_libdir)/courier-imap || die "Failed to ensure sane permissions"
-}
-
-src_test() {
-	ewarn "make check not supported by package due to"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
-}
diff --git a/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild b/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild
new file mode 100644
index 000000000000..ba83a921d6f3
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild,v 1.1 2007/04/07 01:08:00 chtekk Exp $
+
+inherit autotools eutils multilib
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs."
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb debug fam gdbm ipv6 nls selinux"
+
+# userpriv breaks linking against vpopmail
+RESTRICT="userpriv"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+		>=net-libs/courier-authlib-0.57
+		>=net-mail/mailbase-0.00-r8
+		berkdb? ( sys-libs/db )
+		fam? ( virtual/fam )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+		dev-lang/perl
+		!mail-mta/courier
+		userland_GNU? ( sys-process/procps )"
+
+PROVIDE="virtual/imapd"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+pkg_setup() {
+	if ! use berkdb && ! use gdbm ; then
+		echo
+		eerror "Either the 'berkdb' or the 'gdbm' USE flag is required."
+		eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'."
+		eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'."
+		echo
+		die "Required USE flag missing."
+	fi
+}
+
+vpopmail_setup() {
+	VPOPMAIL_INSTALLED=
+	VPOPMAIL_DIR=
+	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
+	VPOPMAIL_INSTALLED=
+	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]] ; then
+		VPOPMAIL_INSTALLED=1
+	else
+		VPOPMAIL_DIR=
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004 langthang@gentoo.org
+	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
+	epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${P}-aclocal-fix.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		epatch "${FILESDIR}"/${P}-db4-bdbobj_configure.in.patch
+		epatch "${FILESDIR}"/${P}-db4-tcpd_configure.in.patch
+		epatch "${FILESDIR}"/${P}-db4-configure.in.patch
+	fi
+
+	ebegin "Recreating configure"
+	AT_NO_RECURSIVE="true" eautoreconf || die "eautoreconf on . failed"
+	eend $?
+
+	cd "${S}/maildir"
+	ebegin "Recreating maildir/configure"
+	eautoreconf || die "eautoreconf on maildir failed"
+	eend $?
+
+	cd "${S}/bdbobj"
+	ebegin "Recreating bdbobj/configure"
+	eautoreconf || die "eautoreconf on bdbobj failed"
+	eend $?
+
+	cd "${S}/tcpd"
+	ebegin "Recreating tcpd/configure"
+	eautoreconf || die "eautoreconf on tcpd failed"
+	eend $?
+}
+
+src_compile() {
+	vpopmail_setup
+
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# The default character set is ISO-8859-1/US-ASCII.
+	# USE 'nls' will enable all available character sets.
+	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation tables.
+	if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then
+		einfo "ENABLE_UNICODE is not set, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	elif use nls ; then
+		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
+		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
+	else
+		einfo "Disabling unicode support"
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Fix for bug #21330
+	CFLAGS="$(echo ${CFLAGS} | xargs)"
+	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
+	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
+
+	# Do the actual build now
+	LDFLAGS="${LDFLAGS} " econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		${myconf} || die "econf failed"
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist || \
+		die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	vpopmail_setup
+
+	dodir /var/lib/${PN} /etc/pam.d
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -Rf "${D}/etc/pam.d"
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin"
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	cd "${D}/usr/$(get_libdir)/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin"
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -f * ../sbin
+	mv -f ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" || die "doexe failed"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger || die "dosym failed"
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}" || die "doinitd ${initd} failed"
+	done
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}" || die "doexe ${exe} failed"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}"
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	einfo "Authdaemond is no longer provided by this package."
+	einfo "Authentication libraries are now in courier-authlib."
+	einfo "For a quick-start howto please refer to:"
+	einfo "/usr/share/doc/${P}/${PN}-gentoo.readme.gz"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
diff --git a/net-mail/courier-imap/courier-imap-4.0.6.ebuild b/net-mail/courier-imap/courier-imap-4.0.6.ebuild
deleted file mode 100644
index ab74da216c97..000000000000
--- a/net-mail/courier-imap/courier-imap-4.0.6.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6.ebuild,v 1.5 2007/01/05 08:51:40 flameeyes Exp $
-
-inherit eutils
-IUSE="fam berkdb gdbm debug ipv6 nls selinux"
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-#MY_PV=${PV/_rc*/}
-#SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	>=net-libs/courier-authlib-0.57
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	fam? ( virtual/fam )
-	selinux? ( sec-policy/selinux-courier-imap )
-	>=net-mail/mailbase-0.00-r8"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	userland_GNU? ( sys-process/procps )
-	!mail-mta/courier"
-PROVIDE="virtual/imapd"
-
-RC_VER="4.0.1-r1"
-INITD_VER="4.0.4"
-
-#S=${WORKDIR}/${PN}-${MY_PV}
-pkg_setup() {
-	if ! use berkdb && ! use gdbm; then
-		echo
-		eerror "either 'berkdb' or 'gdbm' USE flag is required."
-		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
-		eerror "'man 5 portage' for correct syntax usage for '/etc/portage/package.use'"
-		echo
-		die "required USE flag is missing."
-	fi
-}
-
-vpopmail_setup() {
-	VPOPMAIL_INSTALLED=
-	VPOPMAIL_DIR=
-	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004; langthang@gentoo.org.
-	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch ${FILESDIR}/${PN}-4.0.1-disable-fam-configure.in.patch
-
-	# These patches should fix problem detecting Berkeley DB.
-	# We now can compile with db4 support.
-	if use berkdb; then
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-configure.in.patch
-	fi
-
-	export WANT_AUTOCONF="2.5"
-	libtoolize --copy --force
-	ebegin "Recreating configure"
-	autoconf || die "autoconf on . failed"
-	eend $?
-
-	cd ${S}/maildir
-	libtoolize --copy --force
-	ebegin "Recreating maildir/configure"
-	autoconf || die "autoconf on maildir failed"
-	eend $?
-
-	cd ${S}/bdbobj
-	libtoolize --copy --force
-	ebegin "Recreating bdbobj/configure"
-	autoconf || die "autoconf on bdbobj failed"
-	eend $?
-}
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-
-	# 19 Aug 2004; langthang@gentoo.org
-	# default to gdbm if both berkdb and gdbm present.
-	if use gdbm; then
-		einfo "build with GDBM support."
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb; then
-		einfo "build with Berkeley DB support."
-		myconf="${myconf} --with-db=db"
-	fi
-
-	# This check should be in courier-authlib.
-	# But I am not sure so I commented here
-	# If you are using vpopmail and everything work,
-	# please remove this section.
-	#if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-	#	einfo "vpopmail found"
-	#	myconf="${myconf} --with-authvchkpw"
-	#	tmpLDFLAGS="$(cat ${VPOPMAIL_DIR}/etc/lib_deps)"
-	#	LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-	#	CFLAGS="${CFLAGS} $(cat ${VPOPMAIL_DIR}/etc/inc_deps)"
-	#else
-	#	einfo "vpopmail not found"
-	#	myconf="${myconf} --without-authvchkpw"
-	#fi
-
-	# The default character set is ISO-8859-1/US-ASCII.
-	# use nls will enable all available charater sets.
-	# set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
-	# to include only specified translation table.
-	if use nls && [[ -z "$ENABLE_UNICODE" ]]; then
-		einfo "ENABLE_UNICODE is not set, building with all available character sets"
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		einfo "ENABLE_UNICODE is set, building with unicode=$ENABLE_UNICODE"
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		einfo "disabling unicode support"
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	# fix for bug #21330
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS} " econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/$(get_libdir)/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		$(use_with ipv6) \
-		$(use_with fam) \
-		${myconf} || die "econf failed"
-
-	# change the pem file location..
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist || \
-		die "sed failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	vpopmail_setup
-
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-	rm -rf ${D}/etc/pam.d
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	local name
-	for name in imapd pop3d; do
-		mv ${name} "courier-${name}" || \
-			die "failed to mv $name to courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/$(get_libdir)/courier-imap
-	local service
-	for service in imapd pop3d; do
-		local type
-		for type in "" "-ssl"; do
-			local file
-			file="${service}${type}.rc"
-			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
-			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file} || die "sed failed"
-		done
-	done
-
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl; do
-		mv -v ${D}/etc/courier-imap/${x}.dist \
-			${D}/etc/courier-imap/${x} || \
-			die "failed to mv ${x}.dist to ${x}"
-	done
-
-	#insinto /etc/courier-imap
-	#newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	cd ${D}/etc/courier-imap
-	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
-	for service in imapd-ssl pop3d-ssl imapd pop3d; do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-	done
-	for service in imapd pop3d; do
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN=' >> ${service}
-		echo -e '#Put any program for ${LOGINRUN} here' >> ${service}
-		echo -e '#this is for relay-ctrl-allow in 4*' >> ${service}
-		echo 'LOGINRUN=' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *; do
-		if [[ -L ${x} ]]; then
-			rm -v ${x} || die "failed to rm ${x}"
-		fi
-	done
-
-	cd ../share
-	mv -v * ../sbin
-	mv -v ../sbin/man .
-	cd ..
-
-	for x in mkimapdcert mkpop3dcert; do
-		mv ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}.orig || \
-			die "failed to rm ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}"
-	done
-
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert || \
-			die "doexe failed"
-
-	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
-			die "dosym failed"
-
-	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-imapd.rc6 courier-imapd || die "newinitd failed"
-	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-imapd-ssl.rc6 courier-imapd-ssl || die "newinitd failed"
-	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-pop3d.rc6 courier-pop3d || die "newinitd failed"
-	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-pop3d-ssl.rc6 courier-pop3d-ssl || die "newinitd failed"
-
-	exeinto /usr/$(get_libdir)/courier-imap
-		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-imapd.rc gentoo-imapd.rc || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-imapd-ssl.rc gentoo-imapd-ssl.rc || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-pop3d.rc gentoo-pop3d.rc || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-pop3d-ssl.rc gentoo-pop3d-ssl.rc || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-courier-imapd.indirect courier-imapd.indirect || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-courier-pop3d.indirect courier-pop3d.indirect || die "newexe failed"
-
-	#local authmods
-	#authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	#use mysql && authmods="${authmods} authmysql"
-	#use postgres && authmods="${authmods} authpgsql"
-	#use pam && authmods="${authmods} authpam"
-	#use ldap && authmods="${authmods} authldap"
-	#[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	#exeinto /usr/lib/courier-imap/authlib
-	#for i in ${authmods}; do
-	#	[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i} || die "doexe failed"
-	#done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake || \
-		die "mv failed"
-
-	# bug #45953, more docs
-	cd ${S}
-	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} \
-		${FILESDIR}/courier-imap-gentoo.readme
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	einfo "Authdaemond is no longer provided this package."
-	einfo "athentication libraries are from courier-authlib"
-	einfo "for a quick start please refer to"
-	einfo "/usr/share/doc/${P}/courier-imap-gentoo.readme.gz"
-	# some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	chmod 755 ${ROOT}/usr/$(get_libdir)/courier-imap || die "Failed to ensure sane permissions"
-}
-
-src_test() {
-	ewarn "make check not supported by package due to"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
-}
diff --git a/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild b/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..d311e4dda794
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild,v 1.1 2007/04/07 01:08:00 chtekk Exp $
+
+inherit autotools eutils multilib
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs."
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb debug fam gdbm ipv6 nls selinux"
+
+# userpriv breaks linking against vpopmail
+RESTRICT="userpriv"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+		>=net-libs/courier-authlib-0.57
+		>=net-mail/mailbase-0.00-r8
+		berkdb? ( sys-libs/db )
+		fam? ( virtual/fam )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+		dev-lang/perl
+		!mail-mta/courier
+		userland_GNU? ( sys-process/procps )"
+
+PROVIDE="virtual/imapd"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+pkg_setup() {
+	if ! use berkdb && ! use gdbm ; then
+		echo
+		eerror "Either the 'berkdb' or the 'gdbm' USE flag is required."
+		eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'."
+		eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'."
+		echo
+		die "Required USE flag missing."
+	fi
+}
+
+vpopmail_setup() {
+	VPOPMAIL_INSTALLED=
+	VPOPMAIL_DIR=
+	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
+	VPOPMAIL_INSTALLED=
+	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]] ; then
+		VPOPMAIL_INSTALLED=1
+	else
+		VPOPMAIL_DIR=
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004 langthang@gentoo.org
+	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
+	epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${PN}-4.0.6-aclocal-fix.patch
+
+	# as-needed fix (bug #168769).
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		epatch "${FILESDIR}"/${PN}-4.0.6-db4-bdbobj_configure.in.patch
+		epatch "${FILESDIR}"/${PN}-4.0.6-db4-tcpd_configure.in.patch
+		epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch
+	fi
+
+	ebegin "Recreating configure"
+	AT_NO_RECURSIVE="true" eautoreconf || die "eautoreconf on . failed"
+	eend $?
+
+	cd "${S}/maildir"
+	ebegin "Recreating maildir/configure"
+	eautoreconf || die "eautoreconf on maildir failed"
+	eend $?
+
+	cd "${S}/bdbobj"
+	ebegin "Recreating bdbobj/configure"
+	eautoreconf || die "eautoreconf on bdbobj failed"
+	eend $?
+
+	cd "${S}/tcpd"
+	ebegin "Recreating tcpd/configure"
+	eautoreconf || die "eautoreconf on tcpd failed"
+	eend $?
+}
+
+src_compile() {
+	vpopmail_setup
+
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# The default character set is ISO-8859-1/US-ASCII.
+	# USE 'nls' will enable all available character sets.
+	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation tables.
+	if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then
+		einfo "ENABLE_UNICODE is not set, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	elif use nls ; then
+		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
+		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
+	else
+		einfo "Disabling unicode support"
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Fix for bug #21330
+	CFLAGS="$(echo ${CFLAGS} | xargs)"
+	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
+	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
+
+	# Do the actual build now
+	LDFLAGS="${LDFLAGS} " econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		${myconf} || die "econf failed"
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist || \
+		die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	vpopmail_setup
+
+	dodir /var/lib/${PN} /etc/pam.d
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -Rf "${D}/etc/pam.d"
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin"
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	cd "${D}/usr/$(get_libdir)/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin"
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -f * ../sbin
+	mv -f ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" || die "doexe failed"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger || die "dosym failed"
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}" || die "doinitd ${initd} failed"
+	done
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}" || die "doexe ${exe} failed"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}"
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	einfo "Authdaemond is no longer provided by this package."
+	einfo "Authentication libraries are now in courier-authlib."
+	einfo "For a quick-start howto please refer to:"
+	einfo "/usr/share/doc/${P}/${PN}-gentoo.readme.gz"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
diff --git a/net-mail/courier-imap/courier-imap-4.1.2.ebuild b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
deleted file mode 100644
index 2bf5cf6d57db..000000000000
--- a/net-mail/courier-imap/courier-imap-4.1.2.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2.ebuild,v 1.5 2007/03/30 16:52:17 drizzt Exp $
-
-WANT_AUTOCONF="2.6"
-
-inherit autotools eutils multilib
-IUSE="fam berkdb gdbm debug ipv6 nls selinux"
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-#MY_PV=${PV/_rc*/}
-#SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	>=net-libs/courier-authlib-0.57
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	fam? ( virtual/fam )
-	selinux? ( sec-policy/selinux-courier-imap )
-	>=net-mail/mailbase-0.00-r8"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	userland_GNU? ( sys-process/procps )
-	!mail-mta/courier"
-PROVIDE="virtual/imapd"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-#S=${WORKDIR}/${PN}-${MY_PV}
-pkg_setup() {
-	if ! use berkdb && ! use gdbm; then
-		echo
-		eerror "either 'berkdb' or 'gdbm' USE flag is required."
-		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
-		eerror "'man 5 portage' for correct syntax usage for '/etc/portage/package.use'"
-		echo
-		die "required USE flag is missing."
-	fi
-}
-
-vpopmail_setup() {
-	VPOPMAIL_INSTALLED=
-	VPOPMAIL_DIR=
-	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004; langthang@gentoo.org.
-	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch ${FILESDIR}/${PN}-4.0.1-disable-fam-configure.in.patch
-
-	# kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206)
-	epatch "${FILESDIR}"/${P}-aclocal-fix.patch
-
-	# as-needed fix (bug #168769)
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	# These patches should fix problem detecting Berkeley DB.
-	# We now can compile with db4 support.
-	if use berkdb; then
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-tcpd_configure.in.patch
-		epatch ${FILESDIR}/${P}-db4-configure.in.patch
-	fi
-
-	export WANT_AUTOCONF="2.5"
-	ebegin "Recreating configure"
-	AT_NO_RECURSIVE="true" eautoreconf || die "autoconf on . failed"
-	eend $?
-
-	cd ${S}/maildir
-	ebegin "Recreating maildir/configure"
-	eautoreconf || die "autoconf on maildir failed"
-	eend $?
-
-	cd ${S}/bdbobj
-	ebegin "Recreating bdbobj/configure"
-	eautoreconf || die "autoconf on bdbobj failed"
-	eend $?
-
-	cd ${S}/tcpd
-	ebegin "Recreating tcpd/configure"
-	eautoreconf || die "autoconf on bdbobj failed"
-	eend $?
-}
-
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-
-	# 19 Aug 2004; langthang@gentoo.org
-	# default to gdbm if both berkdb and gdbm present.
-	if use gdbm; then
-		einfo "build with GDBM support."
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb; then
-		einfo "build with Berkeley DB support."
-		myconf="${myconf} --with-db=db"
-	fi
-
-	# This check should be in courier-authlib.
-	# But I am not sure so I commented here
-	# If you are using vpopmail and everything work,
-	# please remove this section.
-	#if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-	#	einfo "vpopmail found"
-	#	myconf="${myconf} --with-authvchkpw"
-	#	tmpLDFLAGS="$(cat ${VPOPMAIL_DIR}/etc/lib_deps)"
-	#	LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-	#	CFLAGS="${CFLAGS} $(cat ${VPOPMAIL_DIR}/etc/inc_deps)"
-	#else
-	#	einfo "vpopmail not found"
-	#	myconf="${myconf} --without-authvchkpw"
-	#fi
-
-	# The default character set is ISO-8859-1/US-ASCII.
-	# use nls will enable all available charater sets.
-	# set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
-	# to include only specified translation table.
-	if use nls && [[ -z "$ENABLE_UNICODE" ]]; then
-		einfo "ENABLE_UNICODE is not set, building with all available character sets"
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		einfo "ENABLE_UNICODE is set, building with unicode=$ENABLE_UNICODE"
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		einfo "disabling unicode support"
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	# fix for bug #21330
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS} " econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/$(get_libdir)/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		$(use_with ipv6) \
-		$(use_with fam) \
-		${myconf} || die "econf failed"
-
-	# change the pem file location..
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist || \
-		die "sed failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	vpopmail_setup
-
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-	rm -rf ${D}/etc/pam.d
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	local name
-	for name in imapd pop3d; do
-		mv ${name} "courier-${name}" || \
-			die "failed to mv $name to courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/$(get_libdir)/courier-imap
-	local service
-	for service in imapd pop3d; do
-		local type
-		for type in "" "-ssl"; do
-			local file
-			file="${service}${type}.rc"
-			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
-			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file} || die "sed failed"
-		done
-	done
-
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl; do
-		mv -v ${D}/etc/courier-imap/${x}.dist \
-			${D}/etc/courier-imap/${x} || \
-			die "failed to mv ${x}.dist to ${x}"
-	done
-
-	#insinto /etc/courier-imap
-	#newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	cd ${D}/etc/courier-imap
-	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
-	for service in imapd-ssl pop3d-ssl imapd pop3d; do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-	done
-	for service in imapd pop3d; do
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN=' >> ${service}
-		echo -e '#Put any program for ${LOGINRUN} here' >> ${service}
-		echo -e '#this is for relay-ctrl-allow in 4*' >> ${service}
-		echo 'LOGINRUN=' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *; do
-		if [[ -L ${x} ]]; then
-			rm -v ${x} || die "failed to rm ${x}"
-		fi
-	done
-
-	cd ../share
-	mv -v * ../sbin
-	mv -v ../sbin/man .
-	cd ..
-
-	for x in mkimapdcert mkpop3dcert; do
-		mv ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}.orig || \
-			die "failed to rm ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}"
-	done
-
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert || \
-			die "doexe failed"
-
-	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
-			die "dosym failed"
-
-	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
-	for initd in {imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${INITD_VER}-courier-${initd}.rc6 > \
-			courier-${initd} || die "libdir-sed failed"
-		doinitd courier-${initd} || die "doinitd courier-${initd} failed"
-	done
-	exeinto /usr/$(get_libdir)/courier-imap
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${RC_VER}-${exe} > \
-			${exe} || die "libdir-sed 2 failed"
-		doexe ${exe} || die "doexe ${exe} failed"
-	done
-
-	#local authmods
-	#authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	#use mysql && authmods="${authmods} authmysql"
-	#use postgres && authmods="${authmods} authpgsql"
-	#use pam && authmods="${authmods} authpam"
-	#use ldap && authmods="${authmods} authldap"
-	#[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	#exeinto /usr/lib/courier-imap/authlib
-	#for i in ${authmods}; do
-	#	[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i} || die "doexe failed"
-	#done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake || \
-		die "mv failed"
-
-	# bug #45953, more docs
-	cd ${S}
-	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} \
-		${FILESDIR}/courier-imap-gentoo.readme
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	einfo "Authdaemond is no longer provided this package."
-	einfo "athentication libraries are from courier-authlib"
-	einfo "for a quick start please refer to"
-	einfo "/usr/share/doc/${P}/courier-imap-gentoo.readme.gz"
-	# some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	chmod 755 ${ROOT}/usr/$(get_libdir)/courier-imap || die "Failed to ensure sane permissions"
-}
-
-src_test() {
-	ewarn "make check not supported by package due to"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
-}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch
deleted file mode 100644
index 776fdc144483..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- courier-imap-3.0.7-orig/bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
-+++ courier-imap-3.0.7/bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
-@@ -21,15 +21,19 @@
- dnl Checks for libraries.
- 
- saveLIBS="$LIBS"
--AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--	))
--
--FOUND_DB=0
--AC_CHECK_FUNC(dbopen, FOUND_DB=1)
--AC_CHECK_FUNC(db_open, FOUND_DB=1)
--AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
-+for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+  do
-+        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
-+
-+  done
-+FOUND_DB=0
-+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create, FOUND_DB=1)
- 
- LIBS="$saveLIBS"
- 
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.7-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-db4-configure.in.patch
deleted file mode 100644
index d8ac46e2b5c9..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.7-db4-configure.in.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- courier-imap-3.0.7-orig/configure.in	2004-08-01 07:08:16.000000000 -0700
-+++ courier-imap-3.0.7/configure.in	2004-08-14 16:02:03.856436728 -0700
-@@ -11,7 +11,6 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_SYSCONFTOOL
- 
- AC_PATH_PROGS(SETENV, env)
- 
-@@ -132,16 +131,18 @@
- 
- if test "$db" != "gdbm"
- then
--
--	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--		AC_CHECK_LIB(db, db_env_create,
--				[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--	))
--
--	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
-+  for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+    do
-+	AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	  AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	    AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	      AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
-+    done
-+  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
-+
- fi
- 
- LIBS="$saveLIBS"
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.7-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-disable-fam-configure.in.patch
deleted file mode 100644
index 7019d02a6af5..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.7-disable-fam-configure.in.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- courier-imap-3.0.7-orig/maildir/configure.in	2004-06-08 15:44:23.000000000 -0700
-+++ courier-imap-3.0.7/maildir/configure.in	2004-08-14 15:28:20.525714876 -0700
-@@ -60,6 +60,12 @@
- dnl Checks for library functions.
- AC_CHECK_HEADER(fam.h, :, :)
- AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
-+AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
-+       fam="$withval",
-+       fam="no")
-+
-+if test "$fam" != "no"
-+then
- AC_CHECK_LIB(fam, FAMOpen,  [
- 			LIBFAM=-lfam
- 			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
-@@ -74,6 +80,7 @@
- AC_MSG_ERROR([[FAM development libraries not found.]]) ]
- 					)
- 		  ])
-+fi
- 
- AC_SUBST(LIBFAM)
- 
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch
new file mode 100644
index 000000000000..14e9cda636ab
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch
@@ -0,0 +1,10 @@
+--- configure.in.orig	2006-12-30 09:28:52.000000000 -0500
++++ configure.in	2007-02-27 12:13:38.000000000 -0500
+@@ -16,7 +16,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
index b2c802c548bf..4f14d72db5a4 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
@@ -1,5 +1,5 @@
---- courier-imap-3.0.7-orig/bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
-+++ courier-imap-3.0.7/bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
+--- bdbobj/configure.in.orig	2001-09-18 18:26:28.000000000 -0700
++++ bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
 @@ -21,15 +21,23 @@
  dnl Checks for libraries.
  
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
index 8f6e40693a9f..03d2c03912a8 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
@@ -1,13 +1,5 @@
 --- configure.in.orig	2004-11-16 16:02:11.045791896 -0800
 +++ configure.in	2004-11-16 16:03:06.743324584 -0800
-@@ -11,7 +11,6 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_SYSCONFTOOL
- AC_LIBTOOL_DLOPEN
- AM_PROG_LIBTOOL
- 
 @@ -150,16 +149,22 @@
  
  if test "$db" != "gdbm"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
index 48ddd75c6b9c..e1460be25d09 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 
 depend() {
 	need net courier-authlib
@@ -11,16 +11,16 @@ depend() {
 source /etc/courier-imap/imapd-ssl
 
 checkconfig() {
-	if [ ! -e /etc/courier-imap/imapd-ssl ] ; then
-		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd"
+	if [[ ! -e /etc/courier-imap/imapd-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd-ssl"
 		return 1
 	fi
 	source /etc/courier-imap/imapd-ssl || {
 		eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
-		eerror "Please correct them before trying to start imapd-ssl"
+		eerror "Please correct them before trying to start courier-imapd-ssl"
 		return 3
 	}
-	if [ ! -e "${TLS_CERTFILE}" ] ; then
+	if [[ ! -e "${TLS_CERTFILE}" ]] ; then
 		eerror "You need to create a SSL certificate to use IMAP over SSL"
 		eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
 		return 2
@@ -30,13 +30,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting courier-imapd over SSL"
-	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd-ssl.rc \
-		--pid=$SSLPIDFILE
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd-ssl.rc --pid=${SSLPIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping courier-imapd over SSL"
-	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
+	start-stop-daemon --quiet --stop --pid=${SSLPIDFILE}
 	eend $?
 }
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
index ec95f657f659..2367ae0a2e77 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
@@ -1,5 +1,3 @@
 #!/bin/bash
 XMAILDIR="$1"
-eval ${LOGINRUN} \
-	/usr/sbin/courier-imapd \
-	${XMAILDIR}
+eval ${LOGINRUN} /usr/sbin/courier-imapd "${XMAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
index ed5dab557940..f5433f2af6ca 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 
 depend() {
 	need net courier-authlib
@@ -11,13 +11,13 @@ depend() {
 source /etc/courier-imap/imapd
 
 checkconfig() {
-	if [ ! -e /etc/courier-imap/imapd ] ; then
+	if [[ ! -e /etc/courier-imap/imapd ]] ; then
 		eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
 		return 1
 	fi
 	source /etc/courier-imap/imapd || {
 		eerror "There are syntax errors in /etc/courier-imap/imapd"
-		eerror "Please correct them before trying to start imapd"
+		eerror "Please correct them before trying to start courier-imapd"
 		return 2
 	}
 }
@@ -25,13 +25,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting courier-imapd"
-	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd.rc \
-		--pid=$PIDFILE
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd.rc --pid=${PIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping courier-imapd"
-	start-stop-daemon --quiet --stop --pid=$PIDFILE
+	start-stop-daemon --quiet --stop --pid=${PIDFILE}
 	eend $?
 }
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
index 6dedabc29e09..014244692dfd 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 
 depend() {
 	need net courier-authlib
@@ -11,16 +11,16 @@ depend() {
 source /etc/courier-imap/pop3d-ssl
 
 checkconfig() {
-	if [ ! -e /etc/courier-imap/pop3d-ssl ] ; then
-		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d"
+	if [[ ! -e /etc/courier-imap/pop3d-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d-ssl"
 		return 1
 	fi
 	source /etc/courier-imap/pop3d-ssl || {
 		eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
-		eerror "Please correct them before trying to start pop3d-ssl"
+		eerror "Please correct them before trying to start courier-pop3d-ssl"
 		return 3
 	}
-	if [ ! -e "${TLS_CERTFILE}" ] ; then
+	if [[ ! -e "${TLS_CERTFILE}" ]] ; then
 		eerror "You need to create a SSL certificate to use POP3 over SSL"
 		eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
 		return 2
@@ -30,13 +30,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting courier-pop3d over SSL"
-	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d-ssl.rc \
-		--pidfile $SSLPIDFILE
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d-ssl.rc --pidfile ${SSLPIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping courier-pop3d over SSL"
-	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
+	start-stop-daemon --quiet --stop --pidfile ${SSLPIDFILE}
 	eend $?
 }
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
index c06fa09846de..4651a048ac8b 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
@@ -1,5 +1,3 @@
 #!/bin/bash
 XMAILDIR="$1"
-eval ${LOGINRUN} \
-	/usr/sbin/courier-pop3d \
-	${XMAILDIR}
+eval ${LOGINRUN} /usr/sbin/courier-pop3d "${XMAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
index 8f5aab096dc8..6eeb51c5b926 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 
 depend() {
 	need net courier-authlib
@@ -11,13 +11,13 @@ depend() {
 source /etc/courier-imap/pop3d
 
 checkconfig() {
-	if [ ! -e /etc/courier-imap/pop3d ] ; then
+	if [[ ! -e /etc/courier-imap/pop3d ]] ; then
 		eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
 		return 1
 	fi
 	source /etc/courier-imap/pop3d || {
 		eerror "There are syntax errors in /etc/courier-imap/pop3d"
-		eerror "Please correct them before trying to start pop3d"
+		eerror "Please correct them before trying to start courier-pop3d"
 		return 2
 	}
 }
@@ -25,13 +25,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting courier-pop3d"
-	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d.rc \
-		--pidfile $PIDFILE
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d.rc --pidfile ${PIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping courier-pop3d"
-	start-stop-daemon --quiet --stop --pidfile $PIDFILE
+	start-stop-daemon --quiet --stop --pidfile ${PIDFILE}
 	eend $?
 }
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
index 9bbf2df7c374..1379b0df89e0 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -12,26 +12,21 @@ libexecdir=/usr/GENTOO_LIBDIR/courier-imap
 source /etc/courier-imap/imapd
 source /etc/courier-imap/imapd-ssl
 
-# the new courier-authlib doesn't usee these settings.
-#LIBAUTHMODULES=""
-#for f in `echo $AUTHMODULES`
-#do
-#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/GENTOO_LIBDIR/courier-imap/authlib/$f"
-#done
+ulimit -d ${IMAP_ULIMITD}
 
-ulimit -d $IMAP_ULIMITD
 export IMAP_TLS=1
+
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 
-eval $PRERUN \
-/usr/GENTOO_LIBDIR/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/GENTOO_LIBDIR/courier-imap/courierlogger \
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
 	-stderrloggername=imapd-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/imaplogin \
-		/usr/GENTOO_LIBDIR/courier-imap/courier-imapd.indirect ${MAILDIR}
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
index ce1b89fb23a0..b40614ff8b8c 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.6-r1-gentoo-imapd.rc,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -12,27 +12,22 @@ libexecdir=/usr/GENTOO_LIBDIR/courier-imap
 source /etc/courier-imap/imapd-ssl
 source /etc/courier-imap/imapd
 
-# The new courier-authlib doesn't use these settings.
-#LIBAUTHMODULES=""
-#for f in `echo $AUTHMODULES`
-#do
-#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/GENTOO_LIBDIR/courier-imap/authlib/$f"
-#done
+ulimit -d ${IMAP_ULIMITD}
 
-ulimit -d $IMAP_ULIMITD
-IMAP_STARTTLS="$IMAPDSTARTTLS"
+IMAP_STARTTLS="${IMAPDSTARTTLS}"
 export IMAPDSTARTTLS IMAP_STARTTLS
-TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
+
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 
-eval $PRERUN \
-/usr/GENTOO_LIBDIR/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/GENTOO_LIBDIR/courier-imap/courierlogger \
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
 	-stderrloggername=imapd \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/imaplogin \
-		/usr/GENTOO_LIBDIR/courier-imap/courier-imapd.indirect ${MAILDIR}
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
index 86a639f7ed83..57d3515b77fc 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -12,25 +12,19 @@ libexecdir=/usr/GENTOO_LIBDIR/courier-imap
 source /etc/courier-imap/pop3d
 source /etc/courier-imap/pop3d-ssl
 
-# The new courier-authlib doesn't use these settings.
-#LIBAUTHMODULES=""
-#for f in `echo $AUTHMODULES`
-#do
-#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/GENTOO_LIBDIR/courier-imap/authlib/$f"
-#done
-
 export POP3_TLS=1
+
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 
-eval $PRERUN \
-/usr/GENTOO_LIBDIR/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/GENTOO_LIBDIR/courier-imap/courierlogger \
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
 	-stderrloggername=pop3d-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/pop3login \
-		/usr/GENTOO_LIBDIR/courier-imap/courier-pop3d.indirect ${MAILDIR}
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
index 9d566e0a4244..1a2b44dc6b09 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.6-r1-gentoo-pop3d.rc,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -12,25 +12,20 @@ libexecdir=/usr/GENTOO_LIBDIR/courier-imap
 source /etc/courier-imap/pop3d-ssl
 source /etc/courier-imap/pop3d
 
-# The new courier-authlib doesn't use these settings.
-#LIBAUTHMODULES=""
-#for f in `echo $AUTHMODULES`
-#do
-#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/GENTOO_LIBDIR/courier-imap/authlib/$f"
-#done
+POP3DSTARTTLS="${POP3_STARTTLS}"
+export POP3_STARTTLS POP3DSTARTTLS
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
 
-export POP3DSTARTTLS=$POP3_STARTTLS
-TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 
-eval $PRERUN \
-/usr/GENTOO_LIBDIR/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/GENTOO_LIBDIR/courier-imap/courierlogger \
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
 	-stderrloggername=pop3d \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/pop3login \
-		/usr/GENTOO_LIBDIR/courier-imap/courier-pop3d.indirect ${MAILDIR}
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch
deleted file mode 100644
index f8cb78adaf07..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- courier-imap-4.1.2.orig/configure.in	2006-12-30 09:28:52.000000000 -0500
-+++ courier-imap-4.1.2/configure.in	2007-02-27 12:13:38.000000000 -0500
-@@ -16,7 +16,6 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_SYSCONFTOOL
- AC_LIBTOOL_DLOPEN
- AM_PROG_LIBTOOL
- 
diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch
deleted file mode 100644
index 03d2c03912a8..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.in.orig	2004-11-16 16:02:11.045791896 -0800
-+++ configure.in	2004-11-16 16:03:06.743324584 -0800
-@@ -150,16 +149,22 @@
- 
- if test "$db" != "gdbm"
- then
-+  for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+    do
-+	AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+		AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+			AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	  	AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	    	AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	      	AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
-+    done
-+  AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
- 
--	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--		AC_CHECK_LIB(db, db_env_create,
--				[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--	))
--
--	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
- fi
- 
- LIBS="$saveLIBS"
diff --git a/net-mail/courier-imap/files/digest-courier-imap-3.0.7 b/net-mail/courier-imap/files/digest-courier-imap-3.0.7
deleted file mode 100644
index e2491a6ab5dd..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-3.0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3177f4451d02b6380c5b45aa80d795a7 courier-imap-3.0.7.tar.bz2 1702769
-RMD160 2fb2b2c5e4837459a9dba4b799b7bc8f4ecb080f courier-imap-3.0.7.tar.bz2 1702769
-SHA256 e730ef7127494df931b51087adeaa59062d2d6d7840fed6b1a88409c692cd024 courier-imap-3.0.7.tar.bz2 1702769
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r1 b/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r1
deleted file mode 100644
index 6bd62fdd18fb..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5e1c53a49d5ffb2ec9f3b600a6e1fbef courier-imap-4.0.6.tar.bz2 3157577
-RMD160 4006c5ec4db6b2adac393e2ebdf9ee99af3a8b2a courier-imap-4.0.6.tar.bz2 3157577
-SHA256 27e6847507ddecfab1672fdf52447f8351f4cf046145974768ea93ebfea6ddbb courier-imap-4.0.6.tar.bz2 3157577
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.0.6 b/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r2
index 6bd62fdd18fb..6bd62fdd18fb 100644
--- a/net-mail/courier-imap/files/digest-courier-imap-4.0.6
+++ b/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r2
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.1.2 b/net-mail/courier-imap/files/digest-courier-imap-4.1.2-r1
index d2803af34fc5..d2803af34fc5 100644
--- a/net-mail/courier-imap/files/digest-courier-imap-4.1.2
+++ b/net-mail/courier-imap/files/digest-courier-imap-4.1.2-r1
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
index 89dcd746873c..b50b40c412de 100644
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>net-mail</herd>
-    <maintainer>
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 </pkgmetadata>