Remove old versions. Stable on amd64.

(Portage version: 2.1.1-r2)
 (Signed Manifest commit)

8 files changed, 12 insertions, 505 deletions

diff --git a/net-mail/vmailmgr/Manifest b/net-mail/vmailmgr/Manifest
index 5ce70d1fc1d3..8b702927dc4d 100644
--- a/net-mail/vmailmgr/Manifest
+++ b/net-mail/vmailmgr/Manifest
@@ -13,18 +13,6 @@ AUX socket-file 35 RMD160 e3a599cc2b2b839bc1817ee426109bf60fb77f1d SHA1 7a6a462f
 MD5 bf55605617fc5acfdca3a28a796e82a4 files/socket-file 35
 RMD160 e3a599cc2b2b839bc1817ee426109bf60fb77f1d files/socket-file 35
 SHA256 78bd0a8d33cbfc9b8db0a907fa4b6f48271c58f351d4a9ed7d7bbe0f01d0bd5c files/socket-file 35
-AUX vmailmgr-0.96.9-gcc3.3.patch 3494 RMD160 83f5376abaed4da948c773596b38ab6672de5470 SHA1 447aa02fc1eefc2d238dddaa8369192c680c5f58 SHA256 c87cb666b57b3842af02b09b754a115f96e467496bf743ad7670cad5af9abfa8
-MD5 fcb3e0b872a5f1719f7b9aa76eac8eba files/vmailmgr-0.96.9-gcc3.3.patch 3494
-RMD160 83f5376abaed4da948c773596b38ab6672de5470 files/vmailmgr-0.96.9-gcc3.3.patch 3494
-SHA256 c87cb666b57b3842af02b09b754a115f96e467496bf743ad7670cad5af9abfa8 files/vmailmgr-0.96.9-gcc3.3.patch 3494
-AUX vmailmgr-0.96.9-gentoo-r2.patch 4939 RMD160 0cf1d1fff44abe077ff93db73d5791997358263d SHA1 5e34431dc9107741f5c01356c1b05f39cdf5ef19 SHA256 44c42fa72b1b35df16c313be3e92bbc0fe64deafa43be3f28131e2aef3a327f7
-MD5 d8e019e2a0047f70578608f16b233489 files/vmailmgr-0.96.9-gentoo-r2.patch 4939
-RMD160 0cf1d1fff44abe077ff93db73d5791997358263d files/vmailmgr-0.96.9-gentoo-r2.patch 4939
-SHA256 44c42fa72b1b35df16c313be3e92bbc0fe64deafa43be3f28131e2aef3a327f7 files/vmailmgr-0.96.9-gentoo-r2.patch 4939
-AUX vmailmgr-0.96.9-gentoo-r3.patch 5109 RMD160 142b150027e97abcc1159c7022e66af79a1333f7 SHA1 c531c51f8533b9220cfc58f37536204bf6c0dff1 SHA256 0428d685ce21d11e2194e8d8fe4cde7512a2a7ff69f924c513e256a1f145938f
-MD5 106e71c406367cc524e732c7e0b70749 files/vmailmgr-0.96.9-gentoo-r3.patch 5109
-RMD160 142b150027e97abcc1159c7022e66af79a1333f7 files/vmailmgr-0.96.9-gentoo-r3.patch 5109
-SHA256 0428d685ce21d11e2194e8d8fe4cde7512a2a7ff69f924c513e256a1f145938f files/vmailmgr-0.96.9-gentoo-r3.patch 5109
 AUX vmailmgr-0.97-gentoo.patch 2179 RMD160 15bc6eee92095b7c0c48e90dbea2e0868f52224c SHA1 f2413effe1b1ebb63ba7e1e16356598b6b01941a SHA256 6bd37dfd99908ffc4273e8966f1cfba347e0745034f2f67d2edd47ad4d4d2e9f
 MD5 898e0b827e2e230bb84f4e58dfca368b files/vmailmgr-0.97-gentoo.patch 2179
 RMD160 15bc6eee92095b7c0c48e90dbea2e0868f52224c files/vmailmgr-0.97-gentoo.patch 2179
