remove some old mailman stuff

(Portage version: 2.1.1_pre3-r3)

12 files changed, 0 insertions, 648 deletions

diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index c047b1badcac..9088708ba2bb 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50_mailman.conf 429 RMD160 54104453464b725adc18e5fb66bee265089013f6 SHA1 7b002917ae358587fc121f8c06c54c76dd0d9934 SHA256 8a93c5f9b2012122c6e85445620d5eb388e1bc38cb2102158bb62681cb61d3ec
 MD5 165ec3889c73f334f7b524c654977066 files/50_mailman.conf 429
 RMD160 54104453464b725adc18e5fb66bee265089013f6 files/50_mailman.conf 429
@@ -9,30 +6,10 @@ AUX README.gentoo 4963 RMD160 13ffe8aeb91ed2a2ff8e7a2b060c7697e19e280e SHA1 664b
 MD5 ea0c850a55a563d90a520ab52809112f files/README.gentoo 4963
 RMD160 13ffe8aeb91ed2a2ff8e7a2b060c7697e19e280e files/README.gentoo 4963
 SHA256 1c16bc84fa18b94884277f57f9ab535a80bee4c4e72783a78d0b109c1532c6c3 files/README.gentoo 4963
-AUX mailman-2.1.5-directory-check.patch 641 RMD160 06e080d7cf7dcfc1c026be7ce0f1df0152048c64 SHA1 63f040cc90d3123dbc260ac2e00d37ecea718afc SHA256 45b1840bddb002d904f303cf25c466ea99eae714a4b8c8dcab1054f28d939678
-MD5 1c839f4abbbe57c6ffc915fc8dc3018c files/mailman-2.1.5-directory-check.patch 641
-RMD160 06e080d7cf7dcfc1c026be7ce0f1df0152048c64 files/mailman-2.1.5-directory-check.patch 641
-SHA256 45b1840bddb002d904f303cf25c466ea99eae714a4b8c8dcab1054f28d939678 files/mailman-2.1.5-directory-check.patch 641
-AUX mailman-2.1.5-driver.cvs.patch 2539 RMD160 8ed9a1f8132d4b578d9bf162ef07fc82cc3117fc SHA1 b8be7f8edb81fd9cbdcfe0567011507df1e1a199 SHA256 5b2c21821f896d4834ae8ee188a1d8412f4f1c32ebdb65caf7d8070813a24f30
-MD5 740c1eb479ebc2df0109668027f60762 files/mailman-2.1.5-driver.cvs.patch 2539
-RMD160 8ed9a1f8132d4b578d9bf162ef07fc82cc3117fc files/mailman-2.1.5-driver.cvs.patch 2539
-SHA256 5b2c21821f896d4834ae8ee188a1d8412f4f1c32ebdb65caf7d8070813a24f30 files/mailman-2.1.5-driver.cvs.patch 2539
-AUX mailman-2.1.5-true_path.patch 447 RMD160 afb650d1ad844ec2f376c065e3128db91c20ff87 SHA1 05bc16e6eb25ab441a06c64d8566cd45f68a727f SHA256 221cada753938fe020e7ed483c372288d06eba1c37eb07731ed3e39877836949
-MD5 ede21221890a680ccadd3a6f142f3802 files/mailman-2.1.5-true_path.patch 447
-RMD160 afb650d1ad844ec2f376c065e3128db91c20ff87 files/mailman-2.1.5-true_path.patch 447
-SHA256 221cada753938fe020e7ed483c372288d06eba1c37eb07731ed3e39877836949 files/mailman-2.1.5-true_path.patch 447
 AUX mailman-2.1.6-directory-check.patch 1287 RMD160 3bf6d1216a79a32d68340cb0df5db9b5f44a3931 SHA1 ad2b689ce7911b509f999cd849d0402c36ded97c SHA256 2d31eda834429a55edad1fea3c379ecb3e8f05c03fac82f172989caeab85314d
 MD5 130b235f32a50d11f76a88b979fb4245 files/mailman-2.1.6-directory-check.patch 1287
 RMD160 3bf6d1216a79a32d68340cb0df5db9b5f44a3931 files/mailman-2.1.6-directory-check.patch 1287
 SHA256 2d31eda834429a55edad1fea3c379ecb3e8f05c03fac82f172989caeab85314d files/mailman-2.1.6-directory-check.patch 1287
