Clean out old versions. Sanitize remaining ebuild. Bump to -r1 for bug 117290. Fix configure for bug 117290 for >db-4.3, thanks to Hanno Meyer-Thurow. Fix configure for bug 160286, thanks to Sheldon Hearn.

(Portage version: 2.1.2_rc4-r3)
 (Unsigned Manifest commit)

22 files changed, 31 insertions, 1725 deletions

diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 6689aba7bbb7..d0bb4974467d 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,108 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX CVE-2005-3532.patch 456 RMD160 e6edba3d1cd2c4873b892ce8f98be25cf6038f6c SHA1 06277f602f55a905d40b2337e4003afdfb3bce34 SHA256 ddad90488499f5607e30fd68f209553b6f35ab6aa4958c672f8ed73f85fe03ae
-MD5 452ec8a16d520bb91316b7dc1390b325 files/CVE-2005-3532.patch 456
-RMD160 e6edba3d1cd2c4873b892ce8f98be25cf6038f6c files/CVE-2005-3532.patch 456
-SHA256 ddad90488499f5607e30fd68f209553b6f35ab6aa4958c672f8ed73f85fe03ae files/CVE-2005-3532.patch 456
-AUX configure-db4.patch 2544 RMD160 9bd66d446df13826301b32334471ae07edf0fe31 SHA1 63c60ce736ef0bdc30ce410fcaa3df1a6ee52866 SHA256 273f882b6b22b0667a266741368d0d5a1ef8ee3483f046e064289e6cb08b4766
-MD5 6930587c358320ecb1043761d7ff97f1 files/configure-db4.patch 2544
-RMD160 9bd66d446df13826301b32334471ae07edf0fe31 files/configure-db4.patch 2544
-SHA256 273f882b6b22b0667a266741368d0d5a1ef8ee3483f046e064289e6cb08b4766 files/configure-db4.patch 2544
-AUX courier-authlib-initd 1095 RMD160 d9a38796a0004168aadd387a6875c373c9d3ab0c SHA1 b1f3dc1c6c7abae726ef8c0e295bf17f43ab67fe SHA256 49784ee582ff54612ea13345f09da4ad9199c39745c5faf4799d69cef61c3d8b
-MD5 ac879be5878ebe9b1eb18655b3538bf8 files/courier-authlib-initd 1095
-RMD160 d9a38796a0004168aadd387a6875c373c9d3ab0c files/courier-authlib-initd 1095
-SHA256 49784ee582ff54612ea13345f09da4ad9199c39745c5faf4799d69cef61c3d8b files/courier-authlib-initd 1095
-DIST courier-authlib-0.53.tar.bz2 1966836 RMD160 a8cd7c169153af9bfd43fcff237ed72f520e8b25 SHA1 98ee21462a81452c4b637b66b1e71ab1d49e0caa SHA256 5457a4c5cafe85d6fd7c79d935e07056ba2860a53467d88fe0b175dcd1b534c1
-DIST courier-authlib-0.54.20050224.tar.bz2 1971852 RMD160 7db83f7d3721abd491dc4f6377fff46b2dd7a52b SHA1 2c7bec50f08d9bc5e999d0112eae028f66917ef7 SHA256 062fa428b77f0d8774e527b3052d1860d92f4377df3e12265f7a6670affa3157
-DIST courier-authlib-0.55.20050320.tar.bz2 1981258 RMD160 afce9c0a43da0f38f21ac3383b35f3fad523f6dd SHA1 f2ef451f103c7853f1adaf87a7ea9bc9ec6f665e SHA256 cf7afeadeb6d7d91ed2d4c547b25a49d17e79cf8905c87431ff0be8a6aa82314
-DIST courier-authlib-0.55.tar.bz2 1972024 RMD160 05907d9e7f8824aafa24c652083f564b9ed03e02 SHA1 f8570eeee2d8469e2b3d11ef1b58554d1f14fb83 SHA256 0521f39603490ed46bb1b82c339f56ed162f2ef666a97b4432897954a7ca7eaf
-DIST courier-authlib-0.56.tar.bz2 1981533 RMD160 71253363a141445ca762ceab4da75b8c1f470dc4 SHA1 6ccf0e24423ba352cc9fe25878c142d192c85750 SHA256 8fdeb47684086401aa5153a0108c36c7141c8558d51eb075637300924d57d5ac
-DIST courier-authlib-0.57.20051116.tar.bz2 2007269 RMD160 1847e7871eccb0ea6c02d46fe7b7dec316b41a7d SHA1 10c6537ba369b44bc001a0b12c58017579fa1c77 SHA256 9467ccdb932c9344bbdc57c7e32e77fbeb5f4f46ca5bbf16e2bbf1a53f027288
-DIST courier-authlib-0.57.tar.bz2 2006138 RMD160 b11e2f39b2af38c1487b81bb89c4925723627c9f SHA1 dd68cf4ff7f73ce472206c88dc19a0fd93128f63 SHA256 dd8e41abb573b68d328e183e1ba2a6cc89217e90f22d698a32fb878f38899dde
+AUX 0.58-configure-db4.patch 2616 RMD160 a65654c28537fc797eb0d7633d1b0b38f97af6f7 SHA1 9e66d0f69dc5ae157868c63d48009ef2a27a3d46 SHA256 629888b8363b0debcc592b4bed7390dfb01d9fc0ee15712d7c5a56575e25efe0
+MD5 1a6bae153910f87b5327c5d573503eb5 files/0.58-configure-db4.patch 2616
+RMD160 a65654c28537fc797eb0d7633d1b0b38f97af6f7 files/0.58-configure-db4.patch 2616
+SHA256 629888b8363b0debcc592b4bed7390dfb01d9fc0ee15712d7c5a56575e25efe0 files/0.58-configure-db4.patch 2616
+AUX 0.58-remove-obsolete-macro.patch 252 RMD160 f7bffc4956e078c5700394cfa6641df0c04ba050 SHA1 b199c22cbb6e449db76fdc924f6481a86361314f SHA256 ea6753f82c2b267ff373286f0c0a9e379e30f5d68bfe1df1c375d0a547d12a62
+MD5 ad8c997c0b176c6eab39dd38db000d5e files/0.58-remove-obsolete-macro.patch 252
+RMD160 f7bffc4956e078c5700394cfa6641df0c04ba050 files/0.58-remove-obsolete-macro.patch 252
+SHA256 ea6753f82c2b267ff373286f0c0a9e379e30f5d68bfe1df1c375d0a547d12a62 files/0.58-remove-obsolete-macro.patch 252
+AUX courier-authlib 1108 RMD160 38044239f8790f56a7ef2d76019b27ec3d626000 SHA1 1f5947fa72560ec7b16cbab9221303a201c281fc SHA256 172dde34bf6fa36b29318bf9f6ed9304fd89f549ba0f9a051831183f06d326c0
+MD5 3bb31318f6e3f50060ccf1735e8ceb55 files/courier-authlib 1108
+RMD160 38044239f8790f56a7ef2d76019b27ec3d626000 files/courier-authlib 1108
+SHA256 172dde34bf6fa36b29318bf9f6ed9304fd89f549ba0f9a051831183f06d326c0 files/courier-authlib 1108
+AUX initd/courier-authlib 1114 RMD160 2649ba0e1f8cf6afcf167f56cb47bb392a1f953d SHA1 5c31259b4965aee4df6a289df2e2d08a5602b10d SHA256 1d27f54ab2566ce8fed9501cc603120048c4d2981f1dbed73b53ce2f00325f27
+MD5 cfad3388d2325ef441ef30237c0dffde files/initd/courier-authlib 1114
+RMD160 2649ba0e1f8cf6afcf167f56cb47bb392a1f953d files/initd/courier-authlib 1114
+SHA256 1d27f54ab2566ce8fed9501cc603120048c4d2981f1dbed73b53ce2f00325f27 files/initd/courier-authlib 1114
 DIST courier-authlib-0.58.tar.bz2 2006735 RMD160 6474612496cd287f294c7f52239ea853c44e4aa1 SHA1 8bdab3c2e734cc8f47230924ec638ba3609a92a1 SHA256 d877cc6c65e90471ec9410c5ce7af467ba5beb3922b9cfbf2bf6aa24f6bdc7ad
