General cleanup. Fix bugs. See ChangeLog for details.

(Portage version: 2.1.2.3)

30 files changed, 648 insertions, 1521 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 63078c6a955a..cdf010db8a57 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.146 2007/03/30 16:52:17 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.147 2007/04/07 01:08:00 chtekk Exp $
+
+*courier-imap-4.1.2-r1 (07 Apr 2007)
+*courier-imap-4.0.6-r2 (07 Apr 2007)
+
+  07 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-3.0.7-db4-configure.in.patch,
+  -files/courier-imap-3.0.7-disable-fam-configure.in.patch,
+  +files/courier-imap-4.0.6-aclocal-fix.patch,
+  files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
+  files/courier-imap-4.0.6-db4-configure.in.patch,
+  files/courier-imap-4.0.6-r1-courier-imapd.indirect,
+  files/courier-imap-4.0.6-r1-courier-imapd.rc6,
+  files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,
+  files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
+  files/courier-imap-4.0.6-r1-courier-pop3d.rc6,
+  files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,
+  files/courier-imap-4.0.6-r1-gentoo-imapd.rc,
+  files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,
+  files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,
+  files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-4.1.2-aclocal-fix.patch,
+  -files/courier-imap-4.1.2-db4-configure.in.patch, metadata.xml,
+  -courier-imap-3.0.7.ebuild, -courier-imap-4.0.6.ebuild,
+  -courier-imap-4.0.6-r1.ebuild, +courier-imap-4.0.6-r2.ebuild,
+  -courier-imap-4.1.2.ebuild, +courier-imap-4.1.2-r1.ebuild:
+  Remove old/unused versions with redundant/unstable keywords. General ebuild
+  cleanup for 4.0.6-r2 and 4.1.2-r1. Cleanup of init-scripts and patches. Fix
+  security bug #168196 and autotools handling bug #160037.
 
   30 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
   courier-imap-4.1.2.ebuild:
