marked 1.0.3-r15 stable on x86, started cleanup of old ebuilds

(Portage version: 2.0.51.22-r1)

14 files changed, 9 insertions, 2184 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 5cc69ccd9ef6..24d8ff7130ba 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.37 2005/05/17 21:29:29 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.38 2005/05/19 03:37:20 anarchy Exp $
+
+  19 May 2005; Jory A. Pratt<anarchy@gentoo.org> -qmail-1.03-r8.ebuild,
+  -qmail-1.03-r9.ebuild, -qmail-1.03-r10.ebuild, -qmail-1.03-r11.ebuild,
+  -qmail-1.03-r12.ebuild, -qmail-1.03-r13.ebuild, qmail-1.03-r15.ebuild:
+  cleaned up obsolete ebuilds and digest marked x86 stable for 1.0.3-r15, Will
+  finish cleanup later tomorrow
 
   17 May 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r15.ebuild:
   Stable on ppc and sparc.
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r10 b/mail-mta/qmail/files/digest-qmail-1.03-r10
deleted file mode 100644
index 80ad6ed5cfca..000000000000
--- a/mail-mta/qmail/files/digest-qmail-1.03-r10
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
-MD5 6b202f71a99fb41e9e32906017270ba0 qmail-smtpd-auth-0.31.tar.gz 8798
-MD5 5a8d7a5863b0c56236af945dedd45754 qmailqueue-patch 2510
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
-MD5 1d5b0aafb651ce2ad02aac6af80758c0 qmail-link-sync.patch 1403
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
-MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r11 b/mail-mta/qmail/files/digest-qmail-1.03-r11
deleted file mode 100644
index b1db88921e23..000000000000
--- a/mail-mta/qmail/files/digest-qmail-1.03-r11
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
-MD5 6b202f71a99fb41e9e32906017270ba0 qmail-smtpd-auth-0.31.tar.gz 8798
-MD5 5a8d7a5863b0c56236af945dedd45754 qmailqueue-patch 2510
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
-MD5 1d5b0aafb651ce2ad02aac6af80758c0 qmail-link-sync.patch 1403
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
-MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450
-MD5 4e1f2d8315e7e2a5482798c9d19fac4d sendmail-flagf.patch 863
-MD5 3dc69265a561c7d82ba3e43e89828722 qmail-tls.patch.tbz2 14076
-MD5 122664c38338e5ec35fcac43f33d6927 qmail-1.03-qmtpc.patch 6197
-MD5 24fc1a33089faf12e00b127cd659f317 qmail-smtpd-relay-reject 1230
-MD5 ed5c0ddb6a5cc0386b1e04ced71d26ad qmail-local-tabs.patch 505
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r12 b/mail-mta/qmail/files/digest-qmail-1.03-r12
deleted file mode 100644
index 88f3a557ed29..000000000000
--- a/mail-mta/qmail/files/digest-qmail-1.03-r12
+++ /dev/null
@@ -1,20 +0,0 @@
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
-MD5 5a8d7a5863b0c56236af945dedd45754 qmailqueue-patch 2510
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
-MD5 1d5b0aafb651ce2ad02aac6af80758c0 qmail-link-sync.patch 1403
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
-MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450
-MD5 4e1f2d8315e7e2a5482798c9d19fac4d sendmail-flagf.patch 863
-MD5 122664c38338e5ec35fcac43f33d6927 qmail-1.03-qmtpc.patch 6197
-MD5 24fc1a33089faf12e00b127cd659f317 qmail-smtpd-relay-reject 1230
-MD5 ed5c0ddb6a5cc0386b1e04ced71d26ad qmail-local-tabs.patch 505
-MD5 413be7bb5b407c2964c3275c4d596947 qmail-maildir++.patch 43512
-MD5 d566e8bd99b33efee0194e855b8d6995 qmail-date-localtime.patch.txt 2603
-MD5 1c4518f780d231bde9745cdd0fa313b2 qmail-limit-bounce-size.patch.txt 1753
-MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
-MD5 83bf5c4a4aade3c6c15faa9665ccfb71 qregex-starttls-2way-auth.patch 63825
-MD5 1d8b89607d35bfa409f8cfe6d23bc554 qmail-remote-auth-patch-doc.txt 1287
-MD5 fc00be3edc2827f1c93112d7d5147122 qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2 4524
-MD5 58d912de1ede57062fa8a3e2e0e75abf qmail-popupnofd2close.patch 401
-MD5 d7151dcbeb02eea1c24c1dedffe20e0b qmail-1.03-reread-concurrency.2.patch 1129
-MD5 ad597c93426c0938fdb36d853fbcf40d 08-capa.diff 1323
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r13 b/mail-mta/qmail/files/digest-qmail-1.03-r13
deleted file mode 100644
index 88f3a557ed29..000000000000
--- a/mail-mta/qmail/files/digest-qmail-1.03-r13
+++ /dev/null
@@ -1,20 +0,0 @@
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
-MD5 5a8d7a5863b0c56236af945dedd45754 qmailqueue-patch 2510
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
-MD5 1d5b0aafb651ce2ad02aac6af80758c0 qmail-link-sync.patch 1403
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
-MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450
-MD5 4e1f2d8315e7e2a5482798c9d19fac4d sendmail-flagf.patch 863
-MD5 122664c38338e5ec35fcac43f33d6927 qmail-1.03-qmtpc.patch 6197
-MD5 24fc1a33089faf12e00b127cd659f317 qmail-smtpd-relay-reject 1230
-MD5 ed5c0ddb6a5cc0386b1e04ced71d26ad qmail-local-tabs.patch 505
-MD5 413be7bb5b407c2964c3275c4d596947 qmail-maildir++.patch 43512
-MD5 d566e8bd99b33efee0194e855b8d6995 qmail-date-localtime.patch.txt 2603
-MD5 1c4518f780d231bde9745cdd0fa313b2 qmail-limit-bounce-size.patch.txt 1753
-MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
-MD5 83bf5c4a4aade3c6c15faa9665ccfb71 qregex-starttls-2way-auth.patch 63825
-MD5 1d8b89607d35bfa409f8cfe6d23bc554 qmail-remote-auth-patch-doc.txt 1287
-MD5 fc00be3edc2827f1c93112d7d5147122 qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2 4524
-MD5 58d912de1ede57062fa8a3e2e0e75abf qmail-popupnofd2close.patch 401
-MD5 d7151dcbeb02eea1c24c1dedffe20e0b qmail-1.03-reread-concurrency.2.patch 1129
-MD5 ad597c93426c0938fdb36d853fbcf40d 08-capa.diff 1323
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r8 b/mail-mta/qmail/files/digest-qmail-1.03-r8
deleted file mode 100644
index 9ade032bccfa..000000000000
--- a/mail-mta/qmail/files/digest-qmail-1.03-r8
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
-MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r9 b/mail-mta/qmail/files/digest-qmail-1.03-r9
deleted file mode 100644
index 069eaa99c8ac..000000000000
--- a/mail-mta/qmail/files/digest-qmail-1.03-r9
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
-MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
-MD5 48d2761e9ae44bb4d2812a19634f1a5b qmail-ldap-1.03-20020901.patch.gz 130655
diff --git a/mail-mta/qmail/qmail-1.03-r10.ebuild b/mail-mta/qmail/qmail-1.03-r10.ebuild
deleted file mode 100644
index f4a11a3807de..000000000000
--- a/mail-mta/qmail/qmail-1.03-r10.ebuild
+++ /dev/null
@@ -1,343 +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/qmail/qmail-1.03-r10.ebuild,v 1.8 2005/03/03 18:43:27 ciaranm Exp $
-
-inherit toolchain-funcs eutils
-
-IUSE="ssl selinux"
-DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
-HOMEPAGE="http://www.qmail.org/
-	http://members.elysium.pl/brush/qmail-smtpd-auth/
-	http://www.jedi.claranet.fr/qmail-tuning.html"
-SRC_URI="http://cr.yp.to/software/qmail-1.03.tar.gz
-	http://members.elysium.pl/brush/qmail-smtpd-auth/dist/qmail-smtpd-auth-0.31.tar.gz
-	http://www.qmail.org/qmailqueue-patch
-	http://qmail.null.dk/big-todo.103.patch
-	http://www.jedi.claranet.fr/qmail-link-sync.patch
-	http://www.qmail.org/big-concurrency.patch
-	http://www.suspectclass.com/~sgifford/qmail/qmail-0.0.0.0.patch"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc ~sparc alpha"
-DEPEND="virtual/libc
-	sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	>=net-mail/checkpassword-0.90
-	>=net-mail/cmd5checkpw-0.22
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="!virtual/mta
-	virtual/libc
-	sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	>=sys-process/daemontools-0.76-r1
-	>=net-mail/checkpassword-0.90
-	>=net-mail/cmd5checkpw-0.22
-	>=net-mail/dot-forward-0.71
-	selinux? ( sec-policy/selinux-qmail )"
-
-PROVIDE="virtual/mta
-	 virtual/mda"
-
-src_unpack() {
-	unpack qmail-1.03.tar.gz
-
-	# SMTP AUTH
-	unpack qmail-smtpd-auth-0.31.tar.gz
-	cd ${WORKDIR}/qmail-smtpd-auth-0.31
-	cp README.auth base64.c base64.h ${S}
-	cd ${S}
-	epatch ../qmail-smtpd-auth-0.31/auth.patch
-	# Fixes a problem when utilizing "morercpthosts"
-	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
-
-	# TLS support and an EHLO patch
-	if use ssl
-	then
-		ebegin "Applying tls.patch.bz2..."
-		bzcat ${FILESDIR}/${PV}-${PR}/tls.patch.bz2 | patch -p1 &>/dev/null || die
-		eend $?
-	fi
-
-	# patch so an alternate queue processor can be used
-	# i.e. - qmail-scanner
-	epatch ${DISTDIR}/qmailqueue-patch
-
-	# a patch for faster queue processing
-	epatch ${DISTDIR}/big-todo.103.patch
-
-	# Account for Linux filesystems lack of a synchronus link()
-	cd ${S}
-	epatch ${DISTDIR}/qmail-link-sync.patch
-
-	# Increase limits for large mail systems
-	epatch ${DISTDIR}/big-concurrency.patch
-
-	# Treat 0.0.0.0 as a local address
-	epatch ${DISTDIR}/qmail-0.0.0.0.patch
-
-	# Let the system decide how to define errno
-	epatch ${FILESDIR}/${PV}-${PR}/errno.patch
-
-	if use ssl; then
-		echo "gcc ${CFLAGS} -DTLS" > conf-cc
-	else
-		echo "gcc ${CFLAGS}" > conf-cc
-	fi
-
-	echo "gcc" > conf-ld
-	echo "500" > conf-spawn
-
-}
-
-src_compile() {
-	cd ${S}
-	emake it man || die
-}
-
-
-
-src_install() {
-
-	cd ${S}
-
-	einfo "Setting up directory hierarchy ..."
-
-	diropts -m 755 -o root -g qmail
-	dodir /var/qmail
-
-	for i in bin boot control
-	do
-		dodir /var/qmail/${i}
-	done
-
-	dodir /var/qmail/users
-	keepdir /var/qmail/users
-
-	diropts -m 755 -o alias -g qmail
-	dodir /var/qmail/alias
-
-	einfo "Installing the qmail software ..."
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/boot
-	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
-
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
-	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
-	dodoc ${FILESDIR}/${PV}-${PR}/tls-patch.txt
-
-	insopts -o qmailq -g qmail -m 4711
-	insinto /var/qmail/bin
-	doins qmail-queue qmail-queue
-
-	insopts -o root -g qmail -m 700
-	insinto /var/qmail/bin
-	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-
-	insopts -o root -g qmail -m 711
-	insinto /var/qmail/bin
-	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
-	qmail-clean qmail-send splogger qmail-pw2u
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/bin
-	doins qmail-inject predate datemail mailsubj qmail-showctl \
-	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
-	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
-	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
-	condredirect bouncesaying except maildirmake maildir2mbox \
-	maildirwatch qail elq pinq config-fast
-
-	into /usr
-	for i in *.1 *.5 *.8
-	do
-		doman $i
-	done
-
-	einfo "Adding /var/qmail/bin to PATH and ROOTPATH"
-	dodir /etc/env.d
-	cp ${FILESDIR}/${PV}-${PR}/99qmail ${D}/etc/env.d
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-
-	einfo "Setting up the default aliases ..."
-	diropts -m 700 -o alias -g qmail
-	if [ ! -d ${ROOT}/var/qmail/alias/.maildir ] ; then
-		dodir /var/qmail/alias/.maildir
-		for i in cur new tmp
-		do
-			dodir /var/qmail/alias/.maildir/$i
-		done
-	fi
-
-	for i in mailer-daemon postmaster root
-	do
-		if [ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]; then
-			touch ${D}/var/qmail/alias/.qmail-${i}
-			fowners alias:qmail /var/qmail/alias/.qmail-${i}
-		fi
-	done
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	${D}/var/qmail/bin/maildirmake ${D}/etc/skel/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /etc/skel/.qmail
-	insinto /root
-	${D}/var/qmail/bin/maildirmake ${D}/root/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /root/.qmail
-
-	einfo "Setting up daemontools ..."
-	insopts -o root -g root -m 755
-	diropts -m 755 -o root -g root
-	dodir /var/qmail/supervise
-	dodir /var/qmail/supervise/qmail-send
-	dodir /var/qmail/supervise/qmail-send/log
-	dodir /var/qmail/supervise/qmail-smtpd
-	dodir /var/qmail/supervise/qmail-smtpd/log
-	chmod +t ${D}/var/qmail/supervise/qmail-send
-	chmod +t ${D}/var/qmail/supervise/qmail-smtpd
-	diropts -m 755 -o qmaill
-	dodir /var/log/qmail
-	keepdir /var/log/qmail
-	dodir /var/log/qmail/qmail-send
-	keepdir /var/log/qmail/qmail-send
-	dodir /var/log/qmail/qmail-smtpd
-	keepdir /var/log/qmail/qmail-smtpd
-
-	insinto /var/qmail/supervise/qmail-send
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsend run
-	insinto /var/qmail/supervise/qmail-send/log
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsendlog run
-	insinto /var/qmail/supervise/qmail-smtpd
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsmtpd run
-	insinto /var/qmail/supervise/qmail-smtpd/log
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsmtpdlog run
-
-	einfo "Installing the qmail control file ..."
-	exeinto /var/qmail/bin
-	doexe ${FILESDIR}/${PV}-${PR}/qmail-control
-
-	einfo "Installing the qmail startup file ..."
-	insinto /var/qmail
-	doins ${FILESDIR}/${PV}-${PR}/rc
-	insinto /var/qmail/control
-	doins ${FILESDIR}/${PV}-${PR}/defaultdelivery
-
-	einfo "Setting up the pop3d service ..."
-	insopts -o root -g root -m 755
-	diropts -m 755 -o root -g root
-	dodir /service
-	dodir /var/qmail/supervise/qmail-pop3d
-	dodir /var/qmail/supervise/qmail-pop3d/log
-	chmod +t ${D}/var/qmail/supervise/qmail-pop3d
-	diropts -m 755 -o qmaill
-	dodir /var/log/qmail/qmail-pop3d
-
-	insinto /var/qmail/supervise/qmail-pop3d
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailpop3d run
-	insinto /var/qmail/supervise/qmail-pop3d/log
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailpop3dlog run
-}
-
-pkg_postinst() {
-
-	einfo "Setting up the message queue hierarchy ..."
-
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo
-	install -d -m 700 -o qmailq -g qmail ${ROOT}/var/qmail/queue/pid
-	install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/bounce
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess
-
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-	do
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess/${i}
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo/${i}
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/intd/${i}
-	done
-
-	for i in info local remote
-	do
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/${i}
-	done
-
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-	do
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/info/${i}
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/local/${i}
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/remote/${i}
-	done
-
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/lock
-
-	dd if=/dev/zero of=${ROOT}/var/qmail/queue/lock/tcpto bs=1024 count=1
-	chmod 644 ${ROOT}/var/qmail/queue/lock/tcpto
-	chown qmailr:qmail ${ROOT}/var/qmail/queue/lock/tcpto
-
-	touch ${ROOT}/var/qmail/queue/lock/sendmutex
-	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
-	chown qmails:qmail ${ROOT}/var/qmail/queue/lock/sendmutex
-
-	mkfifo ${ROOT}/var/qmail/queue/lock/trigger
-	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
-	chown qmails:qmail ${ROOT}/var/qmail/queue/lock/trigger
-
-	echo -e "\e[32;01m Please do not forget to run, the following syntax :\033[0m"
-	echo -e "\e[32;01m ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config \033[0m"
-	echo -e "\e[32;01m This will setup qmail to run out-of-the-box on your system. \033[0m"
-	echo -e ""
-	echo -e "\e[32;01m To start qmail at boot you have to enable the /etc/init.d/svscan rc file \033[0m"
-	echo -e "\e[32;01m and create the following links : \033[0m"
-	echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-send /service/qmail-send \033[0m"
-	echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd \033[0m"
-	echo -e ""
-	echo -e "\e[32;01m To start the pop3 server as well, create the following link : \033[0m"
-	echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d \033[0m"
-}
-
-pkg_config() {
-
-export qhost=`hostname --fqdn`
-	if [ ${ROOT} = "/" ] ; then
-		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost
-		fi
-	fi
-
-	echo "Accepting relaying by default from all ips configured on this machine."
-	LOCALIPS=`/sbin/ifconfig  | grep inet | cut -d " " -f 12 -s | cut -b 6-20`
-	for ip in $LOCALIPS; do
-		echo "$ip:allow,RELAYCLIENT=\"\"" >> /etc/tcp.smtp
-	done
-	echo ":allow" >> /etc/tcp.smtp
-
-	tcprules /etc/tcp.smtp.cdb /etc/tcp.smtp.tmp < /etc/tcp.smtp
-
-	if use ssl; then
-	if [ ! -f /var/qmail/control/servercert.pem ]; then
-		echo "Creating a self-signed ssl-cert:"
-		/usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem
-		chmod 640 /var/qmail/control/servercert.pem
-		chown qmaild:qmail /var/qmail/control/servercert.pem
-		ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem
-
-		echo -e "\e[32;01m If You want to have a signed cert, do the following: \033[0m"
-		echo -e "\e[32;01m openssl req -new -nodes -out req.pem \ \033[0m"
-		echo -e "\e[32;01m -keyout /var/qmail/control/servercert.pem \033[0m"
-		echo -e "\e[32;01m chmod 640 /var/qmail/control/servercert.pem \033[0m"
-		echo -e "\e[32;01m chown qmaild:qmail /var/qmail/control/servercert.pem \033[0m"
-		echo -e "\e[32;01m ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem \033[0m"
-		echo -e "\e[32;01m Send req.pem to your CA to obtain signed_req.pem, and do: \033[0m"
-		echo -e "\e[32;01m cat signed_req.pem >> /var/qmail/control/servercert.pem \033[0m"
-	fi
-	fi
-}
diff --git a/mail-mta/qmail/qmail-1.03-r11.ebuild b/mail-mta/qmail/qmail-1.03-r11.ebuild
deleted file mode 100644
index cbf0ffd74a3d..000000000000
--- a/mail-mta/qmail/qmail-1.03-r11.ebuild
+++ /dev/null
@@ -1,358 +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/qmail/qmail-1.03-r11.ebuild,v 1.9 2005/03/03 18:43:27 ciaranm Exp $
-
-inherit toolchain-funcs eutils
-
-IUSE="ssl selinux"
-DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
-HOMEPAGE="http://www.qmail.org/
-	http://members.elysium.pl/brush/qmail-smtpd-auth/
-	http://www.jedi.claranet.fr/qmail-tuning.html"
-SRC_URI="mirror://qmail/qmail-1.03.tar.gz
-	http://members.elysium.pl/brush/qmail-smtpd-auth/dist/qmail-smtpd-auth-0.31.tar.gz
-	mirror://qmail/qmailqueue-patch
-	http://qmail.null.dk/big-todo.103.patch
-	http://www.jedi.claranet.fr/qmail-link-sync.patch
-	mirror://qmail/big-concurrency.patch
-	http://www.suspectclass.com/~sgifford/qmail/qmail-0.0.0.0.patch
-	http://david.acz.org/software/sendmail-flagf.patch
-	mirror://gentoo/qmail-tls.patch.tbz2
-	mirror://qmail/qmail-1.03-qmtpc.patch
-	http://qmail.goof.com/qmail-smtpd-relay-reject
-	mirror://gentoo/qmail-local-tabs.patch"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-DEPEND="virtual/libc
-	sys-apps/groff
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="!virtual/mta
-	virtual/libc
-	>=sys-apps/ucspi-tcp-0.88
-	>=sys-process/daemontools-0.76-r1
-	>=net-mail/checkpassword-0.90
-	>=net-mail/cmd5checkpw-0.22
-	>=net-mail/dot-forward-0.71
-	selinux? ( sec-policy/selinux-qmail )"
-
-PROVIDE="virtual/mta
-	 virtual/mda"
-
-src_unpack() {
-
-	# This makes life easy
-	EPATCH_OPTS="-d ${S}"
-
-	# unpack the initial stuff
-	unpack ${P}.tar.gz qmail-tls.patch.tbz2 qmail-smtpd-auth-0.31.tar.gz
-
-	# SMTP AUTH
-	cp ${WORKDIR}/qmail-smtpd-auth-0.31/{README.auth,base64.c,base64.h} ${S}
-
-	EPATCH_SINGLE_MSG="Adding SMTP AUTH support" \
-	epatch qmail-smtpd-auth-0.31/auth.patch
-
-	# Fixes a problem when utilizing "morercpthosts"
-	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
-
-	# TLS support and an EHLO patch
-	if use ssl
-	then
-		#bzcat ${WORKDIR}/tls.patch.bz2 | patch -p1 &>/dev/null || die
-		ebegin "Adding TLS support"
-		bzcat ${WORKDIR}/tls.patch.bz2 | patch -p1 -d ${S} &>/dev/null || die
-		eend $?
-	fi
-
-	# patch so an alternate queue processor can be used
-	# i.e. - qmail-scanner
-	EPATCH_SINGLE_MSG="Adding QMAILQUEUE support" \
-	epatch ${DISTDIR}/qmailqueue-patch
-
-	# a patch for faster queue processing
-	EPATCH_SINGLE_MSG="Patching for large queues" \
-	epatch ${DISTDIR}/big-todo.103.patch
-
-	# Support for remote hosts that have QMTP
-	EPATCH_SINGLE_MSG="Adding support for remote QMTP hosts" \
-	epatch ${DISTDIR}/qmail-1.03-qmtpc.patch
-
-	# Fix for tabs in .qmail bug noted at
-	# http://www.ornl.gov/its/archives/mailing-lists/qmail/2000/10/msg00696.html
-	# gentoo bug #24293
-	epatch ${DISTDIR}/qmail-local-tabs.patch
-
-	# Account for Linux filesystems lack of a synchronus link()
-	epatch ${DISTDIR}/qmail-link-sync.patch
-
-	# Increase limits for large mail systems
-	epatch ${DISTDIR}/big-concurrency.patch
-
-	# Treat 0.0.0.0 as a local address
-	epatch ${DISTDIR}/qmail-0.0.0.0.patch
-
-	# Let the system decide how to define errno
-	epatch ${FILESDIR}/${PV}-${PR}/errno.patch
-
-	# make the qmail 'sendmail' binary behave like sendmail's for -f
-	epatch ${DISTDIR}/sendmail-flagf.patch
-
-	# Reject some bad relaying attempts
-	# gentoo bug #18064
-	epatch ${DISTDIR}/qmail-smtpd-relay-reject
-
-	cd ${S}
-
-	if use ssl; then
-		echo "$(tc-getCC) ${CFLAGS} -DTLS" > conf-cc
-	else
-		echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	fi
-
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "500" > conf-spawn
-
-}
-
-src_compile() {
-	cd ${S}
-	emake it man || die
-}
-
-
-
-src_install() {
-
-	cd ${S}
-
-	einfo "Setting up directory hierarchy ..."
-
-	diropts -m 755 -o root -g qmail
-	dodir /var/qmail
-
-	for i in bin boot control
-	do
-		dodir /var/qmail/${i}
-	done
-
-	keepdir /var/qmail/users
-
-	diropts -m 755 -o alias -g qmail
-	dodir /var/qmail/alias
-
-	einfo "Installing the qmail software ..."
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/boot
-	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
-
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
-	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
-	dodoc ${WORKDIR}/tls-patch.txt
-
-	insopts -o qmailq -g qmail -m 4711
-	insinto /var/qmail/bin
-	doins qmail-queue qmail-queue
-
-	insopts -o root -g qmail -m 700
-	insinto /var/qmail/bin
-	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-
-	insopts -o root -g qmail -m 711
-	insinto /var/qmail/bin
-	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
-	qmail-clean qmail-send splogger qmail-pw2u
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/bin
-	doins qmail-inject predate datemail mailsubj qmail-showctl \
-	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
-	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
-	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
-	condredirect bouncesaying except maildirmake maildir2mbox \
-	maildirwatch qail elq pinq config-fast
-
-	into /usr
-	for i in *.1 *.5 *.8
-	do
-		doman $i
-	done
-
-	einfo "Adding env.d entry for qmail"
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}-${PR}/99qmail
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-
-	einfo "Setting up the default aliases ..."
-	diropts -m 700 -o alias -g qmail
-	${D}/var/qmail/bin/maildirmake ${D}/var/qmail/alias/.maildir
-	# for good measure
-	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
-
-	for i in mailer-daemon postmaster root
-	do
-		if [ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]; then
-			touch ${D}/var/qmail/alias/.qmail-${i}
-			fowners alias:qmail /var/qmail/alias/.qmail-${i}
-		fi
-	done
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	${D}/var/qmail/bin/maildirmake ${D}/etc/skel/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /etc/skel/.qmail
-	insinto /root
-	${D}/var/qmail/bin/maildirmake ${D}/root/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /root/.qmail
-	# for good measure
-	keepdir /etc/skel/.maildir/{cur,new,tmp} /root/.maildir/{cur,new,tmp}
-
-	einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..."
-	insopts -o root -g root -m 755
-	diropts -m 755 -o root -g root
-	dodir /var/qmail/supervise
-
-	for i in send smtpd qmtpd qmqpd pop3d; do
-		insopts -o root -g root -m 755
-		diropts -m 755 -o root -g root
-		dodir /var/qmail/supervise/qmail-${i}{,/log}
-		diropts -m 755 -o qmaill
-		keepdir /var/log/qmail/qmail-${i}
-		fperms +t /var/qmail/supervise/qmail-${i}{,/log}
-		insinto /var/qmail/supervise/qmail-${i}
-		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i} run
-		insinto /var/qmail/supervise/qmail-${i}/log
-		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i}log run
-	done
-
-	einfo "Installing the qmail control file ..."
-	exeinto /var/qmail/bin
-	doexe ${FILESDIR}/${PV}-${PR}/qmail-control
-
-	einfo "Installing the qmail startup file ..."
-	insinto /var/qmail
-	doins ${FILESDIR}/${PV}-${PR}/rc
-
-	einfo "Insalling some stock configuration files"
-	insinto /var/qmail/control
-	doins ${FILESDIR}/${PV}-${PR}/{defaultdelivery,conf-*}
-}
-
-pkg_postinst() {
-
-	einfo "Setting up the message queue hierarchy ..."
-
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo
-	install -d -m 700 -o qmailq -g qmail ${ROOT}/var/qmail/queue/pid
-	install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/bounce
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess
-
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-	do
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/{mess,todo,intd}/${i}
-	done
-
-	for i in info local remote
-	do
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/${i}
-	done
-
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-	do
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/{info,local,remote}/${i}
-	done
-
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/lock
-
-	[ -e ${ROOT}/var/qmail/queue/lock/tcpto ] || dd if=/dev/zero of=${ROOT}/var/qmail/queue/lock/tcpto bs=1024 count=1
-	chmod 644 ${ROOT}/var/qmail/queue/lock/tcpto
-	chown qmailr:qmail ${ROOT}/var/qmail/queue/lock/tcpto
-
-
-	[ -e ${ROOT}/var/qmail/queue/lock/sendmutex ] || touch ${ROOT}/var/qmail/queue/lock/sendmutex
-	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
-	chown qmails:qmail ${ROOT}/var/qmail/queue/lock/sendmutex
-
-	[ -e ${ROOT}/var/qmail/queue/lock/trigger ] || mkfifo ${ROOT}/var/qmail/queue/lock/trigger
-	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
-	chown qmails:qmail ${ROOT}/var/qmail/queue/lock/trigger
-
-	# for good measure
-	env-update
-
-	einfo "Please do not forget to run, the following syntax :"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config"
-	einfo "This will setup qmail to run out-of-the-box on your system."
-	echo
-	einfo "To start qmail at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following links :"
-	einfo "ln -s /var/qmail/supervise/qmail-send /service/qmail-send"
-	einfo "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd"
-	echo
-	einfo "To start the pop3 server as well, create the following link :"
-	einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d"
-	echo
-	einfo "Additionally, the QMTP and QMQP protocols are supported, and can be started as:"
-	einfo "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd"
-	einfo "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd"
-	echo
-	einfo "Additionally, if you wish to run qmail right now, you should run:"
-	einfo "source /etc/profile"
-}
-
-pkg_config() {
-
-	export qhost=`hostname --fqdn`
-	if [ ${ROOT} = "/" ] ; then
-		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost
-		fi
-	fi
-
-	einfo "Accepting relaying by default from all ips configured on this machine."
-	LOCALIPS=`/sbin/ifconfig  | grep inet | cut -d' ' -f 12 -s | cut -b 6-20`
-	for ip in $LOCALIPS; do
-		echo "$ip:allow,RELAYCLIENT=\"\",RBLSMTPD=\"\"" >> /etc/tcp.smtp
-		echo "$ip:allow,RELAYCLIENT=\"\"" >> /etc/tcp.qmtp
-		echo "$ip:allow,RELAYCLIENT=\"\"" >> /etc/tcp.qmqp
-	done
-	echo ":allow" >> /etc/tcp.smtp
-	echo ":allow" >> /etc/tcp.qmtp
-	echo ":deny" >> /etc/tcp.qmqp
-
-	for i in smtp qmtp qmqp; do
-		tcprules /etc/tcp.${i}.cdb /etc/tcp.${i}.tmp < /etc/tcp.${i}
-	done
-
-	if use ssl; then
-	if [ ! -f /var/qmail/control/servercert.pem ]; then
-		echo "Creating a self-signed ssl-cert:"
-		/usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem
-		chmod 640 /var/qmail/control/servercert.pem
-		chown qmaild:qmail /var/qmail/control/servercert.pem
-		ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem
-
-		einfo "If You want to have a signed cert, do the following:"
-		einfo "openssl req -new -nodes -out req.pem \\"
-		einfo "-keyout /var/qmail/control/servercert.pem"
-		einfo "chmod 640 /var/qmail/control/servercert.pem"
-		einfo "chown qmaild:qmail /var/qmail/control/servercert.pem"
-		einfo "ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem"
-		einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-		einfo "cat signed_req.pem >> /var/qmail/control/servercert.pem"
-	fi
-	fi
-}
diff --git a/mail-mta/qmail/qmail-1.03-r12.ebuild b/mail-mta/qmail/qmail-1.03-r12.ebuild
deleted file mode 100644
index ffec78c619b7..000000000000
--- a/mail-mta/qmail/qmail-1.03-r12.ebuild
+++ /dev/null
@@ -1,393 +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/qmail/qmail-1.03-r12.ebuild,v 1.11 2005/03/03 18:43:27 ciaranm Exp $
-
-inherit toolchain-funcs eutils fixheadtails
-
-IUSE="ssl selinux"
-DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
-HOMEPAGE="http://www.qmail.org/
-	http://members.elysium.pl/brush/qmail-smtpd-auth/
-	http://www.jedi.claranet.fr/qmail-tuning.html"
-SRC_URI="mirror://qmail/qmail-1.03.tar.gz
-	mirror://qmail/qmailqueue-patch
-	http://qmail.null.dk/big-todo.103.patch
-	http://www.jedi.claranet.fr/qmail-link-sync.patch
-	mirror://qmail/big-concurrency.patch
-	http://www.suspectclass.com/~sgifford/qmail/qmail-0.0.0.0.patch
-	http://david.acz.org/software/sendmail-flagf.patch
-	mirror://qmail/qmail-1.03-qmtpc.patch
-	http://qmail.goof.com/qmail-smtpd-relay-reject
-	mirror://gentoo/qmail-local-tabs.patch
-	http://www.shupp.org/patches/qmail-maildir++.patch
-	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-date-localtime.patch.txt
-	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-limit-bounce-size.patch.txt
-	http://www.ckdhr.com/ckd/qmail-103.patch
-	http://www.arda.homeunix.net/store/old_software/qregex-starttls-2way-auth.patch
-	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt
-	mirror://gentoo/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
-	http://www.dataloss.nl/software/patches/qmail-popupnofd2close.patch
-	http://js.hu/package/qmail/qmail-1.03-reread-concurrency.2.patch
-	http://www.mcmilk.de/qmail/dl/djb-qmail/patches/08-capa.diff
-	"
-# broken stuffs
-#http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
-#http://www.dataloss.nl/software/patches/qmail-pop3d-stat.patch 
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-DEPEND="virtual/libc
-	sys-apps/groff
-	app-shells/bash
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	>=net-mail/queue-fix-1.4-r1"
-
-RDEPEND="!virtual/mta
-	virtual/libc
-	>=sys-apps/ucspi-tcp-0.88
-	>=sys-process/daemontools-0.76-r1
-	>=net-mail/checkpassword-0.90
-	>=net-mail/cmd5checkpw-0.22
-	>=net-mail/dot-forward-0.71
-	>=net-mail/queue-fix-1.4-r1
-	selinux? ( sec-policy/selinux-qmail )"
-
-PROVIDE="virtual/mta
-	 virtual/mda"
-
-src_unpack() {
-
-
-	# unpack the initial stuff
-	unpack ${P}.tar.gz
-
-	# This makes life easy
-	EPATCH_OPTS="-d ${S}"
-
-	# this patch merges a few others already
-	EPATCH_SINGLE_MSG="Adding SMTP AUTH (2 way), Qregex and STARTTLS support" \
-	epatch ${DISTDIR}/qregex-starttls-2way-auth.patch
-
-	# Fixes a problem when utilizing "morercpthosts"
-	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
-
-	# patch so an alternate queue processor can be used
-	# i.e. - qmail-scanner
-	EPATCH_SINGLE_MSG="Adding QMAILQUEUE support" \
-	epatch ${DISTDIR}/qmailqueue-patch
-
-	# a patch for faster queue processing
-	EPATCH_SINGLE_MSG="Patching for large queues" \
-	epatch ${DISTDIR}/big-todo.103.patch
-
-	# Support for remote hosts that have QMTP
-	EPATCH_SINGLE_MSG="Adding support for remote QMTP hosts" \
-	epatch ${DISTDIR}/qmail-1.03-qmtpc.patch
-
-	# Large TCP DNS replies confuse it sometimes
-	EPATCH_SINGLE_MSG="Adding support for oversize DNS" \
-	epatch ${DISTDIR}/qmail-103.patch
-
-	# Fix for tabs in .qmail bug noted at
-	# http://www.ornl.gov/its/archives/mailing-lists/qmail/2000/10/msg00696.html
-	# gentoo bug #24293
-	epatch ${DISTDIR}/qmail-local-tabs.patch
-
-	# Account for Linux filesystems lack of a synchronus link()
-	epatch ${DISTDIR}/qmail-link-sync.patch
-
-	# Increase limits for large mail systems
-	epatch ${DISTDIR}/big-concurrency.patch
-
-	# Treat 0.0.0.0 as a local address
-	epatch ${DISTDIR}/qmail-0.0.0.0.patch
-
-	# Let the system decide how to define errno
-	epatch ${FILESDIR}/${PV}-${PR}/errno.patch
-
-	# make the qmail 'sendmail' binary behave like sendmail's for -f
-	epatch ${DISTDIR}/sendmail-flagf.patch
-
-	# Apply patch to make qmail-local and qmail-pop3d compatible with the
-	# maildir++ quota system that is used by vpopmail and courier-imap
-	epatch ${DISTDIR}/qmail-maildir++.patch
-	# fix a typo in the patch
-	# upstream has changed the patch and this isn't needed anymore
-	#epatch ${FILESDIR}/${PV}-${PR}/maildir-quota-fix.patch
-
-	# Apply patch for local timestamps.
-	# This will make the emails headers be written in localtime rather than GMT
-	# If you really want, uncomment it yourself, as mail really should be in GMT
-	epatch ${DISTDIR}/qmail-date-localtime.patch.txt
-
-	# Apply patch to trim large bouncing messages down greatly reduces traffic
-	# when multiple bounces occur (As in with spam)
-	epatch ${DISTDIR}/qmail-limit-bounce-size.patch.txt
-
-	#TODO TEST
-	# Apply patch to add ESMTP SIZE support to qmail-smtpd
-	# This helps your server to be able to reject excessively large messages
-	# "up front", rather than waiting the whole message to arrive and then
-	# bouncing it because it exceeded your databytes setting
-	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-esmtp-size-gentoo.patch
-
-	#TODO TEST
-	# Reject some bad relaying attempts
-	# gentoo bug #18064
-	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-relay-reject.gentoo.patch
-
-	#TODO TEST HEAVILY AS THIS PATCH WAS CUSTOM FIXED
-	# provide badrcptto support
-	# as per bug #17283
-	# patch re-diffed from original at http://sys.pro.br/files/badrcptto-morebadrcptto-accdias.diff.bz2
-	epatch ${DISTDIR}/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
-
-	# TODO TESTING NEEDED
-	EPATCH_SINGLE_MSG="Enable stderr logging from checkpassword programs" \
-	epatch ${DISTDIR}/qmail-popupnofd2close.patch
-	EPATCH_SINGLE_MSG="Allow qmail to re-read concurrency limits on HUP" \
-	epatch ${DISTDIR}/qmail-1.03-reread-concurrency.2.patch
-	EPATCH_SINGLE_MSG="Add support for CAPA in POP3d" \
-	epatch ${DISTDIR}/08-capa.diff
-
-	# TODO REDIFF
-	#EPATCH_SINGLE_MSG="Refuse messages from the null envelope sender if they have more than one envelope recipient" \
-	#epatch ${DISTDIR}/nullenvsender-recipcount.patch
-	# TODO REDIFF
-	#EPATCH_SINGLE_MSG="qmail-pop3d reports erroneous figures on STAT after a DELE" \
-	#epatch ${DISTDIR}/qmail-pop3d-stat.patch 
-
-	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
-	if use ssl; then
-		einfo "Enabling SSL/TLS functionality"
-		echo -n ' -DTLS' >>${S}/conf-cc
-	fi
-	echo -n "$(tc-getCC) ${LDFLAGS}" > ${S}/conf-ld
-	echo -n "500" > ${S}/conf-spawn
-
-	# fix coreutils messup
-	ht_fix_file ${S}/Makefile
-
-}
-
-src_compile() {
-	emake it man || die
-}
-
-src_install() {
-
-	einfo "Setting up directory hierarchy ..."
-
-	diropts -m 755 -o root -g qmail
-	dodir /var/qmail
-
-	for i in bin boot control
-	do
-		dodir /var/qmail/${i}
-	done
-
-	keepdir /var/qmail/users
-
-	diropts -m 755 -o alias -g qmail
-	dodir /var/qmail/alias
-
-	einfo "Installing the qmail software ..."
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/boot
-	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
-
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
-	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION README* ${DISTDIR}/qmail-remote-auth-patch-doc.txt
-
-	insinto /var/qmail/bin
-	insopts -o qmailq -g qmail -m 4711
-	doins qmail-queue
-
-	insopts -o root -g qmail -m 700
-	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-
-	insopts -o root -g qmail -m 711
-	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
-	qmail-clean qmail-send splogger qmail-pw2u
-
-	insopts -o root -g qmail -m 755
-	doins qmail-inject predate datemail mailsubj qmail-showctl \
-	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
-	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
-	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
-	condredirect bouncesaying except maildirmake maildir2mbox \
-	maildirwatch qail elq pinq config-fast qmail-newbrt
-
-	into /usr
-	einfo "Installing manpages"
-	doman *.[1-8]
-
-	# use the correct maildirmake
-	# the courier-imap one has some extensions that are nicer
-	[ -e /usr/bin/maildirmake ] && MAILDIRMAKE="/usr/bin/maildirmake" || MAILDIRMAKE="${D}/var/qmail/bin/maildirmake"
-
-	einfo "Adding env.d entry for qmail"
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}-${PR}/99qmail
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-
-	einfo "Setting up the default aliases ..."
-	diropts -m 700 -o alias -g qmail
-	${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir
-	# for good measure
-	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
-
-	for i in mailer-daemon postmaster root
-	do
-		if [ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]; then
-			touch ${D}/var/qmail/alias/.qmail-${i}
-			fowners alias:qmail /var/qmail/alias/.qmail-${i}
-		fi
-	done
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail.sample
-	fperms 644 /etc/skel/.qmail.sample
-	${MAILDIRMAKE} ${D}/etc/skel/.maildir
-	# for good measure
-	keepdir /etc/skel/.maildir/{cur,new,tmp}
-
-	einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..."
-	insopts -o root -g root -m 755
-	diropts -m 755 -o root -g root
-	dodir /var/qmail/supervise
-
-	for i in send smtpd qmtpd qmqpd pop3d; do
-		insopts -o root -g root -m 755
-		diropts -m 755 -o root -g root
-		dodir /var/qmail/supervise/qmail-${i}{,/log}
-		diropts -m 755 -o qmaill
-		keepdir /var/log/qmail/qmail-${i}
-		fperms +t /var/qmail/supervise/qmail-${i}{,/log}
-		insinto /var/qmail/supervise/qmail-${i}
-		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i} run
-		insinto /var/qmail/supervise/qmail-${i}/log
-		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i}log run
-		insinto /etc
-		[ -f ${FILESDIR}/tcp.${i}.sample ] && newins ${FILESDIR}/tcp.${i}.sample /etc/tcp.${i}
-		for i in smtp qmtp qmqp pop3; do
-			[ -f ${D}/etc/tcp.${i} ] && tcprules ${D}/etc/tcp.${i}.cdb ${D}/etc/.tcp.${i}.tmp < ${D}/etc/tcp.${i}
-		done
-	done
-
-	einfo "Installing the qmail startup file ..."
-	insinto /var/qmail
-	insopts -o root -g root -m 755
-	doins ${FILESDIR}/${PV}-${PR}/rc
-
-	einfo "Installing the qmail control file ..."
-	exeinto /var/qmail/bin
-	insopts -o root -g root -m 755
-	doexe ${FILESDIR}/${PV}-${PR}/qmail-control
-
-	einfo "Insalling some stock configuration files"
-	insinto /var/qmail/control
-	insopts -o root -g root -m 644
-	doins ${FILESDIR}/${PV}-${PR}/conf-*
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail defaultdelivery
-
-	einfo "Configuration sanity checker"
-	into /var/qmail
-	insopts -o root -g root -m 644
-	dobin ${FILESDIR}/${PV}-${PR}/config-sanity-check
-
-}
-
-rootmailfixup() {
-	# so you can check mail as root easily
-	local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir"
-	if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then
-		einfo "Previously the qmail ebuilds created /root/.maildir/ but not"
-		einfo "every mail was delivered there. If the directory does not"
-		einfo "contain any mail, please delete it and run:"
-		einfo "${TMPCMD}"
-	else
-		${TMPCMD}
-	fi
-	chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null
-}
-
-pkg_postinst() {
-
-	einfo "Setting up the message queue hierarchy ..."
-	# queue-fix makes life easy!
-	/var/qmail/bin/queue-fix ${ROOT}/var/qmail/queue >/dev/null
-
-	rootmailfixup
-
-	# for good measure
-	env-update
-
-	einfo "To setup qmail to run out-of-the-box on your system, run:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config"
-	echo
-	einfo "To start qmail at boot you have to add svscan to your startup"
-	einfo "and create the following links :"
-	einfo "ln -s /var/qmail/supervise/qmail-send /service/qmail-send"
-	einfo "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd"
-	echo
-	einfo "To start the pop3 server as well, create the following link :"
-	einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d"
-	echo
-	einfo "Additionally, the QMTP and QMQP protocols are supported, and can be started as:"
-	einfo "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd"
-	einfo "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd"
-	echo
-	einfo "Additionally, if you wish to run qmail right now, you should run this before anything else:"
-	einfo "source /etc/profile"
-}
-
-pkg_config() {
-
-	# avoid some weird locale problems
-	export LC_ALL="C"
-
-	if [ ${ROOT} = "/" ] ; then
-		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			export qhost=`hostname --fqdn`
-			${ROOT}/var/qmail/bin/config-fast $qhost
-		fi
-	fi
-
-	einfo "Accepting relaying by default from all ips configured on this machine."
-	LOCALIPS=`/sbin/ifconfig  | grep inet | cut -d' ' -f 12 -s | cut -b 6-20`
-	TCPSTRING=":allow,RELAYCLIENT=\"\",RBLSMTPD=\"\""
-	for ip in $LOCALIPS; do
-		echo "${ip}${TCPSTRING}" >> ${ROOT}/etc/tcp.smtp
-		echo "${ip}${TCPSTRING}" >> ${ROOT}/etc/tcp.qmtp
-		echo "${ip}${TCPSTRING}" >> ${ROOT}/etc/tcp.qmqp
-	done
-
-	for i in smtp qmtp qmqp pop3; do
-		[ -f ${ROOT}/etc/tcp.${i} ] && tcprules ${ROOT}/etc/tcp.${i}.cdb ${ROOT}/etc/.tcp.${i}.tmp < ${ROOT}/etc/tcp.${i}
-	done
-
-	if use ssl && [ ! -f ${ROOT}/var/qmail/control/servercert.pem ]; then
-		echo "Creating a self-signed ssl-cert:"
-		/usr/bin/openssl req -new -x509 -nodes -out ${ROOT}/var/qmail/control/servercert.pem -days 366 -keyout ${ROOT}/var/qmail/control/servercert.pem
-		chmod 640 ${ROOT}/var/qmail/control/servercert.pem
-		chown qmaild:qmail ${ROOT}/var/qmail/control/servercert.pem
-		ln -s /var/qmail/control/servercert.pem ${ROOT}/var/qmail/control/clientcert.pem
-
-		einfo "If You want to have a signed cert, do the following:"
-		einfo "openssl req -new -nodes -out req.pem \\"
-		einfo "-keyout /var/qmail/control/servercert.pem"
-		einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-		einfo "cat signed_req.pem >> /var/qmail/control/servercert.pem"
-	fi
-}
diff --git a/mail-mta/qmail/qmail-1.03-r13.ebuild b/mail-mta/qmail/qmail-1.03-r13.ebuild
deleted file mode 100644
index 4392844033db..000000000000
--- a/mail-mta/qmail/qmail-1.03-r13.ebuild
+++ /dev/null
@@ -1,431 +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/qmail/qmail-1.03-r13.ebuild,v 1.13 2005/03/03 18:43:27 ciaranm Exp $
-
-inherit toolchain-funcs eutils fixheadtails
-
-IUSE="ssl selinux"
-DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
-HOMEPAGE="http://www.qmail.org/
-	http://members.elysium.pl/brush/qmail-smtpd-auth/
-	http://www.jedi.claranet.fr/qmail-tuning.html"
-SRC_URI="mirror://qmail/qmail-1.03.tar.gz
-	mirror://qmail/qmailqueue-patch
-	http://qmail.null.dk/big-todo.103.patch
-	http://www.jedi.claranet.fr/qmail-link-sync.patch
-	mirror://qmail/big-concurrency.patch
-	http://www.suspectclass.com/~sgifford/qmail/qmail-0.0.0.0.patch
-	http://david.acz.org/software/sendmail-flagf.patch
-	mirror://qmail/qmail-1.03-qmtpc.patch
-	mirror://qmail/qmail-smtpd-relay-reject
-	mirror://gentoo/qmail-local-tabs.patch
-	http://www.shupp.org/patches/qmail-maildir++.patch
-	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-date-localtime.patch.txt
-	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-limit-bounce-size.patch.txt
-	http://www.ckdhr.com/ckd/qmail-103.patch
-	http://www.arda.homeunix.net/store/old_software/qregex-starttls-2way-auth.patch
-	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt
-	mirror://gentoo/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
-	http://www.dataloss.nl/software/patches/qmail-popupnofd2close.patch
-	http://js.hu/package/qmail/qmail-1.03-reread-concurrency.2.patch
-	http://www.mcmilk.de/qmail/dl/djb-qmail/patches/08-capa.diff
-	"
-# broken stuffs
-#http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
-#http://www.dataloss.nl/software/patches/qmail-pop3d-stat.patch 
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc ~hppa alpha"
-DEPEND="virtual/libc
-	sys-apps/groff
-	app-shells/bash
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	>=net-mail/queue-fix-1.4-r1"
-
-RDEPEND="!virtual/mta
-	virtual/libc
-	>=sys-apps/ucspi-tcp-0.88
-	>=sys-process/daemontools-0.76-r1
-	>=net-mail/checkpassword-0.90
-	>=net-mail/cmd5checkpw-0.22
-	>=net-mail/dot-forward-0.71
-	>=net-mail/queue-fix-1.4-r1
-	selinux? ( sec-policy/selinux-qmail )"
-
-PROVIDE="virtual/mta
-	 virtual/mda"
-
-src_unpack() {
-
-
-	# unpack the initial stuff
-	unpack ${P}.tar.gz
-
-	# This makes life easy
-	EPATCH_OPTS="-d ${S}"
-
-	# this patch merges a few others already
-	EPATCH_SINGLE_MSG="Adding SMTP AUTH (2 way), Qregex and STARTTLS support" \
-	epatch ${DISTDIR}/qregex-starttls-2way-auth.patch
-
-	# Fixes a problem when utilizing "morercpthosts"
-	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
-
-	# patch so an alternate queue processor can be used
-	# i.e. - qmail-scanner
-	EPATCH_SINGLE_MSG="Adding QMAILQUEUE support" \
-	epatch ${DISTDIR}/qmailqueue-patch
-
-	# a patch for faster queue processing
-	EPATCH_SINGLE_MSG="Patching for large queues" \
-	epatch ${DISTDIR}/big-todo.103.patch
-
-	# Support for remote hosts that have QMTP
-	EPATCH_SINGLE_MSG="Adding support for remote QMTP hosts" \
-	epatch ${DISTDIR}/qmail-1.03-qmtpc.patch
-
-	# Large TCP DNS replies confuse it sometimes
-	EPATCH_SINGLE_MSG="Adding support for oversize DNS" \
-	epatch ${DISTDIR}/qmail-103.patch
-
-	# Fix for tabs in .qmail bug noted at
-	# http://www.ornl.gov/its/archives/mailing-lists/qmail/2000/10/msg00696.html
-	# gentoo bug #24293
-	epatch ${DISTDIR}/qmail-local-tabs.patch
-
-	# Account for Linux filesystems lack of a synchronus link()
-	epatch ${DISTDIR}/qmail-link-sync.patch
-
-	# Increase limits for large mail systems
-	epatch ${DISTDIR}/big-concurrency.patch
-
-	# Treat 0.0.0.0 as a local address
-	epatch ${DISTDIR}/qmail-0.0.0.0.patch
-
-	# Let the system decide how to define errno
-	epatch ${FILESDIR}/${PV}-${PR}/errno.patch
-
-	# make the qmail 'sendmail' binary behave like sendmail's for -f
-	epatch ${DISTDIR}/sendmail-flagf.patch
-
-	# Apply patch to make qmail-local and qmail-pop3d compatible with the
-	# maildir++ quota system that is used by vpopmail and courier-imap
-	epatch ${DISTDIR}/qmail-maildir++.patch
-	# fix a typo in the patch
-	# upstream has changed the patch and this isn't needed anymore
-	#epatch ${FILESDIR}/${PV}-${PR}/maildir-quota-fix.patch
-
-	# Apply patch for local timestamps.
-	# This will make the emails headers be written in localtime rather than GMT
-	# If you really want, uncomment it yourself, as mail really should be in GMT
-	epatch ${DISTDIR}/qmail-date-localtime.patch.txt
-
-	# Apply patch to trim large bouncing messages down greatly reduces traffic
-	# when multiple bounces occur (As in with spam)
-	epatch ${DISTDIR}/qmail-limit-bounce-size.patch.txt
-
-	#TODO TEST
-	# Apply patch to add ESMTP SIZE support to qmail-smtpd
-	# This helps your server to be able to reject excessively large messages
-	# "up front", rather than waiting the whole message to arrive and then
-	# bouncing it because it exceeded your databytes setting
-	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-esmtp-size-gentoo.patch
-
-	#TODO TEST
-	# Reject some bad relaying attempts
-	# gentoo bug #18064
-	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-relay-reject.gentoo.patch
-
-	#TODO TEST HEAVILY AS THIS PATCH WAS CUSTOM FIXED
-	# provide badrcptto support
-	# as per bug #17283
-	# patch re-diffed from original at http://sys.pro.br/files/badrcptto-morebadrcptto-accdias.diff.bz2
-	epatch ${DISTDIR}/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
-
-	# TODO TESTING NEEDED
-	EPATCH_SINGLE_MSG="Enable stderr logging from checkpassword programs" \
-	epatch ${DISTDIR}/qmail-popupnofd2close.patch
-	EPATCH_SINGLE_MSG="Allow qmail to re-read concurrency limits on HUP" \
-	epatch ${DISTDIR}/qmail-1.03-reread-concurrency.2.patch
-	EPATCH_SINGLE_MSG="Add support for CAPA in POP3d" \
-	epatch ${DISTDIR}/08-capa.diff
-
-	# TODO REDIFF
-	#EPATCH_SINGLE_MSG="Refuse messages from the null envelope sender if they have more than one envelope recipient" \
-	#epatch ${DISTDIR}/nullenvsender-recipcount.patch
-	# TODO REDIFF
-	#EPATCH_SINGLE_MSG="qmail-pop3d reports erroneous figures on STAT after a DELE" \
-	#epatch ${DISTDIR}/qmail-pop3d-stat.patch 
-
-	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
-	if use ssl; then
-		einfo "Enabling SSL/TLS functionality"
-		echo -n ' -DTLS' >>${S}/conf-cc
-	fi
-	echo -n "$(tc-getCC) ${LDFLAGS}" > ${S}/conf-ld
-	echo -n "500" > ${S}/conf-spawn
-
-	# fix coreutils messup
-	ht_fix_file ${S}/Makefile
-
-}
-
-src_compile() {
-	emake it man || die
-}
-
-src_install() {
-
-	einfo "Setting up directory hierarchy ..."
-
-	diropts -m 755 -o root -g qmail
-	dodir /var/qmail
-
-	for i in bin boot control
-	do
-		dodir /var/qmail/${i}
-	done
-
-	keepdir /var/qmail/users
-
-	diropts -m 755 -o alias -g qmail
-	dodir /var/qmail/alias
-
-	einfo "Installing the qmail software ..."
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/boot
-	doins home home+df proc proc+df binm1 binm1+df binm2 \
-		binm2+df binm3 binm3+df
-
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
-	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION README* \
-		${DISTDIR}/qmail-remote-auth-patch-doc.txt
-
-	insinto /var/qmail/bin
-	insopts -o qmailq -g qmail -m 4711
-	doins qmail-queue
-
-	insopts -o root -g qmail -m 700
-	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-
-	insopts -o root -g qmail -m 711
-	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
-	qmail-clean qmail-send splogger qmail-pw2u
-
-	insopts -o root -g qmail -m 755
-	doins qmail-inject predate datemail mailsubj qmail-showctl \
-	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
-	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
-	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
-	condredirect bouncesaying except maildirmake maildir2mbox \
-	maildirwatch qail elq pinq config-fast qmail-newbrt
-
-	into /usr
-	einfo "Installing manpages"
-	doman *.[1-8]
-
-	# use the correct maildirmake
-	# the courier-imap one has some extensions that are nicer
-	[ -e /usr/bin/maildirmake ] && \
-		MAILDIRMAKE="/usr/bin/maildirmake" || \
-		MAILDIRMAKE="${D}/var/qmail/bin/maildirmake"
-
-	einfo "Adding env.d entry for qmail"
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}-${PR}/99qmail
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-
-	einfo "Setting up the default aliases ..."
-	diropts -m 700 -o alias -g qmail
-	${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir
-	# for good measure
-	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
-
-	for i in mailer-daemon postmaster root
-	do
-		if [ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]; then
-			touch ${D}/var/qmail/alias/.qmail-${i}
-			fowners alias:qmail /var/qmail/alias/.qmail-${i}
-		fi
-	done
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail.sample
-	fperms 644 /etc/skel/.qmail.sample
-	${MAILDIRMAKE} ${D}/etc/skel/.maildir
-	# for good measure
-	keepdir /etc/skel/.maildir/{cur,new,tmp}
-
-	einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..."
-	insopts -o root -g root -m 755
-	diropts -m 755 -o root -g root
-	dodir /var/qmail/supervise
-
-	for i in send smtpd qmtpd qmqpd pop3d; do
-		insopts -o root -g root -m 755
-		diropts -m 755 -o root -g root
-		dodir /var/qmail/supervise/qmail-${i}{,/log}
-		diropts -m 755 -o qmaill
-		keepdir /var/log/qmail/qmail-${i}
-		fperms +t /var/qmail/supervise/qmail-${i}{,/log}
-		insinto /var/qmail/supervise/qmail-${i}
-		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i} run
-		insinto /var/qmail/supervise/qmail-${i}/log
-		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i}log run
-		insinto /etc
-	done
-
-	insinto /etc
-	for i in smtp qmtp qmqp pop3; do
-		if [ -f ${FILESDIR}/tcp.${i}.sample ]; then
-			newins ${FILESDIR}/tcp.${i}.sample tcp.${i}
-		fi
-		if [ -f ${D}/etc/tcp.${i} ]; then
-			tcprules ${D}/etc/tcp.${i}.cdb ${D}/etc/.tcp.${i}.tmp \
-			< ${D}/etc/tcp.${i}
-		fi
-	done
-
-	einfo "Installing the qmail startup file ..."
-	insinto /var/qmail
-	insopts -o root -g root -m 755
-	doins ${FILESDIR}/${PV}-${PR}/rc
-
-	einfo "Installing the qmail control file ..."
-	exeinto /var/qmail/bin
-	insopts -o root -g root -m 755
-	doexe ${FILESDIR}/${PV}-${PR}/qmail-control
-
-	einfo "Insalling some stock configuration files"
-	insinto /var/qmail/control
-	insopts -o root -g root -m 644
-	doins ${FILESDIR}/${PV}-${PR}/conf-*
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail defaultdelivery
-	use ssl && doins ${FILESDIR}/${PV}-${PR}/servercert.cnf
-
-	einfo "Configuration sanity checker"
-	into /var/qmail
-	insopts -o root -g root -m 644
-	dobin ${FILESDIR}/${PV}-${PR}/config-sanity-check
-
-	if use ssl; then
-		einfo "SSL Certificate creation script"
-		dobin ${FILESDIR}/${PV}-${PR}/mkservercert
-		einfo "RSA key generation cronjob"
-		insinto /etc/cron.daily
-		doins ${FILESDIR}/${PV}-${PR}/qmail-genrsacert.sh
-		chmod +x ${D}/etc/cron.daily/qmail-genrsacert.sh
-	fi
-}
-
-rootmailfixup() {
-	# so you can check mail as root easily
-	local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir"
-	if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then
-		einfo "Previously the qmail ebuilds created /root/.maildir/ but not"
-		einfo "every mail was delivered there. If the directory does not"
-		einfo "contain any mail, please delete it and run:"
-		einfo "${TMPCMD}"
-	else
-		${TMPCMD}
-	fi
-	chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null
-}
-
-buildtcprules() {
-	for i in smtp qmtp qmqp pop3; do
-		# please note that we don't check if it exists
-		# as we want it to make the cdb files anyway!
-		cat ${ROOT}etc/tcp.${i} 2>/dev/null | tcprules ${ROOT}etc/tcp.${i}.cdb ${ROOT}etc/.tcp.${i}.tmp
-	done
-}
-
-pkg_postinst() {
-
-	einfo "Setting up the message queue hierarchy ..."
-	# queue-fix makes life easy!
-	/var/qmail/bin/queue-fix ${ROOT}/var/qmail/queue >/dev/null
-
-	rootmailfixup
-	buildtcprules
-
-	# for good measure
-	env-update
-
-	einfo "To setup qmail to run out-of-the-box on your system, run:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config"
-	echo
-	einfo "To start qmail at boot you have to add svscan to your startup"
-	einfo "and create the following links:"
-	einfo "ln -s /var/qmail/supervise/qmail-send /service/qmail-send"
-	einfo "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd"
-	echo
-	einfo "To start the pop3 server as well, create the following link:"
-	einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d"
-	echo
-	einfo "Additionally, the QMTP and QMQP protocols are supported, "
-	einfo "and can be started as:"
-	einfo "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd"
-	einfo "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd"
-	echo
-	einfo "Additionally, if you wish to run qmail right now, you should "
-	einfo "run this before anything else:"
-	einfo "source /etc/profile"
-	echo
-	einfo "If you are looking for documentation, check those links:"
-	einfo "http://www.gentoo.org/doc/en/qmail-howto.xml"
-	einfo "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
-	einfo "http://www.lifewithqmail.com/"
-	einfo "  -- Life with qmail"
-}
-
-pkg_config() {
-
-	# avoid some weird locale problems
-	export LC_ALL="C"
-
-	if [ ${ROOT} = "/" ] ; then
-		if [ ! -f ${ROOT}var/qmail/control/me ] ; then
-			export qhost=`hostname --fqdn`
-			${ROOT}var/qmail/bin/config-fast $qhost
-		fi
-	else
-		ewarn "Skipping some configuration as it MUST be run on the final host"
-	fi
-
-	einfo "Accepting relaying by default from all ips configured on this machine."
-	LOCALIPS=`/sbin/ifconfig  | grep inet | cut -d' ' -f 12 -s | cut -b 6-20`
-	TCPSTRING=":allow,RELAYCLIENT=\"\",RBLSMTPD=\"\""
-	for ip in $LOCALIPS; do
-		myline="${ip}${TCPSTRING}"
-		for proto in smtp qmtp qmqp; do
-			f="${ROOT}etc/tcp.${proto}"
-			egrep -q "${myline}" ${f} || echo "${myline}" >>${f}
-		done
-	done
-
-	buildtcprules
-
-	if use ssl; then
-		${ROOT}etc/cron.daily/qmail-genrsacert.sh
-		einfo "Creating a self-signed ssl-certificate:"
-		/var/qmail/bin/mkservercert
-		einfo "If you want to have a properly signed certificate "
-		einfo "instead, do the following:"
-		einfo "openssl req -new -nodes -out req.pem \\"
-		einfo "-config /var/qmail/control/servercert.cnf \\"
-		einfo "-keyout /var/qmail/control/servercert.pem"
-		einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-		einfo "cat signed_req.pem >> /var/qmail/control/servercert.pem"
-	fi
-}
diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild
index 3447fcb5fd72..de58c9480bd9 100644
--- a/mail-mta/qmail/qmail-1.03-r15.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.23 2005/05/17 21:29:29 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.24 2005/05/19 03:37:20 anarchy Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -40,7 +40,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86"
 
 DEPEND="virtual/libc
 	sys-apps/groff
