Bump, remove old apache 2.2 directives, remove old versions.

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

6 files changed, 54 insertions, 364 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index c14ee246236c..58aa56248487 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/mailman
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.147 2014/12/31 16:07:02 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.148 2015/03/29 13:08:58 hanno Exp $
+
+*mailman-2.1.19 (29 Mar 2015)
+
+  29 Mar 2015; <hanno@gentoo.org> -mailman-2.1.14.ebuild,
+  -mailman-2.1.15.ebuild, -mailman-2.1.17.ebuild, +mailman-2.1.19.ebuild,
+  +files/50_mailman.conf-r2:
+  Bump, remove old apache 2.2 directives, remove old versions.
 
   31 Dec 2014; Agostino Sarubbo <ago@gentoo.org> mailman-2.1.18_p1.ebuild:
   Stable for ppc, wrt bug #530772
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index deaaace3f8ab..6e6f0129f9c8 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -2,36 +2,33 @@
 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.14.tgz 8201150 SHA256 1d6be802b718639126c4069eb7f9cd3a347765e1cb199cc3bb14d71572d09523 SHA512 77230730150ba6580a9924a771959a1e4488026a24e1a04f9f984315d127ced9cb04e09fb0eb9272172c097f23ac16d0a0d51b7564c49649a402ca581ae0a308 WHIRLPOOL 299c977ab7887ddefcf559b7d0ec3268d660736559c6066d95eb9b85cce37ca139f9e01abe668fc34c3571bf36afeb52f857d05d630674eb0da4ed8ef34c2c62
-DIST mailman-2.1.15.tgz 8468107 SHA256 f355fb3d31772b488449e6f5173dafd31edca93172c307244c791d25d9e2bec8 SHA512 3502d32690856bad2140851bf582ebe8cea0ba38a184aae715cc7921754aac452b789b7031cbb47895737f4135e59f44888bdca56c512378ad9367d62b372536 WHIRLPOOL f20dad43d44ab542f324dd06373bbd741db2aea0e59eb4894cc73149638ef5ee316dcd622ef71871c26d0e99d830c60e5ec8f10bf63290b0fb5b86d05a32cd9d
-DIST mailman-2.1.17.tgz 9011239 SHA256 c430a8b4ee546ace88174b4213cd4394ccb063bde48fa8c36d141d7ce1239ae7 SHA512 2be6e9ce95ebd92e2e8477cee8334fadb76b76df43da31b1e78d244113d144e895153bad23317b4f8293ddd09597e8c0082beb4e5d0620d2a59ae0b19ca60481 WHIRLPOOL bfefb603c1dc6dcc9c2a4688fef3ce25edb13742d569cb745b42293ab7b11e650d775e79757b04326d5e4e24017ee26118acad583c99e8da89af4a7a089fa0d0
 DIST mailman-2.1.18-1.tgz 9095511 SHA256 ce70ed8b58d719cab80758f39a7258c0a28f8e8e859facdaa8c29add620a5c2c SHA512 ec00bf98e7ecf452a394b0afd444f86108308aba410667482170df8b3042984715ed3c8aa645cd2aeaca58d239c03548c69907c3217f2a9f88fd859e9762c15b WHIRLPOOL 28b2bedc94b3a1c9e2f6fb2345e5afe8b2b18da689d2366e6d71ce94451138e36e81779dc3862a36b179063a6250c79adb40ba72d5b082cbfdf348f036e69b8d