diff --git a/net-mail/courier-imap/courier-imap-3.0.7.ebuild b/net-mail/courier-imap/courier-imap-3.0.7.ebuild
deleted file mode 100644
index 04f081c6e004..000000000000
--- a/net-mail/courier-imap/courier-imap-3.0.7.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2007 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.20 2007/01/05 08:51:40 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips ~alpha hppa amd64 ppc64 ia64"
-IUSE="fam berkdb gdbm debug ipv6 ldap mysql nls pam postgres selinux"
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-
-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 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0
-	fam? ( virtual/fam )
-	selinux? ( sec-policy/selinux-courier-imap )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-lang/perl
-	sys-process/procps"
-PROVIDE="virtual/imapd"
-
-pkg_setup() {
-	if ! use berkdb && ! use gdbm; then
-		echo
-		eerror "either 'berkdb' or 'gdbm' USE flag is required."
-		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
-		eerror "'man 5 portage' for correct syntax usage for '/etc/postage/package.use'"
-		echo
-		die "required USE flag is missing."
-	fi
-}
-
-vpopmail_setup() {
-	VPOPMAIL_INSTALLED=
-	VPOPMAIL_DIR=
-	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-	VPOPMAIL_DIR=`grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6`
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004; langthang@gentoo.org.
-	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch ${FILESDIR}/${P}-disable-fam-configure.in.patch || die "patch failed"
-
-	# These patches should fix problem detecting Berkeley DB.
-	# We now can compile with db4 support.
-	epatch ${FILESDIR}/${P}-db4-bdbobj_configure.in.patch || die "patch failed"
-	epatch ${FILESDIR}/${P}-db4-configure.in.patch || die "patch failed"
-
-	export WANT_AUTOCONF="2.5"
-	ebegin "Recreating configure"
-	autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	cd ${S}/maildir
-	ebegin "Recreating maildir/configure"
-	autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	cd ${S}/bdbobj
-	ebegin "Recreating bdbobj/configure"
-		autoconf || \
-		die "recreate configure failed"
-	eend $?
-}
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `use_with ldap authldap`"
-	myconf="${myconf} `use_with mysql authmysql`"
-	myconf="${myconf} `use_with postgres authpostgresql`"
-	# the --with-ipv6 is broken
-	#myconf="${myconf} --with-ipv6"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	# 19 Aug 2004; langthang@gentoo.org
-	# default to gdbm if both berkdb and gdbm present.
-	if use berkdb; then
-		if use gdbm; then
-			einfo "build with GDBM support."
-			myconf="${myconf} --with-db=gdbm"
-		else
-			einfo "build with Berkeley DB support."
-			myconf="${myconf} --with-db=db"
-		fi
-	else
-		einfo "build with GDBM support."
-		myconf="${myconf} --with-db=gdbm"
-	fi
-
-	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-		einfo "vpopmail found"
-		myconf="${myconf} --with-authvchkpw"
-		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
-		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
-	else
-		einfo "vpopmail not found"
-		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
-
-	use debug && myconf="${myconf} debug=true"
-
-	local cachefile
-	cachefile=${WORKDIR}/config.cache
-	rm -f ${cachefile}
-
-	# fix for bug #21330
-	CFLAGS="`echo ${CFLAGS} | xargs`"
-	CXXFLAGS="`echo ${CXXFLAGS} | xargs`"
-	LDFLAGS="`echo ${LDFLAGS} | xargs`"
-
-	# fix for bug #27528
-	# they really should use a better way to detect redhat
-	myconf="${myconf} --without-redhat"
-
-	# bug #29879 - FAM support
-	#if has_version 'virtual/fam' && ! use fam; then
-	#	ewarn "FAM will be detected by the package and support will be enabled"
-	#	ewarn "The package presently provides no way to disable fam support if you don't want it"
-	#fi
-	myconf="${myconf} `use_with fam`"
-
-	# fix for non-x86 platforms, bug #38606
-	# courier-imap doesn't respect just --host=$CHOST without --build
-	[ -z "${CBUILD}" ] && export CBUILD="${CHOST}"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS} " econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--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 \
-		--cache-file=${cachefile} \
-		${myconf} || die "econf failed"
-
-	# 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() {
-	vpopmail_setup
-
-	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
-	newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 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}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN='>> ${service}
-	done
-	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
-	for service in imapd-ssl pop3d-ssl
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIRPATH=.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
-
-	dosym /usr/sbin/courierlogger /usr/lib/courier-imap/courierlogger
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond-3.0.4-r1 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6-3.0.5 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6-3.0.5 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.7.3-r1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.7.3-r1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.7.3-r1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.7.3-r1.rc gentoo-pop3d-ssl.rc
-
-	local authmods
-	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	use mysql && authmods="${authmods} authmysql"
-	use postgres && authmods="${authmods} authpgsql"
-	use pam && authmods="${authmods} authpam"
-	use ldap && authmods="${authmods} authldap"
-	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	exeinto /usr/lib/courier-imap/authlib
-	for i in ${authmods}; do
-		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
-	done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-	# bug #45953, more docs
-	cd ${S}
-	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog}
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	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"
-}
diff --git a/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild b/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild
deleted file mode 100644
index 5a8276647fa7..000000000000
--- a/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild,v 1.2 2007/02/23 15:59:32 chutzpah Exp $
-
-inherit eutils multilib
-IUSE="fam berkdb gdbm debug ipv6 nls selinux"
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-#MY_PV=${PV/_rc*/}
-#SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	>=net-libs/courier-authlib-0.57
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	fam? ( virtual/fam )
-	selinux? ( sec-policy/selinux-courier-imap )
-	>=net-mail/mailbase-0.00-r8"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	userland_GNU? ( sys-process/procps )
-	!mail-mta/courier"
-PROVIDE="virtual/imapd"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-#S=${WORKDIR}/${PN}-${MY_PV}
-pkg_setup() {
-	if ! use berkdb && ! use gdbm; then
-		echo
-		eerror "either 'berkdb' or 'gdbm' USE flag is required."
-		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
-		eerror "'man 5 portage' for correct syntax usage for '/etc/portage/package.use'"
-		echo
-		die "required USE flag is missing."
-	fi
-}
-
-vpopmail_setup() {
-	VPOPMAIL_INSTALLED=
-	VPOPMAIL_DIR=
-	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004; langthang@gentoo.org.
-	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch ${FILESDIR}/${PN}-4.0.1-disable-fam-configure.in.patch
-
-	# These patches should fix problem detecting Berkeley DB.
-	# We now can compile with db4 support.
-	if use berkdb; then
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-configure.in.patch
-	fi
-
-	export WANT_AUTOCONF="2.5"
-	libtoolize --copy --force
-	ebegin "Recreating configure"
-	autoconf || die "autoconf on . failed"
-	eend $?
-
-	cd ${S}/maildir
-	libtoolize --copy --force
-	ebegin "Recreating maildir/configure"
-	autoconf || die "autoconf on maildir failed"
-	eend $?
-
-	cd ${S}/bdbobj
-	libtoolize --copy --force
-	ebegin "Recreating bdbobj/configure"
-	autoconf || die "autoconf on bdbobj failed"
-	eend $?
-}
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-
-	# 19 Aug 2004; langthang@gentoo.org
-	# default to gdbm if both berkdb and gdbm present.
-	if use gdbm; then
-		einfo "build with GDBM support."
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb; then
-		einfo "build with Berkeley DB support."
-		myconf="${myconf} --with-db=db"
-	fi
-
-	# This check should be in courier-authlib.
-	# But I am not sure so I commented here
-	# If you are using vpopmail and everything work,
-	# please remove this section.
-	#if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-	#	einfo "vpopmail found"
-	#	myconf="${myconf} --with-authvchkpw"
-	#	tmpLDFLAGS="$(cat ${VPOPMAIL_DIR}/etc/lib_deps)"
-	#	LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-	#	CFLAGS="${CFLAGS} $(cat ${VPOPMAIL_DIR}/etc/inc_deps)"
-	#else
-	#	einfo "vpopmail not found"
-	#	myconf="${myconf} --without-authvchkpw"
-	#fi
-
-	# The default character set is ISO-8859-1/US-ASCII.
-	# use nls will enable all available charater sets.
-	# set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
-	# to include only specified translation table.
-	if use nls && [[ -z "$ENABLE_UNICODE" ]]; then
-		einfo "ENABLE_UNICODE is not set, building with all available character sets"
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		einfo "ENABLE_UNICODE is set, building with unicode=$ENABLE_UNICODE"
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		einfo "disabling unicode support"
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	# fix for bug #21330
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS} " econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/$(get_libdir)/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		$(use_with ipv6) \
-		$(use_with fam) \
-		${myconf} || die "econf failed"
-
-	# change the pem file location..
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist || \
-		die "sed failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	vpopmail_setup
-
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-	rm -rf ${D}/etc/pam.d
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	local name
-	for name in imapd pop3d; do
-		mv ${name} "courier-${name}" || \
-			die "failed to mv $name to 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/$(get_libdir)/courier-imap
-	local service
-	for service in imapd pop3d; do
-		local type
-		for type in "" "-ssl"; do
-			local file
-			file="${service}${type}.rc"
-			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
-			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file} || die "sed failed"
-		done
-	done
-
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl; do
-		mv -v ${D}/etc/courier-imap/${x}.dist \
-			${D}/etc/courier-imap/${x} || \
-			die "failed to mv ${x}.dist to ${x}"
-	done
-
-	#insinto /etc/courier-imap
-	#newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	cd ${D}/etc/courier-imap
-	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
-	for service in imapd-ssl pop3d-ssl imapd pop3d; do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-	done
-	for service in imapd pop3d; do
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN=' >> ${service}
-		echo -e '#Put any program for ${LOGINRUN} here' >> ${service}
-		echo -e '#this is for relay-ctrl-allow in 4*' >> ${service}
-		echo 'LOGINRUN=' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *; do
-		if [[ -L ${x} ]]; then
-			rm -v ${x} || die "failed to rm ${x}"
-		fi
-	done
-
-	cd ../share
-	mv -v * ../sbin
-	mv -v ../sbin/man .
-	cd ..
-
-	for x in mkimapdcert mkpop3dcert; do
-		mv ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}.orig || \
-			die "failed to rm ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}"
-	done
-
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert || \
-			die "doexe failed"
-
-	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
-			die "dosym failed"
-
-	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
-	for initd in {imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${INITD_VER}-courier-${initd}.rc6 > \
-			courier-${initd} || die "libdir-sed failed"
-		doinitd courier-${initd} || die "doinitd courier-${initd} failed"
-	done
-	exeinto /usr/$(get_libdir)/courier-imap
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${RC_VER}-${exe} > \
-			${exe} || die "libdir-sed 2 failed"
-		doexe ${exe} || die "doexe ${exe} failed"
-	done
-
-	#local authmods
-	#authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	#use mysql && authmods="${authmods} authmysql"
-	#use postgres && authmods="${authmods} authpgsql"
-	#use pam && authmods="${authmods} authpam"
-	#use ldap && authmods="${authmods} authldap"
-	#[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	#exeinto /usr/lib/courier-imap/authlib
-	#for i in ${authmods}; do
-	#	[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i} || die "doexe failed"
-	#done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake || \
-		die "mv failed"
-
-	# bug #45953, more docs
-	cd ${S}
-	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} \
-		${FILESDIR}/courier-imap-gentoo.readme
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	einfo "Authdaemond is no longer provided this package."
-	einfo "athentication libraries are from courier-authlib"
-	einfo "for a quick start please refer to"
-	einfo "/usr/share/doc/${P}/courier-imap-gentoo.readme.gz"
-	# some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	chmod 755 ${ROOT}/usr/$(get_libdir)/courier-imap || die "Failed to ensure sane permissions"
-}
-
-src_test() {
-	ewarn "make check not supported by package due to"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
-}
diff --git a/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild b/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild
new file mode 100644
index 000000000000..ba83a921d6f3
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild,v 1.1 2007/04/07 01:08:00 chtekk Exp $
+
+inherit autotools eutils multilib
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs."
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb debug fam gdbm ipv6 nls selinux"
+
+# userpriv breaks linking against vpopmail
+RESTRICT="userpriv"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+		>=net-libs/courier-authlib-0.57
+		>=net-mail/mailbase-0.00-r8
+		berkdb? ( sys-libs/db )
+		fam? ( virtual/fam )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+		dev-lang/perl
+		!mail-mta/courier
+		userland_GNU? ( sys-process/procps )"
+
+PROVIDE="virtual/imapd"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+pkg_setup() {
+	if ! use berkdb && ! use gdbm ; then
+		echo
+		eerror "Either the 'berkdb' or the 'gdbm' USE flag is required."
+		eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'."
+		eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'."
+		echo
+		die "Required USE flag missing."
+	fi
+}
+
+vpopmail_setup() {
+	VPOPMAIL_INSTALLED=
+	VPOPMAIL_DIR=
+	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
+	VPOPMAIL_INSTALLED=
+	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]] ; then
+		VPOPMAIL_INSTALLED=1
+	else
+		VPOPMAIL_DIR=
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004 langthang@gentoo.org
+	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
+	epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${P}-aclocal-fix.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		epatch "${FILESDIR}"/${P}-db4-bdbobj_configure.in.patch
+		epatch "${FILESDIR}"/${P}-db4-tcpd_configure.in.patch
+		epatch "${FILESDIR}"/${P}-db4-configure.in.patch
+	fi
+
+	ebegin "Recreating configure"
+	AT_NO_RECURSIVE="true" eautoreconf || die "eautoreconf on . failed"
+	eend $?
+
+	cd "${S}/maildir"
+	ebegin "Recreating maildir/configure"
+	eautoreconf || die "eautoreconf on maildir failed"
+	eend $?
+
+	cd "${S}/bdbobj"
+	ebegin "Recreating bdbobj/configure"
+	eautoreconf || die "eautoreconf on bdbobj failed"
+	eend $?
+
+	cd "${S}/tcpd"
+	ebegin "Recreating tcpd/configure"
+	eautoreconf || die "eautoreconf on tcpd failed"
+	eend $?
+}
+
+src_compile() {
+	vpopmail_setup
+
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# The default character set is ISO-8859-1/US-ASCII.
+	# USE 'nls' will enable all available character sets.
+	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation tables.
+	if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then
+		einfo "ENABLE_UNICODE is not set, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	elif use nls ; then
+		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
+		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
+	else
+		einfo "Disabling unicode support"
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Fix for bug #21330
+	CFLAGS="$(echo ${CFLAGS} | xargs)"
+	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
+	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
+
+	# Do the actual build now
+	LDFLAGS="${LDFLAGS} " econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		${myconf} || die "econf failed"
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist || \
+		die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	vpopmail_setup
+
+	dodir /var/lib/${PN} /etc/pam.d
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -Rf "${D}/etc/pam.d"
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin"
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to 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/$(get_libdir)/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin"
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -f * ../sbin
+	mv -f ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" || die "doexe failed"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger || die "dosym failed"
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}" || die "doinitd ${initd} failed"
+	done
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}" || die "doexe ${exe} failed"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}"
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	einfo "Authdaemond is no longer provided by this package."
+	einfo "Authentication libraries are now in courier-authlib."
+	einfo "For a quick-start howto please refer to:"
+	einfo "/usr/share/doc/${P}/${PN}-gentoo.readme.gz"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
diff --git a/net-mail/courier-imap/courier-imap-4.0.6.ebuild b/net-mail/courier-imap/courier-imap-4.0.6.ebuild
deleted file mode 100644
index ab74da216c97..000000000000
--- a/net-mail/courier-imap/courier-imap-4.0.6.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6.ebuild,v 1.5 2007/01/05 08:51:40 flameeyes Exp $
-
-inherit eutils
-IUSE="fam berkdb gdbm debug ipv6 nls selinux"
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-#MY_PV=${PV/_rc*/}
-#SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	>=net-libs/courier-authlib-0.57
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	fam? ( virtual/fam )
-	selinux? ( sec-policy/selinux-courier-imap )
-	>=net-mail/mailbase-0.00-r8"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	userland_GNU? ( sys-process/procps )
-	!mail-mta/courier"
-PROVIDE="virtual/imapd"
-
-RC_VER="4.0.1-r1"
-INITD_VER="4.0.4"
-
-#S=${WORKDIR}/${PN}-${MY_PV}
-pkg_setup() {
-	if ! use berkdb && ! use gdbm; then
-		echo
-		eerror "either 'berkdb' or 'gdbm' USE flag is required."
-		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
-		eerror "'man 5 portage' for correct syntax usage for '/etc/portage/package.use'"
-		echo
-		die "required USE flag is missing."
-	fi
-}
-
-vpopmail_setup() {
-	VPOPMAIL_INSTALLED=
-	VPOPMAIL_DIR=
-	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004; langthang@gentoo.org.
-	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch ${FILESDIR}/${PN}-4.0.1-disable-fam-configure.in.patch
-
-	# These patches should fix problem detecting Berkeley DB.
-	# We now can compile with db4 support.
-	if use berkdb; then
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-configure.in.patch
-	fi
-
-	export WANT_AUTOCONF="2.5"
-	libtoolize --copy --force
-	ebegin "Recreating configure"
-	autoconf || die "autoconf on . failed"
-	eend $?
-
-	cd ${S}/maildir
-	libtoolize --copy --force
-	ebegin "Recreating maildir/configure"
-	autoconf || die "autoconf on maildir failed"
-	eend $?
-
-	cd ${S}/bdbobj
-	libtoolize --copy --force
-	ebegin "Recreating bdbobj/configure"
-	autoconf || die "autoconf on bdbobj failed"
-	eend $?
-}
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-
-	# 19 Aug 2004; langthang@gentoo.org
-	# default to gdbm if both berkdb and gdbm present.
-	if use gdbm; then
-		einfo "build with GDBM support."
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb; then
-		einfo "build with Berkeley DB support."
-		myconf="${myconf} --with-db=db"
-	fi
-
-	# This check should be in courier-authlib.
-	# But I am not sure so I commented here
-	# If you are using vpopmail and everything work,
-	# please remove this section.
-	#if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-	#	einfo "vpopmail found"
-	#	myconf="${myconf} --with-authvchkpw"
-	#	tmpLDFLAGS="$(cat ${VPOPMAIL_DIR}/etc/lib_deps)"
-	#	LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-	#	CFLAGS="${CFLAGS} $(cat ${VPOPMAIL_DIR}/etc/inc_deps)"
-	#else
-	#	einfo "vpopmail not found"
-	#	myconf="${myconf} --without-authvchkpw"
-	#fi
-
-	# The default character set is ISO-8859-1/US-ASCII.
-	# use nls will enable all available charater sets.
-	# set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
-	# to include only specified translation table.
-	if use nls && [[ -z "$ENABLE_UNICODE" ]]; then
-		einfo "ENABLE_UNICODE is not set, building with all available character sets"
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		einfo "ENABLE_UNICODE is set, building with unicode=$ENABLE_UNICODE"
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		einfo "disabling unicode support"
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	# fix for bug #21330
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS} " econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/$(get_libdir)/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		$(use_with ipv6) \
-		$(use_with fam) \
-		${myconf} || die "econf failed"
-
-	# change the pem file location..
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist || \
-		die "sed failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	vpopmail_setup
-
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-	rm -rf ${D}/etc/pam.d
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	local name
-	for name in imapd pop3d; do
-		mv ${name} "courier-${name}" || \
-			die "failed to mv $name to 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/$(get_libdir)/courier-imap
-	local service
-	for service in imapd pop3d; do
-		local type
-		for type in "" "-ssl"; do
-			local file
-			file="${service}${type}.rc"
-			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
-			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file} || die "sed failed"
-		done
-	done
-
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl; do
-		mv -v ${D}/etc/courier-imap/${x}.dist \
-			${D}/etc/courier-imap/${x} || \
-			die "failed to mv ${x}.dist to ${x}"
-	done
-
-	#insinto /etc/courier-imap
-	#newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	cd ${D}/etc/courier-imap
-	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
-	for service in imapd-ssl pop3d-ssl imapd pop3d; do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-	done
-	for service in imapd pop3d; do
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN=' >> ${service}
-		echo -e '#Put any program for ${LOGINRUN} here' >> ${service}
-		echo -e '#this is for relay-ctrl-allow in 4*' >> ${service}
-		echo 'LOGINRUN=' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *; do
-		if [[ -L ${x} ]]; then
-			rm -v ${x} || die "failed to rm ${x}"
-		fi
-	done
-
-	cd ../share
-	mv -v * ../sbin
-	mv -v ../sbin/man .
-	cd ..
-
-	for x in mkimapdcert mkpop3dcert; do
-		mv ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}.orig || \
-			die "failed to rm ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}"
-	done
-
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert || \
-			die "doexe failed"
-
-	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
-			die "dosym failed"
-
-	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-imapd.rc6 courier-imapd || die "newinitd failed"
-	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-imapd-ssl.rc6 courier-imapd-ssl || die "newinitd failed"
-	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-pop3d.rc6 courier-pop3d || die "newinitd failed"
-	newinitd ${FILESDIR}/${PN}-${INITD_VER}-courier-pop3d-ssl.rc6 courier-pop3d-ssl || die "newinitd failed"
-
-	exeinto /usr/$(get_libdir)/courier-imap
-		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-imapd.rc gentoo-imapd.rc || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-imapd-ssl.rc gentoo-imapd-ssl.rc || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-pop3d.rc gentoo-pop3d.rc || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-gentoo-pop3d-ssl.rc gentoo-pop3d-ssl.rc || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-courier-imapd.indirect courier-imapd.indirect || die "newexe failed"
-		newexe ${FILESDIR}/${PN}-${RC_VER}-courier-pop3d.indirect courier-pop3d.indirect || die "newexe failed"
-
-	#local authmods
-	#authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	#use mysql && authmods="${authmods} authmysql"
-	#use postgres && authmods="${authmods} authpgsql"
-	#use pam && authmods="${authmods} authpam"
-	#use ldap && authmods="${authmods} authldap"
-	#[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	#exeinto /usr/lib/courier-imap/authlib
-	#for i in ${authmods}; do
-	#	[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i} || die "doexe failed"
-	#done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake || \
-		die "mv failed"
-
-	# bug #45953, more docs
-	cd ${S}
-	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} \
-		${FILESDIR}/courier-imap-gentoo.readme
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	einfo "Authdaemond is no longer provided this package."
-	einfo "athentication libraries are from courier-authlib"
-	einfo "for a quick start please refer to"
-	einfo "/usr/share/doc/${P}/courier-imap-gentoo.readme.gz"
-	# some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	chmod 755 ${ROOT}/usr/$(get_libdir)/courier-imap || die "Failed to ensure sane permissions"
-}
-
-src_test() {
-	ewarn "make check not supported by package due to"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
-}
diff --git a/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild b/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..d311e4dda794
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild,v 1.1 2007/04/07 01:08:00 chtekk Exp $
+
+inherit autotools eutils multilib
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs."
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb debug fam gdbm ipv6 nls selinux"
+
+# userpriv breaks linking against vpopmail
+RESTRICT="userpriv"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+		>=net-libs/courier-authlib-0.57
+		>=net-mail/mailbase-0.00-r8
+		berkdb? ( sys-libs/db )
+		fam? ( virtual/fam )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+		dev-lang/perl
+		!mail-mta/courier
+		userland_GNU? ( sys-process/procps )"
+
+PROVIDE="virtual/imapd"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+pkg_setup() {
+	if ! use berkdb && ! use gdbm ; then
+		echo
+		eerror "Either the 'berkdb' or the 'gdbm' USE flag is required."
+		eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'."
+		eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'."
+		echo
+		die "Required USE flag missing."
+	fi
+}
+
+vpopmail_setup() {
+	VPOPMAIL_INSTALLED=
+	VPOPMAIL_DIR=
+	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
+	VPOPMAIL_INSTALLED=
+	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]] ; then
+		VPOPMAIL_INSTALLED=1
+	else
+		VPOPMAIL_DIR=
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004 langthang@gentoo.org
+	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
+	epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${PN}-4.0.6-aclocal-fix.patch
+
+	# as-needed fix (bug #168769).
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		epatch "${FILESDIR}"/${PN}-4.0.6-db4-bdbobj_configure.in.patch
+		epatch "${FILESDIR}"/${PN}-4.0.6-db4-tcpd_configure.in.patch
+		epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch
+	fi
+
+	ebegin "Recreating configure"
+	AT_NO_RECURSIVE="true" eautoreconf || die "eautoreconf on . failed"
+	eend $?
+
+	cd "${S}/maildir"
+	ebegin "Recreating maildir/configure"
+	eautoreconf || die "eautoreconf on maildir failed"
+	eend $?
+
+	cd "${S}/bdbobj"
+	ebegin "Recreating bdbobj/configure"
+	eautoreconf || die "eautoreconf on bdbobj failed"
+	eend $?
+
+	cd "${S}/tcpd"
+	ebegin "Recreating tcpd/configure"
+	eautoreconf || die "eautoreconf on tcpd failed"
+	eend $?
+}
+
+src_compile() {
+	vpopmail_setup
+
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# The default character set is ISO-8859-1/US-ASCII.
+	# USE 'nls' will enable all available character sets.
+	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation tables.
+	if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then
+		einfo "ENABLE_UNICODE is not set, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	elif use nls ; then
+		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
+		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
+	else
+		einfo "Disabling unicode support"
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Fix for bug #21330
+	CFLAGS="$(echo ${CFLAGS} | xargs)"
+	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
+	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
+
+	# Do the actual build now
+	LDFLAGS="${LDFLAGS} " econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		${myconf} || die "econf failed"
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist || \
+		die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	vpopmail_setup
+
+	dodir /var/lib/${PN} /etc/pam.d
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -Rf "${D}/etc/pam.d"
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin"
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to 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/$(get_libdir)/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin"
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -f * ../sbin
+	mv -f ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" || die "doexe failed"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger || die "dosym failed"
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}" || die "doinitd ${initd} failed"
+	done
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}" || die "doexe ${exe} failed"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}"
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	einfo "Authdaemond is no longer provided by this package."
+	einfo "Authentication libraries are now in courier-authlib."
+	einfo "For a quick-start howto please refer to:"
+	einfo "/usr/share/doc/${P}/${PN}-gentoo.readme.gz"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
diff --git a/net-mail/courier-imap/courier-imap-4.1.2.ebuild b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
deleted file mode 100644
index 2bf5cf6d57db..000000000000
--- a/net-mail/courier-imap/courier-imap-4.1.2.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2.ebuild,v 1.5 2007/03/30 16:52:17 drizzt Exp $
-
-WANT_AUTOCONF="2.6"
-
-inherit autotools eutils multilib
-IUSE="fam berkdb gdbm debug ipv6 nls selinux"
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-#MY_PV=${PV/_rc*/}
-#SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	>=net-libs/courier-authlib-0.57
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	fam? ( virtual/fam )
-	selinux? ( sec-policy/selinux-courier-imap )
-	>=net-mail/mailbase-0.00-r8"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	userland_GNU? ( sys-process/procps )
-	!mail-mta/courier"
-PROVIDE="virtual/imapd"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-#S=${WORKDIR}/${PN}-${MY_PV}
-pkg_setup() {
-	if ! use berkdb && ! use gdbm; then
-		echo
-		eerror "either 'berkdb' or 'gdbm' USE flag is required."
-		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
-		eerror "'man 5 portage' for correct syntax usage for '/etc/portage/package.use'"
-		echo
-		die "required USE flag is missing."
-	fi
-}
-
-vpopmail_setup() {
-	VPOPMAIL_INSTALLED=
-	VPOPMAIL_DIR=
-	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004; langthang@gentoo.org.
-	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch ${FILESDIR}/${PN}-4.0.1-disable-fam-configure.in.patch
-
-	# kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206)
-	epatch "${FILESDIR}"/${P}-aclocal-fix.patch
-
-	# as-needed fix (bug #168769)
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	# These patches should fix problem detecting Berkeley DB.
-	# We now can compile with db4 support.
-	if use berkdb; then
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
-		epatch ${FILESDIR}/${PN}-4.0.6-db4-tcpd_configure.in.patch
-		epatch ${FILESDIR}/${P}-db4-configure.in.patch
-	fi
-
-	export WANT_AUTOCONF="2.5"
-	ebegin "Recreating configure"
-	AT_NO_RECURSIVE="true" eautoreconf || die "autoconf on . failed"
-	eend $?
-
-	cd ${S}/maildir
-	ebegin "Recreating maildir/configure"
-	eautoreconf || die "autoconf on maildir failed"
-	eend $?
-
-	cd ${S}/bdbobj
-	ebegin "Recreating bdbobj/configure"
-	eautoreconf || die "autoconf on bdbobj failed"
-	eend $?
-
-	cd ${S}/tcpd
-	ebegin "Recreating tcpd/configure"
-	eautoreconf || die "autoconf on bdbobj failed"
-	eend $?
-}
-
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-
-	# 19 Aug 2004; langthang@gentoo.org
-	# default to gdbm if both berkdb and gdbm present.
-	if use gdbm; then
-		einfo "build with GDBM support."
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb; then
-		einfo "build with Berkeley DB support."
-		myconf="${myconf} --with-db=db"
-	fi
-
-	# This check should be in courier-authlib.
-	# But I am not sure so I commented here
-	# If you are using vpopmail and everything work,
-	# please remove this section.
-	#if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-	#	einfo "vpopmail found"
-	#	myconf="${myconf} --with-authvchkpw"
-	#	tmpLDFLAGS="$(cat ${VPOPMAIL_DIR}/etc/lib_deps)"
-	#	LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-	#	CFLAGS="${CFLAGS} $(cat ${VPOPMAIL_DIR}/etc/inc_deps)"
-	#else
-	#	einfo "vpopmail not found"
-	#	myconf="${myconf} --without-authvchkpw"
-	#fi
-
-	# The default character set is ISO-8859-1/US-ASCII.
-	# use nls will enable all available charater sets.
-	# set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
-	# to include only specified translation table.
-	if use nls && [[ -z "$ENABLE_UNICODE" ]]; then
-		einfo "ENABLE_UNICODE is not set, building with all available character sets"
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		einfo "ENABLE_UNICODE is set, building with unicode=$ENABLE_UNICODE"
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		einfo "disabling unicode support"
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	# fix for bug #21330
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS} " econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/$(get_libdir)/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		$(use_with ipv6) \
-		$(use_with fam) \
-		${myconf} || die "econf failed"
-
-	# change the pem file location..
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist || \
-		die "sed failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	vpopmail_setup
-
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-	rm -rf ${D}/etc/pam.d
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	local name
-	for name in imapd pop3d; do
-		mv ${name} "courier-${name}" || \
-			die "failed to mv $name to 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/$(get_libdir)/courier-imap
-	local service
-	for service in imapd pop3d; do
-		local type
-		for type in "" "-ssl"; do
-			local file
-			file="${service}${type}.rc"
-			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
-			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file} || die "sed failed"
-		done
-	done
-
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl; do
-		mv -v ${D}/etc/courier-imap/${x}.dist \
-			${D}/etc/courier-imap/${x} || \
-			die "failed to mv ${x}.dist to ${x}"
-	done
-
-	#insinto /etc/courier-imap
-	#newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	cd ${D}/etc/courier-imap
-	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
-	for service in imapd-ssl pop3d-ssl imapd pop3d; do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
-	done
-	for service in imapd pop3d; do
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN=' >> ${service}
-		echo -e '#Put any program for ${LOGINRUN} here' >> ${service}
-		echo -e '#this is for relay-ctrl-allow in 4*' >> ${service}
-		echo 'LOGINRUN=' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *; do
-		if [[ -L ${x} ]]; then
-			rm -v ${x} || die "failed to rm ${x}"
-		fi
-	done
-
-	cd ../share
-	mv -v * ../sbin
-	mv -v ../sbin/man .
-	cd ..
-
-	for x in mkimapdcert mkpop3dcert; do
-		mv ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}.orig || \
-			die "failed to rm ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}"
-	done
-
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert || \
-			die "doexe failed"
-
-	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
-			die "dosym failed"
-
-	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
-	for initd in {imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${INITD_VER}-courier-${initd}.rc6 > \
-			courier-${initd} || die "libdir-sed failed"
-		doinitd courier-${initd} || die "doinitd courier-${initd} failed"
-	done
-	exeinto /usr/$(get_libdir)/courier-imap
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${RC_VER}-${exe} > \
-			${exe} || die "libdir-sed 2 failed"
-		doexe ${exe} || die "doexe ${exe} failed"
-	done
-
-	#local authmods
-	#authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	#use mysql && authmods="${authmods} authmysql"
-	#use postgres && authmods="${authmods} authpgsql"
-	#use pam && authmods="${authmods} authpam"
-	#use ldap && authmods="${authmods} authldap"
-	#[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	#exeinto /usr/lib/courier-imap/authlib
-	#for i in ${authmods}; do
-	#	[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i} || die "doexe failed"
-	#done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake || \
-		die "mv failed"
-
-	# bug #45953, more docs
-	cd ${S}
-	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} \
-		${FILESDIR}/courier-imap-gentoo.readme
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	einfo "Authdaemond is no longer provided this package."
-	einfo "athentication libraries are from courier-authlib"
-	einfo "for a quick start please refer to"
-	einfo "/usr/share/doc/${P}/courier-imap-gentoo.readme.gz"
-	# some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	chmod 755 ${ROOT}/usr/$(get_libdir)/courier-imap || die "Failed to ensure sane permissions"
-}
-
-src_test() {
-	ewarn "make check not supported by package due to"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
-}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch
deleted file mode 100644
index 776fdc144483..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.7-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.7-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-db4-configure.in.patch
deleted file mode 100644
index d8ac46e2b5c9..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.7-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.7-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-disable-fam-configure.in.patch
deleted file mode 100644
index 7019d02a6af5..000000000000
--- a/net-mail/courier-imap/files/courier-imap-3.0.7-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.6-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch
new file mode 100644
index 000000000000..14e9cda636ab
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch
@@ -0,0 +1,10 @@
+--- configure.in.orig	2006-12-30 09:28:52.000000000 -0500
++++ configure.in	2007-02-27 12:13:38.000000000 -0500
+@@ -16,7 +16,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
index b2c802c548bf..4f14d72db5a4 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
@@ -1,5 +1,5 @@
---- 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
+--- bdbobj/configure.in.orig	2001-09-18 18:26:28.000000000 -0700
++++ bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
 @@ -21,15 +21,23 @@
  dnl Checks for libraries.
  
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
index 8f6e40693a9f..03d2c03912a8 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
@@ -1,13 +1,5 @@
 --- 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 +149,22 @@
  
  if test "$db" != "gdbm"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
