From 36544c5ab8c66f0b555331add060d1ef17a7e398 Mon Sep 17 00:00:00 2001
From: "Fernando J. Pereda" <ferdy@gentoo.org>
Date: Sat, 6 Jan 2007 01:21:15 +0000
Subject: [PATCH] QA: Clean unused versions. Package-Manager: portage-2.1.1-r2

---
 net-mail/altermime/Manifest                   |  24 +--
 net-mail/altermime/altermime-0.3.6.ebuild     |  28 ---
 .../altermime/files/digest-altermime-0.3.6    |   3 -
 net-mail/eps/Manifest                         |  28 ++-
 net-mail/eps/eps-1.2.ebuild                   |  28 ---
 net-mail/eps/files/digest-eps-1.2             |   1 -
 net-mail/gensig/Manifest                      |  26 ++-
 net-mail/gensig/files/digest-gensig-2.2       |   1 -
 net-mail/gensig/gensig-2.2.ebuild             |  16 --
 net-mail/getmail/Manifest                     |  48 +----
 net-mail/getmail/files/digest-getmail-4.6.3   |   3 -
 net-mail/getmail/files/digest-getmail-4.6.4   |   3 -
 net-mail/getmail/files/digest-getmail-4.6.5   |   3 -
 net-mail/getmail/files/digest-getmail-4.6.6   |   3 -
 net-mail/getmail/getmail-4.6.3.ebuild         |  57 ------
 net-mail/getmail/getmail-4.6.4.ebuild         |  57 ------
 net-mail/getmail/getmail-4.6.5.ebuild         |  57 ------
 net-mail/getmail/getmail-4.6.6.ebuild         |  57 ------
 net-mail/grepmail/Manifest                    |  26 ++-
 net-mail/grepmail/files/digest-grepmail-5.30  |   1 -
 net-mail/grepmail/grepmail-5.30.ebuild        |  28 ---
 net-mail/imapsync/Manifest                    |  31 +--
 net-mail/imapsync/files/digest-imapsync-1.171 |   3 -
 .../imapsync/files/digest-imapsync-1.171-r1   |   3 -
 net-mail/imapsync/imapsync-1.171-r1.ebuild    |  41 ----
 net-mail/imapsync/imapsync-1.171.ebuild       |  40 ----
 net-mail/isync/Manifest                       |  36 ++--
 net-mail/isync/files/digest-isync-0.9.2       |   1 -
 net-mail/isync/isync-0.9.2.ebuild             |  30 ---
 net-mail/lbdb/Manifest                        |  24 +--
 net-mail/lbdb/files/digest-lbdb-0.31          |   3 -
 net-mail/lbdb/lbdb-0.31.ebuild                |  51 -----
 net-mail/mailbase/Manifest                    |  53 ++---
 .../mailbase/files/digest-mailbase-0.00-r4    |   1 -
 .../mailbase/files/digest-mailbase-0.00-r5    |   1 -
 .../mailbase/files/digest-mailbase-0.00-r7    |   1 -
 .../mailbase/files/digest-mailbase-0.00-r8    |   1 -
 .../mailbase/files/digest-mailbase-0.00-r9    |   1 -
 net-mail/mailbase/mailbase-0.00-r4.ebuild     |  36 ----
 net-mail/mailbase/mailbase-0.00-r5.ebuild     |  39 ----
 net-mail/mailbase/mailbase-0.00-r7.ebuild     |  82 --------
 net-mail/mailbase/mailbase-0.00-r8.ebuild     |  96 ---------
 net-mail/mailbase/mailbase-0.00-r9.ebuild     |  98 ---------
 net-mail/mailutils/Manifest                   |  25 ++-
 .../mailutils/files/digest-mailutils-0.6-r2   |   3 -
 net-mail/mailutils/mailutils-0.6-r2.ebuild    |  95 ---------
 net-mail/mairix/Manifest                      |  24 +--
 net-mail/mairix/files/digest-mairix-0.18      |   3 -
 net-mail/mairix/mairix-0.18.ebuild            |  48 -----
 net-mail/mboxgrep/Manifest                    |  26 ++-
 net-mail/mboxgrep/files/digest-mboxgrep-0.7.3 |   1 -
 net-mail/mboxgrep/mboxgrep-0.7.3.ebuild       |  32 ---
 net-mail/popa3d/Manifest                      |  32 +--
 .../popa3d/files/digest-popa3d-0.6.4.1-r2     |   5 -
 net-mail/popa3d/files/digest-popa3d-1.0       |   5 -
 net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild      | 168 ----------------
 net-mail/popa3d/popa3d-1.0.ebuild             | 185 -----------------
 net-mail/ripmime/Manifest                     |  26 +--
 net-mail/ripmime/files/digest-ripmime-1.4.0.5 |   1 -
 net-mail/ripmime/ripmime-1.4.0.5.ebuild       |  22 --
 net-mail/serialmail/Manifest                  |  32 ++-
 .../files/digest-serialmail-0.75-r1           |   1 -
 net-mail/serialmail/serialmail-0.75-r1.ebuild |  60 ------
 net-mail/swaks/Manifest                       |  40 +---
 net-mail/swaks/files/digest-swaks-20040404.1  |   1 -
 net-mail/swaks/files/digest-swaks-20050605.3  |   1 -
 net-mail/swaks/files/digest-swaks-20050709.1  |   1 -
 net-mail/swaks/swaks-20040404.1.ebuild        |  35 ----
 net-mail/swaks/swaks-20050605.3.ebuild        |  35 ----
 net-mail/swaks/swaks-20050709.1.ebuild        |  35 ----
 net-mail/teapop/Manifest                      |  49 ++---
 net-mail/teapop/files/digest-teapop-0.3.3     |   3 -
 net-mail/teapop/files/digest-teapop-0.3.5     |   3 -
 net-mail/teapop/files/digest-teapop-0.3.7     |   3 -
 net-mail/teapop/files/digest-teapop-0.3.7-r1  |   3 -
 net-mail/teapop/teapop-0.3.3.ebuild           |  47 -----
 net-mail/teapop/teapop-0.3.5.ebuild           |  51 -----
 net-mail/teapop/teapop-0.3.7-r1.ebuild        |  57 ------
 net-mail/teapop/teapop-0.3.7.ebuild           |  51 -----
 net-mail/tnef/Manifest                        |  24 +--
 net-mail/tnef/files/digest-tnef-1.4.1         |   3 -
 net-mail/tnef/tnef-1.4.1.ebuild               |  26 ---
 net-mail/uw-imap/Manifest                     |  23 +--
 .../uw-imap/files/digest-uw-imap-2004g-r1     |   3 -
 net-mail/uw-imap/uw-imap-2004g-r1.ebuild      | 189 ------------------
 net-mail/vimap/Manifest                       |  58 +++---
 net-mail/vimap/files/digest-vimap-2002c       |   4 -
 net-mail/vimap/files/digest-vimap-2002c-r1    |   4 -
 net-mail/vimap/files/digest-vimap-2002c-r2    |   4 -
 net-mail/vimap/vimap-2002c-r1.ebuild          | 132 ------------
 net-mail/vimap/vimap-2002c-r2.ebuild          | 152 --------------
 net-mail/vimap/vimap-2002c.ebuild             | 108 ----------
 92 files changed, 284 insertions(+), 2825 deletions(-)
 delete mode 100644 net-mail/altermime/altermime-0.3.6.ebuild
 delete mode 100644 net-mail/altermime/files/digest-altermime-0.3.6
 delete mode 100644 net-mail/eps/eps-1.2.ebuild
 delete mode 100644 net-mail/eps/files/digest-eps-1.2
 delete mode 100644 net-mail/gensig/files/digest-gensig-2.2
 delete mode 100644 net-mail/gensig/gensig-2.2.ebuild
 delete mode 100644 net-mail/getmail/files/digest-getmail-4.6.3
 delete mode 100644 net-mail/getmail/files/digest-getmail-4.6.4
 delete mode 100644 net-mail/getmail/files/digest-getmail-4.6.5
 delete mode 100644 net-mail/getmail/files/digest-getmail-4.6.6
 delete mode 100644 net-mail/getmail/getmail-4.6.3.ebuild
 delete mode 100644 net-mail/getmail/getmail-4.6.4.ebuild
 delete mode 100644 net-mail/getmail/getmail-4.6.5.ebuild
 delete mode 100644 net-mail/getmail/getmail-4.6.6.ebuild
 delete mode 100644 net-mail/grepmail/files/digest-grepmail-5.30
 delete mode 100644 net-mail/grepmail/grepmail-5.30.ebuild
 delete mode 100644 net-mail/imapsync/files/digest-imapsync-1.171
 delete mode 100644 net-mail/imapsync/files/digest-imapsync-1.171-r1
 delete mode 100644 net-mail/imapsync/imapsync-1.171-r1.ebuild
 delete mode 100644 net-mail/imapsync/imapsync-1.171.ebuild
 delete mode 100644 net-mail/isync/files/digest-isync-0.9.2
 delete mode 100644 net-mail/isync/isync-0.9.2.ebuild
 delete mode 100644 net-mail/lbdb/files/digest-lbdb-0.31
 delete mode 100644 net-mail/lbdb/lbdb-0.31.ebuild
 delete mode 100644 net-mail/mailbase/files/digest-mailbase-0.00-r4
 delete mode 100644 net-mail/mailbase/files/digest-mailbase-0.00-r5
 delete mode 100644 net-mail/mailbase/files/digest-mailbase-0.00-r7
 delete mode 100644 net-mail/mailbase/files/digest-mailbase-0.00-r8
 delete mode 100644 net-mail/mailbase/files/digest-mailbase-0.00-r9
 delete mode 100644 net-mail/mailbase/mailbase-0.00-r4.ebuild
 delete mode 100644 net-mail/mailbase/mailbase-0.00-r5.ebuild
 delete mode 100644 net-mail/mailbase/mailbase-0.00-r7.ebuild
 delete mode 100644 net-mail/mailbase/mailbase-0.00-r8.ebuild
 delete mode 100644 net-mail/mailbase/mailbase-0.00-r9.ebuild
 delete mode 100644 net-mail/mailutils/files/digest-mailutils-0.6-r2
 delete mode 100644 net-mail/mailutils/mailutils-0.6-r2.ebuild
 delete mode 100644 net-mail/mairix/files/digest-mairix-0.18
 delete mode 100644 net-mail/mairix/mairix-0.18.ebuild
 delete mode 100644 net-mail/mboxgrep/files/digest-mboxgrep-0.7.3
 delete mode 100644 net-mail/mboxgrep/mboxgrep-0.7.3.ebuild
 delete mode 100644 net-mail/popa3d/files/digest-popa3d-0.6.4.1-r2
 delete mode 100644 net-mail/popa3d/files/digest-popa3d-1.0
 delete mode 100644 net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild
 delete mode 100644 net-mail/popa3d/popa3d-1.0.ebuild
 delete mode 100644 net-mail/ripmime/files/digest-ripmime-1.4.0.5
 delete mode 100644 net-mail/ripmime/ripmime-1.4.0.5.ebuild
 delete mode 100644 net-mail/serialmail/files/digest-serialmail-0.75-r1
 delete mode 100644 net-mail/serialmail/serialmail-0.75-r1.ebuild
 delete mode 100644 net-mail/swaks/files/digest-swaks-20040404.1
 delete mode 100644 net-mail/swaks/files/digest-swaks-20050605.3
 delete mode 100644 net-mail/swaks/files/digest-swaks-20050709.1
 delete mode 100644 net-mail/swaks/swaks-20040404.1.ebuild
 delete mode 100644 net-mail/swaks/swaks-20050605.3.ebuild
 delete mode 100644 net-mail/swaks/swaks-20050709.1.ebuild
 delete mode 100644 net-mail/teapop/files/digest-teapop-0.3.3
 delete mode 100644 net-mail/teapop/files/digest-teapop-0.3.5
 delete mode 100644 net-mail/teapop/files/digest-teapop-0.3.7
 delete mode 100644 net-mail/teapop/files/digest-teapop-0.3.7-r1
 delete mode 100644 net-mail/teapop/teapop-0.3.3.ebuild
 delete mode 100644 net-mail/teapop/teapop-0.3.5.ebuild
 delete mode 100644 net-mail/teapop/teapop-0.3.7-r1.ebuild
 delete mode 100644 net-mail/teapop/teapop-0.3.7.ebuild
 delete mode 100644 net-mail/tnef/files/digest-tnef-1.4.1
 delete mode 100644 net-mail/tnef/tnef-1.4.1.ebuild
 delete mode 100644 net-mail/uw-imap/files/digest-uw-imap-2004g-r1
 delete mode 100644 net-mail/uw-imap/uw-imap-2004g-r1.ebuild
 delete mode 100644 net-mail/vimap/files/digest-vimap-2002c
 delete mode 100644 net-mail/vimap/files/digest-vimap-2002c-r1
 delete mode 100644 net-mail/vimap/files/digest-vimap-2002c-r2
 delete mode 100644 net-mail/vimap/vimap-2002c-r1.ebuild
 delete mode 100644 net-mail/vimap/vimap-2002c-r2.ebuild
 delete mode 100644 net-mail/vimap/vimap-2002c.ebuild

diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
index cb9912b1dd28..95097c86da20 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 DIST altermime-0.3.1.tar.gz 52111 RMD160 f1cb1bc5cefa4ef304c1c0990882f41bb16d2eda SHA1 63cb168068ff7e57020ae8892de2380e9a047a7d SHA256 bd7a3afbe03e5f9ace7cb86df1cfe523aadb0f7020606c62ae9a6018544dbcf9
 DIST altermime-0.3.3.tar.gz 55552 RMD160 c4a5ed8c9e844ab11adc642dd45830f2af3a1b34 SHA1 e568ef080739a7657a5380ae1d1466eca265dc97 SHA256 9d28ce1138e847453741a94d1c72f7e3bc886589225bc9cabfcdda2a70c6fb2b
-DIST altermime-0.3.6.tar.gz 71785 RMD160 62f558be64a9a478fe8cdcb6ca678f2408f6185c SHA1 7ba1d2da166e8c2db79c27c88c74e22b17dd6719 SHA256 14dc907cd8aab73cbda925bd558815c2525dc7dd69f46a8f7a6091bd1fe4b58e
 DIST altermime-0.3.7.tar.gz 76212 RMD160 c49698221c7a1f139e4666fba492de187bf1d0ba SHA1 eabbc914c8bd9ddfb151b04641de437d4db03bb1 SHA256 643c573bceb2921ad4b8078e1eb7ac369d77e78499f95d95c7ba058cb42b43c9
 EBUILD altermime-0.3.1.ebuild 588 RMD160 cdcca2caadc34582d557ff2cbf883d9117dcf383 SHA1 93da2b61f077c58ce9692a249ce7b9640c2cf746 SHA256 ccad0adde6eb63a167539334fe7f0ea2f6bc9585fc9e396a3bcd43a13bada0ad
 MD5 4f74d65d2d118e3d109ab43b4276c423 altermime-0.3.1.ebuild 588
@@ -13,18 +12,14 @@ EBUILD altermime-0.3.3.ebuild 594 RMD160 78e66754bc4b88263b974f35fb203f0a97bdcff
 MD5 731d68f538442d4df431ce6f514c7e2e altermime-0.3.3.ebuild 594
 RMD160 78e66754bc4b88263b974f35fb203f0a97bdcfff altermime-0.3.3.ebuild 594
 SHA256 1fcc12c8a464214019b1049f77c9eadc59a6456a8764046207ccfb5cf2ca4f86 altermime-0.3.3.ebuild 594
-EBUILD altermime-0.3.6.ebuild 824 RMD160 372beacffa38ba9dfc6d74dd0439fc99026bf3b1 SHA1 e775034e35d78eedb2525faccaf152152e483e7f SHA256 fc4ba3572b6ae1f1558331042ca024175a0af0708ce127ed3204b6ee41751fa5
-MD5 7eb04c33d51aa760997c3e3b970230cd altermime-0.3.6.ebuild 824
-RMD160 372beacffa38ba9dfc6d74dd0439fc99026bf3b1 altermime-0.3.6.ebuild 824
-SHA256 fc4ba3572b6ae1f1558331042ca024175a0af0708ce127ed3204b6ee41751fa5 altermime-0.3.6.ebuild 824
 EBUILD altermime-0.3.7.ebuild 886 RMD160 f58472100b63877ea3fbcecfbe5cfbc8b446d0b4 SHA1 739efdcce53d9f5254c63e836bbf4b3e900a5749 SHA256 f965b8e3629408fc25be209e11f18b37a92c3e3bb8d092dd8ff2e27ae391237c
 MD5 74e6bef9e8e922ba3c166f8f0ccda6c9 altermime-0.3.7.ebuild 886
 RMD160 f58472100b63877ea3fbcecfbe5cfbc8b446d0b4 altermime-0.3.7.ebuild 886
 SHA256 f965b8e3629408fc25be209e11f18b37a92c3e3bb8d092dd8ff2e27ae391237c altermime-0.3.7.ebuild 886
-MISC ChangeLog 1269 RMD160 7d3aa813cf5beb226b2fce918dff25ae23522106 SHA1 0b21a80cecad959b9b79a2ae6215ff25eee0acff SHA256 83c1b10cfa564fcf601cecda0b546fe2b11b52e0d1d950bf10fc17a32e40cd92
-MD5 190b92b0e7a5422fe488c452a640ddef ChangeLog 1269
-RMD160 7d3aa813cf5beb226b2fce918dff25ae23522106 ChangeLog 1269
-SHA256 83c1b10cfa564fcf601cecda0b546fe2b11b52e0d1d950bf10fc17a32e40cd92 ChangeLog 1269
+MISC ChangeLog 1381 RMD160 8a7bd914e2d931a9d701b04690c1008598b63d4d SHA1 5173c4e1c208b4b402ecee66636befc14033bd22 SHA256 45b91c5ab56912c5c9e84c15fc3e21845091aef33b7667e5cc0ae4bfa28f0af5
+MD5 1fc292b5c7194f59951ba99dfa969da2 ChangeLog 1381
+RMD160 8a7bd914e2d931a9d701b04690c1008598b63d4d ChangeLog 1381
+SHA256 45b91c5ab56912c5c9e84c15fc3e21845091aef33b7667e5cc0ae4bfa28f0af5 ChangeLog 1381
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -35,16 +30,13 @@ SHA256 1a2dac4399e9fd1d4b71af47072c4ec0d62b5353542b5f4917e381406f8b4b15 files/di
 MD5 ab1521e7777162db6a7a16eebbde2430 files/digest-altermime-0.3.3 244
 RMD160 78bed05607ff481470ee9838dbf4373806d44294 files/digest-altermime-0.3.3 244
 SHA256 7a55d97ce89c170edc4265c4ddae4553aabc95e456b441734c5fbc1d16fee9a1 files/digest-altermime-0.3.3 244
-MD5 15f70d91ee14e571134e392ed16d3dd3 files/digest-altermime-0.3.6 244
-RMD160 293cb68620d57e47c6bb45d264c025167ed1a7af files/digest-altermime-0.3.6 244
-SHA256 88b22cd54d0b81280126ece634556ad3d081de05862b4e5103ed5b6ee162a352 files/digest-altermime-0.3.6 244
 MD5 d1cb8dd1f34bc1d75c5697ef354880ce files/digest-altermime-0.3.7 244
 RMD160 e0fbead45db4fd13925a120d60e67dd4bc8fb899 files/digest-altermime-0.3.7 244
 SHA256 19189a9d073c9a05d55109d3b27a3d4cf5a53e10147330ac2058eab3542d04cc files/digest-altermime-0.3.7 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFfF0QV3J2n04EauwRAuZiAJ9fYFb3gVFqDRkG9B8HdNwz9rECHwCcDwg/
-EP35DXfcECrL19HnVJa9VVo=
-=Bg/+
+iD8DBQFFnvOGViELBEf1JB0RAoixAKCGmCG9yovLj/6da0xcDqjzb/ba4ACfeen5
+KT4wiW5ZRtRunP2AOqQn1vE=
+=Feay
 -----END PGP SIGNATURE-----
diff --git a/net-mail/altermime/altermime-0.3.6.ebuild b/net-mail/altermime/altermime-0.3.6.ebuild
deleted file mode 100644
index 887cb40d27d7..000000000000
--- a/net-mail/altermime/altermime-0.3.6.ebuild
+++ /dev/null
@@ -1,28 +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/altermime/altermime-0.3.6.ebuild,v 1.2 2006/09/30 01:31:17 robbat2 Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
-SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
-HOMEPAGE="http://pldaniels.com/altermime/"
-
-LICENSE="Sendmail"
-KEYWORDS="~x86 ~s390 ~amd64 ~ppc"
-IUSE=""
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" ${S}/Makefile || die "sed failed."
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install () {
-	dobin altermime || die "dobin failed."
-	dodoc CHANGELOG INSTALL LICENCE README || die "dodoc failed."
-}
diff --git a/net-mail/altermime/files/digest-altermime-0.3.6 b/net-mail/altermime/files/digest-altermime-0.3.6
deleted file mode 100644
index e9c6fd632102..000000000000
--- a/net-mail/altermime/files/digest-altermime-0.3.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a9dc3962b00e4a6d6f3b93f10858bd35 altermime-0.3.6.tar.gz 71785
-RMD160 62f558be64a9a478fe8cdcb6ca678f2408f6185c altermime-0.3.6.tar.gz 71785
-SHA256 14dc907cd8aab73cbda925bd558815c2525dc7dd69f46a8f7a6091bd1fe4b58e altermime-0.3.6.tar.gz 71785
diff --git a/net-mail/eps/Manifest b/net-mail/eps/Manifest
index b9543629177e..9be0f148ff61 100644
--- a/net-mail/eps/Manifest
+++ b/net-mail/eps/Manifest
@@ -1,6 +1,26 @@
-MD5 16a502f94e5d412a5fd8b901706d45fc ChangeLog 1036
-MD5 fc470cad53fd62b6edc8b0c4e943d0f2 metadata.xml 442
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST eps-1.5.tar.gz 28346
+EBUILD eps-1.5.ebuild 755 RMD160 5a4000e7a61f094ecee8667cbf02a17b284aab7d SHA1 f07e3a90dd29510a7cbc410d09eb224904c51a91 SHA256 34c3f4f6de4f098f9d69b9cae70aae0b3319adcfdbd0c4b7b528e9ccebf1a404
 MD5 1aa3fc3403d59c71f4342035418bc35c eps-1.5.ebuild 755
-MD5 3d5418fb802d6637488f81b31f8a337b eps-1.2.ebuild 746
+RMD160 5a4000e7a61f094ecee8667cbf02a17b284aab7d eps-1.5.ebuild 755
+SHA256 34c3f4f6de4f098f9d69b9cae70aae0b3319adcfdbd0c4b7b528e9ccebf1a404 eps-1.5.ebuild 755
+MISC ChangeLog 1135 RMD160 b26fd067a97cd1f256e2794decdb1385d085a47f SHA1 20ded77b9d69585caa81e32ca8e8941fee4470c8 SHA256 230a68e9a20c997dc3e788dfbdcf760d17937e93e9beb8ed45696d287f469a72
+MD5 44a0e183ef5276e164e25f26776c3fdb ChangeLog 1135
+RMD160 b26fd067a97cd1f256e2794decdb1385d085a47f ChangeLog 1135
+SHA256 230a68e9a20c997dc3e788dfbdcf760d17937e93e9beb8ed45696d287f469a72 ChangeLog 1135
+MISC metadata.xml 442 RMD160 1a09d588299bbb24da2a58f1dc8eb81f5e35b826 SHA1 4ef1c0f0385ba0bec2194427c6568647467a69d9 SHA256 c50ef4e87967283b2b6715ba3846549f4955d95b0df43956fdd9c5e0de0a3340
+MD5 fc470cad53fd62b6edc8b0c4e943d0f2 metadata.xml 442
+RMD160 1a09d588299bbb24da2a58f1dc8eb81f5e35b826 metadata.xml 442
+SHA256 c50ef4e87967283b2b6715ba3846549f4955d95b0df43956fdd9c5e0de0a3340 metadata.xml 442
 MD5 2193218573380121c6bc7948f8b7f06f files/digest-eps-1.5 58