-EBUILD courier-authlib-0.53.ebuild 5870 RMD160 2224e28fd79a1cf98c747ae529b95e9af8abd2d5 SHA1 d5bd50f6826923a785e831cb99d1f02c1f1d0d35 SHA256 5141a47425f0111df0d8cda8ba7208f06e035bce8f4816e9a34ffe514fd2c9a5
-MD5 e9d85dba962db7935c3c92b7728e9cff courier-authlib-0.53.ebuild 5870
-RMD160 2224e28fd79a1cf98c747ae529b95e9af8abd2d5 courier-authlib-0.53.ebuild 5870
-SHA256 5141a47425f0111df0d8cda8ba7208f06e035bce8f4816e9a34ffe514fd2c9a5 courier-authlib-0.53.ebuild 5870
-EBUILD courier-authlib-0.54.20050224.ebuild 5993 RMD160 4c0eec69dd79882caca1036fe85df4ff839868ea SHA1 caafff68721c3eb634cd8d61cdad04cf757c37ae SHA256 7a707add2deca7a00097d358c18a55afb3393ff74cdcd5bed06fe24a648de1de
-MD5 0827888379c4e442d3472ca3d372ba25 courier-authlib-0.54.20050224.ebuild 5993
-RMD160 4c0eec69dd79882caca1036fe85df4ff839868ea courier-authlib-0.54.20050224.ebuild 5993
-SHA256 7a707add2deca7a00097d358c18a55afb3393ff74cdcd5bed06fe24a648de1de courier-authlib-0.54.20050224.ebuild 5993
-EBUILD courier-authlib-0.55.20050320.ebuild 6065 RMD160 5543aea39587b509b83a91766cd6e75ca4caa8c8 SHA1 6d53447adbedc4b8ad281b63a8efd2a493aa6bd8 SHA256 7e9bf35b1dcd576e43512722caa4cf3421e82e1873ccadb76fe72c6c1a977ea2
-MD5 209eddc5ca740c4bdb6262cedaed9277 courier-authlib-0.55.20050320.ebuild 6065
-RMD160 5543aea39587b509b83a91766cd6e75ca4caa8c8 courier-authlib-0.55.20050320.ebuild 6065
-SHA256 7e9bf35b1dcd576e43512722caa4cf3421e82e1873ccadb76fe72c6c1a977ea2 courier-authlib-0.55.20050320.ebuild 6065
-EBUILD courier-authlib-0.55.ebuild 6023 RMD160 2bb31b20f821a7481af2306367db33a984a7e5f8 SHA1 a4555bf3a95e07b8e8083e9ccfb493b9946c37c7 SHA256 2bb176c580a2186161c67f3fe16fa7c9ad67ae1fdde02089ebbac6bc1df967a8
-MD5 f4b3f464a19b3a49122998be5a12d398 courier-authlib-0.55.ebuild 6023
-RMD160 2bb31b20f821a7481af2306367db33a984a7e5f8 courier-authlib-0.55.ebuild 6023
-SHA256 2bb176c580a2186161c67f3fe16fa7c9ad67ae1fdde02089ebbac6bc1df967a8 courier-authlib-0.55.ebuild 6023
-EBUILD courier-authlib-0.56.ebuild 6056 RMD160 0a4c0da4bfd301560874b9008d5b323dec546c1a SHA1 50fa4a4deb8b99ac45c1ad4537b40dcf8f72216e SHA256 f2bd7f3354bafdddfbae6802a3163b6cba30c50cae278c83a013eedede69cdf4
-MD5 defbab5b3870654a74711558469a84a7 courier-authlib-0.56.ebuild 6056
-RMD160 0a4c0da4bfd301560874b9008d5b323dec546c1a courier-authlib-0.56.ebuild 6056
-SHA256 f2bd7f3354bafdddfbae6802a3163b6cba30c50cae278c83a013eedede69cdf4 courier-authlib-0.56.ebuild 6056
-EBUILD courier-authlib-0.57-r1.ebuild 5935 RMD160 8d2a36615e9cc90b88fd6153e66ae9e83a0993e9 SHA1 b526e2556f1f8850b14761f5a88d231ca785e555 SHA256 7fc9f9019a6683ec5ac68ed4893ed3c30de850bb6166ea067de03a3806dd72cb
-MD5 63609187513bce835d9ce261c2373536 courier-authlib-0.57-r1.ebuild 5935
-RMD160 8d2a36615e9cc90b88fd6153e66ae9e83a0993e9 courier-authlib-0.57-r1.ebuild 5935
-SHA256 7fc9f9019a6683ec5ac68ed4893ed3c30de850bb6166ea067de03a3806dd72cb courier-authlib-0.57-r1.ebuild 5935
-EBUILD courier-authlib-0.57-r2.ebuild 5974 RMD160 22deb45a381e01bb609dc9706234ff2a3420c7b5 SHA1 3dfeca137f0f78246dc442f3966371f19b586f29 SHA256 ece801c0b367c6c6de0bb5c213112513762f03aa5e078ec373fed75cf8648dd0
-MD5 e2092c0d5a8e469f73bf61303257d18c courier-authlib-0.57-r2.ebuild 5974
-RMD160 22deb45a381e01bb609dc9706234ff2a3420c7b5 courier-authlib-0.57-r2.ebuild 5974
-SHA256 ece801c0b367c6c6de0bb5c213112513762f03aa5e078ec373fed75cf8648dd0 courier-authlib-0.57-r2.ebuild 5974
-EBUILD courier-authlib-0.57.20051116.ebuild 6105 RMD160 5663e8945e13343c411684429c613e382ad18646 SHA1 cb2496f4df49a0ead77d6ef036cf0746da39e6f2 SHA256 a7aa9ef6ce258b5894d238eab16187a20a822f86d963c0ba819f4c658cd746a4
-MD5 fd1b6057b1b9749f289803df2bdba206 courier-authlib-0.57.20051116.ebuild 6105
-RMD160 5663e8945e13343c411684429c613e382ad18646 courier-authlib-0.57.20051116.ebuild 6105
-SHA256 a7aa9ef6ce258b5894d238eab16187a20a822f86d963c0ba819f4c658cd746a4 courier-authlib-0.57.20051116.ebuild 6105
-EBUILD courier-authlib-0.57.ebuild 6056 RMD160 3764900a4a23d894175529aeb2c4131c2e37b404 SHA1 905fe61ec568872ad00f258d748983f3ebde2180 SHA256 1a47c675202200e30bc650002fabd0f816058c4022b96df393238badcaed8aa0
-MD5 6e0565965fa90db13a0684a128a7e7e7 courier-authlib-0.57.ebuild 6056
-RMD160 3764900a4a23d894175529aeb2c4131c2e37b404 courier-authlib-0.57.ebuild 6056
-SHA256 1a47c675202200e30bc650002fabd0f816058c4022b96df393238badcaed8aa0 courier-authlib-0.57.ebuild 6056
-EBUILD courier-authlib-0.58.ebuild 5824 RMD160 4fe5a9aac77cbeb4fd834e5e8eed76537edfa358 SHA1 04879676b977328cee61c0180022fd27bff094b2 SHA256 70d3c7ae7df80163269b5977b014fa9f573bde10e8feb9622a025f2c4d7ab136
-MD5 5812c08b3f8f4fcc23a5a16bb776dc3a courier-authlib-0.58.ebuild 5824
-RMD160 4fe5a9aac77cbeb4fd834e5e8eed76537edfa358 courier-authlib-0.58.ebuild 5824
-SHA256 70d3c7ae7df80163269b5977b014fa9f573bde10e8feb9622a025f2c4d7ab136 courier-authlib-0.58.ebuild 5824
-MISC ChangeLog 9655 RMD160 fa44b487863ea9a7a8db5c4306052e74ca69a99b SHA1 b1b24daa160a02158d87a81386a7a57237ea3738 SHA256 a169ad31a95ac6f3f847f41aef66ee9c5fe4979a11a612f4a73862aed0b7ea3b
-MD5 68c128722a4b765cb4dfe8e7ec831945 ChangeLog 9655
-RMD160 fa44b487863ea9a7a8db5c4306052e74ca69a99b ChangeLog 9655
-SHA256 a169ad31a95ac6f3f847f41aef66ee9c5fe4979a11a612f4a73862aed0b7ea3b ChangeLog 9655
+EBUILD courier-authlib-0.58-r1.ebuild 5901 RMD160 bde69b7b117840da39b7563ced5d535337ffaaac SHA1 962ec3fb891769ae271f08e44d1453b5c23f5d8a SHA256 2d5f00a42077b6e259f55fa4e37fdd543e53272ab1c575dbed86d85170ea6f84
+MD5 88835e772409e6a5ce2d8a56e2a063a8 courier-authlib-0.58-r1.ebuild 5901
+RMD160 bde69b7b117840da39b7563ced5d535337ffaaac courier-authlib-0.58-r1.ebuild 5901
+SHA256 2d5f00a42077b6e259f55fa4e37fdd543e53272ab1c575dbed86d85170ea6f84 courier-authlib-0.58-r1.ebuild 5901
+EBUILD courier-authlib-0.58.ebuild 5919 RMD160 50271c5de19f8b1a53ba100502a1e9ef495bd66f SHA1 17393ee00918ecb25fdd0477244f038bb0cd556c SHA256 7d3cab6f436b0622e082728584fb608612a4e20f26436f55792b2d1ac77949aa
+MD5 75db92e4f620bb91c67a1575d569ec1b courier-authlib-0.58.ebuild 5919
+RMD160 50271c5de19f8b1a53ba100502a1e9ef495bd66f courier-authlib-0.58.ebuild 5919
+SHA256 7d3cab6f436b0622e082728584fb608612a4e20f26436f55792b2d1ac77949aa courier-authlib-0.58.ebuild 5919
+MISC ChangeLog 10568 RMD160 1ee59cefb61e6938e3d48bf8e23952c213342950 SHA1 610966ab87f35eb90ba20da2a522f3369e118c1f SHA256 0da9b258a4d137d5084b5c03c5040d9378b3cb572b3677591476f06bcd0ea714
+MD5 875cf3587ce3b5001fdf6ad46243883a ChangeLog 10568
+RMD160 1ee59cefb61e6938e3d48bf8e23952c213342950 ChangeLog 10568
+SHA256 0da9b258a4d137d5084b5c03c5040d9378b3cb572b3677591476f06bcd0ea714 ChangeLog 10568
 MISC metadata.xml 264 RMD160 d6222b0f467d8eba60d21e6aca39f286597beaef SHA1 0801b3c7ed8a52bc3a43092b58ad87a0357b2691 SHA256 712f8d9c0fb0a7cd5ce2c2c4367cc1c7a6d518f1cf2520cde278efcb32240367
 MD5 0364b9fe218debf0191624f65e03edd0 metadata.xml 264
 RMD160 d6222b0f467d8eba60d21e6aca39f286597beaef metadata.xml 264
 SHA256 712f8d9c0fb0a7cd5ce2c2c4367cc1c7a6d518f1cf2520cde278efcb32240367 metadata.xml 264
