diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index c2b71208..c04016b7 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,7 +1,18 @@
 # ChangeLog for net-mail/mailman
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.115 2008/11/14 11:07:45 hanno Exp $
 
+*mailman-2.1.14_p1 (18 Jan 2012)
+
+  18 Jan 2012; Mario Fetka <mario.fetka@gmail.com> -mailman-2.1.11.ebuild,
+  -mailman-2.1.12.ebuild, -mailman-2.1.12-r1.ebuild, -mailman-2.1.13-r1.ebuild,
+  -mailman-2.1.14.ebuild, +mailman-2.1.14_p1.ebuild,
+  -files/mhonarc-2.6.16-list-output-order.patch,
+  -files/mailman-python2.6-exceptions-quickfix.patch,
+  -files/mailman-python2.6.patch, files/README.gentoo-r2,
+  files/README.gentoo-r3, files/mailman.rc:
+  Add patches and Bump to patch level 1
+
 *mailman-2.1.14 (03 Dec 2010)
 
   03 Dec 2010; Mario Fetka <mario.fetka@gmail.com>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 0647fee5..897ad296 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,7 +1,7 @@
 AUX 50_mailman.conf 429 RMD160 54104453464b725adc18e5fb66bee265089013f6 SHA1 7b002917ae358587fc121f8c06c54c76dd0d9934 SHA256 8a93c5f9b2012122c6e85445620d5eb388e1bc38cb2102158bb62681cb61d3ec
 AUX 50_mailman.conf-r1 592 RMD160 2f2be797205a63b728fe89a3367bbfb0e1f5d5dc SHA1 12a9d7276eb796c7512ece411a56f4b45f861a7d SHA256 4512a9dd6cba38a080654cbe172941a053fdc8b33afb65748d76716e9d00a029
-AUX README.gentoo-r2 5537 RMD160 8d753bb466666bac03ee4da4b7e35456d66dfec3 SHA1 f2702f1dbcab75397795b55883972a047b39463e SHA256 3809aa17e4e9a244cdf7c06af1605c3ce660329b0e279a93c4c3650b8d9ffa42
-AUX README.gentoo-r3 6804 RMD160 8885ce718cee4c1ff7fba103b6be314dfbf794c2 SHA1 343a4af9782136775fa3fe20d132d1e70b5468da SHA256 9db15d248be59d98f038718b50d5a02f08f5fc0870bf0f0ebec4c5d008c4e31b
+AUX README.gentoo-r2 5537 RMD160 40e8e94ca4d44054a85f22b48c77da987478496e SHA1 05f55c70880af28c8c43055afa02bd7a321fee9a SHA256 a6393aa8eb2f7954047acdf2b4015bd299fe483ddb67b70066a9266922cb4671
+AUX README.gentoo-r3 6804 RMD160 882a149497399edf20f4caf9f1c60d8e32c63b06 SHA1 4a3ff26d5d14269e57b5310d2e9f6bdf3e41b0d2 SHA256 0b70c4288511224a8039c0874570873c92cb4cc4ff4d067bf6057781e7aef906
 AUX mailman-2.1.12-add-destdir.patch 379 RMD160 f5cec806246df499d90174c907dce2562cd5c607 SHA1 919e3d7fab0e4d4fe176ce1f92bc9651c8d3cf91 SHA256 10a22b784eecfc86c78380be6c389b90bbcec3e4c31a04b70f6a09e96ef4afd8
 AUX mailman-2.1.12-directory-check.patch 1485 RMD160 1b2a12f332ca2c70d2cca4310d6f6d1ed37085aa SHA1 56abf3e8643a7140450a338b133b5f6e2e62d4a4 SHA256 4986cc5e7d37cec02b4f29dbf4838e81799fabdfb89bbc7f8e54c9210ae1de6d
 AUX mailman-2.1.13-ldflags.patch 1022 RMD160 24cb935e95056a55ce77de1c00c083d88dbf2a52 SHA1 ea60f2a9b567c7832525ad150f6a2399d8feb1e1 SHA256 75b9fe8ef757541776532f76b1262c1616d440178ad39c432fe2d529eecf5645
@@ -9,36 +9,16 @@ AUX mailman-2.1.14_rc1-directory-check.patch 786 RMD160 4dcf690c6a5f26feff25376a
 AUX mailman-2.1.8_rc1-directory-check.patch 1287 RMD160 3bf6d1216a79a32d68340cb0df5db9b5f44a3931 SHA1 ad2b689ce7911b509f999cd849d0402c36ded97c SHA256 2d31eda834429a55edad1fea3c379ecb3e8f05c03fac82f172989caeab85314d
 AUX mailman-2.1.9-fix-XSS.patch 11287 RMD160 b4dff793463c976cef7bdfe2cded986a8f7820ab SHA1 d01f299044ddaf8c0c6df53cb7b8ec73f3f183a4 SHA256 cd2ffb0e19dd12205d375f3c83b7d6a3177c0f3389bf15db37bce1e63e459307
 AUX mailman-2.1.9-icons.patch 555 RMD160 d0beb080e0dd4c753ce5e075b3c7db424b5474ef SHA1 786edc8b3ed11920aaaa23a8f3c0e4f9ae190a87 SHA256 cd78a7447febcbe1901144a190ef14cf9075b8055cc275e0405fc748f9c855f0
