cleanups and version bump.

14 files changed, 50 insertions, 696 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 8668b208d91a..33f856de6d64 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.30 2003/04/11 22:44:20 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.31 2003/04/30 11:30:40 liquidx Exp $
+
+*courier-imap-1.7.1 (30 Apr 2003)
+
+  30 Apr 2003; Alastair Tse <liquidx@gentoo.org> courier-imap-1.7.1.ebuild:
+  version bump. workaround db3/db4 coexisting problems. added
+  /var/lib/courier-imap
 
   18 Feb 2003; Nick Hadaway <raker@gentoo.org> files/gentoo-*.rc :
   Updated gentoo-*.rc with fix0rs found by Psi-Jack!
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index fb0a31065252..6a3db4cfdac6 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,23 +1,15 @@
-MD5 330ea653318a455b5667c1a3c6a05129 ChangeLog 5280
-MD5 2f1d03965949f393dd8bf7fb272bd8ef courier-imap-1.4.5-r3.ebuild 4845
-MD5 b63cba2c6e20e5e543a8f770f393655d courier-imap-1.5.0.ebuild 4865
-MD5 5271ae0319ee1a47f197ca176e9daef6 courier-imap-1.5.1.ebuild 4904
-MD5 1afd0fbbff7265368068f06c6bef5245 courier-imap-1.5.3.ebuild 4728
-MD5 4415942cb1a9c9cd8c1b727bdbe1bdbb courier-imap-1.6.1.ebuild 5011
+MD5 bb591f864518bd623ac374ba1fbb3ed6 ChangeLog 5478
 MD5 0f2fe7dc983167c8cd31d66ce0da88de courier-imap-1.6.2-r1.ebuild 4841
 MD5 f66e3273fe19d36ac280c4b20939a10b courier-imap-1.6.2.ebuild 4757
-MD5 56031e4fcc734c48542ee9a7c7d76d6d courier-imap-1.7.0.ebuild 4939
+MD5 4d5c26dbee1a905b79bd58157b98cb4b courier-imap-1.7.0.ebuild 4982
+MD5 4fae5c9c0f9f0a82f93d420e4df8d8dc courier-imap-1.7.1.ebuild 5276
 MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
 MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
 MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208
 MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953
 MD5 32bc690ac270adbfe95dbbeaab37904b files/courier-pop3d-ssl.rc6 1216
 MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