-MD5 fc8883226596a2d8b69fe1c26de46183 files/digest-eps-1.2 58
+RMD160 140745650b22dc56fc6a42e5743aef13eb8729e5 files/digest-eps-1.5 58
+SHA256 700aab9948a4fbb2383d1aa1cf6487ff721ceb2ffa13dfc9e744cabfa5c02607 files/digest-eps-1.5 58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnvPJViELBEf1JB0RAlj9AJ4tvi6gFgeZdg9K99X7bN/P2IpvtACeJSGM
+8qdQ6H/2VUuOV1qfdVYgako=
+=N5qD
+-----END PGP SIGNATURE-----
diff --git a/net-mail/eps/eps-1.2.ebuild b/net-mail/eps/eps-1.2.ebuild
deleted file mode 100644
index 4ce9fe12dc04..000000000000
--- a/net-mail/eps/eps-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/eps/eps-1.2.ebuild,v 1.5 2005/01/05 19:15:21 ticho Exp $
-
-DESCRIPTION="Inter7 Email Processing and mht System library"
-HOMEPAGE="http://www.inter7.com/eps"
-SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-DEPEND="virtual/libc
-	sys-apps/sed"
-RDEPEND="virtual/libc"
-
-src_compile() {
-	sed -i -e 's/\/usr/\$\(DESTDIR\)\$\(prefix\)/g' \
-		-e 's/\-O3/\$\(CFLAGS\)/g' \
-		-e 's/cp -pf/cp -f/g' \
-		Makefile
-
-	make || die "compile failed"
-}
-
-src_install() {
-	make prefix=/usr DESTDIR=${D} install || die "install failed"
-	dodoc ChangeLog TODO doc/*
-}
diff --git a/net-mail/eps/files/digest-eps-1.2 b/net-mail/eps/files/digest-eps-1.2
deleted file mode 100644
index 3e5a11214939..000000000000
--- a/net-mail/eps/files/digest-eps-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20e2e7771e0d99138950ec85880a1d1a eps-1.2.tar.gz 27674
diff --git a/net-mail/gensig/Manifest b/net-mail/gensig/Manifest
index c69d9fb4a886..a8cc3376dcb0 100644
--- a/net-mail/gensig/Manifest
+++ b/net-mail/gensig/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bac222f0bb156efd3b75f83e9e22cf32 ChangeLog 740
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+DIST gensig-2.3.tar.gz 96744
+EBUILD gensig-2.3.ebuild 501 RMD160 cf01759ceca6664e6566bf1242ebfbc7476645fd SHA1 e0aeaac41ddf1df12df600e1dbdafa10685085f6 SHA256 b2a7353ffd23d49395bf587216f749eb78dbd3814bd2311390e89524217756f4
 MD5 e53ce193ff2cffb5855158f52abc5d0b gensig-2.3.ebuild 501
-MD5 f8691af1908379c119f879a9dbacdcbf gensig-2.2.ebuild 504
+RMD160 cf01759ceca6664e6566bf1242ebfbc7476645fd gensig-2.3.ebuild 501
+SHA256 b2a7353ffd23d49395bf587216f749eb78dbd3814bd2311390e89524217756f4 gensig-2.3.ebuild 501
+MISC ChangeLog 843 RMD160 0bce5a9fb1976500845130e6827f5eafea00a71f SHA1 320d4b158f310fdabb720773fd051fe5d89ae727 SHA256 1e3f7cd813b4ff08b10376d699a2450c2bb3af72ddddf3b2ea414ab309983297
+MD5 023a877e93a05d4f0a0e62aca93c7692 ChangeLog 843
+RMD160 0bce5a9fb1976500845130e6827f5eafea00a71f ChangeLog 843
+SHA256 1e3f7cd813b4ff08b10376d699a2450c2bb3af72ddddf3b2ea414ab309983297 ChangeLog 843
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
 MD5 7dc06ff9d3cee1a25edea6e97dc1acc7 files/digest-gensig-2.3 61
-MD5 f8a5df91ba912beed9e97ed0d8621352 files/digest-gensig-2.2 61
+RMD160 8831ed60e483ddb78fcafa7a285875ca6c9ec111 files/digest-gensig-2.3 61
+SHA256 906186844fb56bb673f6f2dfe0468456d8da21c48fc0f19abca8d6765815ce50 files/digest-gensig-2.3 61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFBUCkZ10xuJSrg3/sRAjb5AJ423ZIVcT7JUcBiIr5/uyRrRGFamgCfWF6Z
-TLKP7ECztp0vKNUQXDtYAoo=
-=Msj1
+iD8DBQFFnvPqViELBEf1JB0RAoz6AJ9lD+lWdO55yQ7z2c9q2L9CPlEwCgCfUOQz
+OmheTgV1dZsxLMSbFVQYHf0=
+=dJx1
 -----END PGP SIGNATURE-----
diff --git a/net-mail/gensig/files/digest-gensig-2.2 b/net-mail/gensig/files/digest-gensig-2.2
deleted file mode 100644
index 6a19b8efd541..000000000000
--- a/net-mail/gensig/files/digest-gensig-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a3cd659ffed9c32e027114534a27047 gensig-2.2.tar.gz 58008
diff --git a/net-mail/gensig/gensig-2.2.ebuild b/net-mail/gensig/gensig-2.2.ebuild
deleted file mode 100644
index 1743a38b49d3..000000000000
--- a/net-mail/gensig/gensig-2.2.ebuild
+++ /dev/null
@@ -1,16 +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/gensig/gensig-2.2.ebuild,v 1.7 2004/07/15 01:48:25 agriffis Exp $
-
-DESCRIPTION="Random ~/.signature generator"
-HOMEPAGE="http://www.geekthing.com/~robf/gensig/ChangeLog"
-SRC_URI="http://www.geekthing.com/~robf/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="virtual/libc"
-
-src_install () {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index f29e0cc47e95..24c616adb738 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -2,39 +2,19 @@
 Hash: SHA1
 
 DIST getmail-4.6.2.tar.gz 139831 RMD160 b3b4b7d834d39d921cef4c66f819f85b959d6bdc SHA1 fc22872a8f5896c81e1913fb0f87fece37360868 SHA256 a42dd7e9f36a68c4d75739bb35a67c1b907e3e8b3775e38e769fda64a0c2f7ef
-DIST getmail-4.6.3.tar.gz 140105 RMD160 bfa6b27b67d456ee48f9592e24f4d214c810a1c7 SHA1 22db01f77a803b623238c7af55bc51e3bf31f973 SHA256 20932e4bc5183faec6389baeb662971365875f906d51e231c07af17b864357ab
-DIST getmail-4.6.4.tar.gz 141053 RMD160 3edaec9e8e9f22b5d415821f1963a771eda8b7ae SHA1 a5b063435080bb2eb712a414909b725f5d0bc272 SHA256 d391fd9fbe9c56cbe7258bcba8d71195b1267c2492a4fe41e5eb1dda0a3b7277
-DIST getmail-4.6.5.tar.gz 142473 RMD160 d419b566fba0e17dc96bad081da0b73714ae9edb SHA1 7ac0ccbd83a75f7a7a9d61517515c34c3e9d34a2 SHA256 54bbf645be2b878e41c1fa00f5f0e7efdeac39d0d125d40f719878f1db20a5d3
-DIST getmail-4.6.6.tar.gz 143796 RMD160 dd053dac4b19caf38cb1a77625bdb13feb0eb65d SHA1 69d3e08e38f4d9f63abf030b826c8ebc77bbe695 SHA256 29b25539e165694fd0bb8f6a1b92537356f6fa77b6d1dbc49bc2346b22039339
 DIST getmail-4.6.7.tar.gz 143879 RMD160 8a6b7db919457173237ed44bfc329778ea4e23fe SHA1 cb60e1d058b1040f11dbbeddce5ce726727ed500 SHA256 e904e142c00aeaa9edb6c699e69049af64099e63833a29ceadfe9a6985bf73e8
 EBUILD getmail-4.6.2.ebuild 1572 RMD160 aafff100b9923b709ef2d8c4db26e36546e6fcad SHA1 00a05668634b84775634e72c807b05b7bf030228 SHA256 bdb2a6eba82901dd0e369b7b47b2bf08ceef802896a60314081615400d16878c
 MD5 5bbc1f0d340c34bd39722a25295c625a getmail-4.6.2.ebuild 1572
 RMD160 aafff100b9923b709ef2d8c4db26e36546e6fcad getmail-4.6.2.ebuild 1572
 SHA256 bdb2a6eba82901dd0e369b7b47b2bf08ceef802896a60314081615400d16878c getmail-4.6.2.ebuild 1572
-EBUILD getmail-4.6.3.ebuild 1575 RMD160 21bab24b165c9969fccc58cb2155b35833f86d92 SHA1 6fadc7c2acb2832a03825baa4c8434aa8241cd2c SHA256 ce02ce85c44f14dd8937b8aeef89b3ec9895962986c3a715920f5e68734c9c68
-MD5 0b6f91e1d47736ddc8c671dcf38b2230 getmail-4.6.3.ebuild 1575
-RMD160 21bab24b165c9969fccc58cb2155b35833f86d92 getmail-4.6.3.ebuild 1575
-SHA256 ce02ce85c44f14dd8937b8aeef89b3ec9895962986c3a715920f5e68734c9c68 getmail-4.6.3.ebuild 1575
-EBUILD getmail-4.6.4.ebuild 1575 RMD160 83fae637d1d0ed0d34e6a9a4a4e976a593ddac58 SHA1 1714f0f439d980944b54aea29c2875f3927020fc SHA256 d3a11a7c7a16006d3fb5738c23c44bec71e6038200c1568dedbeee27d62fab31
-MD5 096e964a791bf43181a736955990d1e1 getmail-4.6.4.ebuild 1575
-RMD160 83fae637d1d0ed0d34e6a9a4a4e976a593ddac58 getmail-4.6.4.ebuild 1575
-SHA256 d3a11a7c7a16006d3fb5738c23c44bec71e6038200c1568dedbeee27d62fab31 getmail-4.6.4.ebuild 1575
-EBUILD getmail-4.6.5.ebuild 1575 RMD160 be85c317b302761a414dbb04c3f4ee9d33b97332 SHA1 84806cd32d4f7b668ad57502974c9db39ff409ae SHA256 24923c5640d433b4908e8c443d336f376f4adb458adfa93ca405dbacaba5a4a2
-MD5 ad310243e48b928227b6d9b873339588 getmail-4.6.5.ebuild 1575
-RMD160 be85c317b302761a414dbb04c3f4ee9d33b97332 getmail-4.6.5.ebuild 1575
-SHA256 24923c5640d433b4908e8c443d336f376f4adb458adfa93ca405dbacaba5a4a2 getmail-4.6.5.ebuild 1575
-EBUILD getmail-4.6.6.ebuild 1575 RMD160 e8862624a25173ec2ede51fd4aa1a9efb675ec93 SHA1 d9a114d79eb1115c5a95b1c19f697e41a509f011 SHA256 25ef362e090b33e0d5ecd99bb29371ae79a485d5e0f7f72a70a982a86da12588
-MD5 844b0a0149e5d59d659f1e2534fa6a47 getmail-4.6.6.ebuild 1575
-RMD160 e8862624a25173ec2ede51fd4aa1a9efb675ec93 getmail-4.6.6.ebuild 1575
-SHA256 25ef362e090b33e0d5ecd99bb29371ae79a485d5e0f7f72a70a982a86da12588 getmail-4.6.6.ebuild 1575
 EBUILD getmail-4.6.7.ebuild 1575 RMD160 484a7b55873d7ad36787190ff07ccf897db840cc SHA1 09b32f5b66ffc495e8a95600bd83b5b2da661e16 SHA256 79860d36cd038b8d9a98f9d2a107a6cc794ff2fbe1451b51b12c0d149983b15b
 MD5 f6cd728177c5597d07c3fabde9d69b0a getmail-4.6.7.ebuild 1575
 RMD160 484a7b55873d7ad36787190ff07ccf897db840cc getmail-4.6.7.ebuild 1575
 SHA256 79860d36cd038b8d9a98f9d2a107a6cc794ff2fbe1451b51b12c0d149983b15b getmail-4.6.7.ebuild 1575
-MISC ChangeLog 17592 RMD160 03e0e3f657b0d5082560ac49d11d6b76dc589b0b SHA1 cbda3ab1d67e3bc94a529047c46f5b7096982d9a SHA256 0f9f0abf94f1725d1f70372656aa1b9adf407948def8a5faaec55bed30d5885f
-MD5 61d8a53976639d2b064d7ef4979adde8 ChangeLog 17592
-RMD160 03e0e3f657b0d5082560ac49d11d6b76dc589b0b ChangeLog 17592
-SHA256 0f9f0abf94f1725d1f70372656aa1b9adf407948def8a5faaec55bed30d5885f ChangeLog 17592
+MISC ChangeLog 17769 RMD160 b5532b6bbde544ccf9ba07d5c6f4f67628a73500 SHA1 702399bb1017d33acefdfd5f5e6ba84646c130dd SHA256 1201efaa73c7c6b433cdf1d42ad0fb923b0ac18a44741ea674199c07f648ca9c
+MD5 c09e686b746f103a97d994da8e17da8a ChangeLog 17769
+RMD160 b5532b6bbde544ccf9ba07d5c6f4f67628a73500 ChangeLog 17769
+SHA256 1201efaa73c7c6b433cdf1d42ad0fb923b0ac18a44741ea674199c07f648ca9c ChangeLog 17769
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -42,25 +22,13 @@ SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata
 MD5 64863526891f11fbb304580fe45496f1 files/digest-getmail-4.6.2 241
 RMD160 5bd3290f7c8d86be45824962fa485dfba6537af2 files/digest-getmail-4.6.2 241
 SHA256 31637a7790541fd549810a97059d8548474e66912c46087366ef28b2e6f91be6 files/digest-getmail-4.6.2 241
-MD5 6b147f3b70b9d271c5b4f7a06ad4e843 files/digest-getmail-4.6.3 241
-RMD160 e48688b478ddb8ee7c1bce4fb7f96d25414e0b07 files/digest-getmail-4.6.3 241
-SHA256 d9a946ed8f98c8017f933d2449a384aa2c0c7f251b5e9d555a3a461d7efe4537 files/digest-getmail-4.6.3 241
-MD5 eac85bc2200dfd14ec6066aaf81de61e files/digest-getmail-4.6.4 241
-RMD160 41df2e45d4a97f7b56b3e3123620126bc1f2501e files/digest-getmail-4.6.4 241
-SHA256 6cf04dd628b74c216c1b84036e8cd8dff834b32e61a5e479acb7214767f76320 files/digest-getmail-4.6.4 241
-MD5 34013f6807e44972e15795c9ca6a1d74 files/digest-getmail-4.6.5 241
-RMD160 78cf479769f186684bfa420686ebd5145f138548 files/digest-getmail-4.6.5 241
-SHA256 6d167f252846af2f202fbe629b5452280f90cc8d8977c69c66cca623b5d76618 files/digest-getmail-4.6.5 241
-MD5 3edcb0650df0146f19fb6676d5350261 files/digest-getmail-4.6.6 241
-RMD160 662cd3f0d50629e17177f907cd3ada59f8682298 files/digest-getmail-4.6.6 241
-SHA256 2949f7d941310cc4ca0c8d3a1dab8f4629aac55d038d1f42191f7083e8755ef0 files/digest-getmail-4.6.6 241
 MD5 1378739c52ca0c581f86b427cfcba975 files/digest-getmail-4.6.7 241
 RMD160 78c2f9db4f5290df628ef05b5b7f94a84a64aca5 files/digest-getmail-4.6.7 241
 SHA256 7e02209bd67919237a9814f37cc1d56e8186c48742596e17f17d342e6f4358b7 files/digest-getmail-4.6.7 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFno2XQlM6RnzZP+IRAiXMAKCiEp4aIeOFTY/YCNf5KllHJKV8LwCeMarQ
-5mydLvS+uwIzBzp3St/hh5k=
-=gntA
+iD8DBQFFnvReViELBEf1JB0RAkaVAJ0ez67CPCkpct9ni4VU/SPaFsgRRgCbBV9l
+4t+JivtMWGFGMRrQB2L1kcM=
+=Q8Lj
 -----END PGP SIGNATURE-----
diff --git a/net-mail/getmail/files/digest-getmail-4.6.3 b/net-mail/getmail/files/digest-getmail-4.6.3
deleted file mode 100644
index 61605eb7fcb4..000000000000
--- a/net-mail/getmail/files/digest-getmail-4.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 41d26d81d3e546161bda3530e0e836de getmail-4.6.3.tar.gz 140105
-RMD160 bfa6b27b67d456ee48f9592e24f4d214c810a1c7 getmail-4.6.3.tar.gz 140105
-SHA256 20932e4bc5183faec6389baeb662971365875f906d51e231c07af17b864357ab getmail-4.6.3.tar.gz 140105
diff --git a/net-mail/getmail/files/digest-getmail-4.6.4 b/net-mail/getmail/files/digest-getmail-4.6.4
deleted file mode 100644
index 4875f9f36e21..000000000000
--- a/net-mail/getmail/files/digest-getmail-4.6.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 724484f312bdca3bb92ab80db912c790 getmail-4.6.4.tar.gz 141053
-RMD160 3edaec9e8e9f22b5d415821f1963a771eda8b7ae getmail-4.6.4.tar.gz 141053
-SHA256 d391fd9fbe9c56cbe7258bcba8d71195b1267c2492a4fe41e5eb1dda0a3b7277 getmail-4.6.4.tar.gz 141053
diff --git a/net-mail/getmail/files/digest-getmail-4.6.5 b/net-mail/getmail/files/digest-getmail-4.6.5
deleted file mode 100644
index 13b4c4608100..000000000000
--- a/net-mail/getmail/files/digest-getmail-4.6.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bd630fe8b4df3cba78610b46bef99f7c getmail-4.6.5.tar.gz 142473
-RMD160 d419b566fba0e17dc96bad081da0b73714ae9edb getmail-4.6.5.tar.gz 142473
-SHA256 54bbf645be2b878e41c1fa00f5f0e7efdeac39d0d125d40f719878f1db20a5d3 getmail-4.6.5.tar.gz 142473
diff --git a/net-mail/getmail/files/digest-getmail-4.6.6 b/net-mail/getmail/files/digest-getmail-4.6.6
deleted file mode 100644
index ea4ede377310..000000000000
--- a/net-mail/getmail/files/digest-getmail-4.6.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b126f7491e321afbf7e465070dd2f863 getmail-4.6.6.tar.gz 143796
-RMD160 dd053dac4b19caf38cb1a77625bdb13feb0eb65d getmail-4.6.6.tar.gz 143796
-SHA256 29b25539e165694fd0bb8f6a1b92537356f6fa77b6d1dbc49bc2346b22039339 getmail-4.6.6.tar.gz 143796
diff --git a/net-mail/getmail/getmail-4.6.3.ebuild b/net-mail/getmail/getmail-4.6.3.ebuild
deleted file mode 100644
index e765137763bc..000000000000
--- a/net-mail/getmail/getmail-4.6.3.ebuild
+++ /dev/null
@@ -1,57 +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/getmail/getmail-4.6.3.ebuild,v 1.1 2006/06/24 14:09:33 ticho Exp $
-
-inherit distutils
-
-IUSE=""
-DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
-HOMEPAGE="http://pyropus.ca/software/getmail/"
-SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/python-2.3.3"
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-
-	if has_version "=net-mail/getmail-3*" ; then
-		mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4
-		mv ${D}/usr/bin/getmail_maildir ${D}/usr/bin/getmail_maildir4
-		mv ${D}/usr/bin/getmail_mbox ${D}/usr/bin/getmail_mbox4
-	fi
-
-	# handle docs the gentoo way
-	if [ ${P} != ${PF} ]; then
-		mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-	fi
-
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/share/doc/${PF}/*.html ${D}/usr/share/doc/${PF}/*.css ${D}/usr/share/doc/${PF}/html
-	gzip --silent ${D}/usr/share/doc/${PF}/*
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/getmailcore
-
-	if has_version "=net-mail/getmail-3*" ; then
-		echo
-		ewarn "An already installed instance of getmail v3 was detected. In order to"
-		ewarn "co-exist with it the three main scripts of getmail v4 were renamed to"
-		ewarn "getmail4, getmail_maildir4, getmail_mbox4."
-		echo
-	fi
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}
diff --git a/net-mail/getmail/getmail-4.6.4.ebuild b/net-mail/getmail/getmail-4.6.4.ebuild
deleted file mode 100644
index f36934105973..000000000000
--- a/net-mail/getmail/getmail-4.6.4.ebuild
+++ /dev/null
@@ -1,57 +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/getmail/getmail-4.6.4.ebuild,v 1.1 2006/09/29 08:01:17 ticho Exp $
-
-inherit distutils
-
-IUSE=""
-DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
-HOMEPAGE="http://pyropus.ca/software/getmail/"
-SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/python-2.3.3"
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-
-	if has_version "=net-mail/getmail-3*" ; then
-		mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4
-		mv ${D}/usr/bin/getmail_maildir ${D}/usr/bin/getmail_maildir4
-		mv ${D}/usr/bin/getmail_mbox ${D}/usr/bin/getmail_mbox4
-	fi
-
-	# handle docs the gentoo way
-	if [ ${P} != ${PF} ]; then
-		mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-	fi
-
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/share/doc/${PF}/*.html ${D}/usr/share/doc/${PF}/*.css ${D}/usr/share/doc/${PF}/html
-	gzip --silent ${D}/usr/share/doc/${PF}/*
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/getmailcore
-
-	if has_version "=net-mail/getmail-3*" ; then
-		echo
-		ewarn "An already installed instance of getmail v3 was detected. In order to"
-		ewarn "co-exist with it the three main scripts of getmail v4 were renamed to"
-		ewarn "getmail4, getmail_maildir4, getmail_mbox4."
-		echo
-	fi
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}
diff --git a/net-mail/getmail/getmail-4.6.5.ebuild b/net-mail/getmail/getmail-4.6.5.ebuild
deleted file mode 100644
index 8878cd656d8a..000000000000
--- a/net-mail/getmail/getmail-4.6.5.ebuild
+++ /dev/null
@@ -1,57 +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/getmail/getmail-4.6.5.ebuild,v 1.1 2006/10/21 23:59:50 ticho Exp $
-
-inherit distutils
-
-IUSE=""
-DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
-HOMEPAGE="http://pyropus.ca/software/getmail/"
-SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/python-2.3.3"
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-
-	if has_version "=net-mail/getmail-3*" ; then
-		mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4
-		mv ${D}/usr/bin/getmail_maildir ${D}/usr/bin/getmail_maildir4
-		mv ${D}/usr/bin/getmail_mbox ${D}/usr/bin/getmail_mbox4
-	fi
-
-	# handle docs the gentoo way
-	if [ ${P} != ${PF} ]; then
-		mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-	fi
-
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/share/doc/${PF}/*.html ${D}/usr/share/doc/${PF}/*.css ${D}/usr/share/doc/${PF}/html
-	gzip --silent ${D}/usr/share/doc/${PF}/*
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/getmailcore
-
-	if has_version "=net-mail/getmail-3*" ; then
-		echo
-		ewarn "An already installed instance of getmail v3 was detected. In order to"
-		ewarn "co-exist with it the three main scripts of getmail v4 were renamed to"
-		ewarn "getmail4, getmail_maildir4, getmail_mbox4."
-		echo
-	fi
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}
diff --git a/net-mail/getmail/getmail-4.6.6.ebuild b/net-mail/getmail/getmail-4.6.6.ebuild
deleted file mode 100644
index 5ccb31c77bf1..000000000000
--- a/net-mail/getmail/getmail-4.6.6.ebuild
+++ /dev/null
@@ -1,57 +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/getmail/getmail-4.6.6.ebuild,v 1.1 2006/12/12 16:43:55 ticho Exp $
-
-inherit distutils
-
-IUSE=""
-DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
-HOMEPAGE="http://pyropus.ca/software/getmail/"
-SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/python-2.3.3"
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-
-	if has_version "=net-mail/getmail-3*" ; then
-		mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4
-		mv ${D}/usr/bin/getmail_maildir ${D}/usr/bin/getmail_maildir4
-		mv ${D}/usr/bin/getmail_mbox ${D}/usr/bin/getmail_mbox4
-	fi
-
-	# handle docs the gentoo way
-	if [ ${P} != ${PF} ]; then
-		mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-	fi
-
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/share/doc/${PF}/*.html ${D}/usr/share/doc/${PF}/*.css ${D}/usr/share/doc/${PF}/html
-	gzip --silent ${D}/usr/share/doc/${PF}/*
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/getmailcore
-
-	if has_version "=net-mail/getmail-3*" ; then
-		echo
-		ewarn "An already installed instance of getmail v3 was detected. In order to"
-		ewarn "co-exist with it the three main scripts of getmail v4 were renamed to"
-		ewarn "getmail4, getmail_maildir4, getmail_mbox4."
-		echo
-	fi
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}
diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest
index f3ffa47bf536..b3cce01d3c61 100644
--- a/net-mail/grepmail/Manifest
+++ b/net-mail/grepmail/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bdbe71d4fda6aef62403a62fa039a7bf ChangeLog 3448
-MD5 701ca93f31d9210219c045bedcf86e66 files/digest-grepmail-5.30 65
-MD5 a0fee4a355f9dc42ce39685ab33eff43 files/digest-grepmail-5.30.32 67
+DIST grepmail-5.3032.tar.gz 527481
+EBUILD grepmail-5.30.32.ebuild 710 RMD160 8d34b37b478d866dbad149ff83f33e56307eb507 SHA1 a2a9380d2c0cac87838cb0655201b20880a317e0 SHA256 b2f18e5244bc8a6a8411f6fb895cd488bb567a127d472c011f24a4216d2853b1
 MD5 483f1eb164bb7868d89e9488b410dc0a grepmail-5.30.32.ebuild 710
-MD5 6dd083eb644b0494e631b6c0f37d7367 grepmail-5.30.ebuild 713
+RMD160 8d34b37b478d866dbad149ff83f33e56307eb507 grepmail-5.30.32.ebuild 710
+SHA256 b2f18e5244bc8a6a8411f6fb895cd488bb567a127d472c011f24a4216d2853b1 grepmail-5.30.32.ebuild 710
+MISC ChangeLog 3550 RMD160 1d7a2795e97edbf47255bbb1973c19f2908dc3ab SHA1 e1df2b2ee1ea25c9c040bced4ff4e4d04ff42054 SHA256 35510268991a825a2ccb6946226a5617883e9212781b4f6f11cc2bd5553aebc4
+MD5 f5c0d2192cc3366106cfc4a7ef1d78d3 ChangeLog 3550
+RMD160 1d7a2795e97edbf47255bbb1973c19f2908dc3ab ChangeLog 3550
+SHA256 35510268991a825a2ccb6946226a5617883e9212781b4f6f11cc2bd5553aebc4 ChangeLog 3550
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+MD5 a0fee4a355f9dc42ce39685ab33eff43 files/digest-grepmail-5.30.32 67
+RMD160 af64fe755bdace14ccdc8785bd700ec61651ef3e files/digest-grepmail-5.30.32 67
+SHA256 24bfe34c00fb11adcc8df360455fa3704e95c821fecf0c30af23a6c65d7f125e files/digest-grepmail-5.30.32 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD8J5EtG5z4I8BtQoRAqJpAJ9cLh4wxcbouk/6MnZyPohVsEfPQgCghSD6
-H10wazoRTbdfMjcsEsWlxv4=
-=DcU3
+iD8DBQFFnvS9ViELBEf1JB0RAh1/AJ9gP98lexMwBMiAZuaQF5JqgACnYwCcDOup
+DNeqG5fkOFrBv8sOS4wiV6I=
+=TjMg
 -----END PGP SIGNATURE-----
diff --git a/net-mail/grepmail/files/digest-grepmail-5.30 b/net-mail/grepmail/files/digest-grepmail-5.30
deleted file mode 100644
index 64cab93aa762..000000000000
--- a/net-mail/grepmail/files/digest-grepmail-5.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 445d8cc4ec7ef9cd7f3c26913505f796 grepmail-5.30.tar.gz 496037
diff --git a/net-mail/grepmail/grepmail-5.30.ebuild b/net-mail/grepmail/grepmail-5.30.ebuild
deleted file mode 100644
index 117db1444fa7..000000000000
--- a/net-mail/grepmail/grepmail-5.30.ebuild
+++ /dev/null
@@ -1,28 +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/grepmail/grepmail-5.30.ebuild,v 1.9 2006/02/13 14:57:19 mcummings Exp $
-
-inherit perl-app
-
-DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates."
-HOMEPAGE="http://grepmail.sourceforge.net/"
-SRC_URI="mirror://sourceforge/grepmail/${P}.tar.gz"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="x86 ppc ~amd64 sparc"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-perl/Inline
-	dev-perl/TimeDate
-	dev-perl/DateManip
-	virtual/perl-Digest-MD5
-	dev-perl/Mail-Mbox-MessageParser"
-
-RDEPEND=""
-
-src_compile () {
-	echo "" | perl-app_src_compile
-}
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 28b51fb14b10..71c606effe2b 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -18,28 +18,19 @@ MD5 9f3b0fb71f9437bcf73253609605915c files/imapsync-ssl.patch 990
 RMD160 ba5c0a1b8c6f767e8cfeddb874cc88bc55cc7ddd files/imapsync-ssl.patch 990
 SHA256 25c4afbb3a944b6481c59c17d78f06da641cd540489d952c74cbeb93601c590f files/imapsync-ssl.patch 990
 DIST imapsync-1.121.tgz 41591
-DIST imapsync-1.171.tgz 114666 RMD160 f988c5c91002fb3cefd1e8144b77696afd9a097c SHA1 845984835eb2c2e71c80e38cc8e27366ddfca422 SHA256 95c3ae41c50c54f3d281a5f7851b12d0cb5d9d745ca5c2dfb1b2474a4fc4129b
 DIST imapsync-1.182.tgz 116507 RMD160 3d03286a324d8f3497b548edb9427db3f1407feb SHA1 b246f22fbbd064d6161b1b7b788e4aefdabb11f7 SHA256 c9449c46332e21e98a7ec24017aaf3f1f96fab70d0e7e06855b51fc6e263cca3
 EBUILD imapsync-1.121.ebuild 1205 RMD160 649fda1c84ad39da65a0daad68b8d770f6e19800 SHA1 92ec84eedd3f7834ae783eb134a5ee8f591c2849 SHA256 f205e284801e99fd14534a2e6bb85825abe44f387cfb5cf5822aa6adc3b8a6d9
 MD5 9f6a154f562926eaa6e7c0544ec7604e imapsync-1.121.ebuild 1205
 RMD160 649fda1c84ad39da65a0daad68b8d770f6e19800 imapsync-1.121.ebuild 1205
 SHA256 f205e284801e99fd14534a2e6bb85825abe44f387cfb5cf5822aa6adc3b8a6d9 imapsync-1.121.ebuild 1205
-EBUILD imapsync-1.171-r1.ebuild 937 RMD160 2de5a0ae106e33ea86476ba282cbef27834ee9e8 SHA1 f122d0bac0f9f1706140657e600f7e8c1d5a98ca SHA256 b197d639fd44a3a98f0024c8135f67a7a152cdd4553d1896386ee00124bfc713
-MD5 c07d40dd073ed6a3cbfacc1bde75aeb4 imapsync-1.171-r1.ebuild 937
-RMD160 2de5a0ae106e33ea86476ba282cbef27834ee9e8 imapsync-1.171-r1.ebuild 937
-SHA256 b197d639fd44a3a98f0024c8135f67a7a152cdd4553d1896386ee00124bfc713 imapsync-1.171-r1.ebuild 937
-EBUILD imapsync-1.171.ebuild 910 RMD160 4901fe1e8d35c7214551757b4657c0e8806fa614 SHA1 49c1ebaefddd6aa54b958f2b5b97ce3b3ae87846 SHA256 10532c2ac47a98ff7e12734734d357f9459fad0678861d0dd8e6109ad6851051
-MD5 d3bfc0d48eb8369951b90ea9bf151ed8 imapsync-1.171.ebuild 910
-RMD160 4901fe1e8d35c7214551757b4657c0e8806fa614 imapsync-1.171.ebuild 910
-SHA256 10532c2ac47a98ff7e12734734d357f9459fad0678861d0dd8e6109ad6851051 imapsync-1.171.ebuild 910
 EBUILD imapsync-1.182.ebuild 939 RMD160 4ca759b93b08797d8273af37621bfcb0b5766296 SHA1 45717c867d0939ab6ac93ceb27c8d82aaef37dca SHA256 8e3ec17639e5b62b650de5cd76b18a80068d2a4c3dff937523b54c8542c01bf9
 MD5 68ee96fd9c1af7b987b5150fe2fb5c74 imapsync-1.182.ebuild 939
 RMD160 4ca759b93b08797d8273af37621bfcb0b5766296 imapsync-1.182.ebuild 939
 SHA256 8e3ec17639e5b62b650de5cd76b18a80068d2a4c3dff937523b54c8542c01bf9 imapsync-1.182.ebuild 939
-MISC ChangeLog 2448 RMD160 36ab2bd9b032116927833c43a050d5421f4628f9 SHA1 d1729eb5fcfb60605dcf55198aa6ab11415e16d1 SHA256 e2235633e845a6711cff657d80b3d0484b720dfd2f0222888ebc5b7556f3a0b2
-MD5 d6f355e414bc633c30eca3ebe93c7532 ChangeLog 2448
-RMD160 36ab2bd9b032116927833c43a050d5421f4628f9 ChangeLog 2448
-SHA256 e2235633e845a6711cff657d80b3d0484b720dfd2f0222888ebc5b7556f3a0b2 ChangeLog 2448
+MISC ChangeLog 2584 RMD160 bf4c6c35df81ecc0f4e36902f9dc524dc5cd01b4 SHA1 4b176dc986f1865a358c0b02255fc6d2b0640671 SHA256 5d49c61dd4e558f71e174691f6c369f8a652fca5d94b8e3b07c2436ad23c3d5e
+MD5 ba41dd8627e56e4c691602855a78b200 ChangeLog 2584
+RMD160 bf4c6c35df81ecc0f4e36902f9dc524dc5cd01b4 ChangeLog 2584
+SHA256 5d49c61dd4e558f71e174691f6c369f8a652fca5d94b8e3b07c2436ad23c3d5e ChangeLog 2584
 MISC metadata.xml 253 RMD160 27155323556701c38934832ee9970634a088bb5b SHA1 6c1c3f1fda858526944eb427f5bec79da119da0d SHA256 38f168ad00f8b59ee75efaf002d442b2793f280dafc70955c70920e974c6dfe0
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 RMD160 27155323556701c38934832ee9970634a088bb5b metadata.xml 253
@@ -47,19 +38,13 @@ SHA256 38f168ad00f8b59ee75efaf002d442b2793f280dafc70955c70920e974c6dfe0 metadata
 MD5 162952d278fd23763fa7810cad178625 files/digest-imapsync-1.121 62
 RMD160 81847fdac5524a4281586c71ebc7b53b71eafba4 files/digest-imapsync-1.121 62
 SHA256 7f5f83a31622c8d99f52af5a768a41270ff60d3a3c4f583feff7086df170cc04 files/digest-imapsync-1.121 62
-MD5 7961eed2d4932fb551b44a91a25f1e6c files/digest-imapsync-1.171 235
-RMD160 7977fd739b01057174cd911aaf60d0c2a54819ef files/digest-imapsync-1.171 235
-SHA256 0fd07148df450d38e49d2d869974b9dcfc81c65d9d28b319a0c8b8aedbedaeec files/digest-imapsync-1.171 235
-MD5 7961eed2d4932fb551b44a91a25f1e6c files/digest-imapsync-1.171-r1 235
-RMD160 7977fd739b01057174cd911aaf60d0c2a54819ef files/digest-imapsync-1.171-r1 235
-SHA256 0fd07148df450d38e49d2d869974b9dcfc81c65d9d28b319a0c8b8aedbedaeec files/digest-imapsync-1.171-r1 235
 MD5 cae72cd8c763c7bc3d849d7e43533ecb files/digest-imapsync-1.182 235
 RMD160 b45a0c344a4e0523ba8e3f33ef6a247deda427e7 files/digest-imapsync-1.182 235
 SHA256 fd89a4bd4b04e0a4168bcc6afc11033ead3081ca28a69fc1d12546dcee7db32d files/digest-imapsync-1.182 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFe9SjQlM6RnzZP+IRAmRKAJ91L5bmz1WJwRy4COaqEOvc5vebDACeOz/L
-/wp4xsS5DK2GyZLMnj+z2Sg=
-=Co0r
+iD8DBQFFnvT1ViELBEf1JB0RAuHUAJ9c6kooblb6yxWI/UL06aKrwGsLrQCfWQDm
+ahbs/nbPFJiA8a+WVbEDQFA=
+=IcFL
 -----END PGP SIGNATURE-----
diff --git a/net-mail/imapsync/files/digest-imapsync-1.171 b/net-mail/imapsync/files/digest-imapsync-1.171
deleted file mode 100644
index 5b7b80299884..000000000000
--- a/net-mail/imapsync/files/digest-imapsync-1.171
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ffabc2d4545b945f77fc6d6c36674e47 imapsync-1.171.tgz 114666
-RMD160 f988c5c91002fb3cefd1e8144b77696afd9a097c imapsync-1.171.tgz 114666
-SHA256 95c3ae41c50c54f3d281a5f7851b12d0cb5d9d745ca5c2dfb1b2474a4fc4129b imapsync-1.171.tgz 114666
diff --git a/net-mail/imapsync/files/digest-imapsync-1.171-r1 b/net-mail/imapsync/files/digest-imapsync-1.171-r1
deleted file mode 100644
index 5b7b80299884..000000000000
--- a/net-mail/imapsync/files/digest-imapsync-1.171-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ffabc2d4545b945f77fc6d6c36674e47 imapsync-1.171.tgz 114666
-RMD160 f988c5c91002fb3cefd1e8144b77696afd9a097c imapsync-1.171.tgz 114666
-SHA256 95c3ae41c50c54f3d281a5f7851b12d0cb5d9d745ca5c2dfb1b2474a4fc4129b imapsync-1.171.tgz 114666
diff --git a/net-mail/imapsync/imapsync-1.171-r1.ebuild b/net-mail/imapsync/imapsync-1.171-r1.ebuild
deleted file mode 100644
index 4994f013e1ed..000000000000
--- a/net-mail/imapsync/imapsync-1.171-r1.ebuild
+++ /dev/null
@@ -1,41 +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/imapsync/imapsync-1.171-r1.ebuild,v 1.3 2006/12/10 09:34:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another."
-HOMEPAGE="http://www.linux-france.org/prj/"
-SRC_URI="http://www.linux-france.org/prj/imapsync/dist/${P}.tgz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/Mail-IMAPClient-2.1.4"
-
-RDEPEND="${DEPEND}
-	virtual/perl-Digest-MD5
-	dev-perl/Net-SSLeay
-	virtual/perl-MIME-Base64
-	dev-perl/TermReadKey
-	dev-perl/IO-Socket-SSL"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make failed"
-	dobin imapsync
-
-	dodoc CREDITS ChangeLog FAQ README TODO || \
-		die "dodoc failed"
-
-}
diff --git a/net-mail/imapsync/imapsync-1.171.ebuild b/net-mail/imapsync/imapsync-1.171.ebuild
deleted file mode 100644
index d3a9c87837a4..000000000000
--- a/net-mail/imapsync/imapsync-1.171.ebuild
+++ /dev/null
@@ -1,40 +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/imapsync/imapsync-1.171.ebuild,v 1.2 2006/12/10 09:34:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another."
-HOMEPAGE="http://www.linux-france.org/prj/"
-SRC_URI="http://www.linux-france.org/prj/imapsync/dist/${P}.tgz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/Mail-IMAPClient-2.1.4"
-
-RDEPEND="${DEPEND}
-	virtual/perl-Digest-MD5
-	dev-perl/Net-SSLeay
-	virtual/perl-MIME-Base64
-	dev-perl/Digest-HMAC"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make failed"
-	dobin imapsync
-
-	dodoc CREDITS ChangeLog FAQ README TODO || \
-		die "dodoc failed"
-
-}
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index fb8910453097..3d079038000b 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,32 +1,34 @@
-DIST isync-0.9.2.tar.gz 110170 size 110170
-DIST isync-1.0.1.tar.gz 165617 size 165617
-DIST isync-1.0.2.tar.gz 166143 RMD160 66161696761a8ab41431748ec7b442035c1d97c8 SHA256 cfc8a9c449fbcbb5230fa6832e9411baf8fc55f4163d405c666571c38725f48a size 166143
-EBUILD isync-0.9.2.ebuild 725 RMD160 d8aeef982d596f99c2ee46bf328d8afa527d87c5 SHA1 c678a226b2568b36a3aa602dd97475cf40ce1bc2 SHA256 f5d02e4bbcc876552fc12cde8b2cb112779cc4af4e3ad4552aadc6c9bafbc4dd size 725
-MD5 bc981b11b815676cd74767e55ae79622 isync-0.9.2.ebuild 725
-RMD160 d8aeef982d596f99c2ee46bf328d8afa527d87c5 isync-0.9.2.ebuild 725
-SHA256 f5d02e4bbcc876552fc12cde8b2cb112779cc4af4e3ad4552aadc6c9bafbc4dd isync-0.9.2.ebuild 725
-EBUILD isync-1.0.1.ebuild 732 RMD160 d1cf6186faebb4a18be3082fb4e27cedd184f3ad SHA1 b00edf93cd26f3c3248e2ef20a54ff259f3dff36 SHA256 eb977daa1f93c1014c9ac491559c58ec6ff688a88e7e9b85e7b783dd7b96836f size 732
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST isync-1.0.1.tar.gz 165617
+DIST isync-1.0.2.tar.gz 166143 RMD160 66161696761a8ab41431748ec7b442035c1d97c8 SHA256 cfc8a9c449fbcbb5230fa6832e9411baf8fc55f4163d405c666571c38725f48a
+EBUILD isync-1.0.1.ebuild 732 RMD160 d1cf6186faebb4a18be3082fb4e27cedd184f3ad SHA1 b00edf93cd26f3c3248e2ef20a54ff259f3dff36 SHA256 eb977daa1f93c1014c9ac491559c58ec6ff688a88e7e9b85e7b783dd7b96836f
 MD5 027842a1b2abb0e05efe0bf30f3e5c93 isync-1.0.1.ebuild 732
 RMD160 d1cf6186faebb4a18be3082fb4e27cedd184f3ad isync-1.0.1.ebuild 732
 SHA256 eb977daa1f93c1014c9ac491559c58ec6ff688a88e7e9b85e7b783dd7b96836f isync-1.0.1.ebuild 732
-EBUILD isync-1.0.2.ebuild 744 RMD160 7b865c9fae4021fe3961e7e4aaa90f73e37b871d SHA1 a7e2c7850a71c01f8a2f344a280e307c701c72b7 SHA256 6e9a04e53667d9ec33f4fd609c8b40407f44b6e3d8d58cd3a987d0520ce244d1 size 744
+EBUILD isync-1.0.2.ebuild 744 RMD160 7b865c9fae4021fe3961e7e4aaa90f73e37b871d SHA1 a7e2c7850a71c01f8a2f344a280e307c701c72b7 SHA256 6e9a04e53667d9ec33f4fd609c8b40407f44b6e3d8d58cd3a987d0520ce244d1
 MD5 29c07385ea5a51dd4dbeed05277fe731 isync-1.0.2.ebuild 744
 RMD160 7b865c9fae4021fe3961e7e4aaa90f73e37b871d isync-1.0.2.ebuild 744
 SHA256 6e9a04e53667d9ec33f4fd609c8b40407f44b6e3d8d58cd3a987d0520ce244d1 isync-1.0.2.ebuild 744
-MISC ChangeLog 1135 RMD160 60f3736b9e1270799f4cf2b2a7241ddb563fe3df SHA1 5fb9a8010949d2097aa2bb934302d52a9c09bc5b SHA256 62988d5306c141c1dad70137a70ab8c38ebb72b29e8213b6544f96c4274d3c31 size 1135
-MD5 e2cb8fda1c2245317fa453c525acbd82 ChangeLog 1135
-RMD160 60f3736b9e1270799f4cf2b2a7241ddb563fe3df ChangeLog 1135
-SHA256 62988d5306c141c1dad70137a70ab8c38ebb72b29e8213b6544f96c4274d3c31 ChangeLog 1135
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 size 161
+MISC ChangeLog 1235 RMD160 52c7a307d5c3d0ec6bf0efeb2fdfd1a50007ac54 SHA1 4b88e5de814f5b744b57296ba9f7f09de366a979 SHA256 96cdb0f17040b4b959281f020850484152298475a8f9f05fc43c60291fb70c6d
+MD5 ab14159eb964743c15f1c5ba7f71a361 ChangeLog 1235
+RMD160 52c7a307d5c3d0ec6bf0efeb2fdfd1a50007ac54 ChangeLog 1235
+SHA256 96cdb0f17040b4b959281f020850484152298475a8f9f05fc43c60291fb70c6d ChangeLog 1235
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 594d3cc4335697d6d62d627f06af10a5 files/digest-isync-0.9.2 63
-RMD160 1b21b2536532fec9d838cf29c88bd200c0aee5d2 files/digest-isync-0.9.2 63
-SHA256 6e5834a504dd326b22a5a1db931414d600fbfa59b6db0150cc0c993f8743fc56 files/digest-isync-0.9.2 63
 MD5 182ac15031d136cf470f17070243749d files/digest-isync-1.0.1 63
 RMD160 b2768b2695d4d48138aea6b8b217601841aafc01 files/digest-isync-1.0.1 63
 SHA256 c19cf3f5b771eeb763e71a6c25d76bc448fb71df75c20a7132954f9924151a86 files/digest-isync-1.0.1 63
 MD5 e475d4e6e15ba8487c9d22940a967a04 files/digest-isync-1.0.2 235
 RMD160 6aaeadafb363b2e955eba1a6189b8e69f62fc20a files/digest-isync-1.0.2 235
 SHA256 78be790d52e65906b8ace359b03c675958f05df59653c18b5c608376a7890968 files/digest-isync-1.0.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnvUnViELBEf1JB0RAkt7AJ958BLZha4A49fJnbhNd2Gc96REowCeKZhP
+ixvzAJlzo0LnWqgeS8jOq+I=
+=yjrD
+-----END PGP SIGNATURE-----
diff --git a/net-mail/isync/files/digest-isync-0.9.2 b/net-mail/isync/files/digest-isync-0.9.2
deleted file mode 100644
index be06bbba86f3..000000000000
--- a/net-mail/isync/files/digest-isync-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b15353372ecd2212d8ea61df82e50f6 isync-0.9.2.tar.gz 110170
diff --git a/net-mail/isync/isync-0.9.2.ebuild b/net-mail/isync/isync-0.9.2.ebuild
deleted file mode 100644
index 0fdb8a4a7379..000000000000
--- a/net-mail/isync/isync-0.9.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/isync/isync-0.9.2.ebuild,v 1.4 2005/01/03 23:35:31 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-SRC_URI="mirror://sourceforge/isync/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile () {
-	econf --with-prefix=${D} \
-	$(use_with ssl) \
-	|| die 'Configure failed'
-	emake || die "Error compiling"
-}
-
-src_install()
-{
-	einstall || die 'Error installing'
-	dodoc README COPYING AUTHORS ChangeLog NEWS TODO isyncrc.sample
-}
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 0dd72a86ad29..d7aa2b24ade9 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -2,24 +2,19 @@
 Hash: SHA1
 
 DIST lbdb_0.30.tar.gz 104620 RMD160 289c2a9395523bac08bc36510894b14fb3b18057 SHA1 d137c11857ea23e9689e0f93d876ec107a7b8467 SHA256 ca1f708dcc320203463c8e0e1008bb6c85e455c821eec41919283466853258cd
-DIST lbdb_0.31.tar.gz 106983 RMD160 f17ac7300c79ff1986c4d0a3e997a712123dcd53 SHA1 90cc0e0a9a8c4bfe5c9b8a42034b26d1c292b90f SHA256 c722a1778e833e08f7f31c0538d8ac872eeb614f8fe8f010428b8f1fe9f2d0ce
 DIST lbdb_0.34.tar.gz 108053 RMD160 111df9683719a5464cf6551b58cbb04c0c6d07c4 SHA1 6abcd6f3c441c09538720e28a872c573c9efe03d SHA256 78a8fe2eb80e5382581ef571078cd7e46f0fec303b0a5f9fba96bd5b5fc94c73
 EBUILD lbdb-0.30.ebuild 1405 RMD160 cc5fc64e25583127ffa7954e5105fbe73681aefd SHA1 b8e5df0db8fca3f8a8aa82f8f4e77ea748e12de7 SHA256 83c25a27b9f9712f56fb5c2b23a7bafb12f795c78660825a5db696bbe1bbe6c6
 MD5 4105580608896816f465446264cd1661 lbdb-0.30.ebuild 1405
 RMD160 cc5fc64e25583127ffa7954e5105fbe73681aefd lbdb-0.30.ebuild 1405
 SHA256 83c25a27b9f9712f56fb5c2b23a7bafb12f795c78660825a5db696bbe1bbe6c6 lbdb-0.30.ebuild 1405
-EBUILD lbdb-0.31.ebuild 1409 RMD160 8d0343a149a70c5f05dc044aaa626550164b7726 SHA1 6b456da07ad569175d429bb59e6166bd616414e0 SHA256 8cd2dc0c76eccc476278a2cefc09f0b678dfa4406a7fd17ddc35c7f4a0f29134
-MD5 07f54688e747b9a59be88d47280f87ce lbdb-0.31.ebuild 1409
-RMD160 8d0343a149a70c5f05dc044aaa626550164b7726 lbdb-0.31.ebuild 1409
-SHA256 8cd2dc0c76eccc476278a2cefc09f0b678dfa4406a7fd17ddc35c7f4a0f29134 lbdb-0.31.ebuild 1409
 EBUILD lbdb-0.34.ebuild 1476 RMD160 b8563eea9bcf7492b084989b2218764746f2e701 SHA1 b67846a19a2f292e94bfafe6c1a708b58c2684fc SHA256 752e31e7dcc721aa9466f1ccaabfd1c507df8ddea375c9ee49f38d62b6d71469
 MD5 569e3dfaa1d23c9720831b883a62a56c lbdb-0.34.ebuild 1476
 RMD160 b8563eea9bcf7492b084989b2218764746f2e701 lbdb-0.34.ebuild 1476
 SHA256 752e31e7dcc721aa9466f1ccaabfd1c507df8ddea375c9ee49f38d62b6d71469 lbdb-0.34.ebuild 1476
-MISC ChangeLog 3947 RMD160 6e30d6e660648fd7ea973a1c17acac668e3444f6 SHA1 9b065331bf552e2542de81a174f82d5dc92d06d1 SHA256 4583753c28772d66b2f1aa892c51623e6330346be19e555eadd3645d2d1498d6
-MD5 7342bba220d0c299cb38878bf7028bc5 ChangeLog 3947
-RMD160 6e30d6e660648fd7ea973a1c17acac668e3444f6 ChangeLog 3947
-SHA256 4583753c28772d66b2f1aa892c51623e6330346be19e555eadd3645d2d1498d6 ChangeLog 3947
+MISC ChangeLog 4050 RMD160 7f7e4436d910b377bc6079b2eb24ce999ef65d56 SHA1 f368c05a5c0e6ec3a4c39bc1a9cb13329578dec5 SHA256 2bef0233739fc9075e89c2094b48a3caef34ef7a10caafe5bea661d29c228f61
+MD5 621658674e83a9efca767e5073c7f6b8 ChangeLog 4050
+RMD160 7f7e4436d910b377bc6079b2eb24ce999ef65d56 ChangeLog 4050
+SHA256 2bef0233739fc9075e89c2094b48a3caef34ef7a10caafe5bea661d29c228f61 ChangeLog 4050
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -27,16 +22,13 @@ SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata
 MD5 994c8b9c551dc83d4ecf582f2f004ebc files/digest-lbdb-0.30 229
 RMD160 0732e280b773ed20bdd3880a89d3659d8001ca8a files/digest-lbdb-0.30 229
 SHA256 0668a79a3ecb6b5cd4ef94dd2a0d285eb15b155ee137bd9b002aa368e6f0bda5 files/digest-lbdb-0.30 229
-MD5 fa9c4ab83ad6b1d104b7867c2fccc05c files/digest-lbdb-0.31 229
-RMD160 757a0b4484daad38b4ec979cb18f22a5706207aa files/digest-lbdb-0.31 229
-SHA256 faf385961962530225d75357f38a31527d1076af1f285ad0cf0e7c6513423733 files/digest-lbdb-0.31 229
 MD5 2294c2b85c8e26d15251d905b5c88f4c files/digest-lbdb-0.34 229
 RMD160 0cfd454303561abadcb8a758d2bac9453e6eb475 files/digest-lbdb-0.34 229
 SHA256 0b2a5891cb4c4fc54de98fe54c2ed6c2a199ad191cb63c6cca65b2ec4023b3db files/digest-lbdb-0.34 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFfFEEV3J2n04EauwRAr0gAJ99myW3/XNOivjAHAe2SVsBQDGrJgCgiVwa
-N7h4aZB/OuZmqgqcx1Sxi6A=
-=Se4v
+iD8DBQFFnvVtViELBEf1JB0RAurbAJ0XLyUW6SA/W3lTLdRIhDePWXmPHQCfZHHW
+kT7qlRQx8lOzFJAYnCMkWEk=
+=/+2K
 -----END PGP SIGNATURE-----
diff --git a/net-mail/lbdb/files/digest-lbdb-0.31 b/net-mail/lbdb/files/digest-lbdb-0.31
deleted file mode 100644
index ea0c783417e9..000000000000
--- a/net-mail/lbdb/files/digest-lbdb-0.31
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 740bb8510017d24ac23fd2b948d25f2e lbdb_0.31.tar.gz 106983
-RMD160 f17ac7300c79ff1986c4d0a3e997a712123dcd53 lbdb_0.31.tar.gz 106983
-SHA256 c722a1778e833e08f7f31c0538d8ac872eeb614f8fe8f010428b8f1fe9f2d0ce lbdb_0.31.tar.gz 106983
diff --git a/net-mail/lbdb/lbdb-0.31.ebuild b/net-mail/lbdb/lbdb-0.31.ebuild
deleted file mode 100644
index bfbab8bc7058..000000000000
--- a/net-mail/lbdb/lbdb-0.31.ebuild
+++ /dev/null
@@ -1,51 +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/lbdb/lbdb-0.31.ebuild,v 1.2 2006/12/02 21:25:15 beandog Exp $
-
-inherit eutils
-
-IUSE="pda ldap finger nis abook crypt evo"
-
-MY_P=${P/-/_}
-DESCRIPTION="Little Brother database"
-SRC_URI="http://www.spinnaker.de/debian/${MY_P}.tar.gz"
-HOMEPAGE="http://www.spinnaker.de/lbdb/"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-DEPEND="mail-client/mutt
-	dev-lang/perl
-	evo? ( mail-client/evolution )
-	finger? ( net-misc/netkit-fingerd )
-	abook? ( app-misc/abook )
-	crypt? ( app-crypt/gnupg )
-	nis? ( net-nds/yp-tools )"
-RDEPEND="pda? ( dev-perl/p5-Palm )
-	ldap? ( dev-perl/perl-ldap )"
-
-src_compile() {
-	local evoversion
-
-	if useq evo ; then
-		evoversion=$(best_version mail-client/evolution)
-		evoversion=${evoversion##mail-client/evolution-}
-		M_PATH="/usr/libexec/evolution/${evoversion:0:3}/:${PATH}"
-	else
-		M_PATH=${PATH}
-	fi
-
-	PATH=${M_PATH} econf $(use_with finger) \
-		$(use_with abook) \
-		$(use_with nis ypcat) \
-		$(use_with crypt gpg) \
-		$(use_with evo evolution-addressbook-export) \
-		--without-pgp5 --without-pgp \
-		--without-niscat --without-addr-email --with-getent \
-		--libdir=/usr/$(get_libdir)/lbdb || die
-	emake || die
-}
-
-src_install () {
-	make install_prefix=${D} install || die
-	dodoc README INSTALL COPYING NEWS TODO
-}
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 4bc00040ad63..c64a25139bc5 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX aliases 809 RMD160 ebca326bf7ed746a545f2bfa8f2839a5ecf1debb SHA1 7d8d134e21df6bea63518953dfa97fc0aab32f3c SHA256 41fffc461dfa6a8c36564698b4d9eaabaf280dbc446b3e7f3af4820930e687d6
 MD5 a5623a262865054bd43c914e740a2e52 files/aliases 809
 RMD160 ebca326bf7ed746a545f2bfa8f2839a5ecf1debb files/aliases 809
@@ -14,60 +17,32 @@ AUX mailcap 2235 RMD160 cb84573fec9e1c78f43a8eed2f9a0898c3817097 SHA1 f640500221
 MD5 df65e6e407e866c7e6721e79f731ae6a files/mailcap 2235
 RMD160 cb84573fec9e1c78f43a8eed2f9a0898c3817097 files/mailcap 2235
 SHA256 99dcf0c43b9aa26625a8ff7e375e13f85cc0d677a93e90da62a868d8a2162cda files/mailcap 2235
-EBUILD mailbase-0.00-r4.ebuild 773 RMD160 a5ea5424643b5db91be04f5c3a2446bb7637dc2a SHA1 359b004d3097f4893edcf58ef1ba62885d01169f SHA256 80481c2616542e0278488f99c4b78706a6bd9b68862fe2b70ab5ef1064dc11a4
-MD5 78fc96c16b9dc1d4902c62927e664ce9 mailbase-0.00-r4.ebuild 773
-RMD160 a5ea5424643b5db91be04f5c3a2446bb7637dc2a mailbase-0.00-r4.ebuild 773
-SHA256 80481c2616542e0278488f99c4b78706a6bd9b68862fe2b70ab5ef1064dc11a4 mailbase-0.00-r4.ebuild 773
-EBUILD mailbase-0.00-r5.ebuild 877 RMD160 737702258dd45a5a20feff4d4eb395c42f00176b SHA1 e047aac56f0683d1155cdd1197b552852495f8b8 SHA256 c42836baf2213c57eb4ced56972096ea18a930063ba61595497bf858f3016e6a
-MD5 f224d58950c57b4f07888966ad00cd9a mailbase-0.00-r5.ebuild 877
-RMD160 737702258dd45a5a20feff4d4eb395c42f00176b mailbase-0.00-r5.ebuild 877
-SHA256 c42836baf2213c57eb4ced56972096ea18a930063ba61595497bf858f3016e6a mailbase-0.00-r5.ebuild 877
 EBUILD mailbase-0.00-r6.ebuild 902 RMD160 2a0887fe87b21bf866960e13b0993277635a00a1 SHA1 82ee57841dc4f24b1825e3633d076c5840af46f3 SHA256 85b9ef182cab5b47f93ee6817eee55734b82bb12c04bafb21f1ccd25212ddcbe
 MD5 d70889cf9ee474b30325789a31c253a9 mailbase-0.00-r6.ebuild 902
 RMD160 2a0887fe87b21bf866960e13b0993277635a00a1 mailbase-0.00-r6.ebuild 902
 SHA256 85b9ef182cab5b47f93ee6817eee55734b82bb12c04bafb21f1ccd25212ddcbe mailbase-0.00-r6.ebuild 902
-EBUILD mailbase-0.00-r7.ebuild 1922 RMD160 eda26cf43d04e212de1c999d1cd4cf20bd9a7975 SHA1 85d129164dfda26634eebfbcb395e0e95405e1b5 SHA256 16de1b102a85d24595022614c4965f1e4c6d23b4750f8948b0831fc98c659b00
-MD5 a5d2b893cb09235e3c253d9d0c50f3fa mailbase-0.00-r7.ebuild 1922
-RMD160 eda26cf43d04e212de1c999d1cd4cf20bd9a7975 mailbase-0.00-r7.ebuild 1922
-SHA256 16de1b102a85d24595022614c4965f1e4c6d23b4750f8948b0831fc98c659b00 mailbase-0.00-r7.ebuild 1922
-EBUILD mailbase-0.00-r8.ebuild 2262 RMD160 ef75115dad9223c5695b3b7b11fd6d582fb6788e SHA1 b59cb82a6b0c319acba7d69fd0a637004430942f SHA256 b918b1e2793be534145b63fe001db72e5f42200a13eefc58c6b89a0170ee9fab
-MD5 9199352cf76278406a943618dd4a54ef mailbase-0.00-r8.ebuild 2262
-RMD160 ef75115dad9223c5695b3b7b11fd6d582fb6788e mailbase-0.00-r8.ebuild 2262
-SHA256 b918b1e2793be534145b63fe001db72e5f42200a13eefc58c6b89a0170ee9fab mailbase-0.00-r8.ebuild 2262
-EBUILD mailbase-0.00-r9.ebuild 2428 RMD160 b734bb2f144b1de2fe198b6382219ce6fc4202eb SHA1 6affc809f00161ef1b9afc158d34b36c57dc5bd1 SHA256 84c751531ad0770ab4ee17552c707463bac0ed986d5694df4c3481088c327337
-MD5 49503f6e00aba90637484ef6fd9af542 mailbase-0.00-r9.ebuild 2428
-RMD160 b734bb2f144b1de2fe198b6382219ce6fc4202eb mailbase-0.00-r9.ebuild 2428
-SHA256 84c751531ad0770ab4ee17552c707463bac0ed986d5694df4c3481088c327337 mailbase-0.00-r9.ebuild 2428
 EBUILD mailbase-1.ebuild 1560 RMD160 7eba9df1a63a254a81b270b1b93b3248e9b34e8e SHA1 befc2e205fd4961101dc61f2c5bc16ff8d387879 SHA256 ab1a8a531c1eafb93acdc5ad99a4569370fb544e0c0d1b3c8a1a4bfa655c13ca
 MD5 a5548bfbccd47cbc45bff692e91af614 mailbase-1.ebuild 1560
 RMD160 7eba9df1a63a254a81b270b1b93b3248e9b34e8e mailbase-1.ebuild 1560
 SHA256 ab1a8a531c1eafb93acdc5ad99a4569370fb544e0c0d1b3c8a1a4bfa655c13ca mailbase-1.ebuild 1560
-MISC ChangeLog 7816 RMD160 cce8f08d737b40c0278cb753e37f36d68d1e3543 SHA1 f05b76d30dc4952c90a37cb8c9b833318704ae17 SHA256 7e3f4da6ed6c389a28aa8817367d74e897efd1af69e505e574dae42fb0b0a52e
-MD5 fb986c1cbf543ade6f219a091f3dc73e ChangeLog 7816
-RMD160 cce8f08d737b40c0278cb753e37f36d68d1e3543 ChangeLog 7816
-SHA256 7e3f4da6ed6c389a28aa8817367d74e897efd1af69e505e574dae42fb0b0a52e ChangeLog 7816
+MISC ChangeLog 8032 RMD160 bc789b9269d00e5a43ce77899c3782a09cc2bf33 SHA1 84c5b4b6262184a44950fb64a3f7c48dacf69357 SHA256 6e5827c39322d3cf653058ff3ed9a6077fe6aa218019fd67a558ed5c291025a0
+MD5 96bd38fd1a905e1447cbcbb1a749f9dc ChangeLog 8032
+RMD160 bc789b9269d00e5a43ce77899c3782a09cc2bf33 ChangeLog 8032
+SHA256 6e5827c39322d3cf653058ff3ed9a6077fe6aa218019fd67a558ed5c291025a0 ChangeLog 8032
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mailbase-0.00-r4 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mailbase-0.00-r4 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mailbase-0.00-r4 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mailbase-0.00-r5 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mailbase-0.00-r5 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mailbase-0.00-r5 1
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mailbase-0.00-r6 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mailbase-0.00-r6 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mailbase-0.00-r6 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mailbase-0.00-r7 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mailbase-0.00-r7 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mailbase-0.00-r7 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mailbase-0.00-r8 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mailbase-0.00-r8 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mailbase-0.00-r8 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mailbase-0.00-r9 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mailbase-0.00-r9 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mailbase-0.00-r9 1
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mailbase-1 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mailbase-1 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mailbase-1 1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnvZUViELBEf1JB0RArp+AJ4umKsrMrcEz+lwK+utkMd3pR3FHACeOmBY
+Vt0iRhYwXtaPzrjDZPpd+38=
+=X6/8
+-----END PGP SIGNATURE-----
diff --git a/net-mail/mailbase/files/digest-mailbase-0.00-r4 b/net-mail/mailbase/files/digest-mailbase-0.00-r4
deleted file mode 100644
index 8b137891791f..000000000000
--- a/net-mail/mailbase/files/digest-mailbase-0.00-r4
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/net-mail/mailbase/files/digest-mailbase-0.00-r5 b/net-mail/mailbase/files/digest-mailbase-0.00-r5
deleted file mode 100644
index 8b137891791f..000000000000
--- a/net-mail/mailbase/files/digest-mailbase-0.00-r5
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/net-mail/mailbase/files/digest-mailbase-0.00-r7 b/net-mail/mailbase/files/digest-mailbase-0.00-r7
deleted file mode 100644
index 8b137891791f..000000000000
--- a/net-mail/mailbase/files/digest-mailbase-0.00-r7
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/net-mail/mailbase/files/digest-mailbase-0.00-r8 b/net-mail/mailbase/files/digest-mailbase-0.00-r8
deleted file mode 100644
index 8b137891791f..000000000000
--- a/net-mail/mailbase/files/digest-mailbase-0.00-r8
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/net-mail/mailbase/files/digest-mailbase-0.00-r9 b/net-mail/mailbase/files/digest-mailbase-0.00-r9
deleted file mode 100644
index 8b137891791f..000000000000
--- a/net-mail/mailbase/files/digest-mailbase-0.00-r9
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/net-mail/mailbase/mailbase-0.00-r4.ebuild b/net-mail/mailbase/mailbase-0.00-r4.ebuild
deleted file mode 100644
index d548abaac44b..000000000000
--- a/net-mail/mailbase/mailbase-0.00-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-0.00-r4.ebuild,v 1.18 2005/01/18 13:26:24 kumba Exp $
-
-S=${WORKDIR}
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa mips"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins ${FILESDIR}/aliases
-	insinto /etc/
-	doins ${FILESDIR}/mailcap
-
-	keepdir /var/spool/mail
-	chown root:mail ${D}/var/spool/mail
-	dosym /var/spool/mail /var/mail
-}
-
-pkg_postinst() {
-	if [ ! -d ${ROOT}/var/spool/mail ]
-	then
-		mkdir -p ${ROOT}/var/spool/mail
-		chown root:mail ${ROOT}/var/spool/mail
-	fi
-}
diff --git a/net-mail/mailbase/mailbase-0.00-r5.ebuild b/net-mail/mailbase/mailbase-0.00-r5.ebuild
deleted file mode 100644
index 2b3c2e8a1489..000000000000
--- a/net-mail/mailbase/mailbase-0.00-r5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-0.00-r5.ebuild,v 1.18 2005/01/18 13:26:24 kumba Exp $
-
-S="${WORKDIR}"
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 mips ia64"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins ${FILESDIR}/aliases
-	insinto /etc/
-	doins ${FILESDIR}/mailcap
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 1777 /var/spool/mail
-	dosym /var/spool/mail /var/mail
-}
-
-pkg_postinst() {
-	if [ ! -d ${ROOT}/var/spool/mail ]
-	then
-		mkdir -p ${ROOT}/var/spool/mail
-	fi
-
-	# Always set these to close bug #8029.
-	chown root:mail ${ROOT}/var/spool/mail
-	chmod 1777 ${ROOT}/var/spool/mail
-}
diff --git a/net-mail/mailbase/mailbase-0.00-r7.ebuild b/net-mail/mailbase/mailbase-0.00-r7.ebuild
deleted file mode 100644
index 4ec47b09860c..000000000000
--- a/net-mail/mailbase/mailbase-0.00-r7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-0.00-r7.ebuild,v 1.2 2005/02/10 23:02:29 ferdy Exp $
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}
-
-pkg_setup() {
-	local filestoremove=0;
-	local lineorig=`head -n 1 ${FILESDIR}/common-pamd`
-	local lineold=""
-
-	einfo "Checking for possible file collisions..."
-
-	for i in pop pop3 pop3s pops imap imap4 imap4s imaps;
-	do
-		if [[ -e ${ROOT}/etc/pam.d/${i} ]]
-		then
-			lineold="`head -n 1 ${ROOT}/etc/pam.d/${i}`"
-
-			if [[ "${lineorig}" != "${lineold}" ]]
-			then
-				ewarn "${ROOT}/etc/pam.d/${i} exists and wasn't provided by mailbase"
-				(( filestoremove++ ))
-			fi
-		fi
-	done
-
-	if [[ filestoremove -gt 0 ]]
-	then
-		echo
-		einfo "Those files listed above have to be removed in order to"
-		einfo " install this version of mailbase."
-		echo
-		ewarn "If you edited them, remember to backup and when restoring make"
-		ewarn " sure the first line in each file is:"
-		einfo ${lineorig}
-		die "Can't be installed, files will collide"
-	else
-		einfo "... everything looks ok"
-	fi
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins ${FILESDIR}/aliases
-	insinto /etc/
-	doins ${FILESDIR}/mailcap
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 0775 /var/spool/mail
-	dosym /var/spool/mail /var/mail
-
-	dodir /etc/pam.d/
-	for i in pop pop3 pop3d pops imap imap4 imap4s imaps;
-	do
-		cp ${FILESDIR}/common-pamd ${D}/etc/pam.d/${i}
-	done
-}
-
-pkg_postinst() {
-	if [ ! -d ${ROOT}/var/spool/mail ]
-	then
-		mkdir -p ${ROOT}/var/spool/mail
-	fi
-
-	# Always set these to close bug #8029.
-	chown root:mail ${ROOT}/var/spool/mail
-	chmod 0775 ${ROOT}/var/spool/mail
-}
diff --git a/net-mail/mailbase/mailbase-0.00-r8.ebuild b/net-mail/mailbase/mailbase-0.00-r8.ebuild
deleted file mode 100644
index 475f31411e00..000000000000
--- a/net-mail/mailbase/mailbase-0.00-r8.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-0.00-r8.ebuild,v 1.11 2005/04/06 19:01:01 corsair Exp $
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~ppc-macos s390 sparc x86"
-IUSE="pam"
-
-DEPEND=""
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if use pam;
-	then
-		local filestoremove=0;
-		local lineorig=`head -n 1 ${FILESDIR}/common-pamd`
-		local lineold=""
-
-		einfo "Checking for possible file collisions..."
-
-		for i in pop pop3 pop3s pops imap imap4 imap4s imaps;
-		do
-			if [[ -e ${ROOT}/etc/pam.d/${i} ]]
-			then
-				lineold="`head -n 1 ${ROOT}/etc/pam.d/${i}`"
-
-				if [[ "${lineorig}" != "${lineold}" ]]
-				then
-					ewarn "${ROOT}/etc/pam.d/${i} exists and wasn't provided by mailbase"
-					(( filestoremove++ ))
-				fi
-			fi
-		done
-
-		if [[ filestoremove -gt 0 ]]
-		then
-			echo
-			einfo "Those files listed above have to be removed in order to"
-			einfo " install this version of mailbase."
-			echo
-			ewarn "If you edited them, remember to backup and when restoring make"
-			ewarn " sure the first line in each file is:"
-			einfo ${lineorig}
-			die "Can't be installed, files will collide"
-		else
-			einfo "... everything looks ok"
-		fi
-	fi
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins ${FILESDIR}/aliases
-	insinto /etc/
-	doins ${FILESDIR}/mailcap
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 0775 /var/spool/mail
-	dosym /var/spool/mail /var/mail
-
-	if use pam;
-	then
-		insinto /etc/pam.d/
-
-		# pop file and its symlinks
-		newins ${FILESDIR}/common-pamd pop
-		dosym /etc/pam.d/pop /etc/pam.d/pop3
-		dosym /etc/pam.d/pop /etc/pam.d/pop3s
-		dosym /etc/pam.d/pop /etc/pam.d/pops
-
-		# imap file and its symlinks
-		newins ${FILESDIR}/common-pamd imap
-		dosym /etc/pam.d/imap /etc/pam.d/imap4
-		dosym /etc/pam.d/imap /etc/pam.d/imap4s
-		dosym /etc/pam.d/imap /etc/pam.d/imaps
-	fi
-}
-
-pkg_postinst() {
-	if [ ! -d ${ROOT}/var/spool/mail ]
-	then
-		mkdir -p ${ROOT}/var/spool/mail
-	fi
-
-	# Always set these to close bug #8029.
-	chown root:mail ${ROOT}/var/spool/mail
-	chmod 0775 ${ROOT}/var/spool/mail
-}
diff --git a/net-mail/mailbase/mailbase-0.00-r9.ebuild b/net-mail/mailbase/mailbase-0.00-r9.ebuild
deleted file mode 100644
index 4cc95881f42d..000000000000
--- a/net-mail/mailbase/mailbase-0.00-r9.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-0.00-r9.ebuild,v 1.11 2005/07/29 21:01:36 matsuu Exp $
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
-IUSE="pam"
-
-DEPEND=""
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if use pam;
-	then
-		local filestoremove=0;
-		local lineorig=`head -n 1 ${FILESDIR}/common-pamd`
-		local lineold=""
-
-		einfo "Checking for possible file collisions..."
-
-		for i in pop pop3 pop3s pops imap imap4 imap4s imaps;
-		do
-			if [[ -e ${ROOT}/etc/pam.d/${i} ]]
-			then
-				lineold="`head -n 1 ${ROOT}/etc/pam.d/${i}`"
-
-				if [[ "${lineorig}" != "${lineold}" ]]
-				then
-					ewarn "${ROOT}/etc/pam.d/${i} exists and wasn't provided by mailbase"
-					(( filestoremove++ ))
-				fi
-			fi
-		done
-
-		if [[ filestoremove -gt 0 ]]
-		then
-			echo
-			einfo "Those files listed above have to be removed in order to"
-			einfo " install this version of mailbase."
-			echo
-			ewarn "If you edited them, remember to backup and when restoring make"
-			ewarn " sure the first line in each file is:"
-			einfo ${lineorig}
-			die "Can't be installed, files will collide"
-		else
-			einfo "... everything looks ok"
-		fi
-	fi
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins ${FILESDIR}/aliases
-	insinto /etc/
-	doins ${FILESDIR}/mailcap
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 0775 /var/spool/mail
-	dosym /var/spool/mail /var/mail
-
-	if use pam;
-	then
-		insinto /etc/pam.d/
-
-		# pop file and its symlinks
-		newins ${FILESDIR}/common-pamd pop
-		dosym /etc/pam.d/pop /etc/pam.d/pop3
-		dosym /etc/pam.d/pop /etc/pam.d/pop3s
-		dosym /etc/pam.d/pop /etc/pam.d/pops
-
-		# imap file and its symlinks
-		newins ${FILESDIR}/common-pamd imap
-		dosym /etc/pam.d/imap /etc/pam.d/imap4
-		dosym /etc/pam.d/imap /etc/pam.d/imap4s
-		dosym /etc/pam.d/imap /etc/pam.d/imaps
-	fi
-}
-
-pkg_postinst() {
-	if [ "$(stat -c%a ${ROOT}/var/spool/mail/)" != "775" ] ; then
-		echo
-		ewarn
-		ewarn "Your ${ROOT}/var/spool/mail/ directory permissions differ from"
-		ewarn "  those which mailbase set when you first installed it (0775)."
-		ewarn "  If you did not change them on purpose, consider running:"
-		ewarn
-		echo -e "\tchmod 0775 ${ROOT}/var/spool/mail/"
-		echo
-	fi
-}
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index c5ba491cc95b..c231b35a15e5 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mail.rc 271 RMD160 aed3edf9939427b4a9c602daa0851b829634e088 SHA1 25ed72daf07c3914491731532c2b7df597e55387 SHA256 b75b4e7770be8014baceb59a768697b72db9850fc07be8897a5ac851f169329c
 MD5 eb67c156401bde48c7d5a23a0bd960df files/mail.rc 271
 RMD160 aed3edf9939427b4a9c602daa0851b829634e088 files/mail.rc 271
@@ -35,25 +38,25 @@ MD5 d3019ee356eb19b3ef156ba338b92873 files/mailutils-getline.diff 667
 RMD160 731f7e4af498ef0ab0d800fe5d7ab387061594b6 files/mailutils-getline.diff 667
 SHA256 3a7e33585aa82ff8a151b46ae9d89b8f388ae65d784d4cecbeb43a24c11e0fc0 files/mailutils-getline.diff 667
 DIST mailutils-0.6.tar.bz2 2025327 RMD160 a5f7df9e363ee461135f3c7336a5877f124284ec SHA1 dc9b50aa8e22a6c84e295499ff6ac2871ccf8fb7 SHA256 a76114866ddb705dbc6a841ef8b7f603ef34640bc8d9652ccac14bafddb95a8c
-EBUILD mailutils-0.6-r2.ebuild 2916 RMD160 bf424097fecebdc0d10812e49fb15a8a30664eea SHA1 87c5dafffca3e134bb19c5050a81e04ed0d61c2f SHA256 dca91d939a19b442f78781f07b9515a3c6dd57c606274f09f9842263acf52f37
-MD5 bc2c3fcd6cb673c4080f18facb6690ab mailutils-0.6-r2.ebuild 2916
-RMD160 bf424097fecebdc0d10812e49fb15a8a30664eea mailutils-0.6-r2.ebuild 2916
-SHA256 dca91d939a19b442f78781f07b9515a3c6dd57c606274f09f9842263acf52f37 mailutils-0.6-r2.ebuild 2916
 EBUILD mailutils-0.6-r3.ebuild 3003 RMD160 e9dc046700d2a0702480b5265fac9808e221a888 SHA1 1b2a5bd2419e056d4aed6906021052a87035206a SHA256 0eab50063a4e15d8287ec5a89b700293e607df091c7add9c780c54ce07bc727f
 MD5 6a599ad7de926a45b898a520bcfcde2a mailutils-0.6-r3.ebuild 3003
 RMD160 e9dc046700d2a0702480b5265fac9808e221a888 mailutils-0.6-r3.ebuild 3003
 SHA256 0eab50063a4e15d8287ec5a89b700293e607df091c7add9c780c54ce07bc727f mailutils-0.6-r3.ebuild 3003
-MISC ChangeLog 3884 RMD160 7278950e0454581362546ef874ad613ac4d86d2d SHA1 f0b10155894f191045bccc54864deeeb182988c0 SHA256 f7ce18d2fcf2e689ec4dc0cd81ce1222f9a73350cff302d4f256e40b05f2956b
-MD5 ee813b8483bb89b9e2210db9b215b9b8 ChangeLog 3884
-RMD160 7278950e0454581362546ef874ad613ac4d86d2d ChangeLog 3884
-SHA256 f7ce18d2fcf2e689ec4dc0cd81ce1222f9a73350cff302d4f256e40b05f2956b ChangeLog 3884
+MISC ChangeLog 3996 RMD160 dde22c395a107be4b743b43b641611c5ea991633 SHA1 334a6c07fd2c36e3a3c60bf43186531305e67f8d SHA256 5d227b92e37bbe38761744fbb425d2265c9067621db1e483cc303559bce81674
+MD5 0709fe90832f9d15f32827cf6130d34d ChangeLog 3996
+RMD160 dde22c395a107be4b743b43b641611c5ea991633 ChangeLog 3996
+SHA256 5d227b92e37bbe38761744fbb425d2265c9067621db1e483cc303559bce81674 ChangeLog 3996
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 e3ad82c6c73e4f4c8a788447cf85d929 files/digest-mailutils-0.6-r2 247
-RMD160 90bf24323b52c32941bf6e84a7368cc37e18a3d9 files/digest-mailutils-0.6-r2 247
-SHA256 f9109bfd40322b43245db52aed61d056cd1fa3c05cf434a72aaf97d38930f4c0 files/digest-mailutils-0.6-r2 247
 MD5 e3ad82c6c73e4f4c8a788447cf85d929 files/digest-mailutils-0.6-r3 247
 RMD160 90bf24323b52c32941bf6e84a7368cc37e18a3d9 files/digest-mailutils-0.6-r3 247
 SHA256 f9109bfd40322b43245db52aed61d056cd1fa3c05cf434a72aaf97d38930f4c0 files/digest-mailutils-0.6-r3 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnvZbViELBEf1JB0RApbuAJ4y0ETE7M86ifZ1GPRFhnyAfBzkHgCfdWkZ
+xBXgG2sXukoszJVccEYE3BE=
+=PndM
+-----END PGP SIGNATURE-----
diff --git a/net-mail/mailutils/files/digest-mailutils-0.6-r2 b/net-mail/mailutils/files/digest-mailutils-0.6-r2
deleted file mode 100644
index 87d314e8df50..000000000000
--- a/net-mail/mailutils/files/digest-mailutils-0.6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13e38442893a24f16798e4b5f634ba7d mailutils-0.6.tar.bz2 2025327
-RMD160 a5f7df9e363ee461135f3c7336a5877f124284ec mailutils-0.6.tar.bz2 2025327
-SHA256 a76114866ddb705dbc6a841ef8b7f603ef34640bc8d9652ccac14bafddb95a8c mailutils-0.6.tar.bz2 2025327
diff --git a/net-mail/mailutils/mailutils-0.6-r2.ebuild b/net-mail/mailutils/mailutils-0.6-r2.ebuild
deleted file mode 100644
index f439fc711f61..000000000000
--- a/net-mail/mailutils/mailutils-0.6-r2.ebuild
+++ /dev/null
@@ -1,95 +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/mailutils/mailutils-0.6-r2.ebuild,v 1.3 2006/11/23 16:07:44 vivo Exp $
-
-inherit eutils
-DESCRIPTION="A useful collection of mail servers, clients, and filters."
-HOMEPAGE="http://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="http://ftp.gnu.org/gnu/mailutils/${P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha ~ppc ~sparc x86"
-IUSE="mailwrapper nls pam mysql postgres gdbm"
-PROVIDE="virtual/mailx"
-DEPEND="!virtual/mailx
-	!mail-client/nmh
-	!mail-client/elm
-	dev-util/guile
-	gdbm? ( sys-libs/gdbm )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	nls? ( sys-devel/gettext )
-	virtual/mta"
-
-pkg_setup() {
-	# Default to MySQL if USE="mysql postgres', bug #58162.
-	if use mysql && use postgres; then
-		echo
-		ewarn "You have both 'mysql' and 'postgres' in your USE flags."
-		ewarn "Portage will build this package with MySQL support."
-		echo
-		ewarn "If this is not what you want; please hit Control-C now;"
-		ewarn "change you USE flags then emerge this package again."
-		echo
-		ewarn "Waiting 30 seconds before continuing..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	fi
-}
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-mh-Makefile.in.patch
-	epatch ${FILESDIR}/${PN}-IDEF0954-IDEF0955.patch
-	epatch ${FILESDIR}/${PN}-IDEF0956.patch
-	epatch ${FILESDIR}/${PN}-IDEF0957.patch
-	epatch ${FILESDIR}/${PN}-getline.diff
-	epatch ${FILESDIR}/${PN}-SQLinjection.patch
-	epatch ${FILESDIR}/${P}-imap4d-format-string.patch
-}
-
-src_compile() {
-
-	local myconf="--localstatedir=/var --sharedstatedir=/var --enable-mh-utils"
-
-	# bug in autoconf logic treats both --with and --without as set,
-	# so we cannot do use_with
-	# use mysql && myconf="${myconf} --with-mysql"
-	# use postgres && myconf="${myconf} --with-postgres"
-	if use mysql && use postgres; then
-		einfo "build with MySQL support."
-		myconf="${myconf} --with-mysql"
-	elif use mysql; then
-		einfo "build with MySQL support."
-		myconf="${myconf} --with-mysql"
-	elif use postgres; then
-		einfo "build with PotsgreSQL support."
-		myconf="${myconf} --with-postgres"
-	fi
-
-	# do not disable-sendmail for postfix user w/o mailwrapper, bug #44249.
-	mymta=$(best_version virtual/mta)
-	mymta=${mymta%-[0-9]*}
-	mymta=${mymta##*\/}
-	if ! use mailwrapper && [ "$mymta" == "postfix" ]; then
-		myconf="${myconf} --enable-sendmail"
-		einfo "My MTA is: $mymta"
-		einfo "enable-sendmail"
-	else
-		myconf="${myconf} --disable-sendmail"
-		einfo "My MTA is: $mymta"
-		einfo "disable-sendmail"
-	fi
-
-	myconf="${myconf} $(use_enable nls) $(use_enable pam) $(use_enable gdbm)"
-	econf ${myconf} || die "configure failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	# mail.rc stolen from mailx, resolve bug #37302.
-	insinto /etc
-	doins "${FILESDIR}/mail.rc"
-}
diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
index 7a0bc237e6cc..107cbf8ee25f 100644
--- a/net-mail/mairix/Manifest
+++ b/net-mail/mairix/Manifest
@@ -2,24 +2,19 @@
 Hash: SHA1
 
 DIST mairix-0.17.1.tar.gz 129235 RMD160 f1a9fc5c93a4d9818d4b6c033f23b1b1edc9f264 SHA256 5b7d5ccd5778bc1f7da6a870aefd91f07ab11b50d883eaee56a6e1f40ef52b5e
-DIST mairix-0.18.tar.gz 151168 RMD160 42e1961edc5e56951681e8c15ad0959fa7a8eed2 SHA256 4a2c230f0c6a6ca6ea31a428464ce1cd57d5309b3ab25b8134b648bebdcf6ee9
 DIST mairix-0.19.tar.gz 152430 RMD160 4713fc0e1d427ad2a450566530804742c96d71d1 SHA1 6fd7e92ff8701a30159a23c64cca1d96658a0944 SHA256 fc6f36c5c64e06a7d866a62abc79ddce2911d4909dbdf4ac735a795b74b36e2b
 EBUILD mairix-0.17.1.ebuild 1012 RMD160 67e2a2d2c17e9fc062544246a8d3c9e82169f439 SHA1 12a144896cd9423f97ba6ab759e1fe46bed946a4 SHA256 2a97909e631c7f5dc7a71bea2e96c8a036c3f15af25ad8c8c4dc97eb2a0db6b0
 MD5 0b719c85cd348f3afd32ba7d0d03b416 mairix-0.17.1.ebuild 1012
 RMD160 67e2a2d2c17e9fc062544246a8d3c9e82169f439 mairix-0.17.1.ebuild 1012
 SHA256 2a97909e631c7f5dc7a71bea2e96c8a036c3f15af25ad8c8c4dc97eb2a0db6b0 mairix-0.17.1.ebuild 1012
-EBUILD mairix-0.18.ebuild 1253 RMD160 5087282dda1d4cb7a306ff8ef80591896c7af533 SHA1 dfc724627c45f1c9864a0ac1ef2046d25d29f332 SHA256 7a48f2d4af0c192686427de4972f9809d9134851aeb6c6eef81cbcecbdb08f74
-MD5 0ae0969043a246f081211216db47a88d mairix-0.18.ebuild 1253
-RMD160 5087282dda1d4cb7a306ff8ef80591896c7af533 mairix-0.18.ebuild 1253
-SHA256 7a48f2d4af0c192686427de4972f9809d9134851aeb6c6eef81cbcecbdb08f74 mairix-0.18.ebuild 1253
 EBUILD mairix-0.19.ebuild 1160 RMD160 85740159254743b2de4ce35fd778cce66a91d0ea SHA1 c3578e90606bb876a6e45cab9a1e71a2360395f0 SHA256 eb6e6f1e971b9dc28154aa1e9e72974b58d8f5b59e784fa152435c02817e54c8
 MD5 d77e1d9ed911f11ba1cfbf1d98d5340c mairix-0.19.ebuild 1160
 RMD160 85740159254743b2de4ce35fd778cce66a91d0ea mairix-0.19.ebuild 1160
 SHA256 eb6e6f1e971b9dc28154aa1e9e72974b58d8f5b59e784fa152435c02817e54c8 mairix-0.19.ebuild 1160
-MISC ChangeLog 2671 RMD160 573629e8cfa2e64d28ae13435832d7bfcebd4a15 SHA1 f0711db6a61e362f65f98d2574a2856185222b7e SHA256 f8f4fe143bcf3a97fb74fe8f201a4cf25b883e729b2555b2cdc2e83bf05bde41
-MD5 18ce43727732f1704397209aed2ed147 ChangeLog 2671
-RMD160 573629e8cfa2e64d28ae13435832d7bfcebd4a15 ChangeLog 2671
-SHA256 f8f4fe143bcf3a97fb74fe8f201a4cf25b883e729b2555b2cdc2e83bf05bde41 ChangeLog 2671
+MISC ChangeLog 2776 RMD160 7856fa19e09100fe9d57fc32056d20903e805331 SHA1 4681a82545872059d5af49e3766eeef4f856fb08 SHA256 4cbe50521b4c6242a8a5127705ead1944be43be4d7563098ec3a5fcca0da8e7f
+MD5 32062b467b230aba2995eef168b1fabf ChangeLog 2776
+RMD160 7856fa19e09100fe9d57fc32056d20903e805331 ChangeLog 2776
+SHA256 4cbe50521b4c6242a8a5127705ead1944be43be4d7563098ec3a5fcca0da8e7f ChangeLog 2776
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -27,16 +22,13 @@ SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata
 MD5 b2389a606c11a4ee4c79c2767fdff411 files/digest-mairix-0.17.1 241
 RMD160 6a015539658147155db23dc1349cf5e95bc0b570 files/digest-mairix-0.17.1 241
 SHA256 93b13e390a9ebd3c86190568ee01cdb2c00922900a2781c656a94b6c96305e62 files/digest-mairix-0.17.1 241
-MD5 6870dafa7fc988a0c55d090080df201b files/digest-mairix-0.18 235
-RMD160 7b552ce55b326c447040c2746b385696488223e4 files/digest-mairix-0.18 235
-SHA256 322918f99702cc5e6845801bfc7c00754746228ec2450ee5c5cf738bbb0362c8 files/digest-mairix-0.18 235
 MD5 85d1ae39ef23b80c8bb5c3319f1b67b6 files/digest-mairix-0.19 235
 RMD160 75b76fdd3575b32a8896a691277c90055b470128 files/digest-mairix-0.19 235
 SHA256 df589d33bc579c15071e4893909ddcdaac8043bb789fbfdf1edd1ee477fe8ff4 files/digest-mairix-0.19 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFE5zkaV3J2n04EauwRAntwAKC/EAaQbX74IPkSUFZCLyISnkVV6wCgmRdQ
-qbT/baTgt9RpU4uVPxQtDSE=
-=I730
+iD8DBQFFnvb7ViELBEf1JB0RAoO4AJ477kMwcrF+pWOVunNZeAf/n3oY+wCfUv4B
+ZAw5EhsyWj+I5jRgWhqk7Vw=
+=rmTB
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mairix/files/digest-mairix-0.18 b/net-mail/mairix/files/digest-mairix-0.18
deleted file mode 100644
index d737cb0e8f40..000000000000
--- a/net-mail/mairix/files/digest-mairix-0.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea9f19b5e80dcdfd56dd2da64b879e47 mairix-0.18.tar.gz 151168
-RMD160 42e1961edc5e56951681e8c15ad0959fa7a8eed2 mairix-0.18.tar.gz 151168
-SHA256 4a2c230f0c6a6ca6ea31a428464ce1cd57d5309b3ab25b8134b648bebdcf6ee9 mairix-0.18.tar.gz 151168
diff --git a/net-mail/mairix/mairix-0.18.ebuild b/net-mail/mairix/mairix-0.18.ebuild
deleted file mode 100644
index b0009059eca7..000000000000
--- a/net-mail/mairix/mairix-0.18.ebuild
+++ /dev/null
@@ -1,48 +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/mairix/mairix-0.18.ebuild,v 1.2 2006/05/15 16:03:43 tove Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Indexes and searches Maildir/MH folders"
-HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
-SRC_URI="http://www.rpcurnow.force9.co.uk/mairix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86"
-
-#IUSE="zlib bzip2"
-IUSE=""
-
-#RDEPEND="zlib? ( sys-libs/zlib )
-#	bzip2? ( app-arch/bzip2 )"
-RDEPEND="sys-libs/zlib
-	app-arch/bzip2"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-src_unpack() {
-	unpack ${A}
-
-	# econf would fail with unknown options.
-	# Now it only prints "Unrecognized option".
-	sed -i -e "/^[[:space:]]*bad_options=yes/d" "${S}"/configure || die "sed failed"
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	econf --enable-gzip-mbox --enable-bzip-mbox|| die "configure failed."
-#		$(use_enable zlib gzip-mbox) \
-#		$(use_enable bzip2 bzip-mbox) || die "configure failed."
-
-	emake  all || die "make failed."
-}
-
-src_install() {
-	dobin mairix || die "dobin failed"
-	doman mairix.1 mairixrc.5 || die "doman failed"
-	dodoc NEWS README dotmairixrc.eg
-}
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index 0d95879af7d9..348bcd3b4d7a 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -1,6 +1,26 @@
-MD5 60797ff2fda75e65bdf29f54e313ecfa ChangeLog 1320
-MD5 bdb2ee01b75cb77540058778d853d6dc mboxgrep-0.7.3.ebuild 754
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST mboxgrep-0.7.9.tar.gz 76067
+EBUILD mboxgrep-0.7.9.ebuild 655 RMD160 164ac56aecba0ea8e9afc4b22dc0bb6a8ab66e3d SHA1 298f7c56c086fbc919b487b980e74edc42238a92 SHA256 154d6a6dd8f68d7414413588d563200e57c89f09948113161847f5adf63a302c
 MD5 90aef4677b1b669707b95485405768cf mboxgrep-0.7.9.ebuild 655
+RMD160 164ac56aecba0ea8e9afc4b22dc0bb6a8ab66e3d mboxgrep-0.7.9.ebuild 655
+SHA256 154d6a6dd8f68d7414413588d563200e57c89f09948113161847f5adf63a302c mboxgrep-0.7.9.ebuild 655
+MISC ChangeLog 1427 RMD160 c60913bd519557c9167af7f86b3866694daab31d SHA1 0b490fd6dab76a3148f2fa537138473173b03896 SHA256 92d89fde5c69ca9efe975a11d60c4cc7e1b9f14dd74a35b1366550d4d99b7b99
+MD5 ef5206b67257fe1890e14391f626b312 ChangeLog 1427
+RMD160 c60913bd519557c9167af7f86b3866694daab31d ChangeLog 1427
+SHA256 92d89fde5c69ca9efe975a11d60c4cc7e1b9f14dd74a35b1366550d4d99b7b99 ChangeLog 1427
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 43e2cb38fa892eb6cc542ad5b1bb153a files/digest-mboxgrep-0.7.3 65
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
 MD5 c61b01f55bdbda6508d64d75f53848b9 files/digest-mboxgrep-0.7.9 65
+RMD160 d5690ed1666dc2b32d4a06bda504dc2aef2a907f files/digest-mboxgrep-0.7.9 65
+SHA256 849240192acc54b13bb7e3bbc895c1f8acc9e5d7f91c1bb9a3c33f61723f3f35 files/digest-mboxgrep-0.7.9 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnvapViELBEf1JB0RAou+AJ9E0cI/XwZIAA16JN5s7rr2SBP8tQCfcvUi
+XrDpIKBcu6bQey7vCP20Ze4=
+=3GYa
+-----END PGP SIGNATURE-----
diff --git a/net-mail/mboxgrep/files/digest-mboxgrep-0.7.3 b/net-mail/mboxgrep/files/digest-mboxgrep-0.7.3
deleted file mode 100644
index cc2d49029707..000000000000
--- a/net-mail/mboxgrep/files/digest-mboxgrep-0.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ef5b71b0254022f3e7eb3975baa998e mboxgrep-0.7.3.tar.gz 50288
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild
deleted file mode 100644
index 6f12514239e1..000000000000
--- a/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild
+++ /dev/null
@@ -1,32 +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/mboxgrep/mboxgrep-0.7.3.ebuild,v 1.15 2004/07/23 14:52:49 tomk Exp $
-
-DESCRIPTION="Grep for mbox files"
-SRC_URI="mirror://sourceforge/mboxgrep/${P}.tar.gz"
-HOMEPAGE="http://mboxgrep.sf.net"
-
-DEPEND="virtual/libc"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-	dodoc ChangeLog NEWS TODO README
-}
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index f41b7d8e8281..1adc822c9289 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -7,42 +7,26 @@ RMD160 7a10b05009d7930d5edf7d37bb633a7eb490baf0 files/popa3d-initrc 479
 SHA256 2fc9aeeb1818d7a5fca2f72212767118c6b23d432d1d2550b82cc99b5ada3711 files/popa3d-initrc 479
 DIST popa3d-0.5.9-maildir-2.diff.gz 3227
 DIST popa3d-0.6.3-vname-2.diff.gz 947 RMD160 c29c88357694b9243964b8eca32ce0cd49db5be2 SHA1 109dddd64653edd5e3b05229ff55b643040e645e SHA256 12c157142650801cf4ca534350b332eeb5d16ca329bce06f3fca5b5f0e13d7c2
-DIST popa3d-0.6.4.1.tar.gz 32061
 DIST popa3d-1.0.2.tar.gz 32848 RMD160 7cde1e5876b44644ded3ff2287c19ae7520ba409 SHA1 85779cfc657050352b3bcda5ca7f1dfe7ac4e92b SHA256 e7034336c1e4b6ed1ddff7c92851292d396d011237acb2268492f44cedbb7a7f
-DIST popa3d-1.0.tar.gz 32586
-EBUILD popa3d-0.6.4.1-r2.ebuild 4461 RMD160 60bc5ba8a6e50caefa9129b26f58e5e0629acdf5 SHA1 f912b6abc7c4d0b56354bd16a12e3d31afa5cd4c SHA256 cc07eafb42671dc07172038933e4c9fc766be5e7e18ab1e0d3d118ee5eddb6ae
-MD5 8e7599644826bfabb2672962b23964ea popa3d-0.6.4.1-r2.ebuild 4461
-RMD160 60bc5ba8a6e50caefa9129b26f58e5e0629acdf5 popa3d-0.6.4.1-r2.ebuild 4461
-SHA256 cc07eafb42671dc07172038933e4c9fc766be5e7e18ab1e0d3d118ee5eddb6ae popa3d-0.6.4.1-r2.ebuild 4461
 EBUILD popa3d-1.0.2.ebuild 5545 RMD160 e816998bc3c569e230393b6fd91dd69657581be4 SHA1 b1c91ea7eeb48645b9017978a52932394f96842d SHA256 a02cbff25f2896960e1432f0d7d9a1695d3c73be568867cda620a19fcf770042
 MD5 ef5e1e7aa9e8576a6b7bfd9961d4b850 popa3d-1.0.2.ebuild 5545
 RMD160 e816998bc3c569e230393b6fd91dd69657581be4 popa3d-1.0.2.ebuild 5545
 SHA256 a02cbff25f2896960e1432f0d7d9a1695d3c73be568867cda620a19fcf770042 popa3d-1.0.2.ebuild 5545
-EBUILD popa3d-1.0.ebuild 5437 RMD160 cebd4ca34721853a0613ef17b000b95bd3a509e1 SHA1 ed07cc2ed570fccc6a538d727b14c637fac88562 SHA256 c5bc594b397169a1e69768939e8e87958295f62294631277f6225917ac1e86c5
-MD5 844be3e933b8c6139c5ae88dca139625 popa3d-1.0.ebuild 5437
-RMD160 cebd4ca34721853a0613ef17b000b95bd3a509e1 popa3d-1.0.ebuild 5437
-SHA256 c5bc594b397169a1e69768939e8e87958295f62294631277f6225917ac1e86c5 popa3d-1.0.ebuild 5437
-MISC ChangeLog 4433 RMD160 a14bc42290c2fa90e2fa062d9f910eaae41f656b SHA1 2f9b800f9b54f9b46b3cfa8353f13f9e14df46d5 SHA256 be7d52c04351313c6206b68cb2b5f05bbb409a9e9195bcb99f0df4f560a278e1
-MD5 d414d74f69b183729b3bcc37cd0aab52 ChangeLog 4433
-RMD160 a14bc42290c2fa90e2fa062d9f910eaae41f656b ChangeLog 4433
-SHA256 be7d52c04351313c6206b68cb2b5f05bbb409a9e9195bcb99f0df4f560a278e1 ChangeLog 4433
+MISC ChangeLog 4565 RMD160 4a98d217f772f74bca09a89f137f1d437452548e SHA1 a1f1d77b6e668f78e399957564f634761023aff6 SHA256 c0be8e1af81ca07267b4b26720d0fa10d6e1a59d5f33c9a5b59cb05fa14e9773
+MD5 a579ec9d75ec70d64865e3efcaf1cdbc ChangeLog 4565
+RMD160 4a98d217f772f74bca09a89f137f1d437452548e ChangeLog 4565
+SHA256 c0be8e1af81ca07267b4b26720d0fa10d6e1a59d5f33c9a5b59cb05fa14e9773 ChangeLog 4565
 MISC metadata.xml 235 RMD160 9902228719750c3aa42965b67d3e5fe7354f217f SHA1 cb097e246c97c9d57cbfb5fc1850a6e294509b14 SHA256 67771a4ca51a3c324056aa0ab9ee0040646c12c548b86a478be4b8280af63235
 MD5 5b48d9a897a74987026c74a16e2478e5 metadata.xml 235
 RMD160 9902228719750c3aa42965b67d3e5fe7354f217f metadata.xml 235
 SHA256 67771a4ca51a3c324056aa0ab9ee0040646c12c548b86a478be4b8280af63235 metadata.xml 235
-MD5 1e1c1d28ab170cd8f442938f7a26230d files/digest-popa3d-0.6.4.1-r2 394
-RMD160 1276154fe9821fe365d6dfa94c75a9cd1734807e files/digest-popa3d-0.6.4.1-r2 394
-SHA256 f1a4ae576d9135f8fa1df9b9edbb3c19763c667d939f24520e98df747b7c878a files/digest-popa3d-0.6.4.1-r2 394
-MD5 6f8982bfee8c2d8b5da1e88717eb4727 files/digest-popa3d-1.0 390
-RMD160 065621d4d31c9d65b0998f3a6a08de46e7b0b880 files/digest-popa3d-1.0 390
-SHA256 b9f9fc1ed0f634054cebebe0d0bd258b77bed46f9c81487795cc549a8a00853d files/digest-popa3d-1.0 390
 MD5 4c9c7950de904abc53c1cfffd46af9cc files/digest-popa3d-1.0.2 564
 RMD160 df803ed490fe581526efa0c33936f7548f1a77bc files/digest-popa3d-1.0.2 564
 SHA256 30ec3d8c9c292cf6861b33a3423c585ee5bb6b64afd9a0c0185519c9e002b354 files/digest-popa3d-1.0.2 564
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFmTTDQlM6RnzZP+IRAuiVAKC5Eq8J7jQCxNUY9vV5Dv9NGL7uBACgjSAO
-wASpv/0a5JmG3+KsVMkfCac=
-=8GNx
+iD8DBQFFnvdhViELBEf1JB0RAk5mAJ44hR6fhGI6xUHinBsiMlxjjvP/GgCfZjes
+AjLW+d2Imrsr/HTZYAWe3q8=
+=LS7K
 -----END PGP SIGNATURE-----
diff --git a/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r2 b/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r2
deleted file mode 100644
index f470a24064de..000000000000
--- a/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 ec478faa35cc2ee4f06f77eb9c236070 popa3d-0.5.9-maildir-2.diff.gz 3227
-MD5 568acb623180cbdbfcd286a037688bcf popa3d-0.6.3-vname-2.diff.gz 947
-RMD160 c29c88357694b9243964b8eca32ce0cd49db5be2 popa3d-0.6.3-vname-2.diff.gz 947
-SHA256 12c157142650801cf4ca534350b332eeb5d16ca329bce06f3fca5b5f0e13d7c2 popa3d-0.6.3-vname-2.diff.gz 947
-MD5 5e352b7eebe59f184ce0b0c4c9731c89 popa3d-0.6.4.1.tar.gz 32061
diff --git a/net-mail/popa3d/files/digest-popa3d-1.0 b/net-mail/popa3d/files/digest-popa3d-1.0
deleted file mode 100644
index a3ff4914b695..000000000000
--- a/net-mail/popa3d/files/digest-popa3d-1.0
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 ec478faa35cc2ee4f06f77eb9c236070 popa3d-0.5.9-maildir-2.diff.gz 3227
-MD5 568acb623180cbdbfcd286a037688bcf popa3d-0.6.3-vname-2.diff.gz 947
-RMD160 c29c88357694b9243964b8eca32ce0cd49db5be2 popa3d-0.6.3-vname-2.diff.gz 947
-SHA256 12c157142650801cf4ca534350b332eeb5d16ca329bce06f3fca5b5f0e13d7c2 popa3d-0.6.3-vname-2.diff.gz 947
-MD5 2e0f91765ff5935bbc24626f02a69ada popa3d-1.0.tar.gz 32586
diff --git a/net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild b/net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild
deleted file mode 100644
index b691aae24f20..000000000000
--- a/net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild
+++ /dev/null
@@ -1,168 +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/popa3d/popa3d-0.6.4.1-r2.ebuild,v 1.5 2006/08/26 10:21:59 ferdy Exp $
-
-inherit eutils
-
-#
-# Mailbox format is determined by the 'mbox' and 'maildir'
-# system USE flags.
-#
-# Mailbox path configuration denoted by the system USE
-# flags.
-#
-# USE flag 'maildir' denotes ~/.maildir
-# USE flag 'mbox' denotes /var/mail/username
-#
-# You can overwrite this by setting the POPA3D_HOME_MAILBOX
-# environmental variable (see below) before emerge.
-#
-# Environmental variables.
-#
-# POPA3D_HOME_MAILBOX
-#
-# Overwrite the local user mailbox path. For example
-# if you want qmail-styled ~/Mailbox you can set it
-# to "Mailbox". For the traditional (although not in
-# gentoo Maildir) set it to "Maildir".
-#
-# POPA3D_VIRTUAL_ONLY
-#
-# Set this field to "YES" if you dont want local users
-# to have POP access. Setting this makes the POPA3D_HOME_MAILBOX
-# variable effectively useless.
-#
-# POPA3D_VIRTUAL_HOME_PATH
-#
-# Set this field to the base virtual home path. For more information
-# read the virtual guide here: http://forums.gentoo.org/viewtopic.php?t=82386
-#
-
-IUSE="pam mbox maildir"
-
-DESCRIPTION="A security oriented POP3 server."
-HOMEPAGE="http://www.openwall.com/popa3d/"
-
-SRC_URI="http://www.openwall.com/popa3d/${P}.tar.gz
-	mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz
-	maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-
-DEPEND=">=sys-apps/sed-4
-	pam? ( >=sys-libs/pam-0.72
-	       >=net-mail/mailbase-0.00-r8 )"
-
-pkg_setup() {
-
-	if use pam && ! built_with_use net-mail/mailbase pam;
-	then
-		echo
-		eerror
-		eerror "${PN} needs net-mail/mailbase to be built with the pam USE flag"
-		eerror "activated. Please rebuild net-mail/mailbase with pam"
-		eerror
-		die "mailbase has to be built with pam flag"
-	fi
-
-	if use mbox && use maildir ; then
-		echo
-		eerror
-		eerror "You must choose between mbox or maildir,"
-		eerror "both cannot be used together."
-		eerror
-		die "Both mbox and maildir specified."
-	fi
-
-	echo
-	ewarn
-	ewarn "You can customize this ebuild with environmental variables."
-	ewarn "If you don't set any I'll assume sensible defaults."
-	ewarn
-	ewarn "See inside this ebuild for details."
-	ewarn
-	echo
-	epause 5
-
-	enewgroup popa3d
-	enewuser popa3d -1 -1 -1 popa3d
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${DISTDIR}/popa3d-0.6.3-vname-2.diff.gz
-
-	use maildir && epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff.gz
-}
-
-src_compile() {
-	cd ${S}
-
-	if use maildir ; then
-		einfo "Mailbox format is: MAILDIR."
-		if [ "${POPA3D_HOME_MAILBOX}" = "" ] ; then
-			POPA3D_HOME_MAILBOX=".maildir"
-		fi
-	else
-		einfo "Mailbox format is: MAILBOX."
-	fi
-
-	if [ "${POPA3D_HOME_MAILBOX}" != "" ] ; then
-		einfo "Mailbox path: ~/$POPA3D_HOME_MAILBOX"
-		epause 2
-		sed -i -e "s:^\(#define MAIL_SPOOL_PATH.*\)$://\1:" params.h
-		sed -i -e "s:^#define HOME_MAILBOX_NAME.*$:#define HOME_MAILBOX_NAME \"${POPA3D_HOME_MAILBOX}\":" params.h
-	else
-		einfo "Mailbox path: /var/mail/username"
-	fi
-
-	if [ "${POPA3D_VIRTUAL_ONLY}" = "YES" ] ; then
-		einfo "Virtual only, no local system users"
-		sed -i -e "s:^#define VIRTUAL_ONLY.*$:#define VIRTUAL_ONLY 1:" params.h
-	fi
-
-	if [ "${POPA3D_VIRTUAL_HOME_PATH}" != "" ] ; then
-		einfo "Virtual home path set to: $POPA3D_VIRTUAL_HOME_PATH"
-		sed -i -e "s:^#define VIRTUAL_HOME_PATH.*$:#define VIRTUAL_HOME_PATH \"$POPA3D_VIRTUAL_HOME_PATH\":" params.h
-	fi
-
-	if [ "$POPA3D_VIRTUAL_ONLY" = "YES" ] ; then
-		einfo "Authentication method: Virtual."
-	elif use pam ; then
-		einfo "Authentication method: PAM."
-		LIBS="${LIBS} -lpam"
-		sed -i -e "s:^#define AUTH_SHADOW\t\t\t1$:#define AUTH_SHADOW\t\t\t0:" params.h
-		sed -i -e "s:^#define AUTH_PAM\t\t\t0$:#define AUTH_PAM\t\t\t1:" params.h
-	else
-		einfo "Authentication method: Shadow."
-	fi
-
-	sed -i -e "s:^#define POP_STANDALONE.*$:#define POP_STANDALONE 1:" params.h
-	sed -i -e "s:^#define POP_VIRTUAL.*$:#define POP_VIRTUAL 1:" params.h
-	sed -i -e "s:^#define VIRTUAL_VNAME.*$:#define VIRTUAL_VNAME 1:" params.h
-
-	emake LIBS="${LIBS} -lcrypt" || die "emake failed"
-}
-
-src_install() {
-	into /usr
-
-	dosbin popa3d
-	doman popa3d.8
-	dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT
-
-	diropts -m 755
-	dodir /var/empty
-	keepdir /var/empty
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/popa3d-initrc popa3d
-
-	if use pam ; then
-		dodir /etc/pam.d/
-		dosym /etc/pam.d/pop /etc/pam.d/popa3d
-	fi
-}
diff --git a/net-mail/popa3d/popa3d-1.0.ebuild b/net-mail/popa3d/popa3d-1.0.ebuild
deleted file mode 100644
index aad47c3f5128..000000000000
--- a/net-mail/popa3d/popa3d-1.0.ebuild
+++ /dev/null
@@ -1,185 +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/popa3d/popa3d-1.0.ebuild,v 1.5 2006/08/26 10:21:59 ferdy Exp $
-
-inherit eutils
-
-#
-# Mailbox format is determined by the 'mbox' and 'maildir'
-# system USE flags.
-#
-# Mailbox path configuration denoted by the system USE
-# flags.
-#
-# USE flag 'maildir' denotes ~/.maildir
-# USE flag 'mbox' denotes /var/mail/username
-#
-# You can overwrite this by setting the POPA3D_HOME_MAILBOX
-# environmental variable (see below) before emerge.
-#
-# Environmental variables.
-#
-# POPA3D_HOME_MAILBOX
-#
-# Overwrite the local user mailbox path. For example
-# if you want qmail-styled ~/Mailbox you can set it
-# to "Mailbox". For the traditional (although not in
-# gentoo Maildir) set it to "Maildir".
-#
-# POPA3D_VIRTUAL_ONLY
-#
-# Set this field to "YES" if you dont want local users
-# to have POP access. Setting this makes the POPA3D_HOME_MAILBOX
-# variable effectively useless.
-#
-# POPA3D_VIRTUAL_HOME_PATH
-#
-# Set this field to the base virtual home path. For more information
-# read the virtual guide here: http://forums.gentoo.org/viewtopic.php?t=82386
-#
-######
-# 12/07/2005 - port001
-# Version 1.0 introduced some increased default values for a number of
-# configuration paramaters. These values are way too high for most systems.
-MAX_SESSIONS=100 # Default is 500
-MAX_SESSIONS_PER_SOURCE=10 # Default is 50
-
-MAX_MAILBOX_MESSAGES=100000 # Default is 2097152
-MAX_MAILBOX_OPEN_BYTES=100000000 # Default is 2147483647
-MAX_MAILBOX_WORK_BYTES=150000000 # Default is 2147483647
-######
-
-IUSE="pam mbox maildir"
-
-DESCRIPTION="A security oriented POP3 server."
-HOMEPAGE="http://www.openwall.com/popa3d/"
-
-SRC_URI="http://www.openwall.com/popa3d/${P}.tar.gz
-	mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz
-	maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~ppc sparc x86"
-
-DEPEND=">=sys-apps/sed-4
-	pam? ( >=sys-libs/pam-0.72
-	       >=net-mail/mailbase-0.00-r8 )"
-
-pkg_setup() {
-
-	if use pam && ! built_with_use net-mail/mailbase pam;
-	then
-		echo
-		eerror
-		eerror "${PN} needs net-mail/mailbase to be built with the pam USE flag"
-		eerror "activated. Please rebuild net-mail/mailbase with pam"
-		eerror
-		die "mailbase has to be built with pam flag"
-	fi
-
-	if use mbox && use maildir ; then
-		echo
-		eerror
-		eerror "You must choose between mbox or maildir,"
-		eerror "both cannot be used together."
-		eerror
-		die "Both mbox and maildir specified."
-	fi
-
-	echo
-	ewarn
-	ewarn "You can customize this ebuild with environmental variables."
-	ewarn "If you don't set any I'll assume sensible defaults."
-	ewarn
-	ewarn "See inside this ebuild for details."
-	ewarn
-	echo
-	epause 5
-
-	enewgroup popa3d
-	enewuser popa3d -1 -1 -1 popa3d
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${DISTDIR}/popa3d-0.6.3-vname-2.diff.gz
-
-	use maildir && epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff.gz
-}
-
-src_compile() {
-	cd ${S}
-
-	sed -i -e "s:^#define MAX_SESSIONS\t\t\t.*$:#define MAX_SESSIONS ${MAX_SESSIONS}:" params.h
-	sed -i -e "s:^#define MAX_SESSIONS_PER_SOURCE.*$:#define MAX_SESSIONS_PER_SOURCE ${MAX_SESSIONS_PER_SOURCE}:" params.h
-	sed -i -e "s:^#define MAX_MAILBOX_MESSAGES.*$:#define MAX_MAILBOX_MESSAGES ${MAX_MAILBOX_MESSAGES}:" params.h
-	sed -i -e "s:^#define MAX_MAILBOX_OPEN_BYTES.*$:#define MAX_MAILBOX_OPEN_BYTES ${MAX_MAILBOX_OPEN_BYTES}:" params.h
-	sed -i -e "s:^#define MAX_MAILBOX_WORK_BYTES.*$:#define MAX_MAILBOX_WORK_BYTES ${MAX_MAILBOX_WORK_BYTES}:" params.h
-
-	if use maildir ; then
-		einfo "Mailbox format is: MAILDIR."
-		if [ "${POPA3D_HOME_MAILBOX}" = "" ] ; then
-			POPA3D_HOME_MAILBOX=".maildir"
-		fi
-	else
-		einfo "Mailbox format is: MAILBOX."
-	fi
-
-	if [ "${POPA3D_HOME_MAILBOX}" != "" ] ; then
-		einfo "Mailbox path: ~/$POPA3D_HOME_MAILBOX"
-		epause 2
-		sed -i -e "s:^\(#define MAIL_SPOOL_PATH.*\)$://\1:" params.h
-		sed -i -e "s:^#define HOME_MAILBOX_NAME.*$:#define HOME_MAILBOX_NAME \"${POPA3D_HOME_MAILBOX}\":" params.h
-	else
-		einfo "Mailbox path: /var/mail/username"
-	fi
-
-	if [ "${POPA3D_VIRTUAL_ONLY}" = "YES" ] ; then
-		einfo "Virtual only, no local system users"
-		sed -i -e "s:^#define VIRTUAL_ONLY.*$:#define VIRTUAL_ONLY 1:" params.h
-	fi
-
-	if [ "${POPA3D_VIRTUAL_HOME_PATH}" != "" ] ; then
-		einfo "Virtual home path set to: $POPA3D_VIRTUAL_HOME_PATH"
-		sed -i -e "s:^#define VIRTUAL_HOME_PATH.*$:#define VIRTUAL_HOME_PATH \"$POPA3D_VIRTUAL_HOME_PATH\":" params.h
-	fi
-
-	if [ "$POPA3D_VIRTUAL_ONLY" = "YES" ] ; then
-		einfo "Authentication method: Virtual."
-	elif use pam ; then
-		einfo "Authentication method: PAM."
-		LIBS="${LIBS} -lpam"
-		sed -i -e "s:^#define AUTH_SHADOW\t\t\t1$:#define AUTH_SHADOW\t\t\t0:" params.h
-		sed -i -e "s:^#define AUTH_PAM\t\t\t0$:#define AUTH_PAM\t\t\t1:" params.h
-	else
-		einfo "Authentication method: Shadow."
-	fi
-
-	sed -i -e "s:^#define POP_STANDALONE.*$:#define POP_STANDALONE 1:" params.h
-	sed -i -e "s:^#define POP_VIRTUAL.*$:#define POP_VIRTUAL 1:" params.h
-	sed -i -e "s:^#define VIRTUAL_VNAME.*$:#define VIRTUAL_VNAME 1:" params.h
-
-	emake LIBS="${LIBS} -lcrypt" || die "emake failed"
-}
-
-src_install() {
-	into /usr
-
-	dosbin popa3d
-	doman popa3d.8
-	dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT
-
-	diropts -m 755
-	dodir /var/empty
-	keepdir /var/empty
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/popa3d-initrc popa3d
-
-	if use pam ; then
-		dodir /etc/pam.d/
-		dosym /etc/pam.d/pop /etc/pam.d/popa3d
-	fi
-}
diff --git a/net-mail/ripmime/Manifest b/net-mail/ripmime/Manifest
index 5648e53331d5..8340c9e65411 100644
--- a/net-mail/ripmime/Manifest
+++ b/net-mail/ripmime/Manifest
@@ -1,24 +1,26 @@
-DIST ripmime-1.4.0.5.tar.gz 160896
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ripmime-1.4.0.6.tar.gz 163441 RMD160 b0f5f4d99e06fe2edbd8071972157c923eb0fb11 SHA256 ba1d82c80d8651bd6af0678db88e9dcaf69802922e0ea0de9c750093f988bef6
-EBUILD ripmime-1.4.0.5.ebuild 604 RMD160 159c190a9e143c6826dcfdf773be250633ed74b5 SHA1 95f902102099fbbfa72d7468eb8ce6555a967803 SHA256 75261929a47dbdf6474d9d65ab26ee9e60b48ab48f7ab5cad89a35ec4524455d
-MD5 49c1d8f8a6d4d86b42e1a3a3018ea29b ripmime-1.4.0.5.ebuild 604
-RMD160 159c190a9e143c6826dcfdf773be250633ed74b5 ripmime-1.4.0.5.ebuild 604
-SHA256 75261929a47dbdf6474d9d65ab26ee9e60b48ab48f7ab5cad89a35ec4524455d ripmime-1.4.0.5.ebuild 604
 EBUILD ripmime-1.4.0.6.ebuild 604 RMD160 7b277ce20dc5fbf00988fcaf421d4a1f4b99ad51 SHA1 34f7d3078bed3f55fe94c2b1267c0c1d95c7b539 SHA256 e33db12a5972cb14eb3e9062122479c6e92d39bf4f712cedab0a9775d37e0aa7
 MD5 a2388b384dfcdf32780a5ad3910d3c0b ripmime-1.4.0.6.ebuild 604
 RMD160 7b277ce20dc5fbf00988fcaf421d4a1f4b99ad51 ripmime-1.4.0.6.ebuild 604
 SHA256 e33db12a5972cb14eb3e9062122479c6e92d39bf4f712cedab0a9775d37e0aa7 ripmime-1.4.0.6.ebuild 604
-MISC ChangeLog 3139 RMD160 799a753e275f02d56e89ab80a1c467b510d8614c SHA1 7fc086616db2ca8473409e19c6e2a99fc77a8136 SHA256 e2a217d329bd33ec9688293e1793c1c3ddafe1b43939d2da8a27b3f250e5485a
-MD5 a616a65012675ca154557bb4b4f0b729 ChangeLog 3139
-RMD160 799a753e275f02d56e89ab80a1c467b510d8614c ChangeLog 3139
-SHA256 e2a217d329bd33ec9688293e1793c1c3ddafe1b43939d2da8a27b3f250e5485a ChangeLog 3139
+MISC ChangeLog 3249 RMD160 ded7cca1d03e1848678685cf4e8ed87833884bcf SHA1 a722c28ee552859932778440e1a962f1166a12e1 SHA256 5d8dfbe1b567d56024676b794b875f414f7167a1915f259200976cac06990816
+MD5 e4ec31d930decba753a0cb1786076c0b ChangeLog 3249
+RMD160 ded7cca1d03e1848678685cf4e8ed87833884bcf ChangeLog 3249
+SHA256 5d8dfbe1b567d56024676b794b875f414f7167a1915f259200976cac06990816 ChangeLog 3249
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 00d684da74cd7e31b78c9d86ada1bf19 files/digest-ripmime-1.4.0.5 67
-RMD160 72d0310c27926858718b30ee8b2089b44dfa871e files/digest-ripmime-1.4.0.5 67
-SHA256 cc16d263c780ce82236724d51cce8e04d9f2014dbc4ad9e5a9466d6c733c3994 files/digest-ripmime-1.4.0.5 67
 MD5 bf62ce5bc3e9bf9c709ef472ebd99647 files/digest-ripmime-1.4.0.6 247
 RMD160 735054c2ad20a2c7cdfebbfa2a15c381e8114b09 files/digest-ripmime-1.4.0.6 247
 SHA256 323d9ea23d7863d62531b4bfd04cacbe68b2828bc901c042fcf3969e081d417f files/digest-ripmime-1.4.0.6 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnvezViELBEf1JB0RAuvIAJ9YYZ59Zo/Bg1VZ2PrqKoArwxiYTgCcC3nt
+lZe09U5VsU5g1dZuwMjtztI=
+=nvQf
+-----END PGP SIGNATURE-----
diff --git a/net-mail/ripmime/files/digest-ripmime-1.4.0.5 b/net-mail/ripmime/files/digest-ripmime-1.4.0.5
deleted file mode 100644
index 4abee40015c2..000000000000
--- a/net-mail/ripmime/files/digest-ripmime-1.4.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 732b07890397d320f5f5835b5229190a ripmime-1.4.0.5.tar.gz 160896
diff --git a/net-mail/ripmime/ripmime-1.4.0.5.ebuild b/net-mail/ripmime/ripmime-1.4.0.5.ebuild
deleted file mode 100644
index a0fd5ee7252f..000000000000
--- a/net-mail/ripmime/ripmime-1.4.0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ripmime/ripmime-1.4.0.5.ebuild,v 1.5 2005/07/12 12:23:15 blubb Exp $
-
-DESCRIPTION="extract attachment files out of a MIME-encoded email pack"
-HOMEPAGE="http://pldaniels.com/ripmime/"
-SRC_URI="http://www.pldaniels.com/ripmime/${P}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dobin ripmime || die
-	doman ripmime.1
-	dodoc CHANGELOG INSTALL README TODO
-}
diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
index 8c70dd44ca67..1645f26198b5 100644
--- a/net-mail/serialmail/Manifest
+++ b/net-mail/serialmail/Manifest
@@ -1,17 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 538cf91810fa9224ddd25744ba703640 serialmail-0.75-r1.ebuild 1227
-MD5 bbd39a00f67219bf981b2ea6c18d9bd9 ChangeLog 2257
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 71d4acaff9aa1fd7ab06a0e27a49f541 serialmail-0.75-r2.ebuild 1388
+AUX errno.patch 567 RMD160 a21cba6ce68658d0f4049885931e36d10b21c006 SHA1 9e76559ca1f7802a4a8fe82b66a3ee22b8f19cc8 SHA256 717fa3b4e113f7b3a2d10eb5aca24d9d3c7024cdde6fde2daf8e2172dadc33cc
 MD5 3339480edaf2f8d572600ce92d8ffa33 files/errno.patch 567
-MD5 9470e572fd04d86fc02411a70786ebbc files/digest-serialmail-0.75-r1 66
+RMD160 a21cba6ce68658d0f4049885931e36d10b21c006 files/errno.patch 567
+SHA256 717fa3b4e113f7b3a2d10eb5aca24d9d3c7024cdde6fde2daf8e2172dadc33cc files/errno.patch 567
+DIST serialmail-0.75-patch.tar.bz2 7702
+DIST serialmail-0.75.tar.gz 55079
+EBUILD serialmail-0.75-r2.ebuild 1388 RMD160 493f97f2d142857aa96bfe506bc423cb833a00d4 SHA1 1f5783c654d77759f99b2c298fbb01e8f6c14d48 SHA256 6418495903a8d49517918da6db053bb7d1b7ebaba5bff534844b9687ff907376
+MD5 71d4acaff9aa1fd7ab06a0e27a49f541 serialmail-0.75-r2.ebuild 1388
+RMD160 493f97f2d142857aa96bfe506bc423cb833a00d4 serialmail-0.75-r2.ebuild 1388
+SHA256 6418495903a8d49517918da6db053bb7d1b7ebaba5bff534844b9687ff907376 serialmail-0.75-r2.ebuild 1388
+MISC ChangeLog 2370 RMD160 9a58573eb836a89678fc7a6336e603f00cd2b689 SHA1 dcedbf2334fe57c14df205c5d0840a0403a35f37 SHA256 973bb270e7d7b290e7f7016c6c8604208e75a3a894e19f2e8a260279f580d9aa
+MD5 8e286da4f62690dbaa08aafaeaf28017 ChangeLog 2370
+RMD160 9a58573eb836a89678fc7a6336e603f00cd2b689 ChangeLog 2370
+SHA256 973bb270e7d7b290e7f7016c6c8604208e75a3a894e19f2e8a260279f580d9aa ChangeLog 2370
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
 MD5 be37eec8e201ac2eb60cd0fc1fd845fe files/digest-serialmail-0.75-r2 138
+RMD160 a1b66177ef7a10e9673fb267ac6447946dfd94af files/digest-serialmail-0.75-r2 138
+SHA256 92b0bd909939d437292763f8479c2f0939bc5fecf49cd84b0b5e3c34ee73186b files/digest-serialmail-0.75-r2 138
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFCeJAPViELBEf1JB0RAhDZAJ9/PhhjR85hyMUb5AGKBF/mAXZw0QCfYHv0
-aR4GDeHSJfFZX5ivJAt18xk=
-=9nCJ
+iD8DBQFFnvf2ViELBEf1JB0RAtDZAJ94Ha9cPhNIHI5egXrnU4egmH0bIgCghUpj
+ICGxqcEzShJUcpnf497UDzc=
+=CNsv
 -----END PGP SIGNATURE-----
diff --git a/net-mail/serialmail/files/digest-serialmail-0.75-r1 b/net-mail/serialmail/files/digest-serialmail-0.75-r1
deleted file mode 100644
index 223ae338b5df..000000000000
--- a/net-mail/serialmail/files/digest-serialmail-0.75-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6a3049863ae8577b1780fcd9fbc98a9 serialmail-0.75.tar.gz 55079
diff --git a/net-mail/serialmail/serialmail-0.75-r1.ebuild b/net-mail/serialmail/serialmail-0.75-r1.ebuild
deleted file mode 100644
index 99386935ba42..000000000000
--- a/net-mail/serialmail/serialmail-0.75-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/serialmail/serialmail-0.75-r1.ebuild,v 1.5 2005/03/03 18:32:40 ciaranm Exp $
-
-IUSE=""
-
-DESCRIPTION="A serialmail is a collection of tools for passing mail
-across serial links."
-HOMEPAGE="http://cr.yp.to/serialmail.html"
-SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
-
-DEPEND="virtual/libc
-	sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88"
-
-RDEPEND="virtual/libc
-	sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	>=sys-process/daemontools-0.76-r1"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc"
-
-src_unpack() {
-
-	unpack ${P}.tar.gz
-	patch -p0 < ${FILESDIR}/errno.patch || die "patch failed"
-
-	cd ${S}
-
-	echo "/usr" > conf-home
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc" > conf-ld
-	echo "500" > conf-spawn
-
-}
-
-src_compile() {
-
-	grep -v man hier.c | grep -v doc > hier.c
-
-	emake it man || die
-
-}
-
-src_install() {
-
-	dodir /usr
-
-	echo "${D}/usr" > conf-home
-
-	make man setup check || die
-
-	dodoc AUTOTURN CHANGES FROMISP SYSDEPS THANKS TOISP \
-		BLURB FILES INSTALL README TARGETS TODO VERSION
-
-	doman maildirqmtp.1 maildirserial.1 maildirsmtp.1 \
-		serialqmtp.1 serialsmtp.1 setlock.1
-}
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
index 4e3adbabb708..90dd70ba5aed 100644
--- a/net-mail/swaks/Manifest
+++ b/net-mail/swaks/Manifest
@@ -1,23 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST swaks.20040404.1 46264
-DIST swaks.20050605.3 47674
-DIST swaks.20050709.1 50920
 DIST swaks.20060621.0 66005 RMD160 fd9d1e87ba2aba581bc5875635ecd42ee42878d0 SHA1 cc2ccab270884c0fb36a7735e3406637dc99e3a7 SHA256 18042e2d2f68c540835d4b5cff54587662f5dae12a8a5c9fa7aae6577c6bc5d0
 DIST swaks.20061116.0 79270 RMD160 1b8501917b83e0bf93dec5b8a09bf5b76aa01164 SHA1 f95b7de828345d2f1f589be2427cde91caf16aef SHA256 2970f2ce9d9781661a3ee04114423f66217c6208009700b3447e2fa7663026e3
-EBUILD swaks-20040404.1.ebuild 866 RMD160 19a706972a4c2b7368643387be5660eb9ccaa278 SHA1 5833365b433309f9c94bce5b95cde5533e7918c2 SHA256 3f05790af28fe02944c3094193978694b201ea3f48190e6e72493b127e67606d
-MD5 a0dc23d7a857b45d450bf45fcfb60201 swaks-20040404.1.ebuild 866
-RMD160 19a706972a4c2b7368643387be5660eb9ccaa278 swaks-20040404.1.ebuild 866
-SHA256 3f05790af28fe02944c3094193978694b201ea3f48190e6e72493b127e67606d swaks-20040404.1.ebuild 866
-EBUILD swaks-20050605.3.ebuild 871 RMD160 61d48594f94747a62ea72ec853659557bf65f8c5 SHA1 7db9578aae746ab8808f47dea5b50790d79d5b13 SHA256 8b9da28e1782216ef1e4303a000a1e40c1dfed982b20468f4a89394c1fd82ecc
-MD5 946ba09d62c23053513231a127ab82a2 swaks-20050605.3.ebuild 871
-RMD160 61d48594f94747a62ea72ec853659557bf65f8c5 swaks-20050605.3.ebuild 871
-SHA256 8b9da28e1782216ef1e4303a000a1e40c1dfed982b20468f4a89394c1fd82ecc swaks-20050605.3.ebuild 871
-EBUILD swaks-20050709.1.ebuild 874 RMD160 d0346589c06e41954328f75dac94210702ac9ae8 SHA1 80d684b413358084df2adf730cc6b7ce2a1a5e80 SHA256 ffc5e521b42732e73019b8dfdccca0e3e87888c6b686df6ae17f424474d7e366
-MD5 c6d4828830d8e630838600ec60cd708e swaks-20050709.1.ebuild 874
-RMD160 d0346589c06e41954328f75dac94210702ac9ae8 swaks-20050709.1.ebuild 874
-SHA256 ffc5e521b42732e73019b8dfdccca0e3e87888c6b686df6ae17f424474d7e366 swaks-20050709.1.ebuild 874
 EBUILD swaks-20060621.0.ebuild 874 RMD160 14c599d50a9299319902ae279cdfde2e85dd0a0e SHA1 6f46c338f2adf09cf6a16bd7a4061000aa3101a2 SHA256 a627199cfdcfd786f9ffa0c84f4c1cf6a8d30d00e85d85455f0403089c6e1487
 MD5 35237502fd39067bb14256be5d00d6b9 swaks-20060621.0.ebuild 874
 RMD160 14c599d50a9299319902ae279cdfde2e85dd0a0e swaks-20060621.0.ebuild 874
@@ -26,23 +11,14 @@ EBUILD swaks-20061116.0.ebuild 875 RMD160 1f74ec9adfc9f9045364f892528623a484bd6c
 MD5 3d339a1a8c440b87db6b8fd5a52a7011 swaks-20061116.0.ebuild 875
 RMD160 1f74ec9adfc9f9045364f892528623a484bd6c90 swaks-20061116.0.ebuild 875
 SHA256 1057acdb4d93b3692bbe31d67035717510013a0785e620c76c8b94c51df98de8 swaks-20061116.0.ebuild 875
-MISC ChangeLog 1907 RMD160 aca5f0953dff5a0483e9d10f1c9fb042be3cfb25 SHA1 5d70d8a7352904f466cd5ce9dcd761ad354127eb SHA256 587d2f4484a808f44ca64d6f126e606205a30c211fcaf22977c0b9004167d9cd
-MD5 2ad6498b6263ecf8543ea3babd5759b7 ChangeLog 1907
-RMD160 aca5f0953dff5a0483e9d10f1c9fb042be3cfb25 ChangeLog 1907
-SHA256 587d2f4484a808f44ca64d6f126e606205a30c211fcaf22977c0b9004167d9cd ChangeLog 1907
+MISC ChangeLog 2072 RMD160 479ab3b941c89e738740e8e4b0f43d621446bb56 SHA1 c473156e6393deca372672d384d1710c740009ff SHA256 e963eb2c14f737ae3b5b0c35809d09ae82aecb46760bffd16f14b6958b00d268
+MD5 ed94b9b98327b628071502e6b9349a2f ChangeLog 2072
+RMD160 479ab3b941c89e738740e8e4b0f43d621446bb56 ChangeLog 2072
+SHA256 e963eb2c14f737ae3b5b0c35809d09ae82aecb46760bffd16f14b6958b00d268 ChangeLog 2072
 MISC metadata.xml 327 RMD160 97f2a03f6f75a524eb0168176b2705644be64790 SHA1 ee240c412efbab3b669a66846acf31a4b14dbbd4 SHA256 1de43525648df8e29a37b1703f907cf81a8637580823a3dee5f4bf142c88a019
 MD5 a03aed363a1775343da51293c48c2186 metadata.xml 327
 RMD160 97f2a03f6f75a524eb0168176b2705644be64790 metadata.xml 327
 SHA256 1de43525648df8e29a37b1703f907cf81a8637580823a3dee5f4bf142c88a019 metadata.xml 327
-MD5 ee7202c1b9d50ea55ff11de6a9e547c7 files/digest-swaks-20040404.1 60
-RMD160 4c2cb4393676749dd7b2827dbd96cd0cd0ab55f1 files/digest-swaks-20040404.1 60
-SHA256 ab484e2fb8dd5497f451720a6786fcdc8f07755a8c569ee3797db314ac9fafbb files/digest-swaks-20040404.1 60
-MD5 da6d9bf580c6918ab8125421c6efdaa8 files/digest-swaks-20050605.3 60
-RMD160 942564ed6637805da015ad0f6786e67994616b60 files/digest-swaks-20050605.3 60
-SHA256 7926c42e54ccaf285d63a143d3fbb6f3864f6d26a29fa724cdaef379e8bdb0ee files/digest-swaks-20050605.3 60
-MD5 0f2f7b12b457cc6793005cec40150212 files/digest-swaks-20050709.1 60
-RMD160 90fb9992c4ec4b88066bb1d687d8e20b08646665 files/digest-swaks-20050709.1 60
-SHA256 abdc7132b37c7e5e1ba0643af94e476ad804e74da376611df90a5f348c3caecd files/digest-swaks-20050709.1 60
 MD5 81a9837c800ce95e98c0f89d928dd8e0 files/digest-swaks-20060621.0 226
 RMD160 d62ff247acdbd36762fe80acfe2621a8cdefe26a files/digest-swaks-20060621.0 226
 SHA256 523329546ed2ccb6d3a020c36f7725d7bd005c8d2453144dcf3d35ad572b8922 files/digest-swaks-20060621.0 226
@@ -50,9 +26,9 @@ MD5 b6557b906154864d305fca5de3d3088a files/digest-swaks-20061116.0 226
 RMD160 a9a69fc00cc7d8d1ab4fcd961df9e790e5e27dc7 files/digest-swaks-20061116.0 226
 SHA256 09784fc388db6c848f223428be9313c4b00746a081a8ad2403aef28c274646ae files/digest-swaks-20061116.0 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFXLaWQlM6RnzZP+IRAhSQAJ95UZ3rbAXtsT+z7iJqadLSYsg8WgCglb0A
-5R0JErmXFvUOzp0gesk4vDY=
-=sgLv
+iD8DBQFFnvhoViELBEf1JB0RAujFAJ9JSPw31tH/S8mzGwyHCHfIJIZPvACfQEjW
+y6liwej9e1CRDX8+5mjZISs=
+=7tuc
 -----END PGP SIGNATURE-----
diff --git a/net-mail/swaks/files/digest-swaks-20040404.1 b/net-mail/swaks/files/digest-swaks-20040404.1
deleted file mode 100644
index 57edb9ea5115..000000000000
--- a/net-mail/swaks/files/digest-swaks-20040404.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 747b5ace5648a4dc6ff2faef139539a1 swaks.20040404.1 46264
diff --git a/net-mail/swaks/files/digest-swaks-20050605.3 b/net-mail/swaks/files/digest-swaks-20050605.3
deleted file mode 100644
index 9042b02413e1..000000000000
--- a/net-mail/swaks/files/digest-swaks-20050605.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ae35eaba3184262f0aece57308ece39 swaks.20050605.3 47674
diff --git a/net-mail/swaks/files/digest-swaks-20050709.1 b/net-mail/swaks/files/digest-swaks-20050709.1
deleted file mode 100644
index 9cb3f6385099..000000000000
--- a/net-mail/swaks/files/digest-swaks-20050709.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f70027dd8c1b0dbeca9d8b73c6fa13fb swaks.20050709.1 50920
diff --git a/net-mail/swaks/swaks-20040404.1.ebuild b/net-mail/swaks/swaks-20040404.1.ebuild
deleted file mode 100644
index b5759004a680..000000000000
--- a/net-mail/swaks/swaks-20040404.1.ebuild
+++ /dev/null
@@ -1,35 +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/swaks/swaks-20040404.1.ebuild,v 1.6 2006/02/13 14:59:12 mcummings Exp $
-
-MY_P=${P/-/.}
-DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
-HOMEPAGE="http://www.jetmore.org/john/code/#swaks"
-SRC_URI="http://www.jetmore.org/john/code/${MY_P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE="ssl"
-
-DEPEND=">=dev-lang/perl-5.8.3"
-
-RDEPEND="${DEPEND}
-		>=dev-perl/Net-DNS-0.40
-		ssl? ( >=dev-perl/Net-SSLeay-1.23 )
-		>=virtual/perl-MIME-Base64-3.00
-		>=virtual/perl-Digest-MD5-2.33
-		>=virtual/perl-Time-HiRes-1.54
-		>=dev-perl/Authen-NTLM-1.02
-		>=dev-perl/Authen-DigestMD5-0.04"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp ${DISTDIR}/${A} ${WORKDIR}
-}
-
-src_install() {
-	newbin ${MY_P} swaks
-}
-
diff --git a/net-mail/swaks/swaks-20050605.3.ebuild b/net-mail/swaks/swaks-20050605.3.ebuild
deleted file mode 100644
index 5f2f5717494d..000000000000
--- a/net-mail/swaks/swaks-20050605.3.ebuild
+++ /dev/null
@@ -1,35 +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/swaks/swaks-20050605.3.ebuild,v 1.4 2006/02/13 14:59:12 mcummings Exp $
-
-MY_P=${P/-/.}
-DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
-HOMEPAGE="http://www.jetmore.org/john/code/#swaks"
-SRC_URI="http://www.jetmore.org/john/code/${MY_P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-
-IUSE="ssl"
-
-DEPEND=">=dev-lang/perl-5.8.3"
-
-RDEPEND="${DEPEND}
-		>=dev-perl/Net-DNS-0.40
-		ssl? ( >=dev-perl/Net-SSLeay-1.23 )
-		>=virtual/perl-MIME-Base64-3.00
-		>=virtual/perl-Digest-MD5-2.33
-		>=virtual/perl-Time-HiRes-1.54
-		>=dev-perl/Authen-NTLM-1.02
-		>=dev-perl/Authen-DigestMD5-0.04"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp ${DISTDIR}/${A} ${WORKDIR}
-}
-
-src_install() {
-	newbin ${MY_P} swaks
-}
-
diff --git a/net-mail/swaks/swaks-20050709.1.ebuild b/net-mail/swaks/swaks-20050709.1.ebuild
deleted file mode 100644
index 7cd7c7198fe0..000000000000
--- a/net-mail/swaks/swaks-20050709.1.ebuild
+++ /dev/null
@@ -1,35 +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/swaks/swaks-20050709.1.ebuild,v 1.4 2006/08/31 20:53:24 blubb Exp $
-
-MY_P=${P/-/.}
-DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
-HOMEPAGE="http://www.jetmore.org/john/code/#swaks"
-SRC_URI="http://www.jetmore.org/john/code/${MY_P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-IUSE="ssl"
-
-DEPEND=">=dev-lang/perl-5.8.3"
-
-RDEPEND="${DEPEND}
-		>=dev-perl/Net-DNS-0.40
-		ssl? ( >=dev-perl/Net-SSLeay-1.23 )
-		>=virtual/perl-MIME-Base64-3.00
-		>=virtual/perl-Digest-MD5-2.33
-		>=virtual/perl-Time-HiRes-1.54
-		>=dev-perl/Authen-NTLM-1.02
-		>=dev-perl/Authen-DigestMD5-0.04"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp ${DISTDIR}/${A} ${WORKDIR}
-}
-
-src_install() {
-	newbin ${MY_P} swaks
-}
-
diff --git a/net-mail/teapop/Manifest b/net-mail/teapop/Manifest
index f2c85becdd69..d03c40b7c614 100644
--- a/net-mail/teapop/Manifest
+++ b/net-mail/teapop/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX teapop-confd 143 RMD160 7db01e078539387353b7dd1bec1d80327988d62b SHA1 3275c313cb6b1e7f73f2868a05ea42f783ccb147 SHA256 f8f5b01a3e02e7713aa4d909fa35ff32a6601dd1678aeed599794a2f2e9d428a
 MD5 fa42f37eed3061bfa135eb72673414c5 files/teapop-confd 143
 RMD160 7db01e078539387353b7dd1bec1d80327988d62b files/teapop-confd 143
@@ -10,26 +13,7 @@ AUX tpop.xinetd 301 RMD160 8b19b913a55d474edc9ff7e330c384f0e5b993be SHA1 765b8b3
 MD5 c1ff745885fd91ab9bdab44961a05d92 files/tpop.xinetd 301
 RMD160 8b19b913a55d474edc9ff7e330c384f0e5b993be files/tpop.xinetd 301
 SHA256 ebc2ce32479c93e5648a195950641ddd6d03ef49a5cf160ac81844915ae73b73 files/tpop.xinetd 301
-DIST teapop-0.3.3.tar.gz 105518 RMD160 5f194c8f8359ddd07cfd92225957e5413cb0a426 SHA1 68477fba5045570b339a84a4e71b8f6307bd3ed9 SHA256 1a952956739eb7e6642bafe13f4169bef32fcb277d40c09dc07454256d85221a
-DIST teapop-0.3.5.tar.gz 139858 RMD160 09baaea821485e5266982c7773e4b208f30c01a4 SHA1 27e86a4b467f24f2527ecf15ad92cbb3471d1346 SHA256 9b223d6969e97c66eef68ef3c97083f705e91171751b885c445946113cf19d84
-DIST teapop-0.3.7.tar.gz 145741 RMD160 4aae254f84f3b3aaba2e486625d1541689a866bb SHA1 1528c9c068bbb15a012530fe534241136669018c SHA256 9f8867555984f7c43cff23ff1de8df2babd9a4baca82c4c35a91dedd6dfc298f
 DIST teapop-0.3.8.tar.gz 147098 RMD160 fce3606748c33bd71134c09d8bb3e65aaabcdfa3 SHA1 33632cc34148d88408bcb9afa5433c1a103f3cf5 SHA256 dca43b0a07a9cbe5651352d6ec631b13a9720cd3c011b67e801e13695d80539e
-EBUILD teapop-0.3.3.ebuild 1128 RMD160 76f91905d2612857aa340312e12a5ff14eabe77c SHA1 c3f56ef55a37b6a1f0286411a92ec5034d0d6ea7 SHA256 85a6e2f5575e25c4d78b7c4e36d58eb422b12a2ca6230103e68fb37ba03bbfa0
-MD5 c8af71bca7650d7eb281bacf0929a42d teapop-0.3.3.ebuild 1128
-RMD160 76f91905d2612857aa340312e12a5ff14eabe77c teapop-0.3.3.ebuild 1128
-SHA256 85a6e2f5575e25c4d78b7c4e36d58eb422b12a2ca6230103e68fb37ba03bbfa0 teapop-0.3.3.ebuild 1128
-EBUILD teapop-0.3.5.ebuild 1328 RMD160 6be886c8ea722b764a65adfedc997d23626e1fc6 SHA1 cd3e91b08de55d1bb7ff7aacd13170d084294ae0 SHA256 f2acb6c9e8960f6555c1a60079f24aea63de0ed91e1b8548ba41c58fe6d4daf2
-MD5 a4afa890d0c16182676416151e83e299 teapop-0.3.5.ebuild 1328
-RMD160 6be886c8ea722b764a65adfedc997d23626e1fc6 teapop-0.3.5.ebuild 1328
-SHA256 f2acb6c9e8960f6555c1a60079f24aea63de0ed91e1b8548ba41c58fe6d4daf2 teapop-0.3.5.ebuild 1328
-EBUILD teapop-0.3.7-r1.ebuild 1473 RMD160 325630dec713461392ba479a36dda70a5463996b SHA1 cfb53a21b753cb016088eba9da2fbdecc03da692 SHA256 a9fa60ad8547f0eeefa3795c9b36ef41cbfd945a061291347cee5c60966d539b
-MD5 e60769ebb22e6eef9c7bfa0b87cad78d teapop-0.3.7-r1.ebuild 1473
-RMD160 325630dec713461392ba479a36dda70a5463996b teapop-0.3.7-r1.ebuild 1473
-SHA256 a9fa60ad8547f0eeefa3795c9b36ef41cbfd945a061291347cee5c60966d539b teapop-0.3.7-r1.ebuild 1473
-EBUILD teapop-0.3.7.ebuild 1326 RMD160 7b6b5032a8875910d9042eff8c064092aded28fa SHA1 3331fc4ba8e210c1f3c59cf248bbc8e44c6f84a4 SHA256 ffe5b743c6c986d566c1c4c11c205b2599d69c6e8b3810b4a49c870f02c298e6
-MD5 4d8de652ec721ef3675aaf5798f7a23a teapop-0.3.7.ebuild 1326
-RMD160 7b6b5032a8875910d9042eff8c064092aded28fa teapop-0.3.7.ebuild 1326
-SHA256 ffe5b743c6c986d566c1c4c11c205b2599d69c6e8b3810b4a49c870f02c298e6 teapop-0.3.7.ebuild 1326
 EBUILD teapop-0.3.8-r1.ebuild 1571 RMD160 0c7ac6e46c181207f88a8748dbb3c9a0733696c0 SHA1 c336fa61fb14aae3b683e14e1557ca1f898e91cf SHA256 23e5f6ab88791a9bf51e1e44db9ac74842fc5fb451fca683462e9f9fdc787ce8
 MD5 5d679e200c2ffee4f2a695a951305a2b teapop-0.3.8-r1.ebuild 1571
 RMD160 0c7ac6e46c181207f88a8748dbb3c9a0733696c0 teapop-0.3.8-r1.ebuild 1571
@@ -38,29 +22,24 @@ EBUILD teapop-0.3.8.ebuild 1508 RMD160 3f37a6db949eb210221a90ade55a50ac4c529147
 MD5 7ff31de605c12c9b7533f451789c4a8c teapop-0.3.8.ebuild 1508
 RMD160 3f37a6db949eb210221a90ade55a50ac4c529147 teapop-0.3.8.ebuild 1508
 SHA256 1524d65deafaaef600845ca01b35d33cfd6e866b6f6e442733a518ec88630785 teapop-0.3.8.ebuild 1508
-MISC ChangeLog 3176 RMD160 49cabdfe5ef3b1b6ab2455bb515367bf177556d7 SHA1 1a438d56ae7ae8942e0649c200c53d758df6cf48 SHA256 24c4b46cb7fce30b2e4eb45d210af5d7b4ef06cdbf03c015157157b48ccfcb59
-MD5 e5ae0bd5f13790ff56014438dd1dbc34 ChangeLog 3176
-RMD160 49cabdfe5ef3b1b6ab2455bb515367bf177556d7 ChangeLog 3176
-SHA256 24c4b46cb7fce30b2e4eb45d210af5d7b4ef06cdbf03c015157157b48ccfcb59 ChangeLog 3176
+MISC ChangeLog 3353 RMD160 f61ce5cab7945f2b12b11dc9e75cdc33faa565b6 SHA1 321f256dba2681bd9812f05bedea9323fc8f154c SHA256 dc2600e6f86846a26fe9d121a5f1d4bbcd936cd543358c5ab7b2238bd19fc842
+MD5 6427b64a14ae3bf5c61d536fcb625536 ChangeLog 3353
+RMD160 f61ce5cab7945f2b12b11dc9e75cdc33faa565b6 ChangeLog 3353
+SHA256 dc2600e6f86846a26fe9d121a5f1d4bbcd936cd543358c5ab7b2238bd19fc842 ChangeLog 3353
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 03547f3d943d811d9d390866f8cf7de5 files/digest-teapop-0.3.3 238
-RMD160 e2dc2dab4b6884c53d37419e73be472c23ef70d4 files/digest-teapop-0.3.3 238
-SHA256 315789fa3f6d1bc95962e07967de1835405e08220009eae572de8899869d0aaf files/digest-teapop-0.3.3 238
-MD5 b9e0d8556237b506210a69eb0e1444bc files/digest-teapop-0.3.5 238
-RMD160 66501dd0a5ce6c052bbe6380e463c446cf90296d files/digest-teapop-0.3.5 238
-SHA256 56105928f31559d31accbfa8dfa0dc25d4c320fea5f37cf6e7a7d112cbaa2a1e files/digest-teapop-0.3.5 238
-MD5 796349cc8598ccd292af28afd4bc8450 files/digest-teapop-0.3.7 238
-RMD160 673f8f9c37751d420265182061c4e62966d15f9d files/digest-teapop-0.3.7 238
-SHA256 2f6debf97786f1a6ca3caae8204a7257e6a84837fd21a9677ac954058eca540f files/digest-teapop-0.3.7 238
-MD5 796349cc8598ccd292af28afd4bc8450 files/digest-teapop-0.3.7-r1 238
-RMD160 673f8f9c37751d420265182061c4e62966d15f9d files/digest-teapop-0.3.7-r1 238
-SHA256 2f6debf97786f1a6ca3caae8204a7257e6a84837fd21a9677ac954058eca540f files/digest-teapop-0.3.7-r1 238
 MD5 fd7f80f1b1000eeefcce56a4e5bccd08 files/digest-teapop-0.3.8 238
 RMD160 25e1d88da8d04fa2105e5bcc2f2512c97e4181d2 files/digest-teapop-0.3.8 238
 SHA256 66f79d3c5f87d3037d8c7d013b9da19ea20defbc03237e6798ff858814081d08 files/digest-teapop-0.3.8 238
 MD5 fd7f80f1b1000eeefcce56a4e5bccd08 files/digest-teapop-0.3.8-r1 238
 RMD160 25e1d88da8d04fa2105e5bcc2f2512c97e4181d2 files/digest-teapop-0.3.8-r1 238
 SHA256 66f79d3c5f87d3037d8c7d013b9da19ea20defbc03237e6798ff858814081d08 files/digest-teapop-0.3.8-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnvioViELBEf1JB0RAoQeAJ0bdlr03gJbPYp09DsbCeQSVrU/4wCeO2Sm
+5vp0TnmONnDo1/n2iEd3vXg=
+=WjQd
+-----END PGP SIGNATURE-----
diff --git a/net-mail/teapop/files/digest-teapop-0.3.3 b/net-mail/teapop/files/digest-teapop-0.3.3
deleted file mode 100644
index e0cd0340440c..000000000000
--- a/net-mail/teapop/files/digest-teapop-0.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d59e385aec8f1796439aecc81d87cc41 teapop-0.3.3.tar.gz 105518
-RMD160 5f194c8f8359ddd07cfd92225957e5413cb0a426 teapop-0.3.3.tar.gz 105518
-SHA256 1a952956739eb7e6642bafe13f4169bef32fcb277d40c09dc07454256d85221a teapop-0.3.3.tar.gz 105518
diff --git a/net-mail/teapop/files/digest-teapop-0.3.5 b/net-mail/teapop/files/digest-teapop-0.3.5
deleted file mode 100644
index 881086c63758..000000000000
--- a/net-mail/teapop/files/digest-teapop-0.3.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 65fdea12d76c1ed45d65689f48f7f994 teapop-0.3.5.tar.gz 139858
-RMD160 09baaea821485e5266982c7773e4b208f30c01a4 teapop-0.3.5.tar.gz 139858
-SHA256 9b223d6969e97c66eef68ef3c97083f705e91171751b885c445946113cf19d84 teapop-0.3.5.tar.gz 139858
diff --git a/net-mail/teapop/files/digest-teapop-0.3.7 b/net-mail/teapop/files/digest-teapop-0.3.7
deleted file mode 100644
index 228a88509867..000000000000
--- a/net-mail/teapop/files/digest-teapop-0.3.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0e67030968e48e4307df854d433cc6f4 teapop-0.3.7.tar.gz 145741
-RMD160 4aae254f84f3b3aaba2e486625d1541689a866bb teapop-0.3.7.tar.gz 145741
-SHA256 9f8867555984f7c43cff23ff1de8df2babd9a4baca82c4c35a91dedd6dfc298f teapop-0.3.7.tar.gz 145741
diff --git a/net-mail/teapop/files/digest-teapop-0.3.7-r1 b/net-mail/teapop/files/digest-teapop-0.3.7-r1
deleted file mode 100644
index 228a88509867..000000000000
--- a/net-mail/teapop/files/digest-teapop-0.3.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0e67030968e48e4307df854d433cc6f4 teapop-0.3.7.tar.gz 145741
-RMD160 4aae254f84f3b3aaba2e486625d1541689a866bb teapop-0.3.7.tar.gz 145741
-SHA256 9f8867555984f7c43cff23ff1de8df2babd9a4baca82c4c35a91dedd6dfc298f teapop-0.3.7.tar.gz 145741
diff --git a/net-mail/teapop/teapop-0.3.3.ebuild b/net-mail/teapop/teapop-0.3.3.ebuild
deleted file mode 100644
index e00e80490ad6..000000000000
--- a/net-mail/teapop/teapop-0.3.3.ebuild
+++ /dev/null
@@ -1,47 +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/teapop/teapop-0.3.3.ebuild,v 1.14 2004/07/15 02:28:25 agriffis Exp $
-
-DESCRIPTION="Tiny POP3 server"
-SRC_URI="ftp://ftp.toontown.org/pub/teapop/${P}.tar.gz"
-HOMEPAGE="http://www.toontown.org/teapop/"
-DEPEND=""
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc"
-IUSE="mysql postgres"
-
-src_compile() {
-	local myconf
-	use mysql && myconf="${myconf} --enable-mysql"
-	use postgres && myconf="${myconf} --enable-pgsql"
-	econf \
-		--enable-lock=flock,dotlock \
-		--enable-homespool=mail \
-		--enable-mailspool=/var/spool/mail \
-		--enable-apop \
-		${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		install || die
-
-	dodir /usr/sbin
-	mv ${D}/usr/libexec/teapop ${D}/usr/sbin/
-
-	dodoc doc/{CREDITS,ChangeLog,INSTALL,TODO}
-
-	docinto contrib
-	dodoc contrib/{README,popauther3.pl,teapop+exim.txt}
-	dohtml contrib/*.html
-
-	docinto rfc
-	dodoc rfc/rfc*.txt
-}
diff --git a/net-mail/teapop/teapop-0.3.5.ebuild b/net-mail/teapop/teapop-0.3.5.ebuild
deleted file mode 100644
index 65fabf676e6f..000000000000
--- a/net-mail/teapop/teapop-0.3.5.ebuild
+++ /dev/null
@@ -1,51 +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/teapop/teapop-0.3.5.ebuild,v 1.12 2006/11/23 16:10:40 vivo Exp $
-
-DESCRIPTION="Tiny POP3 server"
-SRC_URI="ftp://ftp.toontown.org/pub/teapop/${P}.tar.gz"
-HOMEPAGE="http://www.toontown.org/teapop/"
-DEPEND="virtual/libc
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )"
-IUSE="mysql postgres ldap"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~sparc"
-
-src_compile() {
-	local myconf
-	use mysql && myconf="${myconf} --with-mysql=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use ldap && myconf="${myconf} --with-ldap=openldap"
-	econf \
-		--enable-lock=flock,dotlock \
-		--enable-homespool=mail \
-		--enable-mailspool=/var/spool/mail \
-		--enable-apop \
-		${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodir /usr/sbin
-	mv ${D}/usr/libexec/teapop ${D}/usr/sbin/
-
-	dodoc doc/{CREDITS,ChangeLog,INSTALL,TODO}
-
-	docinto contrib
-	dodoc contrib/{README,popauther3.pl,teapop+exim.txt}
-	dohtml contrib/*.html
-
-	docinto rfc
-	dodoc rfc/rfc*.txt
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/teapop-init teapop
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/teapop-confd teapop
-}
diff --git a/net-mail/teapop/teapop-0.3.7-r1.ebuild b/net-mail/teapop/teapop-0.3.7-r1.ebuild
deleted file mode 100644
index 2ca0369772ba..000000000000
--- a/net-mail/teapop/teapop-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,57 +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/teapop/teapop-0.3.7-r1.ebuild,v 1.6 2006/11/23 16:10:40 vivo Exp $
-
-DESCRIPTION="Tiny POP3 server"
-SRC_URI="ftp://ftp.toontown.org/pub/teapop/${P}.tar.gz"
-HOMEPAGE="http://www.toontown.org/teapop/"
-DEPEND="virtual/libc
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	java? ( virtual/jre )"
-IUSE="ipv6 java ldap mysql postgres tcpd"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~sparc"
-
-src_compile() {
-	local myconf
-	use mysql && myconf="${myconf} --with-mysql=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use ldap && myconf="${myconf} --with-ldap=openldap"
-
-	econf \
-		--enable-lock=flock,dotlock \
-		--enable-homespool=mail \
-		--enable-mailspool=/var/spool/mail \
-		--enable-apop \
-		$( use_enable ipv6 ) \
-		$( use_with tcpd ) \
-		$( use_with java ) \
-		${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodir /usr/sbin
-	mv ${D}/usr/libexec/teapop ${D}/usr/sbin/
-
-	dodoc doc/{CREDITS,ChangeLog,INSTALL,TODO}
-
-	docinto contrib
-	dodoc contrib/{README,popauther3.pl,teapop+exim.txt}
-	dohtml contrib/*.html
-
-	docinto rfc
-	dodoc rfc/rfc*.txt
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/teapop-init teapop
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/teapop-confd teapop
-}
diff --git a/net-mail/teapop/teapop-0.3.7.ebuild b/net-mail/teapop/teapop-0.3.7.ebuild
deleted file mode 100644
index bc78963859e0..000000000000
--- a/net-mail/teapop/teapop-0.3.7.ebuild
+++ /dev/null
@@ -1,51 +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/teapop/teapop-0.3.7.ebuild,v 1.5 2006/11/23 16:10:40 vivo Exp $
-
-DESCRIPTION="Tiny POP3 server"
-SRC_URI="ftp://ftp.toontown.org/pub/teapop/${P}.tar.gz"
-HOMEPAGE="http://www.toontown.org/teapop/"
-DEPEND="virtual/libc
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )"
-IUSE="mysql postgres ldap"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc"
-
-src_compile() {
-	local myconf
-	use mysql && myconf="${myconf} --with-mysql=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use ldap && myconf="${myconf} --with-ldap=openldap"
-	econf \
-		--enable-lock=flock,dotlock \
-		--enable-homespool=mail \
-		--enable-mailspool=/var/spool/mail \
-		--enable-apop \
-		${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodir /usr/sbin
-	mv ${D}/usr/libexec/teapop ${D}/usr/sbin/
-
-	dodoc doc/{CREDITS,ChangeLog,INSTALL,TODO}
-
-	docinto contrib
-	dodoc contrib/{README,popauther3.pl,teapop+exim.txt}
-	dohtml contrib/*.html
-
-	docinto rfc
-	dodoc rfc/rfc*.txt
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/teapop-init teapop
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/teapop-confd teapop
-}
diff --git a/net-mail/tnef/Manifest b/net-mail/tnef/Manifest
index bc595b92cb14..ce52af306c25 100644
--- a/net-mail/tnef/Manifest
+++ b/net-mail/tnef/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 DIST tnef-1.3.3.tar.gz 1640238
 DIST tnef-1.3.4.tar.gz 1641599 RMD160 7babdbe0c0b652780f513660ee6d1ac837ec2700 SHA1 6129cc171dd10576c124940886e20e3634980669 SHA256 cf1d7e98609f99f0957dde98aaa14c29b5d3964d1babb00aa1a59ed7d34242b1
-DIST tnef-1.4.1.tar.gz 3911959 RMD160 3fa76ffd0561b0f711fa7174fbc1f0b1468f299c SHA1 d3cb3daf93a2a68f63f875838a9fdca1f96c5147 SHA256 7875f81ee06d3bc11621fe7c75a44d030eea9b71f0804b3a8f637cc20411c468
 DIST tnef-1.4.3.tar.gz 3920517 RMD160 a94ab3ff029eeb2ff20f2cce8a64043cf10f3e97 SHA1 699be103018ee985b1a1edc865c7047816571577 SHA256 be2d852bead0df591da8eaf0d36a79fedbe7dc0d577ade110a189e86405965af
 EBUILD tnef-1.3.3.ebuild 645 RMD160 aa9ad3ceb6b49083f9f3aa15a28a5686d0db6e9c SHA1 8893b4861ed00a43ac710e061b6cbe3720a0a863 SHA256 e8f57c2f72a68a39bfcd709ab47967b63cb4c613024cc62790a240dd52749efe
 MD5 6b8c2163c189c7ae604d7bb72e3b542a tnef-1.3.3.ebuild 645
@@ -13,18 +12,14 @@ EBUILD tnef-1.3.4.ebuild 646 RMD160 2f619bb71d3343ac7552efbe79f92fcc6dba4d0f SHA
 MD5 a6595dcf8e39790043b923c795a1abbe tnef-1.3.4.ebuild 646
 RMD160 2f619bb71d3343ac7552efbe79f92fcc6dba4d0f tnef-1.3.4.ebuild 646
 SHA256 380759703f884c07cb7fa94113db8c1b1d0e8c38d8acd6b0a154f41ec2b1b232 tnef-1.3.4.ebuild 646
-EBUILD tnef-1.4.1.ebuild 649 RMD160 8e5f4aa15a8a932866117df83e5c4b4e094850e2 SHA1 2f1830660104214085c2a7ec5d681f9432db8af9 SHA256 89dfa8788a7c217500cccbdfb2e43009c61b0f1318af21acef92a7c2134d0172
-MD5 5a69d50b1607691107a50a600ca58ef2 tnef-1.4.1.ebuild 649
-RMD160 8e5f4aa15a8a932866117df83e5c4b4e094850e2 tnef-1.4.1.ebuild 649
-SHA256 89dfa8788a7c217500cccbdfb2e43009c61b0f1318af21acef92a7c2134d0172 tnef-1.4.1.ebuild 649
 EBUILD tnef-1.4.3.ebuild 625 RMD160 d095356475b46ddfbaf857b2708e27f1330deb36 SHA1 f9d4be3de91a7ed974ba8e766aab199c344a0abb SHA256 71e988e3b8f21343d5312ecaead04d3b043e7de0c532c3a681521a057604eb0c
 MD5 83aca7f3f2c4c6373f859cc1bc1493f1 tnef-1.4.3.ebuild 625
 RMD160 d095356475b46ddfbaf857b2708e27f1330deb36 tnef-1.4.3.ebuild 625
 SHA256 71e988e3b8f21343d5312ecaead04d3b043e7de0c532c3a681521a057604eb0c tnef-1.4.3.ebuild 625
-MISC ChangeLog 3171 RMD160 c02544e7b91238f602a0bce345f402888c71f532 SHA1 dd873d0e9d2a3a65617ca1d70a8b9798f7974715 SHA256 a71923f32876327d07d4592b36dd029f8b1ee06118920bd3c42ef92f3b1eb51a
-MD5 2196cb2485da7937b076cccade5b34f8 ChangeLog 3171
-RMD160 c02544e7b91238f602a0bce345f402888c71f532 ChangeLog 3171
-SHA256 a71923f32876327d07d4592b36dd029f8b1ee06118920bd3c42ef92f3b1eb51a ChangeLog 3171
+MISC ChangeLog 3274 RMD160 3861ac8461baf98e1c998deaceb5b1029176de22 SHA1 de7e98da2c205a676bd9bbbecb57738ca210011f SHA256 873a26c04224b1f3c05f14dac20b0afcdae6c226c6756427333f64442af46422
+MD5 6d395533e18fd2f32a759fdd6e05874e ChangeLog 3274
+RMD160 3861ac8461baf98e1c998deaceb5b1029176de22 ChangeLog 3274
+SHA256 873a26c04224b1f3c05f14dac20b0afcdae6c226c6756427333f64442af46422 ChangeLog 3274
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -35,16 +30,13 @@ SHA256 5e417b544f29e264582f2878a8a466e2eb0aeac42f42e6bfcdd3a878d4eca12c files/di
 MD5 8e59494d863ac134bc388c478d3a7fba files/digest-tnef-1.3.4 235
 RMD160 63a784606a28e5e2d52d72d0cc28fb724b50a2be files/digest-tnef-1.3.4 235
 SHA256 510e21a304a1a0865cf9e125005e0a33bb9e040762f80450012d77c1ac4fa0f4 files/digest-tnef-1.3.4 235
-MD5 07ccebc7ae9907ad0bd870ce6eacbe67 files/digest-tnef-1.4.1 235
-RMD160 beb834e3c47c597f34b79eccc0c8df46638b715e files/digest-tnef-1.4.1 235
-SHA256 e5fe2c30b518675bf06c45692b10eb17f5b3cad9d520d4115c901935d61c2b96 files/digest-tnef-1.4.1 235
 MD5 634caf3fb67e2700a47e06008ea812b1 files/digest-tnef-1.4.3 235
 RMD160 d2888d664793d4fcc0fa0320d46e29137833719f files/digest-tnef-1.4.3 235
 SHA256 a2c1812de32d90bee43e5798badf878a61f0a7bb1903c22bcc68609c71845d3d files/digest-tnef-1.4.3 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFJxHzQlM6RnzZP+IRAm55AKCtP3qVmLLafqXgnMSJqRApG7wDKQCgvakw
-ZCIYCvuipS1T5OynH/+a6+o=
-=KYsZ
+iD8DBQFFnvj+ViELBEf1JB0RAgYmAKCBjchJ9PY2f1JMVZ3QUMLto/7fZgCggUA7
+qZ4yB7lCiH5xjTzjXyIwJl8=
+=UJA/
 -----END PGP SIGNATURE-----
diff --git a/net-mail/tnef/files/digest-tnef-1.4.1 b/net-mail/tnef/files/digest-tnef-1.4.1
deleted file mode 100644
index bbb013fab5fa..000000000000
--- a/net-mail/tnef/files/digest-tnef-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 da62095fb539d647567ffa5231c056e5 tnef-1.4.1.tar.gz 3911959
-RMD160 3fa76ffd0561b0f711fa7174fbc1f0b1468f299c tnef-1.4.1.tar.gz 3911959
-SHA256 7875f81ee06d3bc11621fe7c75a44d030eea9b71f0804b3a8f637cc20411c468 tnef-1.4.1.tar.gz 3911959
diff --git a/net-mail/tnef/tnef-1.4.1.ebuild b/net-mail/tnef/tnef-1.4.1.ebuild
deleted file mode 100644
index 264e4e586d10..000000000000
--- a/net-mail/tnef/tnef-1.4.1.ebuild
+++ /dev/null
@@ -1,26 +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/tnef/tnef-1.4.1.ebuild,v 1.1 2006/07/21 21:42:49 tsunam Exp $
-
-DESCRIPTION="Decodes MS-TNEF MIME attachments"
-SRC_URI="mirror://sourceforge/tnef/${P}.tar.gz"
-HOMEPAGE="http://world.std.com/~damned/software.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	rm -rf ${D}/usr/man
-	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
-	doman doc/tnef.1
-}
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index 2b4a5252f60f..6b3c818b7a3f 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -26,32 +26,25 @@ MD5 7fe0f2231e5e0d8b491a8c9780048ac3 files/uw-ipop3s.xinetd 469
 RMD160 28b09d47e577643c08f959ed09b7b63371c4e029 files/uw-ipop3s.xinetd 469
 SHA256 fa2c408770b27f29ea25297540f2bc0789f2e5bd98f72f48a9f1659df3d39264 files/uw-ipop3s.xinetd 469
 DIST imap-2004g.tar.Z 2246713 RMD160 a016a06ba073e879d2574a6395ce1074ea74c687 SHA1 791a8bb247ca51ce0a4c32e814a2f736c2bcf066 SHA256 958ab8a6a8b5a1a53167793141fe5bf1fbafc012be1d3f70a21f5f2f493ffa6d
-EBUILD uw-imap-2004g-r1.ebuild 5250 RMD160 40678d65b21804cc7da75cfafc3868ccb53e4ec4 SHA1 69e2b6a5d548793cc46b40647df890400801ad5d SHA256 8ee405990a2344a02c0b750bec8c3973f6a4508978ffa96384a75fa0ce26acc4
-MD5 41a06da8e230daf94eda062cf15b9dad uw-imap-2004g-r1.ebuild 5250
-RMD160 40678d65b21804cc7da75cfafc3868ccb53e4ec4 uw-imap-2004g-r1.ebuild 5250
-SHA256 8ee405990a2344a02c0b750bec8c3973f6a4508978ffa96384a75fa0ce26acc4 uw-imap-2004g-r1.ebuild 5250
 EBUILD uw-imap-2004g-r2.ebuild 5194 RMD160 d021eaf56d566d8f58b2d6ca503bf1aabf3f4989 SHA1 bf13cd32b4c408307acd94e115751b46279376bc SHA256 245e8d1cf1f303b4b23c9f0875bf7af3fc333294f7b3e3a067c9c0c42d355d44
 MD5 5a9971ac3a47092a89411ebf952f153c uw-imap-2004g-r2.ebuild 5194
 RMD160 d021eaf56d566d8f58b2d6ca503bf1aabf3f4989 uw-imap-2004g-r2.ebuild 5194
 SHA256 245e8d1cf1f303b4b23c9f0875bf7af3fc333294f7b3e3a067c9c0c42d355d44 uw-imap-2004g-r2.ebuild 5194
-MISC ChangeLog 13294 RMD160 2ce93de1a86765483497a278dddad9e3a068c084 SHA1 70abf0dbf138a23154d940136fd0e403307c23e5 SHA256 1cbbfaef7b923764d2962cb923df56692d7d97a0ddef92e37e9db49ba1bafa7c
-MD5 f4b8f5dbbd157c83526ca0911cd8c77c ChangeLog 13294
-RMD160 2ce93de1a86765483497a278dddad9e3a068c084 ChangeLog 13294
-SHA256 1cbbfaef7b923764d2962cb923df56692d7d97a0ddef92e37e9db49ba1bafa7c ChangeLog 13294
+MISC ChangeLog 13405 RMD160 89ad01578b7f5dd95fadc98d215d1f620c00e3d2 SHA1 979cf6b15d36a95a04c433e767b1db2256237c01 SHA256 425734c5c336004aa57eb53ad48a4d287e146c10a7fb07d2ed2c80d5c0294546
+MD5 c69aaa3834b5011b5c4c07b12ead5893 ChangeLog 13405
+RMD160 89ad01578b7f5dd95fadc98d215d1f620c00e3d2 ChangeLog 13405
+SHA256 425734c5c336004aa57eb53ad48a4d287e146c10a7fb07d2ed2c80d5c0294546 ChangeLog 13405
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 0d5d414d07402759de9342401655183d files/digest-uw-imap-2004g-r1 232
-RMD160 aef5a82d8b7b979859d4e1c7ec1ae3f5f94897d7 files/digest-uw-imap-2004g-r1 232
-SHA256 6e923a6cf0c59497531bb8ad3ed5e77a50f113a7579b46d90716540d17528fd4 files/digest-uw-imap-2004g-r1 232
 MD5 0d5d414d07402759de9342401655183d files/digest-uw-imap-2004g-r2 232
 RMD160 aef5a82d8b7b979859d4e1c7ec1ae3f5f94897d7 files/digest-uw-imap-2004g-r2 232
 SHA256 6e923a6cf0c59497531bb8ad3ed5e77a50f113a7579b46d90716540d17528fd4 files/digest-uw-imap-2004g-r2 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFJvfdQlM6RnzZP+IRAvR+AJ4oO4/j361VRRp3x9sAVdyksLAkZQCfSxrK
-/tvo6UjEOnZJJNvjtIkmo/M=
-=4TlJ
+iD8DBQFFnvlhViELBEf1JB0RAipQAJ4i9YWDOMvHZwnE8s+sDm3dUvlhdACeL0nF
+pOsXR3Z0nBDsbRPyqBNK4sY=
+=wAkY
 -----END PGP SIGNATURE-----
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2004g-r1 b/net-mail/uw-imap/files/digest-uw-imap-2004g-r1
deleted file mode 100644
index a058c31903b4..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2004g-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9a80f58d8d6a0979c13714ae69050020 imap-2004g.tar.Z 2246713
-RMD160 a016a06ba073e879d2574a6395ce1074ea74c687 imap-2004g.tar.Z 2246713
-SHA256 958ab8a6a8b5a1a53167793141fe5bf1fbafc012be1d3f70a21f5f2f493ffa6d imap-2004g.tar.Z 2246713
diff --git a/net-mail/uw-imap/uw-imap-2004g-r1.ebuild b/net-mail/uw-imap/uw-imap-2004g-r1.ebuild
deleted file mode 100644
index 02ad77c8db17..000000000000
--- a/net-mail/uw-imap/uw-imap-2004g-r1.ebuild
+++ /dev/null
@@ -1,189 +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/uw-imap/uw-imap-2004g-r1.ebuild,v 1.10 2006/10/07 00:41:03 ticho Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="imap-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="ipv6 ssl pic kerberos clearpasswd"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="!net-mail/vimap
-	!virtual/imap-c-client
-	>=net-mail/uw-mailutils-2004g
-	virtual/libc
-	>=sys-libs/pam-0.72
-	>=net-mail/mailbase-0.00-r8
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )"
-
-RDEPEND="${DEPEND}
-	sys-apps/xinetd"
-
-pkg_setup() {
-	echo
-	if use clearpasswd; then
-		ewarn "Building uw-imap with cleartext LOGIN allowed. Disable \"clearpasswd\" USE"
-		ewarn "flag to restrict cleartext LOGIN to SSL/TLS sessions only."
-	else
-		if use ssl; then
-			ewarn "Building uw-imap with cleartext LOGIN restricted to SSL/TLS sessions only."
-			ewarn "Enable \"clearpasswd\" flag to allow unrestricted cleartext LOGIN."
-		else
-			ewarn "You have disabled SSL for uw-imap, but want cleartext passwords restricted to"
-			ewarn "SSL/TLS sessions only. Either enable \"ssl\" USE flag, or \"clearpasswd\""
-			ewarn "USE flag."
-			die "Impossible USE flag combination, see above message"
-		fi
-	fi
-	echo
-	# ewarn people not using pam with this file
-	if ! built_with_use net-mail/mailbase pam ; then
-		echo
-		ewarn "It is needed to have the net-mail/mailbase package"
-		ewarn "  built with the pam use flag activated. Please rebuild"
-		ewarn "  net-mail/mailbase with pam activated."
-		echo
-		die "mailbase has to be built with pam use flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-
-	cd ${S}
-
-	if use amd64; then
-		# Now we must make all the individual Makefiles use different CFLAGS,
-		# otherwise they would all use -fPIC
-		sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-			src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-			src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-			|| die "sed failed patching Makefile CFLAGS."
-		# Now there is only c-client left, which should be built with -fPIC
-		append-flags -fPIC
-		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${PN}-2004c-amd64-so-fix.patch
-	fi
-
-	use pic || use alpha && append-flags -fPIC
-
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-
-	# Uncomment this for MBX support
-	#cp Makefile Makefile.orig2
-	#sed \
-	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
-	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
-	#	< Makefile.orig2 > Makefile
-}
-
-src_compile() {
-	local mymake
-	local ipver
-	ipver="IP=4"
-
-	use ipv6 && echo ipv6
-	use kerberos && echo kerberos
-	use ssl && echo ssl
-	use ipv6 && ipver="IP=6"
-	use kerberos \
-	  && mymake="EXTRAAUTHENTICATORS=gss"
-	if use ssl; then
-		cd ${S}
-		echo ${mymake}
-		if use clearpasswd; then
-			yes | make lnp ${mymake} ${ipver} SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" || die
-		else
-			yes | make lnp ${mymake} ${ipver} SSLTYPE=unix.nopwd EXTRACFLAGS="${CFLAGS}" || die
-		fi
-
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		yes | make lnp ${mymake} ${ipver} SSLTYPE=none EXTRACFLAGS="${CFLAGS}" || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mlock/mlock
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	if use amd64; then
-		dolib.so c-client/libc-client.so.1.0.0
-		cd ${D}/usr/$(get_libdir)
-		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1.0.0 libc-client.so
-	fi
-
-	cd ${S}
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,misc,smtp,nntp}.h
-	doins c-client/linkage.{c,h}
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# gentoo config stuff
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-ipop3s.xinetd ipop3s
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
diff --git a/net-mail/vimap/Manifest b/net-mail/vimap/Manifest
index eaaa93af4032..e6001cd9a0ab 100644
--- a/net-mail/vimap/Manifest
+++ b/net-mail/vimap/Manifest
@@ -1,51 +1,55 @@
-MD5 8bd4ad24bc5c5bda8376cb219f70a0e9 ChangeLog 2793
-RMD160 063c2a3a254ae8479e5215b61bdf3cd49ff7a9b4 ChangeLog 2793
-SHA256 b0c985f30657d9b26e379e89a51099944a9277117f051c20701d7380d71d1437 ChangeLog 2793
-MD5 701215f06507cf05887c2f87c1c86a66 files/digest-vimap-2002c 325
-RMD160 fdb6462769ff51411064c7a74f925f9e2c4b03d9 files/digest-vimap-2002c 325
-SHA256 a2762fbc11539ec22af8febe0902bbec34a9015e92d5025f246bb41553f597c6 files/digest-vimap-2002c 325
-MD5 701215f06507cf05887c2f87c1c86a66 files/digest-vimap-2002c-r1 325
-RMD160 fdb6462769ff51411064c7a74f925f9e2c4b03d9 files/digest-vimap-2002c-r1 325
-SHA256 a2762fbc11539ec22af8febe0902bbec34a9015e92d5025f246bb41553f597c6 files/digest-vimap-2002c-r1 325
-MD5 701215f06507cf05887c2f87c1c86a66 files/digest-vimap-2002c-r2 325
-RMD160 fdb6462769ff51411064c7a74f925f9e2c4b03d9 files/digest-vimap-2002c-r2 325
-SHA256 a2762fbc11539ec22af8febe0902bbec34a9015e92d5025f246bb41553f597c6 files/digest-vimap-2002c-r2 325
-MD5 701215f06507cf05887c2f87c1c86a66 files/digest-vimap-2002c-r3 325
-RMD160 fdb6462769ff51411064c7a74f925f9e2c4b03d9 files/digest-vimap-2002c-r3 325
-SHA256 a2762fbc11539ec22af8febe0902bbec34a9015e92d5025f246bb41553f597c6 files/digest-vimap-2002c-r3 325
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX uw-imap.pam-system-auth 344 RMD160 83119b2960c3dadfd4def18368382c69787b6d2c SHA1 eb4ebaa698bd31eb943eea074c2418f73c129a10 SHA256 36b853138232649786b754ffd55d23ded8e85c4f5048a5806262a18e358e38f9
 MD5 28c291d52426cc5d25be57406f14e096 files/uw-imap.pam-system-auth 344
 RMD160 83119b2960c3dadfd4def18368382c69787b6d2c files/uw-imap.pam-system-auth 344
 SHA256 36b853138232649786b754ffd55d23ded8e85c4f5048a5806262a18e358e38f9 files/uw-imap.pam-system-auth 344
+AUX uw-imap.xinetd 492 RMD160 f38b90d562f02f2387a729d35b6a60490f9ee203 SHA1 3b056aba7aa0ec7709e0fdbac05c50f873d33bc8 SHA256 d935692a8e7433ca1194cfad0ce48a9d2fe6013873f569a826c1ed2fd595aa8d
 MD5 b9265aebc1d378faf06199471ceabc4f files/uw-imap.xinetd 492
 RMD160 f38b90d562f02f2387a729d35b6a60490f9ee203 files/uw-imap.xinetd 492
 SHA256 d935692a8e7433ca1194cfad0ce48a9d2fe6013873f569a826c1ed2fd595aa8d files/uw-imap.xinetd 492
+AUX uw-imaps.xinetd 487 RMD160 bc4d2c6ea873bbf313e5728688d9776290b1eab1 SHA1 998081dbbc5006a429be52dc1ca96a8a30a0b712 SHA256 a501426cc717b70b69cb729069466de448048f5f8f78c379aaf8d4bd61c8be5a
 MD5 a801fe6d35ae75b0abeb6e410b3b6ea2 files/uw-imaps.xinetd 487
 RMD160 bc4d2c6ea873bbf313e5728688d9776290b1eab1 files/uw-imaps.xinetd 487
 SHA256 a501426cc717b70b69cb729069466de448048f5f8f78c379aaf8d4bd61c8be5a files/uw-imaps.xinetd 487
+AUX uw-ipop2.xinetd 564 RMD160 3c750a01697ec9e997b94408ef3a9b0e889dc2ab SHA1 a31fec18ddf140fec2d80899064d8791bbc77e24 SHA256 f6aab06935f38b2c423cfa44a20a6bfc3f947143fb4c40a460712e6c8d8ea85d
 MD5 2cc8deb01d6efd5a650d6fc5519289bd files/uw-ipop2.xinetd 564
 RMD160 3c750a01697ec9e997b94408ef3a9b0e889dc2ab files/uw-ipop2.xinetd 564
 SHA256 f6aab06935f38b2c423cfa44a20a6bfc3f947143fb4c40a460712e6c8d8ea85d files/uw-ipop2.xinetd 564
+AUX uw-ipop3.xinetd 473 RMD160 6743466d3b178995fa0a1229fedda5713395a234 SHA1 319ba93e3d58addbf99735607ea3936032d73b6e SHA256 bf073c9c44bd707f8ab6686090a50acc967c6d1a13c7db2c8b55aad54778c409
 MD5 fbd30c975d120429f29509866d292745 files/uw-ipop3.xinetd 473
 RMD160 6743466d3b178995fa0a1229fedda5713395a234 files/uw-ipop3.xinetd 473
 SHA256 bf073c9c44bd707f8ab6686090a50acc967c6d1a13c7db2c8b55aad54778c409 files/uw-ipop3.xinetd 473
+AUX uw-ipop3s.xinetd 474 RMD160 d12bd772752f8ab83b3c84180ba1ef9b45a6e1c6 SHA1 c90581450fcdb2f6bea5f361cb5c7b334259ffa7 SHA256 e771aca41925e4a1e05d292b4b3b3f3df0c1af9c700bdf25d2e7a0d19d7892f2
 MD5 c6e5f24322fad9b16d63b1e08ca3bee8 files/uw-ipop3s.xinetd 474
 RMD160 d12bd772752f8ab83b3c84180ba1ef9b45a6e1c6 files/uw-ipop3s.xinetd 474
 SHA256 e771aca41925e4a1e05d292b4b3b3f3df0c1af9c700bdf25d2e7a0d19d7892f2 files/uw-ipop3s.xinetd 474
+AUX vimap-2002c-amd64-so-fix.patch 675 RMD160 f13adf21e7043175d2b2dd356b2ba48554e9e99f SHA1 fd6aad7b87d71795cb3e9bdee29b70ca72b289e9 SHA256 8f80dff390a5d87afd71ab07bbff0eed00acb14b3bfa2355f33ba22e833af202
 MD5 cde23dc2375a8c33998202c8f0c9ae0e files/vimap-2002c-amd64-so-fix.patch 675
 RMD160 f13adf21e7043175d2b2dd356b2ba48554e9e99f files/vimap-2002c-amd64-so-fix.patch 675
 SHA256 8f80dff390a5d87afd71ab07bbff0eed00acb14b3bfa2355f33ba22e833af202 files/vimap-2002c-amd64-so-fix.patch 675
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
-SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 82ac18149e7adc13ab027958e9e77283 vimap-2002c-r1.ebuild 3662
-RMD160 281e7313502a586cc54acda5e23b6e761ac73ea1 vimap-2002c-r1.ebuild 3662
-SHA256 a0df679a4e49ee3e310413e31a00841a12b9d7401ba733b7d04c72a9da3c9cd1 vimap-2002c-r1.ebuild 3662
-MD5 ffb2ee83e29e994d129048f4ad420213 vimap-2002c-r2.ebuild 4141
-RMD160 aedb6839f6e1cc8420900e7527d03131d6f9b7ed vimap-2002c-r2.ebuild 4141
-SHA256 97214d8d422a7319b72056461e11e9eff302bdd02098864f38dac101e14767e0 vimap-2002c-r2.ebuild 4141
+DIST imap-2002c-virtual.patch.bz2 10394 RMD160 65ad46273b559467c14e0c42427badbc286c1fd1 SHA256 55ff4d38b762cadda5e408f8a4cef3adbb3266b5a0cb31b0cee567f06eb70f0a
+DIST imap-2002c1.tar.Z 2111395
+EBUILD vimap-2002c-r3.ebuild 4721 RMD160 268441cc344ed65bad4a19bb280f43136e8ec567 SHA1 3408f15fa54b95ea8a02c09e7da14a7ca98d326e SHA256 ce18082457d83ba59f1033b9b80f849898c84c2d4db8a71f19923c9e4dbd42e3
 MD5 3dff1fa38781f491d880c60682ead313 vimap-2002c-r3.ebuild 4721
 RMD160 268441cc344ed65bad4a19bb280f43136e8ec567 vimap-2002c-r3.ebuild 4721
 SHA256 ce18082457d83ba59f1033b9b80f849898c84c2d4db8a71f19923c9e4dbd42e3 vimap-2002c-r3.ebuild 4721
-MD5 09a8be7d5fb7836609ffc35371998c56 vimap-2002c.ebuild 2735
-RMD160 bedf87b5b2a198f4805e95ade78dc4bd3e244b7a vimap-2002c.ebuild 2735
-SHA256 0be6f3a9e2304e62598e32e90b30a9c2b58d67e1b227aa1e33b4bc394d5dbfdb vimap-2002c.ebuild 2735
+MISC ChangeLog 2947 RMD160 bcdff6c474f1380dca88fae03c5a436183af08f0 SHA1 a59a92a6e11c73128bdd14d396ff4173a176c7bc SHA256 e1f645a8d19dbe40e8c883b3a493d1e3eab31d48ac4c85dc57fbe975346ca215
+MD5 ba698db8ba340104abbf637d669238c4 ChangeLog 2947
+RMD160 bcdff6c474f1380dca88fae03c5a436183af08f0 ChangeLog 2947
+SHA256 e1f645a8d19dbe40e8c883b3a493d1e3eab31d48ac4c85dc57fbe975346ca215 ChangeLog 2947
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+MD5 701215f06507cf05887c2f87c1c86a66 files/digest-vimap-2002c-r3 325
+RMD160 fdb6462769ff51411064c7a74f925f9e2c4b03d9 files/digest-vimap-2002c-r3 325
+SHA256 a2762fbc11539ec22af8febe0902bbec34a9015e92d5025f246bb41553f597c6 files/digest-vimap-2002c-r3 325
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnvmHViELBEf1JB0RAuutAJ0ZnPKEJp2O+qpOVHgCiDmR122wbwCfdxdt
+kC5KYIcabwJwOHymYN6TUS8=
+=1eRt
+-----END PGP SIGNATURE-----
diff --git a/net-mail/vimap/files/digest-vimap-2002c b/net-mail/vimap/files/digest-vimap-2002c
deleted file mode 100644
index 57f19bea2a0c..000000000000
--- a/net-mail/vimap/files/digest-vimap-2002c
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0ec3cd52bf3e7064a3d9e60a5ac16291 imap-2002c-virtual.patch.bz2 10394
-RMD160 65ad46273b559467c14e0c42427badbc286c1fd1 imap-2002c-virtual.patch.bz2 10394
-SHA256 55ff4d38b762cadda5e408f8a4cef3adbb3266b5a0cb31b0cee567f06eb70f0a imap-2002c-virtual.patch.bz2 10394
-MD5 90c255dcf3ee373e3fb174ea5d820f4d imap-2002c1.tar.Z 2111395
diff --git a/net-mail/vimap/files/digest-vimap-2002c-r1 b/net-mail/vimap/files/digest-vimap-2002c-r1
deleted file mode 100644
index 57f19bea2a0c..000000000000
--- a/net-mail/vimap/files/digest-vimap-2002c-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0ec3cd52bf3e7064a3d9e60a5ac16291 imap-2002c-virtual.patch.bz2 10394
-RMD160 65ad46273b559467c14e0c42427badbc286c1fd1 imap-2002c-virtual.patch.bz2 10394
-SHA256 55ff4d38b762cadda5e408f8a4cef3adbb3266b5a0cb31b0cee567f06eb70f0a imap-2002c-virtual.patch.bz2 10394
-MD5 90c255dcf3ee373e3fb174ea5d820f4d imap-2002c1.tar.Z 2111395
diff --git a/net-mail/vimap/files/digest-vimap-2002c-r2 b/net-mail/vimap/files/digest-vimap-2002c-r2
deleted file mode 100644
index 57f19bea2a0c..000000000000
--- a/net-mail/vimap/files/digest-vimap-2002c-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0ec3cd52bf3e7064a3d9e60a5ac16291 imap-2002c-virtual.patch.bz2 10394
-RMD160 65ad46273b559467c14e0c42427badbc286c1fd1 imap-2002c-virtual.patch.bz2 10394
-SHA256 55ff4d38b762cadda5e408f8a4cef3adbb3266b5a0cb31b0cee567f06eb70f0a imap-2002c-virtual.patch.bz2 10394
-MD5 90c255dcf3ee373e3fb174ea5d820f4d imap-2002c1.tar.Z 2111395
diff --git a/net-mail/vimap/vimap-2002c-r1.ebuild b/net-mail/vimap/vimap-2002c-r1.ebuild
deleted file mode 100644
index 4d3dbf8e2ff0..000000000000
--- a/net-mail/vimap/vimap-2002c-r1.ebuild
+++ /dev/null
@@ -1,132 +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/vimap/vimap-2002c-r1.ebuild,v 1.2 2006/03/06 20:41:40 blubb Exp $
-
-inherit eutils flag-o-matic
-
-S=${WORKDIR}/imap-2002c1
-
-DESCRIPTION="Linuxconf style virtual domain patched UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/imap-2002c1.tar.Z
-		mirror://gentoo/imap-2002c-virtual.patch.bz2"
-HOMEPAGE="http://www.washington.edu/imap/ http://vimap.sf.net/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~hppa ~alpha"
-IUSE="ssl"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-	cd ${S}
-	epatch ${WORKDIR}/imap-2002c-virtual.patch
-	if use amd64; then
-		# Now we must make all the individual Makefiles use different CFLAGS,
-		# otherwise they would all use -fPIC
-		sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-			src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-			src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-			|| die "sed failed patching Makefile CFLAGS."
-		# Now there is only c-client left, which should be built with -fPIC
-		append-flags -fPIC
-		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
-	fi
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-	cd ${S}
-}
-
-src_compile() {
-	if use ssl; then
-		cd ${S}
-
-		yes | make lnp ${mymake} ${ipver} \
-			SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="-lcrypt" || die
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		yes | make lnp ${mymake} ${ipver} \
-			SSLTYPE=none EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="-lcrypt" || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	if use amd64; then
-		dolib.so c-client/libc-client.so*
-		cd ${D}/usr/$(get_libdir)
-		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1 libc-client.so
-	fi
-
-	cd ${S}
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam-system-auth imap
-	newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-ipop3s.xinetd ipop3s
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
diff --git a/net-mail/vimap/vimap-2002c-r2.ebuild b/net-mail/vimap/vimap-2002c-r2.ebuild
deleted file mode 100644
index 49a40c288fb3..000000000000
--- a/net-mail/vimap/vimap-2002c-r2.ebuild
+++ /dev/null
@@ -1,152 +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/vimap/vimap-2002c-r2.ebuild,v 1.2 2006/03/06 20:41:40 blubb Exp $
-
-inherit eutils flag-o-matic
-
-S=${WORKDIR}/imap-2002c1
-
-DESCRIPTION="Linuxconf style virtual domain patched UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/imap-2002c1.tar.Z
-		mirror://gentoo/imap-2002c-virtual.patch.bz2"
-HOMEPAGE="http://www.washington.edu/imap/ http://vimap.sf.net/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~hppa ~alpha"
-IUSE="ssl"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-
-RDEPEND=">=net-mail/mailbase-0.00-r8"
-
-DEPEND="
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )"
-
-pkg_setup() {
-	# Warn people with pam flag deactivated.
-	if ! built_with_use net-mail/mailbase pam;
-	then
-		echo
-		ewarn "It is recommended to have the net-mail/mailbase package"
-		ewarn "  built with the pam use flag activated. Please rebuild"
-		ewarn "  net-mail/mailbase with pam activated."
-		echo
-		epause 3
-	fi
-}
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-	cd ${S}
-	epatch ${WORKDIR}/imap-2002c-virtual.patch
-	if use amd64; then
-		# Now we must make all the individual Makefiles use different CFLAGS,
-		# otherwise they would all use -fPIC
-		sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-			src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-			src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-			|| die "sed failed patching Makefile CFLAGS."
-		# Now there is only c-client left, which should be built with -fPIC
-		append-flags -fPIC
-		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
-	fi
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-	cd ${S}
-}
-
-src_compile() {
-	if use ssl; then
-		cd ${S}
-
-		yes | make lnp ${mymake} ${ipver} \
-			SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="-lcrypt" || die
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		yes | make lnp ${mymake} ${ipver} \
-			SSLTYPE=none EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="-lcrypt" || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	if use amd64; then
-		dolib.so c-client/libc-client.so*
-		cd ${D}/usr/$(get_libdir)
-		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1 libc-client.so
-	fi
-
-	cd ${S}
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	## pam.d files are provided by mailbase
-	#   unless mailbase wasn't built with pam.
-	if ! built_with_use net-mail/mailbase pam;
-	then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/uw-imap.pam-system-auth imap
-		newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-ipop3s.xinetd ipop3s
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
diff --git a/net-mail/vimap/vimap-2002c.ebuild b/net-mail/vimap/vimap-2002c.ebuild
deleted file mode 100644
index 5405ee91f0a6..000000000000
--- a/net-mail/vimap/vimap-2002c.ebuild
+++ /dev/null
@@ -1,108 +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/vimap/vimap-2002c.ebuild,v 1.11 2006/03/06 20:41:40 blubb Exp $
-
-inherit eutils
-
-S=${WORKDIR}/imap-2002c1
-
-DESCRIPTION="Linuxconf style virtual domain patched UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/imap-2002c1.tar.Z
-		mirror://gentoo//imap-2002c-virtual.patch.bz2"
-HOMEPAGE="http://www.washington.edu/imap/ http://vimap.sf.net/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc ppc hppa alpha"
-IUSE="ssl"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="!net-mail/uw-imap
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-	cd ${S}
-	epatch ${WORKDIR}/imap-2002c-virtual.patch
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-	cd ${S}
-}
-
-src_compile() {
-	if use ssl; then
-		cd ${S}
-		yes | make lnv SSLTYPE=unix || die
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		yes | make lnp SSLTYPE=none || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam-system-auth imap
-	newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-ipop3s.xinetd ipop3s
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
-- 
2.26.2