@@ -33,41 +21,26 @@ AUX vmailmgr-0.97-no-authvmailmgr.patch 6197 RMD160 e54bb3b30a3bfbe2fb040bd2d047
 MD5 2757698f66f98b27d5e23fdc2a9a2e44 files/vmailmgr-0.97-no-authvmailmgr.patch 6197
 RMD160 e54bb3b30a3bfbe2fb040bd2d0478839b76bff7a files/vmailmgr-0.97-no-authvmailmgr.patch 6197
 SHA256 bc54490b9bf6cc3f4850f80cc045ebdf01977f805115a3aa67ff5a2a29ac66bd files/vmailmgr-0.97-no-authvmailmgr.patch 6197
-DIST vmailmgr-0.96.9.tar.gz 362379 RMD160 652b50c4acc4776fec2319db4956cf1e4936d41a SHA1 42e4410c29482d9a5c0490a1f5a71899b2f75d94 SHA256 1538cfd0822c23e57cff5a016c6248cc6ad8280d3708a58eb2ba1ea21dde6b29
 DIST vmailmgr-0.97.tar.gz 635160 RMD160 802a6fe30d5b0d5a6c6c50ea089ca2d90671f0c6 SHA1 0d97c8fd6df79001dd4f3b842a145089333eae8c SHA256 6266873db29991bf74c912e8423cee5ebf11b3b944ea413682d6b75634c399c2
-EBUILD vmailmgr-0.96.9-r2.ebuild 1644 RMD160 3204be42196a708e39bc8f9638d38e33cbc3fc01 SHA1 e05def52005dd01ebf6934e6d1a839ea3b2cd63b SHA256 dd1e23a55730b601aebe964ed810f90c97246e7f78d844f89ddf0f16c60fb504
-MD5 ccbcd62fcb2f8a6143c108147f78e68f vmailmgr-0.96.9-r2.ebuild 1644
-RMD160 3204be42196a708e39bc8f9638d38e33cbc3fc01 vmailmgr-0.96.9-r2.ebuild 1644
-SHA256 dd1e23a55730b601aebe964ed810f90c97246e7f78d844f89ddf0f16c60fb504 vmailmgr-0.96.9-r2.ebuild 1644
-EBUILD vmailmgr-0.96.9-r3.ebuild 1645 RMD160 cae6e8ceb94463329fb07cb56205440ec142f7b0 SHA1 9c25e6cd56d8a7ee5723b75d47c4ff179b043743 SHA256 b3a18e8056c854e151870c230a36896b78d4cb73fb47f29b674c89008b16cc89
-MD5 68fc95ecff8428697a46f9bb4a5bd2a8 vmailmgr-0.96.9-r3.ebuild 1645
-RMD160 cae6e8ceb94463329fb07cb56205440ec142f7b0 vmailmgr-0.96.9-r3.ebuild 1645
-SHA256 b3a18e8056c854e151870c230a36896b78d4cb73fb47f29b674c89008b16cc89 vmailmgr-0.96.9-r3.ebuild 1645
-EBUILD vmailmgr-0.97.ebuild 1927 RMD160 5ef402d57823a00b88fb04ba4b6cb9da9c390461 SHA1 46d2d5361c6742b97a6007cc36b490c66e717d56 SHA256 18e0973c56872d92b7639f122104a0feab2ee7272a2b0674dc27297adeaf67e5
-MD5 20ec535f83525a6798c576657fc00c0e vmailmgr-0.97.ebuild 1927
-RMD160 5ef402d57823a00b88fb04ba4b6cb9da9c390461 vmailmgr-0.97.ebuild 1927
-SHA256 18e0973c56872d92b7639f122104a0feab2ee7272a2b0674dc27297adeaf67e5 vmailmgr-0.97.ebuild 1927
-MISC ChangeLog 3904 RMD160 4fd61b671bb8e8cba9948542c5f43f371cc679a8 SHA1 e7d3d1da6a73222e26947b1585bddc3a07b092e3 SHA256 9ea08f97043b596aad3109020eb9f138b4027ea9bcc5c8da5e74c2901e0e5f67
-MD5 dd963effa4e4d0f2ee5cbdb0bf8a2436 ChangeLog 3904
-RMD160 4fd61b671bb8e8cba9948542c5f43f371cc679a8 ChangeLog 3904
-SHA256 9ea08f97043b596aad3109020eb9f138b4027ea9bcc5c8da5e74c2901e0e5f67 ChangeLog 3904
+EBUILD vmailmgr-0.97.ebuild 1924 RMD160 00fab9037fed678d1b61581e61d5dbadf688d60e SHA1 15981feb2048ce1e0bc83dee238dfcae2892724a SHA256 276287682363def01353d07d97b779d656eab459f0909b41b30549846f68210f
+MD5 02de6515eb7eee2cf8748f15a9f42be3 vmailmgr-0.97.ebuild 1924
+RMD160 00fab9037fed678d1b61581e61d5dbadf688d60e vmailmgr-0.97.ebuild 1924
+SHA256 276287682363def01353d07d97b779d656eab459f0909b41b30549846f68210f vmailmgr-0.97.ebuild 1924
+MISC ChangeLog 4194 RMD160 a8097038438539b6186f6752eb3f0f0b85515beb SHA1 21e1c39a5483b54900b73422b4b4f2b64163180c SHA256 e6b4381a0cf922b487aa71241c90ae992ac49dc2889b2a2a6d2691f25017b0a9
+MD5 2dda88ac3d42b5946d3f2e723badc2ad ChangeLog 4194
+RMD160 a8097038438539b6186f6752eb3f0f0b85515beb ChangeLog 4194
+SHA256 e6b4381a0cf922b487aa71241c90ae992ac49dc2889b2a2a6d2691f25017b0a9 ChangeLog 4194
 MISC metadata.xml 250 RMD160 b7b640f08b38ac03c0d05e894492d59f085915ab SHA1 192a308a4ecebe3a59f384ce5d21ab2ed129c543 SHA256 8d0be60fefa54f1b4cdd3d02e373a8b9e8162c2f022296cb224b8d36f99418b3
 MD5 911634f611838bc9b119dfb48b047c35 metadata.xml 250
 RMD160 b7b640f08b38ac03c0d05e894492d59f085915ab metadata.xml 250
 SHA256 8d0be60fefa54f1b4cdd3d02e373a8b9e8162c2f022296cb224b8d36f99418b3 metadata.xml 250
