-r3 -> x86, removed -r1 & -r2

7 files changed, 23 insertions, 711 deletions

diff --git a/net-mail/courier/ChangeLog b/net-mail/courier/ChangeLog
index ae41d7a8f476..dfe0e5ebccc1 100644
--- a/net-mail/courier/ChangeLog
+++ b/net-mail/courier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/ChangeLog,v 1.30 2003/08/01 09:49:53 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/ChangeLog,v 1.31 2003/08/02 16:22:31 iggy Exp $
+
+  02 Aug 2003; <iggy@gentoo.org> courier-0.42.2-r1.ebuild,
+  courier-0.42.2-r2.ebuild, courier-0.42.2-r3.ebuild:
+  -r3 -> x86, removed older broken ebuilds (-r1, -r2)
 
 *courier-0.42.2-r3 (01 Aug 2003)
 
diff --git a/net-mail/courier/Manifest b/net-mail/courier/Manifest
index a10c849de75e..98f32cd3d564 100644
--- a/net-mail/courier/Manifest
+++ b/net-mail/courier/Manifest
@@ -1,30 +1,26 @@
 MD5 cde0b9d363f6d323dff0b3435d2e89d0 courier-0.42.2.ebuild 9694
-MD5 9b88ca074a30918d9a752ca19aea095c courier-0.42.2-r3.ebuild 10211
-MD5 6993a637562fbfd0e0a84e0bc4cf1cf8 courier-0.42.2-r2.ebuild 10113
+MD5 636565aadd2a000d4ab59150d9aaa58d courier-0.42.2-r3.ebuild 10210
+MD5 6648267303d77b000cfb060f2bdf27c4 ChangeLog 5367
 MD5 891fa054ac6cfcaee491ccaae9b84a85 metadata.xml 463
-MD5 cc4ed7783f515d1f895caaeaceb358ab ChangeLog 5201
-MD5 53327473ab98ae5f796aa93d31126841 courier-0.42.2-r1.ebuild 9800
-MD5 b24f71b5e2b701cdcb758c2f6e3b1083 files/digest-courier-0.42.2-r3 68
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
-MD5 de7f91e6afb4d9b65a82157f1f805f3c files/courier-pop3d 431
-MD5 2ec2b05590afdf6d0e94e012baa44c4f files/courier-imapd-ssl 451
-MD5 4cc259ba91efc1fd7885a6dd6e2291f1 files/courier-authdaemond 451
-MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
-MD5 b24f71b5e2b701cdcb758c2f6e3b1083 files/digest-courier-0.42.2-r2 68
-MD5 8be77f68229aebdc27b53660a6431e8c files/courier-esmtpd-ssl 456
-MD5 6ca0ee26b88804756f7918e42196304a files/courier-mta 427
+MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
 MD5 c90d29ee6fb093c3a57dd6085a8463b3 files/courier-imapd 431
-MD5 b24f71b5e2b701cdcb758c2f6e3b1083 files/digest-courier-0.42.2 68
-MD5 957bb3471d7c3c669a9e35475091a35b files/courier-init 4112
+MD5 de7f91e6afb4d9b65a82157f1f805f3c files/courier-pop3d 431
+MD5 ef6e0853e5d668144f698c59c835d548 files/courier-ldapaliasd 452
+MD5 bf6d70e1911dad2eda0e07530afb0300 files/courier-filterd 509
+MD5 11b3d1dd7a351499fc244c9517ae9371 files/courier 691
 MD5 0410ef54ac603ee57686a191cffb6be5 files/courier-esmtpd 436
+MD5 b24f71b5e2b701cdcb758c2f6e3b1083 files/digest-courier-0.42.2-r3 68
+MD5 2ec2b05590afdf6d0e94e012baa44c4f files/courier-imapd-ssl 451
+MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
-MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
-MD5 11b3d1dd7a351499fc244c9517ae9371 files/courier 691
-MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
+MD5 b24f71b5e2b701cdcb758c2f6e3b1083 files/digest-courier-0.42.2 68
 MD5 aba961cc052d0c255f4e1deb65945153 files/courier-0.42.2-gentoo.diff.bz2 378