-MD5 88bc282c8dd7523327e75d3178f47924 files/digest-courier-imap-1.4.5-r3 71
-MD5 8c0913ac8bf9557ec9c4c5df2c52fa2e files/digest-courier-imap-1.5.0 71
-MD5 ead0265d23dbc7d34b937272894f2708 files/digest-courier-imap-1.5.1 71
-MD5 de0e43ae9f05433c8eb091040494780a files/digest-courier-imap-1.5.3 71
-MD5 7435b4c9faa3263e4c0685c000d4ce75 files/digest-courier-imap-1.6.1 72
+MD5 f8379da2c3af9757896cf51719923edd files/digest-courier-imap-1.7.1 72
 MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2 72
 MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2-r1 72
 MD5 f287a12e157d9a3280951ab876b5159b files/digest-courier-imap-1.7.0 72
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
deleted file mode 100644
index 46f5a3aca482..000000000000
--- a/net-mail/courier-imap/courier-imap-1.4.5-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.5-r3.ebuild,v 1.10 2003/03/11 21:11:46 seemant Exp $
-
-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 ppc sparc "
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gdbm tcltk ldap berkdb mysql pam"
-
-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} dev-lang/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
-	dodir /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# 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
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	# 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.5.0.ebuild b/net-mail/courier-imap/courier-imap-1.5.0.ebuild
deleted file mode 100644
index e7b02e2b5dcf..000000000000
--- a/net-mail/courier-imap/courier-imap-1.5.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.5.0.ebuild,v 1.12 2003/03/11 21:11:46 seemant Exp $
-
-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 ppc sparc "
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gdbm tcltk ldap berkdb mysql pam"
-
-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} dev-lang/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"
-
-	# Courier Assumes that if the account exists, then we need
-	# to build with support. This is a bad assumption.
-	[ -x /usr/bin/vchkpw ] || myconf="${myconf} --without-authvchkpw"
-
-	./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
-	dodir /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# 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 ..
-
-	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
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	# courier-imap comes with pam_stack aware pam.d/ files already
-	#insinto /etc/pam.d ; doins ${FILEDIR}/pam.d-imap
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	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.5.1.ebuild b/net-mail/courier-imap/courier-imap-1.5.1.ebuild
deleted file mode 100644
index 0b32c8063637..000000000000
--- a/net-mail/courier-imap/courier-imap-1.5.1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.5.1.ebuild,v 1.10 2003/03/11 21:11:46 seemant Exp $
-
-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 ppc sparc "
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 gdbm tcltk ldap berkdb mysql pam"
-
-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} dev-lang/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"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	./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 \
-		--enable-unicode \
-		--without-authvchkpw \
-		--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
-	dodir /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# 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
-	
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# 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 ..
-
-	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
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	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
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-	echo
-
-}
diff --git a/net-mail/courier-imap/courier-imap-1.5.3.ebuild b/net-mail/courier-imap/courier-imap-1.5.3.ebuild
deleted file mode 100644
index 4f9756ad3427..000000000000
--- a/net-mail/courier-imap/courier-imap-1.5.3.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.5.3.ebuild,v 1.8 2003/03/11 21:11:46 seemant Exp $
-
-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 ppc sparc"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 gdbm tcltk ldap berkdb mysql pam"
-
-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} dev-lang/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 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"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	./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 \
-		--enable-unicode \
-		--without-authvchkpw \
-		--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 /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# 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
-	
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# 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 ..
-
-	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
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	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
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-	echo
-
-}
diff --git a/net-mail/courier-imap/courier-imap-1.7.0.ebuild b/net-mail/courier-imap/courier-imap-1.7.0.ebuild
index 1940c8fd7232..d7678dfd5cd3 100644
--- a/net-mail/courier-imap/courier-imap-1.7.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.0.ebuild,v 1.5 2003/04/11 22:44:20 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.0.ebuild,v 1.6 2003/04/30 11:30:40 liquidx Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="http://twtelecom.dl.sourceforge.net/sourceforge/courier/${P}.tar.bz2"
@@ -160,6 +160,8 @@ src_install() {
 
 	dodoc ${S}/imap/ChangeLog
 
+	keepdir /var/lib/courier-imap/authdaemon
+
 }
 
 pkg_postinst() {
diff --git a/net-mail/courier-imap/courier-imap-1.6.1.ebuild b/net-mail/courier-imap/courier-imap-1.7.1.ebuild
index 5c06deb87e8c..f89e1004015b 100644
--- a/net-mail/courier-imap/courier-imap-1.6.1.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.7.1.ebuild
@@ -1,50 +1,70 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.6.1.ebuild,v 1.5 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.1.ebuild,v 1.1 2003/04/30 11:30:40 liquidx Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="http://twtelecom.dl.sourceforge.net/sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
-
 KEYWORDS="~x86 ~ppc ~sparc "
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6 gdbm tcltk ldap berkdb mysql pam"
-
+IUSE="ipv6 gdbm tcltk ldap berkdb mysql pam nls postgres"
 PROVIDE="virtual/imapd"
-
+# not compatible with >=sys-libs/db-4
 RDEPEND="virtual/glibc
 	>=dev-libs/openssl-0.9.6
 	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
+	berkdb? ( =sys-libs/db-3* )
 	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 )"
+	tcltk? ( >=dev-tcltk/expect-5.33.0 )
+	postgres? ( >=dev-db/postgresql-7.2 )"
 DEPEND="${RDEPEND} dev-lang/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 We need to add an /etc/mail.conf.