-AUX mailman-2.1.6_beta1-directory-check.patch 1494 RMD160 2d986ed48d8794cc7a444ce41bb9e31a8fba394f SHA1 c4833920a9cb944347b44443384d8d04583cabf0 SHA256 6c1a2bb5500c84f49280a575b4c52af25e419d3ed53cc8d6c9d565aed39aa9f6
-MD5 208aa179cb4feeb3597841fe30529d15 files/mailman-2.1.6_beta1-directory-check.patch 1494
-RMD160 2d986ed48d8794cc7a444ce41bb9e31a8fba394f files/mailman-2.1.6_beta1-directory-check.patch 1494
-SHA256 6c1a2bb5500c84f49280a575b4c52af25e419d3ed53cc8d6c9d565aed39aa9f6 files/mailman-2.1.6_beta1-directory-check.patch 1494
-AUX mailman-2.1.6_rc4-directory-check.patch 1287 RMD160 3bf6d1216a79a32d68340cb0df5db9b5f44a3931 SHA1 ad2b689ce7911b509f999cd849d0402c36ded97c SHA256 2d31eda834429a55edad1fea3c379ecb3e8f05c03fac82f172989caeab85314d
-MD5 130b235f32a50d11f76a88b979fb4245 files/mailman-2.1.6_rc4-directory-check.patch 1287
-RMD160 3bf6d1216a79a32d68340cb0df5db9b5f44a3931 files/mailman-2.1.6_rc4-directory-check.patch 1287
-SHA256 2d31eda834429a55edad1fea3c379ecb3e8f05c03fac82f172989caeab85314d files/mailman-2.1.6_rc4-directory-check.patch 1287
 AUX mailman-2.1.7-directory-check.patch 1287 RMD160 3bf6d1216a79a32d68340cb0df5db9b5f44a3931 SHA1 ad2b689ce7911b509f999cd849d0402c36ded97c SHA256 2d31eda834429a55edad1fea3c379ecb3e8f05c03fac82f172989caeab85314d
 MD5 130b235f32a50d11f76a88b979fb4245 files/mailman-2.1.7-directory-check.patch 1287
 RMD160 3bf6d1216a79a32d68340cb0df5db9b5f44a3931 files/mailman-2.1.7-directory-check.patch 1287
@@ -49,27 +26,13 @@ AUX mailman.rc 597 RMD160 be0a574298a1d8d547a4ca76f864dd5fee9b897d SHA1 f464f5ba
 MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597
 RMD160 be0a574298a1d8d547a4ca76f864dd5fee9b897d files/mailman.rc 597
 SHA256 ef4f5482cf68ba44a0fbb83acde29295bd8dcb6512d259d14387dfc29beeb625 files/mailman.rc 597
-DIST mailman-2.1.5.tgz 5745912
 DIST mailman-2.1.6.tgz 6482726
-DIST mailman-2.1.6rc4.tgz 6473242
 DIST mailman-2.1.7.tgz 6736536
 DIST mailman-2.1.8rc1.tgz 6856298 RMD160 853e31435a6c9d5a35776d534a9ffe4991c0fd94 SHA256 e22c48466e67110d3bd519a32ce685c929c505118c70ba8e8ce2ee3eeab8bfb8
