courier asneeded fix and remove some old ebuilds

Package-Manager: portage-2.1.5_rc6

8 files changed, 36 insertions, 701 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index f1360a7d7e59..d9262e708578 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.102 2008/04/22 11:59:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.103 2008/05/05 22:33:07 hanno Exp $
+
+  05 May 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/courier-0.59.0-asneeded.patch, metadata.xml, courier-0.59.0.ebuild:
+  Fix for --as-needed, thanks to flameeyes.
 
   22 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> courier-0.59.0.ebuild:
   Don't call _elibtoolize manually! Use eautoreconf instead.
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index e6ca28001a86..51b2ba6c8eb2 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA1 4996c33b74a3c9b70886f27948334e3880df8073 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65
 AUX bofh 23 RMD160 995b6b103c29f390c2f0230af95d4c0823423dcb SHA1 f6399bc612af33ca79921961b223cbdf394d9549 SHA256 7e42d61373770a2b14a6fdd8b5f71c598ce4767726f8f7106de00b7c34a59e8c
-AUX courier-0.48.1-spf-error-handling.patch 318 RMD160 3051e323b9564e9e31d9593ef2a1afb76ed45a3f SHA1 75c93cbf98806bc94da91b96daab39aec071851d SHA256 f6f706470cab4bffb45f6ef196799a1c596e8abf5cbef1b5e3d22287c990298b
+AUX courier-0.59.0-asneeded.patch 534 RMD160 fe2f28235842220d999dc77ed22857dd99c648a2 SHA1 5ae8a8cefbbd91f2146988c9095ac0e3668c1135 SHA256 802ae0431c9d2b55cdda4602522058874765170d12f4e2fcdd064971f8d31991
 AUX courier-init 5182 RMD160 7c5d80d7fdd4e09418461a746f6642f2a276b88b SHA1 beef0a5742fe31388947e945b4646c1dbe5627f1 SHA256 4b1a030bbba852c9c2c8d50e58c43c8e97b5a1ac29a04974a1f097362929e126
 AUX courier-init-r1 5252 RMD160 2c770526b4fd2e342c904289573c4f8cb19ca6df SHA1 ac67cd4a9664b1010322b5260f84d017ee06736b SHA256 e74fc291b49dace3ffb3af1844b976255c0c7a34aa0e2d87b5c05f672db9058a
 AUX dot_courier 26 RMD160 cf20012379abbb63f78e1eb0f9cbaefff6d1048d SHA1 8e5e09e167035d100859b42311b6dda2842f4d67 SHA256 8c585031b4356ca1f887e0823fd9b365fff57a5f9cc32541eccfc1542d5d3763
@@ -19,16 +19,14 @@ DIST courier-0.53.2.tar.bz2 6942557 RMD160 a6efce3a8d6572923190ea49ed6085906317e
 DIST courier-0.55.1.tar.bz2 7019376 RMD160 43b4e5868a3e450cbc238cae0ba411011c1fa49f SHA1 a4b83a1fa018abd9d32b946b6407764ad2d98993 SHA256 caec49a2fed5c2048ea69fc290dc01402bf0dfc7852d2e1865e35ae15ce1eea6
 DIST courier-0.59.0.tar.bz2 7121762 RMD160 580e57fd9d39b62772e07dcdec653379cd21caaf SHA1 6870d2b12f1c93d5ede12f2a5c9c1107a7fb647c SHA256 e488cc920ed970c6d38496dba21359b50c6032ff4f2f91432b5d23db261578ec
 EBUILD courier-0.53.2-r1.ebuild 11567 RMD160 6d0aa51f770a25bc3ed037d92ccad8ed2be56254 SHA1 6aa1721a7b4732c97814479067cb22463172a9ad SHA256 ab406803613dc3cea093ebacf8d3fa7437e4297ddf7ee4f18d01d38e37cccd09
-EBUILD courier-0.53.2.ebuild 11532 RMD160 576ce689a2bc8fb1f6e4518bbddc5bd1a1fcd453 SHA1 40690f3fe06591582b52e0ee29c28c0a0b1e2da7 SHA256 fb00cdf3c88032f267ed838186b0d6e6b7699ad2354906ec8090ca6fd90cb115
 EBUILD courier-0.55.1-r1.ebuild 11645 RMD160 34b63074e5b99003b0558f29162fbde2abbdd6ab SHA1 549654b9cf13e1a9cb44700f52cdb487698e3180 SHA256 ca309870b086cab8be373ddeef62a3e69a218d65e401a2ca15ca6f90c178acce