-AUX mailman-python2.6-exceptions-quickfix.patch 1079 RMD160 fac2683997eec1c38e115bd21657eb9f67ebfff1 SHA1 fb7c242c922f915d26ffb83e14fd760aead54292 SHA256 0d9ecb2cbb6f180760f0589a90281be4bc739ae4d3185564a75beedda548a9dd
-AUX mailman-python2.6.patch 7094 RMD160 d854b5465331ccde122022d0dfb6174bdc677702 SHA1 c687cd2f485abfc348fc67e067a845e83d57956d SHA256 8f28e2c81865b71874768dafcc4e9d6548dd61998776d99f90dc9edb54018f75
 AUX mailman.conf 385 RMD160 bec3c71140385fa88078ffb38be14bfd8ec068c6 SHA1 64e15fce12231bac8e9a5dd831d9c4f134df77a1 SHA256 fdd86c4a72318ade5dfe0f075ce62470979f93d8a4c862993dc32e7bdb422eab
-AUX mailman.rc 597 RMD160 be0a574298a1d8d547a4ca76f864dd5fee9b897d SHA1 f464f5ba7310934d300a9af7c614fdf7498f7d2b SHA256 ef4f5482cf68ba44a0fbb83acde29295bd8dcb6512d259d14387dfc29beeb625
-AUX mhonarc-2.6.16-list-output-order.patch 1430 RMD160 b8c28140e30fc78e69942d0a49d9bc1cd19e6eef SHA1 866a17bfde975a905cda2787417f6f8db651cf80 SHA256 91b1661bc495fef894832c739dec533231e0fe0376fc20e94d4d9aade7cd486f
-DIST MHonArc-2.6.16.tar.bz2 1562490 RMD160 31d6659fabdb00b4d4594eda9f5985bd5f3f33b8 SHA1 8b803a610805fe736036c3dcd2596e2e416a886b SHA256 7e6f113bd307d818005cc1c55004df94ce338b6ca64043ae3f89d86ce8d56df1
-DIST antispam-2.1.12-0.1.patch.gz 3122 RMD160 f9ea024ea9c60b3de7fc5937d3c1369e1ec0bdf0 SHA1 da3803ef5a103bdf5cb9744f8febebe2de6dac9d SHA256 ee42e2831a479781f56c25e38f9d3b8de361ef180c3af26ee2031dea0e5c1a39
+AUX mailman.rc 597 RMD160 4fdfb9c52d8c44d7c0774b7dbf9c47eb97903eef SHA1 d7185a2ab750dd30d61066e3edb2b5eadd01f08a SHA256 e770e15031d03ebf7adbd762253af7b0949f99aca5dd9ef2003e710efde7ba5a
 DIST antispam-2.1.14-0.1.patch.gz 3644 RMD160 22bc7eeae1c0e00d5854b91d40b2a315d8912438 SHA1 f9a27dd9b2ca9bfee85ea08be12aa7ba5310b740 SHA256 eaf7e8bf7b0a0d6bf5b8b8f747d84152c06af9d9b07accab9f3139b28bc6c94b
 DIST dailymbox-2.1.12-0.1.patch.gz 7781 RMD160 81f63255eb294a7263d363206f90004ff1aa6d24 SHA1 3f46e349161879198a89e51fbd4dea80046d810d SHA256 470b53212f61df1777236b557e839f3eff62fbe46289b785911c1b02138349c0
-DIST exitstatus-2.1.11-0.1.patch.gz 5270 RMD160 afbc435ce38764db7e1fbd070345b19296bb7c26 SHA1 9be1dc7aaf1c344737cf28cb7e4d773b3c205e11 SHA256 7312812155d3fdee4f1921ff442b48222ea992320cca1a7b957e0c6a6b9fa468
 DIST exitstatus-2.1.12-0.1.patch.gz 5273 RMD160 d7402bba9130556969df583647f1d046e0da46ef SHA1 6fd5594c092e3e49a392c1a498d8f1bb75dad8ca SHA256 d039862a45996c3e1a054434b624a7d46a8806230e8d6caf253724ea817d650f
-DIST htdig-2.1.11-0.1.patch.gz 61311 RMD160 07c20e91a94e5fbfc76c8f8747ee9b1ffe64300b SHA1 d49dbe8b9bc278ec9d42d936d79cc48cff534eff SHA256 e603257259a0e5255dbae82ac64c3ee2b0fe4d947b43c3b9e750571d8f829335
 DIST htdig-2.1.12-0.1.patch.gz 61296 RMD160 13e5a0e7b3d44bb7dd1cff19e8fcd60bf3d98199 SHA1 03ac9fe56e36ac651b1418b3d37ba8e642ff01f3 SHA256 4675fafe1ba978ec8ebfeb9306363d3ee0468bdbb32f204267ab54e0f15057d4
-DIST indexing-2.1.11-0.1.patch.gz 8203 RMD160 74ea4379f70e9a0dad2b7ffe61648c7f8c5f9c3c SHA1 55e9b1e8c6ff96ee6b5e0c0039fc4329ba3ee573 SHA256 bb940388dfbc19a52bdd62569d6212d09b2a3ceb6cb5a1fe43b5f1551da10433
-DIST indexing-2.1.12-0.1.patch.gz 8178 RMD160 2e683878ad2ea61e0fd5e3e088da0977c0c304f7 SHA1 9a870adf0c5d3c7920f9c21cd0bf2dc11ce7b882 SHA256 c9bb8398695d79bbaa1079063d8327f4b7208a1f3cde7766d2f39390da1d820e
 DIST indexing-2.1.14-0.1.patch.gz 8718 RMD160 0d8d504e2239d6ff81ec4874884ce910635b5318 SHA1 45da60c19002d8482b61e6e5605afed0bc24b50c SHA256 2c7a445d0b3643ba36a8b6910e736bfaabd01ca32d21e05675763c68fd96d8f2
