And also clean files dir

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

36 files changed, 34 insertions, 1187 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 98b810866560..4abb82d7dccc 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.181 2009/11/23 10:26:14 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.182 2009/11/23 10:40:24 voyageur Exp $
+
+  23 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/gentoo-pop3d-1.7.3-r1.rc, -files/gentoo-pop3d-ssl-1.7.3-r1.rc,
+  -files/authdaemond-3.0.4-r1, -files/authdaemond.conf-3.0.4-r1,
+  -files/courier-imapd-ssl.rc6-3.0.5, -files/courier-pop3d-ssl.rc6-3.0.5,
+  -files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-3.0.8-db4-configure.in.patch,
+  -files/courier-imap-3.0.8-disable-fam-configure.in.patch,
+  -files/courier-imap-4.0.1-courier-imapd.rc6,
+  -files/courier-imap-4.0.1-courier-imapd-ssl.rc6,
+  -files/courier-imap-4.0.1-courier-pop3d.rc6,
+  -files/courier-imap-4.0.1-courier-pop3d-ssl.rc6,
+  -files/courier-imap-4.0.1-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-4.0.1-db4-configure.in.patch,
+  -files/courier-imap-4.0.1-gentoo-imapd.rc,
+  -files/courier-imap-4.0.1-gentoo-imapd-ssl.rc,
+  -files/courier-imap-4.0.1-gentoo-pop3d.rc,
+  -files/courier-imap-4.0.1-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-4.0.1-r1-courier-imapd.indirect,
+  -files/courier-imap-4.0.1-r1-courier-pop3d.indirect,
+  -files/courier-imap-4.0.1-r1-gentoo-imapd.rc,
+  -files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc,
+  -files/courier-imap-4.0.1-r1-gentoo-pop3d.rc,
+  -files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-4.0.4-courier-imapd.rc6,
+  -files/courier-imap-4.0.4-courier-imapd-ssl.rc6,
+  -files/courier-imap-4.0.4-courier-pop3d.rc6,
+  -files/courier-imap-4.0.4-courier-pop3d-ssl.rc6,
+  -files/courier-imap-4.1.2-as-needed.patch, -files/courier-imapd.rc6,
+  -files/courier-pop3d.rc6, -files/gentoo-imapd-1.7.3-r1.rc,
+  -files/gentoo-imapd-ssl-1.7.3-r1.rc:
+  And also clean files dir
 
   23 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
   -courier-imap-3.0.8.ebuild, -courier-imap-4.0.6-r2.ebuild,
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index e70a32dc79d1..334ea30a1269 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,29 +1,4 @@
-AUX authdaemond-3.0.4-r1 1062 RMD160 5e9184dc8c8ccbb528252c0795b5cd62b1d1b9c8 SHA1 55180242453ee47c951d265615da7a0902a5dc1f SHA256 2731b87fec98ae4ecdb5cfdb5917894e28eaf768f68555462d801c116cfa2a0d
-AUX authdaemond.conf-3.0.4-r1 544 RMD160 52c3d3ec3c720ef36d03b531e9f4408149769d19 SHA1 f433ce39a182b7e2d7c91d22c59546e5fc552d83 SHA256 6bbf884df95152b5f8e1b0cd404a1833c1e337ccd44360156296122d2c9bb72f
-AUX courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 SHA1 72cc2d43835efe8833ece60602ebd839d5480729 SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73
-AUX courier-imap-3.0.8-db4-configure.in.patch 1337 RMD160 61f09bd94189576acc3b41a5aee9605d1f0c95de SHA1 e06ef1f954e0c0deaabe548abe559525d2fe918a SHA256 5f749b10f53d3a631af65f3766f3d72e54603761b164a2a656a59aee78c67939
-AUX courier-imap-3.0.8-disable-fam-configure.in.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
-AUX courier-imap-4.0.1-courier-imapd-ssl.rc6 1215 RMD160 895e04e9d0fc49fa5e2a022b070c09e31706918b SHA1 55e6a427c1acae17853fe016dc38068a9f3456b6 SHA256 7724a4e51effba581872917244a56d165506a813a923c4126323d93985ea5c2f
-AUX courier-imap-4.0.1-courier-imapd.rc6 970 RMD160 cc29497750a0d4c1f09a8dde111b3e387bf902bd SHA1 34f0bf3456ad6d33280216940807cf5805214cd6 SHA256 adde0c60fb7d66253c791197631281efb57975cb130b7e70925cac03a1085d5a
-AUX courier-imap-4.0.1-courier-pop3d-ssl.rc6 1223 RMD160 ce2d8a86fb20da03d9a3b085032cc1c68d48b3b9 SHA1 021a3b52493dfd1c97614a31f1015ad947a58e9b SHA256 ecb4258a140359940637f84c1457c885e57aa0f45a6b5c3247db4d413219680f
-AUX courier-imap-4.0.1-courier-pop3d.rc6 978 RMD160 fbcc8eaaa0c68e29beaa83236d165ed489a0eea7 SHA1 b66127eab29e9e0a44469a5e2aebe1582518b3d0 SHA256 a66aa6fd10ab8d43bc28357b1c9db63afb80e6c66b8fa47fa26214c40cf1bcf7
-AUX courier-imap-4.0.1-db4-bdbobj_configure.in.patch 1263 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 SHA1 72cc2d43835efe8833ece60602ebd839d5480729 SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73
-AUX courier-imap-4.0.1-db4-configure.in.patch 1303 RMD160 69228d5d2fb61bf176581c22a0a02e795342595e SHA1 75e73e48fb91c22996bdbd6417d30a6698a96309 SHA256 f7d626d03e6a83a6851be1ec7b1ad8b24e26d20fa1a2cf87ebce4560c226c2c3
 AUX courier-imap-4.0.1-disable-fam-configure.in.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