index 48ddd75c6b9c..e1460be25d09 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 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.6-r1-courier-imapd-ssl.rc6,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 
 depend() {
 	need net courier-authlib
@@ -11,16 +11,16 @@ depend() {
 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"
+	if [[ ! -e /etc/courier-imap/imapd-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd-ssl"
 		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"
+		eerror "Please correct them before trying to start courier-imapd-ssl"
 		return 3
 	}
-	if [ ! -e "${TLS_CERTFILE}" ] ; then
+	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
@@ -30,13 +30,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting courier-imapd over SSL"
-	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd-ssl.rc \
-		--pid=$SSLPIDFILE
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd-ssl.rc --pid=${SSLPIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping courier-imapd over SSL"
-	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
+	start-stop-daemon --quiet --stop --pid=${SSLPIDFILE}
 	eend $?
 }
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
index ec95f657f659..2367ae0a2e77 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
@@ -1,5 +1,3 @@
 #!/bin/bash
 XMAILDIR="$1"
-eval ${LOGINRUN} \
-	/usr/sbin/courier-imapd \
-	${XMAILDIR}
+eval ${LOGINRUN} /usr/sbin/courier-imapd "${XMAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
index ed5dab557940..f5433f2af6ca 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 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.6-r1-courier-imapd.rc6,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 
 depend() {
 	need net courier-authlib
@@ -11,13 +11,13 @@ depend() {
 source /etc/courier-imap/imapd
 
 checkconfig() {
-	if [ ! -e /etc/courier-imap/imapd ] ; then
+	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"
+		eerror "Please correct them before trying to start courier-imapd"
 		return 2
 	}
 }
@@ -25,13 +25,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting courier-imapd"
-	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd.rc \
-		--pid=$PIDFILE
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd.rc --pid=${PIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping courier-imapd"
-	start-stop-daemon --quiet --stop --pid=$PIDFILE
+	start-stop-daemon --quiet --stop --pid=${PIDFILE}
 	eend $?
 }
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
index 6dedabc29e09..014244692dfd 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 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.6-r1-courier-pop3d-ssl.rc6,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 
 depend() {
 	need net courier-authlib
@@ -11,16 +11,16 @@ depend() {
 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"
+	if [[ ! -e /etc/courier-imap/pop3d-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d-ssl"
 		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"
+		eerror "Please correct them before trying to start courier-pop3d-ssl"
 		return 3
 	}
-	if [ ! -e "${TLS_CERTFILE}" ] ; then
+	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
@@ -30,13 +30,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting courier-pop3d over SSL"
-	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d-ssl.rc \
-		--pidfile $SSLPIDFILE
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d-ssl.rc --pidfile ${SSLPIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping courier-pop3d over SSL"
-	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
+	start-stop-daemon --quiet --stop --pidfile ${SSLPIDFILE}
 	eend $?
 }
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
index c06fa09846de..4651a048ac8b 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
@@ -1,5 +1,3 @@
 #!/bin/bash
 XMAILDIR="$1"
-eval ${LOGINRUN} \
-	/usr/sbin/courier-pop3d \
-	${XMAILDIR}
+eval ${LOGINRUN} /usr/sbin/courier-pop3d "${XMAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
index 8f5aab096dc8..6eeb51c5b926 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 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.6-r1-courier-pop3d.rc6,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 
 depend() {
 	need net courier-authlib
@@ -11,13 +11,13 @@ depend() {
 source /etc/courier-imap/pop3d
 
 checkconfig() {
-	if [ ! -e /etc/courier-imap/pop3d ] ; then
+	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"
+		eerror "Please correct them before trying to start courier-pop3d"
 		return 2
 	}
 }
@@ -25,13 +25,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting courier-pop3d"
-	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d.rc \
-		--pidfile $PIDFILE
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d.rc --pidfile ${PIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping courier-pop3d"
-	start-stop-daemon --quiet --stop --pidfile $PIDFILE
+	start-stop-daemon --quiet --stop --pidfile ${PIDFILE}
 	eend $?
 }
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
index 9bbf2df7c374..1379b0df89e0 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -12,26 +12,21 @@ libexecdir=/usr/GENTOO_LIBDIR/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/GENTOO_LIBDIR/courier-imap/authlib/$f"
-#done
+ulimit -d ${IMAP_ULIMITD}
 
-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/GENTOO_LIBDIR/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/GENTOO_LIBDIR/courier-imap/courierlogger \
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
 	-stderrloggername=imapd-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/imaplogin \
-		/usr/GENTOO_LIBDIR/courier-imap/courier-imapd.indirect ${MAILDIR}
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
index ce1b89fb23a0..b40614ff8b8c 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.6-r1-gentoo-imapd.rc,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -12,27 +12,22 @@ libexecdir=/usr/GENTOO_LIBDIR/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/GENTOO_LIBDIR/courier-imap/authlib/$f"
-#done
+ulimit -d ${IMAP_ULIMITD}
 
-ulimit -d $IMAP_ULIMITD
-IMAP_STARTTLS="$IMAPDSTARTTLS"
+IMAP_STARTTLS="${IMAPDSTARTTLS}"
 export IMAPDSTARTTLS IMAP_STARTTLS
-TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+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/GENTOO_LIBDIR/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/GENTOO_LIBDIR/courier-imap/courierlogger \
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
 	-stderrloggername=imapd \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/imaplogin \
-		/usr/GENTOO_LIBDIR/courier-imap/courier-imapd.indirect ${MAILDIR}
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
index 86a639f7ed83..57d3515b77fc 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -12,25 +12,19 @@ libexecdir=/usr/GENTOO_LIBDIR/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/GENTOO_LIBDIR/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/GENTOO_LIBDIR/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/GENTOO_LIBDIR/courier-imap/courierlogger \
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
 	-stderrloggername=pop3d-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/pop3login \
-		/usr/GENTOO_LIBDIR/courier-imap/courier-pop3d.indirect ${MAILDIR}
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
index 9d566e0a4244..1a2b44dc6b09 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.6-r1-gentoo-pop3d.rc,v 1.1 2007/02/03 01:20:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -12,25 +12,20 @@ libexecdir=/usr/GENTOO_LIBDIR/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/GENTOO_LIBDIR/courier-imap/authlib/$f"
-#done
+POP3DSTARTTLS="${POP3_STARTTLS}"
+export POP3_STARTTLS POP3DSTARTTLS
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
 
-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/GENTOO_LIBDIR/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/GENTOO_LIBDIR/courier-imap/courierlogger \
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
 	-stderrloggername=pop3d \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/pop3login \
-		/usr/GENTOO_LIBDIR/courier-imap/courier-pop3d.indirect ${MAILDIR}
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch
deleted file mode 100644
index f8cb78adaf07..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- courier-imap-4.1.2.orig/configure.in	2006-12-30 09:28:52.000000000 -0500
-+++ courier-imap-4.1.2/configure.in	2007-02-27 12:13:38.000000000 -0500
-@@ -16,7 +16,6 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_SYSCONFTOOL
- AC_LIBTOOL_DLOPEN
- AM_PROG_LIBTOOL
- 
diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch
deleted file mode 100644
index 03d2c03912a8..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.in.orig	2004-11-16 16:02:11.045791896 -0800
-+++ configure.in	2004-11-16 16:03:06.743324584 -0800
-@@ -150,16 +149,22 @@
- 
- if test "$db" != "gdbm"
- then
-+  for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+		AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+			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_4004, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1)
-+  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/digest-courier-imap-3.0.7 b/net-mail/courier-imap/files/digest-courier-imap-3.0.7
deleted file mode 100644
index e2491a6ab5dd..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-3.0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3177f4451d02b6380c5b45aa80d795a7 courier-imap-3.0.7.tar.bz2 1702769
-RMD160 2fb2b2c5e4837459a9dba4b799b7bc8f4ecb080f courier-imap-3.0.7.tar.bz2 1702769
-SHA256 e730ef7127494df931b51087adeaa59062d2d6d7840fed6b1a88409c692cd024 courier-imap-3.0.7.tar.bz2 1702769
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r1 b/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r1
deleted file mode 100644
index 6bd62fdd18fb..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5e1c53a49d5ffb2ec9f3b600a6e1fbef courier-imap-4.0.6.tar.bz2 3157577
-RMD160 4006c5ec4db6b2adac393e2ebdf9ee99af3a8b2a courier-imap-4.0.6.tar.bz2 3157577
-SHA256 27e6847507ddecfab1672fdf52447f8351f4cf046145974768ea93ebfea6ddbb courier-imap-4.0.6.tar.bz2 3157577
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.0.6 b/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r2
index 6bd62fdd18fb..6bd62fdd18fb 100644
--- a/net-mail/courier-imap/files/digest-courier-imap-4.0.6
+++ b/net-mail/courier-imap/files/digest-courier-imap-4.0.6-r2
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.1.2 b/net-mail/courier-imap/files/digest-courier-imap-4.1.2-r1
index d2803af34fc5..d2803af34fc5 100644
--- a/net-mail/courier-imap/files/digest-courier-imap-4.1.2
+++ b/net-mail/courier-imap/files/digest-courier-imap-4.1.2-r1
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
index 89dcd746873c..b50b40c412de 100644
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>net-mail</herd>
-    <maintainer>
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 </pkgmetadata>