fix previous keepdir fix

(Portage version: 2.0.51.19)

10 files changed, 56 insertions, 345 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index d7e70f5e7bc1..6eaa2b925ac9 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.51 2005/03/03 17:15:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.52 2005/03/04 11:48:50 swtaylor Exp $
+
+*courier-0.49.0 (04 Mar 2005)
+
+  04 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-0.48.2.20050215.ebuild, courier-0.48.2.20050224.ebuild,
+  courier-0.48.2.ebuild, +courier-0.49.0.ebuild:
+  bump to 0.49.0 keepdir had been executed on too many directories, collided
+  with baselayout. readded more sane keepdir calls, fixes bug 82286
 
   03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> courier-0.47-r1.ebuild,
   courier-0.48.1.ebuild, courier-0.48.2.20050130.ebuild,
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 8447e2ccb2b9..2bcb3a49355b 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,34 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 99ab1188140f15f405ed8e9019bb4b03 courier-0.48.2.20050224.ebuild 10444
+MD5 43f5fe7f6eb8ceef41a6a2f716d32f4f courier-0.48.2.20050215.ebuild 9867
+MD5 8398be6f6eee26293f731c5dca376feb courier-0.48.2.ebuild 8868
+MD5 784f698b39f97d686c90948a1d941353 courier-0.49.0.ebuild 10451
+MD5 460bfe6d73bf32bb236921374781109f courier-0.48.2.20050203.ebuild 9736
 MD5 449cf82fbc27d010b68b2609c5449c94 courier-0.48.1.ebuild 8513
 MD5 52f0aa89a31232120c71ca01e2590570 ChangeLog 18835
-MD5 db6b2f6bedcc7deeec402750e95bbab1 courier-0.47-r1.ebuild 10996
-MD5 460bfe6d73bf32bb236921374781109f courier-0.48.2.20050203.ebuild 9736
-MD5 6a8f5a55940a30977f2b1e8b9793d4ad courier-0.48.2.ebuild 8860
-MD5 528158dc22113898ce0879fbbff13108 courier-0.48.2.20050130.ebuild 9736
-MD5 7df84e34a51862cce31cd074ae3b878c courier-0.48.2.20050215.ebuild 9736
-MD5 21b2c78b3690fe3e5c9ddbf1da256913 courier-0.48.2.20050224.ebuild 10593
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
-MD5 60af69963b0764d6358700c5b6399170 files/courier-init 5084
+MD5 528158dc22113898ce0879fbbff13108 courier-0.48.2.20050130.ebuild 9736
+MD5 db6b2f6bedcc7deeec402750e95bbab1 courier-0.47-r1.ebuild 10996
+MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
+MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
 MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489
-MD5 cc4c7fbf5c664bea35e209920137bf7a files/digest-courier-0.48.2.20050224 77
 MD5 df2fdddfd4f8d7b2569cdbca5b771bbf files/digest-courier-0.48.2.20050130 77
-MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
-MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 0609d3d712a95ae2ea13d87646617918 files/digest-courier-0.48.2.20050203 77
-MD5 9ef0f345ddfd8e819cabc4327f509a66 files/digest-courier-0.48.2 68
-MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 94ad6ac6dbe11ffe50a6f8a464e8fa9a files/digest-courier-0.48.2.20050215 77
-MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
-MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
+MD5 cc4c7fbf5c664bea35e209920137bf7a files/digest-courier-0.48.2.20050224 77
+MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
 MD5 6f47a6ec3b49ab38118513207c008eac files/digest-courier-0.48.1 68
+MD5 9ef0f345ddfd8e819cabc4327f509a66 files/digest-courier-0.48.2 68
+MD5 9d17c84c8f8fbd96f3f51f81336a3ef6 files/digest-courier-0.49.0 68
+MD5 60af69963b0764d6358700c5b6399170 files/courier-init 5084
+MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
 MD5 8396693e821bf04e8382d047cc740b5e files/digest-courier-0.47-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCJ0YTLLFUmVNQ7rkRApCNAJ0eLCLU9Z6PbvHrriTbbZoqSKy/2ACfYCeq
