Remove old versions.

(Portage version: 2.1_pre4-r1)

12 files changed, 7 insertions, 554 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 6130ad49f2a2..b3647e2e8b62 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.20 2006/01/30 03:50:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.21 2006/01/30 04:04:28 robbat2 Exp $
+
+  30 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  -nullmailer-1.00_rc7.ebuild, -nullmailer-1.00_rc7-r1.ebuild,
+  -nullmailer-1.00_rc7-r2.ebuild, -nullmailer-1.00_rc7-r4.ebuild,
+  -nullmailer-1.00_rc7-r5.ebuild:
+  Remove old versions.
 
 *nullmailer-1.02 (30 Jan 2006)
 
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index e572ce68bd25..482a591603fd 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -4,21 +4,6 @@ SHA256 3a42b96df15642e1d3b5ec81edda1b4286a073e76c248a2732740fca5f2e77f8 ChangeLo
 MD5 06a9baa1496bffaed64ef1891cbe1d13 files/digest-nullmailer-1.00 247
 RMD160 e472f735603df6e727cf722e00c7d325a1fcfa69 files/digest-nullmailer-1.00 247
 SHA256 d65c51d9ad82d8df49abd94224a889e9ffa2748dc7953574c9371bc2716f0378 files/digest-nullmailer-1.00 247
-MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7 70
-RMD160 c9d5203905e7563c3b66d77b0d290dfa4e6750d1 files/digest-nullmailer-1.00_rc7 70
-SHA256 18e7d643406f4230c39b55f471fcdb5f411f616735ce150818e41cea306808b4 files/digest-nullmailer-1.00_rc7 70
-MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r1 70
-RMD160 c9d5203905e7563c3b66d77b0d290dfa4e6750d1 files/digest-nullmailer-1.00_rc7-r1 70
-SHA256 18e7d643406f4230c39b55f471fcdb5f411f616735ce150818e41cea306808b4 files/digest-nullmailer-1.00_rc7-r1 70
-MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r2 70
-RMD160 c9d5203905e7563c3b66d77b0d290dfa4e6750d1 files/digest-nullmailer-1.00_rc7-r2 70
-SHA256 18e7d643406f4230c39b55f471fcdb5f411f616735ce150818e41cea306808b4 files/digest-nullmailer-1.00_rc7-r2 70
-MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r4 70
-RMD160 c9d5203905e7563c3b66d77b0d290dfa4e6750d1 files/digest-nullmailer-1.00_rc7-r4 70
-SHA256 18e7d643406f4230c39b55f471fcdb5f411f616735ce150818e41cea306808b4 files/digest-nullmailer-1.00_rc7-r4 70
-MD5 639fa6e9d323b500b247ab367596cb29 files/digest-nullmailer-1.00_rc7-r5 143
-RMD160 f79f83943ae4f04b3d665e4969130d58d6c8ce9c files/digest-nullmailer-1.00_rc7-r5 143
-SHA256 2caa6fb466387b3491bdbb3e7b9a98617200b04d4222244539ba2c9d76a0fdc1 files/digest-nullmailer-1.00_rc7-r5 143
 MD5 43920fd55d8bc46cbd5a9e49eb36571b files/digest-nullmailer-1.02 500
 RMD160 9709467371178f6b5d91a069679b62235837da0a files/digest-nullmailer-1.02 500
 SHA256 2210806664c8cb8c20146cff21be42c1f46ca311959019e19299f2c939db8ff6 files/digest-nullmailer-1.02 500
@@ -46,21 +31,6 @@ SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540 metadata
 MD5 d4e805efb1d3b2e50c998385b843eaf8 nullmailer-1.00.ebuild 4063
 RMD160 f0cae7caed44de2bcb8f7973c930797f0ecbd1f7 nullmailer-1.00.ebuild 4063
 SHA256 475d36030ac457fe80f07bb5f18d59047da0ceb29cbe8bf4159c8f38f6a986dd nullmailer-1.00.ebuild 4063
