mailman cleanup

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5880072BBB51E42

6 files changed, 20 insertions, 419 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index ed3c3b27a289..46ca767b30e0 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/mailman
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.150 2015/04/01 07:53:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.151 2015/05/11 16:02:58 hanno Exp $
+
+  11 May 2015; <hanno@gentoo.org> -mailman-2.1.18_p1.ebuild,
+  -mailman-2.1.19.ebuild, -files/50_mailman.conf-r1,
+  -files/mailman-2.1.13-ldflags.patch:
+  Cleanup due to security bump.
 
   01 Apr 2015; Agostino Sarubbo <ago@gentoo.org> mailman-2.1.20.ebuild:
   Stable for amd64/ppc/x86, wrt bug #545070
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 727aac382f12..dbed38bc04e3 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,36 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 50_mailman.conf-r1 592 SHA256 4512a9dd6cba38a080654cbe172941a053fdc8b33afb65748d76716e9d00a029 SHA512 e5ae0b4aca37a5946d986f3e257e306c14c4228b239e6401c9de54f592cc27794f2e61a6f6f218d5a49992e3e1e82200f7f11f8e8d2f1b047f35223152a06b68 WHIRLPOOL bfa861273398df9356a981b22de7a4e933da3ccd082481ab65f52aa072730408b907f28420439cb5afa314fe2415368022b8a05ecce800917825e8b7171c2ec1
 AUX 50_mailman.conf-r2 482 SHA256 670cafbf05bc72dd47f9b516e4b3721423215fa9699908b4452c2d562fcbf6e4 SHA512 c279f8709ea7932469c0d8ff0b645df228562678081df5fc3d946d62f7bbbc33f4723e71fd4560eebfc751052a6a271d4aadf6affadefeca107f41d3193563d3 WHIRLPOOL 1578cd48b96ee808fedf3a00e93475ce7470a66bea1d8beb378266aa9522ed8ecb4503a723024794ab7d68d407ff66f6535b2845ef03b777bf265ead0ad86cbf
 AUX README.gentoo-r3 6804 SHA256 9db15d248be59d98f038718b50d5a02f08f5fc0870bf0f0ebec4c5d008c4e31b SHA512 54407c223ad2aaf037f565604a76d55a686399de308bbd277b9c6a8690a56bd35756a3032cdaf3e1eab02b5d118b9f17d42673db0c75d590ce4cd245539b44d2 WHIRLPOOL 9f457503daecd76500547de39e4814a27631f9b3b13d3169cd97dda5812e7c740d554609db21b00c00cf3b079d883ea566b356c4e33d4584efe799aa77321211