-EBUILD courier-0.55.1.ebuild 11538 RMD160 15e23e2c8736ead5b71d502020a266f1712f257e SHA1 5f01c3926aa1fc9d080dd4190c6899c6ed104879 SHA256 253f511eb570d6915fe68c77e55d3ca194e1b4e6ead018dd9c622934ef1f59da
-EBUILD courier-0.59.0.ebuild 10266 RMD160 103c942790284fda6f67a9f25ddb4e104b90e289 SHA1 0d54d32bd7689b3316b36004e9173cda7a6ac3a4 SHA256 2c5a653434e339e7c9031e73a8e6ee4e94445506c69406831bd5d6b25de5477e
-MISC ChangeLog 27883 RMD160 91a4f37050f02d2b1b82235efe941eda733bbe30 SHA1 89f47de1d1834e81e1b3bfbb43760cc352d85150 SHA256 c38df2b6a0e12f886df00a3ca84d290a25548d7c5a31196afd5b0a197aed4d44
-MISC metadata.xml 387 RMD160 e1292f1437d43cb4b06854838a3f19624b85c99a SHA1 cf0cb74c6e4201d083d7217b196e61ae239a6ca2 SHA256 d9597d8160644cfc4be73390e564379d5b2c209dc165deb44071274ec4fddcc5
+EBUILD courier-0.59.0.ebuild 10338 RMD160 64b4665e2a833b1e45bea43af8853e807bd68918 SHA1 35c2a827d13a9a076fdf5fb27cb5fa835687cd63 SHA256 d8f27357aec6d7ff7339f678cfecf4a061fdcc3526cac65d2b21bf185483171a
+MISC ChangeLog 28047 RMD160 3ab565386fb2d955bcedcc8a5942bf71731e9788 SHA1 a5036d6505af913af121ae0b6b41adee6df54947 SHA256 b65773da45fe7743b70e3015fb8bdad1de4d603a10074a39073d216611397bb6
+MISC metadata.xml 376 RMD160 82ea46ae2ed62ac50b20e20e38f2cb3f4f6a8a57 SHA1 162be1d3d7881ba50eee2f8d64afcba99e2ba75c SHA256 43df8f3a057229eeb0159e3ee412a76e0bb7e76fc3f4ce408b486792a93e582e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgN0zEACgkQAiZjviIA2XhZ0ACeLomqmo1SKfpCxVKuk7RjLivD
-9MEAoMC+ks+56/8AfG02afL4ZBqVyOQe
-=d5fO
+iEYEARECAAYFAkgfiykACgkQr2QksT29OyBSwwCgh09aR58xRfcbaplRr9Q5eeJr
+5Q4An1uDUtr1aQabAGGbgr+dI7tyms4Y
+=NY9v
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.53.2.ebuild b/mail-mta/courier/courier-0.53.2.ebuild
deleted file mode 100644
index 54c3de668879..000000000000
--- a/mail-mta/courier/courier-0.53.2.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.19 2008/02/03 10:51:33 hollow Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
-
-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="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.55
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	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"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn '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
-
-	# disable link to fam.
-	epatch ${FILESDIR}/fam-disable-check.patch
-	cd ${S}/maildir
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with ipv6` \
-		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-	use spell || myconf="${myconf} --without-ispell"
-
-	myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	myconf="${myconf} $(use_with 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}" && elog "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}" && \
-			elog "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
-
-	newinitd ${FILESDIR}/courier-init-r1 courier
-	use fam || sed -i -e's|^.*use 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
-}
-
-src_test() {
-	addpredict /
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		hasq test ${FEATURES} && eerror "Make check needs FEATURES="userpriv" to work."
-	fi
-	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-
-	# fix for bug #99334
-	elog "Courier's sendmail is not suid by default, therefore non-root users can't send"
-	elog "mail using sendmail. If you need this to work, you should set sendmail suid."
-	elog "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/courier-0.55.1.ebuild b/mail-mta/courier/courier-0.55.1.ebuild
deleted file mode 100644
index 038f268dbe9b..000000000000
--- a/mail-mta/courier/courier-0.55.1.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1.ebuild,v 1.4 2008/02/03 10:51:33 hollow Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
-
-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="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.59
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	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"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn '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
-
-	# disable link to fam.
-	epatch ${FILESDIR}/fam-disable-check.patch
-	cd ${S}/maildir
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with ipv6` \
-		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-	use spell || myconf="${myconf} --without-ispell"
-
-	myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	myconf="${myconf} $(use_with 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}" && elog "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}" && \
-			elog "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
-
-	newinitd ${FILESDIR}/courier-init-r1 courier
-	use fam || sed -i -e's|^.*use 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
-}
-
-src_test() {
-	addpredict /
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		hasq test ${FEATURES} && eerror "Make check needs FEATURES="userpriv" to work."
-	fi
-	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-
-	# fix for bug #99334
-	elog "Courier's sendmail is not suid by default, therefore non-root users can't send"
-	elog "mail using sendmail. If you need this to work, you should set sendmail suid."
-	elog "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/courier-0.59.0.ebuild b/mail-mta/courier/courier-0.59.0.ebuild
index 530f34d73898..573fb8bad3d2 100644
--- a/mail-mta/courier/courier-0.59.0.ebuild
+++ b/mail-mta/courier/courier-0.59.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.59.0.ebuild,v 1.3 2008/04/22 11:59:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.59.0.ebuild,v 1.4 2008/05/05 22:33:07 hanno Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -65,8 +65,12 @@ src_unpack() {
 	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 
 	epatch "${FILESDIR}/remove-sysconftool.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
 
 	eautoreconf
+
+	cd "${S}/gdbmobj/"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/mail-mta/courier/files/courier-0.48.1-spf-error-handling.patch b/mail-mta/courier/files/courier-0.48.1-spf-error-handling.patch
deleted file mode 100644
index 9ccaa9b87183..000000000000
--- a/mail-mta/courier/files/courier-0.48.1-spf-error-handling.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- courier-0.50.0/rfc1035/spf.c	2004-08-24 02:43:30.000000000 +0200
-+++ courier-0.50.1/rfc1035/spf.c	2005-07-03 06:19:39.000000000 +0200
-@@ -771,7 +771,7 @@
- 
- 		free(domain_spec);
- 
--		if (rc < 0)
-+		if (rc != 0)
- 		{
- 			set_err_msg(info->errmsg_buf, info->errmsg_buf_size,
- 				    "IP address lookup failed.\n");
diff --git a/mail-mta/courier/files/courier-0.59.0-asneeded.patch b/mail-mta/courier/files/courier-0.59.0-asneeded.patch
new file mode 100644
index 000000000000..776becb3ce5b
--- /dev/null
+++ b/mail-mta/courier/files/courier-0.59.0-asneeded.patch
@@ -0,0 +1,18 @@
+Index: courier-0.59.0/gdbmobj/Makefile.am
+===================================================================
+--- courier-0.59.0.orig/gdbmobj/Makefile.am
++++ courier-0.59.0/gdbmobj/Makefile.am
+@@ -14,11 +14,12 @@ noinst_LTLIBRARIES=libgdbmobj.la
+ noinst_PROGRAMS=testgdbm
+ 
+ libgdbmobj_la_SOURCES=$(LIBGDBMSOURCES)
++libgdbmobj_la_LIBADD=@LIBGDBM@
+ 
+ testgdbm_SOURCES=$(TESTGDBMSOURCES)
+ 
+ testgdbm_DEPENDENCIES=libgdbmobj.la
+-testgdbm_LDADD=libgdbmobj.la @LIBGDBM@
++testgdbm_LDADD=libgdbmobj.la
+ testgdbm_LDFLAGS=-static
+ 
+ check-am:
diff --git a/mail-mta/courier/metadata.xml b/mail-mta/courier/metadata.xml
index 9d18715097b6..cd06e2b40cfe 100644
--- a/mail-mta/courier/metadata.xml
+++ b/mail-mta/courier/metadata.xml
@@ -4,7 +4,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>hanno@@gentoo.org</email>
 	</maintainer>
 	<longdescription>
 		Complete email package consisting of pop, imap, smtp, and fax