version bump

Package-Manager: portage-2.1_pre4-r1

4 files changed, 405 insertions, 13 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 52f038c4fbf6..983d670e547f 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,11 @@
 # 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.66 2005/12/25 16:48:47 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.67 2006/02/19 09:35:05 iggy Exp $
+
+  19 Feb 2006; Brian Jackson <iggy@gentoo.org> +courier-0.52.2.ebuild:
+  version bump
+
+*courier-0.52.2 (19 Feb 2006)
 
   25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   courier-0.50.1-r1.ebuild:
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 20957b44b12a..c5ee7325726d 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,38 +1,90 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b4547da4f293bbb8ed2d822354090c41 ChangeLog 21567
+MD5 d9a27e7db3b02347c84971ba92089f5d ChangeLog 21680
+RMD160 263dc8121c17ea2fcabcc32370a51d3e25b19869 ChangeLog 21680
+SHA256 a113808087c9e500ee352301092c3befeb34645a26c6c0442a281775565bc43f ChangeLog 21680
 MD5 684399cf97b724099222a88434701c6a courier-0.48.1-r1.ebuild 8956
+RMD160 c5b4df1d1163f01d2d857fb9442051b1065a9207 courier-0.48.1-r1.ebuild 8956
+SHA256 11fee985473b3b65a5df39dcc18c2b5e02c0781639da8d686a656ff7bb569d78 courier-0.48.1-r1.ebuild 8956
 MD5 8de8434ea05e6a76656ba7f1d08fecb5 courier-0.48.1.ebuild 8510
+RMD160 c98fae33327c4da7c3d25daddf9ddd65e12c1298 courier-0.48.1.ebuild 8510
+SHA256 281292692edffeee6d922fc0cbd9bc803afbb2b8d3e2d30b58a7ece20db44eef courier-0.48.1.ebuild 8510
 MD5 34312418fdc6c5037592fa0cb0bccf8c courier-0.48.2.20050224.ebuild 10500
+RMD160 c3fa0eb982e4f3bcf87d8f2227d75cd997986e97 courier-0.48.2.20050224.ebuild 10500
+SHA256 c4b2af1728ecd3cbea3eb3cf55f3db8ce4d607a7e9a2b3613d58af0d4554c36c courier-0.48.2.20050224.ebuild 10500
 MD5 52b9e1c79d37a4168e98834570a20839 courier-0.49.0.20050405.ebuild 10507
+RMD160 956064c8dbeb7e6e3748252da28c6d086db86ddc courier-0.49.0.20050405.ebuild 10507
+SHA256 745a466df55024d26de91f4463d676251bcc20fd556a1115ba4d34bbb3fea1ae courier-0.49.0.20050405.ebuild 10507
 MD5 113c9a1725a437cf9aea85f9fa662fda courier-0.49.0.ebuild 10498
+RMD160 04c97a6ec586966a00d97ea532bd69c044a37ef8 courier-0.49.0.ebuild 10498
+SHA256 8ca0931124aeb773c4f2862f04bd941cb139a581d12b04e0d016d964867fdc02 courier-0.49.0.ebuild 10498
 MD5 9e00ca77d50c701246cbeb7807cbede4 courier-0.50.0.ebuild 10501
+RMD160 b7d6fac5c05c2c42ac363a855c21a56e3adbd5d0 courier-0.50.0.ebuild 10501
+SHA256 2beef9eaaa385ccd10b052581da7b986031cb951518ed42e3b52b9243ef893a0 courier-0.50.0.ebuild 10501
 MD5 298ccc29911085afdcc1a468f65ef7ed courier-0.50.1-r1.ebuild 11563
+RMD160 a005c3dbff68bdee5372e7f97fce74c7921fba82 courier-0.50.1-r1.ebuild 11563
+SHA256 f5eac9b112d29a91de894dfdaf7a08a3ae672a47a6c9bcbd363f5e97c9aadbe1 courier-0.50.1-r1.ebuild 11563
 MD5 e43ff2b2b410fe1cab3ba04c3bc19dfe courier-0.50.1.ebuild 11199