-MD5 0a3268172648b4e421507917392a5b4e nullmailer-1.00_rc7-r1.ebuild 3102
-RMD160 f9210a64271f26e4824a8ff2fb51c9cb03b1955c nullmailer-1.00_rc7-r1.ebuild 3102
-SHA256 7d29cb7de512ecf77b162cc375b90710f82b908bd51410dc21e6bd8bf1c4ce6a nullmailer-1.00_rc7-r1.ebuild 3102
-MD5 52ec79f027ce456d57c887779c9012f3 nullmailer-1.00_rc7-r2.ebuild 3453
-RMD160 206262a114c87bc4d004589c051e437c1a2afdec nullmailer-1.00_rc7-r2.ebuild 3453
-SHA256 b9b0379e03d3ef6577a8156bfa07833f49990714192fe792684c75748788f112 nullmailer-1.00_rc7-r2.ebuild 3453
-MD5 0b62f146f078fb8ca6c3882cf7beacd8 nullmailer-1.00_rc7-r4.ebuild 3750
-RMD160 3255eede14626bca6b2a4452e7337117b54244ac nullmailer-1.00_rc7-r4.ebuild 3750
-SHA256 25b6bceab6932c9e00643847975ff46b87f5252e1c0987b368ead9888d5e0ca9 nullmailer-1.00_rc7-r4.ebuild 3750
-MD5 8006d00f06f72fcfeb67b8a7c9fa8616 nullmailer-1.00_rc7-r5.ebuild 4354
-RMD160 1e659965919b72dbc5b8b56d9568d58917b88b65 nullmailer-1.00_rc7-r5.ebuild 4354
-SHA256 41530d9a224243ba3adc1ea68333b3994a69873510f7ca2af1f31d24ed5c07fd nullmailer-1.00_rc7-r5.ebuild 4354
-MD5 924e99d087a6b09c6dca72afeccf5eca nullmailer-1.00_rc7.ebuild 3151
-RMD160 e783ce992092881caff7b2c8711f64ef2c4edf51 nullmailer-1.00_rc7.ebuild 3151
-SHA256 483215a2423d949d522c6c73f984413950bb16679ac962cb6f9f0f2f155585a8 nullmailer-1.00_rc7.ebuild 3151
 MD5 5506bf114c5fb6e918ac444ad8a47f5c nullmailer-1.02.ebuild 4441
 RMD160 c122c3394febf10a4e731e364c78ced0c4cd99ca nullmailer-1.02.ebuild 4441
 SHA256 74454d1e67ca9eb84779dbe2658b135aec9166735d9afdbf7263e6db38412202 nullmailer-1.02.ebuild 4441
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7 b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7
deleted file mode 100644
index d67f55c171d8..000000000000
--- a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r1 b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r1
deleted file mode 100644
index d67f55c171d8..000000000000
--- a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r2 b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r2
deleted file mode 100644
index d67f55c171d8..000000000000
--- a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r4 b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r4
deleted file mode 100644
index d67f55c171d8..000000000000
--- a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r5 b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r5
deleted file mode 100644
index edf6986401b1..000000000000
--- a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
-MD5 6afd79fb3e644b2f89acafdea983e0d1 nullmailer_1.00RC7-22.diff.gz 17964
diff --git a/mail-mta/nullmailer/nullmailer-1.00_rc7-r1.ebuild b/mail-mta/nullmailer/nullmailer-1.00_rc7-r1.ebuild
deleted file mode 100644
index 182711416edc..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.00_rc7-r1.ebuild
+++ /dev/null
@@ -1,92 +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/nullmailer/nullmailer-1.00_rc7-r1.ebuild,v 1.8 2005/12/31 14:18:03 flameeyes Exp $
-
-inherit eutils
-
-MY_P="${P/_rc/RC}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple relay-only local mail transport agent"
-SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://untroubled.org/${PN}/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/libc
-		sys-apps/groff"
-RDEPEND="!virtual/mta
-		virtual/libc
-		>=sys-process/supervise-scripts-3.2
-		>=sys-process/daemontools-0.76-r1
-		sys-apps/shadow"
-PROVIDE="virtual/mta"
-
-NULLMAILER_GROUP_NAME=nullmail
-NULLMAILER_GROUP_GID=88
-NULLMAILER_USER_NAME=nullmail
-NULLMAILER_USER_UID=88
-NULLMAILER_USER_SHELL=-1
-NULLMAILER_USER_GROUPS=nullmail
-NULLMAILER_USER_HOME=/var/nullmailer
-
-setupuser() {
-	enewgroup ${NULLMAILER_GROUP_NAME} ${NULLMAILER_GROUP_GID}
-	enewuser ${NULLMAILER_USER_NAME} ${NULLMAILER_USER_UID} ${NULLMAILER_USER_SHELL} ${NULLMAILER_USER_HOME} ${NULLMAILER_USER_GROUPS}
-}
-
-pkg_setup() {
-	setupuser
-}
-
-src_compile() {
-	# Note that we pass a different directory below due to bugs in the makefile!
-	econf --localstatedir=/var || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	einstall localstatedir=${D}/var/nullmailer || die "einstall failed"
-	dodoc AUTHORS BUGS COPYING HOWTO INSTALL NEWS README YEAR2000 TODO ChangeLog
-	# A small bit of sample config
-	dodir /etc/nullmailer
-	cp ${FILESDIR}/remotes.sample ${D}/etc/nullmailer/remotes
-	# daemontools stuff
-	dodir /var/nullmailer/service{,/log}
-	cp scripts/nullmailer.run ${D}/var/nullmailer/service/run
-	fperms 700 /var/nullmailer/service/run
-	cp scripts/nullmailer-log.run ${D}/var/nullmailer/service/log/run
-	fperms 700 /var/nullmailer/service/log/run
-	# usablity
-	dodir /usr/lib
-	dosym /usr/sbin/sendmail usr/lib/sendmail
-	# permissions stuff
-	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	fperms 660 /var/nullmailer/trigger
-}
-
-pkg_config() {
-	[ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me
-	[ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain
-}
-
-pkg_postinst() {
-	setupuser
-	# Do this again for good measure
-	[ ! -e /var/nullmailer/trigger ] && mkfifo /var/nullmailer/trigger
-	chown nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	chmod 660 /var/nullmailer/trigger
-
-	einfo "To create an initial setup, please do:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following links :"
-	einfo "ln -fs /var/nullmailer/service /service/nullmailer"
-}
diff --git a/mail-mta/nullmailer/nullmailer-1.00_rc7-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.00_rc7-r2.ebuild
deleted file mode 100644
index f66227295841..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.00_rc7-r2.ebuild
+++ /dev/null
@@ -1,97 +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/nullmailer/nullmailer-1.00_rc7-r2.ebuild,v 1.8 2005/12/31 14:18:03 flameeyes Exp $
-
-inherit eutils
-
-MY_P="${P/_rc/RC}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple relay-only local mail transport agent"
-SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://untroubled.org/${PN}/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-		sys-apps/groff"
-RDEPEND="!virtual/mta
-		virtual/libc
-		>=sys-process/supervise-scripts-3.2
-		>=sys-process/daemontools-0.76-r1
-		sys-apps/shadow"
-PROVIDE="virtual/mta"
-
-NULLMAILER_GROUP_NAME=nullmail
-NULLMAILER_GROUP_GID=88
-NULLMAILER_USER_NAME=nullmail
-NULLMAILER_USER_UID=88
-NULLMAILER_USER_SHELL=-1
-NULLMAILER_USER_GROUPS=nullmail
-NULLMAILER_USER_HOME=/var/nullmailer
-
-setupuser() {
-	enewgroup ${NULLMAILER_GROUP_NAME} ${NULLMAILER_GROUP_GID}
-	enewuser ${NULLMAILER_USER_NAME} ${NULLMAILER_USER_UID} ${NULLMAILER_USER_SHELL} ${NULLMAILER_USER_HOME} ${NULLMAILER_USER_GROUPS}
-}
-
-pkg_setup() {
-	setupuser
-}
-
-src_compile() {
-	# Note that we pass a different directory below due to bugs in the makefile!
-	econf --localstatedir=/var || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	einstall localstatedir=${D}/var/nullmailer || die "einstall failed"
-	mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.nullmailer
-	mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.nullmailer
-	dodoc AUTHORS BUGS COPYING HOWTO INSTALL NEWS README YEAR2000 TODO ChangeLog
-	# A small bit of sample config
-	dodir /etc/nullmailer
-	cp ${FILESDIR}/remotes.sample ${D}/etc/nullmailer/remotes
-	# daemontools stuff
-	dodir /var/nullmailer/service{,/log}
-	cp scripts/nullmailer.run ${D}/var/nullmailer/service/run
-	fperms 700 /var/nullmailer/service/run
-	cp scripts/nullmailer-log.run ${D}/var/nullmailer/service/log/run
-	fperms 700 /var/nullmailer/service/log/run
-	# usablity
-	dodir /usr/lib
-	dosym /usr/sbin/sendmail usr/lib/sendmail
-	# permissions stuff
-	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	fperms 660 /var/nullmailer/trigger
-	ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
-
-pkg_config() {
-	[ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me
-	[ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain
-	ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
-
-pkg_postinst() {
-	setupuser
-	# Do this again for good measure
-	[ ! -e /var/nullmailer/trigger ] && mkfifo /var/nullmailer/trigger
-	chown nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	chmod 660 /var/nullmailer/trigger
-
-	einfo "To create an initial setup, please do:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following links :"
-	einfo "ln -fs /var/nullmailer/service /service/nullmailer"
-	ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
diff --git a/mail-mta/nullmailer/nullmailer-1.00_rc7-r4.ebuild b/mail-mta/nullmailer/nullmailer-1.00_rc7-r4.ebuild
deleted file mode 100644
index b7356d757805..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.00_rc7-r4.ebuild
+++ /dev/null
@@ -1,109 +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/nullmailer/nullmailer-1.00_rc7-r4.ebuild,v 1.8 2005/12/31 14:18:03 flameeyes Exp $
-
-inherit eutils
-
-MY_P="${P/_rc/RC}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple relay-only local mail transport agent"
-SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://untroubled.org/${PN}/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="mailwrapper"
-
-DEPEND="virtual/libc
-		sys-apps/groff"
-RDEPEND="!mailwrapper? ( !virtual/mta )
-		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-		virtual/libc
-		>=sys-process/supervise-scripts-3.2
-		>=sys-process/daemontools-0.76-r1
-		sys-apps/shadow"
-PROVIDE="virtual/mta"
-
-NULLMAILER_GROUP_NAME=nullmail
-NULLMAILER_GROUP_GID=88
-NULLMAILER_USER_NAME=nullmail
-NULLMAILER_USER_UID=88
-NULLMAILER_USER_SHELL=-1
-NULLMAILER_USER_GROUPS=nullmail
-NULLMAILER_USER_HOME=/var/nullmailer
-
-setupuser() {
-	enewgroup ${NULLMAILER_GROUP_NAME} ${NULLMAILER_GROUP_GID}
-	enewuser ${NULLMAILER_USER_NAME} ${NULLMAILER_USER_UID} ${NULLMAILER_USER_SHELL} ${NULLMAILER_USER_HOME} ${NULLMAILER_USER_GROUPS}
-}
-
-pkg_setup() {
-	setupuser
-}
-
-src_compile() {
-	# Note that we pass a different directory below due to bugs in the makefile!
-	econf --localstatedir=/var || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	einstall localstatedir=${D}/var/nullmailer || die "einstall failed"
-	if use mailwrapper; then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.nullmailer
-		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.nullmailer
-		dosym /usr/sbin/sendmail /usr/bin/mailq
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	fi
-	dodoc AUTHORS BUGS COPYING HOWTO INSTALL NEWS README YEAR2000 TODO ChangeLog
-	# A small bit of sample config
-	dodir /etc/nullmailer
-	insinto /etc/nullmailer
-	newins ${FILESDIR}/remotes.sample remotes
-	# daemontools stuff
-	dodir /var/nullmailer/service{,/log}
-	insinto /var/nullmailer/service
-	newins scripts/nullmailer.run run
-	fperms 700 /var/nullmailer/service/run
-	insinto /var/nullmailer/service/log
-	newins scripts/nullmailer-log.run run
-	fperms 700 /var/nullmailer/service/log/run
-	# usablity
-	dodir /usr/lib
-	dosym /usr/sbin/sendmail usr/lib/sendmail
-	# permissions stuff
-	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	fperms 660 /var/nullmailer/trigger
-	use mailwrapper && \
-		ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
-
-pkg_config() {
-	[ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me
-	[ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain
-	use mailwrapper && \
-		ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
-
-pkg_postinst() {
-	setupuser
-	# Do this again for good measure
-	[ ! -e /var/nullmailer/trigger ] && mkfifo /var/nullmailer/trigger
-	chown nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	chmod 660 /var/nullmailer/trigger
-
-	einfo "To create an initial setup, please do:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following links :"
-	einfo "ln -fs /var/nullmailer/service /service/nullmailer"
-	use mailwrapper && \
-		ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
diff --git a/mail-mta/nullmailer/nullmailer-1.00_rc7-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.00_rc7-r5.ebuild
deleted file mode 100644
index 2b3fedd4bd6b..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.00_rc7-r5.ebuild
+++ /dev/null
@@ -1,125 +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/nullmailer/nullmailer-1.00_rc7-r5.ebuild,v 1.6 2005/12/31 14:18:03 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_rc/RC}"
-S=${WORKDIR}/${MY_P}
-DEBIAN_PATCH="${MY_P/-/_}-22.diff.gz"
-DESCRIPTION="Simple relay-only local mail transport agent"
-SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz mirror://debian//pool/main/${PN:0:1}/${PN}/${DEBIAN_PATCH}"
-HOMEPAGE="http://untroubled.org/${PN}/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="mailwrapper"
-
-DEPEND="virtual/libc
-		sys-apps/groff"
-RDEPEND="!mailwrapper? ( !virtual/mta )
-		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-		virtual/libc
-		>=sys-process/supervise-scripts-3.2
-		>=sys-process/daemontools-0.76-r1
-		sys-apps/shadow"
-PROVIDE="virtual/mta"
-
-NULLMAILER_GROUP_NAME=nullmail
-NULLMAILER_GROUP_GID=88
-NULLMAILER_USER_NAME=nullmail
-NULLMAILER_USER_UID=88
-NULLMAILER_USER_SHELL=-1
-NULLMAILER_USER_GROUPS=nullmail
-NULLMAILER_USER_HOME=/var/nullmailer
-
-setupuser() {
-	enewgroup ${NULLMAILER_GROUP_NAME} ${NULLMAILER_GROUP_GID}
-	enewuser ${NULLMAILER_USER_NAME} ${NULLMAILER_USER_UID} ${NULLMAILER_USER_SHELL} ${NULLMAILER_USER_HOME} ${NULLMAILER_USER_GROUPS}
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	mkdir -p ${S}/debian
-	epatch ${DISTDIR}/${DEBIAN_PATCH} || die "debian patch failed"
-	local debianpatch
-	# we don't want 02*diff
-	for i in 01syslog.diff 03addrdot.diff 04pine.diff 05perm.diff 06g++.diff 07smtp.diff; do
-		debianpatch="${S}/debian/patches/${i}"
-		sed -e 's, (Debian only),,g' -i "${debianpatch}" || die "patch sed failed"
-		EPATCH_OPTS="-d ${S} -p1" epatch "${debianpatch}" || die "epatch failed"
-	done;
-}
-
-
-pkg_setup() {
-	setupuser
-}
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-	# Note that we pass a different directory below due to bugs in the makefile!
-	econf --localstatedir=/var || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	einstall localstatedir=${D}/var/nullmailer || die "einstall failed"
-	if use mailwrapper; then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.nullmailer
-		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.nullmailer
-		dosym /usr/sbin/sendmail /usr/bin/mailq
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	fi
-	dodoc AUTHORS BUGS COPYING HOWTO INSTALL NEWS README YEAR2000 TODO ChangeLog
-	# A small bit of sample config
-	dodir /etc/nullmailer
-	insinto /etc/nullmailer
-	newins ${FILESDIR}/remotes.sample remotes
-	# daemontools stuff
-	dodir /var/nullmailer/service{,/log}
-	insinto /var/nullmailer/service
-	newins scripts/nullmailer.run run
-	fperms 700 /var/nullmailer/service/run
-	insinto /var/nullmailer/service/log
-	newins scripts/nullmailer-log.run run
-	fperms 700 /var/nullmailer/service/log/run
-	# usablity
-	dodir /usr/lib
-	dosym /usr/sbin/sendmail usr/lib/sendmail
-	# permissions stuff
-	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	fperms 660 /var/nullmailer/trigger
-	use mailwrapper && \
-		ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
-
-pkg_config() {
-	[ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me
-	[ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain
-	use mailwrapper && \
-		ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
-
-pkg_postinst() {
-	setupuser
-	# Do this again for good measure
-	[ ! -e /var/nullmailer/trigger ] && mkfifo /var/nullmailer/trigger
-	chown nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	chmod 660 /var/nullmailer/trigger
-
-	einfo "To create an initial setup, please do:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following link :"
-	einfo "ln -fs /var/nullmailer/service /service/nullmailer"
-	use mailwrapper && \
-		ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
-}
diff --git a/mail-mta/nullmailer/nullmailer-1.00_rc7.ebuild b/mail-mta/nullmailer/nullmailer-1.00_rc7.ebuild
deleted file mode 100644
index 780c02657de1..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.00_rc7.ebuild
+++ /dev/null
@@ -1,94 +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/nullmailer/nullmailer-1.00_rc7.ebuild,v 1.8 2005/12/31 14:18:03 flameeyes Exp $
-
-inherit eutils
-
-MY_P="${P/_rc/RC}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple relay-only local mail transport agent"
-SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://untroubled.org/${PN}/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-		sys-apps/groff"
-RDEPEND="!virtual/mta
-		virtual/libc
-		>=sys-process/supervise-scripts-3.2
-		>=sys-process/daemontools-0.76-r1
-		sys-apps/shadow"
-PROVIDE="virtual/mta"
-
-NULLMAILER_GROUP_NAME=nullmail
-NULLMAILER_GROUP_GID=88
-NULLMAILER_USER_NAME=nullmail
-NULLMAILER_USER_UID=88
-NULLMAILER_USER_SHELL=-1
-NULLMAILER_USER_GROUPS=nullmail
-NULLMAILER_USER_HOME=/var/nullmailer
-
-setupuser() {
-	enewgroup ${NULLMAILER_GROUP_NAME} ${NULLMAILER_GROUP_GID}
-	enewuser ${NULLMAILER_USER_NAME} ${NULLMAILER_USER_UID} ${NULLMAILER_USER_SHELL} ${NULLMAILER_USER_HOME} ${NULLMAILER_USER_GROUPS}
-}
-
-pkg_setup() {
-	setupuser
-}
-
-src_compile() {
-	# Note that we pass a different directory below due to bugs in the makefile!
-	econf --localstatedir=/var || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	einstall localstatedir=${D}/var/nullmailer || die "einstall failed"
-	dodoc AUTHORS BUGS COPYING HOWTO INSTALL NEWS README YEAR2000 TODO ChangeLog
-	# A small bit of sample config
-	dodir /etc/nullmailer
-	cp ${FILESDIR}/remotes.sample ${D}/etc/nullmailer/remotes
-	# daemontools stuff
-	dodir /var/nullmailer/service{,/log}
-	cp scripts/nullmailer.run ${D}/var/nullmailer/service/run
-	fperms 700 /var/nullmailer/service/run
-	cp scripts/nullmailer-log.run ${D}/var/nullmailer/service/log/run
-	fperms 700 /var/nullmailer/service/log/run
-	# usablity
-	dodir /usr/lib
-	dosym /usr/sbin/sendmail usr/lib/sendmail
-	# permissions stuff
-	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fowners root:nullmail /usr/sbin/nullmailer-queue
-	fperms g+s /usr/sbin/nullmailer-queue
-	fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	fperms 660 /var/nullmailer/trigger
-}
-
-pkg_config() {
-	[ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me
-	[ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain
-}
-
-pkg_postinst() {
-	setupuser
-	# Do this again for good measure
-	[ ! -e /var/nullmailer/trigger ] && mkfifo /var/nullmailer/trigger
-	chown root:nullmail /usr/sbin/nullmailer-queue
-	chown nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
-	chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	chmod g+s /usr/sbin/nullmailer-queue
-	chmod 660 /var/nullmailer/trigger
-
-	einfo "To create an initial setup, please do:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following links :"
-	einfo "ln -fs /var/nullmailer/service /service/nullmailer"
-}