cleanup

15 files changed, 12 insertions, 515 deletions

diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 6f55927a0264..bbd7c2df34ca 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,17 +1,13 @@
-MD5 3153e54df9fb507dc7ae0bd8be50fb4c ChangeLog 5383
-MD5 90d4a4ecf8b547ecec843fc2ec9c8315 fetchmail-6.2.2.ebuild 1788
-MD5 99d40ddff2edffdce93d5bd7d9bb42ec fetchmail-6.2.2-r1.ebuild 1984
+MD5 888192613c9923b973b03ec5cbfec9d9 ChangeLog 5383
 MD5 d7a2a5454208f393dcfbf0c9ebad98c9 fetchmail-5.9.14.ebuild 1941
-MD5 d6495f128b17c6db763d2643fffd4381 fetchmail-6.2.2-r2.ebuild 1947
 MD5 64bf477646087eebe46e8acd9e3c3dac fetchmail-6.2.1-r1.ebuild 1789
-MD5 f6bb533591550f2f5978892a3e0a6fc6 files/conf.d-fetchmail 359
+MD5 71e6bdc8a05311118f8c32cdecf2e64a fetchmail-6.2.2-r2.ebuild 2053
 MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
-MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2 68
 MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
-MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r1 68
-MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
+MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
 MD5 c9baecd4bea485a075f696462c9ab6cc files/fetchmail 581
 MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
-MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
 MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
-MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
+MD5 f6bb533591550f2f5978892a3e0a6fc6 files/conf.d-fetchmail 359
+MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
+MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
diff --git a/net-mail/fetchmail/fetchmail-6.2.2-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.2-r1.ebuild
deleted file mode 100644
index 9d15eabec6a1..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.2-r1.ebuild,v 1.2 2003/03/31 19:56:18 avenj Exp $
-
-inherit eutils
-
-DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/fetchmail/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="x86 ~alpha"
-IUSE="ssl nls ipv6"
-
-DEPEND="virtual/glibc
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fetchmail-6.2.0-gentoo.diff || die
-}
-
-src_compile() {
-	local myconf
-	use ssl && myconf="${myconf} --with-ssl=/usr"
-	use nls || myconf="${myconf} --disable-nls"
-	use ipv6 && myconf="${myconf} --enable-inet6"
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die	
-	
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-	
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-	
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d-fetchmail fetchmail
-	
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
-	einfo "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.2.ebuild b/net-mail/fetchmail/fetchmail-6.2.2.ebuild
deleted file mode 100644
index 3002b721b8ff..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.2.ebuild,v 1.2 2003/03/26 00:37:35 drobbins Exp $
-
-inherit eutils
-
-DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/fetchmail/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="x86 ~alpha"
-IUSE="ssl nls ipv6"
-
-DEPEND="virtual/glibc
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fetchmail-6.2.0-gentoo.diff || die
-}
-
-src_compile() {
-	local myconf
-	use ssl && myconf="${myconf} --with-ssl=/usr"
-	use nls || myconf="${myconf} --disable-nls"
-	use ipv6 && myconf="${myconf} --enable-inet6"
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die	
-	
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-	
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-	
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-	
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-}
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.2 b/net-mail/fetchmail/files/digest-fetchmail-6.2.2
deleted file mode 100644
index a1f977811cec..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3544890a2452b5b04c709c65109c43a fetchmail-6.2.2.tar.gz 1205198
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.2-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.2.2-r1
deleted file mode 100644
index a1f977811cec..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3544890a2452b5b04c709c65109c43a fetchmail-6.2.2.tar.gz 1205198
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 64a90dc8cf46..b3d120168951 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,15 +1,7 @@
-MD5 ea28f9c1907e2ce2ded3f9322ff2e38d mailman-2.0.12.ebuild 2083
-MD5 ce6937efe1b9b2c81907050e31e34378 mailman-2.1.1-r1.ebuild 2712
-MD5 56d0300c139c8e9d0db16c662ca92f59 mailman-2.1.1.ebuild 2482
-MD5 a7700a2cb6070e1977b8f9ef790c67ad mailman-2.1.ebuild 2489
-MD5 ddc361a8f2c9e4ae26324c5846665cef mailman-2.1.1-r2.ebuild 2713
 MD5 04c7220a7f0eb8ce7d7da969992b1c87 ChangeLog 1486
+MD5 ddc361a8f2c9e4ae26324c5846665cef mailman-2.1.1-r2.ebuild 2713
 MD5 648adfcb9a609c3b9977421a2b8eb606 mailman-2.1.1-r3.ebuild 2867
 MD5 9e00a0641afbe041944feb97bfb5f80d files/README.gentoo 1370