+RMD160 74b828915f9b296ab2d014afd0dc161b3ee9d2ae courier-0.50.1.ebuild 11199
+SHA256 b3096567bff557ab8b47215794de509f82b2d73fa33e9e5ad9387adfefd850e0 courier-0.50.1.ebuild 11199
+MD5 5c88941b82db980a7b0cda488a56051b courier-0.52.2.ebuild 11475
+RMD160 76dbf0b22f75eb2bcca0d490392951dac6c5e861 courier-0.52.2.ebuild 11475
+SHA256 08f2b3dfeb44c6f9b65ca60913f0675e6f221f8f282801f3e9e05b2962c6d366 courier-0.52.2.ebuild 11475
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
+RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 files/apache-sqwebmail.inc 347
+SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65 files/apache-sqwebmail.inc 347
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
+RMD160 995b6b103c29f390c2f0230af95d4c0823423dcb files/bofh 23
+SHA256 7e42d61373770a2b14a6fdd8b5f71c598ce4767726f8f7106de00b7c34a59e8c files/bofh 23
 MD5 810650e3b52f7d93e59fd987e235381e files/courier-0.48.1-spf-error-handling.patch 318
+RMD160 3051e323b9564e9e31d9593ef2a1afb76ed45a3f files/courier-0.48.1-spf-error-handling.patch 318
+SHA256 f6f706470cab4bffb45f6ef196799a1c596e8abf5cbef1b5e3d22287c990298b files/courier-0.48.1-spf-error-handling.patch 318
 MD5 9d570961b398a1a8e3724947c7205943 files/courier-init 5182
+RMD160 7c5d80d7fdd4e09418461a746f6642f2a276b88b files/courier-init 5182
+SHA256 4b1a030bbba852c9c2c8d50e58c43c8e97b5a1ac29a04974a1f097362929e126 files/courier-init 5182
 MD5 6f47a6ec3b49ab38118513207c008eac files/digest-courier-0.48.1 68
+RMD160 56a487aa6c946223d5e617c3d412f65aa179e730 files/digest-courier-0.48.1 68
+SHA256 04fa076db39519915ec5e7c15efe4482ceb4c16497884aa9608ad95c9e960a65 files/digest-courier-0.48.1 68
 MD5 6f47a6ec3b49ab38118513207c008eac files/digest-courier-0.48.1-r1 68
+RMD160 56a487aa6c946223d5e617c3d412f65aa179e730 files/digest-courier-0.48.1-r1 68
+SHA256 04fa076db39519915ec5e7c15efe4482ceb4c16497884aa9608ad95c9e960a65 files/digest-courier-0.48.1-r1 68
 MD5 cc4c7fbf5c664bea35e209920137bf7a files/digest-courier-0.48.2.20050224 77
+RMD160 8f71daccadce65907a2863363758fe815bf80730 files/digest-courier-0.48.2.20050224 77
+SHA256 05f68e73935f9284625e7fa9294dc153b64e2eb3592f6c2082e9889459a2441d files/digest-courier-0.48.2.20050224 77
 MD5 9d17c84c8f8fbd96f3f51f81336a3ef6 files/digest-courier-0.49.0 68
+RMD160 3cb9d960fd9b1fde6751771cb1c4a1fd8160380b files/digest-courier-0.49.0 68
+SHA256 684c428c27998e57ccae6f8323c4691198214fa5a55a596a8685d2bce495979f files/digest-courier-0.49.0 68
 MD5 80dd58e050ca3d9071ddaf741857cf5a files/digest-courier-0.49.0.20050405 77
+RMD160 b098e72169bcbc509c73f7de644516e454a90e75 files/digest-courier-0.49.0.20050405 77
+SHA256 4aad06872f6e8d8c08cad328d4ed1ff891add72d0573d024fb9b3605a7458919 files/digest-courier-0.49.0.20050405 77
 MD5 35a514d415bc8ddd679970634a95d435 files/digest-courier-0.50.0 68
+RMD160 6cacf3ace57f3d8a01dcb7a6cdb03fee03e5b482 files/digest-courier-0.50.0 68
+SHA256 9825444219b0b5ace2957f8122bd8d03a017f5fcfa8b0eb7159a52dfeba086c5 files/digest-courier-0.50.0 68
 MD5 b8da99ca8d9720c84f1f4dcd3921f93f files/digest-courier-0.50.1 68
+RMD160 a718f31a205510a5ceaf4e4a975fc15769d3ed1f files/digest-courier-0.50.1 68
+SHA256 0fb1a49547bb139f3f76fe52bde37ffa6647abf9dc06fd89a3a12671c4402fd2 files/digest-courier-0.50.1 68
 MD5 b8da99ca8d9720c84f1f4dcd3921f93f files/digest-courier-0.50.1-r1 68
+RMD160 a718f31a205510a5ceaf4e4a975fc15769d3ed1f files/digest-courier-0.50.1-r1 68
+SHA256 0fb1a49547bb139f3f76fe52bde37ffa6647abf9dc06fd89a3a12671c4402fd2 files/digest-courier-0.50.1-r1 68
+MD5 d4cd73d5c2900a594128931e71bd70f2 files/digest-courier-0.52.2 250
+RMD160 5dfe41191c81bca3e7ddaa9cfca8c74c0e68313b files/digest-courier-0.52.2 250
+SHA256 573391f6b56d6110c9657041b69ef686dc5463e1a3f312442855c5230c606540 files/digest-courier-0.52.2 250
 MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
