remove cruft. add the missing ?

15 files changed, 21 insertions, 466 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 8030ad8f39e2..5d6155ede5f2 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.93 2004/11/01 22:52:50 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.94 2004/11/02 22:21:45 langthang Exp $
+
+  02 Nov 2004; Tuan Van <langthang@gentoo.org> -files/authdaemond.conf,
+  -files/authdaemond.rc6, -files/courier-imap-3.0.2-db40vs41.patch,
+  -files/courier-imap-3.0.2-disable-fam.diff,
+  -files/courier-imap-3.0.2-removerpm.patch, -files/courier-imapd-ssl.rc6,
+  -files/courier-pop3d-ssl.rc6, -files/gentoo-imapd-ssl.rc,
+  -files/gentoo-imapd.rc, -files/gentoo-pop3d-ssl.rc,
+  -files/gentoo-pop3d.rc, courier-imap-3.0.7.ebuild,
+  courier-imap-3.0.8.ebuild:
+  remove cruft. fix RDEPEND use? syntax error.
 
   01 Nov 2004; Tuan Van <langthang@gentoo.org> -courier-imap-3.0.5.ebuild,
   courier-imap-3.0.8.ebuild:
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index cae6b4c102d0..9488d6f2327d 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d6ae1ef53f138017d5584db66b5ccf6d courier-imap-3.0.7.ebuild 9232
-MD5 ed5a39df227b08d2817976d690070f1f courier-imap-3.0.8.ebuild 9251
-MD5 ab55035065d4ebb8180c973d0c74bc3c ChangeLog 15505
+MD5 ef51bf8c56f3b35171934dc4af99452d courier-imap-3.0.7.ebuild 9236
+MD5 7985007c6832ae86a3204ddb0152d711 courier-imap-3.0.8.ebuild 9252
+MD5 c86bc2437d68448f9b5ec24e3099216a ChangeLog 16010
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
 MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263
@@ -11,35 +11,24 @@ MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
 MD5 71a551a4f772f4299f9752f3d043b8c5 files/authdaemond-3.0.4-r1 1062
 MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
 MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
-MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
 MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
-MD5 c8836ccb71ec53cb7570308b10d9c247 files/courier-imapd-ssl.rc6 1200
 MD5 90bb778616a7c67658b9e78890d4b8fe files/courier-imapd.rc6 945
 MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
 MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
-MD5 ce975bfaa13118f7fcc463f2e0486277 files/courier-imap-3.0.2-removerpm.patch 4264
-MD5 f156e5a11ab06f0bee9c0b1e6e2c8887 files/authdaemond.conf 440
 MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
-MD5 d1bfa2a8019ebac0a33d3ef7a8945eeb files/courier-pop3d-ssl.rc6 1208
-MD5 73fffd635f45ec99ecf6a45a9d0e4516 files/courier-imap-3.0.2-disable-fam.diff 1996
 MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263
 MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.8-disable-fam-configure.in.patch 654
-MD5 dfe2c230fed9f3be8e27d5d0baeef193 files/courier-imap-3.0.2-db40vs41.patch 585
 MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.8-db4-configure.in.patch 1337
 MD5 5d57e73c7593d5bb37135d3964d6d4c2 files/digest-courier-imap-3.0.7 72
 MD5 140a2653b4e3e2b7c9967d691da7a9ea files/digest-courier-imap-3.0.8 72
 MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.7-db4-configure.in.patch 1337
 MD5 2399f4a660fd7149e3fe19f0bfc230e1 files/gentoo-imapd-1.7.3-r1.rc 1074
-MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
-MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
-MD5 92cd406de622a1cf2de2ffc0662349bc files/authdaemond.rc6 957
 MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBhr5i5FrxP71izLARAjQdAKC9j7ZzZleFkOywgPjvQjTo+onGXwCgoYca
-byj7Aug87cBUy2R9+6u2HNU=
-=Je7a
+iD8DBQFBiAj15FrxP71izLARAgFWAJ4g5e7cBfrCzWps4ivlHfXxJo7hBgCePM0Y
+1JVm0VCkx4mZNtuETaC7WoU=
+=qGj5
 -----END PGP SIGNATURE-----
diff --git a/net-mail/courier-imap/courier-imap-3.0.7.ebuild b/net-mail/courier-imap/courier-imap-3.0.7.ebuild
index 96a01ad8776e..15c040209728 100644
--- a/net-mail/courier-imap/courier-imap-3.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-3.0.7.ebuild
@@ -1,6 +1,6 @@
 # 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/courier-imap-3.0.7.ebuild,v 1.14 2004/09/27 19:00:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.7.ebuild,v 1.15 2004/11/02 22:21:45 langthang Exp $
 
 inherit eutils gnuconfig
 