-EBUILD mailman-2.1.14.ebuild 5943 SHA256 1b5030b30e32a4b75fda29ec8e535256265f3f55782d1937a2a5c82083ea5b3e SHA512 27866e5de8d2bb6ef84e8d76a4ed91d0a6171fb6fa2323e4656ea7c0100bf811eab65fd43fe3d335e6791cdb456260979a1b07ec71a1a098e50271f8eaa33e15 WHIRLPOOL ee9fef10e56b3eb698c5b5671c3f22424af3b019989f5cbeba20dd68efb482aa04fe95c13bc7e279339e7254fbccd3bac08a446a5ae1924e78f7efb5663d8459
-EBUILD mailman-2.1.15.ebuild 6170 SHA256 42f2e96eba6265b7ef5016fe6849978ebd866ce60a7c0c082a06c913e57c60ef SHA512 04c21678fc4184673087548ee394b213f99cb2c9b14361a8d2f68354d54d537cd51a0dd3fec110baaf42811a30ded765f07c712632d4c6e0440bcb83c5ce9b31 WHIRLPOOL ab0eeda6827bd2ba5141ac943d16e026eec41b5a5935d3fce3a00cb530c028dc00d0a5f4a60658b012cf1ef5a863abbeb44fca96393375d40df833caa7337ed0
-EBUILD mailman-2.1.17.ebuild 6169 SHA256 0b38d3280484eb82824c8c12b75108d0c5ffd2367d783a439dc5547849c90d6d SHA512 aa191a480255ec38e117e2411b074a8cafd5c6953ce32d6f3f617b451c4d61c6029493bc8bccb6d3c36ceb6789316eb1881914b3457b36e4aade3f8c93ab40a3 WHIRLPOOL cd763b01112d5deb287d6cb778782410c78e1e07db25fb3e0431cbc60e1d84b2a588dd1f6e4fe6cba936690705d9c7a141ab6e9553d57a8cfdb168f61bc56c55
+DIST mailman-2.1.19.tgz 9185697 SHA256 cb33429797f7b8b3b3f86bd528192ebc9de9df990257df8d482384c687e22014 SHA512 a89949dd8c27dba72a791f75373169989bf863d2fd73187902fdcd45b495871498eca6b6e4608f8aa049161637c59c9005ba9a88d6d8d5e3d344f19c71ced37a WHIRLPOOL 34580883b1f859b0563cd43c85b82b3834ff668400decea52a0d2d974d7b0cb9e8b04c650186a7764b8a966b12d83ad0a82b8677fb8458c59f55f1042e522b97
 EBUILD mailman-2.1.18_p1.ebuild 6223 SHA256 d650a6d81d95200d56a0c6083293978c7c996ad1aa98d20a6de76eb5c2983704 SHA512 1f45844fcd8b582788b229a2c533a0b89fda6b1b2e22ac931d9da3e12d8dba0fa5a484e64ed29559bc1c2cafabad203215147ba0064b094ce1d7a2edb6484d88 WHIRLPOOL 08981fe939d71325f96e3c80fc040329bb78b1e2c4505172bc5c7eddd65dc4edc694cb63352eb68912a01286edb349be29b524b7f08bee89657b3823a77a1d8c
-MISC ChangeLog 20259 SHA256 8ce546ec840200c858b55750c433acbf175d0baca3014ac5f3f10bd5dac3fb7a SHA512 2e617eecc1926a85e6d77204caedc77b83a9a80f5f84455dc4fe2c440718f96a22eb07f1552a4145639c9d4efe9fa990a3387120b538d91ab902b5abee256f7c WHIRLPOOL 97a585166ce7d275089a6252af92f64ea1d2d822e353c44699d2b994bfa6f5c471506179ae31a0f991c8c78e6416bc6013a1d3e1a8699be5610df7319973fc2e
+EBUILD mailman-2.1.19.ebuild 6225 SHA256 cace7ebe3d87167a241d75c758137efc9a47eb5b766a10ad21bde8a2bea2dec1 SHA512 7cc1ef492725bf3520ebf33ea159f40e97a7fe5ab0198e8818f7e8dfde2c9b1b4a9556a7d72b8cda727606e7fd38af8d3a52a7df8ec0e3fb04c9a6b6d497d8d7 WHIRLPOOL 9e3883376926847159aae50fd08d980996afea1a02228d3dcb65042b8b08019412554a9d9249dcaf46b08019fa09a3d6240a71341ff19cfdf3beec193985adf2
+MISC ChangeLog 20517 SHA256 264c35e885fa543359c1d5fdf097c2179f58fe07cdac6efb1852396742582dbb SHA512 e990111fc31b767d1a22e0dd92fac73a368620d4d4f585acc28cc017a405dbc0f5d144189868b35ee20bf9356bb977ffd60ba18b42fa085eadbe1b8dc8a9dcb0 WHIRLPOOL 1e36b54419dde5a77aa7930dd72782b78aa62e7582ac08ff58ce50969f1159c9cbb5ee172d89dc764d7f7c0b4646b2e522f3272a42bd2b1c4cb55de09aff785b
 MISC metadata.xml 218 SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89 SHA512 8bb5bbe8e06a6caffb45c8a717c3fce94b35fd085a711523d439b3135f3949e46f8b7ae1936aa75ea6385fc59054585009ff16fe73052c3eccaea09449204544 WHIRLPOOL aaa5590db64b60ddb7628f0e9ea780da50f0e43a7f10a6562848d9167dfdfbec531aff68f7df2da2b173e9900b91e40b5ff9cf4ecab86dbff8c082053a53b90c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUpB8nAAoJELp701BxlEWfiBYQAMTJLIkoADdILUqmHAnFJ9l6