+inherit flag-o-matic
+filter-flags -funroll-loops
+filter-flags -fomit-frame-pointer
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	
+	# explicitly use db3 over db4
+	if [ -n "`use berkdb`" ]; then
+		sed -i -e "s,-ldb,-ldb-3.2," configure
+		sed -i -e "s,-ldb,-ldb-3.2," bdbobj/configure
+		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
+	fi
+	
+}
 
 src_compile() {
 	local myconf
 	use pam || myconf="${myconf} --without-authpam"
 	use ldap || myconf="${myconf} --without-authldap"
 	use mysql || myconf="${myconf} --without-authmysql"
+	use postgres || myconf="${myconf} --without-authpostgresql"
 	use berkdb \
 		&& myconf="${myconf} --with-db=db" \
 		|| myconf="${myconf} --with-db=gdbm"
 	use ipv6 || myconf="${myconf} --without-ipv6"
 
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
+	VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
+	if [ -f ${VPOPMAIL_DIR}/etc/lib_deps ]; then
 		myconf="${myconf} --with-authvchkpw"
 	else
 		myconf="${myconf} --without-authvchkpw"
 	fi
 
+	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
+		myconf="${myconf} --enable-unicode"
+	elif use nls; then
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	else
+		myconf="${myconf} --disable-unicode"
+	fi
+
 	myconf="${myconf} debug=true"
 
 	./configure \
@@ -57,7 +77,6 @@ src_compile() {
 		--localstatedir=/var/lib/courier-imap \
 		--enable-workarounds-for-imap-client-bugs \
 		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--enable-unicode \
 		--host=${CHOST} ${myconf} || die "bad ./configure"
 
 	# change the pem file location..
@@ -154,21 +173,16 @@ src_install() {
 
 	dodoc ${S}/imap/ChangeLog
 
+	keepdir /var/lib/courier-imap/authdaemon
+
 }
 
 pkg_postinst() {
 	# rebuild init deps to include deps on authdaemond
 	/etc/init.d/depscan.sh
 	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
 	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
 	einfo "you would like to use something other than the"
 	einfo "authdaemond.plain authenticator"
 	echo
-
 }
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.4.5-r3 b/net-mail/courier-imap/files/digest-courier-imap-1.4.5-r3
deleted file mode 100644
index 5736726e7edf..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.4.5-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3416b15e7b3b5632aad75cf7532450f courier-imap-1.4.5.tar.gz 1251897
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.5.0 b/net-mail/courier-imap/files/digest-courier-imap-1.5.0
deleted file mode 100644
index 63d0777387d2..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68242abb5c32cff6ed6ed6db4a209c56 courier-imap-1.5.0.tar.gz 1256574
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.5.1 b/net-mail/courier-imap/files/digest-courier-imap-1.5.1
deleted file mode 100644
index 070e4d80121a..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f718dd5ad029ab315bfebd6ff6885384 courier-imap-1.5.1.tar.gz 1253471
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.5.3 b/net-mail/courier-imap/files/digest-courier-imap-1.5.3
deleted file mode 100644
index 732e720549c8..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 132c2405e3857b3fa2a6369d77e19fd9 courier-imap-1.5.3.tar.gz 1296016
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.6.1 b/net-mail/courier-imap/files/digest-courier-imap-1.6.1
deleted file mode 100644
index 64aa62f003a5..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 313a1b1c7a6813c81f543b524f4f2a3d courier-imap-1.6.1.tar.bz2 1200262
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.7.1 b/net-mail/courier-imap/files/digest-courier-imap-1.7.1
new file mode 100644
index 000000000000..87109aa7e0c7
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-1.7.1
@@ -0,0 +1 @@
+MD5 ce3a78cabd3d69e4982907de69ecac96 courier-imap-1.7.1.tar.bz2 1217835