-EBUILD mailman-2.1.5-r4.ebuild 4511 RMD160 7c81cf6381b26d5e251a301642ff88d0fb19cdf6 SHA1 87b3979f4b2a291a1b7085d603f152468e78578f SHA256 a213d8403a4eb7f49b6e20ac26a8b7aa4060fcb836a607377e6ff5fe853299c0
-MD5 a7be2134df27b6e69e5ccfd1a80acc89 mailman-2.1.5-r4.ebuild 4511
-RMD160 7c81cf6381b26d5e251a301642ff88d0fb19cdf6 mailman-2.1.5-r4.ebuild 4511
-SHA256 a213d8403a4eb7f49b6e20ac26a8b7aa4060fcb836a607377e6ff5fe853299c0 mailman-2.1.5-r4.ebuild 4511
-EBUILD mailman-2.1.5-r5.ebuild 4018 RMD160 d9cc93dc403f5be0534e8a6e566e546365cb1e60 SHA1 9b443a575b747457a64dfc1fd0b386f371b363e8 SHA256 f3f09c426b73e46d91ff93c6a27d148f5e37285a6607adeeaca382762fd75346
-MD5 1cfc9aeb321d6dfe97653ba263c03c63 mailman-2.1.5-r5.ebuild 4018
-RMD160 d9cc93dc403f5be0534e8a6e566e546365cb1e60 mailman-2.1.5-r5.ebuild 4018
-SHA256 f3f09c426b73e46d91ff93c6a27d148f5e37285a6607adeeaca382762fd75346 mailman-2.1.5-r5.ebuild 4018
 EBUILD mailman-2.1.6.ebuild 4346 RMD160 28400b16f42127e93170c1de8feb4c01f38df5a6 SHA1 b1b30b93ae100604aa4c87c03bde0ffcdefd58c8 SHA256 55dba4a92cd8f394d07e88fec11509e0d163a660a466dd1e505a1d5eb22cda6a
 MD5 7d08a063ff49ea4dccf2a423a5303b13 mailman-2.1.6.ebuild 4346
 RMD160 28400b16f42127e93170c1de8feb4c01f38df5a6 mailman-2.1.6.ebuild 4346
 SHA256 55dba4a92cd8f394d07e88fec11509e0d163a660a466dd1e505a1d5eb22cda6a mailman-2.1.6.ebuild 4346
-EBUILD mailman-2.1.6_rc4.ebuild 4351 RMD160 8de2ff4b0ef8f6a09ea60f52106ac6d13aae5406 SHA1 5538be1209a34354680d7ecc98a303566e67afe9 SHA256 7b95faa488ce008f0bf1a58b8333bcdf80711d8348e52d293dbeefa3be73da0f
-MD5 d057b74471c1d885bf3312b30219140b mailman-2.1.6_rc4.ebuild 4351
-RMD160 8de2ff4b0ef8f6a09ea60f52106ac6d13aae5406 mailman-2.1.6_rc4.ebuild 4351
-SHA256 7b95faa488ce008f0bf1a58b8333bcdf80711d8348e52d293dbeefa3be73da0f mailman-2.1.6_rc4.ebuild 4351
 EBUILD mailman-2.1.7.ebuild 4344 RMD160 e0bb8fb75107b7b0b19cf0da553018974362ab57 SHA1 6e390c7403af637e1b60ff979992b2e6b6a9784c SHA256 93c08a74c42a42e2a38eba765463e2f7635de164ca38c1e3a147b889a8f5a2fd
 MD5 b9fd765a192b09fbf5e5497dc735dfeb mailman-2.1.7.ebuild 4344
 RMD160 e0bb8fb75107b7b0b19cf0da553018974362ab57 mailman-2.1.7.ebuild 4344
@@ -86,28 +49,12 @@ MISC metadata.xml 218 RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff SHA1 486b3
 MD5 45b42e062b70460f0304d1ebe48d82ab metadata.xml 218
 RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff metadata.xml 218
 SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89 metadata.xml 218
-MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r4 63
-RMD160 689928adacbd8a9b9bf64c38e1341d4ac704b0c6 files/digest-mailman-2.1.5-r4 63
-SHA256 1f6a203e04ebb008eebf2316a333eb2e19f22490dc5556f47b3aa4dafcfb7a4d files/digest-mailman-2.1.5-r4 63
-MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r5 63
-RMD160 689928adacbd8a9b9bf64c38e1341d4ac704b0c6 files/digest-mailman-2.1.5-r5 63
-SHA256 1f6a203e04ebb008eebf2316a333eb2e19f22490dc5556f47b3aa4dafcfb7a4d files/digest-mailman-2.1.5-r5 63
 MD5 67bd3d52df6390733875bb04e142d471 files/digest-mailman-2.1.6 63
 RMD160 e3744f8143f0e42ba58fb37f55692438d5d7863e files/digest-mailman-2.1.6 63
 SHA256 4feddcd8607da6ba56d4b91824ed84586f6d183ae0076c994f4ebecdf060fd41 files/digest-mailman-2.1.6 63