-MD5 376a186cbafb01d25cef573b3f34596f files/digest-vmailmgr-0.96.9-r2 247
-RMD160 8a11aefc3302e6f7a9da847585f1c65521da9c39 files/digest-vmailmgr-0.96.9-r2 247
-SHA256 4eacb0d2e8e83b503c24c478101bb35be831c7df2dd4bc82231f8ba166bf0146 files/digest-vmailmgr-0.96.9-r2 247
-MD5 376a186cbafb01d25cef573b3f34596f files/digest-vmailmgr-0.96.9-r3 247
-RMD160 8a11aefc3302e6f7a9da847585f1c65521da9c39 files/digest-vmailmgr-0.96.9-r3 247
-SHA256 4eacb0d2e8e83b503c24c478101bb35be831c7df2dd4bc82231f8ba166bf0146 files/digest-vmailmgr-0.96.9-r3 247
 MD5 a650521ea057484fb96e96062c0b4059 files/digest-vmailmgr-0.97 241
 RMD160 a50a3ad46e8fd5f147571f24416b927d7dc22ae3 files/digest-vmailmgr-0.97 241
 SHA256 ff7d449ebe25a12da7988e168ea966a4f287f78bdf776cbcfcb09405324042ce files/digest-vmailmgr-0.97 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFdXmHKRy60XGEcJIRAikHAKCWtb2zdGOJtJHmcY4/0s/aqHz3LwCePVuq
-esRITMeF3DUXDg5pazILTGA=
-=1M5f
+iD8DBQFFqrEvJnxX6mF440QRAsCeAKDD1kYIgJW8G+nry8anftECgstSuQCg2+7w
+F7w3MJ3ugUWrzg/FwZSjJak=
+=i9zx
 -----END PGP SIGNATURE-----