-MD5 faba9c25f3b886f192a684d40c98047d files/digest-courier-authlib-0.53 268
-RMD160 1006b3d8496904401bce431dfd95d4777a118f3c files/digest-courier-authlib-0.53 268
-SHA256 885ff814e7296dea8b32613b7692bbf1718737b963b91bcd88ee41818ec8e26e files/digest-courier-authlib-0.53 268
-MD5 3d74fa72f8823bc473b5848dad447ce6 files/digest-courier-authlib-0.54.20050224 295
-RMD160 53eab8d59028b2f02cdea69164de683a5f6b2cfa files/digest-courier-authlib-0.54.20050224 295
-SHA256 6016b8a90e27c5cff26688aff3b1fba7e7bcdad024c101c5aa127979e3a64c71 files/digest-courier-authlib-0.54.20050224 295
-MD5 8ebd92bfeca6f06a8abf4e9ed0653b9a files/digest-courier-authlib-0.55 268
-RMD160 0a15a725c59ed8ce23a98d692bd3488da849dd67 files/digest-courier-authlib-0.55 268
-SHA256 1a94704a150f8f6f1176909305b5fb3b09a07939dd8d2286f5667dbbeea38db5 files/digest-courier-authlib-0.55 268
-MD5 d97189a7956827ed0ff4f9c98188f7e3 files/digest-courier-authlib-0.55.20050320 295
-RMD160 19906f9ccbe6fd5292bb3605d850ee9c0a4f005b files/digest-courier-authlib-0.55.20050320 295
-SHA256 bfb4d409b5b2f6747660af03f1f8dd5de2e393eca1ca99316c3032986e0b4928 files/digest-courier-authlib-0.55.20050320 295
-MD5 b6eefbe7127792f0f3123c2aa6ea046d files/digest-courier-authlib-0.56 268
-RMD160 dd8c24fffa18f318a5b7f5524dec33c1ceac2242 files/digest-courier-authlib-0.56 268
-SHA256 cdc2826d00c4ad5b41561a8a6a137dcb675b722b0bc9fb2ec524e2312e1be80f files/digest-courier-authlib-0.56 268
-MD5 4b985b8fc3a2853495ca3d081e57f61a files/digest-courier-authlib-0.57 268
-RMD160 1c1d02587cffbad307f7562f6a440c3407d5740c files/digest-courier-authlib-0.57 268
-SHA256 fac6a4a110a189acd14f56de20fa44d68c0732b6fe00e8c0e8fcefeb7cc33375 files/digest-courier-authlib-0.57 268
-MD5 4b985b8fc3a2853495ca3d081e57f61a files/digest-courier-authlib-0.57-r1 268
-RMD160 1c1d02587cffbad307f7562f6a440c3407d5740c files/digest-courier-authlib-0.57-r1 268
-SHA256 fac6a4a110a189acd14f56de20fa44d68c0732b6fe00e8c0e8fcefeb7cc33375 files/digest-courier-authlib-0.57-r1 268
-MD5 4b985b8fc3a2853495ca3d081e57f61a files/digest-courier-authlib-0.57-r2 268
-RMD160 1c1d02587cffbad307f7562f6a440c3407d5740c files/digest-courier-authlib-0.57-r2 268
-SHA256 fac6a4a110a189acd14f56de20fa44d68c0732b6fe00e8c0e8fcefeb7cc33375 files/digest-courier-authlib-0.57-r2 268
-MD5 e91fe446b8414a1d081e9b10efeb5cac files/digest-courier-authlib-0.57.20051116 295
-RMD160 2a83befcdc5cb43a82124bfad9843db8a37a43d8 files/digest-courier-authlib-0.57.20051116 295
-SHA256 d91e0bc608673dbbce9c3703d085fe7aa6406666e4b956ebead60e9b0fbec0a5 files/digest-courier-authlib-0.57.20051116 295
 MD5 4cc2f8a9b13e49b3df351d0fc139b5d1 files/digest-courier-authlib-0.58 268
 RMD160 13974bb3b0b57b205e5da3c9a2f43086590afe30 files/digest-courier-authlib-0.58 268
 SHA256 24d46d530a68dccb1d51628593632dfcf6ed86bd6fe6547660656f6511e818ed files/digest-courier-authlib-0.58 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnhFLAiZjviIA2XgRApOiAJ9S8/9rjMke9l3xHRX7ZEfgoKvQCQCfTGUx