-MD5 b6cf776a5d518cd817fcac8a007c265b files/digest-mailman-2.1.6_rc4 66
-RMD160 18f2d96c1c01c0424cca8037b83c2a6cb960e285 files/digest-mailman-2.1.6_rc4 66
-SHA256 5232dae11fef58fa821b46d7b3e08eb9bde19443f6267d270787f9d14dc21d62 files/digest-mailman-2.1.6_rc4 66
 MD5 b8cbeb10e0b59889315d0e112785ebbf files/digest-mailman-2.1.7 63
 RMD160 bca96b989fcfc492ffc2278e9c0c531eff83c9d0 files/digest-mailman-2.1.7 63
 SHA256 c7af7490150aa978d5cea36f894918602e2904d5b0231b9d64034a8eee9d5a55 files/digest-mailman-2.1.7 63
 MD5 728fd53b688010789867f46a7c33cfac files/digest-mailman-2.1.8_rc1 244
 RMD160 3f7f0eca6ecac5ac5dfb630df854c5bce1ff3352 files/digest-mailman-2.1.8_rc1 244
 SHA256 622899b7584ff1d39e274d61a37cb0e9aa6d685324d8bbf6a42cc01d4fad5af7 files/digest-mailman-2.1.8_rc1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwQw+r2QksT29OyARArMsAJ0dXzUS/FmOJX4a61zLm5JXifN6qgCgl1uD