diff --git a/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r2 b/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r2
deleted file mode 100644
index dee8a9e3386d..000000000000
--- a/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8d2bb288eeacb799985e8af2c7101c1 vmailmgr-0.96.9.tar.gz 362379
-RMD160 652b50c4acc4776fec2319db4956cf1e4936d41a vmailmgr-0.96.9.tar.gz 362379
-SHA256 1538cfd0822c23e57cff5a016c6248cc6ad8280d3708a58eb2ba1ea21dde6b29 vmailmgr-0.96.9.tar.gz 362379
diff --git a/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r3 b/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r3
deleted file mode 100644
index dee8a9e3386d..000000000000
--- a/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8d2bb288eeacb799985e8af2c7101c1 vmailmgr-0.96.9.tar.gz 362379
-RMD160 652b50c4acc4776fec2319db4956cf1e4936d41a vmailmgr-0.96.9.tar.gz 362379
-SHA256 1538cfd0822c23e57cff5a016c6248cc6ad8280d3708a58eb2ba1ea21dde6b29 vmailmgr-0.96.9.tar.gz 362379
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gcc3.3.patch b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gcc3.3.patch
deleted file mode 100644
index 8ac557628df3..000000000000
--- a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gcc3.3.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur vmailmgr-0.96.9.orig/commands/vcheckquota.cc vmailmgr-0.96.9/commands/vcheckquota.cc
---- vmailmgr-0.96.9.orig/commands/vcheckquota.cc	2000-08-19 19:05:57.000000000 +0200
-+++ vmailmgr-0.96.9/commands/vcheckquota.cc	2003-12-06 13:06:22.293442000 +0100
-@@ -31,10 +31,10 @@
- 
- const char* cli_program = "vcheckquota";
- const char* cli_help_prefix = "vmailmgr quota enforcement program\n";
--const char* cli_help_suffix = "
--Warning: the soft-message is linked into the users maildir once for each
--message that is received while the account is over its soft quota.  This may
--result in multiple warning messages.\n";
-+const char* cli_help_suffix = "\n"
-+"Warning: the soft-message is linked into the users maildir once for each\n"
-+"message that is received while the account is over its soft quota.  This may\n"
-+"result in multiple warning messages.\n";
- const char* cli_args_usage = "";
- const int cli_args_min = 0;
- const int cli_args_max = 0;
-diff -ur vmailmgr-0.96.9.orig/commands/vchforwards.cc vmailmgr-0.96.9/commands/vchforwards.cc
---- vmailmgr-0.96.9.orig/commands/vchforwards.cc	2000-08-16 04:08:35.000000000 +0200
-+++ vmailmgr-0.96.9/commands/vchforwards.cc	2003-12-06 13:06:06.349761000 +0100
-@@ -25,8 +25,7 @@
- const char* cli_help_prefix =
- "Change virtual user forwarding addresses.\n";
- const char* cli_help_suffix =
--"If no forwarding addresses are given, forwarding is disabled.
--";
-+"If no forwarding addresses are given, forwarding is disabled.\n";
- const char* cli_args_usage = "USERNAME [DESTINATION1 ...]";
- const int cli_args_min = 1;
- const int cli_args_max = -1;
-diff -ur vmailmgr-0.96.9.orig/commands/vpasswd2cdb.cc vmailmgr-0.96.9/commands/vpasswd2cdb.cc
---- vmailmgr-0.96.9.orig/commands/vpasswd2cdb.cc	2000-08-16 04:02:01.000000000 +0200
-+++ vmailmgr-0.96.9/commands/vpasswd2cdb.cc	2003-12-06 13:05:47.972435000 +0100
-@@ -26,10 +26,10 @@
- 
- const char* cli_program = "vpasswd2cdb";
- const char* cli_help_prefix = "Converts text password tables to CDB format\n";
--const char* cli_help_suffix =
--"Reads in a standard virtual password table in the current directory,
--and writes it out to a CDB table.  The file names for the text and CDB
--tables are determined from the configuration file.";
-+const char* cli_help_suffix = "\n"
-+"Reads in a standard virtual password table in the current directory,\n"
-+"and writes it out to a CDB table.  The file names for the text and CDB\n"
-+"tables are determined from the configuration file.";
- const char* cli_args_usage = "";
- const int cli_args_min = 0;
- const int cli_args_max = 0;
-diff -ur vmailmgr-0.96.9.orig/commands/vpasswd2db.cc vmailmgr-0.96.9/commands/vpasswd2db.cc
---- vmailmgr-0.96.9.orig/commands/vpasswd2db.cc	2000-08-16 04:02:04.000000000 +0200
-+++ vmailmgr-0.96.9/commands/vpasswd2db.cc	2003-12-06 13:06:36.300404000 +0100
-@@ -26,9 +26,9 @@
- const char* cli_program = "vpasswd2db";
- const char* cli_help_prefix = "Converts text password tables to current vpwtable DB format\n";
- const char* cli_help_suffix =
--"Reads in a standard virtual password table in the current directory,
--and writes it out to a table.  The file names for the input and output
--tables are determined from the configuration file.";
-+"Reads in a standard virtual password table in the current directory,\n"
-+"and writes it out to a table.  The file names for the input and output\n"
-+"tables are determined from the configuration file.";
- const char* cli_args_usage = "";
- const int cli_args_min = 0;
- const int cli_args_max = 0;
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r2.patch b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r2.patch
deleted file mode 100644
index a5b12a4fb920..000000000000
--- a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r2.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -Nru vmailmgr-0.96.9.orig/authenticate/Makefile.am vmailmgr-0.96.9/authenticate/Makefile.am
---- vmailmgr-0.96.9.orig/authenticate/Makefile.am	2000-09-23 23:23:32.000000000 +0300
-+++ vmailmgr-0.96.9/authenticate/Makefile.am	2005-03-05 13:25:48.178155952 +0200
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = checkvpw vauthenticate
- authlib_PROGRAMS = authvmailmgr
--authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${prefix}/lib/courier-imap/authlib/
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-diff -Nru vmailmgr-0.96.9.orig/authenticate/Makefile.in vmailmgr-0.96.9/authenticate/Makefile.in
---- vmailmgr-0.96.9.orig/authenticate/Makefile.in	2000-10-01 07:33:29.000000000 +0300
-+++ vmailmgr-0.96.9/authenticate/Makefile.in	2005-03-05 13:25:48.178155952 +0200
-@@ -83,7 +83,7 @@
- 
- bin_PROGRAMS = checkvpw vauthenticate
- authlib_PROGRAMS = authvmailmgr
--authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${prefix}/lib/courier-imap/authlib/
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-diff -Nru vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc vmailmgr-0.96.9/authenticate/authvmailmgr.cc
---- vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc	2000-08-01 20:09:27.000000000 +0300
-+++ vmailmgr-0.96.9/authenticate/authvmailmgr.cc	2005-03-05 13:25:48.179155800 +0200
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "misc/exec.h"
- #include "authvlib.h"
- // Courier-IMAP includes
-diff -Nru vmailmgr-0.96.9.orig/authenticate/checkvpw.cc vmailmgr-0.96.9/authenticate/checkvpw.cc
---- vmailmgr-0.96.9.orig/authenticate/checkvpw.cc	2000-08-11 01:39:27.000000000 +0300
-+++ vmailmgr-0.96.9/authenticate/checkvpw.cc	2005-03-05 13:25:48.179155800 +0200
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <stdlib.h>
- #include "config/configrc.h"
- #include "misc/exec.h"
- #include "misc/stat_fns.h"
-diff -Nru vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc vmailmgr-0.96.9/authenticate/vauthenticate.cc
---- vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc	2000-08-01 21:05:31.000000000 +0300
-+++ vmailmgr-0.96.9/authenticate/vauthenticate.cc	2005-03-05 13:25:48.180155648 +0200
-@@ -17,6 +17,7 @@
- #include <config.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include "authvlib.h"
- #include "fdbuf/fdbuf.h"
- 
-diff -Nru vmailmgr-0.96.9.orig/configure vmailmgr-0.96.9/configure
---- vmailmgr-0.96.9.orig/configure	2000-10-01 07:24:23.000000000 +0300
-+++ vmailmgr-0.96.9/configure	2005-03-05 13:25:48.182155344 +0200
-@@ -2682,7 +2682,7 @@
- done
- 
- 
--cgidir='${prefix}/cgi-bin'
-+cgidir='/var/www/localhost/cgi-bin'
- 
- 
- trap '' 1 2 15
-diff -Nru vmailmgr-0.96.9.orig/lib/cdb++/cdb++.h vmailmgr-0.96.9/lib/cdb++/cdb++.h
---- vmailmgr-0.96.9.orig/lib/cdb++/cdb++.h	2000-04-05 22:11:45.000000000 +0300
-+++ vmailmgr-0.96.9/lib/cdb++/cdb++.h	2005-03-05 13:27:26.573197632 +0200
-@@ -20,8 +20,9 @@
- #include "mystring/mystring.h"
- #include "cdb++/datum.h"
- #include "fdbuf/fdbuf.h"
-+#include <inttypes.h>
- 
--typedef unsigned long uint32;
-+typedef uint32_t uint32;
- 
- #define CDBMAKE_HPLIST 1000
- 
-diff -Nru vmailmgr-0.96.9.orig/lib/misc/exec.cc vmailmgr-0.96.9/lib/misc/exec.cc
---- vmailmgr-0.96.9.orig/lib/misc/exec.cc	2000-08-03 19:35:09.000000000 +0300
-+++ vmailmgr-0.96.9/lib/misc/exec.cc	2005-03-05 13:25:48.182155344 +0200
-@@ -21,6 +21,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-+#include <string.h>
- #include "exec.h"
- #include "config/configrc.h"
- 
-diff -Nru vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc vmailmgr-0.96.9/lib/misc/keystrlist.cc
---- vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc	2000-04-03 21:22:13.000000000 +0300
-+++ vmailmgr-0.96.9/lib/misc/keystrlist.cc	2005-03-05 13:25:48.183155192 +0200
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "strlist.h"
- 
- void keystrlist::set(const mystring& var, const mystring& val)
-diff -Nru vmailmgr-0.96.9.orig/lib/misc/strlist.cc vmailmgr-0.96.9/lib/misc/strlist.cc
---- vmailmgr-0.96.9.orig/lib/misc/strlist.cc	2000-04-03 21:22:14.000000000 +0300
-+++ vmailmgr-0.96.9/lib/misc/strlist.cc	2005-03-05 13:25:48.183155192 +0200
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "strlist.h"
- 
- static const char* compare(const char* ptr, const char* end,
-diff -Nru vmailmgr-0.96.9.orig/lib/mystring/append.cc vmailmgr-0.96.9/lib/mystring/append.cc
---- vmailmgr-0.96.9.orig/lib/mystring/append.cc	2000-02-13 07:16:03.000000000 +0200
-+++ vmailmgr-0.96.9/lib/mystring/append.cc	2005-03-05 13:25:48.184155040 +0200
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "mystring.h"
- #include "trace.h"
- 
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r3.patch b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r3.patch
deleted file mode 100644
index 0c5236378eef..000000000000
--- a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r3.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Nru vmailmgr-0.96.9.orig/authenticate/Makefile.am vmailmgr-0.96.9/authenticate/Makefile.am
---- vmailmgr-0.96.9.orig/authenticate/Makefile.am	2000-09-23 14:23:32.000000000 -0600
-+++ vmailmgr-0.96.9/authenticate/Makefile.am	2005-05-23 16:23:41.264118445 -0600
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = checkvpw vauthenticate
- authlib_PROGRAMS = authvmailmgr
--authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${libdir}/courier-imap/authlib/
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-diff -Nru vmailmgr-0.96.9.orig/authenticate/Makefile.in vmailmgr-0.96.9/authenticate/Makefile.in
---- vmailmgr-0.96.9.orig/authenticate/Makefile.in	2000-09-30 22:33:29.000000000 -0600
-+++ vmailmgr-0.96.9/authenticate/Makefile.in	2005-05-23 16:23:41.265118291 -0600
-@@ -83,7 +83,7 @@
- 
- bin_PROGRAMS = checkvpw vauthenticate
- authlib_PROGRAMS = authvmailmgr
--authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${libdir}/courier-imap/authlib/
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-diff -Nru vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc vmailmgr-0.96.9/authenticate/authvmailmgr.cc
---- vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc	2000-08-01 11:09:27.000000000 -0600
-+++ vmailmgr-0.96.9/authenticate/authvmailmgr.cc	2005-05-23 16:23:41.265118291 -0600
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "misc/exec.h"
- #include "authvlib.h"
- // Courier-IMAP includes
-diff -Nru vmailmgr-0.96.9.orig/authenticate/checkvpw.cc vmailmgr-0.96.9/authenticate/checkvpw.cc
---- vmailmgr-0.96.9.orig/authenticate/checkvpw.cc	2000-08-10 16:39:27.000000000 -0600
-+++ vmailmgr-0.96.9/authenticate/checkvpw.cc	2005-05-23 16:23:41.266118138 -0600
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <stdlib.h>
- #include "config/configrc.h"
- #include "misc/exec.h"
- #include "misc/stat_fns.h"
-diff -Nru vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc vmailmgr-0.96.9/authenticate/vauthenticate.cc
---- vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc	2000-08-01 12:05:31.000000000 -0600
-+++ vmailmgr-0.96.9/authenticate/vauthenticate.cc	2005-05-23 16:23:41.266118138 -0600
-@@ -17,6 +17,7 @@
- #include <config.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include "authvlib.h"
- #include "fdbuf/fdbuf.h"
- 
-diff -Nru vmailmgr-0.96.9.orig/configure vmailmgr-0.96.9/configure
---- vmailmgr-0.96.9.orig/configure	2000-09-30 22:24:23.000000000 -0600
-+++ vmailmgr-0.96.9/configure	2005-05-23 16:30:28.481474749 -0600
-@@ -1604,7 +1604,7 @@
-   WANTPYTHON_FALSE=
- fi
- 
--phpdir="/home/httpd/php"
-+phpdir="${libdir}/php"
- 
- 
- # Extract the first word of "w3m", so it can be a program name with args.
-@@ -2682,7 +2682,7 @@
- done
- 
- 
--cgidir='${prefix}/cgi-bin'
-+cgidir='/var/www/localhost/cgi-bin'
- 
- 
- trap '' 1 2 15
-diff -Nru vmailmgr-0.96.9.orig/lib/cdb++/cdb++.h vmailmgr-0.96.9/lib/cdb++/cdb++.h
---- vmailmgr-0.96.9.orig/lib/cdb++/cdb++.h	2000-04-05 13:11:45.000000000 -0600
-+++ vmailmgr-0.96.9/lib/cdb++/cdb++.h	2005-05-23 16:23:41.269117676 -0600
-@@ -20,8 +20,9 @@
- #include "mystring/mystring.h"
- #include "cdb++/datum.h"
- #include "fdbuf/fdbuf.h"
-+#include <inttypes.h>
- 
--typedef unsigned long uint32;
-+typedef uint32_t uint32;
- 
- #define CDBMAKE_HPLIST 1000
- 
-diff -Nru vmailmgr-0.96.9.orig/lib/misc/exec.cc vmailmgr-0.96.9/lib/misc/exec.cc
---- vmailmgr-0.96.9.orig/lib/misc/exec.cc	2000-08-03 10:35:09.000000000 -0600
-+++ vmailmgr-0.96.9/lib/misc/exec.cc	2005-05-23 16:23:41.270117522 -0600
-@@ -21,6 +21,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-+#include <string.h>
- #include "exec.h"
- #include "config/configrc.h"
- 
-diff -Nru vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc vmailmgr-0.96.9/lib/misc/keystrlist.cc
---- vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc	2000-04-03 12:22:13.000000000 -0600
-+++ vmailmgr-0.96.9/lib/misc/keystrlist.cc	2005-05-23 16:23:41.270117522 -0600
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "strlist.h"
- 
- void keystrlist::set(const mystring& var, const mystring& val)
-diff -Nru vmailmgr-0.96.9.orig/lib/misc/strlist.cc vmailmgr-0.96.9/lib/misc/strlist.cc
---- vmailmgr-0.96.9.orig/lib/misc/strlist.cc	2000-04-03 12:22:14.000000000 -0600
-+++ vmailmgr-0.96.9/lib/misc/strlist.cc	2005-05-23 16:23:41.271117369 -0600
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "strlist.h"
- 
- static const char* compare(const char* ptr, const char* end,
-diff -Nru vmailmgr-0.96.9.orig/lib/mystring/append.cc vmailmgr-0.96.9/lib/mystring/append.cc
---- vmailmgr-0.96.9.orig/lib/mystring/append.cc	2000-02-12 22:16:03.000000000 -0700
-+++ vmailmgr-0.96.9/lib/mystring/append.cc	2005-05-23 16:23:41.271117369 -0600
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "mystring.h"
- #include "trace.h"
- 
diff --git a/net-mail/vmailmgr/vmailmgr-0.96.9-r2.ebuild b/net-mail/vmailmgr/vmailmgr-0.96.9-r2.ebuild
deleted file mode 100644
index 7bd2f474e484..000000000000
--- a/net-mail/vmailmgr/vmailmgr-0.96.9-r2.ebuild
+++ /dev/null
@@ -1,70 +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/vmailmgr/vmailmgr-0.96.9-r2.ebuild,v 1.4 2006/02/20 22:06:33 hansmi Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="virtual domains for qmail"
-SRC_URI="http://www.vmailmgr.org/current/${P}.tar.gz"
-HOMEPAGE="http://www.vmailmgr.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND=">=sys-apps/ucspi-unix-0.34
-	virtual/qmail
-	>=net-mail/qmail-autoresponder-0.95
-	!>=net-mail/courier-imap-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo-${PR}.patch
-
-	if [ `gcc-major-version` -eq 3 ] && [ `gcc-minor-version` -ge 3 ]; then
-		epatch ${FILESDIR}/${P}-gcc3.3.patch
-	fi
-}
-
-src_compile() {
-	export CXX=g++
-
-	if [ `gcc-major-version` -eq 3 ]; then
-		export LIBS="-lcrypt -lsupc++"
-	elif [ `gcc-major-version` -eq 2 ]; then
-		export LIBS="-lcrypt"
-	fi
-
-	econf || die "./configure failed"
-
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS INSTALL README TODO NEWS
-
-	exeinto /var/lib/supervise/vmailmgrd
-	newexe ${S}/scripts/vmailmgrd.run run
-
-	exeinto /var/lib/supervise/vmailmgrd/log
-	newexe ${S}/scripts/vmailmgrd-log.run run
-
-	exeinto /etc/vmailmgr
-	newexe ${S}/scripts/autoresponder.sh vdeliver-postdeliver
-
-	doexe ${FILESDIR}/checkvpw-loginfail
-
-	insinto /etc/vmailmgr
-	doins ${FILESDIR}/socket-file
-	doins ${FILESDIR}/separators
-}
-
-pkg_postinst() {
-	einfo "To start vmailmgrd you need to link"
-	einfo "/var/lib/supervise/vmailmgrd to /service"
-}
diff --git a/net-mail/vmailmgr/vmailmgr-0.96.9-r3.ebuild b/net-mail/vmailmgr/vmailmgr-0.96.9-r3.ebuild
deleted file mode 100644
index 15e349873a1c..000000000000
--- a/net-mail/vmailmgr/vmailmgr-0.96.9-r3.ebuild
+++ /dev/null
@@ -1,70 +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/vmailmgr/vmailmgr-0.96.9-r3.ebuild,v 1.3 2006/02/20 22:06:33 hansmi Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="virtual domains for qmail"
-SRC_URI="http://www.vmailmgr.org/current/${P}.tar.gz"
-HOMEPAGE="http://www.vmailmgr.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND=">=sys-apps/ucspi-unix-0.34
-	virtual/qmail
-	>=net-mail/qmail-autoresponder-0.95
-	!>=net-mail/courier-imap-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo-${PR}.patch
-
-	if [ `gcc-major-version` -eq 3 ] && [ `gcc-minor-version` -ge 3 ]; then
-		epatch ${FILESDIR}/${P}-gcc3.3.patch
-	fi
-}
-
-src_compile() {
-	export CXX=g++
-
-	if [ `gcc-major-version` -eq 3 ]; then
-		export LIBS="-lcrypt -lsupc++"
-	elif [ `gcc-major-version` -eq 2 ]; then
-		export LIBS="-lcrypt"
-	fi
-
-	econf || die "./configure failed"
-
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS INSTALL README TODO NEWS
-
-	exeinto /var/lib/supervise/vmailmgrd
-	newexe ${S}/scripts/vmailmgrd.run run
-
-	exeinto /var/lib/supervise/vmailmgrd/log
-	newexe ${S}/scripts/vmailmgrd-log.run run
-
-	exeinto /etc/vmailmgr
-	newexe ${S}/scripts/autoresponder.sh vdeliver-postdeliver
-
-	doexe ${FILESDIR}/checkvpw-loginfail
-
-	insinto /etc/vmailmgr
-	doins ${FILESDIR}/socket-file
-	doins ${FILESDIR}/separators
-}
-
-pkg_postinst() {
-	einfo "To start vmailmgrd you need to link"
-	einfo "/var/lib/supervise/vmailmgrd to /service"
-}