Make eautoreconf recursive again, fixes libtool issue in bug #293971. Also drop some versions

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

8 files changed, 11 insertions, 1626 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index c58cc645e6e0..98b810866560 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.180 2009/11/08 17:04:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.181 2009/11/23 10:26:14 voyageur Exp $
+
+  23 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -courier-imap-3.0.8.ebuild, -courier-imap-4.0.6-r2.ebuild,
+  -courier-imap-4.1.2-r1.ebuild, -courier-imap-4.1.2-r2.ebuild,
+  -courier-imap-4.4.1.ebuild, -courier-imap-4.4.1-r1.ebuild,
+  courier-imap-4.6.0.ebuild:
+  Make eautoreconf recursive again, fixes libtool issue in bug #293971. Also
+  drop some versions
 
   08 Nov 2009; Raúl Porcel <armin76@gentoo.org> courier-imap-4.5.0.ebuild:
   ia64/s390/sparc stable wrt #287933
diff --git a/net-mail/courier-imap/courier-imap-3.0.8.ebuild b/net-mail/courier-imap/courier-imap-3.0.8.ebuild
deleted file mode 100644
index afc8e46f504d..000000000000
--- a/net-mail/courier-imap/courier-imap-3.0.8.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.8.ebuild,v 1.29 2009/09/23 19:05:02 patrick 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="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86"
-IUSE="fam berkdb gdbm debug ipv6 ldap mysql nls pam postgres selinux"
-#userpriv breaks linking against vpopmail
-RESTRICT="userpriv"
-
-RDEPEND=">=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? ( virtual/postgresql-base )
-	>=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
-	!mail-mta/courier"
-RDEPEND="${RDEPEND}
-	!virtual/imapd"
-
-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
-	elog "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	elog "you would like to use something other than the"
-	elog "authdaemond.plain authenticator"
-}
-
-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
deleted file mode 100644
index 98a07d86bbc1..000000000000
--- a/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2009 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.13 2009/07/11 16:50:42 tove 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 )"
-RDEPEND="${RDEPEND}
-		!virtual/imapd"
-
-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() {
-	elog "Authdaemond is no longer provided by this package."
-	elog "Authentication libraries are now in courier-authlib."
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
-	# 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-r1.ebuild b/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild
deleted file mode 100644
index 5ddeb029f79f..000000000000
--- a/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2009 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.4 2009/07/11 16:50:42 tove 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 )"
-RDEPEND="${RDEPEND}
-		!virtual/imapd"
-
-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() {
-	elog "Authdaemond is no longer provided by this package."
-	elog "Authentication libraries are now in courier-authlib."
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
-	# 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-r2.ebuild b/net-mail/courier-imap/courier-imap-4.1.2-r2.ebuild
deleted file mode 100644
index f9630ed28319..000000000000
--- a/net-mail/courier-imap/courier-imap-4.1.2-r2.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2009 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-r2.ebuild,v 1.2 2009/07/11 16:50:42 tove 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 )"
-RDEPEND="${RDEPEND}
-		!virtual/imapd"
-
-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() {
-	elog "Authdaemond is no longer provided by this package."
-	elog "Authentication libraries are now in courier-authlib."
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
-	# 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.4.1-r1.ebuild b/net-mail/courier-imap/courier-imap-4.4.1-r1.ebuild
deleted file mode 100644
index 865daa7d4ae9..000000000000
--- a/net-mail/courier-imap/courier-imap-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2009 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.4.1-r1.ebuild,v 1.2 2009/07/11 16:50:42 tove Exp $
-
-inherit autotools eutils multilib libtool
-
-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-3"
-SLOT="0"
-IUSE="berkdb debug fam gdbm ipv6 nls selinux gnutls"
-
-# userpriv breaks linking against vpopmail
-RESTRICT="userpriv"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6 )
-		>=net-libs/courier-authlib-0.61
-		>=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 )"
-RDEPEND="${RDEPEND}
-		!virtual/imapd"
-
-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
-
-	# 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-configure.in.patch
-	fi
-
-	ebegin "Recreating configure"
-	eautoreconf || die "eautoreconf 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) \
-		$(use_with gnutls) \
-		${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() {
-	elog "Authdaemond is no longer provided by this package."
-	elog "Authentication libraries are now in courier-authlib."
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
-	# 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.4.1.ebuild b/net-mail/courier-imap/courier-imap-4.4.1.ebuild
deleted file mode 100644
index a2de57bb179e..000000000000
--- a/net-mail/courier-imap/courier-imap-4.4.1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2009 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.4.1.ebuild,v 1.2 2009/07/11 16:50:42 tove Exp $
-
-inherit autotools eutils multilib libtool
-
-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-3"
-SLOT="0"
-IUSE="berkdb debug fam gdbm ipv6 nls selinux gnutls"
-
-# userpriv breaks linking against vpopmail
-RESTRICT="userpriv"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6 )
-		>=net-libs/courier-authlib-0.61
-		>=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 )"
-RDEPEND="${RDEPEND}
-		!virtual/imapd"
-
-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
-
-	# 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-configure.in.patch
-	fi
-
-	ebegin "Recreating configure"
-	eautoreconf || die "eautoreconf 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) \
-		$(use_with gnutls) \
-		${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() {
-	elog "Authdaemond is no longer provided by this package."
-	elog "Authentication libraries are now in courier-authlib."
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
-	# 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.6.0.ebuild b/net-mail/courier-imap/courier-imap-4.6.0.ebuild
index 7ce71542c873..c7dfa1c7cce5 100644
--- a/net-mail/courier-imap/courier-imap-4.6.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.6.0.ebuild,v 1.1 2009/10/06 21:38:40 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.6.0.ebuild,v 1.2 2009/11/23 10:26:14 voyageur Exp $
 
 EAPI=2
 inherit autotools eutils multilib libtool
@@ -61,11 +61,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch
 	fi
 
-	AT_NO_RECURSIVE="true" eautoreconf || die "root eautoreconf failed"
-	cd "${S}"/maildir
-	eautoreconf || die "maildir eautoreconf failed"
-	cd "${S}"/bdbobj
-	eautoreconf || die "bdobj eautoreconf failed"
+	eautoreconf || die "eautoreconf failed"
 }
 
 src_configure() {