-DIST mailman-2.1.11.tgz 7992229 RMD160 667297720aae9fef07600eab6fbf3d2cfc205c8b SHA1 068f1927f4d8dd0896b5064bdf6d102798491b72 SHA256 66f2e1d27b6d1f253a8ebbe218cacaab947e6b421f7513fbaea2314b24f06bda
-DIST mailman-2.1.12.tgz 8010027 RMD160 94d8d132bb37180bf4c02ccd2a5fb3862ce13b94 SHA1 6d6281f7ce322e271f0259321f4d8931ff46e6ae SHA256 5e9313252cc2eea774c453131e7f3fe3a5873ebce26628c5504cdc318d563ddd
-DIST mailman-2.1.13.tgz 8166504 RMD160 3a62b04ea0f48c3ecbe815eb927d282f765e416c SHA1 923dd78a17cbab576354b53a80443fe05f134398 SHA256 ddab5169c851e49134d8e58fd0d5fd3b920d8ddb5f52582c2ec95076c746a25e
-DIST mailman-2.1.14.tgz 8201150 RMD160 a36d403b9c00e5354b204b62b5f0e96ab0779186 SHA1 c92de1a5ee2d8b0c83d29836b35bd422116c96f4 SHA256 1d6be802b718639126c4069eb7f9cd3a347765e1cb199cc3bb14d71572d09523
-DIST mhonarc-2.1.11-0.2.patch.gz 15544 RMD160 b5cef27e3b4051a891c7ec2650ec3ba9e5d5e5ec SHA1 1d94f9ba1854f0c4035df6eba8aefd65c0ed4898 SHA256 5165d9b91c3cd244f181884733f7e571bd2937bfadb56aefd179c0fffad39583
-DIST mhonarc-2.1.12-0.1.patch.gz 15545 RMD160 eefc23c41486882b1a24b7ae410e4a8be4a628d3 SHA1 5b31bce83844d0a4360d89258ed329181f95f81a SHA256 7e95207bcbbf2540afed42343774af0662759f9c7aead816b20d04868215e1d6
-DIST modinc-2.1.11-0.1.patch.gz 1166 RMD160 d9c8a37aecb54a2b2a016bb0879eed7a2bc48401 SHA1 2f924d2d9c838891a0bea4bd51212f3910b6678f SHA256 80181af1e0be4cddfc899ed27e92853944a19a0f71792bdca3940b6c609f507e
-DIST modinc-2.1.12-0.1.patch.gz 1168 RMD160 77dcfb97bc93d35f7bfd5365d688ff74ccd60bdb SHA1 5e4cb1dc6990adb09894a104c7117bc92dd34241 SHA256 7e124e0bf35f66b37e43f01439867dc8acb1bcd75bb19316eaa6a314d8062ff1
+DIST mailman-2.1.14-1.tgz 8201308 RMD160 0d86e766e28aaab9703bfe530b72316a5b02beda SHA1 390874c1059878b33be9ab4cf57fdb719eac1819 SHA256 2dbaaf28c7b3ba286976ffd525d435ee901ef25c23045a3d4a6877cf86b7de99
 DIST modinc-2.1.14-0.1.patch.gz 1466 RMD160 0457e8e244f90e3807caa616b4f489a9883d59bf SHA1 77fae8889ef6e26423ed827d78b9def00b806b87 SHA256 a6aa1469a10c98e65c9aae53a153be3bf6ffbb5b5f7b2af8373dcf663f5a442c
 DIST response-2.1.12-0.1.patch.gz 10518 RMD160 b6965ba7fc0ed4125d44e0900446324c20099571 SHA1 2db575da30550eed44c8777ae4cc6aa8f047c2ce SHA256 645fe1d12d0d6e03a46f2d210011b4ffe3f184b5d4499ac879a734b63f13b5ef
-EBUILD mailman-2.1.11.ebuild 5958 RMD160 c849d3b350cd627a8fd0fade75b5cc9e232c9f1e SHA1 06816919ba9d1c57991de3caa0b701097e6100d4 SHA256 4549243e5096c4678c46a83390b5f3f429f86063c7a6e1b8cc4fac2996509e8f
-EBUILD mailman-2.1.12-r1.ebuild 7950 RMD160 e0fe4b30c7643aaee0d327e0b78aeab413525d9f SHA1 841012539a173a7a4ab4e0d2fe97c5019fa81b08 SHA256 8d9a8da82c48eeab65a43f813b95c84a4539d8136d861c2e780ad1983f8f2489
-EBUILD mailman-2.1.12.ebuild 7349 RMD160 4dd6bbabcfb5914474ca9f0d3fb760783af1c9b2 SHA1 3967838921087de79f9ef8bed98430ca66645b1a SHA256 6df8f8b9040a2871ec01b30b1dddad3b4b21728ab9b700942e7fd098dbac5760
-EBUILD mailman-2.1.13-r1.ebuild 8018 RMD160 8102aabdc3a130a2b241d94f51e2101881c548ad SHA1 fe8b0ba339d4c317795e824f4745388873118841 SHA256 1db698d49dc554ae97b6d2fc65e6348e0f46d0d819371c93eb0954d6e32d51e0
-EBUILD mailman-2.1.14.ebuild 7585 RMD160 3d5c340e9dbf1825f22492870abed0980944ae1a SHA1 558546cfec72546306403e57455990e6daaa3a81 SHA256 a58e1f473c5d677c20e1a5d37f8c6cdbe355e84c01832550c153651d67787f95
-MISC ChangeLog 16573 RMD160 d877684000019612285d8be2fa3a6453ecbfef73 SHA1 04fa848e9bd236dd9547a7c5c24931c86dc6076d SHA256 29cf721333de28a68f5b18b4c99864ac9af5b475b366c69fb967cb4507542125
+EBUILD mailman-2.1.14_p1.ebuild 7666 RMD160 d3b56d54f4bb99d0bd02a4f185e6b65256efed9a SHA1 6ee0421af7e4eca25a78f71a03fe77b5d987df5e SHA256 474b1559d190c6a7888e55494f95898dbec5ad638ac458779bf06c0f3723d520
+MISC ChangeLog 17061 RMD160 396b6a22d357c2f915a65a3fdc3af4d5e84b76ef SHA1 4942db26264bd16375f48ec6338aad4f87f05b7f SHA256 17e7aa7bc2673971fe7888d55742419745b138c7b7eed21b5bd016bff7cab4ba
 MISC metadata.xml 218 RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff SHA1 486b307ff1dae10aef7d18472460a21bc2decdfb SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89