-dDAb2HnhLBZFVxTPQUIMek0=
-=t7oB
------END PGP SIGNATURE-----
diff --git a/net-mail/mailman/files/digest-mailman-2.1.5-r4 b/net-mail/mailman/files/digest-mailman-2.1.5-r4
deleted file mode 100644
index 1e43ecb04e52..000000000000
--- a/net-mail/mailman/files/digest-mailman-2.1.5-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5f56f04747cd4aff67427e7a45631af mailman-2.1.5.tgz 5745912
diff --git a/net-mail/mailman/files/digest-mailman-2.1.5-r5 b/net-mail/mailman/files/digest-mailman-2.1.5-r5
deleted file mode 100644
index 1e43ecb04e52..000000000000
--- a/net-mail/mailman/files/digest-mailman-2.1.5-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5f56f04747cd4aff67427e7a45631af mailman-2.1.5.tgz 5745912
diff --git a/net-mail/mailman/files/digest-mailman-2.1.6_rc4 b/net-mail/mailman/files/digest-mailman-2.1.6_rc4
deleted file mode 100644
index b56d83e773a7..000000000000
--- a/net-mail/mailman/files/digest-mailman-2.1.6_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 81a5fb00b72cfb95667cad48ec9c76e5 mailman-2.1.6rc4.tgz 6473242
diff --git a/net-mail/mailman/files/mailman-2.1.5-directory-check.patch b/net-mail/mailman/files/mailman-2.1.5-directory-check.patch
deleted file mode 100644
index 3a3cae800d3e..000000000000
--- a/net-mail/mailman/files/mailman-2.1.5-directory-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN mailman-2.1.5-orig/bin/check_perms mailman-2.1.5/bin/check_perms
---- mailman-2.1.5-orig/bin/check_perms	2003-03-31 14:07:55.000000000 -0600
-+++ mailman-2.1.5/bin/check_perms	2004-07-21 17:24:34.810274976 -0500
-@@ -313,6 +313,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 --git a/net-mail/mailman/files/mailman-2.1.5-driver.cvs.patch b/net-mail/mailman/files/mailman-2.1.5-driver.cvs.patch
deleted file mode 100644
index 0e286f9e351c..000000000000
--- a/net-mail/mailman/files/mailman-2.1.5-driver.cvs.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- scripts/driver.orig	2003-04-19 21:52:55.000000000 -0700
-+++ scripts/driver	2005-01-13 20:45:30.432695194 -0800
-@@ -1,6 +1,6 @@
- # -*- python -*-
- 
--# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
-+# Copyright (C) 1998-2004 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
-@@ -28,7 +28,11 @@
- # comfortable with.  By setting STEALTH_MODE to 1, you disable the printing of
- # this information to the web pages.  This information is still, and always,
- # printed in the error logs.
--STEALTH_MODE = 0
-+STEALTH_MODE = 1
-+
-+# This will be set to the entity escaper.
-+def websafe(s):
-+    return s
- 
- 
- 
-@@ -53,12 +57,22 @@
- 
- 
- def run_main():
-+    global STEALTH_MODE, websafe
-+
-     # These will ensure that even if something between now and the
-     # creation of the real logger below fails, we can still get
-     # *something* meaningful.
-     logger = None
-     try:
-         import paths
-+        # When running in non-stealth mode, we need to escape entities,
-+        # otherwise we're vulnerable to cross-site scripting attacks.
-+        try:
-+            if not STEALTH_MODE:
-+                from Mailman.Utils import websafe
-+        except:
-+            STEALTH_MODE = 1
-+            raise
-         # Map stderr to a logger, if possible.
-         from Mailman.Logging.StampedLogger import StampedLogger
-         logger = StampedLogger('error',
-@@ -140,11 +154,13 @@
- a description of what happened.  Thanks!
- 
- <h4>Traceback:</h4><p><pre>'''
-+        exc_info = sys.exc_info()
-         if traceback:
--            traceback.print_exc(file=sys.stdout)
-+            for line in traceback.format_exception(*exc_info):
-+                print websafe(line),
-         else:
-             print '[failed to import module traceback]'
--            print '[exc: %s, var: %s]' % sys.exc_info()[0:2]
-+            print '[exc: %s, var: %s]' % [websafe(x) for x in exc_info[0:2]]
-         print '\n\n</pre></body>'
-     else:
-         print '''<p>Please inform the webmaster for this site of this
-@@ -212,7 +228,9 @@
- '''
-         if os:
-             for k, v in os.environ.items():
--                print '<tr><td><tt>', k, '</tt></td><td>', v, '</td></tr>'
-+                print '<tr><td><tt>', websafe(k), \
-+                      '</tt></td><td>', websafe(v), \
-+                      '</td></tr>'
-             print '</table>'
-         else:
-             print '<p><hr>[failed to import module os]'
diff --git a/net-mail/mailman/files/mailman-2.1.5-true_path.patch b/net-mail/mailman/files/mailman-2.1.5-true_path.patch
deleted file mode 100644
index 8ec97553d157..000000000000
--- a/net-mail/mailman/files/mailman-2.1.5-true_path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Mailman/Cgi/private.py.orig	2005-02-08 19:39:44.980596944 -0800
-+++ Mailman/Cgi/private.py	2005-02-08 19:40:52.834281616 -0800
-@@ -37,11 +37,12 @@
- 
- 
- 
-+SLASH = '/'
-+
- def true_path(path):
-     "Ensure that the path is safe by removing .."
--    path = path.replace('../', '')
--    path = path.replace('./', '')
--    return path[1:]
-+    parts = [x for x in path.split(SLASH) if x not in ('.', '..')]
-+    return SLASH.join(parts)[1:]
- 
- 
- 
diff --git a/net-mail/mailman/files/mailman-2.1.6_beta1-directory-check.patch b/net-mail/mailman/files/mailman-2.1.6_beta1-directory-check.patch
deleted file mode 100644
index c6cccc90b6cd..000000000000
--- a/net-mail/mailman/files/mailman-2.1.6_beta1-directory-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -urN mailman-2.1.5-orig/bin/check_perms mailman-2.1.5/bin/check_perms
---- mailman-2.1.5-orig/bin/check_perms	2003-03-31 14:07:55.000000000 -0600
-+++ mailman-2.1.5/bin/check_perms	2004-07-21 17:24:34.810274976 -0500
-@@ -313,6 +313,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 -urN mailman-2.1.5-orig/bin/update mailman-2.1.5/bin/update
---- mailman-2.1.5-orig/bin/update-old	2005-02-11 22:48:41.000000000 -0800
-+++ mailman-2.1.5-orig/bin/update	2005-02-11 23:17:41.219729400 -0800
-@@ -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.6_rc4-directory-check.patch b/net-mail/mailman/files/mailman-2.1.6_rc4-directory-check.patch
deleted file mode 100644
index d8542fcf6a88..000000000000
--- a/net-mail/mailman/files/mailman-2.1.6_rc4-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/mailman-2.1.5-r4.ebuild b/net-mail/mailman/mailman-2.1.5-r4.ebuild
deleted file mode 100644
index 1591ac8c34f9..000000000000
--- a/net-mail/mailman/mailman-2.1.5-r4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.5-r4.ebuild,v 1.7 2006/07/21 17:12:45 hanno Exp $
-
-inherit eutils depend.apache
-IUSE="apache2"
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc amd64"
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	net-www/apache"
-
-INSTALLDIR="/usr/local/mailman"
-APACHEGID="81"
-MAILGID="280"
-
-pkg_setup() {
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup mailman 280
-	enewuser mailman 280 /bin/bash ${INSTALLDIR} mailman -G cron -c mailman
-	mkdir -p ${INSTALLDIR}
-	chown mailman:mailman ${INSTALLDIR}
-	chmod 2775 ${INSTALLDIR}
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch ${FILESDIR}/${P}-directory-check.patch || die "patch failed."
-	# Bug #77524. remove with version bump.
-	epatch ${FILESDIR}/${P}-driver.cvs.patch || die "patch failed."
-	epatch ${FILESDIR}/${P}-true_path.patch || die "patch failed."
-}
-
-src_compile() {
-	econf \
-		--prefix=${INSTALLDIR} \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${APACHEGID} \
-	|| die "configure failed"
-
-	make || die "make failed"
-}
-
-src_install () {
-	ID=${D}${INSTALLDIR}
-
-	make prefix=${ID} var_prefix=${ID} doinstall || die
-
-	keepdir ${INSTALLDIR}/logs
-	keepdir ${INSTALLDIR}/locks
-	keepdir ${INSTALLDIR}/spam
-	keepdir ${INSTALLDIR}/archives/public
-	keepdir ${INSTALLDIR}/archives/private
-	keepdir ${INSTALLDIR}/lists
-	keepdir ${INSTALLDIR}/qfiles
-
-	if use apache2; then
-		dodir /etc/apache2/conf/modules.d
-		#dodir ${APACHE2_MODULES_CONFDIR}
-		insinto /etc/apache2/conf/modules.d
-		#insinto ${APACHE2_MODULES_CONFDIR}
-		newins ${FILESDIR}/mailman.conf 50_mailman.conf
-	else
-		dodir /etc/apache/conf/addon-modules
-		#dodir ${APACHE1_MODULES_CONFDIR}
-		insinto /etc/apache/conf/addon-modules
-		#insinto ${APACHE1_MODULES_CONFDIR}
-		doins ${FILESDIR}/mailman.conf
-	fi
-
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL
-	dodoc contrib/README.check_perms_grsecurity contrib/mm-handler.readme
-	dodoc contrib/virtusertable contrib/mailman.mc
-
-	cp build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler* ${D}/usr/local/mailman/bin
-
-	# Save the old config into the new package as CONFIG_PROTECT
-	# doesn't work for this package.
-	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.dist"
-	fi
-	if [ -f ${ROOT}/home/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/home/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-	if [ -f ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mailman.rc mailman
-
-	chown -R mailman:mailman ${ID}
-	chmod 2775 ${ID}
-	}
-
-pkg_postinst() {
-	enewgroup mailman 280
-	enewuser mailman 280 -1 ${INSTALLDIR} mailman -G cron -c "mailman"
-	cd ${INSTALLDIR}
-	bin/update
-	einfo "Running \`${INSTALLDIR}/bin/check_perms -f\` *"
-	bin/check_perms -f
-	einfo ""
-	einfo "Please read /usr/share/doc/${PF}/README.gentoo.gz for additional"
-	einfo "Setup information, mailman will NOT run unless you follow"
-	einfo "those instructions!"
-	einfo ""
-
-	# per vericgar's advise
-	# we dont need to do this anymore with the new apache revision.
-	# will remove these when the new apache unmasked.
-	if ! use apache2; then
-		einfo "It appears that you aren't running apache2..."
-		einfo "ebuild /var/db/pkg/net-mail/${PN}/${PF}.ebuild config"
-		einfo "to add the mailman hooks to your config"
-	fi
-}
-
-pkg_config() {
-	if ! use apache2; then
-		einfo "Updating apache config"
-		einfo "added: \"Include  conf/addon-modules/mailman.conf\""
-		einfo "to ${ROOT}/etc/apache/conf/apache.conf"
-		echo "Include  conf/addon-modules/mailman.conf" \
-			>> ${ROOT}/etc/apache/conf/apache.conf
-	fi
-}
diff --git a/net-mail/mailman/mailman-2.1.5-r5.ebuild b/net-mail/mailman/mailman-2.1.5-r5.ebuild
deleted file mode 100644
index d88423d1adb3..000000000000
--- a/net-mail/mailman/mailman-2.1.5-r5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.5-r5.ebuild,v 1.3 2006/07/21 17:12:45 hanno Exp $
-
-inherit eutils depend.apache
-IUSE="apache2"
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	net-www/apache"
-
-INSTALLDIR="/usr/local/mailman"
-APACHEGID="81"
-MAILGID="280"
-
-pkg_setup() {
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup mailman 280
-	enewuser mailman 280 /bin/bash ${INSTALLDIR} mailman -G cron -c mailman
-	mkdir -p ${INSTALLDIR}
-	chown mailman:mailman ${INSTALLDIR}
-	chmod 2775 ${INSTALLDIR}
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch ${FILESDIR}/${P}-directory-check.patch || die "patch failed."
-	# Bug #77524. remove with version bump.
-	epatch ${FILESDIR}/${P}-driver.cvs.patch || die "patch failed."
-	epatch ${FILESDIR}/${P}-true_path.patch || die "patch failed."
-}
-
-src_compile() {
-	econf \
-		--prefix=${INSTALLDIR} \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${APACHEGID} \
-	|| die "configure failed"
-
-	make || die "make failed"
-}
-
-src_install () {
-	ID=${D}${INSTALLDIR}
-
-	make prefix=${ID} var_prefix=${ID} doinstall || die
-
-	keepdir ${INSTALLDIR}/logs
-	keepdir ${INSTALLDIR}/locks
-	keepdir ${INSTALLDIR}/spam
-	keepdir ${INSTALLDIR}/archives/public
-	keepdir ${INSTALLDIR}/archives/private
-	keepdir ${INSTALLDIR}/lists
-	keepdir ${INSTALLDIR}/qfiles
-
-	if use apache2; then
-		insinto ${APACHE2_MODULES_CONFDIR}
-	else
-		insinto ${APACHE1_MODULES_CONFDIR}
-	fi
-	newins ${FILESDIR}/mailman.conf 50_mailman.conf
-
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL
-	dodoc contrib/README.check_perms_grsecurity contrib/mm-handler.readme
-	dodoc contrib/virtusertable contrib/mailman.mc
-
-	cp build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler* ${D}/usr/local/mailman/bin
-
-	# Save the old config into the new package as CONFIG_PROTECT
-	# doesn't work for this package.
-	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.dist"
-	fi
-	if [ -f ${ROOT}/home/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/home/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-	if [ -f ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mailman.rc mailman
-
-	chown -R mailman:mailman ${ID}
-	chmod 2775 ${ID}
-	}
-
-pkg_postinst() {
-	enewgroup mailman 280
-	enewuser mailman 280 -1 ${INSTALLDIR} mailman -G cron -c "mailman"
-	cd ${INSTALLDIR}
-	bin/update
-	einfo "Running \`${INSTALLDIR}/bin/check_perms -f\` *"
-	bin/check_perms -f
-	einfo ""
-	einfo "Please read /usr/share/doc/${PF}/README.gentoo.gz for additional"
-	einfo "Setup information, mailman will NOT run unless you follow"
-	einfo "those instructions!"
-	einfo ""
-
-	einfo "An example Mailman configuration file for Apache has been installed into:"
-	use apache2 && einfo "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	use apache2 || einfo "  ${APACHE1_MODULES_CONFDIR}/50_mailman.conf"
-	einfo ""
-	einfo "To enable, you will need to add \"-D MAILMAN\" to"
-	use apache2 && einfo "/etc/conf.d/apache2."
-	use apache2 || einfo "/etc/conf.d/apache."
-	einfo ""
-}
diff --git a/net-mail/mailman/mailman-2.1.6_rc4.ebuild b/net-mail/mailman/mailman-2.1.6_rc4.ebuild
deleted file mode 100644
index 49fe4f46aec8..000000000000
--- a/net-mail/mailman/mailman-2.1.6_rc4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.6_rc4.ebuild,v 1.5 2006/07/21 17:12:45 hanno Exp $
-
-inherit eutils depend.apache
-IUSE="apache2 postfix sendmail qmail courier exim xmail"
-
-MY_PV=${PV/_rc/rc}
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	net-www/apache"
-
-INSTALLDIR="/usr/local/mailman"
-APACHEGID="81"
-
-if use postfix; then
-	MAILGID="280"
-elif use sendmail; then
-	MAILGID=daemon
-elif use qmail; then
-	MAILGID=qmail
-elif use courier; then
-	MAILGID=mail
-elif use exim; then
-	MAILGID=mail
-elif use xmail; then
-	MAILGID=xmail
-else
-	MAILGID="280"
-fi
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup mailman 280
-	enewuser mailman 280 /bin/bash ${INSTALLDIR} mailman -G cron -c mailman
-	mkdir -p ${INSTALLDIR}
-	chown mailman:mailman ${INSTALLDIR}
-	chmod 2775 ${INSTALLDIR}
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch ${FILESDIR}/${P}-directory-check.patch || die "patch failed."
-	# Bug #77524. remove with version bump.
-	#epatch ${FILESDIR}/${P}-driver.cvs.patch || die "patch failed."
-	#epatch ${FILESDIR}/${P}-true_path.patch || die "patch failed."
-}
-
-src_compile() {
-
-	econf \
-		--prefix=${INSTALLDIR} \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${APACHEGID} \
-	|| die "configure failed"
-
-	make || die "make failed"
-}
-
-src_install () {
-	ID=${D}${INSTALLDIR}
-
-	make prefix=${ID} var_prefix=${ID} doinstall || die
-
-	keepdir ${INSTALLDIR}/logs
-	keepdir ${INSTALLDIR}/locks
-	keepdir ${INSTALLDIR}/spam
-	keepdir ${INSTALLDIR}/archives/public
-	keepdir ${INSTALLDIR}/archives/private
-	keepdir ${INSTALLDIR}/lists
-	keepdir ${INSTALLDIR}/qfiles
-
-	if use apache2; then
-		insinto ${APACHE2_MODULES_CONFDIR}
-	else
-		insinto ${APACHE1_MODULES_CONFDIR}
-	fi
-	newins ${FILESDIR}/mailman.conf 50_mailman.conf
-
-	dodoc ${FILESDIR}/README.gentoo
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL
-	dodoc contrib/README.check_perms_grsecurity contrib/mm-handler.readme
-	dodoc contrib/virtusertable contrib/mailman.mc
-
-	cp build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler* ${D}/usr/local/mailman/bin
-
-	# Save the old config into the new package as CONFIG_PROTECT
-	# doesn't work for this package.
-	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.dist"
-	fi
-	if [ -f ${ROOT}/home/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/home/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-	if [ -f ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mailman.rc mailman
-
-	chown -R mailman:mailman ${ID}
-	chmod 2775 ${ID}
-}
-
-pkg_postinst() {
-	enewgroup mailman 280
-	enewuser mailman 280 -1 ${INSTALLDIR} mailman -G cron -c "mailman"
-	cd ${INSTALLDIR}
-	bin/update
-	einfo "Running \`${INSTALLDIR}/bin/check_perms -f\` *"
-	bin/check_perms -f
-	einfo ""
-	einfo "Please read /usr/share/doc/${PF}/README.gentoo.gz for additional"
-	einfo "Setup information, mailman will NOT run unless you follow"
-	einfo "those instructions!"
-	einfo ""
-
-	einfo "An example Mailman configuration file for Apache has been installed into:"
-	use apache2 && einfo "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	use apache2 || einfo "  ${APACHE1_MODULES_CONFDIR}/50_mailman.conf"
-	einfo ""
-	einfo "To enable, you will need to add \"-D MAILMAN\" to"
-	use apache2 && einfo "/etc/conf.d/apache2."
-	use apache2 || einfo "/etc/conf.d/apache."
-	einfo ""
-}