-AUX mailman-2.1.13-ldflags.patch 1022 SHA256 75b9fe8ef757541776532f76b1262c1616d440178ad39c432fe2d529eecf5645 SHA512 5f1bd3d7cc04d7bf464442eb2805a7e449607ee9679760b0901245fb57400421ae0fbd6d17a68f26832acc3f674221696670588bc2cf832b6c7f5ee0f1f63bbf WHIRLPOOL a09edd3fd8606dc1b092fb449ef093fb08243e9e2a7d953e15594a112e67097426ede6851b2fac25939c9b9fd0cc1a62314ce8d3c5ad208cf23fdf33bf094d8f
 AUX mailman-2.1.14_rc1-directory-check.patch 786 SHA256 13c5988eeaf1fad7c7f4db2c817bb234dce022636e0ebe1a7de9d0ef8400d91c SHA512 510a67915163732ae05ed9f8920f93eb99538a706d85e4fb2c071e01a6d88be8cd32aa5ea0127d36a1dc4f7a735c179bb1169e7358025ee7d3c85b0c8cda44d7 WHIRLPOOL 316a6e78129bf1a46be3c81232cf29a4cf639c5f350085e10d37700d1f97ae614ee48c0caea1acef33da172e74b025645098ce36055f6757b9e32567c15d9414
 AUX mailman-2.1.9-icons.patch 555 SHA256 cd78a7447febcbe1901144a190ef14cf9075b8055cc275e0405fc748f9c855f0 SHA512 caec3eb1abdb29e92ebd6a589f93870ffc91bbcc7bd2e0115e38f48ae0a31e564037a4a828395229ee238d215e72e19a31d53c8bca6c39a48b5c08a327e663a6 WHIRLPOOL 0e73c6c89fd026bf73c5665da95fa711e47b0a7fa031ce3c31ad3a4771935c2d8fdabbba58e32448ee9b8263576004c22376249e1c135b69dbbaa47c880b96b9
 AUX mailman.rc 597 SHA256 ef4f5482cf68ba44a0fbb83acde29295bd8dcb6512d259d14387dfc29beeb625 SHA512 68840cb5afd364fdf440c0267c42c1e59565247f4ae11e7e4bcfd734d7bb9abc7e9167f25086c66e3527ff92ebf1a620d408f0e70b45bc1ab8adb8f05fd912a2 WHIRLPOOL 2d269b5bdab88b42265029c0c5cdbc6e6a2de146a629357f5c7b1041d99e25d18be3e5d8982d3d74d8f1fba8ffa8fd4444a05a9569244126fed05b87ca833ad2
 AUX mailman.service 288 SHA256 6cd1c76bac4ce0c6e15886089a62ed70012653a6416fc1d0c0836822b58e7c02 SHA512 c4a5532666afbebc5aa69463ec9b9eaa2dcb03fdd8fd62307920a4572d0c795c1d93478236240746018be617c0eec0fcfcc1c711e8810140fb8ffbc0a9b71009 WHIRLPOOL 0980699e58b2b86789ea7bd2172063359a12f97d7df1cea27ada1dea77ec8a7c3426f1aca1c3bbf982d97b72ac1ee3ff28b49f651d8a066ea80a6d0ca20135c3
-DIST mailman-2.1.18-1.tgz 9095511 SHA256 ce70ed8b58d719cab80758f39a7258c0a28f8e8e859facdaa8c29add620a5c2c SHA512 ec00bf98e7ecf452a394b0afd444f86108308aba410667482170df8b3042984715ed3c8aa645cd2aeaca58d239c03548c69907c3217f2a9f88fd859e9762c15b WHIRLPOOL 28b2bedc94b3a1c9e2f6fb2345e5afe8b2b18da689d2366e6d71ce94451138e36e81779dc3862a36b179063a6250c79adb40ba72d5b082cbfdf348f036e69b8d
-DIST mailman-2.1.19.tgz 9185697 SHA256 cb33429797f7b8b3b3f86bd528192ebc9de9df990257df8d482384c687e22014 SHA512 a89949dd8c27dba72a791f75373169989bf863d2fd73187902fdcd45b495871498eca6b6e4608f8aa049161637c59c9005ba9a88d6d8d5e3d344f19c71ced37a WHIRLPOOL 34580883b1f859b0563cd43c85b82b3834ff668400decea52a0d2d974d7b0cb9e8b04c650186a7764b8a966b12d83ad0a82b8677fb8458c59f55f1042e522b97
 DIST mailman-2.1.20.tgz 9204867 SHA256 522c2b5c5ab91398fdf949a8961162c314f6323cd1bfeb907e0fb2d88277711f SHA512 2821ce9f22f7f927f3f3e51ad949b43066be4510aa781c63de1acdc8bec5408e242ece7e83bbf77affcdab61fa9715cb239ceed197cda647e8e56308ba9adce7 WHIRLPOOL 4678622b8e98654fe551bf00f3afebaef2e6df49f13755c2277a696b7aaf0a7e6f261a94c190ed212465d6b81be9121a66ca454c998861b3b73ddbdbef3e9095