-AUX courier-imap-4.0.1-gentoo-imapd-ssl.rc 1092 RMD160 d32cbf015f9fda6bbeee1bfa054c39a08ccead95 SHA1 9f5ad90b96a40c0cd3d910e5390d7f648c2c0046 SHA256 1feabc5a11925e8a9abef29b3797b6f8ee6c9935f726e4a9af918f2f9879b797
-AUX courier-imap-4.0.1-gentoo-imapd.rc 1129 RMD160 db3c0dfea4074482144fca2195acbbc18a9b395b SHA1 6b0966aeace6d643c63e902443cf782ad5c81422 SHA256 0814d73c7eb1cd857288390b3e8206fa8037bccb2d17c4998e18d351da87fcf7
-AUX courier-imap-4.0.1-gentoo-pop3d-ssl.rc 1067 RMD160 a33364035b91a371da9e0b7a6cd1f8af075edcd9 SHA1 df93bd12d2afeafc6576d67a0d945827e791c298 SHA256 7ffa8c0a0788ad70332c5351aebf58be715b8ed6f7ace887c3163b4b4282d397
-AUX courier-imap-4.0.1-gentoo-pop3d.rc 1075 RMD160 8cc119405c18525fbc3bed9a5ea1be3ac3cb02b8 SHA1 cf79243fbf860c0082b39df9ba16d726b198ccf6 SHA256 a81f912ff7542f6cb3fee162a75a045606b5f1175264a0b5b303a9d5c1c4a1d1
-AUX courier-imap-4.0.1-r1-courier-imapd.indirect 85 RMD160 3b6790ccee0c7271c23f76a393b9d0a0d0b575ef SHA1 807e2294f80b95f0bae856a64774ffed7175dbef SHA256 96f7cd8cb1f4817be039df630b0e5da3838530955881b7217527307514b1b8a3
-AUX courier-imap-4.0.1-r1-courier-pop3d.indirect 85 RMD160 f0750ff2a958b9a24112c9352bdc6a70b4a077f4 SHA1 6b7859075554104f0fe04f1e74fde2565a77e65d SHA256 df03082133b598631c4e47b5f448bba385f5993c0bd55a4eca9637b8176d8593
-AUX courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc 1114 RMD160 c68bdfd5e7d73a0977db02833fad84efa4697419 SHA1 9ced6a64c1c7f8e0843f8e63c36f057ab6ed1ef3 SHA256 d632673bb34aa049205682d7c26c4972623589bbcace6604bf6c81a91d02d30d
-AUX courier-imap-4.0.1-r1-gentoo-imapd.rc 1151 RMD160 c0e1c3402382b62210a4855e1fe5239bcce3e06a SHA1 087ca38c92d82c3cf6a94aa2c97368415a28b72e SHA256 c9929c008990b5e4602f2b9e2654875c25f5cc776e1d0c433f16c716a327afa6
-AUX courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc 1089 RMD160 1b0339c606987f6c230d7b7e962a098c01bba0e3 SHA1 4cb7a81534d19f45c065b41139ee66a51ff64c61 SHA256 ce0ce1e14324ce8d6633aad60762b4bcc7dc79a94047b6aa45a670b4e897393e
-AUX courier-imap-4.0.1-r1-gentoo-pop3d.rc 1097 RMD160 d138103cf9fd92ebc7806593eb79b22a4aea4d50 SHA1 d2d7e885e37e8d4510f440ab3e94593ce02eef86 SHA256 6e7fd5f98e40504c0da0236bdfeadad33cf95cc8dfe31af8207d23620f27b84d
-AUX courier-imap-4.0.4-courier-imapd-ssl.rc6 1174 RMD160 a7e9593106447b743cc8dc153664869924a152a2 SHA1 984c4e7324e890290c3ae793f9afdf855991a205 SHA256 ef3d363558c64dcb3b6429de700eb4bc1557c622dbfad2e26abe98f59c18329f
-AUX courier-imap-4.0.4-courier-imapd.rc6 929 RMD160 4aec3c1c2fd1e32ff8fc89bc4d89b7b1227cda57 SHA1 bb919257cdd11f66bf448db86539d784ca539ccf SHA256 5187c9dbaaeceb98273e719b676fe7197bcfa215dfdf05c9d8cb161af48e3146
-AUX courier-imap-4.0.4-courier-pop3d-ssl.rc6 1182 RMD160 61a232d9de309f8a79c9ee05a412afc3265f0b21 SHA1 e337b7ba969462e896c595b205eb1b15d2860a5e SHA256 bc1e61890624d9ecc930d33785879b6d22bea6ac962be5f2aad1529a024c88f3
-AUX courier-imap-4.0.4-courier-pop3d.rc6 937 RMD160 aa08726aefd6fd3dad6cf2003de853869eb2d71a SHA1 2728ecebabcb5210c6d7f985df777b14a1edc5d3 SHA256 70c526347c8c53888df1bc6602d242376e9ef885a2b125d5292363c082dc4fca
 AUX courier-imap-4.0.6-aclocal-fix.patch 237 RMD160 005a1b1bcff427b747b5fdae0fbe678367e7ebfa SHA1 9593c438e8b6be719d1685f5398659bb841f115b SHA256 2bc930268fd9c1565f2dfc341557de4a6e4f867131b279d52d47d285e5f62579
 AUX courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1558 RMD160 ae5866697c98a760e11927faa69687b942795ff3 SHA1 e6fd4defb33644d806679e00f2eb056e7f72170e SHA256 208e443f2730237ee8ae858eb21c3895c83651fbaacda881bdf46076b5182db7
 AUX courier-imap-4.0.6-db4-configure.in.patch 1497 RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 SHA1 349ad8d16c05ba0c7a7231b092286f48fecca54b SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c