+RMD160 cf20012379abbb63f78e1eb0f9cbaefff6d1048d files/dot_courier 26
+SHA256 8c585031b4356ca1f887e0823fd9b365fff57a5f9cc32541eccfc1542d5d3763 files/dot_courier 26
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/locallowercase 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/locallowercase 0
 MD5 9bd0825e1ea931d82349ec13d74df657 files/mailer.conf 199
+RMD160 2f5cd1e2e983d32dd78d59ef4e359b9c9f4933f3 files/mailer.conf 199
+SHA256 a80ff48cf867d4a0cad3a6e2e33299375dc31f2033edaaaff0f87ee7c52edb2a files/mailer.conf 199
 MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489
+RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 files/norewrite.patch 489
+SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4 files/norewrite.patch 489
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
+RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 files/password.dist 247
+SHA256 4df4f7cb3c33ded8a19093ea10fd204a1af859e4919f10affcc419a2352e2f4c files/password.dist 247
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
+RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad files/set-mime 741
+SHA256 bf15af7c181d517a924cb82854cbce46278e6e28ffb338e2159ba89c386dc74f files/set-mime 741
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrs18AiZjviIA2XgRAru3AJ9drHwm7eQu33Nsa78FgJ+2EU55LwCfbonQ
-rh8ugGLkGMGzsQfvs8dDfQc=
-=xCgF
------END PGP SIGNATURE-----
+RMD160 a5f3cd47c53ec2ae720e7e64edd0901125ff4ffc metadata.xml 392
+SHA256 3be70bc6ad3e8e0a58245206224523d8c97e9f0049423b057614c01c77bd36a5 metadata.xml 392
diff --git a/mail-mta/courier/courier-0.52.2.ebuild b/mail-mta/courier/courier-0.52.2.ebuild
new file mode 100644
index 000000000000..1f537ce09164
--- /dev/null
+++ b/mail-mta/courier/courier-0.52.2.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.52.2.ebuild,v 1.1 2006/02/19 09:35:05 iggy Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+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 mailwrapper fam"
+
+PROVIDE="virtual/mta
+	 virtual/mda
+	 virtual/imapd"
+
+DEPEND="virtual/libc
+	>=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 )
+	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
+	!mail-filter/maildrop"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+filter-flags '-fomit-frame-pointer'
+
+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 elibc_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 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
+	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
+	keepdir /var/run/courier
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	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
+
+	cd ${D}/etc/courier
+	insinto /etc/courier
+	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
+
+	if use pam ; then
+		dodir /etc/pam.d
+		rm imapd.authpam pop3d.authpam
+		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
+	fi
+
+	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
+	[ -e ldapaliasrc ] &&  ( chown root:0 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-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
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	rm ${D}/usr/sbin/{pop3d,imapd}{,-ssl}
+	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
+	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	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
+		mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier
+		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier
+
+		mv ${D}/usr/share/man/man1/sendmail.1 \
+			${D}/usr/share/man/man1/sendmail-courier.1
+		mv ${D}/usr/share/man/man1/mailq.1 \
+			${D}/usr/share/man/man1/mailq-courier.1
+		mv ${D}/usr/share/man/man1/rmail.1 \
+			${D}/usr/share/man/man1/rmail-courier.1
+
+		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"
+
+	# fix for bug #99334
+	einfo "Courier's sendmail is not suid by default, therefore non-root users can't send"
+	einfo "mail using sendmail. If you need this to work, you should set sendmail suid."
+	einfo "See also: http://www.courier-mta.org/install.html#suid"
+}
+
+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/files/digest-courier-0.52.2 b/mail-mta/courier/files/digest-courier-0.52.2
new file mode 100644
index 000000000000..b75a77b9283c
--- /dev/null
+++ b/mail-mta/courier/files/digest-courier-0.52.2
@@ -0,0 +1,3 @@
+MD5 73cda41adc5425ade94e1f9005b2218b courier-0.52.2.tar.bz2 6611624
+RMD160 38e59a845ba30034d03a7472d04a1b62a0e9cf9b courier-0.52.2.tar.bz2 6611624
+SHA256 7b717f22c9fe49e0042874d5615bdd7d4adc32659d0818eb7686de3004229beb courier-0.52.2.tar.bz2 6611624