tidy, mailbase collision, strip bad cflags

Package-Manager: portage-2.0.51.19

10 files changed, 33 insertions, 969 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 6eaa2b925ac9..d7efac2f6e06 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.52 2005/03/04 11:48:50 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.53 2005/03/21 11:14:15 swtaylor Exp $
+
+  21 Mar 2005; Scott W Taylor <swtaylor@gentoo.org> -courier-0.47-r1.ebuild,
+  -courier-0.48.2.ebuild, -courier-0.48.2.20050215.ebuild,
+  courier-0.48.2.20050224.ebuild, courier-0.49.0.ebuild:
+  tidy up due to collision with mailbase. strip bad cflags
 
 *courier-0.49.0 (04 Mar 2005)
 
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index d7e5c98e346b..ca197deef2dd 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,22 +1,16 @@
-MD5 8d1b64c85bb30a56190db9c8f7e3c487 courier-0.48.2.20050224.ebuild 10430
-MD5 85632906608fa24ef43c819bf690cd79 courier-0.48.2.20050215.ebuild 9853
-MD5 7d94ab798849d4d85d5717c37d932a67 courier-0.48.2.ebuild 8854
-MD5 d49b6d835d0863e16a3007a5eb471a4f courier-0.49.0.ebuild 10428
+MD5 5bfcb0b0986b991747d8eb0f09cc6fb5 courier-0.48.2.20050224.ebuild 10504
+MD5 a45a917f08f4bb667cd419c3179b234d courier-0.49.0.ebuild 10502
 MD5 449cf82fbc27d010b68b2609c5449c94 courier-0.48.1.ebuild 8513
-MD5 fab3a8cae787c4dd8d1240c583c0e8d5 ChangeLog 19180
+MD5 9f9d8d3b48b7e8103be36ba0e65acf75 ChangeLog 19433
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
-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 94ad6ac6dbe11ffe50a6f8a464e8fa9a files/digest-courier-0.48.2.20050215 77
 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
 MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