@@ -38,16 +13,7 @@ AUX courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 984 RMD160 93671fcb0eb2660ef41edf9
 AUX courier-imap-4.0.6-r1-gentoo-imapd.rc 1026 RMD160 1bd16e446e10da64352390803cbaa691c11ecc68 SHA1 b8eb095bb6c8b6c970dd60e944ebfd2f36a39b40 SHA256 a54e674a8bfce99cda974e5c2e9bd818440256130f018f1c3412ea29f4e618f1
 AUX courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 957 RMD160 7dcbfe1e550601ebdd973394ff03f19701425254 SHA1 d5bc5e06275d4082ab9b76c739d9da491a08cafd SHA256 977ddb360fe8a4a2baab932895c1d871b992d33d2837d97af23d7a97f66dc6a6
 AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 999 RMD160 10028f0deafad4b31b12e4006ace1a007b542495 SHA1 5db7530c017c1e0a4cdb02a67bc5256f9b790110 SHA256 e9ec918c6a9f1ac3ad952d7c15392ab73f0a2e6a27f4f8a1f3fe3902c67ea278
-AUX courier-imap-4.1.2-as-needed.patch 398 RMD160 0cda873874a9261cd0f640703fdb0c7cfb79e044 SHA1 53ab7b464ed0daf167066c323827524a653964e0 SHA256 8d1185d1929ab1cce5216f188adeb66a52ede20fbcb95b45d9b7a39287f884e3
 AUX courier-imap-gentoo.readme 2827 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 SHA1 72c4f79c6ed08c4423925b05303f97287b8d95d1 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f
