And also clean files dir

(Portage version: 2.2_rc51/cvs/Linux x86_64)

34 files changed, 0 insertions, 1151 deletions

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}