-jUMCcOw069aqop4DE33RKe0=
-=TElM
------END PGP SIGNATURE-----
+MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
diff --git a/mail-mta/courier/courier-0.48.2.20050203.ebuild b/mail-mta/courier/courier-0.48.2.20050203.ebuild
deleted file mode 100644
index ae6129225d2d..000000000000
--- a/mail-mta/courier/courier-0.48.2.20050203.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050203.ebuild,v 1.2 2005/03/03 17:15:06 ciaranm Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	net-libs/courier-authlib
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		einfo "courier-imap will fall back to 60 second polls."
-		einfo 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	use fam || (
-		epatch ${FILESDIR}/fam-disable-check.patch
-		export WANT_AUTOCONF="2.5"
-		gnuconfig_update
-		cd ${S}/maildir
-		libtoolize --copy --force
-		ebegin "Recreating maildir without fam"
-		autoconf ||  die "recreate maildir failed"
-		eend $?
-		myconf="${myconf} --without-fam"
-	)
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file=${S}/configuring.cache \
-		--host=${CHOST} ${myconf} debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'${D}'|g\" -i permissions.dat' -i Makefile
-	emake || die "Compile problem"
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && einfo "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			einfo "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	dodir /etc/pam.d
-
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	dodir /var/lib/courier
-	dodir /var/run/courier
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	mv imapd.authpam imap.authpam ; mv pop3d.authpam pop3.authpam
-	for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:root ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> ${D}/etc/courier/sizelimit
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-SHA1 CRAM-MD5"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-SHA1 CRAM-MD5"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-SHA1 CRAM-MD5" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-SHA1 CRAM-MD5" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	cd ${S}
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc tcpd/README.couriertls
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd ${D}/usr/sbin
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
-	sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-		-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-		${D}/usr/share/courier/courierwebadmin/admin-40imap.pl \
-		|| ewarn "failed to fix webadmin"
-	sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-		-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-		${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl \
-		|| ewarn "failed to fix webadmin"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		rm ${D}/usr/bin/rmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-pkg_postinst() {
-	use fam && einfo "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost=`hostname`
-	export mailhost
-
-	domainname=`domainname`
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
-	fi
-	export domainname
-
-
-	if [ ${ROOT} = "/" ] ; then
-		file=${ROOT}/etc/courier/locals
-		if [ ! -f ${file} ] ; then
-			echo "localhost" > ${file};
-			echo ${domainname} >> ${file};
-		fi
-		file=${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}
-		if [ ! -f ${file} ] ; then
-			echo ${domainname} > ${file}
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file=${ROOT}/etc/courier/smtpaccess/${domainname}
-		if [ ! -f ${file} ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS=${IFS}
-				IFS="."
-				for o in ${netmask}
-				do
-					if [ ${o} == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t=`echo ${network} | cut -d " " -f ${i}`
-						net="${net}${t}"
-					fi
-					i=$((${i} + 1))
-				done
-				IFS=${TIFS}
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.48.2.20050215.ebuild b/mail-mta/courier/courier-0.48.2.20050215.ebuild
index 523cc0ce3f17..ad4e112b558a 100644
--- a/mail-mta/courier/courier-0.48.2.20050215.ebuild
+++ b/mail-mta/courier/courier-0.48.2.20050215.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050215.ebuild,v 1.2 2005/03/03 17:15:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050215.ebuild,v 1.3 2005/03/04 11:48:50 swtaylor Exp $
 
 inherit eutils gnuconfig
 
@@ -145,11 +145,14 @@ src_install() {
 	keepdir /etc/skel/.maildir
 
 	diropts -o mail -g mail
-	dodir /var/lib/courier
-	dodir /var/run/courier
+	keepdir /var/run/courier
 	make install DESTDIR=${D} || die "install"
 	make install-configure || die "install-configure"
 
+	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
+		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
+	done
+
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/courier-init courier
 	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
diff --git a/mail-mta/courier/courier-0.48.2.20050224.ebuild b/mail-mta/courier/courier-0.48.2.20050224.ebuild
index eaa3fc6a946d..7f92fafca6ae 100644
--- a/mail-mta/courier/courier-0.48.2.20050224.ebuild
+++ b/mail-mta/courier/courier-0.48.2.20050224.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050224.ebuild,v 1.2 2005/03/03 17:15:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050224.ebuild,v 1.3 2005/03/04 11:48:50 swtaylor Exp $
 
 inherit eutils gnuconfig
 
@@ -146,17 +146,13 @@ src_install() {
 
 	diropts -o mail -g mail
 	keepdir /var/run/courier
-	dodir /var/lib/courier
-	keepdir /var/lib/courier/track
-	keepdir /var/lib/courier/faxtmp
-	keepdir /var/lib/courier/allfilters
-	keepdir /var/lib/courier/webmail-logincache
-	keepdir /var/lib/courier/calendar/public
-	keepdir /var/lib/courier/calendar/private
-	keepdir /var/lib/courier/calendar/localcache
 	make install DESTDIR=${D} || die "install"
 	make install-configure || die "install-configure"
 
+	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
+		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
+	done
+
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/courier-init courier
 	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
diff --git a/mail-mta/courier/courier-0.48.2.ebuild b/mail-mta/courier/courier-0.48.2.ebuild
index a6b704dbb285..102a42bd526f 100644
--- a/mail-mta/courier/courier-0.48.2.ebuild
+++ b/mail-mta/courier/courier-0.48.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.ebuild,v 1.2 2005/03/03 17:15:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.ebuild,v 1.3 2005/03/04 11:48:50 swtaylor Exp $
 
 inherit eutils
 
@@ -117,12 +117,12 @@ set_maildir() {
 src_install() {
 	local f
 	dodir /etc/pam.d
-	dodir /var/lib/courier
+	diropts -o mail -g mail
 	dodir /var/run/courier
 	make install DESTDIR=${D} || die "install"
 	make install-configure || die "install-configure"
-	diropts -o mail -g mail
-	for dir2keep in `(cd ${D} && find . -type d)` ; do
+
+	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
 		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
 	done
 
diff --git a/mail-mta/courier/courier-0.48.2.20050130.ebuild b/mail-mta/courier/courier-0.49.0.ebuild
index 1b5d2c5ec65b..59057813d419 100644
--- a/mail-mta/courier/courier-0.48.2.20050130.ebuild
+++ b/mail-mta/courier/courier-0.49.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050130.ebuild,v 1.4 2005/03/03 17:15:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.49.0.ebuild,v 1.1 2005/03/04 11:48:50 swtaylor Exp $
 
 inherit eutils gnuconfig
 
@@ -22,7 +22,7 @@ PROVIDE="virtual/mta
 	 virtual/imapd"
 
 DEPEND="virtual/libc
-	net-libs/courier-authlib
+	>=net-libs/courier-authlib-0.55
 	>=dev-libs/openssl-0.9.6
 	>=sys-libs/gdbm-1.8.0
 	|| ( app-misc/mime-types net-www/apache )
@@ -145,11 +145,14 @@ src_install() {
 	keepdir /etc/skel/.maildir
 
 	diropts -o mail -g mail
-	dodir /var/lib/courier
-	dodir /var/run/courier
+	keepdir /var/run/courier
 	make install DESTDIR=${D} || die "install"
 	make install-configure || die "install-configure"
 
+	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
+		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
+	done
+
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/courier-init courier
 	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
@@ -180,17 +183,21 @@ src_install() {
 	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
 	etc_courier esmtpd-msa "BOFHBADMIME=accept"
 	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-SHA1 CRAM-MD5"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-SHA1 CRAM-MD5"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-SHA1 CRAM-MD5" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-SHA1 CRAM-MD5" ESMTPAUTHINFOTLS
+	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
+	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
 	etc_courier_chg esmtpd-msa ESMTPDSTART YES
 	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
 	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
 	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
 	etc_courier_chg imapd IMAPDSTART YES
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
 	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
 	etc_courier_chg pop3d POP3DSTART YES
+	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
 	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
 
 	cd ${S}
diff --git a/mail-mta/courier/files/digest-courier-0.48.2.20050130 b/mail-mta/courier/files/digest-courier-0.48.2.20050130
deleted file mode 100644
index b8cdc2de7889..000000000000
--- a/mail-mta/courier/files/digest-courier-0.48.2.20050130
+++ /dev/null
@@ -1 +0,0 @@
-MD5 22d448133e483cc50fb48fe46b2aacf5 courier-0.48.2.20050130.tar.bz2 5884181
diff --git a/mail-mta/courier/files/digest-courier-0.48.2.20050203 b/mail-mta/courier/files/digest-courier-0.48.2.20050203
deleted file mode 100644
index 3fbd7163f9dc..000000000000
--- a/mail-mta/courier/files/digest-courier-0.48.2.20050203
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2086be6a128609f9c70b53d77dd4e3b courier-0.48.2.20050203.tar.bz2 5883716
diff --git a/mail-mta/courier/files/digest-courier-0.49.0 b/mail-mta/courier/files/digest-courier-0.49.0
new file mode 100644
index 000000000000..e7b6020865cd
--- /dev/null
+++ b/mail-mta/courier/files/digest-courier-0.49.0
@@ -0,0 +1 @@
+MD5 2c0f3d3d2eab405aaf633d9e17363bae courier-0.49.0.tar.bz2 5884664