-EBUILD mailman-2.1.18_p1.ebuild 6223 SHA256 d650a6d81d95200d56a0c6083293978c7c996ad1aa98d20a6de76eb5c2983704 SHA512 1f45844fcd8b582788b229a2c533a0b89fda6b1b2e22ac931d9da3e12d8dba0fa5a484e64ed29559bc1c2cafabad203215147ba0064b094ce1d7a2edb6484d88 WHIRLPOOL 08981fe939d71325f96e3c80fc040329bb78b1e2c4505172bc5c7eddd65dc4edc694cb63352eb68912a01286edb349be29b524b7f08bee89657b3823a77a1d8c
-EBUILD mailman-2.1.19.ebuild 6225 SHA256 cace7ebe3d87167a241d75c758137efc9a47eb5b766a10ad21bde8a2bea2dec1 SHA512 7cc1ef492725bf3520ebf33ea159f40e97a7fe5ab0198e8818f7e8dfde2c9b1b4a9556a7d72b8cda727606e7fd38af8d3a52a7df8ec0e3fb04c9a6b6d497d8d7 WHIRLPOOL 9e3883376926847159aae50fd08d980996afea1a02228d3dcb65042b8b08019412554a9d9249dcaf46b08019fa09a3d6240a71341ff19cfdf3beec193985adf2
 EBUILD mailman-2.1.20.ebuild 6220 SHA256 27652fc3c3841ca0c45052c417c6a0b623998aa3c8be78075b221ad068c54f1f SHA512 7178eb390a38b0ca78741ee457294508b17777e4227b2af43e3258c0b15056bcc6a7ab4fd02339d15ea5bb8077bd66d76a3d51468ce739318e59dc1584455a74 WHIRLPOOL a30a1a8d5b9e48574352bb5ac8eaddc2461f7df66317d936b6b90d9b7d64522cff301c87c3caf589dfe7473392292d43d5978b0797592ff2e5db7f6a22cfbc80
-MISC ChangeLog 20770 SHA256 f6add64c006d9a87c4a0017f59a85a3be814f2219023eed01f3555173f6297a8 SHA512 ed7bc7ac0ca60414bb627adb076c5b6b4e89c83b449f1313e1b5aa059eb4bd56cfe7519c378adbf8cc1cf3d1ce938bc773584f5a0ec224c7d83da3c7fdcfff06 WHIRLPOOL 8f933cde1dfbcec73f67902f38590c9bf82afebc407d45d6f9357ca33211af4ddfceca0668acc89301f6c8a2792b29ad6422ea469e97d532922952400231c8b5
+MISC ChangeLog 20958 SHA256 913282d55fad5cfe19703c8c3de63e957c8df5929410d3c4331d8342b9280f62 SHA512 2dd773d7ea3ccdf1a2241e90f13f5585d9dbf7656c26ae196ac5219828aefba1cbe2c6dbdbfe1b6f584820d9a05f9af6ad8e7e34cc90fad15679bca54d12b967 WHIRLPOOL 2d047534d4739f8b82c7aa20e7e20b12f4c3b7b9252db3456d8c08d28bccc59c6ec375be64130bdc4eb91c355bb8ed87aa10da797da2add76ef0243060986ea0
 MISC metadata.xml 218 SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89 SHA512 8bb5bbe8e06a6caffb45c8a717c3fce94b35fd085a711523d439b3135f3949e46f8b7ae1936aa75ea6385fc59054585009ff16fe73052c3eccaea09449204544 WHIRLPOOL aaa5590db64b60ddb7628f0e9ea780da50f0e43a7f10a6562848d9167dfdfbec531aff68f7df2da2b173e9900b91e40b5ff9cf4ecab86dbff8c082053a53b90c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVG6QIAAoJELp701BxlEWf8kwQAJXOsljTD9EmQGNGya+siujv