-V3wtR7nrtSnR//43HhXSxBBjDiqwynEEeMbCulzRnqHYgfuQJ5ZMRAWhjvCUPy7o
-RyXvdN8EiPAFHjDwhGYVw35SJf85tlZprgsLkv64gtnk2MP8pgH6L5KEEyrsaUvL
-Hgp9tTYX+TB7DvJRLkf8A9HlnS2a/2tUOopDapHgTZHxAEV7dLvpxWPma0amnJ5f
-ieiMsx5eqHvmHHuZLSL/eNXox98mzEhv3Z6CqWcxsMQOWfv3bqCWpF2v14Uvr3VG
-a7zF/U9Vnu5THyVK5GiIug9KRmrx5gtwFc9TDtW6mkhaSsssyhFG6aN8Kd8wBnR0
-p5rhfVwcSshu22v+FPnd3JiqN9zkB5AWniQVgkVg/pgwQm6RHLUSBdCxeDnRO+IC
-rzIfYDbxt/zDT4G83fUMOEklzGlAFdZ4uEokpNAgjbz5P+ECuUDWFCdDxMPxD9dd
-GVK5Re4GqC9XKDzyX9j2zkvYD3o4tA71pX2oMGUQrMktKkwjigEGo2O/pGj5L/vn
-yLzzFTp4d6fTK4m3WRiDWxgHOcxVNka30IUar6ZGdRdetgfXieWa1ZY1vk6zpoMF
-NC8jQOtA/+G+NK2evv0rlzwjMb8vLpV7icwKFBHqF+IjRBbs0FwYjZDr2BedHrRr
-L/tEAmjJZQ+OHm/tO8mF
-=ohzy
+iQIcBAEBCAAGBQJVF/l2AAoJEKWIAHK7tR5CHm0P+wWO0rW4EpIptwqg7goHLG35
+c8mI8Ti773K0EohN3jAcKCgb4Ge3peS2GHpzma+RD9HWL834048ABmwAw8pQF0n/
+cY6ccEDc1FWVatdd66XZybzNqE5SLsCzcnRqnI86zlOInLyXLv3P5Qh3SVS+qGVO
+QmIc+BkbFD714xJ+svAWdoWpqCUM7sLdAt0hQKEi5+LAeGB3OPGqCE5uP35TqU0l
+vL9Vu+IEFtfsD8+HUiiGLtIT0jEjyImMO8X8g1+RCMpxlQ1eoqfI8e5+aB6UrEsp
+xJ/Jsn7N131k7vEGuHT5gtlHfWWBZNY32AWvbyumPTQcAKZwU685/7MOEESyHHQo
+mBcqZHim0vdK5V0s5nEkwFKw2G5qFq/NMjYAseIeVDBg2o1AlkiJ43nexiWuVmGE
+BVAYw5woxdPsIsB6G0wG/RL6Qx9AOQhfOMTanAwb+I7RjvpNzfmzeAZxROwcnKwZ
+WAlNrKvYY0OLIadVIMsqCDBXwWKyF3uV57VXrddkwYo4Z7Q2sSpAmRY64DBiPb4/
+3/l5o/72+RcP5UN+ZJgjqCR+u/ZeHRENttScdyf2cD5QCqumTIiy2rqR27lAUinf
+zfjPFJBVD0E0TV215hQ8mXlaoW8lrdfPB5Xvz9bf2v7jAdzNjzEEg3JQNUVHmS8W
+tKaeRdCdVqLL5GkVBmNh
+=+o0I
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailman/files/50_mailman.conf-r2 b/net-mail/mailman/files/50_mailman.conf-r2
new file mode 100644
index 000000000000..c0cf69562fed
--- /dev/null
+++ b/net-mail/mailman/files/50_mailman.conf-r2
@@ -0,0 +1,18 @@
+<IfDefine MAILMAN>
+	ScriptAlias /mailman/ "/usr/local/mailman/cgi-bin/"
+	<Directory "/usr/local/mailman/cgi-bin/">
+		AllowOverride None
+		Options None
+	</Directory>
+
+	Alias /pipermail/ "/usr/local/mailman/archives/public/"
+	<Directory "/usr/local/mailman/archives/public/">
+		AllowOverride None
+		Options ExecCGI FollowSymLinks
+	</Directory>
+
+	Alias /mailman-icons/ "/usr/local/mailman/icons/"
+	<Directory "/usr/local/mailman/icons/">
+		AllowOverride None
+	</Directory>
+</IfDefine>
diff --git a/net-mail/mailman/mailman-2.1.14.ebuild b/net-mail/mailman/mailman-2.1.14.ebuild
deleted file mode 100644
index 5ae257ebe141..000000000000
--- a/net-mail/mailman/mailman-2.1.14.ebuild
+++ /dev/null
@@ -1,164 +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.14.ebuild,v 1.10 2014/01/08 06:42:15 vapier Exp $
-
-inherit eutils python multilib user
-
-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="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux"
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi
-	selinux? ( sec-policy/selinux-mailman )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-2.1.13-ldflags.patch"
-}
-
-src_compile() {
-	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} \
-	|| die "configure failed"
-
-	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
-	dosed "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" /etc/apache2/modules.d/50_mailman.conf
-	dosed "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" /etc/apache2/modules.d/50_mailman.conf
-	dosed "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" /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
-
-	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."
-	ebeep
-}
-
-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.17.ebuild b/net-mail/mailman/mailman-2.1.17.ebuild
deleted file mode 100644
index 538b28489385..000000000000
--- a/net-mail/mailman/mailman-2.1.17.ebuild
+++ /dev/null
@@ -1,171 +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.17.ebuild,v 1.5 2014/11/02 09:00:17 swift 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}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux"
-
-DEPEND="virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-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.15.ebuild b/net-mail/mailman/mailman-2.1.19.ebuild
index 26870bbc5372..0583bd6b317b 100644
--- a/net-mail/mailman/mailman-2.1.15.ebuild
+++ b/net-mail/mailman/mailman-2.1.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.15.ebuild,v 1.9 2014/01/08 06:42:15 vapier Exp $
+# $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"
@@ -8,19 +8,22 @@ 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}.tgz"
+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"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="selinux"
 
 DEPEND="virtual/mta
 	virtual/cron
 	virtual/httpd-cgi
-	selinux? ( sec-policy/selinux-mailman )"
-RDEPEND="${DEPEND}"
+	dev-python/dnspython"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-mailman )
+"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -68,7 +71,7 @@ src_install () {
 	emake "DESTDIR=${D}" doinstall || die
 
 	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r1" 50_mailman.conf
+	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"