diff --git a/net-mail/mailman/files/README.gentoo-r2 b/net-mail/mailman/files/README.gentoo-r2
index 5149b1fe..1a9e49fa 100644
--- a/net-mail/mailman/files/README.gentoo-r2
+++ b/net-mail/mailman/files/README.gentoo-r2
@@ -1,4 +1,4 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 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 $
 
diff --git a/net-mail/mailman/files/README.gentoo-r3 b/net-mail/mailman/files/README.gentoo-r3
index e5e0e3bd..24f703c6 100644
--- a/net-mail/mailman/files/README.gentoo-r3
+++ b/net-mail/mailman/files/README.gentoo-r3
@@ -1,4 +1,4 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/files/README.gentoo-r3,v 1.2 2008/11/14 11:07:55 hanno Exp $
 
diff --git a/net-mail/mailman/files/mailman-python2.6-exceptions-quickfix.patch b/net-mail/mailman/files/mailman-python2.6-exceptions-quickfix.patch
deleted file mode 100644
index 7d523a9f..00000000
--- a/net-mail/mailman/files/mailman-python2.6-exceptions-quickfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur mailman-2.1.11.orig/Mailman/Errors.py mailman-2.1.11/Mailman/Errors.py
---- mailman-2.1.11.orig/Mailman/Errors.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/Mailman/Errors.py	2008-11-12 16:46:05.000000000 +0100
-@@ -50,13 +50,13 @@
- class MMInvalidCookieError(MMCookieError): pass
- 
- # BAW: these still need to be converted to classes.
--MMMustDigestError    = "MMMustDigestError"
--MMCantDigestError    = "MMCantDigestError"
--MMNeedApproval       = "MMNeedApproval"
--MMSubscribeNeedsConfirmation = "MMSubscribeNeedsConfirmation"
--MMBadConfirmation    = "MMBadConfirmation"
--MMAlreadyDigested    = "MMAlreadyDigested"
--MMAlreadyUndigested  = "MMAlreadyUndigested"
-+class MMMustDigestError(Exception): pass
-+class MMCantDigestError(Exception): pass
-+class MMNeedApproval(Exception): pass
-+class MMSubscribeNeedsConfirmation(Exception): pass
-+class MMBadConfirmation(Exception): pass
-+class MMAlreadyDigested(Exception): pass
-+class MMAlreadyUndigested(Exception): pass
- 
- MODERATED_LIST_MSG    = "Moderated list"
- IMPLICIT_DEST_MSG     = "Implicit destination"
diff --git a/net-mail/mailman/files/mailman-python2.6.patch b/net-mail/mailman/files/mailman-python2.6.patch
deleted file mode 100644
index ba9349af..00000000
--- a/net-mail/mailman/files/mailman-python2.6.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -ur mailman-2.1.11/Mailman/Bouncers/Caiwireless.py mailman-2.1.11-py26/Mailman/Bouncers/Caiwireless.py
---- mailman-2.1.11/Mailman/Bouncers/Caiwireless.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Bouncers/Caiwireless.py	2008-10-15 13:29:11.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- 
- def process(msg):
--    if msg.get_type() <> 'multipart/mixed':
-+    if msg.get_content_type() <> 'multipart/mixed':
-         return None
-     # simple state machine
-     #     0 == nothing seen
-diff -ur mailman-2.1.11/Mailman/Bouncers/GroupWise.py mailman-2.1.11-py26/Mailman/Bouncers/GroupWise.py
---- mailman-2.1.11/Mailman/Bouncers/GroupWise.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Bouncers/GroupWise.py	2008-10-15 13:29:26.000000000 +0200
-@@ -30,7 +30,7 @@
- 
- 
- def find_textplain(msg):
--    if msg.get_type(msg.get_default_type()) == 'text/plain':
-+    if msg.get_content_type(msg.get_default_type()) == 'text/plain':
-         return msg
-     if msg.is_multipart:
-         for part in msg.get_payload():
-@@ -44,7 +44,7 @@
- 
- 
- def process(msg):
--    if msg.get_type() <> 'multipart/mixed' or not msg['x-mailer']:
-+    if msg.get_content_type() <> 'multipart/mixed' or not msg['x-mailer']:
-         return None
-     if msg['x-mailer'][:3].lower() not in ('nov', 'ntm', 'int'):
-         return None
-diff -ur mailman-2.1.11/Mailman/Bouncers/Microsoft.py mailman-2.1.11-py26/Mailman/Bouncers/Microsoft.py
---- mailman-2.1.11/Mailman/Bouncers/Microsoft.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Bouncers/Microsoft.py	2008-10-15 13:29:52.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- def process(msg):
--    if msg.get_type() <> 'multipart/mixed':
-+    if msg.get_content_type() <> 'multipart/mixed':
-         return None
-     # Find the first subpart, which has no MIME type
-     try:
-diff -ur mailman-2.1.11/Mailman/Bouncers/Netscape.py mailman-2.1.11-py26/Mailman/Bouncers/Netscape.py
---- mailman-2.1.11/Mailman/Bouncers/Netscape.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Bouncers/Netscape.py	2008-10-15 13:30:04.000000000 +0200
-@@ -61,7 +61,7 @@
-     leaves = []
-     flatten(msg, leaves)
-     for i, subpart in zip(range(len(leaves)-1), leaves):
--        if subpart.get_type() == 'text/plain':
-+        if subpart.get_content_type() == 'text/plain':
-             plainmsg = subpart
-             break
-     if not plainmsg:
-diff -ur mailman-2.1.11/Mailman/Bouncers/Postfix.py mailman-2.1.11-py26/Mailman/Bouncers/Postfix.py
---- mailman-2.1.11/Mailman/Bouncers/Postfix.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Bouncers/Postfix.py	2008-10-15 13:29:01.000000000 +0200
-@@ -71,14 +71,14 @@
- 
- 
- def process(msg):
--    if msg.get_type() not in ('multipart/mixed', 'multipart/report'):
-+    if msg.get_content_type() not in ('multipart/mixed', 'multipart/report'):
-         return None
-     # We're looking for the plain/text subpart with a Content-Description: of
-     # `notification'.
-     leaves = []
-     flatten(msg, leaves)
-     for subpart in leaves:
--        if subpart.get_type() == 'text/plain' and \
-+        if subpart.get_content_type() == 'text/plain' and \
-            subpart.get('content-description', '').lower() == 'notification':
-             # then...
-             return findaddr(subpart)
-diff -ur mailman-2.1.11/Mailman/Handlers/Decorate.py mailman-2.1.11-py26/Mailman/Handlers/Decorate.py
---- mailman-2.1.11/Mailman/Handlers/Decorate.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Handlers/Decorate.py	2008-10-15 13:30:23.000000000 +0200
-@@ -130,7 +130,7 @@
-             wrap = False
-         except (LookupError, UnicodeError):
-             pass
--    elif msg.get_type() == 'multipart/mixed':
-+    elif msg.get_content_type() == 'multipart/mixed':
-         # The next easiest thing to do is just prepend the header and append
-         # the footer as additional subparts
-         payload = msg.get_payload()
-diff -ur mailman-2.1.11/Mailman/Handlers/Scrubber.py mailman-2.1.11-py26/Mailman/Handlers/Scrubber.py
---- mailman-2.1.11/Mailman/Handlers/Scrubber.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Handlers/Scrubber.py	2008-10-15 13:26:42.000000000 +0200
-@@ -189,7 +189,7 @@
-     # Now walk over all subparts of this message and scrub out various types
-     format = delsp = None
-     for part in msg.walk():
--        ctype = part.get_type(part.get_default_type())
-+        ctype = part.get_content_type()
-         # If the part is text/plain, we leave it alone
-         if ctype == 'text/plain':
-             # We need to choose a charset for the scrubbed message, so we'll
-@@ -300,7 +300,7 @@
-         # will transform the url into a hyperlink.
-         elif part.get_payload() and not part.is_multipart():
-             payload = part.get_payload(decode=True)
--            ctype = part.get_type()
-+            ctype = part.get_content_type()
-             # XXX Under email 2.5, it is possible that payload will be None.
-             # This can happen when you have a Content-Type: multipart/* with
-             # only one part and that part has two blank lines between the
-diff -ur mailman-2.1.11/Mailman/Handlers/Tagger.py mailman-2.1.11-py26/Mailman/Handlers/Tagger.py
---- mailman-2.1.11/Mailman/Handlers/Tagger.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Handlers/Tagger.py	2008-10-15 13:30:37.000000000 +0200
-@@ -69,11 +69,11 @@
-     # or if the outer type is multipart/alternative and there is a text/plain
-     # part.  Anything else, and the body is ignored for header-scan purposes.
-     found = None
--    if msg.get_type('text/plain') == 'text/plain':
-+    if msg.get_content_type('text/plain') == 'text/plain':
-         found = msg
--    elif msg.is_multipart() and msg.get_type() == 'multipart/alternative':
-+    elif msg.is_multipart() and msg.get_content_type() == 'multipart/alternative':
-         for found in msg.get_payload():
--            if found.get_type('text/plain') == 'text/plain':
-+            if found.get_content_type('text/plain') == 'text/plain':
-                 break
-         else:
-             found = None
-diff -ur mailman-2.1.11/Mailman/SecurityManager.py mailman-2.1.11-py26/Mailman/SecurityManager.py
---- mailman-2.1.11/Mailman/SecurityManager.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/SecurityManager.py	2008-10-15 12:55:04.000000000 +0200
-@@ -49,6 +49,11 @@
- 
- import os
- import re
-+
-+from warnings import filterwarnings
-+filterwarnings('ignore', '.* sha module', DeprecationWarning)
-+filterwarnings('ignore', '.* md5 module', DeprecationWarning)
-+
- import sha
- import time
- import Cookie
-diff -ur mailman-2.1.11/Mailman/Utils.py mailman-2.1.11-py26/Mailman/Utils.py
---- mailman-2.1.11/Mailman/Utils.py	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11-py26/Mailman/Utils.py	2008-10-15 12:47:17.000000000 +0200
-@@ -28,6 +28,10 @@
- 
- import os
- import re
-+
-+from warnings import filterwarnings
-+filterwarnings('ignore', '.* sha module', DeprecationWarning)
-+
- import cgi
- import sha
- import time
diff --git a/net-mail/mailman/files/mailman.rc b/net-mail/mailman/files/mailman.rc
index bc5a6886..ab6fe299 100644
--- a/net-mail/mailman/files/mailman.rc
+++ b/net-mail/mailman/files/mailman.rc
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/files/mailman.rc,v 1.5 2004/07/14 23:50:52 agriffis Exp $
 