+MD5 957bb3471d7c3c669a9e35475091a35b files/courier-init 4112
+MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
 MD5 d587a072860886d2896d8b5a8c118951 files/courier-esmtpd-msa 438
-MD5 b24f71b5e2b701cdcb758c2f6e3b1083 files/digest-courier-0.42.2-r1 68
-MD5 ef6e0853e5d668144f698c59c835d548 files/courier-ldapaliasd 452
-MD5 bf6d70e1911dad2eda0e07530afb0300 files/courier-filterd 509
+MD5 8be77f68229aebdc27b53660a6431e8c files/courier-esmtpd-ssl 456
+MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
 MD5 9da52a8e324cc8da121a87a607754e6d files/courier-pop3d-ssl 451
-MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
+MD5 6ca0ee26b88804756f7918e42196304a files/courier-mta 427
+MD5 4cc259ba91efc1fd7885a6dd6e2291f1 files/courier-authdaemond 451
diff --git a/net-mail/courier/courier-0.42.2-r1.ebuild b/net-mail/courier/courier-0.42.2-r1.ebuild
deleted file mode 100644
index b73585767708..000000000000
--- a/net-mail/courier/courier-0.42.2-r1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild
-
-inherit flag-o-matic eutils
-
-filter-flags -fomit-frame-pointer
-filter-flags -funroll-loops
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc"
-IUSE="gdbm tcltk postgres ldap berkdb mysql pam nls tcltk ipv6 spell fax crypt"
-
-PROVIDE="virtual/mta
-	 virtual/imapd"
-
-RDEPEND="virtual/glibc
-	>=dev-tcltk/expect-5.33.0
-	>=dev-libs/openssl-0.9.6
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	fax? (	>=media-libs/netpbm-9.12
-		>=app-text/ghostscript-7.05.5
-		>=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	tcltk? ( >=dev-tcltk/expect-5.33.0 )
-	spell? ( virtual/aspell-dict )"
-DEPEND="${RDEPEND}
-	app-admin/fam-oss
-	dev-lang/perl
-	sys-apps/procps"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	#epatch ${FILESDIR}/${PF}-gentoo.diff.bz2
-	# I don't think this is necessary anymore, so I'm going to mask this and 
-	# have some people try it out
-}
-
-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 berkdb \
-                && myconf="${myconf} --with-db=db" \
-                || myconf="${myconf} --with-db=gdbm"
-	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
-
-	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 \
-		--enable-autorenamsent \
-		--enable-mimetypes=/etc/apache/conf/mime.types \
-		--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
-}						
-
-src_install() {
-	dodir /var/lib/courier
-	dodir /etc/pam.d
-	# fix bug #15873 bad owner on /var/run/courier
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	make install DESTDIR=${D} || die
-
-	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
-	newexe ${FILESDIR}/courier courier
-	newexe ${FILESDIR}/courier-authdaemond courier-authdaemond
-	newexe ${FILESDIR}/courier-ldapaliasd courier-ldapaliasd
-	newexe ${FILESDIR}/courier-mta courier-mta
-	newexe ${FILESDIR}/courier-esmtpd courier-esmtpd
-	newexe ${FILESDIR}/courier-esmtpd-ssl courier-esmtpd-ssl
-	newexe ${FILESDIR}/courier-esmtpd-msa courier-esmtpd-msa
-	newexe ${FILESDIR}/courier-imapd courier-imapd
-	newexe ${FILESDIR}/courier-imapd-ssl courier-imapd-ssl
-	newexe ${FILESDIR}/courier-pop3d-ssl courier-pop3d-ssl
-	newexe ${FILESDIR}/courier-pop3d courier-pop3d
-	newexe ${FILESDIR}/courier-filterd courier-filterd
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-	newins ${FILESDIR}/dot_courier .courier
-	fperms 644 /etc/skel/.courier
-	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-	insinto /etc/courier
-	newins ${FILESDIR}/bofh bofh
-	newins ${FILESDIR}/locallowercase locallowercase
-	newins ${FILESDIR}/sizelimit sizelimit
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	
-	touch ${D}/var/lib/courier/webmail-logincache/.keep
-	touch ${D}/var/lib/courier/tmp/broken/.keep
-	touch ${D}/var/lib/courier/msgs/.keep
-	touch ${D}/var/lib/courier/msgq/.keep
-	touch ${D}/var/lib/courier/filters/.keep
-	touch ${D}/var/lib/courier/faxtmp/.keep
-	touch ${D}/var/lib/courier/calendar/public/.keep
-	touch ${D}/var/lib/courier/calendar/private/.keep
-	touch ${D}/var/lib/courier/calendar/localcache/.keep
-	touch ${D}/var/lib/courier/calendar/.keep
-	touch ${D}/var/lib/courier/allfilters/.keep
-
-	dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
-
-	# 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
-
-}
-
-pkg_preinst() {
-	# avoid name collisions in /usr/sbin
-	local y
-	cd ${D}/usr/share/courier
-	set_maildir 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
-	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
-}
-
-pkg_postinst() {
-	cd ${S}
-	make install-configure
-
-	# fixes bug #15873 for upgrades, should be able to yank this sometime in 
-	# the future
-	chown --recursive mail.mail ${ROOT}/var/run/courier
-
-	# need to do this for new installs to be able to start courier 
-        # without having to run rc-update ...
-        /etc/init.d/depscan.sh
-
-	echo -e "\e[32;01m The following command :\033[0m"
-	echo -e "\e[32;01m ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config \033[0m"
-	echo -e "\e[32;01m will setup courier-mta for your system. \033[0m"
-	echo
-	echo -e "\e[32;01m To access/configure webmail ( sqwebmail ) : \033[0m"
-	echo
-	echo -e "\e[32;01m Append the following line to your apache.conf : \033[0m"
-	echo -e "\e[32;01m Include /etc/courier/apache-sqwebmail.inc \033[0m"
-	echo -e "\e[32;01m and make sure your apache can access the directory \033[0m"
-	echo -e "\e[32;01m /usr/lib/courier/courier/webmail ( hint: chmod/chown ) \033[0m"
-	echo -e "\e[32;01m To access sqwebmail point your browser to : \033[0m"
-	echo -e "\e[32;01m http://your.server.com/cgi-bin/webmail \033[0m"
-	echo -e "\e[32;01m or even better https://your.server.com/cgi-bin/webmail ;-) \033[0m"
-}
-
-pkg_config() {
-	mailhost=`hostname`
-	export mailhost
-	
-	domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
-	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/net-mail/courier/courier-0.42.2-r2.ebuild b/net-mail/courier/courier-0.42.2-r2.ebuild
deleted file mode 100644
index ee30f17fc626..000000000000
--- a/net-mail/courier/courier-0.42.2-r2.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild
-
-inherit flag-o-matic eutils
-
-filter-flags -fomit-frame-pointer
-filter-flags -funroll-loops
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc"
-IUSE="gdbm tcltk postgres ldap berkdb mysql pam nls tcltk ipv6 spell fax crypt"
-
-PROVIDE="virtual/mta
-	 virtual/imapd"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	fax? (	>=media-libs/netpbm-9.12
-		>=app-text/ghostscript-7.05.5
-		>=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	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 )
-	!virtual/imapd"
-
-	# Removed these from RDEP until the tcltk situation is clarified.
-	# They are only necessary for non-virtual users to be able to change 
-	# passwords via webmail. Hopefully not a highly used feature.
-	#>=dev-tcltk/expect-5.33.0
-	#tcltk? ( >=dev-tcltk/expect-5.33.0 )
-
-
-DEPEND="${RDEPEND}
-	app-admin/fam-oss
-	dev-lang/perl
-	sys-apps/procps"
-
-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 berkdb \
-                && myconf="${myconf} --with-db=db" \
-                || myconf="${myconf} --with-db=gdbm"
-	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
-
-	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 \
-		--enable-mimetypes=/etc/apache/conf/mime.types \
-		--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
-}						
-
-src_install() {
-	dodir /var/lib/courier
-	dodir /etc/pam.d
-	make install DESTDIR=${D} || die
-	# fix bug #15873 bad owner on /var/run/courier
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	# make install creates a ton of dirs that we want to keep
-	# and we don't want to run keepdir 900 times
-	find ${D} -type d -exec touch {}/.keep
-
-	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
-	insinto /etc/skel
-	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-	newins ${FILESDIR}/dot_courier .courier
-	fperms 644 /etc/skel/.courier
-	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-	insinto /etc/courier
-	newins ${FILESDIR}/bofh bofh
-	newins ${FILESDIR}/locallowercase locallowercase
-	newins ${FILESDIR}/sizelimit sizelimit
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	
-	touch ${D}/var/lib/courier/webmail-logincache/.keep
-	touch ${D}/var/lib/courier/tmp/broken/.keep
-	touch ${D}/var/lib/courier/msgs/.keep
-	touch ${D}/var/lib/courier/msgq/.keep
-	touch ${D}/var/lib/courier/filters/.keep
-	touch ${D}/var/lib/courier/faxtmp/.keep
-	touch ${D}/var/lib/courier/calendar/public/.keep
-	touch ${D}/var/lib/courier/calendar/private/.keep
-	touch ${D}/var/lib/courier/calendar/localcache/.keep
-	touch ${D}/var/lib/courier/calendar/.keep
-	touch ${D}/var/lib/courier/allfilters/.keep
-
-	dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
-
-	# 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
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-
-}
-
-pkg_preinst() {
-	# avoid name collisions in /usr/sbin
-	local y
-	cd ${D}/usr/share/courier
-	set_maildir 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
-	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
-}
-
-pkg_postinst() {
-	cd ${S}
-	make install-configure
-
-	# fixes bug #15873 for upgrades, should be able to yank this sometime in 
-	# the future
-	chown --recursive mail.mail ${ROOT}/var/run/courier
-
-	# need to do this for new installs to be able to start courier 
-        # without having to run rc-update ...
-        /etc/init.d/depscan.sh
-
-	einfo "The following command will setup courier for you 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"
-
-	ewarn "The init scripts for courier have changed."
-	ewarn "There is now one init script (/etc/init.d/courier). The rest"
-	ewarn "are obsolete. You can remove /etc/init.d/courier-*. You also"
-	ewarn "need to edit the following files in /etc/courier to enable"
-	ewarn "the different services:"
-	ewarn "imapd"
-	ewarn "pop3d"
-	ewarn "pop3d-ssl"
-	ewarn "esmtpd"
-	ewarn "imapd-ssl"
-	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 -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-}
-
-pkg_config() {
-	mailhost=`hostname`
-	export mailhost
-	
-	domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
-	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/net-mail/courier/courier-0.42.2-r3.ebuild b/net-mail/courier/courier-0.42.2-r3.ebuild
index 3b3c13168b36..83a1b1c98c6e 100644
--- a/net-mail/courier/courier-0.42.2-r3.ebuild
+++ b/net-mail/courier/courier-0.42.2-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc"
+KEYWORDS="x86 -ppc -sparc"
 IUSE="gdbm tcltk postgres ldap mysql pam nls tcltk ipv6 spell fax crypt"
 
 PROVIDE="virtual/mta
diff --git a/net-mail/courier/files/digest-courier-0.42.2-r1 b/net-mail/courier/files/digest-courier-0.42.2-r1
deleted file mode 100644
index 62f09dfd9bee..000000000000
--- a/net-mail/courier/files/digest-courier-0.42.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f607cbd949dd0fe7f138cf3b65d702f4 courier-0.42.2.tar.bz2 3348347
diff --git a/net-mail/courier/files/digest-courier-0.42.2-r2 b/net-mail/courier/files/digest-courier-0.42.2-r2
deleted file mode 100644
index 62f09dfd9bee..000000000000
--- a/net-mail/courier/files/digest-courier-0.42.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f607cbd949dd0fe7f138cf3b65d702f4 courier-0.42.2.tar.bz2 3348347