diff --git a/mail-mta/qmail/qmail-1.03-r8.ebuild b/mail-mta/qmail/qmail-1.03-r8.ebuild
deleted file mode 100644
index d3ec223db479..000000000000
--- a/mail-mta/qmail/qmail-1.03-r8.ebuild
+++ /dev/null
@@ -1,276 +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/qmail/qmail-1.03-r8.ebuild,v 1.7 2005/03/03 18:43:27 ciaranm Exp $
-
-DESCRIPTION="A modern replacement for sendmail which uses maildirs"
-HOMEPAGE="http://www.qmail.org/
-	http://www.jedi.claranet.fr/qmail-tuning.html
-	http://iain.cx/unix/qmail/mysql.php
-	http://www.nrg4u.com/"
-
-SRC_URI="http://cr.yp.to/software/qmail-1.03.tar.gz
-	http://www.qmail.org/big-todo.103.patch
-	http://www.qmail.org/big-concurrency.patch
-	http://www.ckdhr.com/ckd/qmail-103.patch"
-
-DEPEND="virtual/libc
-	sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	>=net-mail/checkpassword-0.90"
-
-RDEPEND="!virtual/mta
-	virtual/libc
-	sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	>=sys-process/daemontools-0.76-r1
-	>=net-mail/checkpassword-0.90
-	>=net-mail/dot-forward-0.71
-	selinux? ( sec-policy/selinux-qmail )"
-
-PROVIDE="virtual/mta"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE="selinux"
-
-src_unpack() {
-
-cd ${WORKDIR}
-unpack qmail-1.03.tar.gz
-
-cd ${S}
-
-	echo "Applying dns patch..."
-	patch < ${DISTDIR}/qmail-103.patch
-
-	echo "Applying big-todo patch..."
-	patch < ${DISTDIR}/big-todo.103.patch
-
-	echo "Applying big-concurrency patch..."
-	patch < ${DISTDIR}/big-concurrency.patch
-
-	echo "Applying Ext2FS/ReiserFS patch..."
-	patch < ${FILESDIR}/${PV}-${PR}/qmail-linksync.patch
-
-	echo "Applying QMAILQUEUE patch..."
-	patch < ${FILESDIR}/${PV}-${PR}/qmail-queue.patch
-
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc" > conf-ld
-	echo "500" > conf-spawn
-
-}
-
-src_compile() {
-
-	cd ${S}
-
-	emake it man || die
-}
-
-
-
-src_install() {
-
-	cd ${S}
-
-	einfo "Setting up directory hierarchy ..."
-
-	diropts -m 755 -o root -g qmail
-	dodir /var/qmail
-
-	for i in bin boot control
-	do
-		dodir /var/qmail/${i}
-	done
-
-	dodir /var/qmail/users
-	keepdir /var/qmail/users
-
-	diropts -m 755 -o alias -g qmail
-	dodir /var/qmail/alias
-
-	einfo "Installing the qmail software ..."
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/boot
-	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
-
-	into /usr
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
-	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
-
-	insopts -o qmailq -g qmail -m 4711
-	insinto /var/qmail/bin
-	doins qmail-queue qmail-queue
-
-	insopts -o root -g qmail -m 700
-	insinto /var/qmail/bin
-	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-
-	insopts -o root -g qmail -m 711
-	insinto /var/qmail/bin
-	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
-	qmail-clean qmail-send splogger qmail-pw2u
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/bin
-	doins qmail-inject predate datemail mailsubj qmail-showctl \
-	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
-	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
-	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
-	condredirect bouncesaying except maildirmake maildir2mbox \
-	maildirwatch qail elq pinq config-fast
-
-	into /usr
-	for i in *.1 *.5 *.8
-	do
-		doman $i
-	done
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-
-	einfo "Setting up the default aliases ..."
-	diropts -m 700 -o alias -g qmail
-	if [ ! -d ${ROOT}/var/qmail/alias/.maildir ] ; then
-		dodir /var/qmail/alias/.maildir
-		for i in cur new tmp
-		do
-			dodir /var/qmail/alias/.maildir/$i
-		done
-	fi
-
-	for i in mailer-daemon postmaster root
-	do
-		touch ${D}/var/qmail/alias/.qmail-${i}
-		fowners alias:qmail /var/qmail/alias/.qmail-${i}
-	done
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	${D}/var/qmail/bin/maildirmake ${D}/etc/skel/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /etc/skel/.qmail
-	insinto /root
-	${D}/var/qmail/bin/maildirmake ${D}/root/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /root/.qmail
-
-	einfo "Setting up daemontools ..."
-	insopts -o root -g root -m 755
-	diropts -m 755 -o root -g root
-	dodir /var/qmail/supervise
-	dodir /var/qmail/supervise/qmail-send
-	dodir /var/qmail/supervise/qmail-send/log
-	dodir /var/qmail/supervise/qmail-smtpd
-	dodir /var/qmail/supervise/qmail-smtpd/log
-	chmod +t ${D}/var/qmail/supervise/qmail-send
-	chmod +t ${D}/var/qmail/supervise/qmail-smtpd
-	diropts -m 755 -o qmaill
-	dodir /var/log/qmail
-	keepdir /var/log/qmail
-	dodir /var/log/qmail/qmail-send
-	keepdir /var/log/qmail/qmail-send
-	dodir /var/log/qmail/qmail-smtpd
-	keepdir /var/log/qmail/qmail-smtpd
-
-	insinto /var/qmail/supervise/qmail-send
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsend run
-	insinto /var/qmail/supervise/qmail-send/log
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsendlog run
-	insinto /var/qmail/supervise/qmail-smtpd
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsmtpd run
-	insinto /var/qmail/supervise/qmail-smtpd/log
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsmtpdlog run
-
-	einfo "Installing the qmail control file ..."
-	exeinto /var/qmail/bin
-	doexe ${FILESDIR}/${PV}-${PR}/qmail-control
-
-	einfo "Installing the qmail startup file ..."
-	insinto /var/qmail
-	doins ${FILESDIR}/${PV}-${PR}/rc
-	insinto /var/qmail/control
-	doins ${FILESDIR}/${PV}-${PR}/defaultdelivery
-
-}
-
-pkg_postinst() {
-
-	einfo "Setting up the message queue hierarchy ..."
-
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo
-	install -d -m 700 -o qmailq -g qmail ${ROOT}/var/qmail/queue/pid
-	install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/bounce
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess
-
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-	do
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess/${i}
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo/${i}
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/intd/${i}
-	done
-
-	for i in info local remote
-	do
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/${i}
-	done
-
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-	do
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/info/${i}
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/local/${i}
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/remote/${i}
-	done
-
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/lock
-
-	dd if=/dev/zero of=${ROOT}/var/qmail/queue/lock/tcpto bs=1024 count=1
-	chmod 644 ${ROOT}/var/qmail/queue/lock/tcpto
-	chown qmailr:qmail ${ROOT}/var/qmail/queue/lock/tcpto
-
-	touch ${ROOT}/var/qmail/queue/lock/sendmutex
-	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
-	chown qmails:qmail ${ROOT}/var/qmail/queue/lock/sendmutex
-
-	mkfifo ${ROOT}/var/qmail/queue/lock/trigger
-	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
-	chown qmails:qmail ${ROOT}/var/qmail/queue/lock/trigger
-
-	echo -e "\e[32;01m Please do not forget to run, the following syntax :\033[0m"
-	echo -e "\e[32;01m ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config \033[0m"
-	echo -e "\e[32;01m This will setup qmail to run out-of-the-box on your system. \033[0m"
-	echo -e ""
-	echo -e "\e[32;01m To start qmail at boot you have to enable the /etc/init.d/svscan rc file \033[0m"
-	echo -e "\e[32;01m and create the following links : \033[0m"
-	echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-send /service/qmail-send \033[0m"
-	echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd \033[0m"
-
-}
-
-pkg_config() {
-
-export qhost=`hostname`
-	if [ ${ROOT} = "/" ] ; then
-		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost
-		fi
-	fi
-
-	echo "Accepting relaying by default from all ips configured on this machine."
-	LOCALIPS=`/sbin/ifconfig  | grep inet | cut -d " " -f 12 -s | cut -b 6-20`
-	for ip in $LOCALIPS; do
-		echo "$ip:allow,RELAYCLIENT=\"\"" >> /etc/tcp.smtp
-	done
-	echo ":allow" >> /etc/tcp.smtp
-
-	tcprules /etc/tcp.smtp.cdb /etc/tcp.smtp.tmp < /etc/tcp.smtp
-
-}
diff --git a/mail-mta/qmail/qmail-1.03-r9.ebuild b/mail-mta/qmail/qmail-1.03-r9.ebuild
deleted file mode 100644
index 477167a59828..000000000000
--- a/mail-mta/qmail/qmail-1.03-r9.ebuild
+++ /dev/null
@@ -1,312 +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/qmail/qmail-1.03-r9.ebuild,v 1.8 2005/03/03 18:43:27 ciaranm Exp $
-
-IUSE="ssl ldap selinux"
-
-DESCRIPTION="A modern replacement for sendmail which uses maildirs"
-HOMEPAGE="http://www.qmail.org/
-	http://www.jedi.claranet.fr/qmail-tuning.html
-	http://iain.cx/unix/qmail/mysql.php
-	http://www.nrg4u.com/"
-SRC_URI="http://cr.yp.to/software/qmail-1.03.tar.gz
-	http://www.qmail.org/big-todo.103.patch
-	http://www.qmail.org/big-concurrency.patch
-	http://www.ckdhr.com/ckd/qmail-103.patch
-	ldap? ( http://www.nrg4u.com/qmail/qmail-ldap-1.03-20020901.patch.gz )"
-
-DEPEND="virtual/libc
-	sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	>=net-mail/checkpassword-0.90
-	ldap? ( >=net-nds/openldap-2.0.25-r2 )
-	ssl? ( >=dev-libs/openssl-0.9.6e )"
-
-RDEPEND="!virtual/mta
-	virtual/libc
-	sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	>=sys-process/daemontools-0.76-r1
-	>=net-mail/checkpassword-0.90
-	>=net-mail/dot-forward-0.71
-	selinux? ( sec-policy/selinux-qmail )"
-
-PROVIDE="virtual/mta
-	 virtual/mda"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="-x86 -ppc -sparc"
-
-src_unpack() {
-
-	unpack qmail-1.03.tar.gz
-
-	use ldap && unpack qmail-ldap-1.03-20020901.patch.gz
-
-	cd ${S}
-
-	echo "Applying big-todo patch..."
-	patch < ${DISTDIR}/big-todo.103.patch || die "big-todo patch failed"
-
-	echo "Applying Ext2FS/ReiserFS patch..."
-	patch < ${FILESDIR}/${PV}-${PR}/qmail-linksync.patch || die "linksync patch failed"
-
-	echo "Applying QMAILQUEUE patch..."
-	patch < ${FILESDIR}/${PV}-${PR}/qmail-queue.patch || die "qmail queue patch failed"
-
-	if use ldap; then
-		echo "Applying ldap patches..."
-		patch -p1 < ${WORKDIR}/qmail-ldap-1.03-20020901.patch || die "ldap patch failed"
-		#patch -p1 < ${FILESDIR}/${PV}-${PR}/ldap-config.diff || die "ldap config patch failed"
-	else
-		echo "Applying dns patch..."
-		patch < ${DISTDIR}/qmail-103.patch || die "dns patch failed"
-
-		echo "Applying big-concurrency patch..."
-		patch < ${DISTDIR}/big-concurrency.patch || die "big-concurrency patch failed"
-
-		use ssl && patch < ${FILESDIR}/${PV}-${PR}/qmail-1.03-starttls-smtp-auth.patch || die "tls+auth patch failed"
-	fi
-
-	if use ssl; then
-		echo "gcc ${CFLAGS} -DTLS" > conf-cc
-	else
-		echo "gcc ${CFLAGS}" > conf-cc
-	fi
-	echo "gcc" > conf-ld
-	echo "500" > conf-spawn
-
-}
-
-src_compile() {
-
-	cd ${S}
-
-	emake it man || die
-
-}
-
-
-
-src_install() {
-
-	cd ${S}
-
-	einfo "Setting up directory hierarchy ..."
-
-	diropts -m 755 -o root -g qmail
-	dodir /var/qmail
-
-	for i in bin boot control
-	do
-		dodir /var/qmail/${i}
-	done
-
-	dodir /var/qmail/users
-	keepdir /var/qmail/users
-
-	diropts -m 755 -o alias -g qmail
-	dodir /var/qmail/alias
-
-	einfo "Installing the qmail software ..."
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/boot
-	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
-
-	into /usr
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
-	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
-
-	insopts -o qmailq -g qmail -m 4711
-	insinto /var/qmail/bin
-	doins qmail-queue qmail-queue
-
-	insopts -o root -g qmail -m 700
-	insinto /var/qmail/bin
-	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-
-	insopts -o root -g qmail -m 711
-	insinto /var/qmail/bin
-	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
-	qmail-clean qmail-send splogger qmail-pw2u
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/bin
-	doins qmail-inject predate datemail mailsubj qmail-showctl \
-	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
-	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
-	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
-	condredirect bouncesaying except maildirmake maildir2mbox \
-	maildirwatch qail elq pinq config-fast
-
-	into /usr
-	for i in *.1 *.5 *.8
-	do
-		doman $i
-	done
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-
-	einfo "Setting up the default aliases ..."
-	diropts -m 700 -o alias -g qmail
-	if [ ! -d ${ROOT}/var/qmail/alias/.maildir ] ; then
-		dodir /var/qmail/alias/.maildir
-		for i in cur new tmp
-		do
-			dodir /var/qmail/alias/.maildir/$i
-		done
-	fi
-
-	for i in mailer-daemon postmaster root
-	do
-		touch ${D}/var/qmail/alias/.qmail-${i}
-		fowners alias:qmail /var/qmail/alias/.qmail-${i}
-	done
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	${D}/var/qmail/bin/maildirmake ${D}/etc/skel/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /etc/skel/.qmail
-	insinto /root
-	${D}/var/qmail/bin/maildirmake ${D}/root/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /root/.qmail
-
-	einfo "Setting up daemontools ..."
-	insopts -o root -g root -m 755
-	diropts -m 755 -o root -g root
-	dodir /var/qmail/supervise
-	dodir /var/qmail/supervise/qmail-send
-	dodir /var/qmail/supervise/qmail-send/log
-	dodir /var/qmail/supervise/qmail-smtpd
-	dodir /var/qmail/supervise/qmail-smtpd/log
-	chmod +t ${D}/var/qmail/supervise/qmail-send
-	chmod +t ${D}/var/qmail/supervise/qmail-smtpd
-	diropts -m 755 -o qmaill
-	dodir /var/log/qmail
-	keepdir /var/log/qmail
-	dodir /var/log/qmail/qmail-send
-	keepdir /var/log/qmail/qmail-send
-	dodir /var/log/qmail/qmail-smtpd
-	keepdir /var/log/qmail/qmail-smtpd
-
-	insinto /var/qmail/supervise/qmail-send
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsend run
-	insinto /var/qmail/supervise/qmail-send/log
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsendlog run
-	insinto /var/qmail/supervise/qmail-smtpd
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsmtpd run
-	insinto /var/qmail/supervise/qmail-smtpd/log
-	newins ${FILESDIR}/${PV}-${PR}/run-qmailsmtpdlog run
-
-	einfo "Installing the qmail control file ..."
-	exeinto /var/qmail/bin
-	doexe ${FILESDIR}/${PV}-${PR}/qmail-control
-
-	einfo "Installing the qmail startup file ..."
-	insinto /var/qmail
-	doins ${FILESDIR}/${PV}-${PR}/rc
-	insinto /var/qmail/control
-	doins ${FILESDIR}/${PV}-${PR}/defaultdelivery
-
-}
-
-pkg_postinst() {
-
-	einfo "Setting up the message queue hierarchy ..."
-
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo
-	install -d -m 700 -o qmailq -g qmail ${ROOT}/var/qmail/queue/pid
-	install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/bounce
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess
-
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-	do
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess/${i}
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo/${i}
-		install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/intd/${i}
-	done
-
-	for i in info local remote
-	do
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/${i}
-	done
-
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-	do
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/info/${i}
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/local/${i}
-		install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/remote/${i}
-	done
-
-	install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/lock
-
-	dd if=/dev/zero of=${ROOT}/var/qmail/queue/lock/tcpto bs=1024 count=1
-	chmod 644 ${ROOT}/var/qmail/queue/lock/tcpto
-	chown qmailr:qmail ${ROOT}/var/qmail/queue/lock/tcpto
-
-	touch ${ROOT}/var/qmail/queue/lock/sendmutex
-	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
-	chown qmails:qmail ${ROOT}/var/qmail/queue/lock/sendmutex
-
-	mkfifo ${ROOT}/var/qmail/queue/lock/trigger
-	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
-	chown qmails:qmail ${ROOT}/var/qmail/queue/lock/trigger
-
-	echo -e "\e[32;01m Please do not forget to run, the following syntax :\033[0m"
-	echo -e "\e[32;01m ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config \033[0m"
-	echo -e "\e[32;01m This will setup qmail to run out-of-the-box on your system. \033[0m"
-	echo -e ""
-	echo -e "\e[32;01m To start qmail at boot you have to enable the /etc/init.d/svscan rc file \033[0m"
-	echo -e "\e[32;01m and create the following links : \033[0m"
-	echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-send /service/qmail-send \033[0m"
-	echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd \033[0m"
-
-
-	if use ssl; then
-		echo "Creating a self-signed ssl-cert:"
-		/usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem
-		chmod 640 /var/qmail/control/servercert.pem
-		chown qmaild:qmail /var/qmail/control/servercert.pem
-		ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem
-
-		echo -e "\e[32;01m If You want to have a signed cert, do the following: \033[0m"
-		echo -e "\e[32;01m openssl req -new -nodes -out req.pem \ \033[0m"
-		echo -e "\e[32;01m -keyout /var/qmail/control/servercert.pem \033[0m"
-		echo -e "\e[32;01m chmod 640 /var/qmail/control/servercert.pem \033[0m"
-		echo -e "\e[32;01m chown qmaild:qmail /var/qmail/control/servercert.pem \033[0m"
-		echo -e "\e[32;01m ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem \033[0m"
-		echo -e "\e[32;01m Send req.pem to your CA to obtain signed_req.pem, and do: \033[0m"
-		echo -e "\e[32;01m cat signed_req.pem >> /var/qmail/control/servercert.pem \033[0m"
-	fi
-
-}
-
-pkg_config() {
-
-export qhost=`hostname`
-	if [ ${ROOT} = "/" ] ; then
-		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost
-		fi
-	fi
-
-	echo "Accepting relaying by default from all ips configured on this machine."
-	LOCALIPS=`/sbin/ifconfig  | grep inet | cut -d " " -f 12 -s | cut -b 6-20`
-	for ip in $LOCALIPS; do
-		echo "$ip:allow,RELAYCLIENT=\"\"" >> /etc/tcp.smtp
-	done
-	echo ":allow" >> /etc/tcp.smtp
-
-	tcprules /etc/tcp.smtp.cdb /etc/tcp.smtp.tmp < /etc/tcp.smtp
-
-}