diff --git a/net-mail/mailman/files/mhonarc-2.6.16-list-output-order.patch b/net-mail/mailman/files/mhonarc-2.6.16-list-output-order.patch
deleted file mode 100644
index de4b7a56..00000000
--- a/net-mail/mailman/files/mhonarc-2.6.16-list-output-order.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- MHonArc-2.6.16/lib/mhthread.pl.orig	2006-09-08 20:46:48.000000000 -0700
-+++ MHonArc-2.6.16/lib/mhthread.pl	2006-09-08 20:47:14.000000000 -0700
-@@ -406,22 +406,22 @@
-     ## Decrement level count if their were replies
-     --$level  if ($haverepls);
- 
-+    ## Close entry text
-+    if ($attop) {
-+	&print_thread_var($handle, $idx, \$TTOPEND);
-+    } elsif (!$single && !$didtliend) {
-+	&print_thread_var($handle, $idx, \$TLIEND);
-+    }
-+    
-     ## Check for missing messages
-     if ($DoMissingMsgs && !($attop || $single)) {
- 	for ($i=$depth; $i > 0; --$i) {
--	    &print_thread_var($handle, $idx, \$TLINONEEND);
- 	    &print_thread_var($handle, $idx, \$TSUBLISTEND)
- 		if $level <= $TLEVELS;
-+	    &print_thread_var($handle, $idx, \$TLINONEEND);
- 	    --$level;
- 	}
-     }
--
--    ## Close entry text
--    if ($attop) {
--	&print_thread_var($handle, $idx, \$TTOPEND);
--    } elsif (!$single && !$didtliend) {
--	&print_thread_var($handle, $idx, \$TLIEND);
--    }
- }
- 
- ##---------------------------------------------------------------------------
-@@ -636,9 +636,9 @@
-     ## Check for missing messages
-     if ($DoMissingMsgs && !($attop || $single)) {
- 	for ($i = $depth; $i > 0; $i--) {
--	    $ret .= &expand_thread_var($idx, \$TSLICELINONEEND);
- 	    $ret .= &expand_thread_var($idx, \$TSLICESUBLISTEND)
- 		if $level <= $TSLICELEVELS;
-+	    $ret .= &expand_thread_var($idx, \$TSLICELINONEEND);
- 	    $level--;
- 	}
-     }
-
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 3e573b00..00000000
--- a/net-mail/mailman/mailman-2.1.11.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2010 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.4 2008/08/15 15:26:26 nixnut 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 ~arm 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 -G cron -c "mailman"
-}
-
-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."
-	epatch "${FILESDIR}/${PN}-python2.6.patch" || die "patch failed."
-	epatch "${FILESDIR}/${PN}-python2.6-exceptions-quickfix.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 -G cron -c "mailman"
-	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-r1.ebuild b/net-mail/mailman/mailman-2.1.12-r1.ebuild
deleted file mode 100644
index 7b009f2c..00000000
--- a/net-mail/mailman/mailman-2.1.12-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2010 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.4 2008/08/15 15:26:26 nixnut Exp $
-
-inherit eutils python multilib perl-app
-
-MH_VER="2.6.16"
-MM_VER="2.1.12"
-INDEXING_VER="0.1"
-HTDIG_VER="0.1"
-EXITSTATUS_VER="0.1"
-MODINC_VER="0.1"
-MHONARC_VER="0.1"
-ANTISPAM_VER="0.1"
-RESPONSE_VER="0.1"
-DAILYMBOX_VER="0.1"
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${MH_VER}.tar.bz2
-	http://www.openinfo.co.uk/mm/patches/444879/indexing-${MM_VER}-${INDEXING_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/444884/htdig-${MM_VER}-${HTDIG_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/644797/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/760567/modinc-${MM_VER}-${MODINC_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/mhonarc/mhonarc-${MM_VER}-${MHONARC_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/850805/antispam-${MM_VER}-${ANTISPAM_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/supportlist/response-${MM_VER}-${RESPONSE_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/dailymbox/dailymbox-${MM_VER}-${DAILYMBOX_VER}.patch.gz"
-HOMEPAGE="http://www.list.org/ http://www.openinfo.co.uk/mm/ http://www.mhonarc.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="!net-mail/mhonarc"
-
-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 -G cron -c "mailman"
-}
-
-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."
-	epatch "${DISTDIR}/indexing-${MM_VER}-${INDEXING_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/htdig-${MM_VER}-${HTDIG_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/modinc-${MM_VER}-${MODINC_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/mhonarc-${MM_VER}-${MHONARC_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/antispam-${MM_VER}-${ANTISPAM_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/response-${MM_VER}-${RESPONSE_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/dailymbox-${MM_VER}-${DAILYMBOX_VER}.patch.gz" || die "patch failed."
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	epatch "${FILESDIR}"/mhonarc-${MH_VER}-list-output-order.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"
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	perl-app_src_compile
-}
-
-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"
-
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	sed -e "s|-prefix /usr |-docpath '${D}/usr/share/doc/${PF}/mhonarc' -prefix '${D}/${INSTALLDIR}/mhonarc' -libpath '${D}/${SITE_LIB}' |g" -i Makefile
-        perl-module_src_install
-        prepalldocs
-
-
-}
-
-pkg_postinst() {
-	python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman
-
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman -G cron -c "mailman"
-	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 3e43f3f6..00000000
--- a/net-mail/mailman/mailman-2.1.12.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2010 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.4 2008/08/15 15:26:26 nixnut Exp $
-
-inherit eutils python multilib perl-app
-
-MH_VER="2.6.16"
-MM_VER="2.1.11"
-INDEXING_VER="0.1"
-HTDIG_VER="0.1"
-EXITSTATUS_VER="0.1"
-MODINC_VER="0.1"
-MHONARC_VER="0.2"
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${MH_VER}.tar.bz2
-	http://www.openinfo.co.uk/mm/patches/444879/indexing-${MM_VER}-${INDEXING_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/444884/htdig-${MM_VER}-${HTDIG_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/644797/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/760567/modinc-${MM_VER}-${MODINC_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/mhonarc/mhonarc-${MM_VER}-${MHONARC_VER}.patch.gz"
-HOMEPAGE="http://www.list.org/ http://www.openinfo.co.uk/mm/ http://www.mhonarc.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="!net-mail/mhonarc"
-
-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 -G cron -c "mailman"
-}
-
-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."
-	epatch "${DISTDIR}/indexing-${MM_VER}-${INDEXING_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/htdig-${MM_VER}-${HTDIG_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/modinc-${MM_VER}-${MODINC_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/mhonarc-${MM_VER}-${MHONARC_VER}.patch.gz" || die "patch failed."
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	epatch "${FILESDIR}"/mhonarc-${MH_VER}-list-output-order.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"
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	perl-app_src_compile
-}
-
-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"
-
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	sed -e "s|-prefix /usr |-docpath '${D}/usr/share/doc/${PF}/mhonarc' -prefix '${D}/${INSTALLDIR}/mhonarc' -libpath '${D}/${SITE_LIB}' |g" -i Makefile
-        perl-module_src_install
-        prepalldocs
-
-
-}
-
-pkg_postinst() {
-	python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman
-
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman -G cron -c "mailman"
-	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.13-r1.ebuild b/net-mail/mailman/mailman-2.1.13-r1.ebuild
deleted file mode 100644
index 6158dfd4..00000000
--- a/net-mail/mailman/mailman-2.1.13-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2010 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.4 2008/08/15 15:26:26 nixnut Exp $
-
-inherit eutils python multilib perl-app
-
-MH_VER="2.6.16"
-MM_VER="2.1.12"
-INDEXING_VER="0.1"
-HTDIG_VER="0.1"
-EXITSTATUS_VER="0.1"
-MODINC_VER="0.1"
-MHONARC_VER="0.1"
-ANTISPAM_VER="0.1"
-RESPONSE_VER="0.1"
-DAILYMBOX_VER="0.1"
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${MH_VER}.tar.bz2
-	http://www.openinfo.co.uk/mm/patches/444879/indexing-${MM_VER}-${INDEXING_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/444884/htdig-${MM_VER}-${HTDIG_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/644797/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/760567/modinc-${MM_VER}-${MODINC_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/mhonarc/mhonarc-${MM_VER}-${MHONARC_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/850805/antispam-${MM_VER}-${ANTISPAM_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/supportlist/response-${MM_VER}-${RESPONSE_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/dailymbox/dailymbox-${MM_VER}-${DAILYMBOX_VER}.patch.gz"
-HOMEPAGE="http://www.list.org/ http://www.openinfo.co.uk/mm/ http://www.mhonarc.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="!net-mail/mhonarc"
-
-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 -G cron -c "mailman"
-}
-
-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}/${PN}-2.1.13-ldflags.patch" || die "patch failed."
-	epatch "${DISTDIR}/indexing-${MM_VER}-${INDEXING_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/htdig-${MM_VER}-${HTDIG_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/modinc-${MM_VER}-${MODINC_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/mhonarc-${MM_VER}-${MHONARC_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/antispam-${MM_VER}-${ANTISPAM_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/response-${MM_VER}-${RESPONSE_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/dailymbox-${MM_VER}-${DAILYMBOX_VER}.patch.gz" || die "patch failed."
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	epatch "${FILESDIR}"/mhonarc-${MH_VER}-list-output-order.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"
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	perl-app_src_compile
-}
-
-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"
-
-	cd ${WORKDIR}/MHonArc-${MH_VER}
-	sed -e "s|-prefix /usr |-docpath '${D}/usr/share/doc/${PF}/mhonarc' -prefix '${D}/${INSTALLDIR}/mhonarc' -libpath '${D}/${SITE_LIB}' |g" -i Makefile
-        perl-module_src_install
-        prepalldocs
-
-
-}
-
-pkg_postinst() {
-	python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman
-
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman -G cron -c "mailman"
-	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.14.ebuild b/net-mail/mailman/mailman-2.1.14_p1.ebuild
similarity index 84%
rename from net-mail/mailman/mailman-2.1.14.ebuild
rename to net-mail/mailman/mailman-2.1.14_p1.ebuild
index 832edf2c..94f498a3 100644
--- a/net-mail/mailman/mailman-2.1.14.ebuild
+++ b/net-mail/mailman/mailman-2.1.14_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.14.ebuild,v 1.5 2010/10/15 12:49:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.14.ebuild,v 1.7 2011/11/02 22:09:34 vapier Exp $
 
 inherit eutils python multilib
 
@@ -13,16 +13,19 @@ ANTISPAM_VER="0.1"
 RESPONSE_VER="0.1"
 DAILYMBOX_VER="0.1"
 
+MY_PVP="${PV/_p/-}"
+MY_PV="${PV/_p*/}"
+
 DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	http://www.openinfo.co.uk/mm/patches/444879/indexing-${PV}-${INDEXING_VER}.patch.gz
-	http://ftp.disconnected-by-peer.at/pub/indexing-${PV}-${INDEXING_VER}.patch.gz
+SRC_URI="http://launchpad.net/${PN}/2.1/${MY_PV}/+download/mailman-${MY_PVP}.tgz
+	http://www.openinfo.co.uk/mm/patches/444879/indexing-${MY_PV}-${INDEXING_VER}.patch.gz
+	http://ftp.disconnected-by-peer.at/pub/indexing-${MY_PV}-${INDEXING_VER}.patch.gz
 	http://www.openinfo.co.uk/mm/patches/444884/htdig-${MM_VER}-${HTDIG_VER}.patch.gz
 	http://www.openinfo.co.uk/mm/patches/644797/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/760567/modinc-${PV}-${MODINC_VER}.patch.gz
-	http://ftp.disconnected-by-peer.at/pub/modinc-${PV}-${MODINC_VER}.patch.gz
-	http://www.openinfo.co.uk/mm/patches/850805/antispam-${PV}-${ANTISPAM_VER}.patch.gz
-	http://ftp.disconnected-by-peer.at/pub/antispam-${PV}-${ANTISPAM_VER}.patch.gz
+	http://www.openinfo.co.uk/mm/patches/760567/modinc-${MY_PV}-${MODINC_VER}.patch.gz
+	http://ftp.disconnected-by-peer.at/pub/modinc-${MY_PV}-${MODINC_VER}.patch.gz
+	http://www.openinfo.co.uk/mm/patches/850805/antispam-${MY_PV}-${ANTISPAM_VER}.patch.gz
+	http://ftp.disconnected-by-peer.at/pub/antispam-${MY_PV}-${ANTISPAM_VER}.patch.gz
 	http://www.openinfo.co.uk/mm/patches/supportlist/response-${MM_VER}-${RESPONSE_VER}.patch.gz
 	http://www.openinfo.co.uk/mm/patches/dailymbox/dailymbox-${MM_VER}-${DAILYMBOX_VER}.patch.gz"
 HOMEPAGE="http://www.list.org/ http://www.openinfo.co.uk/mm/"
@@ -38,6 +41,8 @@ DEPEND=">=dev-lang/python-2.3
 	virtual/httpd-cgi"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/mailman-${MY_PVP}"
+
 pkg_setup() {
 	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
 	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
@@ -52,7 +57,7 @@ pkg_setup() {
 	# 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 -G cron -c "mailman"
+	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
 }
 
 src_unpack() {
@@ -60,12 +65,12 @@ src_unpack() {
 	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" || die "patch failed."
-	epatch "${DISTDIR}/indexing-${PV}-${INDEXING_VER}.patch.gz" || die "patch failed."
+	epatch "${FILESDIR}/${PN}-2.1.13-ldflags.patch"
+	epatch "${DISTDIR}/indexing-${MY_PV}-${INDEXING_VER}.patch.gz" || die "patch failed."
 	epatch "${DISTDIR}/htdig-${MM_VER}-${HTDIG_VER}.patch.gz" || die "patch failed."
 	epatch "${DISTDIR}/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/modinc-${PV}-${MODINC_VER}.patch.gz" || die "patch failed."
-	epatch "${DISTDIR}/antispam-${PV}-${ANTISPAM_VER}.patch.gz" || die "patch failed."
+	epatch "${DISTDIR}/modinc-${MY_PV}-${MODINC_VER}.patch.gz" || die "patch failed."
+	epatch "${DISTDIR}/antispam-${MY_PV}-${ANTISPAM_VER}.patch.gz" || die "patch failed."
 	epatch "${DISTDIR}/response-${MM_VER}-${RESPONSE_VER}.patch.gz" || die "patch failed."
 	epatch "${DISTDIR}/dailymbox-${MM_VER}-${DAILYMBOX_VER}.patch.gz" || die "patch failed."
 }
@@ -95,7 +100,7 @@ src_install () {
 
 	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo || die "newdoc failed"
 
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL* contrib/mailman.mc \
+	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
@@ -140,7 +145,7 @@ pkg_postinst() {
 		${INSTALLDIR}/Mailman/*/
 
 	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman -G cron -c "mailman"
+	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"