@@ -19,7 +19,7 @@ RDEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6
 	pam? ( >=sys-libs/pam-0.75 )
 	berkdb? ( sys-libs/db )
-	gdbm ( >=sys-libs/gdbm-1.8.0 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	mysql? ( >=dev-db/mysql-3.23.36 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	postgres? ( >=dev-db/postgresql-7.2 )
diff --git a/net-mail/courier-imap/courier-imap-3.0.8.ebuild b/net-mail/courier-imap/courier-imap-3.0.8.ebuild
index 4a122d6a6493..ed799985d41e 100644
--- a/net-mail/courier-imap/courier-imap-3.0.8.ebuild
+++ b/net-mail/courier-imap/courier-imap-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # 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/courier-imap-3.0.8.ebuild,v 1.5 2004/11/01 22:52:50 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.8.ebuild,v 1.6 2004/11/02 22:21:45 langthang Exp $
 
 inherit eutils gnuconfig
 
@@ -19,7 +19,7 @@ RDEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6
 	pam? ( >=sys-libs/pam-0.75 )
 	berkdb? ( sys-libs/db )
-	gdbm ( >=sys-libs/gdbm-1.8.0 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	mysql? ( >=dev-db/mysql-3.23.36 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	postgres? ( >=dev-db/postgresql-7.2 )
diff --git a/net-mail/courier-imap/files/authdaemond.conf b/net-mail/courier-imap/files/authdaemond.conf
deleted file mode 100644
index 1c19fd9d4484..000000000000
--- a/net-mail/courier-imap/files/authdaemond.conf
+++ /dev/null
@@ -1,12 +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,v 1.3 2004/06/26 23:30:58 robbat2 Exp $
-
-# This file should contain your chosen authenticator
-# Valid choices are..
-#
-# AUTHDAEMOND="authdaemond.mysql"
-# AUTHDAEMOND="authdaemond.ldap"
-# AUTHDAEMOND="authdaemond.plain"
-#
-AUTHDAEMOND="authdaemond.plain"
diff --git a/net-mail/courier-imap/files/authdaemond.rc6 b/net-mail/courier-imap/files/authdaemond.rc6
deleted file mode 100644
index 319ed24beb92..000000000000
--- a/net-mail/courier-imap/files/authdaemond.rc6
+++ /dev/null
@@ -1,41 +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.rc6,v 1.6 2004/06/26 23:30:58 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
-}
-
-start() {
-	checkconfig || return 1
-	setauth
-	
-	ebegin "Starting ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --start --exec \
-		/usr/bin/env - "${AUTHLIB}/${AUTHDAEMOND}" start \
-		--pidfile /var/lib/courier-imap/authdaemon/pid
-	eend $?
-}
-
-stop() {
-	setauth
-	
-	ebegin "Stopping ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --stop \
-		--pidfile /var/lib/courier-imap/authdaemon/pid
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.2-db40vs41.patch b/net-mail/courier-imap/files/courier-imap-3.0.2-db40vs41.patch
deleted file mode 100644
index 6c797660db1c..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.2-db40vs41.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- courier-imap-3.0.2/bdbobj/bdbobj.c	2003-09-29 05:00:43.000000000 -0700
-+++ courier-imap-3.0.2-patched/bdbobj/bdbobj.c	2004-03-24 10:58:22.559723664 -0800
-@@ -112,13 +112,13 @@
- #else
- 	obj->dbf=0;
- 
--#define DB_40 0
-+#define DB_41 0
- 
- #if DB_VERSION_MAJOR == 4
--#if DB_VERSION_MINOR == 0
-+#if DB_VERSION_MINOR == 1
- 
--#undef DB_40
--#define DB_40 1
-+#undef DB_41
-+#define DB_41 1
- 
- #endif
- #endif
-@@ -132,10 +132,10 @@
- 	{
- 		if ( (*obj->dbf->open)(obj->dbf,
- 
--#if DB_40
--
-+#if DB_41
-+                       NULL,
- #else
--				       NULL,
-+
- #endif
- 
- 				       filename, NULL,
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.2-disable-fam.diff b/net-mail/courier-imap/files/courier-imap-3.0.2-disable-fam.diff
deleted file mode 100644
index 2508d154b10d..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.2-disable-fam.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur courier-imap-3.0.2.orig/maildir/configure.in courier-imap-3.0.2/maildir/configure.in
---- courier-imap-3.0.2.orig/maildir/configure.in	2004-04-23 18:58:35.000000000 -0700
-+++ courier-imap-3.0.2/maildir/configure.in	2004-04-23 18:58:40.000000000 -0700
-@@ -58,26 +58,33 @@
- AC_STRUCT_TM
- 
- dnl Checks for library functions.
--AC_CHECK_HEADER(fam.h, :, :)
--AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
--AC_CHECK_LIB(fam, FAMOpen,  [
--			LIBFAM=-lfam
--			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
--			[ Whether libfam.a is available ])
--
--			AC_CHECK_HEADER(fam.h, : , [
--AC_MSG_WARN([[The development header files and libraries for fam,]])
--AC_MSG_WARN([[the File Alteration Monitor, are not installed.]])
--AC_MSG_WARN([[You appear to have the FAM runtime libraries installed,]])
--AC_MSG_WARN([[so you need to simply install the additional development]])
--AC_MSG_WARN([[package for your operating system.]])
--AC_MSG_ERROR([[FAM development libraries not found.]]) ]
--					)
--		  ])
--
--AC_SUBST(LIBFAM)
--
--echo "$LIBFAM" >maildir.libdeps
-+AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
-+	fam="$withval",
-+	fam="no")
-+
-+if test "$fam" != "no"
-+then
-+	AC_CHECK_HEADER(fam.h, :, :)
-+	AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
-+	AC_CHECK_LIB(fam, FAMOpen,  [
-+				LIBFAM=-lfam
-+				AC_DEFINE_UNQUOTED(HAVE_FAM,1,
-+				[ Whether libfam.a is available ])
-+	
-+				AC_CHECK_HEADER(fam.h, : , [
-+	AC_MSG_WARN([[The development header files and libraries for fam,]])
-+	AC_MSG_WARN([[the File Alteration Monitor, are not installed.]])
-+	AC_MSG_WARN([[You appear to have the FAM runtime libraries installed,]])
-+	AC_MSG_WARN([[so you need to simply install the additional development]])
-+	AC_MSG_WARN([[package for your operating system.]])
-+	AC_MSG_ERROR([[FAM development libraries not found.]]) ]
-+						)
-+			  ])
-+	
-+	AC_SUBST(LIBFAM)
-+	
-+	echo "$LIBFAM" >maildir.libdeps
-+fi
- 
- AC_CACHE_CHECK([for missing gethostname prototype],maildir_cv_SYS_GETHOSTNAME,
- 
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.2-removerpm.patch b/net-mail/courier-imap/files/courier-imap-3.0.2-removerpm.patch
deleted file mode 100644
index e4cfbf86e981..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.2-removerpm.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- courier-imap-3.0.2/configure	2004-03-16 18:17:04.000000000 -0800
-+++ courier-imap-3.0.2-patched/configure	2004-03-24 11:04:22.589990744 -0800
-@@ -2846,71 +2846,6 @@
- fi
- 
- 
--# Check whether --with-redhat or --without-redhat was given.
--if test "${with_redhat+set}" = set; then
--  withval="$with_redhat"
--   redhat=$withval
--else
--  redhat=no
--fi;
--
--if test "$srcdir" = "."
--then
--	case `./config.guess` in
--	*-redhat-*)
--		if test "$redhat" = "no"
--		then
--			hash='#'
--			{ echo "$as_me:$LINENO: WARNING: === I think you are trying to run this configure script" >&5
--echo "$as_me: WARNING: === I think you are trying to run this configure script" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === on Red Hat/Fedora.  You're doing too much work!" >&5
--echo "$as_me: WARNING: === on Red Hat/Fedora.  You're doing too much work!" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === It's much faster to create installable binary RPMs" >&5
--echo "$as_me: WARNING: === It's much faster to create installable binary RPMs" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === like this: http://www.courier-mta.org/FAQ.html${hash}rpm" >&5
--echo "$as_me: WARNING: === like this: http://www.courier-mta.org/FAQ.html${hash}rpm" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === When you do this you may find that RPM will tell you" >&5
--echo "$as_me: WARNING: === When you do this you may find that RPM will tell you" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === to install some other software first, before trying to" >&5
--echo "$as_me: WARNING: === to install some other software first, before trying to" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === build this one, and even tell you the name of RPMs you" >&5
--echo "$as_me: WARNING: === build this one, and even tell you the name of RPMs you" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === need to install from the distribution CD.  That's much" >&5
--echo "$as_me: WARNING: === need to install from the distribution CD.  That's much" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === easier than trying to figure out the same from some" >&5
--echo "$as_me: WARNING: === easier than trying to figure out the same from some" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === cryptic error message." >&5
--echo "$as_me: WARNING: === cryptic error message." >&2;}
--			{ echo "$as_me:$LINENO: WARNING: " >&5
--echo "$as_me: WARNING: " >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === Even if you don't intend to use everything you need to" >&5
--echo "$as_me: WARNING: === Even if you don't intend to use everything you need to" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === have in order to build via RPM, you should still do as" >&5
--echo "$as_me: WARNING: === have in order to build via RPM, you should still do as" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === you're told.  All the extra stuff (LDAP, SQL, etc...)" >&5
--echo "$as_me: WARNING: === you're told.  All the extra stuff (LDAP, SQL, etc...)" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === goes into RPM sub-packages, which do not need to be" >&5
--echo "$as_me: WARNING: === goes into RPM sub-packages, which do not need to be" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === installed." >&5
--echo "$as_me: WARNING: === installed." >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === But, if you insist, you can simply add '--with-redhat'" >&5
--echo "$as_me: WARNING: === But, if you insist, you can simply add '--with-redhat'" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === parameter to this configure script and not see this" >&5
--echo "$as_me: WARNING: === parameter to this configure script and not see this" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === error message.  You should also do this when upgrading" >&5
--echo "$as_me: WARNING: === error message.  You should also do this when upgrading" >&2;}
--			{ echo "$as_me:$LINENO: WARNING: === and you didn't use RPM with the older version." >&5
--echo "$as_me: WARNING: === and you didn't use RPM with the older version." >&2;}
--			{ { echo "$as_me:$LINENO: error: ... in either case you better know what you're doing!" >&5
--echo "$as_me: error: ... in either case you better know what you're doing!" >&2;}
--   { (exit 1); exit 1; }; }
--		fi
--		;;
--	*)
--		;;
--	esac
--fi
--
- if test x$prefix = xNONE
- then
- 	prefix="$defaultprefix"
diff --git a/net-mail/courier-imap/files/courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imapd-ssl.rc6
deleted file mode 100644
index 335d774a8462..000000000000
--- a/net-mail/courier-imap/files/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-imapd-ssl.rc6,v 1.6 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
-	if [ ! -e /etc/courier-imap/imapd.pem ] ; 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
-	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
-	}
-}
-
-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-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-pop3d-ssl.rc6
deleted file mode 100644
index a155ee1f519c..000000000000
--- a/net-mail/courier-imap/files/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-pop3d-ssl.rc6,v 1.6 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
-	if [ ! -e /etc/courier-imap/pop3d.pem ] ; 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
-	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
-	}
-}
-
-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/gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/gentoo-imapd-ssl.rc
deleted file mode 100644
index 5360d97660e0..000000000000
--- a/net-mail/courier-imap/files/gentoo-imapd-ssl.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# $Id: gentoo-imapd-ssl.rc,v 1.3 2003/05/20 01:40:06 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/$/;/'`
-
-$PRERUN \
-/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/logger \
-	-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-imapd.rc b/net-mail/courier-imap/files/gentoo-imapd.rc
deleted file mode 100644
index 163d83bf3767..000000000000
--- a/net-mail/courier-imap/files/gentoo-imapd.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# $Id: gentoo-imapd.rc,v 1.4 2003/05/20 01:40:06 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
-export IMAPDSTARTTLS
-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/$/;/'`
-
-$PRERUN \
-/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/logger \
-	-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-pop3d-ssl.rc b/net-mail/courier-imap/files/gentoo-pop3d-ssl.rc
deleted file mode 100644
index dde2b3875731..000000000000
--- a/net-mail/courier-imap/files/gentoo-pop3d-ssl.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $Id: gentoo-pop3d-ssl.rc,v 1.3 2003/05/20 01:40:06 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/$/;/'`
-
-$PRERUN \
-/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/logger \
-	-stderrloggername=pop3d-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
-		/usr/sbin/courier-pop3d ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-pop3d.rc b/net-mail/courier-imap/files/gentoo-pop3d.rc
deleted file mode 100644
index 34785665449f..000000000000
--- a/net-mail/courier-imap/files/gentoo-pop3d.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $Id: gentoo-pop3d.rc,v 1.5 2003/05/20 01:40:06 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/$/;/'`
-
-$PRERUN \
-/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/logger \
-	-stderrloggername=pop3d \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
-		/usr/sbin/courier-pop3d ${MAILDIR}