-AKEEkE8JeDa2PyMId2ZMFbyeJACAMCfvFmS28c2YaGY2ylt98g4mmVRL8VqiE7ua
-sTMOCJ3H0hc47dssFzzD0oMhpalbodQK3y6oqQOaLSrRgq4A9hKmCydWw0p1vg20
-GP5Hu29KJt8+VsiKL0ujuiZjuqb+0QfOyzN5RFcmu+8UFcNimDDZuWavmpwCHuAi
-NUx58H4mRrSFJUx98W7sKT2IW43d2hEg0Bo31gostsQwQ5S/cZPCmKFmMMFDrbWg
-XS0db9azJ17FAqA1Z8hyvoCoaPUVfNZ6sdo/5ue1GW73Szl3F56gBCZSIYa7VN3X
-rAYLFqfR2j9bAwdxNKcYTocwCvXzolyC4G+upjZOLZDtCLfPmcOB/Y7eUPoGUh8W
-DPigFnJHI5GBmZOzKVrsmoXqNsum8jn77B3XGMWlOWDALsrigpNkXbVH0eLIdmLT
-GVEC/5gct6/97/wPJ6ElkIMF+DjMEehQbVDTum8q4D8lSgmFUqvu8wzldyR7Secg
-JNJO3W0Jex44AA+anHvz2k0YxJaKvyaCleXmI1ylXA8jq+dbb5wqq0+2zcsZr4+f
-iz0duZEIik63ucHf3kAiJ6X8iLjHk9ug4cOdkMeOy3/HzCaGbHiN05kraaHf2sIj
-Lz8qX7hXo7eB7OagTJWf
-=4mkc
+iQIcBAEBCAAGBQJVUNLWAAoJEKWIAHK7tR5C3JsP/1Y8CtxWesHyPVQI1Hj8hPkm
+boW4vE3FtKZfgeglahjVqI1EMKaSKRENaBZ5IvdzfNLldsZlS+FHA9vcXPkxXaDK
+a2+AvwRNFU7x5R4TeTqAogAR3FKamYAMl0ZQ6yyW4KXVodCiPIFDDyCrxeNFfLdW
+l9Pk/foKsgTZvN9ySaLqyKl4WLhoPaianiQzYvCKhNwZjfZeJ/9GIgkqeANP71p1
+cG2NsU9JJCxb7H0hhmzc3mztRmlkdlU2khrTv5ooyMHnFaEwEy5kbe+QuVD/PlBg
+Gc/rE9PI7Ks1VOiLVXKx/LdtZ5TAeG0eRJKlZ1DK7Bb27RRrQVlJTnFdheW1X5bG
+ZbuydybnWtZNQ89K6zerbf4Le1Wj8ew376sFfLuvqLuZyMnbdneBFQ3QYEusFMEa
+P8SYyinrEcvpFj67dO1geGCUM2htVQdKRKimuvNhrR6SLrJWQe4S+VOhyFUFNOh/
+0+0l12dpsVNETqELqGYZN1X5+Ix3vjYtzGF8QIBgaeQQ6B6kW7DjdIfiI0Ww8fdL
+k3z5MB+33Wxmtfb3sX0fkPx91kxLNm+85SkS2NJYA3Or9O1ktjYdYi9nSDYv7nVE
+t5tdSRdAJrPiDRNRSh9Klu+oLkkriNc8c699yX6ENPrURAuCSB24J7aaho+5YDgq
+gQnCyeZtJYDNni1J265X
+=+ZkZ
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailman/files/50_mailman.conf-r1 b/net-mail/mailman/files/50_mailman.conf-r1
deleted file mode 100644
index 82a23214fce9..000000000000
--- a/net-mail/mailman/files/50_mailman.conf-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-<IfDefine MAILMAN>
-	ScriptAlias /mailman/ "/usr/local/mailman/cgi-bin/"
-	<Directory "/usr/local/mailman/cgi-bin/">
-		AllowOverride None
-		Options None
-		Order allow,deny
-		Allow from all
-	</Directory>
-
-	Alias /pipermail/ "/usr/local/mailman/archives/public/"
-	<Directory "/usr/local/mailman/archives/public/">
-		AllowOverride None
-		Options ExecCGI FollowSymLinks
-		Order allow,deny  
-		Allow from all
-	</Directory>
-
-	Alias /mailman-icons/ "/usr/local/mailman/icons/"
-	<Directory "/usr/local/mailman/icons/">
-		AllowOverride None
-		Order allow,deny
-		Allow from all
-	</Directory>
-</IfDefine>
diff --git a/net-mail/mailman/files/mailman-2.1.13-ldflags.patch b/net-mail/mailman/files/mailman-2.1.13-ldflags.patch
deleted file mode 100644
index 1c278347a0ad..000000000000
--- a/net-mail/mailman/files/mailman-2.1.13-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/Makefile.in~	2009-02-23 22:23:35.000000000 +0100
-+++ src/Makefile.in	2010-08-08 02:03:16.000000000 +0200
-@@ -46,6 +46,7 @@
- CGIDIR= 	$(exec_prefix)/cgi-bin
- CGIEXT=		@CGIEXT@
- MAILDIR=	$(exec_prefix)/mail
-+LDFLAGS= @LDFLAGS@
- 
- SHELL=		/bin/sh
- 
-@@ -91,13 +92,13 @@
- all: $(PROGRAMS)
- 
- mailman: $(srcdir)/mail-wrapper.c $(COMMONOBJS)
--	$(CC) -I. $(MAIL_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/mail-wrapper.c
-+	$(CC) $(LDFLAGS) -I. $(MAIL_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/mail-wrapper.c
- 
- #addaliases: $(srcdir)/alias-wrapper.c $(COMMONOBJS)
- #	$(CC) -I. $(ALIAS_FLAGS) $(CFLAGS) -o $@ $(srcdir)/alias-wrapper.c
- 
- $(CGI_PROGS): $(srcdir)/cgi-wrapper.c $(COMMONOBJS)
--	$(CC) -DSCRIPT="\"$@\"" -I. $(CGI_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/cgi-wrapper.c
-+	$(CC) $(LDFLAGS) -DSCRIPT="\"$@\"" -I. $(CGI_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/cgi-wrapper.c
- 
- common.o: $(srcdir)/common.c $(srcdir)/common.h Makefile
- 	$(CC) -c -I. $(COMMON_FLAGS) $(CFLAGS) $(srcdir)/common.c
diff --git a/net-mail/mailman/mailman-2.1.18_p1.ebuild b/net-mail/mailman/mailman-2.1.18_p1.ebuild
deleted file mode 100644
index ef73fb76bcb9..000000000000
--- a/net-mail/mailman/mailman-2.1.18_p1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.18_p1.ebuild,v 1.5 2014/12/31 16:07:02 ago Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-S="${WORKDIR}/${P/_p/-}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux"
-
-DEPEND="virtual/mta
-	virtual/cron
-	virtual/httpd-cgi
-	dev-python/dnspython"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-pkg_setup() {
-	python_set_active_version 2
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed."
-}
-
-src_configure() {
-	econf --without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python=$(PYTHON -2 -a) \
-	|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install () {
-	emake "DESTDIR=${D}" doinstall || die
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r1" 50_mailman.conf
-	sed -i "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
-	sed -i "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
-	sed -i "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo || die "newdoc failed"
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable || die "dodoc failed"
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler* || die
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}
-	do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py"
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/*
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private"
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public}
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private"
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles"
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman"
-
-}
-
-pkg_postinst() {
-	python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman \
-		${INSTALLDIR}/Mailman/*/
-
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	elog
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	elog
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	elog
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	elog
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
-
-pkg_postrm() {
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	python_mod_cleanup ${INSTALLDIR}/bin ${INSTALLDIR}/Mailman \
-		${INSTALLDIR}/Mailman/*/
-}
diff --git a/net-mail/mailman/mailman-2.1.19.ebuild b/net-mail/mailman/mailman-2.1.19.ebuild
deleted file mode 100644
index 0583bd6b317b..000000000000
--- a/net-mail/mailman/mailman-2.1.19.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.19.ebuild,v 1.1 2015/03/29 13:08:58 hanno Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-S="${WORKDIR}/${P/_p/-}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="selinux"
-
-DEPEND="virtual/mta
-	virtual/cron
-	virtual/httpd-cgi
-	dev-python/dnspython"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-pkg_setup() {
-	python_set_active_version 2
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed."
-}
-
-src_configure() {
-	econf --without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python=$(PYTHON -2 -a) \
-	|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install () {
-	emake "DESTDIR=${D}" doinstall || die
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
-	sed -i "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
-	sed -i "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
-	sed -i "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo || die "newdoc failed"
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable || die "dodoc failed"
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler* || die
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}
-	do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py"
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/*
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private"
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public}
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private"
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles"
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman"
-
-}
-
-pkg_postinst() {
-	python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman \
-		${INSTALLDIR}/Mailman/*/
-
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	elog
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	elog
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	elog
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	elog
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
-
-pkg_postrm() {
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	python_mod_cleanup ${INSTALLDIR}/bin ${INSTALLDIR}/Mailman \
-		${INSTALLDIR}/Mailman/*/
-}