-AUX courier-imapd-ssl.rc6-3.0.5 1196 RMD160 b3d21018f32d59c8db09491aa5d25e99ef5022ca SHA1 b25b6d29cba405ba7ea96223d564178f7cce8ece SHA256 818217507f3d27aebf9f14fa10a9eb9805b605c5bacc7a936e8610127816fd76
-AUX courier-imapd.rc6 945 RMD160 1446c5fdc95aceeebfb670e501d2f6d0f8e15c5b SHA1 77f36e56631db5be6f51377386a6059e9f48244f SHA256 37d2d245f58dbfeca4f6c15f3dffbb652daaae18ba07973989f661ce00f23178
-AUX courier-pop3d-ssl.rc6-3.0.5 1204 RMD160 c1638bd94fadc331cc97cc54462c9d9ed8fbd986 SHA1 7c1956c410179881430be2580561f6ea6c6fd5c2 SHA256 4a107d764d17ec217ecaeaa57504bb893558b0bc8fa5e82af33a3c63771d60a4
-AUX courier-pop3d.rc6 953 RMD160 c98bce7aabef2e138febf10e4c8bab86026216d4 SHA1 0aa6898254e70b0f2f13b9b3cc68e9895f9d4a3b SHA256 e64d98087123a432b528a301bb5a4f1d6ef6232a39c981318f8159297f775f76
-AUX gentoo-imapd-1.7.3-r1.rc 1074 RMD160 0fec4a1dc289b348e0605152467e603a2674847a SHA1 5eae59350ef88024041cad7bb8b4e7c79ea03b43 SHA256 52ad1bb47496be6fdd5a943cc5d156e18f4429c7b3f9d4d89670d451023db9e7
-AUX gentoo-imapd-ssl-1.7.3-r1.rc 1036 RMD160 441ee24be1825ab8cfb485cad5df329a1aa008fa SHA1 7791e6fc38cce038562b8dee868ec83c6e06a5c1 SHA256 2430819bae8e265934ac31944534ef8e3ab94dfe0e59a3ea658f60ebdd7d989b
-AUX gentoo-pop3d-1.7.3-r1.rc 1020 RMD160 e0c83f2cf3507cd8b08dd53f47abe3dcbeb10c8a SHA1 bab1db4ee5f31e33c8ca81ebab7cd46e93a908bc SHA256 189dca5b4fa90405e25f7d659b984c10a705d6c9a725f0571bc37d784793911b
-AUX gentoo-pop3d-ssl-1.7.3-r1.rc 1012 RMD160 d967c3996f95e113e7e6f9dd0a62b418c37d6ee4 SHA1 b8cfb3069000e2a70e0aa836b231fa40bdeef6c7 SHA256 12659fbc648e66ccfd5b62f75a9cc4a580f56b35ddb02f1460b6ce2726050e0d
 AUX mkimapdcert 996 RMD160 4ca3c600dc558f14648f318007447318a5e45165 SHA1 a1259ae6a18d4c2b2d783da72b730437fe0ffc2f SHA256 1ebd9ae44e3ca5fb906f5f399abec7d6f117d231db5725be0a1c4e043eaec4f6
 AUX mkpop3dcert 996 RMD160 424c61ae95914f267397a1180dcb8fee64586ea3 SHA1 28f43f0f62999105fe37b6a2edd5a0cbf8cee157 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb
 DIST courier-imap-4.0.6.tar.bz2 3157577 RMD160 4006c5ec4db6b2adac393e2ebdf9ee99af3a8b2a SHA1 d7fee884cc0015586459c511dbe03bc2a8466c7f SHA256 27e6847507ddecfab1672fdf52447f8351f4cf046145974768ea93ebfea6ddbb
@@ -56,5 +22,5 @@ DIST courier-imap-4.6.0.tar.bz2 3397972 RMD160 664fb26c1351965af6b1bb21e22230ef6
 EBUILD courier-imap-4.0.6-r3.ebuild 8493 RMD160 8d52d5401496d2b8c9566fa52459969977d13c65 SHA1 661f252ca6e06d8d8709684f20b828a1d570aacb SHA256 f43d8dfe6f2d6a267ae6cfa8cad62e34d89a3fcee8bb4de8261f95cea1177b79
 EBUILD courier-imap-4.5.0.ebuild 8222 RMD160 1f00541ce9d990492012aa98d3c6691d2970ae62 SHA1 0d9c59c726d3d2ef326f05f646106e28a5df19ad SHA256 27461e863fb43aadd17bf14e0decbd268d109d6dcdd7e3146ef67d328d901e52
 EBUILD courier-imap-4.6.0.ebuild 7681 RMD160 72f888556fc5109cfa76a5f405f282a021a8bf7d SHA1 2c019cb8b80872fd44df23ae681b7d3a831f8b9e SHA256 48296ac6a0448152ae3be589dd942255467e4a16f1132c95ebc60d188089805d