diff --git a/mail-mta/courier/courier-0.47-r1.ebuild b/mail-mta/courier/courier-0.47-r1.ebuild
deleted file mode 100644
index 6d63291ef3c3..000000000000
--- a/mail-mta/courier/courier-0.47-r1.ebuild
+++ /dev/null
@@ -1,378 +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.47-r1.ebuild,v 1.7 2005/03/03 17:15:06 ciaranm Exp $
-
-inherit eutils
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 alpha ppc sparc amd64 ~mips"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	>=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 )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	virtual/fam
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	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
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use postgres || myconf="${myconf} --without-authpostgresql"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-	use spell \
-		&& myconf="${myconf} --with-ispell" \
-		|| myconf="${myconf} --without-ispell"
-
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
-		myconf="${myconf} --with-authvchkpw"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
-	#    enable the specified unicode sets
-	# 2. If nls is enabled and no unicode sets are specified,
-	#    enable them all
-	# 3. If nls is disabled, disable unicode sets
-	#
-	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	[ -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"
-
-	myconf="${myconf} debug=true"
-
-	./configure \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/lib/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 \
-		--disable-autorenamesent \
-		--with-db=gdbm \
-		--enable-workarounds-for-imap-client-bugs \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "Compile problem"
-}
-
-chg_cfg() {
-	file=${1}
-	key=${2}
-	value=${3}
-
-	echo "changing ${file}: ${key} to ${value}"
-	sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
-	rm -f ${f}.tmp 1>/dev/null 2>&1
-}
-
-set_mime() {
-	local files=$*
-
-	chk_badmime='##NAME: BOFHBADMIME:0'
-	pos_badmime='##NAME: NOADDMSGID:0'
-	ins_badmime='\
-##NAME: BOFHBADMIME:0\
-#\
-# set BOFHBADMIME\
-#   to \"reject\" to return mail with invalid MIME header\
-#   to \"wrap\" to wrap mail with invalid MIME header in an attachmant\
-#   to \"accept\" to pass mail with invalid MIME header untouched\
-\
-BOFHBADMIME=accept\
-'
-
-	local f
-	for f in ${files}
-	do
-		if ! grep -q "${chk_badmime}" ${f}
-		then
-			echo "adding parameter ${chk_badmime} to ${f}"
-			sed -e"/${pos_badmime}/ i ${ins_badmime}" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-			rm -f ${f}.tmp 1>/dev/null 2>&1
-		fi
-	done
-}
-
-set_maildir() {
-	local files=$*
-
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-
-	local f
-	for f in ${files}
-	do
-		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-		rm -f ${f}.tmp 1> /dev/null 2>&1
-	done
-}
-
-set_dollarmaildir() {
-	local files=$*
-
-	origmaildir='Maildir'
-	newmaildir='$MAILDIRPATH'
-
-	local f
-	for f in ${files}
-	do
-		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-		rm -f ${f}.tmp 1> /dev/null 2>&1
-	done
-}
-
-src_install() {
-	dodir /var/lib/courier
-	dodir /etc/pam.d
-	make install DESTDIR=${D} || die
-	# fix bug #15873 bad owner on /var/run/courier
-	mkdir -p ${D}/var/run/courier
-	diropts -o mail -g mail
-	for dir2keep in `(cd ${D} && find . -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	local f
-	cd ${D}/etc/courier
-	mv imapd.authpam imap.authpam
-	mv pop3d.authpam pop3.authpam
-	for f in *.authpam
-	do
-		cp "${f}" "${D}/etc/pam.d/${f%%.authpam}"
-	done
-
-	exeinto /etc/init.d
-	# we install the new single init script as courier
-	newexe ${FILESDIR}/courier-init courier
-	# and install the old main init script as courier-old if the old one
-	# is installed which it will be now, but for the future...
-	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
-		newexe ${FILESDIR}/courier courier-old
-	# the rest of them don't need to be installed
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	keepdir /etc/skel
-	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-	keepdir /var/spool/mail
-	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-	keepdir /var/spool/mail/.maildir
-	insinto /etc/courier
-	newins ${FILESDIR}/bofh bofh
-	newins ${FILESDIR}/locallowercase locallowercase
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	echo 0 > ${D}/etc/courier/sizelimit
-
-	cd ${S}
-	dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
-	dodoc authlib/README.authmysql.myownquery authlib/README.ldap courier/doc/*.txt
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>>${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/lib/courier/courier
-	insopts -m  755 -o mail -g mail
-	doins ${S}/courier/webmaild
-
-	# See bug #10574
-	# file which describes the webadmin password file
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# fixes bug #25028 courier doesn't symlink sendmail to /usr/sbin
-	# and 73486 for mailwrapper support
-	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
-
-	echo "MAILDIR=\$HOME/.maildir" >> ${D}/etc/courier/courierd
-
-	# we change the names of the binaries, but webadmin is still looking
-	# for the old names
-	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"
-
-	# avoid name collisions in /usr/sbin
-	local y
-	cd ${D}/usr/share/courier
-	set_dollarmaildir imapd imapd-ssl pop3d pop3d-ssl
-
-	cd ${D}/usr/sbin
-	for y in imapd imapd-ssl pop3d pop3d-ssl
-	do
-		mv ${y} courier-${y}
-	done
-
-	cd ${D}/etc/courier
-	for y in *.dist
-	do
-		cp ${y} ${y%%.dist}
-	done
-	touch esmtproutes
-	touch backuprelay
-	touch maildroprc
-	[ -e ldapaliasrc ] && chown mail:root ldapaliasrc
-	chg_cfg imapd-ssl COURIERTLS /usr/bin/couriertls
-	chg_cfg authdaemonrc authmodulelist authpam
-	chg_cfg authdaemonrc version authdaemond.plain
-	set_mime esmtpd esmtpd-ssl esmtpd-msa
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-}
-
-pkg_postinst() {
-	cd ${S}
-	make install-configure
-
-	einfo "The following command will setup courier for your system:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config"
-	echo
-	einfo "To enable webmail/webadmin, run the following commands:"
-	einfo "$ echo \"Include /etc/courier/apache-sqwebmail.inc\" >> /etc/apache*/conf/apache.conf"
-	einfo "$ chmod a+rx /usr/lib/courier/courier/webmail"
-	einfo "Then visit: http(s)://localhost/courier/webmail"
-	echo
-	ewarn "There is one init script (/etc/init.d/courier)."
-	ewarn "Each component is activated by a line in its config"
-	ewarn "which is in /etc/courier:"
-	ewarn "imapd"
-	ewarn "imapd-ssl"
-	ewarn "pop3d"
-	ewarn "pop3d-ssl"
-	ewarn "esmtpd"
-	ewarn "esmtpd-msa"
-	ewarn "esmtpd-ssl"
-	ewarn "hint: look for a line at the bottom of the file that looks like so"
-	ewarn "ESMTPDSTART=NO"
-	ewarn "and change it to YES for the services that you use"
-	echo
-	einfo "expect was removed as a dependency due to it's limited usefulness."
-	einfo "If you need the ability to change passwords via webmail _while_ using AUTHPAM, you'll"
-	einfo "have to emerge expect manually. Other auth modules are unaffected."
-	ebeep 5
-}
-
-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
deleted file mode 100644
index ad4e112b558a..000000000000
--- a/mail-mta/courier/courier-0.48.2.20050215.ebuild
+++ /dev/null
@@ -1,297 +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.20050215.ebuild,v 1.3 2005/03/04 11:48:50 swtaylor 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
-	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
-
-	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.20050224.ebuild b/mail-mta/courier/courier-0.48.2.20050224.ebuild
index 7f92fafca6ae..ad5d519ae202 100644
--- a/mail-mta/courier/courier-0.48.2.20050224.ebuild
+++ b/mail-mta/courier/courier-0.48.2.20050224.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2005/03/04 11:48:50 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050224.ebuild,v 1.4 2005/03/21 11:14:15 swtaylor Exp $
 
-inherit eutils gnuconfig
+inherit eutils gnuconfig flag-o-matic
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 [ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -41,8 +41,11 @@ RDEPEND="${DEPEND}
 	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"
@@ -136,8 +139,6 @@ set_maildir() {
 
 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
@@ -160,8 +161,13 @@ src_install() {
 	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
+
+	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:root ldapaliasrc ; chmod 400 ldapaliasrc )
 	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
diff --git a/mail-mta/courier/courier-0.48.2.ebuild b/mail-mta/courier/courier-0.48.2.ebuild
deleted file mode 100644
index 102a42bd526f..000000000000
--- a/mail-mta/courier/courier-0.48.2.ebuild
+++ /dev/null
@@ -1,269 +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.ebuild,v 1.3 2005/03/04 11:48:50 swtaylor Exp $
-
-inherit eutils
-
-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"
-
-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 )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	virtual/fam
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	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"
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-	./configure \
-		--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}"
-	grep -q "${key}" "${file}" && einfo "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${key}/,+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
-	diropts -o mail -g mail
-	dodir /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
-
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	keepdir /etc/skel
-	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-	keepdir /var/spool/mail
-	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-	keepdir /var/spool/mail/.maildir
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
-		newexe ${FILESDIR}/courier courier-old
-
-	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 mail:root 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-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	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_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.49.0.ebuild b/mail-mta/courier/courier-0.49.0.ebuild
index 59057813d419..bd61d9ef8479 100644
--- a/mail-mta/courier/courier-0.49.0.ebuild
+++ b/mail-mta/courier/courier-0.49.0.ebuild
@@ -1,8 +1,8 @@
 # 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.49.0.ebuild,v 1.1 2005/03/04 11:48:50 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.49.0.ebuild,v 1.2 2005/03/21 11:14:15 swtaylor Exp $
 
-inherit eutils gnuconfig
+inherit eutils gnuconfig flag-o-matic
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 [ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -41,8 +41,11 @@ RDEPEND="${DEPEND}
 	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"
@@ -136,8 +139,6 @@ set_maildir() {
 
 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
@@ -160,8 +161,13 @@ src_install() {
 	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
+
+	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:root ldapaliasrc ; chmod 400 ldapaliasrc )
 	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
diff --git a/mail-mta/courier/files/digest-courier-0.47-r1 b/mail-mta/courier/files/digest-courier-0.47-r1
deleted file mode 100644
index 60ac7ea405bb..000000000000
--- a/mail-mta/courier/files/digest-courier-0.47-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 639bb3b236914e3b86f287ce3f55264e courier-0.47.tar.bz2 4268038
diff --git a/mail-mta/courier/files/digest-courier-0.48.2 b/mail-mta/courier/files/digest-courier-0.48.2
deleted file mode 100644
index 3c59695ccebf..000000000000
--- a/mail-mta/courier/files/digest-courier-0.48.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3fc189ecf162375d0f8c4d7a681432b courier-0.48.2.tar.bz2 5874592
diff --git a/mail-mta/courier/files/digest-courier-0.48.2.20050215 b/mail-mta/courier/files/digest-courier-0.48.2.20050215
deleted file mode 100644
index 438c62fd3a50..000000000000
--- a/mail-mta/courier/files/digest-courier-0.48.2.20050215
+++ /dev/null
@@ -1 +0,0 @@
-MD5 08f56ffa168790c698f7a9f5bf07610f courier-0.48.2.20050215.tar.bz2 5885413