Added KEYWORDS, and cleaned up files/

10 files changed, 4 insertions, 927 deletions

diff --git a/net-mail/courier-imap/courier-imap-1.4.1-r4.ebuild b/net-mail/courier-imap/courier-imap-1.4.1-r4.ebuild
deleted file mode 100644
index 95477d28d0ae..000000000000
--- a/net-mail/courier-imap/courier-imap-1.4.1-r4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.1-r4.ebuild,v 1.1 2002/03/14 22:29:51 g2boojum Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.courier-mta.org/"
-
-PROVIDE="virtual/imapd"
-
-DEPEND="virtual/glibc sys-devel/perl sys-apps/procps
-        >=sys-libs/pam-0.75
-	>=dev-libs/openssl-0.9.6
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-#This package is complete if you just need basic IMAP functionality.  Here are some things that
-#still need fixing:
-#supervise support (of course)
-#creation of imapd-ssl, pop3-ssl, pop3 init.d scripts (I only converted the imapd.rc script)
-#tweaking of config files.
-#My RC script is configured to look for maildirs in ~/.maildir (my preference, and the official
-#Gentoo Linux standard location) instead of the more traditional and icky ~/Maildir.
-#We need to add an /etc/mail.conf.
-
-src_compile() {
-	local myconf
-	if [ -z "`use ldap`" ] ; then
-	    myconf="--without-authldap"
-	fi
-	if [ -z "`use mysql`" ] ; then
-	    myconf="$myconf --without-authmysql"
-	fi
-	if [ "`use berkdb`" ] ; then
-	    myconf="$myconf --with-db=db"
-	else
-	    myconf="$myconf --with-db=gdbm"
-	fi
-	if [ -z "`use pam`" ] ; then
-	    myconf="$myconf --without-authpam"
-	fi
-	./configure --sysconfdir=/etc/courier-imap --prefix=/usr \
-	--bindir=/usr/sbin --libexecdir=/usr/lib/courier-imap \
-	--localstatedir=/var/lib/courier-imap --mandir=/usr/share/man \
-	--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-	--disable-root-check $myconf || die
-
-	cd ${S}/imap
-	cp imapd-ssl.dist imapd-ssl.dist.old
-	sed -e "s:TLS_CERTFILE=/usr/share/imapd.pem:TLS_CERTFILE=/etc/courier-imap/imapd.pem:g" imapd-ssl.dist.old > imapd-ssl.dist
-
-	cd ${S}
-	emake || die
-}
-
-src_install () {
-	dodir /var/lib/courier-imap
-	mkdir -p ${D}/etc/pam.d
-	make install DESTDIR=${D}
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of 'Maildir',
-	# and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-	cd ../share
-	mv * ../sbin
-        mv ../sbin/man .
-	cd ..
-	cd ${D}/etc/pam.d
-	for x in *
-	do
-		cp ${x} ${x}.orig
-		sed -e 's#/lib/security/##g' ${x}.orig > ${x}
-		rm ${x}.orig
-	done
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-imap-rc6 courier-imap
-	newexe ${FILESDIR}/courier-imap-ssl-rc6 courier-imap-ssl
-	rm ${D}/usr/sbin/mkimapdcert
-	exeinto /usr/sbin
-	doexe ${FILESDIR}/mkimapdcert	
-	insinto /etc/pam.d
-	doins ${FILEDIR}/pam.d-imap
-}
-
diff --git a/net-mail/courier-imap/courier-imap-1.4.3-r1.ebuild b/net-mail/courier-imap/courier-imap-1.4.3-r1.ebuild
deleted file mode 100644
index 83626cc06d0f..000000000000
--- a/net-mail/courier-imap/courier-imap-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.3-r1.ebuild,v 1.1 2002/05/01 03:56:05 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.courier-mta.org/"
-
-PROVIDE="virtual/imapd"
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	tcltk? ( >=dev-tcltk/expect-5.33.0 )"
-DEPEND="${RDEPEND} sys-devel/perl sys-apps/procps"
-
-# This package is complete if you just need basic IMAP functionality.
-# Here are some things that still need fixing:
-# o supervise support (of course)
-# o creation of imapd-ssl, pop3-ssl, pop3 init.d scripts
-#     (I only converted the imapd.rc script)
-# o tweaking of config files
-# o My RC script is configured to look for maildirs in ~/.maildir
-#     (my preference, and the official Gentoo Linux standard location)
-#     instead of the more traditional and icky ~/Maildir.
-# o We need to add an /etc/mail.conf.
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use berkdb && myconf="${myconf} --with-db=db"
-	use berkdb || myconf="${myconf} --with-db=gdbm"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /var/lib/courier-imap
-	mkdir -p ${D}/etc/pam.d
-	make install DESTDIR=${D}
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-        mv ../sbin/man .
-	cd ..
-
-	# we dont need to do this.. // woodchip
-	#cd ${D}/etc/pam.d
-	#for x in *
-	#do
-	#	cp ${x} ${x}.orig
-	#	sed -e 's#/lib/security/##g' ${x}.orig > ${x}
-	#	rm ${x}.orig
-	#done
-
-	rm ${D}/usr/sbin/mkimapdcert
-	exeinto /usr/sbin ; doexe ${FILESDIR}/mkimapdcert
-
- 	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-imap-rc6 courier-imap
-	newexe ${FILESDIR}/courier-imap-ssl-rc6 courier-imap-ssl
-
-	# not neccesary, we now have pam_stack, and courier-imap
-	# comes with pam_stack aware pam.d/ files already :) // woodchip
-	#insinto /etc/pam.d ; doins ${FILEDIR}/pam.d-imap
-}
diff --git a/net-mail/courier-imap/courier-imap-1.4.3.ebuild b/net-mail/courier-imap/courier-imap-1.4.3.ebuild
deleted file mode 100644
index c20ea5296029..000000000000
--- a/net-mail/courier-imap/courier-imap-1.4.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.3.ebuild,v 1.1 2002/04/01 21:53:25 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.courier-mta.org/"
-
-PROVIDE="virtual/imapd"
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )"
-DEPEND="${RDEPEND} sys-devel/perl sys-apps/procps"
-
-# This package is complete if you just need basic IMAP functionality.
-# Here are some things that still need fixing:
-# o supervise support (of course)
-# o creation of imapd-ssl, pop3-ssl, pop3 init.d scripts
-#     (I only converted the imapd.rc script)
-# o tweaking of config files
-# o My RC script is configured to look for maildirs in ~/.maildir
-#     (my preference, and the official Gentoo Linux standard location)
-#     instead of the more traditional and icky ~/Maildir.
-# o We need to add an /etc/mail.conf.
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use berkdb && myconf="${myconf} --with-db=db"
-	use berkdb || myconf="${myconf} --with-db=gdbm"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /var/lib/courier-imap
-	mkdir -p ${D}/etc/pam.d
-	make install DESTDIR=${D}
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-        mv ../sbin/man .
-	cd ..
-
-	# we dont need to do this.. // woodchip
-	#cd ${D}/etc/pam.d
-	#for x in *
-	#do
-	#	cp ${x} ${x}.orig
-	#	sed -e 's#/lib/security/##g' ${x}.orig > ${x}
-	#	rm ${x}.orig
-	#done
-
-	rm ${D}/usr/sbin/mkimapdcert
-	exeinto /usr/sbin ; doexe ${FILESDIR}/mkimapdcert
-
- 	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-imap-rc6 courier-imap
-	newexe ${FILESDIR}/courier-imap-ssl-rc6 courier-imap-ssl
-
-	# not neccesary, we now have pam_stack, and courier-imap
-	# comes with pam_stack aware pam.d/ files already :) // woodchip
-	#insinto /etc/pam.d ; doins ${FILEDIR}/pam.d-imap
-}
diff --git a/net-mail/courier-imap/courier-imap-1.4.5-r1.ebuild b/net-mail/courier-imap/courier-imap-1.4.5-r1.ebuild
deleted file mode 100644
index 5a78c4e5b6bf..000000000000
--- a/net-mail/courier-imap/courier-imap-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.5-r1.ebuild,v 1.1 2002/06/13 18:58:04 nitro Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.courier-mta.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-PROVIDE="virtual/imapd"
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	tcltk? ( >=dev-tcltk/expect-5.33.0 )"
-DEPEND="${RDEPEND} sys-devel/perl sys-apps/procps"
-
-# This package is complete if you just need basic IMAP functionality.
-# Here are some things that still need fixing:
-# o supervise support (of course)
-# o tweaking of config files
-# o My RC script is configured to look for maildirs in ~/.maildir
-#     (my preference, and the official Gentoo Linux standard location)
-#     instead of the more traditional and icky ~/Maildir.
-# o We need to add an /etc/mail.conf.
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use berkdb && myconf="${myconf} --with-db=db"
-	use berkdb || myconf="${myconf} --with-db=gdbm"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /var/lib/courier-imap
-	mkdir -p ${D}/etc/pam.d
-	make install DESTDIR=${D}
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-        mv ../sbin/man .
-	cd ..
-
-	# we dont need to do this.. // woodchip
-	#cd ${D}/etc/pam.d
-	#for x in *
-	#do
-	#	cp ${x} ${x}.orig
-	#	sed -e 's#/lib/security/##g' ${x}.orig > ${x}
-	#	rm ${x}.orig
-	#done
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin 
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
- 	exeinto /etc/init.d
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		doexe ${FILESDIR}/gentoo-imapd.rc ${FILESDIR}/gentoo-imapd-ssl.rc \
-			${FILESDIR}/gentoo-pop3d.rc ${FILESDIR}/gentoo-pop3d-ssl.rc
-
-	# not neccesary, we now have pam_stack, and courier-imap
-	# comes with pam_stack aware pam.d/ files already :) // woodchip
-	#insinto /etc/pam.d ; doins ${FILEDIR}/pam.d-imap
-}
-
-pkg_postinst() {
-	echo
-	einfo "Courier-IMAP version 1.4.5-r1 and higher have new init scripts."
-	einfo "Please use courier-imapd instead of courier-imap."
-	einfo "This release also includes support for the included pop3 server."
-	einfo "If you choose not to switch your init files, you server will "
-	einfo "continue to function as it currently does."
-	echo
-}
diff --git a/net-mail/courier-imap/courier-imap-1.4.5-r2.ebuild b/net-mail/courier-imap/courier-imap-1.4.5-r2.ebuild
deleted file mode 100644
index 546f9cc8fb4a..000000000000
--- a/net-mail/courier-imap/courier-imap-1.4.5-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.5-r2.ebuild,v 1.1 2002/06/14 22:05:35 nitro Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.courier-mta.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-PROVIDE="virtual/imapd"
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	tcltk? ( >=dev-tcltk/expect-5.33.0 )"
-DEPEND="${RDEPEND} sys-devel/perl sys-apps/procps"
-
-# This package is complete if you just need basic IMAP functionality.
-# Here are some things that still need fixing:
-# o supervise support (of course)
-# o tweaking of config files
-# o My RC script is configured to look for maildirs in ~/.maildir
-#     (my preference, and the official Gentoo Linux standard location)
-#     instead of the more traditional and icky ~/Maildir.
-# o We need to add an /etc/mail.conf.
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use berkdb && myconf="${myconf} --with-db=db"
-	use berkdb || myconf="${myconf} --with-db=gdbm"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /var/lib/courier-imap
-	mkdir -p ${D}/etc/pam.d
-	make install DESTDIR=${D}
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-        mv ../sbin/man .
-	cd ..
-
-	# we dont need to do this.. // woodchip
-	#cd ${D}/etc/pam.d
-	#for x in *
-	#do
-	#	cp ${x} ${x}.orig
-	#	sed -e 's#/lib/security/##g' ${x}.orig > ${x}
-	#	rm ${x}.orig
-	#done
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin 
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
- 	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		doexe ${FILESDIR}/gentoo-imapd.rc ${FILESDIR}/gentoo-imapd-ssl.rc \
-			${FILESDIR}/gentoo-pop3d.rc ${FILESDIR}/gentoo-pop3d-ssl.rc
-
-	# not neccesary, we now have pam_stack, and courier-imap
-	# comes with pam_stack aware pam.d/ files already :) // woodchip
-	#insinto /etc/pam.d ; doins ${FILEDIR}/pam.d-imap
-}
-
-pkg_postinst() {
-	echo
-	einfo "Courier-IMAP version 1.4.5-r1 and higher have new init scripts."
-	einfo "Please use courier-imapd instead of courier-imap."
-	einfo "This release also includes support for the included pop3 server."
-	einfo "If you choose not to switch your init files, you server will "
-	einfo "continue to function as it currently does."
-	echo
-}
diff --git a/net-mail/courier-imap/courier-imap-1.4.5-r3.ebuild b/net-mail/courier-imap/courier-imap-1.4.5-r3.ebuild
index 46bbac36247a..000d55473c01 100644
--- a/net-mail/courier-imap/courier-imap-1.4.5-r3.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.4.5-r3.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.5-r3.ebuild,v 1.1 2002/06/20 21:34:37 nitro Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.5-r3.ebuild,v 1.2 2002/07/09 21:51:18 nitro Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
 HOMEPAGE="http://www.courier-mta.org/"
 
+KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-mail/courier-imap/courier-imap-1.4.5.ebuild b/net-mail/courier-imap/courier-imap-1.4.5.ebuild
deleted file mode 100644
index 41aaadb4073d..000000000000
--- a/net-mail/courier-imap/courier-imap-1.4.5.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.5.ebuild,v 1.1 2002/05/06 20:05:42 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.courier-mta.org/"
-
-PROVIDE="virtual/imapd"
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	tcltk? ( >=dev-tcltk/expect-5.33.0 )"
-DEPEND="${RDEPEND} sys-devel/perl sys-apps/procps"
-
-# This package is complete if you just need basic IMAP functionality.
-# Here are some things that still need fixing:
-# o supervise support (of course)
-# o creation of imapd-ssl, pop3-ssl, pop3 init.d scripts
-#     (I only converted the imapd.rc script)
-# o tweaking of config files
-# o My RC script is configured to look for maildirs in ~/.maildir
-#     (my preference, and the official Gentoo Linux standard location)
-#     instead of the more traditional and icky ~/Maildir.
-# o We need to add an /etc/mail.conf.
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use berkdb && myconf="${myconf} --with-db=db"
-	use berkdb || myconf="${myconf} --with-db=gdbm"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /var/lib/courier-imap
-	mkdir -p ${D}/etc/pam.d
-	make install DESTDIR=${D}
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-        mv ../sbin/man .
-	cd ..
-
-	# we dont need to do this.. // woodchip
-	#cd ${D}/etc/pam.d
-	#for x in *
-	#do
-	#	cp ${x} ${x}.orig
-	#	sed -e 's#/lib/security/##g' ${x}.orig > ${x}
-	#	rm ${x}.orig
-	#done
-
-	rm ${D}/usr/sbin/mkimapdcert
-	exeinto /usr/sbin ; doexe ${FILESDIR}/mkimapdcert
-
- 	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-imap-rc6 courier-imap
-	newexe ${FILESDIR}/courier-imap-ssl-rc6 courier-imap-ssl
-
-	# not neccesary, we now have pam_stack, and courier-imap
-	# comes with pam_stack aware pam.d/ files already :) // woodchip
-	#insinto /etc/pam.d ; doins ${FILEDIR}/pam.d-imap
-}
diff --git a/net-mail/courier-imap/courier-imap-1.5.0.ebuild b/net-mail/courier-imap/courier-imap-1.5.0.ebuild
index 21de7ef103e4..2f99599408b7 100644
--- a/net-mail/courier-imap/courier-imap-1.5.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.5.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.5.0.ebuild,v 1.1 2002/06/24 20:36:09 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.5.0.ebuild,v 1.2 2002/07/09 21:51:18 nitro Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
 HOMEPAGE="http://www.courier-mta.org/"
 
+KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-mail/courier-imap/files/courier-imap-rc6 b/net-mail/courier-imap/files/courier-imap-rc6
deleted file mode 100644
index 158fb9b564cd..000000000000
--- a/net-mail/courier-imap/files/courier-imap-rc6
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-rc6,v 1.3 2002/04/01 21:57:37 woodchip Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/courier-imap/imapd ] ; then
-		eerror "You need an /etc/courier-imap/imapd file to run courier imap"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier imap"
-	/usr/lib/courier-imap/imapd.rc start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier imap"
-	/usr/lib/courier-imap/imapd.rc stop
-	eend $?
-}
diff --git a/net-mail/courier-imap/files/courier-imap-ssl-rc6 b/net-mail/courier-imap/files/courier-imap-ssl-rc6
deleted file mode 100644
index 8b9f68faa1d7..000000000000
--- a/net-mail/courier-imap/files/courier-imap-ssl-rc6
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-ssl-rc6,v 1.3 2002/04/01 21:57:37 woodchip Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/courier-imap/imapd ] ; then
-		eerror "You need an /etc/courier-imap/imapd file to run courier imap"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting courier ssl imap"
-	/usr/lib/courier-imap/imapd-ssl.rc start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier ssl imap"
-	/usr/lib/courier-imap/imapd-ssl.rc stop
-	eend $?
-}