3 files changed, 13 insertions, 135 deletions
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 2d4e4d39c99d..0b5a0acbc585 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9fb9cb7efd215fcca4ed096e27391255 mailman-2.1.5-r2.ebuild 4161
 MD5 71a1612183cbbf31d44f267338547d34 ChangeLog 6443
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 2c755e431914dc9ef5acd2b2cdc47f5e mailman-2.1.5.ebuild 3764
-MD5 9fb9cb7efd215fcca4ed096e27391255 mailman-2.1.5-r2.ebuild 4161
 MD5 ea0c850a55a563d90a520ab52809112f files/README.gentoo 4963
+MD5 1c839f4abbbe57c6ffc915fc8dc3018c files/mailman-2.1.5-directory-check.patch 641
 MD5 3089c1f0f8d91abdd612997b085959eb files/mailman.conf 385
-MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597
-MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5 63
 MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r2 63
-MD5 1c839f4abbbe57c6ffc915fc8dc3018c files/mailman-2.1.5-directory-check.patch 641
+MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBFvYC5FrxP71izLARAqpmAJ9YRcL2ZCAVCAK1kSIb9r9jS+pfgACfaCt+
+S5q6NcMqZEtS9HE4klq74b4=
+=XYKn
+-----END PGP SIGNATURE-----
diff --git a/net-mail/mailman/files/digest-mailman-2.1.5 b/net-mail/mailman/files/digest-mailman-2.1.5
deleted file mode 100644
index 1e43ecb04e52..000000000000
--- a/net-mail/mailman/files/digest-mailman-2.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5f56f04747cd4aff67427e7a45631af mailman-2.1.5.tgz 5745912
diff --git a/net-mail/mailman/mailman-2.1.5.ebuild b/net-mail/mailman/mailman-2.1.5.ebuild
deleted file mode 100644
index 96fc87fff0e7..000000000000
--- a/net-mail/mailman/mailman-2.1.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.5.ebuild,v 1.7 2004/07/10 15:53:22 kugelfang Exp $
-
-IUSE="apache2"
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="O"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc ~amd64"
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	net-www/apache"
-
-INSTALLDIR="/usr/local/mailman"
-APACHEGID="81"
-MAILGID="280"
-
-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() {
-	econf \
-		--prefix=${INSTALLDIR} \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${APACHEGID} \
-	|| die "configure failed"
-
-	make || die "make failed"
-}
-
-src_install () {
-	ID=${D}${INSTALLDIR}
-
-	make prefix=${ID} var_prefix=${ID} doinstall || die
-
-	keepdir ${INSTALLDIR}/logs
-	keepdir ${INSTALLDIR}/locks
-	keepdir ${INSTALLDIR}/spam
-	keepdir ${INSTALLDIR}/archives/public
-	keepdir ${INSTALLDIR}/archives/private
-	keepdir ${INSTALLDIR}/lists
-	keepdir ${INSTALLDIR}/qfiles
-
-	chown -R mailman:mailman ${ID}
-	chmod 2775 ${ID}
-
-	if use apache2; then
-		dodir /etc/apache2/conf/modules.d
-		insinto /etc/apache2/conf/modules.d
-		newins ${FILESDIR}/mailman.conf 50_mailman.conf
-	else
-		dodir /etc/apache/conf/addon-modules
-		insinto /etc/apache/conf/addon-modules
-		doins ${FILESDIR}/mailman.conf
-	fi
-
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL
-	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}/usr/local/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
-		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.dist"
-	fi
-	if [ -f ${ROOT}/home/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/home/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-	if [ -f ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		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!"
-	einfo ""
-	if ! use apache2; then
-		einfo "It appears that you aren't running apache2..."
-		einfo "ebuild /var/db/pkg/net-mail/${PN}/${PF}.ebuild config"
-		einfo "to add the mailman hooks to your config"
-	fi
-}
-
-pkg_config() {
-	if ! use apache2; then
-		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
-	fi
-}