-MZkPDlkBZQfAbolxE2bvd1A=
-=NKiU
------END PGP SIGNATURE-----
+MD5 4cc2f8a9b13e49b3df351d0fc139b5d1 files/digest-courier-authlib-0.58-r1 268
+RMD160 13974bb3b0b57b205e5da3c9a2f43086590afe30 files/digest-courier-authlib-0.58-r1 268
+SHA256 24d46d530a68dccb1d51628593632dfcf6ed86bd6fe6547660656f6511e818ed files/digest-courier-authlib-0.58-r1 268
diff --git a/net-libs/courier-authlib/courier-authlib-0.53.ebuild b/net-libs/courier-authlib/courier-authlib-0.53.ebuild
deleted file mode 100644
index 788863825654..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.53.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.53.ebuild,v 1.10 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 alpha amd64 arm hppa ia64 mips ppc s390 ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-
-DEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild b/net-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild
deleted file mode 100644
index 05c4b80ab9a0..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild,v 1.7 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-
-DEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
-		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
-		; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild b/net-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild
deleted file mode 100644
index 6d959a902529..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild,v 1.4 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-RESTRICT="nouserpriv"
-
-DEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
-		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
-		; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.55.ebuild b/net-libs/courier-authlib/courier-authlib-0.55.ebuild
deleted file mode 100644
index 622bfdf3851a..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.55.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.55.ebuild,v 1.8 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 alpha amd64 arm hppa ia64 mips ppc s390 sparc ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-
-DEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
-		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
-		; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.56.ebuild b/net-libs/courier-authlib/courier-authlib-0.56.ebuild
deleted file mode 100644
index 2def5f92e923..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.56.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.56.ebuild,v 1.3 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-RESTRICT="nouserpriv"
-
-DEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
-		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
-		; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild
deleted file mode 100644
index 026b19f4a457..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild,v 1.14 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-RESTRICT="nouserpriv"
-
-DEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
-		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
-		; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.57-r2.ebuild b/net-libs/courier-authlib/courier-authlib-0.57-r2.ebuild
deleted file mode 100644
index 12209c977ee7..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.57-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.57-r2.ebuild,v 1.3 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-RESTRICT="nouserpriv"
-
-DEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/CVE-2005-3532.patch
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
-		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
-		; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.57.20051116.ebuild b/net-libs/courier-authlib/courier-authlib-0.57.20051116.ebuild
deleted file mode 100644
index e760c594da9a..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.57.20051116.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.57.20051116.ebuild,v 1.3 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-RESTRICT="nouserpriv"
-
-DEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/CVE-2005-3532.patch
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
-		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
-		; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.57.ebuild b/net-libs/courier-authlib/courier-authlib-0.57.ebuild
deleted file mode 100644
index e168803e6b74..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.57.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.57.ebuild,v 1.3 2007/01/05 08:50:10 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-RESTRICT="nouserpriv"
-
-DEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-	unpack ${A}
-	cd ${S}
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		libtoolize --copy --force
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		libtoolize --copy --force
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-				myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="`grep \"^${option}=\" ${file} | cut -d'\"' -f 2`"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
-		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
-		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install"
-	emake install-migrate DESTDIR="${D}" || die "migrate"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "configure"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
-		cp authldap.schema ${D}/etc/openldap/schema/ )
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
-}
-
-pkg_postinst() {
-	[ -e /etc/courier/authlib/userdb ] && \
-		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
-		; makeuserdb )
-	# Suggest cleaning out the following old files
-	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm `echo \"${list}\" | xargs echo`"
-	fi
-}
diff --git a/net-libs/courier-authlib/files/CVE-2005-3532.patch b/net-libs/courier-authlib/files/CVE-2005-3532.patch
deleted file mode 100644
index 73c93b8adeb7..000000000000
--- a/net-libs/courier-authlib/files/CVE-2005-3532.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- authpam.c.orig	2005-12-05 17:53:15.787004803 -0700
-+++ authpam.c	2005-12-05 17:54:41.890084079 -0700
-@@ -124,13 +124,14 @@
- 		if (retval != PAM_SUCCESS) DPRINTF("pam_setcred failed, result %d", retval);
- 	}
- #endif
-+#endif
- 
- 	if (retval == PAM_SUCCESS)
- 	{
- 		retval=pam_acct_mgmt(*pamh, 0);
- 		if (retval != PAM_SUCCESS) DPRINTF("pam_acct_mgmt failed, result %d", retval);
- 	}
--#endif
-+
- 	if (retval == PAM_SUCCESS)
- 		DPRINTF("dopam successful");
- 
diff --git a/net-libs/courier-authlib/files/configure-db4.patch b/net-libs/courier-authlib/files/configure-db4.patch
deleted file mode 100644
index 639aa1e7d223..000000000000
--- a/net-libs/courier-authlib/files/configure-db4.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- configure.in.orig	2004-11-02 14:46:22.000000000 -0800
-+++ configure.in	2004-11-02 14:51:02.531958000 -0800
-@@ -26,7 +26,6 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_LN_S
--AC_PROG_SYSCONFTOOL
- AC_SUBST(LTDLINCL)
- AC_SUBST(LIBLTDL)
- AC_LIBTOOL_DLOPEN
-@@ -284,15 +283,17 @@
- 
- 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"
---- bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
-+++ 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-libs/courier-authlib/files/courier-authlib-initd b/net-libs/courier-authlib/files/courier-authlib-initd
deleted file mode 100644
index 1e5b2c5f3487..000000000000
--- a/net-libs/courier-authlib/files/courier-authlib-initd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib-initd,v 1.6 2005/12/10 04:48:16 swtaylor Exp $
-depend() {
-	need net
-	provide authdaemond
-}
-
-checkconfig() {
-	if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
-		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
-		return 1
-	fi
-}
-
-setauth() {
-	source /etc/courier/authlib/authdaemonrc
-	AUTHLIB="/usr/lib/courier/courier-authlib"
-	AUTHDAEMOND="authdaemond"
-	pidfile="/var/run/authdaemon.pid"
-	logger="/usr/sbin/courierlogger"
-	export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
-}
-
-start() {
-	checkconfig || return 1
-	setauth
-	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
-		/usr/bin/env $logger -- -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
-	eend $?
-}
-
-stop() {
-	setauth
-	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --stop --pidfile "$pidfile"
-	eend $?
-}
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.53 b/net-libs/courier-authlib/files/digest-courier-authlib-0.53
deleted file mode 100644
index 495753c01be6..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.53
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72407b67050e740d5b834eac06d834df courier-authlib-0.53.tar.bz2 1966836
-RMD160 a8cd7c169153af9bfd43fcff237ed72f520e8b25 courier-authlib-0.53.tar.bz2 1966836
-SHA256 5457a4c5cafe85d6fd7c79d935e07056ba2860a53467d88fe0b175dcd1b534c1 courier-authlib-0.53.tar.bz2 1966836
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.54.20050224 b/net-libs/courier-authlib/files/digest-courier-authlib-0.54.20050224
deleted file mode 100644
index ea47932d749d..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.54.20050224
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 69d09cbf66b328ebca469da2da028109 courier-authlib-0.54.20050224.tar.bz2 1971852
-RMD160 7db83f7d3721abd491dc4f6377fff46b2dd7a52b courier-authlib-0.54.20050224.tar.bz2 1971852
-SHA256 062fa428b77f0d8774e527b3052d1860d92f4377df3e12265f7a6670affa3157 courier-authlib-0.54.20050224.tar.bz2 1971852
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.55 b/net-libs/courier-authlib/files/digest-courier-authlib-0.55
deleted file mode 100644
index 0b16c70d1410..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.55
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb57aefb8460106709d560c40cccaa41 courier-authlib-0.55.tar.bz2 1972024
-RMD160 05907d9e7f8824aafa24c652083f564b9ed03e02 courier-authlib-0.55.tar.bz2 1972024
-SHA256 0521f39603490ed46bb1b82c339f56ed162f2ef666a97b4432897954a7ca7eaf courier-authlib-0.55.tar.bz2 1972024
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.55.20050320 b/net-libs/courier-authlib/files/digest-courier-authlib-0.55.20050320
deleted file mode 100644
index a02b984b56be..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.55.20050320
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2ab704aec4cd1f4a94cf44b6296bf217 courier-authlib-0.55.20050320.tar.bz2 1981258
-RMD160 afce9c0a43da0f38f21ac3383b35f3fad523f6dd courier-authlib-0.55.20050320.tar.bz2 1981258
-SHA256 cf7afeadeb6d7d91ed2d4c547b25a49d17e79cf8905c87431ff0be8a6aa82314 courier-authlib-0.55.20050320.tar.bz2 1981258
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.56 b/net-libs/courier-authlib/files/digest-courier-authlib-0.56
deleted file mode 100644
index ad9bf4739fbc..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.56
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d4348a3add731fadd1c3c445aa8c904a courier-authlib-0.56.tar.bz2 1981533
-RMD160 71253363a141445ca762ceab4da75b8c1f470dc4 courier-authlib-0.56.tar.bz2 1981533
-SHA256 8fdeb47684086401aa5153a0108c36c7141c8558d51eb075637300924d57d5ac courier-authlib-0.56.tar.bz2 1981533
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.57 b/net-libs/courier-authlib/files/digest-courier-authlib-0.57
deleted file mode 100644
index 19c89b0aaeb7..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.57
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af146ac84f0c3ee00006af50b4415d8a courier-authlib-0.57.tar.bz2 2006138
-RMD160 b11e2f39b2af38c1487b81bb89c4925723627c9f courier-authlib-0.57.tar.bz2 2006138
-SHA256 dd8e41abb573b68d328e183e1ba2a6cc89217e90f22d698a32fb878f38899dde courier-authlib-0.57.tar.bz2 2006138
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r1 b/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r1
deleted file mode 100644
index 19c89b0aaeb7..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af146ac84f0c3ee00006af50b4415d8a courier-authlib-0.57.tar.bz2 2006138
-RMD160 b11e2f39b2af38c1487b81bb89c4925723627c9f courier-authlib-0.57.tar.bz2 2006138
-SHA256 dd8e41abb573b68d328e183e1ba2a6cc89217e90f22d698a32fb878f38899dde courier-authlib-0.57.tar.bz2 2006138
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r2 b/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r2
deleted file mode 100644
index 19c89b0aaeb7..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af146ac84f0c3ee00006af50b4415d8a courier-authlib-0.57.tar.bz2 2006138
-RMD160 b11e2f39b2af38c1487b81bb89c4925723627c9f courier-authlib-0.57.tar.bz2 2006138
-SHA256 dd8e41abb573b68d328e183e1ba2a6cc89217e90f22d698a32fb878f38899dde courier-authlib-0.57.tar.bz2 2006138
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.57.20051116 b/net-libs/courier-authlib/files/digest-courier-authlib-0.57.20051116
deleted file mode 100644
index 429808f20564..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.57.20051116
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7c019c7aaaf5618e0821161c0f23cb55 courier-authlib-0.57.20051116.tar.bz2 2007269
-RMD160 1847e7871eccb0ea6c02d46fe7b7dec316b41a7d courier-authlib-0.57.20051116.tar.bz2 2007269
-SHA256 9467ccdb932c9344bbdc57c7e32e77fbeb5f4f46ca5bbf16e2bbf1a53f027288 courier-authlib-0.57.20051116.tar.bz2 2007269