-MD5 55be2eab933580039c9feb4796c3bcf9 files/digest-mailman-2.0.12 63
-MD5 2172743b0a9160821702fe304a875392 files/digest-mailman-2.1 61
-MD5 3163b3164584897610113805a484fd2d files/digest-mailman-2.1.1 63
-MD5 3163b3164584897610113805a484fd2d files/digest-mailman-2.1.1-r1 63
 MD5 fe71ab4dfe5cf773c56053a21ce6a7d6 files/mailman.conf 410
 MD5 4e8df002cf51ad9f2f2195c26246aaba files/mailman.rc 559
 MD5 3163b3164584897610113805a484fd2d files/digest-mailman-2.1.1-r2 63
diff --git a/net-mail/mailman/files/digest-mailman-2.0.12 b/net-mail/mailman/files/digest-mailman-2.0.12
deleted file mode 100644
index b978380555de..000000000000
--- a/net-mail/mailman/files/digest-mailman-2.0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94999f0954ff91e880a2102717c0474e mailman-2.0.12.tgz 415993
diff --git a/net-mail/mailman/files/digest-mailman-2.1 b/net-mail/mailman/files/digest-mailman-2.1
deleted file mode 100644
index 143990dab9b5..000000000000
--- a/net-mail/mailman/files/digest-mailman-2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d486abaa1404e2fe93d72d3cdd9c84af mailman-2.1.tgz 5466418
diff --git a/net-mail/mailman/files/digest-mailman-2.1.1 b/net-mail/mailman/files/digest-mailman-2.1.1
deleted file mode 100644
index 16cd1f01a87b..000000000000
--- a/net-mail/mailman/files/digest-mailman-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f7cdc52a40a17a2c7ee91c5f4dd675d mailman-2.1.1.tgz 5473754
diff --git a/net-mail/mailman/files/digest-mailman-2.1.1-r1 b/net-mail/mailman/files/digest-mailman-2.1.1-r1
deleted file mode 100644
index 16cd1f01a87b..000000000000
--- a/net-mail/mailman/files/digest-mailman-2.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f7cdc52a40a17a2c7ee91c5f4dd675d mailman-2.1.1.tgz 5473754
diff --git a/net-mail/mailman/mailman-2.0.12.ebuild b/net-mail/mailman/mailman-2.0.12.ebuild
deleted file mode 100644
index e542437da44b..000000000000
--- a/net-mail/mailman/mailman-2.0.12.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.0.12.ebuild,v 1.9 2003/02/13 14:33:42 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU Mailman, the mailing list server with webinterface"
-SRC_URI="ftp://ftp.gnu.org/gnu/mailman/mailman-2.0.12.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="O"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
-
-DEPEND=">=dev-lang/python-1.5.2
-	virtual/mta
-	net-www/apache"
-
-INSTALLDIR="/var/mailman"
-APACHEGID="81"
-MAILGID="65534"
-
-pkg_setup() {
-        if ! grep -q ^mailman: /etc/group ; then
-                groupadd -g 280 mailman || die "problem adding group mailman"
-        fi
-        if ! grep -q ^mailman: /etc/passwd ; then
-                useradd -u 280 -g mailman -G cron -s /bin/bash \
-					-d ${INSTALLDIR} -c "mailman" mailman
-        fi
-	mkdir -p ${INSTALLDIR}
-	chown mailman.mailman ${INSTALLDIR}
-	chmod 2775 ${INSTALLDIR}
-}
-
-src_compile() {
-        cd ${S}
-        ./configure \
-                --prefix=${INSTALLDIR} \
-                --with-mail-gid=${MAILGID} \
-                --with-cgi-gid=${APACHEGID}
-        make || die
-}
-
-src_install () {
-	ID=${D}${INSTALLDIR}
-        cd ${S}
-        mkdir -p ${ID}
-        chown -R mailman.mailman ${ID}
-        chmod 2775 ${ID}
-        make prefix=${ID} var_prefix=${ID} doinstall || die
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mailman.conf
-	
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING
-}
-
-pkg_postinst() {
-	cd ${INSTALLDIR}
-	bin/update
-	bin/check_perms -f
-		einfo
-		einfo "Please read /usr/share/doc/${P}/README.gentoo.gz for additional"
-		einfo "Setup information, mailman will NOT run unless you follow"
-		einfo "those instructions!"
-}
-
-pkg_config() {
-		einfo "Updating apache config"
-		einfo "added: \"Include  conf/addon-modules/mailman.conf\""
-		einfo "to ${ROOT}/etc/apache/conf/apache.conf"
-        echo "Include  conf/addon-modules/mailman.conf" \
-                >> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-mail/mailman/mailman-2.1.1-r1.ebuild b/net-mail/mailman/mailman-2.1.1-r1.ebuild
deleted file mode 100644
index 271c40ca30ec..000000000000
--- a/net-mail/mailman/mailman-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.1-r1.ebuild,v 1.1 2003/04/18 22:44:25 mholzer Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU Mailman, the mailing list server with webinterface"
-SRC_URI="mirror://gnu/${PN}/${P}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="O"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
-
-DEPEND=">=dev-lang/python-1.5.2
-	virtual/mta
-	net-www/apache"
-
-INSTALLDIR="/var/mailman"
-APACHEGID="81"
-MAILGID="65534"
-
-pkg_setup() {
-        if ! grep -q ^mailman: /etc/group ; then
-                groupadd -g 280 mailman || die "problem adding group mailman"
-        fi
-        if ! grep -q ^mailman: /etc/passwd ; then
-                useradd -u 280 -g mailman -G cron -s /bin/bash \
-					-d ${INSTALLDIR} -c "mailman" mailman
-        fi
-	mkdir -p ${INSTALLDIR}
-	chown mailman.mailman ${INSTALLDIR}
-	chmod 2775 ${INSTALLDIR}
-}
-
-src_compile() {
-        cd ${S}
-        ./configure \
-                --prefix=${INSTALLDIR} \
-                --with-mail-gid=${MAILGID} \
-                --with-cgi-gid=${APACHEGID}
-        make || die
-}
-
-src_install () {
-	ID=${D}${INSTALLDIR}
-        cd ${S}
-        mkdir -p ${ID}
-        chown -R mailman.mailman ${ID}
-        chmod 2775 ${ID}
-        make prefix=${ID} var_prefix=${ID} doinstall || die
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mailman.conf
-	
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING
-	dodoc contrib/README.check_perms_grsecurity contrib/mm-handler.readme
-	dodoc contrib/virtusertable contrib/mailman.mc
-
-	cp contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler* ${D}/var/mailman/bin
-
-	# Save the old config into the new package as CONFIG_PROTECT
-	# doesn't work for this package.
-	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
-		rm ${D}/var/mailman/Mailman/mm_cfg.py
-		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
-			${D}/var/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved."
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mailman.rc mailman
-	}
-
-pkg_postinst() {
-	cd ${INSTALLDIR}
-	bin/update
-	bin/check_perms -f
-	einfo
-	einfo "Please read /usr/share/doc/${PF}/README.gentoo.gz for additional"
-	einfo "Setup information, mailman will NOT run unless you follow"
-	einfo "those instructions!"
-}
-
-pkg_config() {
-	einfo "Updating apache config"
-	einfo "added: \"Include  conf/addon-modules/mailman.conf\""
-	einfo "to ${ROOT}/etc/apache/conf/apache.conf"
-        echo "Include  conf/addon-modules/mailman.conf" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-mail/mailman/mailman-2.1.1.ebuild b/net-mail/mailman/mailman-2.1.1.ebuild
deleted file mode 100644
index ef94dd4502d5..000000000000
--- a/net-mail/mailman/mailman-2.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.1.ebuild,v 1.1 2003/02/17 08:39:30 aliz Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU Mailman, the mailing list server with webinterface"
-SRC_URI="mirror://gnu/mailman/${P}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="O"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
-
-DEPEND=">=dev-lang/python-1.5.2
-	virtual/mta
-	net-www/apache"
-
-INSTALLDIR="/var/mailman"
-APACHEGID="81"
-MAILGID="65534"
-
-pkg_setup() {
-        if ! grep -q ^mailman: /etc/group ; then
-                groupadd -g 280 mailman || die "problem adding group mailman"
-        fi
-        if ! grep -q ^mailman: /etc/passwd ; then
-                useradd -u 280 -g mailman -G cron -s /bin/bash \
-					-d ${INSTALLDIR} -c "mailman" mailman
-        fi
-	mkdir -p ${INSTALLDIR}
-	chown mailman.mailman ${INSTALLDIR}
-	chmod 2775 ${INSTALLDIR}
-}
-
-src_compile() {
-        cd ${S}
-        ./configure \
-                --prefix=${INSTALLDIR} \
-                --with-mail-gid=${MAILGID} \
-                --with-cgi-gid=${APACHEGID}
-        make || die
-}
-
-src_install () {
-	ID=${D}${INSTALLDIR}
-        cd ${S}
-        mkdir -p ${ID}
-        chown -R mailman.mailman ${ID}
-        chmod 2775 ${ID}
-        make prefix=${ID} var_prefix=${ID} doinstall || die
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mailman.conf
-	
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING
-	# Save the old config into the new package as CONFIG_PROTECT
-	# doesn't work for this package.
-	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
-		rm ${D}/var/mailman/Mailman/mm_cfg.py
-		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
-			${D}/var/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved."
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mailman.rc mailman
-	}
-
-pkg_postinst() {
-	cd ${INSTALLDIR}
-	bin/update
-	bin/check_perms -f
-	einfo
-	einfo "Please read /usr/share/doc/${P}/README.gentoo.gz for additional"
-	einfo "Setup information, mailman will NOT run unless you follow"
-	einfo "those instructions!"
-}
-
-pkg_config() {
-	einfo "Updating apache config"
-	einfo "added: \"Include  conf/addon-modules/mailman.conf\""
-	einfo "to ${ROOT}/etc/apache/conf/apache.conf"
-        echo "Include  conf/addon-modules/mailman.conf" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-mail/mailman/mailman-2.1.ebuild b/net-mail/mailman/mailman-2.1.ebuild
deleted file mode 100644
index 729135906ea2..000000000000
--- a/net-mail/mailman/mailman-2.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.ebuild,v 1.3 2003/02/13 14:33:48 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU Mailman, the mailing list server with webinterface"
-SRC_URI="mirror://gnu/mailman/mailman-2.1.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="O"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
-
-DEPEND=">=dev-lang/python-1.5.2
-	virtual/mta
-	net-www/apache"
-
-INSTALLDIR="/var/mailman"
-APACHEGID="81"
-MAILGID="65534"
-
-pkg_setup() {
-        if ! grep -q ^mailman: /etc/group ; then
-                groupadd -g 280 mailman || die "problem adding group mailman"
-        fi
-        if ! grep -q ^mailman: /etc/passwd ; then
-                useradd -u 280 -g mailman -G cron -s /bin/bash \
-					-d ${INSTALLDIR} -c "mailman" mailman
-        fi
-	mkdir -p ${INSTALLDIR}
-	chown mailman.mailman ${INSTALLDIR}
-	chmod 2775 ${INSTALLDIR}
-}
-
-src_compile() {
-        cd ${S}
-        ./configure \
-                --prefix=${INSTALLDIR} \
-                --with-mail-gid=${MAILGID} \
-                --with-cgi-gid=${APACHEGID}
-        make || die
-}
-
-src_install () {
-	ID=${D}${INSTALLDIR}
-        cd ${S}
-        mkdir -p ${ID}
-        chown -R mailman.mailman ${ID}
-        chmod 2775 ${ID}
-        make prefix=${ID} var_prefix=${ID} doinstall || die
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mailman.conf
-	
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING
-	# Save the old config into the new package as CONFIG_PROTECT
-	# doesn't work for this package.
-	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
-		rm ${D}/var/mailman/Mailman/mm_cfg.py
-		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
-			${D}/var/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved."
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mailman.rc mailman
-	}
-
-pkg_postinst() {
-	cd ${INSTALLDIR}
-	bin/update
-	bin/check_perms -f
-	einfo
-	einfo "Please read /usr/share/doc/${P}/README.gentoo.gz for additional"
-	einfo "Setup information, mailman will NOT run unless you follow"
-	einfo "those instructions!"
-}
-
-pkg_config() {
-	einfo "Updating apache config"
-	einfo "added: \"Include  conf/addon-modules/mailman.conf\""
-	einfo "to ${ROOT}/etc/apache/conf/apache.conf"
-        echo "Include  conf/addon-modules/mailman.conf" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-mail/qmail-scanner/Manifest b/net-mail/qmail-scanner/Manifest
new file mode 100644
index 000000000000..879e414d3e02
--- /dev/null
+++ b/net-mail/qmail-scanner/Manifest
@@ -0,0 +1,5 @@
+MD5 ad7f17def896f49d73f79ac9a39f5200 ChangeLog 1495
+MD5 48909ffbdce4f89d0bcbe54f2bb6c11d qmail-scanner-1.16.ebuild 2773
+MD5 fc085a869188e3c4cb27dfaf2a2c19fb qmail-scanner-1.16-r1.ebuild 2786
+MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16 67
+MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r1 67