remove ebeep and remove old versions

Package-Manager: portage-2.1.11.10/cvs/Linux x86_64

15 files changed, 29 insertions, 1363 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index d9a97ec9969f..679842e783bd 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-mail/mailman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.130 2012/08/08 17:37:43 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.131 2012/08/15 12:48:25 hanno Exp $
+
+  15 Aug 2012; Hanno Boeck <hanno@gentoo.org> -files/50_mailman.conf,
+  -files/mailman-2.1.8_rc1-directory-check.patch, -mailman-2.1.9-r3.ebuild,
+  -files/mailman-2.1.9-fix-XSS.patch, -mailman-2.1.11.ebuild,
+  -mailman-2.1.12.ebuild, -files/mailman-2.1.12-add-destdir.patch,
+  -files/mailman-2.1.12-directory-check.patch, -mailman-2.1.13.ebuild,
+  -mailman-2.1.14_rc1.ebuild, mailman-2.1.15.ebuild, -files/README.gentoo-r2,
+  -files/mailman.conf:
+  Remove old.
+
+  15 Aug 2012; Hanno Boeck <hanno@gentoo.org> mailman-2.1.15.ebuild:
+  Remove ebeep (#431516).
 
 *mailman-2.1.15 (08 Aug 2012)
 
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 7dc9f3311208..c994be6774d1 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,49 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 50_mailman.conf 429 SHA256 8a93c5f9b2012122c6e85445620d5eb388e1bc38cb2102158bb62681cb61d3ec SHA512 3c6fe136ed0cdb31037233326dffcff26d6827a3d70fa2aa6147e01cceec93b5245af8010b38c220ab327f1bfcff35f7c7d3d78575cec8fc0bf154912a81321e WHIRLPOOL 65cc9c49c2daf82128a7ede123c1854ec55d029b8be5242e0eac24c6601f576a5ab5127938577bff5fb6f4afca2db9351b29f728d6e8e50706a0607f60f18bd2
 AUX 50_mailman.conf-r1 592 SHA256 4512a9dd6cba38a080654cbe172941a053fdc8b33afb65748d76716e9d00a029 SHA512 e5ae0b4aca37a5946d986f3e257e306c14c4228b239e6401c9de54f592cc27794f2e61a6f6f218d5a49992e3e1e82200f7f11f8e8d2f1b047f35223152a06b68 WHIRLPOOL bfa861273398df9356a981b22de7a4e933da3ccd082481ab65f52aa072730408b907f28420439cb5afa314fe2415368022b8a05ecce800917825e8b7171c2ec1
-AUX README.gentoo-r2 5537 SHA256 3809aa17e4e9a244cdf7c06af1605c3ce660329b0e279a93c4c3650b8d9ffa42 SHA512 87c9a910d764387e0850613d235b42768fb5d22b430f88830e9df29404c6ae7772a4a26243fa277eac3acb696e76ef32b00b350a4c81c82813f223d50415ed98 WHIRLPOOL cc7ebd32058a0b83a835ffc4d514990205e6368861d3fa539f42a0842745e764bda9448b943bec56499a12b43919c6eb4e451a9c82feee3420ea119bf81d64b9
 AUX README.gentoo-r3 6804 SHA256 9db15d248be59d98f038718b50d5a02f08f5fc0870bf0f0ebec4c5d008c4e31b SHA512 54407c223ad2aaf037f565604a76d55a686399de308bbd277b9c6a8690a56bd35756a3032cdaf3e1eab02b5d118b9f17d42673db0c75d590ce4cd245539b44d2 WHIRLPOOL 9f457503daecd76500547de39e4814a27631f9b3b13d3169cd97dda5812e7c740d554609db21b00c00cf3b079d883ea566b356c4e33d4584efe799aa77321211
-AUX mailman-2.1.12-add-destdir.patch 379 SHA256 10a22b784eecfc86c78380be6c389b90bbcec3e4c31a04b70f6a09e96ef4afd8 SHA512 9259f4ee2548db8e429dcbd63ccda832a8e4bf2a00ff5ce9a6aa85ee0b841a6497c7d5abcec22eb95538c0af379b635cb19eded53a6499f1877334daea7ed87b WHIRLPOOL 1e9dddf1990a3d2430fb783518fec4a63a5a1e912f0f1f5abd690e00b7cfa633d434196bb0cf828a50c194fdeb4fad0dfffc46ed00e914278ef108cf51215ff7
-AUX mailman-2.1.12-directory-check.patch 1485 SHA256 4986cc5e7d37cec02b4f29dbf4838e81799fabdfb89bbc7f8e54c9210ae1de6d SHA512 79b91042374d64a3412d204daf621379e78aa390d1ffd72da6b56643e475f51811e4b7fe5d3f92535e95e52c450292dfac8e5661e110d7be20f714ea6460c842 WHIRLPOOL 7e99a5e3fdb256acb860b0a447eaf272ad157db31f996560875bcb19fcde4cbe3bcc6ec4449bdc90056c0286754cfcfb63642901ef5b90bd51f14d4cc6f6a33d
 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.8_rc1-directory-check.patch 1287 SHA256 2d31eda834429a55edad1fea3c379ecb3e8f05c03fac82f172989caeab85314d SHA512 eeeed8b82493a8a6d425b616ff86e62d0b132db0ae03fcc21485a4382db02b893f3e785a1dbe16a5e167e76ac163892f2690314e46cea2d8bb627e0328b7bd34 WHIRLPOOL a87cee3b6b48ec346d7fd975acf518efa9c7a0c7974d22892335874c9f602d22ca8ccbbe9351402e07cf68ddbedffc205fd10aac20d71575cc6931aef5b585a1
-AUX mailman-2.1.9-fix-XSS.patch 11287 SHA256 cd2ffb0e19dd12205d375f3c83b7d6a3177c0f3389bf15db37bce1e63e459307 SHA512 c6828ece9d60f15ee20ec0ebd2a158edba66ba2707e1ad0b1e18a95d4292b06da1a321b95eecf29f896373554caa3405024e725ef078533c8382e2eb89a69cdc WHIRLPOOL 0148bf9bbd1cb6b0ef0eb4c53dcfe140a5aa61508506159217c2b3d80f81398ed57df4ccfa184b99a23197489b530eb1aa72ec9319edd4a2091bbea4c2b7485b
 AUX mailman-2.1.9-icons.patch 555 SHA256 cd78a7447febcbe1901144a190ef14cf9075b8055cc275e0405fc748f9c855f0 SHA512 caec3eb1abdb29e92ebd6a589f93870ffc91bbcc7bd2e0115e38f48ae0a31e564037a4a828395229ee238d215e72e19a31d53c8bca6c39a48b5c08a327e663a6 WHIRLPOOL 0e73c6c89fd026bf73c5665da95fa711e47b0a7fa031ce3c31ad3a4771935c2d8fdabbba58e32448ee9b8263576004c22376249e1c135b69dbbaa47c880b96b9
-AUX mailman.conf 385 SHA256 fdd86c4a72318ade5dfe0f075ce62470979f93d8a4c862993dc32e7bdb422eab SHA512 fc68f877e64496a7527235ade9ab34681153803e4c07269df2dc37089c9ff1202d2a7b032cdbdd679b70e42f8b2c60de60922802a892dbf40a123af27fd55c40 WHIRLPOOL 280c1dd9ed7651029ba1d5f8b18b7db54549c953d1ce33bd0c98b8ae20081e3d3bd354ee7fc13df9fc49ad001dc50cae9d2abe5226d49e6dcaa78cafbf5f35a6
 AUX mailman.rc 597 SHA256 ef4f5482cf68ba44a0fbb83acde29295bd8dcb6512d259d14387dfc29beeb625 SHA512 68840cb5afd364fdf440c0267c42c1e59565247f4ae11e7e4bcfd734d7bb9abc7e9167f25086c66e3527ff92ebf1a620d408f0e70b45bc1ab8adb8f05fd912a2 WHIRLPOOL 2d269b5bdab88b42265029c0c5cdbc6e6a2de146a629357f5c7b1041d99e25d18be3e5d8982d3d74d8f1fba8ffa8fd4444a05a9569244126fed05b87ca833ad2
-DIST mailman-2.1.11.tgz 7992229 SHA256 66f2e1d27b6d1f253a8ebbe218cacaab947e6b421f7513fbaea2314b24f06bda
-DIST mailman-2.1.12.tgz 8010027 SHA256 5e9313252cc2eea774c453131e7f3fe3a5873ebce26628c5504cdc318d563ddd
-DIST mailman-2.1.13.tgz 8166504 SHA256 ddab5169c851e49134d8e58fd0d5fd3b920d8ddb5f52582c2ec95076c746a25e
 DIST mailman-2.1.14.tgz 8201150 SHA256 1d6be802b718639126c4069eb7f9cd3a347765e1cb199cc3bb14d71572d09523 SHA512 77230730150ba6580a9924a771959a1e4488026a24e1a04f9f984315d127ced9cb04e09fb0eb9272172c097f23ac16d0a0d51b7564c49649a402ca581ae0a308 WHIRLPOOL 299c977ab7887ddefcf559b7d0ec3268d660736559c6066d95eb9b85cce37ca139f9e01abe668fc34c3571bf36afeb52f857d05d630674eb0da4ed8ef34c2c62
-DIST mailman-2.1.14rc1.tgz 8201021 SHA256 f3969382740418a8e30eb27142d98ec39613a098649bc14992cbfda671c45b70
 DIST mailman-2.1.15.tgz 8468107 SHA256 f355fb3d31772b488449e6f5173dafd31edca93172c307244c791d25d9e2bec8 SHA512 3502d32690856bad2140851bf582ebe8cea0ba38a184aae715cc7921754aac452b789b7031cbb47895737f4135e59f44888bdca56c512378ad9367d62b372536 WHIRLPOOL f20dad43d44ab542f324dd06373bbd741db2aea0e59eb4894cc73149638ef5ee316dcd622ef71871c26d0e99d830c60e5ec8f10bf63290b0fb5b86d05a32cd9d
-DIST mailman-2.1.9.tgz 7829201 SHA256 1b7a2c853c21bfd22205167dc3678c634a3f981721d95d1cd923ca84967cc986
-EBUILD mailman-2.1.11.ebuild 5767 SHA256 81c70d7057006df62efc1d17014f1a968351c24f17f74f3072f0ecf23be83ecc SHA512 82dd025da2c04a8d3025a8f1e440f774ace5f58c19efa660656a19ffceadd94514382da1e9b2c94b436d9cba6a106c6165b2ca3b6956f31406cc89320b005844 WHIRLPOOL bfb764350731bdcbbe7edf6210473ecd260adcae4038b8e11ef23678c74dd7e35c1413fa9e0cf0f66c525ac9da7f246b013e5b63743eecbc8cdf5607d0ccfcf7
-EBUILD mailman-2.1.12.ebuild 5922 SHA256 03c7aec1eb264463a072b435001accd0f69400a144d8983b8dd012877052619a SHA512 9630b7f4d66d34f2098a99097bdba0cac138681bbcf62b58a96c905d784cc463fc7dbe3fc2c4f88a576f5a52e446229ecf8ae46c62d8c4139522bbfc836f3950 WHIRLPOOL 00db1a8c34874e0184c53b76d2ab188ca796011ff6304994f10d417c2356aacb70fdec5a086acc068aed016dee70b72179ad7f67acd3406052dcd54471d67c04
-EBUILD mailman-2.1.13.ebuild 5891 SHA256 7a40c895e97ce3bb18f5d2885c1075f2b280e3b9e4f4c7f12c82f0fc2e55957c SHA512 f87388829d5ff26b946428ca250de861ffb65caed0765a146c75b3aa8be99e84b1ffcd4af3ad4ab9bde9d1c7f313305ec3d3679ae7480a8fac989e72cd6a40bb WHIRLPOOL 4868b8e82b877106e1d3b1e40cfab424f463f3eb0b644ab37bed0b0368931b8d88d87f5556cc9d17507a4baea989378691f6f584ee1d4d610edbb29e1e41e9e9
 EBUILD mailman-2.1.14.ebuild 5895 SHA256 334ef09a518098f67d2c485f4538cd4c07f24e02d536b1fe85708d2487a04e82 SHA512 112e72cdc50359cd7d397104b28f90ec981f9c8077c253bc5a3a87110963ce2d73358422aa5918ede8a9169581c1bb88aceb8c8989c85cac98aae18188370a48 WHIRLPOOL d84988a3aa8ec319d1d73a5e017885e88097533fad938ea0105f7d7413495b24457234d9abc62e0e631c77803695751d0306799a02b1d70dfd25c867240b1bb0
-EBUILD mailman-2.1.14_rc1.ebuild 5933 SHA256 a52d961d10867f52b6e9babf30f98c1a9cb5ba27ed54dc2ff93b88cdbd93474a SHA512 e5b39e28ba637c864bfaa85e26f09409afc5e9cdcdc3ae41e25065695625b38dd0186b5cb4515ef710d9e0ce3fe7eeee1c0fc8dc52615eacf89d4cf299415c37 WHIRLPOOL c20c2f31fe7681537e3520f17a50ea30a5e5f15fb12168448f91ddf36ff3e672903a4a9529ff52bcf15ebcfd7d5c24e5668205eccbc9885d691de05d4b9cc019
-EBUILD mailman-2.1.15.ebuild 5954 SHA256 85a44480652feb297114469d413a3f9888558b2baad54830259932c039d2d5c6 SHA512 bb8ec3de48b85fa3b8cefe06f8027a40577392820aab782afca5e0da5d0d9c1a2b108ebb3eb5a1216405e04e2651530359653bc6e220c77e60c0f73a24996205 WHIRLPOOL 0a8b51c464e69d31ead4e54fda1dd958583595a9525f35a05ab7ad4ae841b8ba5aaafd37afa0c979499bd7fccc06138323b1612adb6ca11362ab4588be39bdc0
-EBUILD mailman-2.1.9-r3.ebuild 5012 SHA256 bed710facdc9144171bc33f130b0c6b6c3fc8ca608a348662bf09bea2cde50c1 SHA512 8184972a83fbb1bd9b72a6a3a7508557363755cb81720bae440c70bdc4c520261413beb86c1d7897fb145c8855298bc8eba0a4b222c7b40c536b738f873ac1ff WHIRLPOOL 425b1062e131273796968d8c4bbf68ef1cb543328ed734808f2eaad58f39a1af1ab42a3b7f744526c77228b607445c4cd031becca41081fe22dde0820a42d3fb
-MISC ChangeLog 17738 SHA256 e8bde912b6a77c0337667ebf28621cf13914fb557fe48df123c6f10ba5d2d152 SHA512 863ef3dd1b94b86a4891778645a5fc9326860fe325192740a64e574f08b0e02e0291bafd17dd83d198e0b52505b0bef775c4293d47510cd9e0dd92d203c7ce37 WHIRLPOOL 403c09fb76c712b6ed2fc51ad2c900a526fcfdbefdde23cd30666922f29bf4e7d21d691918707744c2bf77c162a663a872843d889dd1667e3291a5b510eeadbe
+EBUILD mailman-2.1.15.ebuild 5947 SHA256 8f909916092c184bb5b9fad9dc2c498fc373e69c6124d3e5ff888b15c453e4f4 SHA512 62f2d2ef10d08163b9dc349e96dd3bb574f197f208afb7b81a27a8e8c2977c115073d159b090566581c74ca16e2e6b07b294519fc3520ced3e9ff3698d5431c0 WHIRLPOOL eefeec5950cdbadeaf1c36615b544e00df7a63c5c3fa1ff08bffc72009e34e4d24145c10869c471316eb5b97f52322da6bbbd983b6351870130a05bb980ec69a
+MISC ChangeLog 18296 SHA256 16244a607e2ed1a854757ac0f901069b75c44b82d4cdb5cf7b3278e70062ece4 SHA512 767980bf6ee31deac013ba67737ceb9370765316070b2066f9647654c10f8b9d58253f6c55bf7bacca77d8361a2928e0922f3a6e8689a2ceb8ebba7aff7a16b9 WHIRLPOOL be3730bf1d99ef4f310f8dacaf0783e2bff1377b35951f0f5f4802316e96d2f1f940de2f271d100e1aa91e9eee7f4b22b57f84f15373045aef355e28b81eb281
 MISC metadata.xml 218 SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89 SHA512 8bb5bbe8e06a6caffb45c8a717c3fce94b35fd085a711523d439b3135f3949e46f8b7ae1936aa75ea6385fc59054585009ff16fe73052c3eccaea09449204544 WHIRLPOOL aaa5590db64b60ddb7628f0e9ea780da50f0e43a7f10a6562848d9167dfdfbec531aff68f7df2da2b173e9900b91e40b5ff9cf4ecab86dbff8c082053a53b90c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQIqP8AAoJEKWIAHK7tR5ClssP/3eb46IJqQ8Tsse72cbzC17E
-CzBpUgqhIGAJBKkgNv/FrCD+2tprRqKMZBTpVbZKpak69qcoXZBmNHl4u1k6ebOx
-lTqIlMIURVrFUBstFY9/HFqY9Q2rrajmKO1/d++Nkj9rt8TLy51+uRFnnDDYkEen
-i/EQvFUE3AkDtKlTTamyEtGnZbMtY6nB3y1wEXyQJdAY+V9OfSfIZG7/P6k3Kw6S
-imJO+lI/KIOh01c+OiR5FIKVZkcc3iCSnjR3pzn2caI7JIV7lfpmqhI/p9Ux60DS
-5v0ovvUbvJMz7LQE9YiebIJGWFagpdWQ2TtkBMJ6HRPXqk35gQeZDpXehG/H12EK
-qr5K1JD1oHSo0v32djgivRGc+Je4x9/f116M9rKsGiHBzpyme5D8XGEARyxTq3EV
-2hNrE5Bd9sST2i7FQjkQRkJffW1F91cGopJg9WWL0UCBtNv95PKQIaWg9nf4EOzY
-AcS1QciddP5seZFZY9weBOzvm007MQ3kfR+KNh7Ul1moHJC8Ovkm5gKsrCdonAWJ
-sWqFdIih3dU43vZsnoCc3Jt13UuTI8z4kWHjtu1OFDsvrfWlGlezOR+10E8kkoFI
-bd0EfuGRHR1VXP9nNhcg4GCKq+Fq35r3zKEWrcyidXSMl3pSZz2a58y2fkLPIw7j
-4hCF91HVBYXbSYyyU6BY
-=U+Wz
+iQIcBAEBCAAGBQJQK5qTAAoJEKWIAHK7tR5C6HgP/3/oZIt9qXzuW3A5+roLMWnH
+WQ+CVxuLdUfTEa+bdtOtXjdCbrUvDfg1aCzHvXguyVH9PjLt/VOeS5Jk0PI4sJdd
+rLa2u/xoEG8VfXGr7iSqf4Ri5sw8TYCOwCHhy+C8p4Jji8Lf1qvDsMe27KxaBAij
+ZxAdeu2a0IjRyMxBDPhLAG4eSP7k86lfD3oJw1Z6UcYpdg49w4dxMijW5wSmtBZR
+1INrfehqEhYL38yLJ+OmLmdlaBYsfzfcqNBYgQmTi3LFCJB1/LXNAy0GJ1CWCIeD
+x0CJyWrtDsgQt0Eoigg+0XMjHdwlkWGtDtmVg74R4gctCs3dLnDMAFqpgqwmsFIQ
+CO/ypGbejOH7Q8Tj8KkqyZP0+9UEHRwM3TJRx9BlRdy+ouz3hvMbafpR9jfLFeTG
+zByVS9vO+PkQ5yFI4M2z9qvMv9qI+rlsmHYIoG4cTReaZC7vD8uHgCvz3Hf3yqsW
+cbICfCIKXPPFIaVSN9cz69PXxFC5EY37PQOHkm7k/u/c8KJHfAcXl3T9M9Gm+dAL
+SI4e7z12zxSxP17eG+mJdEr4bCt5o6/yif2UMpCh/74w+5kil4+WK0jVqH4LmD+p
+SNFuPRQ773V4kNMDrNMNnaQtYjInid/s+0T5Ig4nG9CKe2vjkFCKjk/eIuCEiSKT
+qfSTSlSGILwpctykYl/A
+=2jnD
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailman/files/50_mailman.conf b/net-mail/mailman/files/50_mailman.conf
deleted file mode 100644
index dc076dab77aa..000000000000
--- a/net-mail/mailman/files/50_mailman.conf
+++ /dev/null
@@ -1,18 +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>
-</IfDefine>
diff --git a/net-mail/mailman/files/README.gentoo-r2 b/net-mail/mailman/files/README.gentoo-r2
deleted file mode 100644
index 5149b1feed68..000000000000
--- a/net-mail/mailman/files/README.gentoo-r2
+++ /dev/null
@@ -1,149 +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/files/README.gentoo-r2,v 1.1 2008/01/22 15:47:37 hanno Exp $
-
-Follow these instructions to finish setting up mailman. This file and the
-original ebuild were tweaked by me <lamer@gentoo.org> but were graciously
-submitted by Joby Walker (YOU RULE!) 
-2003 Jul 09: updated by Jesus Perez and re-tweaked by me <raker@gentoo.org>
-for 2.1.x.
-
-Please view the documentation on Mailman at: http://www.list.org/
-
-This documentation assumes you're using the default gentoo path
-(/usr/lib/mailman/), if you've changed it with MAILMAN_PREFIX, adjust them
-accordingly.
-
-1) If this is your first time installing mailman, after your "emerge mailman",
-you need to add -D MAILMAN to /etc/conf.d/apache or /etc/conf.d/apache2 and restart
-apache.
-
-2) In your /etc/conf.d/apache (for apache 1.x)
-	or /etc/conf.d/apache2 (for apache 2.x) 
-	file add the additional option to the
-	APACHE_OPTS or APACHE2_OPTS variable:
-
-	-D MAILMAN
-
-3) Make sure mailman is a part of the cron group
-
-4) This must be done as user mailman:
-
-	su - mailman
-
-Add the cron jobs:
-
-	cd cron
-	crontab crontab.in
-	cd ..
-
-Create the site password:
-
-	bin/mmsitepass
-
-and main list:
-
-	bin/newlist mailman
-
-
-5) Change back to root:
-
-	exit
-
-(Postfix users: read the notes at the end of this file before you continue)
-Add this to /etc/mail/aliases (and see point 9 for notes):
-     mailman:              "|/usr/lib/mailman/mail/mailman post mailman"
-     mailman-admin:        "|/usr/lib/mailman/mail/mailman admin mailman"
-     mailman-bounces:      "|/usr/lib/mailman/mail/mailman bounces mailman"
-     mailman-confirm:      "|/usr/lib/mailman/mail/mailman confirm mailman"
-     mailman-join:         "|/usr/lib/mailman/mail/mailman join mailman"
-     mailman-leave:        "|/usr/lib/mailman/mail/mailman leave mailman"
-     mailman-owner:        "|/usr/lib/mailman/mail/mailman owner mailman"
-     mailman-request:      "|/usr/lib/mailman/mail/mailman request mailman"
-     mailman-subscribe:    "|/usr/lib/mailman/mail/mailman subscribe mailman"
-     mailman-unsubscribe:  "|/usr/lib/mailman/mail/mailman unsubscribe mailman"
-
-For courier, the aliases have to go to /etc/courier/aliases and you have to skip
-the quotes.
-
-Run newaliases (only if you use sendmail).
-
-	newaliases
-    
-Copy the web icons:
-     cp /usr/lib/mailman/icons/* /var/www/localhost/icons
-
-6) Start the mailman daemon:
-
-	/etc/init.d/mailman start
-
-and add it to default runlevel (optional but recommended):
-
-	rc-update add mailman default
-
-7) For each list created (either with web interface or with bin/newlist) 
-this must be added to /etc/mail/aliases (see smrsh notes below)
-replace <list-name> with the name of the list:
-
-	<list-name>: "|/usr/lib/mailman/mail/mailman post <list-name>"
-	<list-name>-admin: "|/usr/lib/mailman/mail/mailman admin <list-name>"
-	<list-name>-bounces: "|/usr/lib/mailman/mail/mailman bounces <list-name>"
-     	<list-name>-confirm: "|/usr/lib/mailman/mail/mailman confirm <list-name>"
-     	<list-name>-join: "|/usr/lib/mailman/mail/mailman join <list-name>"
-	<list-name>-leave: "|/usr/lib/mailman/mail/mailman leave <list-name>"
-	<list-name>-owner: "|/usr/lib/mailman/mail/mailman owner <list-name>"
-	<list-name>-request: "|/usr/lib/mailman/mail/mailman request <list-name>"
-     	<list-name>-subscribe: "|/usr/lib/mailman/mail/mailman subscribe <list-name>"
-	<list-name>-unsubscribe: "|/usr/lib/mailman/mail/mailman unsubscribe <list-name>"
-
-For courier, the aliases have to go to /etc/courier/aliases and you have to skip
-the quotes.
-
-Run newaliases:
-
-	newaliases
-
-smrsh notes
------------
-(if you use sendmail, you are surely using srmsh) you must note that 
-sendmail won't run any program outside of EBINDIR. I tried to change 
-EBINDIR using,define(`confEBINDIR', `/usr/lib/mailman/mail')dnl in 
-sendmail.mc but it didn't work, so mailman must be placed in EBINDIR, 
-which in Gentoo is /usr/adm/sm.bin, so you must run as root:
-
-     ln -s /usr/lib/mailman/mail/mailman /usr/adm/sm.bin/mailman
-
-And the lines in /etc/mail/aliases which refer to 
-/usr/lib/mailman/mail/mailman must be changed to mailman:
-
-     <list-name>:              "|mailman post <list-name>"
-     <list-name>-admin:        "|mailman admin <list-name>"
-     <list-name>-bounces:      "|mailman bounces <list-name>"
-     <list-name>-confirm:      "|mailman confirm <list-name>"
-     <list-name>-join:         "|mailman join <list-name>"
-     <list-name>-leave:        "|mailman leave <list-name>"
-     <list-name>-owner:        "|mailman owner <list-name>"
-     <list-name>-request:      "|mailman request <list-name>"
-     <list-name>-subscribe:    "|mailman subscribe <list-name>"
-     <list-name>-unsubscribe:  "|mailman unsubscribe <list-name>"
-
-
-Other Helpful things to know...
--------------------------------
-run "bin/check_perms -f" from the root mailman directory
-(/usr/lib/mailman) to check and fix permission problems.
-
-The INSTALL file is located in /usr/share/doc/mailman-$VERSION/ 
-
-Postfix notes
--------------
-If you're using Postfix, don't manually change your /etc/mail/aliases
-file, as described above. Instead, follow these instructions:
-
-http://list.org/mailman-install/node13.html
-
-This will set up Mailman and Postfix to automatically generate the new
-aliases when you create new lists. It will also make sure that Postfix
-uses the correct group ID when it's talking to Mailman, otherwise you
-will get security errors from Mailman.
-
diff --git a/net-mail/mailman/files/mailman-2.1.12-add-destdir.patch b/net-mail/mailman/files/mailman-2.1.12-add-destdir.patch
deleted file mode 100644
index 5aaaca4b9914..000000000000
--- a/net-mail/mailman/files/mailman-2.1.12-add-destdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mailman-2.1.12/misc/Makefile.in.1	2009-08-01 11:47:54.000000000 +0200
-+++ mailman-2.1.12/misc/Makefile.in	2009-08-01 11:48:02.000000000 +0200
-@@ -93,7 +93,7 @@
- install-packages:
- 	if [ -z "$(EMAILPKG)" -a -d $(PYTHONLIBDIR)/email ] ; \
- 	then \
--	    rm -rf $(PYTHONLIBDIR)/email* ; \
-+	    rm -rf $(DESTDIR)/$(PYTHONLIBDIR)/email* ; \
- 	fi
- 	for p in $(PACKAGES); \
- 	do \
diff --git a/net-mail/mailman/files/mailman-2.1.12-directory-check.patch b/net-mail/mailman/files/mailman-2.1.12-directory-check.patch
deleted file mode 100644
index 857a7c8ade54..000000000000
--- a/net-mail/mailman/files/mailman-2.1.12-directory-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur mailman-2.1.12/bin/check_perms mailman-2.1.12-1/bin/check_perms
---- mailman-2.1.12/bin/check_perms	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-1/bin/check_perms	2009-08-01 11:28:56.000000000 +0200
-@@ -340,6 +340,8 @@
-         print _('checking permissions on list data')
-     # BAW: This needs to be converted to the Site module abstraction
-     for dir in os.listdir(mm_cfg.LIST_DATA_DIR):
-+        if not S_ISDIR(statmode(os.path.join(mm_cfg.LIST_DATA_DIR,dir))):
-+            continue
-         for file in checkfiles:
-             path = os.path.join(mm_cfg.LIST_DATA_DIR, dir, file)
-             if STATE.VERBOSE:
-diff -Naur mailman-2.1.12/bin/update mailman-2.1.12-1/bin/update
---- mailman-2.1.12/bin/update	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-1/bin/update	2009-08-01 11:29:19.000000000 +0200
-@@ -34,6 +34,7 @@
- """
- 
- import os
-+import stat
- import sys
- import time
- import errno
-@@ -431,7 +432,7 @@
-     # Now update for the Mailman 2.1.5 qfile format.  For every filebase in
-     # the qfiles/* directories that has both a .pck and a .db file, pull the
-     # data out and re-queue them.
--    for dirname in os.listdir(mm_cfg.QUEUE_DIR):
-+    for dirname in [x for x in os.listdir(mm_cfg.QUEUE_DIR) if stat.S_ISDIR(os.stat(os.path.join(mm_cfg.QUEUE_DIR,x)).st_mode)]:
-         dirpath = os.path.join(mm_cfg.QUEUE_DIR, dirname)
-         if dirpath == mm_cfg.BADQUEUE_DIR:
-             # The files in qfiles/bad can't possibly be pickles
diff --git a/net-mail/mailman/files/mailman-2.1.8_rc1-directory-check.patch b/net-mail/mailman/files/mailman-2.1.8_rc1-directory-check.patch
deleted file mode 100644
index d8542fcf6a88..000000000000
--- a/net-mail/mailman/files/mailman-2.1.8_rc1-directory-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- bin/check_perms.org	2005-05-25 00:04:15.000000000 +0200
-+++ bin/check_perms	2005-05-25 00:04:35.000000000 +0200
-@@ -331,6 +331,8 @@
-         print _('checking permissions on list data')
-     # BAW: This needs to be converted to the Site module abstraction
-     for dir in os.listdir(mm_cfg.LIST_DATA_DIR):
-+        if not S_ISDIR(statmode(os.path.join(mm_cfg.LIST_DATA_DIR,dir))):
-+            continue
-         for file in checkfiles:
-             path = os.path.join(mm_cfg.LIST_DATA_DIR, dir, file)
-             if STATE.VERBOSE:
---- bin/update.org	2005-05-25 00:04:30.000000000 +0200
-+++ bin/update	2005-05-25 00:04:35.000000000 +0200
-@@ -34,6 +34,7 @@
- """
- 
- import os
-+import stat
- import md5
- import sys
- import time
-@@ -425,7 +426,7 @@
-     # Now update for the Mailman 2.1.5 qfile format.  For every filebase in
-     # the qfiles/* directories that has both a .pck and a .db file, pull the
-     # data out and re-queue them.
--    for dirname in os.listdir(mm_cfg.QUEUE_DIR):
-+    for dirname in [x for x in os.listdir(mm_cfg.QUEUE_DIR) if stat.S_ISDIR(os.stat(os.path.join(mm_cfg.QUEUE_DIR,x)).st_mode)]:
-         dirpath = os.path.join(mm_cfg.QUEUE_DIR, dirname)
-         if dirpath == mm_cfg.BADQUEUE_DIR:
-             # The files in qfiles/bad can't possibly be pickles
diff --git a/net-mail/mailman/files/mailman-2.1.9-fix-XSS.patch b/net-mail/mailman/files/mailman-2.1.9-fix-XSS.patch
deleted file mode 100644
index b80c50dca6fd..000000000000
--- a/net-mail/mailman/files/mailman-2.1.9-fix-XSS.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-=== modified file 'Mailman/Cgi/edithtml.py'
---- Mailman/Cgi/edithtml.py	2006-08-30 14:54:22 +0000
-+++ Mailman/Cgi/edithtml.py	2007-12-04 19:52:18 +0000
-@@ -1,4 +1,4 @@
--# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
-+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
-@@ -159,7 +159,20 @@
-         doc.AddItem('<hr>')
-         return
-     code = cgi_info['html_code'].value
--    code = re.sub(r'<([/]?script.*?)>', r'&lt;\1&gt;', code)
-+    if Utils.suspiciousHTML(code):
-+        doc.AddItem(Header(3,
-+           _("""The page you saved contains suspicious HTML that could
-+potentially expose your users to cross-site scripting attacks.  This change
-+has therefore been rejected.  If you still want to make these changes, you
-+must have shell access to your Mailman server.
-+             """)))
-+        doc.AddItem(_('See '))
-+        doc.AddItem(Link(
-+'http://www.python.org/cgi-bin/faqw-mm.py?req=show&file=faq04.048.htp',
-+                _('FAQ 4.48.')))
-+        doc.AddItem(Header(3,_("Page Unchanged.")))
-+        doc.AddItem('<hr>')
-+        return
-     langdir = os.path.join(mlist.fullpath(), mlist.preferred_language)
-     # Make sure the directory exists
-     omask = os.umask(0)
-
-=== modified file 'Mailman/Gui/General.py'
---- Mailman/Gui/General.py	2006-08-30 14:54:22 +0000
-+++ Mailman/Gui/General.py	2007-12-04 19:52:18 +0000
-@@ -1,4 +1,4 @@
--# Copyright (C) 2001-2006 by the Free Software Foundation, Inc.
-+# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
-@@ -436,17 +442,21 @@
-             # Convert any html entities to Unicode
-             mlist.subject_prefix = Utils.canonstr(
-                 val, mlist.preferred_language)
-+        elif property == 'info':
-+            if val <> mlist.info:
-+                if Utils.suspiciousHTML(val):
-+                    doc.addError(_("""The <b>info</b> attribute you saved
-+contains suspicious HTML that could potentially expose your users to cross-site
-+scripting attacks.  This change has therefore been rejected.  If you still want
-+to make these changes, you must have shell access to your Mailman server.
-+This change can be made with bin/withlist or with bin/config_list by setting
-+mlist.info.
-+                        """))
-+                else:
-+                    mlist.info = val
-         else:
-             GUIBase._setValue(self, mlist, property, val, doc)
- 
--    def _escape(self, property, value):
--        # The 'info' property allows HTML, but let's sanitize it to avoid XSS
--        # exploits.  Everything else should be fully escaped.
--        if property <> 'info':
--            return GUIBase._escape(self, property, value)
--        # Sanitize <script> and </script> tags but nothing else.  Not the best
--        # solution, but expedient.
--        return re.sub(r'(?i)<([/]?script.*?)>', r'&lt;\1&gt;', value)
- 
-     def _postValidate(self, mlist, doc):
-         if not mlist.reply_to_address.strip() and \
-
-=== modified file 'Mailman/Gui/GUIBase.py'
---- Mailman/Gui/GUIBase.py	2005-08-27 01:40:17 +0000
-+++ Mailman/Gui/GUIBase.py	2007-11-18 20:01:26 +0000
-@@ -1,4 +1,4 @@
--# Copyright (C) 2002-2004 by the Free Software Foundation, Inc.
-+# Copyright (C) 2002-2007 by the Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
-@@ -12,7 +12,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+# USA.
- 
- """Base class for all web GUI components."""
- 
-@@ -122,10 +127,6 @@
-         # Validate all the attributes for this category
-         pass
- 
--    def _escape(self, property, value):
--        value = value.replace('<', '&lt;')
--        return value
--
-     def handleForm(self, mlist, category, subcat, cgidata, doc):
-         for item in self.GetConfigInfo(mlist, category, subcat):
-             # Skip descriptions and legacy non-attributes
-@@ -144,10 +145,9 @@
-             elif not cgidata.has_key(property):
-                 continue
-             elif isinstance(cgidata[property], ListType):
--                val = [self._escape(property, x.value)
--                       for x in cgidata[property]]
-+                val = [x.value for x in cgidata[property]]
-             else:
--                val = self._escape(property, cgidata[property].value)
-+                val = cgidata[property].value
-             # Coerce the value to the expected type, raising exceptions if the
-             # value is invalid.
-             try:
-
-=== modified file 'Mailman/Utils.py'
---- Mailman/Utils.py	2007-11-25 08:04:30 +0000
-+++ Mailman/Utils.py	2007-12-04 19:52:18 +0000
-@@ -876,3 +876,154 @@
-     except (LookupError, UnicodeError, ValueError, HeaderParseError):
-         # possibly charset problem. return with undecoded string in one line.
-         return EMPTYSTRING.join(s.splitlines())
-+
-+
-+# Patterns and functions to flag possible XSS attacks in HTML.
-+# This list is compiled from information at http://ha.ckers.org/xss.html,
-+# http://www.quirksmode.org/js/events_compinfo.html,
-+# http://www.htmlref.com/reference/appa/events1.htm,
-+# http://lxr.mozilla.org/mozilla/source/content/events/src/nsDOMEvent.cpp#59,
-+# http://www.w3.org/TR/DOM-Level-2-Events/events.html and
-+# http://www.xulplanet.com/references/elemref/ref_EventHandlers.html
-+# Many thanks are due to Moritz Naumann for his assistance with this.
-+_badwords = [
-+    '<i?frame',
-+    '<link',
-+    '<meta',
-+    '<script',
-+    r'(?:^|\W)j(?:ava)?script(?:\W|$)',
-+    r'(?:^|\W)vbs(?:cript)?(?:\W|$)',
-+    r'(?:^|\W)domactivate(?:\W|$)',
-+    r'(?:^|\W)domattrmodified(?:\W|$)',
-+    r'(?:^|\W)domcharacterdatamodified(?:\W|$)',
-+    r'(?:^|\W)domfocus(?:in|out)(?:\W|$)',
-+    r'(?:^|\W)dommenuitem(?:in)?active(?:\W|$)',
-+    r'(?:^|\W)dommousescroll(?:\W|$)',
-+    r'(?:^|\W)domnodeinserted(?:intodocument)?(?:\W|$)',
-+    r'(?:^|\W)domnoderemoved(?:fromdocument)?(?:\W|$)',
-+    r'(?:^|\W)domsubtreemodified(?:\W|$)',
-+    r'(?:^|\W)fscommand(?:\W|$)',
-+    r'(?:^|\W)onabort(?:\W|$)',
-+    r'(?:^|\W)on(?:de)?activate(?:\W|$)',
-+    r'(?:^|\W)on(?:after|before)print(?:\W|$)',
-+    r'(?:^|\W)on(?:after|before)update(?:\W|$)',
-+    r'(?:^|\W)onbefore(?:(?:de)?activate|copy|cut|editfocus|paste)(?:\W|$)',
-+    r'(?:^|\W)onbeforeunload(?:\W|$)',
-+    r'(?:^|\W)onbegin(?:\W|$)',
-+    r'(?:^|\W)onblur(?:\W|$)',
-+    r'(?:^|\W)onbounce(?:\W|$)',
-+    r'(?:^|\W)onbroadcast(?:\W|$)',
-+    r'(?:^|\W)on(?:cell)?change(?:\W|$)',
-+    r'(?:^|\W)oncheckboxstatechange(?:\W|$)',
-+    r'(?:^|\W)on(?:dbl)?click(?:\W|$)',
-+    r'(?:^|\W)onclose(?:\W|$)',
-+    r'(?:^|\W)oncommand(?:update)?(?:\W|$)',
-+    r'(?:^|\W)oncomposition(?:end|start)(?:\W|$)',
-+    r'(?:^|\W)oncontextmenu(?:\W|$)',
-+    r'(?:^|\W)oncontrolselect(?:\W|$)',
-+    r'(?:^|\W)oncopy(?:\W|$)',
-+    r'(?:^|\W)oncut(?:\W|$)',
-+    r'(?:^|\W)ondataavailable(?:\W|$)',
-+    r'(?:^|\W)ondataset(?:changed|complete)(?:\W|$)',
-+    r'(?:^|\W)ondrag(?:drop|end|enter|exit|gesture|leave|over)?(?:\W|$)',
-+    r'(?:^|\W)ondragstart(?:\W|$)',
-+    r'(?:^|\W)ondrop(?:\W|$)',
-+    r'(?:^|\W)onend(?:\W|$)',
-+    r'(?:^|\W)onerror(?:update)?(?:\W|$)',
-+    r'(?:^|\W)onfilterchange(?:\W|$)',
-+    r'(?:^|\W)onfinish(?:\W|$)',
-+    r'(?:^|\W)onfocus(?:in|out)?(?:\W|$)',
-+    r'(?:^|\W)onhelp(?:\W|$)',
-+    r'(?:^|\W)oninput(?:\W|$)',
-+    r'(?:^|\W)onkey(?:up|down|press)(?:\W|$)',
-+    r'(?:^|\W)onlayoutcomplete(?:\W|$)',
-+    r'(?:^|\W)on(?:un)?load(?:\W|$)',
-+    r'(?:^|\W)onlosecapture(?:\W|$)',
-+    r'(?:^|\W)onmedia(?:complete|error)(?:\W|$)',
-+    r'(?:^|\W)onmouse(?:down|enter|leave|move|out|over|up|wheel)(?:\W|$)',
-+    r'(?:^|\W)onmove(?:end|start)?(?:\W|$)',
-+    r'(?:^|\W)on(?:off|on)line(?:\W|$)',
-+    r'(?:^|\W)onoutofsync(?:\W|$)',
-+    r'(?:^|\W)onoverflow(?:changed)?(?:\W|$)',
-+    r'(?:^|\W)onpage(?:hide|show)(?:\W|$)',
-+    r'(?:^|\W)onpaint(?:\W|$)',
-+    r'(?:^|\W)onpaste(?:\W|$)',
-+    r'(?:^|\W)onpause(?:\W|$)',
-+    r'(?:^|\W)onpopup(?:hidden|hiding|showing|shown)(?:\W|$)',
-+    r'(?:^|\W)onprogress(?:\W|$)',
-+    r'(?:^|\W)onpropertychange(?:\W|$)',
-+    r'(?:^|\W)onradiostatechange(?:\W|$)',
-+    r'(?:^|\W)onreadystatechange(?:\W|$)',
-+    r'(?:^|\W)onrepeat(?:\W|$)',
-+    r'(?:^|\W)onreset(?:\W|$)',
-+    r'(?:^|\W)onresize(?:end|start)?(?:\W|$)',
-+    r'(?:^|\W)onresume(?:\W|$)',
-+    r'(?:^|\W)onreverse(?:\W|$)',
-+    r'(?:^|\W)onrow(?:delete|enter|exit|inserted)(?:\W|$)',
-+    r'(?:^|\W)onrows(?:delete|enter|inserted)(?:\W|$)',
-+    r'(?:^|\W)onscroll(?:\W|$)',
-+    r'(?:^|\W)onseek(?:\W|$)',
-+    r'(?:^|\W)onselect(?:start)?(?:\W|$)',
-+    r'(?:^|\W)onselectionchange(?:\W|$)',
-+    r'(?:^|\W)onstart(?:\W|$)',
-+    r'(?:^|\W)onstop(?:\W|$)',
-+    r'(?:^|\W)onsubmit(?:\W|$)',
-+    r'(?:^|\W)onsync(?:from|to)preference(?:\W|$)',
-+    r'(?:^|\W)onsyncrestored(?:\W|$)',
-+    r'(?:^|\W)ontext(?:\W|$)',
-+    r'(?:^|\W)ontimeerror(?:\W|$)',
-+    r'(?:^|\W)ontrackchange(?:\W|$)',
-+    r'(?:^|\W)onunderflow(?:\W|$)',
-+    r'(?:^|\W)onurlflip(?:\W|$)',
-+    r'(?:^|\W)seeksegmenttime(?:\W|$)',
-+    r'(?:^|\W)svgabort(?:\W|$)',
-+    r'(?:^|\W)svgerror(?:\W|$)',
-+    r'(?:^|\W)svgload(?:\W|$)',
-+    r'(?:^|\W)svgresize(?:\W|$)',
-+    r'(?:^|\W)svgscroll(?:\W|$)',
-+    r'(?:^|\W)svgunload(?:\W|$)',
-+    r'(?:^|\W)svgzoom(?:\W|$)',
-+    ]
-+
-+
-+# This is the actual re to look for the above patterns
-+_badhtml = re.compile('|'.join(_badwords), re.IGNORECASE)
-+# This is used to filter non-printable us-ascii characters, some of which
-+# can be used to break words to avoid recognition.
-+_filterchars = re.compile('[\000-\011\013\014\016-\037\177-\237]')
-+# This is used to recognize '&#' and '%xx' strings for _translate which
-+# translates them to characters
-+_encodedchars = re.compile('(&#[0-9]+;?)|(&#x[0-9a-f]+;?)|(%[0-9a-f]{2})',
-+                           re.IGNORECASE)
-+
-+
-+def _translate(mo):
-+    """Translate &#... and %xx encodings into the encoded character."""
-+    match = mo.group().lower().strip('&#;')
-+    try:
-+        if match.startswith('x') or match.startswith('%'):
-+            val = int(match[1:], 16)
-+        else:
-+            val = int(match, 10)
-+    except ValueError:
-+        return ''
-+    if val < 256:
-+        return chr(val)
-+    else:
-+        return ''
-+
-+
-+def suspiciousHTML(html):
-+    """Check HTML string for various tags, script language names and
-+    'onxxx' actions that can be used in XSS attacks.
-+    Currently, this a very simple minded test.  It just looks for
-+    patterns without analyzing context.  Thus, it potentially flags lots
-+    of benign stuff.
-+    Returns True if anything suspicious found, False otherwise.
-+    """
-+
-+    if _badhtml.search(_filterchars.sub(
-+                       '', _encodedchars.sub(_translate, html))):
-+        return True
-+    else:
-+        return False
-
diff --git a/net-mail/mailman/files/mailman.conf b/net-mail/mailman/files/mailman.conf
deleted file mode 100644
index 4d8facd12832..000000000000
--- a/net-mail/mailman/files/mailman.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-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>
diff --git a/net-mail/mailman/mailman-2.1.11.ebuild b/net-mail/mailman/mailman-2.1.11.ebuild
deleted file mode 100644
index 54acfa6b57de..000000000000
--- a/net-mail/mailman/mailman-2.1.11.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.11.ebuild,v 1.6 2011/11/02 22:09:34 vapier Exp $
-
-inherit eutils python multilib
-
-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 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-
-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.8_rc1-directory-check.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed."
-}
-
-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
-
-	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
-}
diff --git a/net-mail/mailman/mailman-2.1.12.ebuild b/net-mail/mailman/mailman-2.1.12.ebuild
deleted file mode 100644
index b2293f9a998a..000000000000
--- a/net-mail/mailman/mailman-2.1.12.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.12.ebuild,v 1.7 2011/11/02 22:09:34 vapier Exp $
-
-inherit eutils python multilib
-
-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 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-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.12-directory-check.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-2.1.12-add-destdir.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed."
-}
-
-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}/pythonlib/*/
-
-	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}/pythonlib/*/
-}
diff --git a/net-mail/mailman/mailman-2.1.13.ebuild b/net-mail/mailman/mailman-2.1.13.ebuild
deleted file mode 100644
index b62acae87912..000000000000
--- a/net-mail/mailman/mailman-2.1.13.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.13.ebuild,v 1.4 2011/11/02 22:09:34 vapier Exp $
-
-inherit eutils python multilib
-
-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 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-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.12-directory-check.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed."
-	epatch "${FILESDIR}/${P}-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}/pythonlib/*/
-
-	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}/pythonlib/*/
-}
diff --git a/net-mail/mailman/mailman-2.1.14_rc1.ebuild b/net-mail/mailman/mailman-2.1.14_rc1.ebuild
deleted file mode 100644
index c7463e39e26a..000000000000
--- a/net-mail/mailman/mailman-2.1.14_rc1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2011 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_rc1.ebuild,v 1.3 2011/11/02 22:09:34 vapier Exp $
-
-inherit eutils python multilib
-
-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 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${P/_/}"
-
-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}/pythonlib/*/
-
-	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}/pythonlib/*/
-}
diff --git a/net-mail/mailman/mailman-2.1.15.ebuild b/net-mail/mailman/mailman-2.1.15.ebuild
index d8d79dbbf152..7f776466672a 100644
--- a/net-mail/mailman/mailman-2.1.15.ebuild
+++ b/net-mail/mailman/mailman-2.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1 2012/08/08 17:37:43 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.15.ebuild,v 1.2 2012/08/15 12:48:25 hanno Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -158,7 +158,6 @@ pkg_postinst() {
 	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() {
diff --git a/net-mail/mailman/mailman-2.1.9-r3.ebuild b/net-mail/mailman/mailman-2.1.9-r3.ebuild
deleted file mode 100644
index ad554e6b4aa2..000000000000
--- a/net-mail/mailman/mailman-2.1.9-r3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9-r3.ebuild,v 1.7 2011/11/02 22:09:34 vapier Exp $
-
-inherit eutils python multilib
-
-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 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-
-pkg_setup() {
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIGID=${MAILMAN_CGIGID:-81}
-	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.8_rc1-directory-check.patch" || die "patch failed."
-	epatch "${FILESDIR}/mailman-2.1.9-fix-XSS.patch" || die "patch failed."
-}
-
-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
-	doins "${FILESDIR}/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/archives:${VAR_PREFIX}/archives:g" /etc/apache2/modules.d/50_mailman.conf
-
-	newdoc "${FILESDIR}/README.gentoo-r2" 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/*
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public}
-	chmod 2750 "${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
-
-	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 "  ${APACHE_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_CGIGID (default: 81)"
-	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 "MUST change the homedir of the mailman-user manually:"
-	ewarn "usermod -d ${INSTALLDIR} mailman"
-	ebeep
-}
-
-pkg_postrm() {
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	python_mod_cleanup ${INSTALLDIR}/bin ${INSTALLDIR}/Mailman
-}