-MISC ChangeLog 35321 RMD160 c4c3d0350ebe817a3acc98dabd97f69583af3c33 SHA1 b37243bfca41ac6e43d94dec36a8055e1f8a146a SHA256 a4dd94f0db761f44013466d045412c4ff9c1ffc21ac3e9c279439c20b7e8ec1e
+MISC ChangeLog 36958 RMD160 a11140615adb46472f113ec164ea2bf978ffa6f4 SHA1 87fbb2d671efa82c0276d2e961c047147421922f SHA256 ae1b702c19838916a8830156ebeb904b3a117e447fa38f0e822c999643910bf4
 MISC metadata.xml 495 RMD160 a08ec4892b1931702f94b78f75841d4a6d0989ab SHA1 6fee69c5c0cc8fe6092d12e0028ca43739d94040 SHA256 009ce86710a6c7acebacfd6338e68e3eb73e17f9be05042aadad0a469a8a3da5
diff --git a/net-mail/courier-imap/files/authdaemond-3.0.4-r1 b/net-mail/courier-imap/files/authdaemond-3.0.4-r1
deleted file mode 100644
index 25baf315107c..000000000000
--- a/net-mail/courier-imap/files/authdaemond-3.0.4-r1
+++ /dev/null
@@ -1,42 +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-mail/courier-imap/files/authdaemond-3.0.4-r1,v 1.3 2004/08/22 23:52:08 robbat2 Exp $
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/courier-imap/authdaemonrc ] ; then
-		eerror "You need an /etc/courier-imap/authdaemonrc file to run authdaemon"
-		return 1
-	fi
-}
-
-setauth() {
-	source /etc/courier-imap/authdaemonrc
-	AUTHLIB="/usr/lib/courier-imap/authlib"
-	source /etc/courier-imap/authdaemond.conf
-	[ -z "$version" ] && version="${AUTHDAEMOND}"
-	pidfile="/var/run/authdaemon.pid"
-	logger="/usr/lib/courier-imap/courierlogger"
-}
-
-start() {
-	checkconfig || return 1
-	setauth
-	
-	ebegin "Starting ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
-		/usr/bin/env -- - $logger -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
-	eend $?
-}
-
-stop() {
-	setauth
-	
-	ebegin "Stopping ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --stop \
-		--pidfile "$pidfile"
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/authdaemond.conf-3.0.4-r1 b/net-mail/courier-imap/files/authdaemond.conf-3.0.4-r1
deleted file mode 100644
index fa039342d84c..000000000000
--- a/net-mail/courier-imap/files/authdaemond.conf-3.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/authdaemond.conf-3.0.4-r1,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
-
-# This file should contain your chosen authenticator
-# This overrides 'version' in /etc/courier-imap/authdaemonrc
-# Valid choices are..
-#
-# AUTHDAEMOND="authdaemond.plain"
-# AUTHDAEMOND="authdaemond.mysql"
-# AUTHDAEMOND="authdaemond.pgsql"
-# AUTHDAEMOND="authdaemond.ldap"
-#
-AUTHDAEMOND="authdaemond.plain"
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch
deleted file mode 100644
index 776fdc144483..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.8-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.8-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.8-db4-configure.in.patch
deleted file mode 100644
index d8ac46e2b5c9..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.8-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.8-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.8-disable-fam-configure.in.patch
deleted file mode 100644
index 7019d02a6af5..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.8-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.1-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd-ssl.rc6
deleted file mode 100644
index 21b386cf1f1b..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd-ssl.rc6
+++ /dev/null
@@ -1,42 +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-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd-ssl.rc6,v 1.1 2005/01/05 15:46:55 langthang Exp $
-
-depend() {
-	need net courier-authlib
-	use famd
-}
-
-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"
-		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"
-		return 3
-	}
-	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
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-imapd over SSL"
-	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd-ssl.rc \
-		--pid=$SSLPIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-imapd over SSL"
-	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd.rc6
deleted file mode 100644
index aa9f3b809a95..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd.rc6
+++ /dev/null
@@ -1,37 +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-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd.rc6,v 1.1 2005/01/05 15:46:55 langthang Exp $
-
-depend() {
-	need net courier-authlib
-	use famd
-}
-
-source /etc/courier-imap/imapd
-
-checkconfig() {
-	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"
-		return 2
-	}
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-imapd"
-	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd.rc \
-		--pid=$PIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-imapd"
-	start-stop-daemon --quiet --stop --pid=$PIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d-ssl.rc6
deleted file mode 100644
index 52dabb3d39eb..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d-ssl.rc6
+++ /dev/null
@@ -1,42 +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-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d-ssl.rc6,v 1.1 2005/01/05 15:46:55 langthang Exp $
-
-depend() {
-	need net courier-authlib
-	use famd
-}
-
-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"
-		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"
-		return 3
-	}
-	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
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-pop3d over SSL"
-	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d-ssl.rc \
-		--pidfile $SSLPIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-pop3d over SSL"
-	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d.rc6
deleted file mode 100644
index 849938d22340..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d.rc6
+++ /dev/null
@@ -1,37 +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-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d.rc6,v 1.1 2005/01/05 15:46:55 langthang Exp $
-
-depend() {
-	need net courier-authlib
-	use famd
-}
-
-source /etc/courier-imap/pop3d
-
-checkconfig() {
-	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"
-		return 2
-	}
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-pop3d"
-	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d.rc \
-		--pidfile $PIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-pop3d"
-	start-stop-daemon --quiet --stop --pidfile $PIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.1-db4-bdbobj_configure.in.patch
deleted file mode 100644
index 776fdc144483..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-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-4.0.1-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.1-db4-configure.in.patch
deleted file mode 100644
index 400b746a233a..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-db4-configure.in.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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 +150,18 @@
- 
- if test "$db" != "gdbm"
- then
-+  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)
- 
--	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/courier-imap-4.0.1-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd-ssl.rc
deleted file mode 100644
index b8574d9b4b41..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd-ssl.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# $Id: courier-imap-4.0.1-gentoo-imapd-ssl.rc,v 1.1 2005/01/05 15:46:55 langthang Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/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/lib/courier-imap/authlib/$f"
-#done
-
-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/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=imapd-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/imaplogin \
-		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd.rc
deleted file mode 100644
index 66f473b4e456..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# $Id: courier-imap-4.0.1-gentoo-imapd.rc,v 1.1 2005/01/05 15:46:55 langthang Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/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/lib/courier-imap/authlib/$f"
-#done
-
-ulimit -d $IMAP_ULIMITD
-IMAP_STARTTLS="$IMAPDSTARTTLS"
-export IMAPDSTARTTLS IMAP_STARTTLS
-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/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=imapd \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/imaplogin \
-		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d-ssl.rc
deleted file mode 100644
index 88bd88277ce4..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d-ssl.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# $Id: courier-imap-4.0.1-gentoo-pop3d-ssl.rc,v 1.1 2005/01/05 15:46:55 langthang Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/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/lib/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/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=pop3d-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/pop3login \
-		/usr/sbin/courier-pop3d ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d.rc
deleted file mode 100644
index 4eca8e1dab14..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# $Id: courier-imap-4.0.1-gentoo-pop3d.rc,v 1.1 2005/01/05 15:46:55 langthang Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/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/lib/courier-imap/authlib/$f"
-#done
-
-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/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=pop3d \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/pop3login \
-		/usr/sbin/courier-pop3d ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-imapd.indirect b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-imapd.indirect
deleted file mode 100644
index ec95f657f659..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-imapd.indirect
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-XMAILDIR="$1"
-eval ${LOGINRUN} \
-	/usr/sbin/courier-imapd \
-	${XMAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-pop3d.indirect b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-pop3d.indirect
deleted file mode 100644
index c06fa09846de..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-pop3d.indirect
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-XMAILDIR="$1"
-eval ${LOGINRUN} \
-	/usr/sbin/courier-pop3d \
-	${XMAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc
deleted file mode 100644
index e3d0476c5ea1..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# $Id: courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/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/lib/courier-imap/authlib/$f"
-#done
-
-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/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=imapd-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/imaplogin \
-		/usr/lib/courier-imap/courier-imapd.indirect ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd.rc
deleted file mode 100644
index 72bc708c71ea..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# $Id: courier-imap-4.0.1-r1-gentoo-imapd.rc,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/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/lib/courier-imap/authlib/$f"
-#done
-
-ulimit -d $IMAP_ULIMITD
-IMAP_STARTTLS="$IMAPDSTARTTLS"
-export IMAPDSTARTTLS IMAP_STARTTLS
-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/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=imapd \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/imaplogin \
-		/usr/lib/courier-imap/courier-imapd.indirect ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc
deleted file mode 100644
index 5b1dd5d235cc..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# $Id: courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/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/lib/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/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=pop3d-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/pop3login \
-		/usr/lib/courier-imap/courier-pop3d.indirect ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d.rc
deleted file mode 100644
index 7e5cb7db9b10..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# $Id: courier-imap-4.0.1-r1-gentoo-pop3d.rc,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/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/lib/courier-imap/authlib/$f"
-#done
-
-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/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=pop3d \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/pop3login \
-		/usr/lib/courier-imap/courier-pop3d.indirect ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd-ssl.rc6
deleted file mode 100644
index 496800881339..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd-ssl.rc6
+++ /dev/null
@@ -1,42 +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-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd-ssl.rc6,v 1.1 2005/08/08 09:57:05 flameeyes Exp $
-
-depend() {
-	need net courier-authlib
-	use famd
-}
-
-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"
-		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"
-		return 3
-	}
-	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
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-imapd over SSL"
-	/usr/bin/env - /usr/lib/courier-imap/gentoo-imapd-ssl.rc \
-		--pid=$SSLPIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-imapd over SSL"
-	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd.rc6
deleted file mode 100644
index 57e5a53a603b..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd.rc6
+++ /dev/null
@@ -1,37 +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-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd.rc6,v 1.1 2005/08/08 09:57:05 flameeyes Exp $
-
-depend() {
-	need net courier-authlib
-	use famd
-}
-
-source /etc/courier-imap/imapd
-
-checkconfig() {
-	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"
-		return 2
-	}
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-imapd"
-	/usr/bin/env - /usr/lib/courier-imap/gentoo-imapd.rc \
-		--pid=$PIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-imapd"
-	start-stop-daemon --quiet --stop --pid=$PIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d-ssl.rc6
deleted file mode 100644
index 9a0579bf6b4b..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d-ssl.rc6
+++ /dev/null
@@ -1,42 +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-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d-ssl.rc6,v 1.1 2005/08/08 09:57:05 flameeyes Exp $
-
-depend() {
-	need net courier-authlib
-	use famd
-}
-
-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"
-		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"
-		return 3
-	}
-	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
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-pop3d over SSL"
-	/usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d-ssl.rc \
-		--pidfile $SSLPIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-pop3d over SSL"
-	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d.rc6
deleted file mode 100644
index 69925db4b638..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d.rc6
+++ /dev/null
@@ -1,37 +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-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d.rc6,v 1.1 2005/08/08 09:57:05 flameeyes Exp $
-
-depend() {
-	need net courier-authlib
-	use famd
-}
-
-source /etc/courier-imap/pop3d
-
-checkconfig() {
-	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"
-		return 2
-	}
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-pop3d"
-	/usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d.rc \
-		--pidfile $PIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-pop3d"
-	start-stop-daemon --quiet --stop --pidfile $PIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-as-needed.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-as-needed.patch
deleted file mode 100644
index 3eff0a80300d..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.1.2-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: courier-imap-4.1.2/gdbmobj/Makefile.am
-===================================================================
---- courier-imap-4.1.2.orig/gdbmobj/Makefile.am
-+++ courier-imap-4.1.2/gdbmobj/Makefile.am
-@@ -15,6 +15,7 @@ noinst_LTLIBRARIES=libgdbmobj.la
- noinst_PROGRAMS=testgdbm
- 
- libgdbmobj_la_SOURCES=$(LIBGDBMSOURCES)
-+libgdbmobj_la_LIBADD=@LIBGDBM@
- 
- testgdbm_SOURCES=$(TESTGDBMSOURCES)
- 
diff --git a/net-mail/courier-imap/files/courier-imapd-ssl.rc6-3.0.5 b/net-mail/courier-imap/files/courier-imapd-ssl.rc6-3.0.5
deleted file mode 100644
index abf0f022f6c4..000000000000
--- a/net-mail/courier-imap/files/courier-imapd-ssl.rc6-3.0.5
+++ /dev/null
@@ -1,42 +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-mail/courier-imap/files/courier-imapd-ssl.rc6-3.0.5,v 1.1 2004/06/26 23:30:58 robbat2 Exp $
-
-depend() {
-	need net authdaemond
-	use famd
-}
-
-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"
-		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"
-		return 3
-	}
-	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
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-imapd over SSL"
-	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd-ssl.rc \
-		--pid=$SSLPIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-imapd over SSL"
-	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imapd.rc6
deleted file mode 100644
index a322e37a3591..000000000000
--- a/net-mail/courier-imap/files/courier-imapd.rc6
+++ /dev/null
@@ -1,37 +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-mail/courier-imap/files/courier-imapd.rc6,v 1.6 2004/06/26 23:30:58 robbat2 Exp $
-
-depend() {
-	need net authdaemond
-	use famd
-}
-
-source /etc/courier-imap/imapd
-
-checkconfig() {
-	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"
-		return 2
-	}
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-imapd"
-	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd.rc \
-		--pid=$PIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-imapd"
-	start-stop-daemon --quiet --stop --pid=$PIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-pop3d-ssl.rc6-3.0.5 b/net-mail/courier-imap/files/courier-pop3d-ssl.rc6-3.0.5
deleted file mode 100644
index b2ea4337d756..000000000000
--- a/net-mail/courier-imap/files/courier-pop3d-ssl.rc6-3.0.5
+++ /dev/null
@@ -1,42 +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-mail/courier-imap/files/courier-pop3d-ssl.rc6-3.0.5,v 1.1 2004/06/26 23:30:58 robbat2 Exp $
-
-depend() {
-	need net authdaemond
-	use famd
-}
-
-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"
-		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"
-		return 3
-	}
-	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
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-pop3d over SSL"
-	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d-ssl.rc \
-		--pidfile $SSLPIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-pop3d over SSL"
-	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-pop3d.rc6
deleted file mode 100644
index 159a74eb6e33..000000000000
--- a/net-mail/courier-imap/files/courier-pop3d.rc6
+++ /dev/null
@@ -1,37 +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-mail/courier-imap/files/courier-pop3d.rc6,v 1.6 2004/06/26 23:30:58 robbat2 Exp $
-
-depend() {
-	need net authdaemond
-	use famd
-}
-
-source /etc/courier-imap/pop3d
-
-checkconfig() {
-	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"
-		return 2
-	}
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier-pop3d"
-	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d.rc \
-		--pidfile $PIDFILE
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier-pop3d"
-	start-stop-daemon --quiet --stop --pidfile $PIDFILE
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/gentoo-imapd-1.7.3-r1.rc b/net-mail/courier-imap/files/gentoo-imapd-1.7.3-r1.rc
deleted file mode 100644
index 5075c8cc6463..000000000000
--- a/net-mail/courier-imap/files/gentoo-imapd-1.7.3-r1.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# $Id: gentoo-imapd-1.7.3-r1.rc,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/courier-imap
-
-source /etc/courier-imap/imapd-ssl
-source /etc/courier-imap/imapd
-
-LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
-do
-	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
-done
-
-ulimit -d $IMAP_ULIMITD
-IMAP_STARTTLS="$IMAPDSTARTTLS"
-export IMAPDSTARTTLS IMAP_STARTTLS
-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/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=imapd \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/imaplogin $LIBAUTHMODULES \
-		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-imapd-ssl-1.7.3-r1.rc b/net-mail/courier-imap/files/gentoo-imapd-ssl-1.7.3-r1.rc
deleted file mode 100644
index 59e4ce7298cd..000000000000
--- a/net-mail/courier-imap/files/gentoo-imapd-ssl-1.7.3-r1.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# $Id: gentoo-imapd-ssl-1.7.3-r1.rc,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/courier-imap
-
-source /etc/courier-imap/imapd
-source /etc/courier-imap/imapd-ssl
-
-LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
-do
-	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
-done
-
-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/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=imapd-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/imaplogin $LIBAUTHMODULES \
-		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-pop3d-1.7.3-r1.rc b/net-mail/courier-imap/files/gentoo-pop3d-1.7.3-r1.rc
deleted file mode 100644
index 707b0f8974b5..000000000000
--- a/net-mail/courier-imap/files/gentoo-pop3d-1.7.3-r1.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# $Id: gentoo-pop3d-1.7.3-r1.rc,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/courier-imap
-
-source /etc/courier-imap/pop3d-ssl
-source /etc/courier-imap/pop3d
-
-LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
-do
-	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
-done
-
-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/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=pop3d \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
-		/usr/sbin/courier-pop3d ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.7.3-r1.rc b/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.7.3-r1.rc
deleted file mode 100644
index 3c68062d4621..000000000000
--- a/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.7.3-r1.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# $Id: gentoo-pop3d-ssl-1.7.3-r1.rc,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/courier-imap
-
-source /etc/courier-imap/pop3d
-source /etc/courier-imap/pop3d-ssl
-
-LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
-do
-	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/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/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=pop3d-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
-		/usr/sbin/courier-pop3d ${MAILDIR}