Removed old ebuilds, and unneeded patches. Closes bug #160171.

Package-Manager: portage-2.1.2_rc4-r1

9 files changed, 8 insertions, 723 deletions

diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index d12a3a293bca..4fa5a6081b36 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -5,14 +5,6 @@ AUX 99vpopmail 86 RMD160 2ede3f28e75f950c46fda8b43242b3d9c9d1c55b SHA1 843a382c9
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
 RMD160 2ede3f28e75f950c46fda8b43242b3d9c9d1c55b files/99vpopmail 86
 SHA256 15c0f4c42f654492e7d41772974d91e140626fcf8670d7540fc10d608209e9a1 files/99vpopmail 86
-AUX vpopmail-5.2.1-showall.patch 754 RMD160 0ea48a7243b3536692cd8432f00430d7de8904e9 SHA1 c5d3b134407b2b4c41713af77289aef34a7ad2ac SHA256 fe0e2b78b721415b5c95b944902dbaf5f214bf01c9237fb6359429fe3a4276f9
-MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
-RMD160 0ea48a7243b3536692cd8432f00430d7de8904e9 files/vpopmail-5.2.1-showall.patch 754
-SHA256 fe0e2b78b721415b5c95b944902dbaf5f214bf01c9237fb6359429fe3a4276f9 files/vpopmail-5.2.1-showall.patch 754
-AUX vpopmail-5.4.6-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac
-MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.6-access.violation.patch 918
-RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 files/vpopmail-5.4.6-access.violation.patch 918
-SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac files/vpopmail-5.4.6-access.violation.patch 918
 AUX vpopmail-5.4.9-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac
 MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.9-access.violation.patch 918
 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 files/vpopmail-5.4.9-access.violation.patch 918
@@ -21,14 +13,6 @@ AUX vpopmail-Maildir-dotmaildir-fix.sh 1480 RMD160 691f03e6a7eee4597ef7615720618
 MD5 8c6ca78a4c32c9a267dd9c3f7e9db5f1 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
 RMD160 691f03e6a7eee4597ef7615720618bccd2c8439f files/vpopmail-Maildir-dotmaildir-fix.sh 1480
 SHA256 de2100c8f56116591870b55f953ae3358c0f65d1920d5acda3c1c00bc5c10085 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
-AUX vpopmail-cdb-Makefile.patch 363 RMD160 9e85433d347f5561495c13189d5a86b4dc569d48 SHA1 b75a9fb15452268dbbb31637e757fdfef181b42a SHA256 7b405a185e9c844faf33b3f0154c52023e8f191556cb085a3651b53dbad43a84
-MD5 4b9ecca5815031b05bd173888da4d228 files/vpopmail-cdb-Makefile.patch 363
-RMD160 9e85433d347f5561495c13189d5a86b4dc569d48 files/vpopmail-cdb-Makefile.patch 363
-SHA256 7b405a185e9c844faf33b3f0154c52023e8f191556cb085a3651b53dbad43a84 files/vpopmail-cdb-Makefile.patch 363
-AUX vpopmail-fPIC.patch 7397 RMD160 111839636b0c46bc5989037e488e40460a458f8e SHA1 64e855a15971f43bab6ec9886a230daa96d6e2c4 SHA256 d63d8f172cc213eabb03704cf55795864291e9bddbee27a845b26db48e36e774
-MD5 aa40d1572827d929f64cdcdabb71f437 files/vpopmail-fPIC.patch 7397
-RMD160 111839636b0c46bc5989037e488e40460a458f8e files/vpopmail-fPIC.patch 7397
-SHA256 d63d8f172cc213eabb03704cf55795864291e9bddbee27a845b26db48e36e774 files/vpopmail-fPIC.patch 7397
 AUX vpopmail-lazy.patch 324 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 SHA1 d24b87cc3ae340f23533390eb0cd41cc26922cb7 SHA256 aa1f8123433b82cdae554c943c8731359e226c598cea22496fdd63a11ab58fc4
 MD5 64f166cd6f9ffc206ab5842a1286b546 files/vpopmail-lazy.patch 324
 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 files/vpopmail-lazy.patch 324
@@ -41,42 +25,26 @@ AUX vpopmail.conf 466 RMD160 80bc94ab202558ad4ec044810a7ceeb9032eaad3 SHA1 69f15
 MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
 RMD160 80bc94ab202558ad4ec044810a7ceeb9032eaad3 files/vpopmail.conf 466
 SHA256 66d50ec6ba176cab96934ebc696d880d2d60d5767e19464cab54f85e54ac421e files/vpopmail.conf 466
-DIST vpopmail-5.4.13.tar.gz 434719 RMD160 16b5365b959585b1c5abe07298d38e799f47abea SHA1 1ad56a8fc4cfd8f5c40249c1627b400c104df0b8 SHA256 0cb13c797ef1dbfa858c237ed7002d9b943901d0fd8884b73d82f71936be5b97
 DIST vpopmail-5.4.16.tar.gz 453019 RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b SHA1 59d158f0e6b9516f242085101a144597fc8bf296 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a
-DIST vpopmail-5.4.6.tar.gz 425910 RMD160 7c4c94c0c4351567fe1ed2f72228dcebb7933d4f SHA1 52666f3bace15122d6fe3060e407c533ca7291dc SHA256 0e2801cb3fc0155021c628f37345df43eedab5844e15db530e114acc6485af79
-EBUILD vpopmail-5.4.13.ebuild 7677 RMD160 45cb97c0f127e246198665c64934cf0d78f2dcd5 SHA1 deb2ff6c36bbe7a7f2333637a1ec1043c8eddbc1 SHA256 f8ceeef353cc32c148cf345234a05c003bc3b22b7844ab10c76afe71a7d2a14a
-MD5 bbe088b881be882884e335dd16704796 vpopmail-5.4.13.ebuild 7677
-RMD160 45cb97c0f127e246198665c64934cf0d78f2dcd5 vpopmail-5.4.13.ebuild 7677
-SHA256 f8ceeef353cc32c148cf345234a05c003bc3b22b7844ab10c76afe71a7d2a14a vpopmail-5.4.13.ebuild 7677
 EBUILD vpopmail-5.4.16.ebuild 7601 RMD160 cc64483f9a40443eb44d604949b2f03831aa39f0 SHA1 639f2d03fb846c0602b954c6448bdbcd5042c189 SHA256 59f537799c16630d661370ff9446f765b2bb0fcea6d240014cf3f30df52040c8
 MD5 d3d0d10e875afbb04b391939710e79c0 vpopmail-5.4.16.ebuild 7601
 RMD160 cc64483f9a40443eb44d604949b2f03831aa39f0 vpopmail-5.4.16.ebuild 7601
 SHA256 59f537799c16630d661370ff9446f765b2bb0fcea6d240014cf3f30df52040c8 vpopmail-5.4.16.ebuild 7601
-EBUILD vpopmail-5.4.6-r1.ebuild 7594 RMD160 5c4190393b9e251f79afd71bc67a4fd0abb12b12 SHA1 80d3ac172ae522e4af751caf1070af3fc96ac5d1 SHA256 81450eb73cdb4f26964a82bc3726facba9c51d7667f14f85d615a03e36c99771
-MD5 19e6a6243d2ab2d3690e9564e2ec8bd0 vpopmail-5.4.6-r1.ebuild 7594
-RMD160 5c4190393b9e251f79afd71bc67a4fd0abb12b12 vpopmail-5.4.6-r1.ebuild 7594
-SHA256 81450eb73cdb4f26964a82bc3726facba9c51d7667f14f85d615a03e36c99771 vpopmail-5.4.6-r1.ebuild 7594
-MISC ChangeLog 12349 RMD160 cd2923022cc98a2dcc51ef2705899c00ff56a241 SHA1 60d35c6d488eacf45d3b90f17904e18e3ce7c614 SHA256 ba8e66722a0ef31308caaed774cc1a7d7248cf5433778ddbe56f5e4cbe51d006
-MD5 6f79f251891bea7ef229c2338450456c ChangeLog 12349
-RMD160 cd2923022cc98a2dcc51ef2705899c00ff56a241 ChangeLog 12349
-SHA256 ba8e66722a0ef31308caaed774cc1a7d7248cf5433778ddbe56f5e4cbe51d006 ChangeLog 12349
+MISC ChangeLog 12666 RMD160 3dfb4a403d87d3d48791def9b8f5782f53d29e7a SHA1 ebcc2c6db893b9bdb92a9d687716d31cb5311b4f SHA256 dc1f57e3effb0a05756ddc4cd97b002360b42194cc43d1089401a3fc1a608f71
+MD5 dbbff6b854e8cc5a112b4f263af87b96 ChangeLog 12666
+RMD160 3dfb4a403d87d3d48791def9b8f5782f53d29e7a ChangeLog 12666
+SHA256 dc1f57e3effb0a05756ddc4cd97b002360b42194cc43d1089401a3fc1a608f71 ChangeLog 12666
 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 3aea9d0e27c5255505dd00c4485e2d87 files/digest-vpopmail-5.4.13 247
-RMD160 35fb2129f652250294f3de890294835dceb6f6eb files/digest-vpopmail-5.4.13 247
-SHA256 57348053ee9fba3292a550e30bec55c0676aa56c305a3146ea8836c29a364fe5 files/digest-vpopmail-5.4.13 247
 MD5 a464df25b232aab1a73d12dde9149854 files/digest-vpopmail-5.4.16 247
 RMD160 39d6399bf7108c80b1a15f77594f2f294aca82a8 files/digest-vpopmail-5.4.16 247
 SHA256 911d2a37db98d55dfb2e9884e9fa64a529d3b29882e5c9add69d3a0d62b7201f files/digest-vpopmail-5.4.16 247
-MD5 41940b909f3928fd1c089110417861cb files/digest-vpopmail-5.4.6-r1 244
-RMD160 10810e8d7187a63d42b1f8ea76248d6b54aec5b4 files/digest-vpopmail-5.4.6-r1 244
-SHA256 a16460925abde005f0253cfed6cf47708707992726f5a664f0a6f4953103e35a files/digest-vpopmail-5.4.6-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFnhO4AiZjviIA2XgRAk4MAKDo5KC+FIbwF9fJVbhmYp2pfxaWFgCgyaJc
-JF93vAU3JYeafTh+32Mnue8=
-=XRO9
+iD8DBQFFnohEQlM6RnzZP+IRAkPPAKCygmVz0v7bU5c6QkPA18vwKTm7TgCdHkTq
+JyioYAjDhElmCFp74RV9TKs=
+=BjpY
 -----END PGP SIGNATURE-----
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.13 b/net-mail/vpopmail/files/digest-vpopmail-5.4.13
deleted file mode 100644
index fed10bbf0d61..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.4.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 da0bf4dd773ec725171dc6d41ee4b3cd vpopmail-5.4.13.tar.gz 434719
-RMD160 16b5365b959585b1c5abe07298d38e799f47abea vpopmail-5.4.13.tar.gz 434719
-SHA256 0cb13c797ef1dbfa858c237ed7002d9b943901d0fd8884b73d82f71936be5b97 vpopmail-5.4.13.tar.gz 434719
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.6-r1 b/net-mail/vpopmail/files/digest-vpopmail-5.4.6-r1
deleted file mode 100644
index 75089749a2b9..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.4.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2db38c521b5fad4d76868d2582a72221 vpopmail-5.4.6.tar.gz 425910
-RMD160 7c4c94c0c4351567fe1ed2f72228dcebb7933d4f vpopmail-5.4.6.tar.gz 425910
-SHA256 0e2801cb3fc0155021c628f37345df43eedab5844e15db530e114acc6485af79 vpopmail-5.4.6.tar.gz 425910
diff --git a/net-mail/vpopmail/files/vpopmail-5.2.1-showall.patch b/net-mail/vpopmail/files/vpopmail-5.2.1-showall.patch
deleted file mode 100644
index 31f439f22ef5..000000000000
--- a/net-mail/vpopmail/files/vpopmail-5.2.1-showall.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur vpopmail-5.2.1.orig/vuserinfo.c vpopmail-5.2.1/vuserinfo.c
---- vpopmail-5.2.1.orig/vuserinfo.c	2003-08-06 02:29:37.000000000 -0700
-+++ vpopmail-5.2.1/vuserinfo.c	2003-08-06 02:31:02.000000000 -0700
-@@ -192,7 +192,7 @@
- 				DisplayAll = 0;
- 				break;
- 			case 'a':
--				DisplayAll = 0;
-+				DisplayAll = 1;
- 				break;
- 			default:
- 				errflag = 1;
-@@ -229,6 +229,7 @@
-         printf("name:   %s\n", mypw->pw_name);
-         printf("passwd: %s\n", mypw->pw_passwd);
-         printf("clear passwd: %s\n", mypw->pw_clear_passwd);
-+        printf("comment: %s\n", mypw->pw_gecos);
-         printf("uid:    %lu\n", (long unsigned)mypw->pw_uid);
-         printf("gid:    %lu\n", (long unsigned)mypw->pw_gid);
- 
-Only in vpopmail-5.2.1: vuserinfo.c~
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.6-access.violation.patch b/net-mail/vpopmail/files/vpopmail-5.4.6-access.violation.patch
deleted file mode 100644
index 7a31fa9a3d3e..000000000000
--- a/net-mail/vpopmail/files/vpopmail-5.4.6-access.violation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.in.org	2004-06-30 22:11:08.000000000 -0700
-+++ configure.in	2004-08-22 16:45:36.279473008 -0700
-@@ -463,16 +463,16 @@
-   if test ! -d $vpopmaildir
-   then
-     AC_MSG_WARN( creating $vpopmaildir )
--    mkdir -p $vpopmaildir
--    chown $vpopmailuid $vpopmaildir
--    chgrp $vpopmailgid $vpopmaildir
--    chmod 755 $vpopmaildir
-+    mkdir -p ${D}/$vpopmaildir
-+    chown $vpopmailuid ${D}/$vpopmaildir
-+    chgrp $vpopmailgid ${D}/$vpopmaildir
-+    chmod 755 ${D}/$vpopmaildir
-   fi
-   AC_MSG_WARN( making a vpopmail etc directory )
--  mkdir $vpopmaildir/etc
--  chown $vpopmailuid "$vpopmaildir"/etc
--  chgrp $vpopmailgid "$vpopmaildir"/etc
--  chmod 755 "$vpopmaildir"/etc
-+  mkdir ${D}/$vpopmaildir/etc
-+  chown $vpopmailuid ${D}/$vpopmaildir/etc
-+  chgrp $vpopmailgid ${D}/$vpopmaildir/etc
-+  chmod 755 ${D}/$vpopmaildir/etc
- fi
- 
- #----------------------------------------------------------------------
diff --git a/net-mail/vpopmail/files/vpopmail-cdb-Makefile.patch b/net-mail/vpopmail/files/vpopmail-cdb-Makefile.patch
deleted file mode 100644
index dc2942c29c6b..000000000000
--- a/net-mail/vpopmail/files/vpopmail-cdb-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vpopmail-5.4.9/cdb/Makefile.orig	2005-04-29 17:59:48.829109280 -0400
-+++ vpopmail-5.4.9/cdb/Makefile	2005-04-29 18:00:18.645576488 -0400
-@@ -43,7 +43,7 @@
- compile: \
- warn-auto.sh conf-cc
- 	( cat warn-auto.sh; \
--	echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \
-+	echo exec "`head -n 1 conf-cc`" -fPIC '-c $${1+"$$@"}' \
- 	) > compile
- 	chmod 755 compile
diff --git a/net-mail/vpopmail/files/vpopmail-fPIC.patch b/net-mail/vpopmail/files/vpopmail-fPIC.patch
deleted file mode 100644
index 716cae833e74..000000000000
--- a/net-mail/vpopmail/files/vpopmail-fPIC.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -urN vpopmail-5.4.9-orig/Makefile.am vpopmail-5.4.9/Makefile.am
---- vpopmail-5.4.9-orig/Makefile.am	2005-05-25 14:51:18.369559672 -0400
-+++ vpopmail-5.4.9/Makefile.am	2005-05-25 14:51:48.388996024 -0400
-@@ -18,6 +18,7 @@
- 
- libvpopmail_a_SOURCES=$(COMMONSOURCES) 
- libvpopmail_a_LIBADD =  cdb/*.o
-+libvpopmail_a_CFLAGS = -fPIC
- 
- vpopmailbindir=@vpopmaildir@/bin
- vpopmailbin_PROGRAMS = vchkpw vdelivermail clearopensmtp vadddomain \
-diff -urN vpopmail-5.4.9-orig/Makefile.in vpopmail-5.4.9/Makefile.in
---- vpopmail-5.4.9-orig/Makefile.in	2005-05-25 14:51:18.369559672 -0400
-+++ vpopmail-5.4.9/Makefile.in	2005-05-25 14:53:35.568702232 -0400
-@@ -101,6 +101,7 @@
- 
- libvpopmail_a_SOURCES = $(COMMONSOURCES) 
- libvpopmail_a_LIBADD = cdb/*.o
-+libvpopmail_a_CFLAGS = -fPIC
- 
- vpopmailbindir = @vpopmaildir@/bin
- vpopmailbin_PROGRAMS = vchkpw vdelivermail clearopensmtp vadddomain \
-@@ -192,9 +193,12 @@
- 
- libvpopmail_a_AR = $(AR) cru
- libvpopmail_a_DEPENDENCIES = cdb/*.o
--am__objects_1 = vpopmail.$(OBJEXT) md5.$(OBJEXT) bigdir.$(OBJEXT) \
--	vauth.$(OBJEXT) file_lock.$(OBJEXT) vpalias.$(OBJEXT) \
--	seek.$(OBJEXT) vlimits.$(OBJEXT) maildirquota.$(OBJEXT)
-+am__objects_1 = libvpopmail_a-vpopmail.$(OBJEXT) \
-+	libvpopmail_a-md5.$(OBJEXT) libvpopmail_a-bigdir.$(OBJEXT) \
-+	libvpopmail_a-vauth.$(OBJEXT) libvpopmail_a-file_lock.$(OBJEXT) \
-+	libvpopmail_a-vpalias.$(OBJEXT) libvpopmail_a-seek.$(OBJEXT) \
-+	libvpopmail_a-vlimits.$(OBJEXT) \
-+	libvpopmail_a-maildirquota.$(OBJEXT)
- am_libvpopmail_a_OBJECTS = $(am__objects_1)
- libvpopmail_a_OBJECTS = $(am_libvpopmail_a_OBJECTS)
- vpopmailbin_PROGRAMS = vchkpw$(EXEEXT) vdelivermail$(EXEEXT) \
-@@ -327,8 +331,8 @@
- 	install-exec-recursive installdirs-recursive install-recursive \
- 	uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
--	Makefile.in aclocal.m4 config.guess config.h.in config.sub \
--	configure configure.in install-sh ltmain.sh missing \
-+	Makefile.in aclocal.m4 compile config.guess config.h.in \
-+	config.sub configure configure.in install-sh ltmain.sh missing \
- 	mkinstalldirs
- DIST_SUBDIRS = $(SUBDIRS)
- SOURCES = $(libvpopmail_a_SOURCES) $(clearopensmtp_SOURCES) $(dotqmail2valias_SOURCES) $(vaddaliasdomain_SOURCES) $(vadddomain_SOURCES) $(vadduser_SOURCES) $(valias_SOURCES) $(vchangepw_SOURCES) $(vchkpw_SOURCES) $(vconvert_SOURCES) $(vdeldomain_SOURCES) $(vdelivermail_SOURCES) $(vdeloldusers_SOURCES) $(vdeluser_SOURCES) $(vdominfo_SOURCES) $(vipmap_SOURCES) $(vkill_SOURCES) $(vmkpasswd_SOURCES) $(vmoddomlimits_SOURCES) $(vmoduser_SOURCES) $(vpasswd_SOURCES) $(vpopbull_SOURCES) $(vsetuserquota_SOURCES) $(vuserinfo_SOURCES)
-@@ -376,6 +380,15 @@
- 
- clean-noinstLIBRARIES:
- 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-+libvpopmail_a-vpopmail.$(OBJEXT): vpopmail.c
-+libvpopmail_a-md5.$(OBJEXT): md5.c
-+libvpopmail_a-bigdir.$(OBJEXT): bigdir.c
-+libvpopmail_a-vauth.$(OBJEXT): vauth.c
-+libvpopmail_a-file_lock.$(OBJEXT): file_lock.c
-+libvpopmail_a-vpalias.$(OBJEXT): vpalias.c
-+libvpopmail_a-seek.$(OBJEXT): seek.c
-+libvpopmail_a-vlimits.$(OBJEXT): vlimits.c
-+libvpopmail_a-maildirquota.$(OBJEXT): maildirquota.c
- libvpopmail.a: $(libvpopmail_a_OBJECTS) $(libvpopmail_a_DEPENDENCIES) 
- 	-rm -f libvpopmail.a
- 	$(libvpopmail_a_AR) libvpopmail.a $(libvpopmail_a_OBJECTS) $(libvpopmail_a_LIBADD)
-@@ -485,6 +498,60 @@
- 
- .c.obj:
- 	$(COMPILE) -c `cygpath -w $<`
-+
-+libvpopmail_a-vpopmail.o: vpopmail.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vpopmail.o `test -f 'vpopmail.c' || echo '$(srcdir)/'`vpopmail.c
-+
-+libvpopmail_a-vpopmail.obj: vpopmail.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vpopmail.obj `cygpath -w vpopmail.c`
-+
-+libvpopmail_a-md5.o: md5.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-md5.o `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
-+
-+libvpopmail_a-md5.obj: md5.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-md5.obj `cygpath -w md5.c`
-+
-+libvpopmail_a-bigdir.o: bigdir.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-bigdir.o `test -f 'bigdir.c' || echo '$(srcdir)/'`bigdir.c
-+
-+libvpopmail_a-bigdir.obj: bigdir.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-bigdir.obj `cygpath -w bigdir.c`
-+
-+libvpopmail_a-vauth.o: vauth.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vauth.o `test -f 'vauth.c' || echo '$(srcdir)/'`vauth.c
-+
-+libvpopmail_a-vauth.obj: vauth.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vauth.obj `cygpath -w vauth.c`
-+
-+libvpopmail_a-file_lock.o: file_lock.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-file_lock.o `test -f 'file_lock.c' || echo '$(srcdir)/'`file_lock.c
-+
-+libvpopmail_a-file_lock.obj: file_lock.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-file_lock.obj `cygpath -w file_lock.c`
-+
-+libvpopmail_a-vpalias.o: vpalias.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vpalias.o `test -f 'vpalias.c' || echo '$(srcdir)/'`vpalias.c
-+
-+libvpopmail_a-vpalias.obj: vpalias.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vpalias.obj `cygpath -w vpalias.c`
-+
-+libvpopmail_a-seek.o: seek.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-seek.o `test -f 'seek.c' || echo '$(srcdir)/'`seek.c
-+
-+libvpopmail_a-seek.obj: seek.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-seek.obj `cygpath -w seek.c`
-+
-+libvpopmail_a-vlimits.o: vlimits.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vlimits.o `test -f 'vlimits.c' || echo '$(srcdir)/'`vlimits.c
-+
-+libvpopmail_a-vlimits.obj: vlimits.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vlimits.obj `cygpath -w vlimits.c`
-+
-+libvpopmail_a-maildirquota.o: maildirquota.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-maildirquota.o `test -f 'maildirquota.c' || echo '$(srcdir)/'`maildirquota.c
-+
-+libvpopmail_a-maildirquota.obj: maildirquota.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-maildirquota.obj `cygpath -w maildirquota.c`
- uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
diff --git a/net-mail/vpopmail/vpopmail-5.4.13.ebuild b/net-mail/vpopmail/vpopmail-5.4.13.ebuild
deleted file mode 100644
index 9d1d8637cc00..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.13.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.13.ebuild,v 1.11 2007/01/05 09:00:33 flameeyes Exp $
-
-inherit eutils fixheadtails
-
-# TODO: all ldap, sybase support
-#MY_PV=${PV/_/-}
-#MY_P=${PN}-${MY_PV}
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc sparc x86"
-IUSE="mysql ipalias clearpasswd"
-# vpopmail will NOT build if non-root.
-RESTRICT="nouserpriv"
-DEPEND_COMMON="virtual/qmail
-	mysql? ( virtual/mysql )"
-DEPEND="sys-apps/sed
-	sys-apps/ucspi-tcp
-	${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	virtual/cron"
-
-# S="${WORKDIR}/${MY_P}"
-
-# Define vpopmail home dir in /etc/password if different
-VPOP_DEFAULT_HOME="/var/vpopmail"
-VPOP_HOME="$VPOP_DEFAULT_HOME"
-
-# This makes sure the variable is set, and that it isn't null.
-vpopmail_set_homedir() {
-	VPOP_HOME=`getent passwd vpopmail | cut -d: -f6`
-	if [ -z "$VPOP_HOME" ]; then
-		echo -ne "\a"
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	# cd ${WORKDIR}
-	# unpack ${MY_P}.tar.gz
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-5.4.9-access.violation.patch || die "failed to patch."
-	epatch ${FILESDIR}/${PN}-lazy.patch || die "failed to patch."
-
-	sed -i \
-		's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c \
-		|| die "failed to change Maildir to .maildir"
-	sed -i \
-		'/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c \
-		|| die "failed to remove vpopmail advertisement"
-
-	aclocal || die "aclocal failed"
-	WANT_AUTOMAKE="1.6" automake --add-missing || die "automake failed."
-	autoconf || die "reconfigure failed."
-	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
-}
-
-src_compile() {
-	vpopmail_set_homedir
-
-	use ipalias \
-		&& myopts="${myopts} --enable-ip-alias-domains=y" \
-		|| myopts="${myopts} --enable-ip-alias-domains=n"
-
-	use mysql \
-		&& myopts="${myopts} --enable-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n \
-			--enable-mysql-limits"
-
-	# Bug 20127
-	use clearpasswd \
-		&& myopts="${myopts} --enable-clear-passwd=y" \
-		|| myopts="${myopts} --enable-clear-passwd=n"
-
-	econf \
-		${myopts} \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-qmaildir=/var/qmail \
-		--enable-qmail-newu=/var/qmail/bin/qmail-newu \
-		--enable-qmail-inject=/var/qmail/bin/qmail-inject \
-		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-many-domains=y \
-		--enable-vpopgroup=vpopmail \
-		--enable-file-locking=y \
-		--enable-file-sync=y \
-		--enable-md5-passwords=y \
-		--enable-logging=y \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users \
-		|| die
-
-	# TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
-	#--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-	#--disable-rebuild-tcpserver-file \
-
-	emake || die "Make failed."
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install || die
-	dosed ${VPOP_HOME}/etc/inc_deps
-	dosed ${VPOP_HOME}/etc/lib_deps
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dodoc doc/doc_html/* doc/man_html/*
-	rm -rf ${D}/${VPOP_HOME}/doc
-	dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
-
-	# Create /etc/vpopmail.conf
-	if use mysql ; then
-		einfo "Installing vpopmail mysql configuration file"
-		dodir /etc
-		#config file position
-		mv ${D}/var/vpopmail/etc/vpopmail.mysql ${D}/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf /var/vpopmail/etc/vpopmail.mysql
-		sed -e '12d' -i ${D}/etc/vpopmail.conf
-		echo '# Read-only DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		echo '# Write DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	# Install a proper cronjob instead of the old nastiness
-	#einfo "Installing cronjob"
-	#dodir /etc/cron.hourly
-	#insinto /etc/cron.hourly
-	#doins ${FILESDIR}/vpopmail.clearopensmtp
-	#fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/99vpopmail
-
-	# Configure b0rked. We'll do this manually
-	#echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
-	#local libs_extra
-	#use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
-	#echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
-
-	einfo "Locking down vpopmail permissions"
-	# secure things more, i don't want the vpopmail user being able to write this stuff!
-	chown -R root:0 ${D}${VPOP_HOME}/{bin,etc,include}
-	chown root:vpopmail ${D}${VPOP_HOME}/bin/vchkpw
-	chmod 4711 ${D}${VPOP_HOME}/bin/vchkpw
-}
-
-pkg_preinst() {
-	vpopmail_set_homedir
-
-	# Keep DATA
-	keepdir ${VPOP_HOME}/domains
-
-	# This is a workaround until portage handles binary packages+users better.
-	pkg_setup
-
-	upgradewarning
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}."
-
-	if use mysql ; then
-		echo
-		einfo "You have 'mysql' turned on in your USE"
-		einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		einfo "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		echo
-		einfo "First log into mysql as your mysql root user and pass. Then:"
-		einfo "> create database vpopmail;"
-		einfo "> use mysql;"
-		einfo "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		einfo "  vpopmail@localhost identified by 'your password';"
-		einfo "> flush privileges;"
-		echo
-		einfo "If you have problems with vpopmail not accepting mail properly,"
-		einfo "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		einfo "owned by root:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ] ; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	einfo "The vpopmail DATA will NOT be removed automatically."
-	einfo "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	echo
-	einfo "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	einfo "using net-mail/relay-ctrl instead."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild
deleted file mode 100644
index 22e6641ec4a9..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild,v 1.14 2007/01/05 09:00:33 flameeyes Exp $
-
-inherit eutils fixheadtails
-
-# TODO: all ldap, sybase support
-#MY_PV=${PV/_/-}
-#MY_P=${PN}-${MY_PV}
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-#	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc sparc x86"
-IUSE="mysql ipalias clearpasswd"
-# vpopmail will NOT build if non-root.
-RESTRICT="nouserpriv userpriv"
-DEPEND_COMMON="virtual/qmail
-	mysql? ( virtual/mysql )"
-DEPEND="sys-apps/sed
-	sys-apps/ucspi-tcp
-	${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	virtual/cron"
-
-# S="${WORKDIR}/${MY_P}"
-
-# Define vpopmail home dir in /etc/password if different
-VPOP_DEFAULT_HOME="/var/vpopmail"
-VPOP_HOME="$VPOP_DEFAULT_HOME"
-
-# This makes sure the variable is set, and that it isn't null.
-vpopmail_set_homedir() {
-	VPOP_HOME=`getent passwd vpopmail | cut -d: -f6`
-	if [ -z "$VPOP_HOME" ]; then
-		echo -ne "\a"
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	# cd ${WORKDIR}
-	# unpack ${MY_P}.tar.gz
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch || die "failed to patch."
-	epatch ${FILESDIR}/${P}-access.violation.patch || die "failed to patch."
-	sed -i \
-		's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c \
-		|| die "failed to change Maildir to .maildir"
-	sed -i \
-		'/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c \
-		|| die "failed to remove vpopmail advertisement"
-
-	autoconf || die "reconfigure failed."
-	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
-}
-
-src_compile() {
-	vpopmail_set_homedir
-
-	use ipalias \
-		&& myopts="${myopts} --enable-ip-alias-domains=y" \
-		|| myopts="${myopts} --enable-ip-alias-domains=n"
-
-	use mysql \
-		&& myopts="${myopts} --enable-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n \
-			--enable-mysql-limits"
-
-	# Bug 20127
-	use clearpasswd \
-		&& myopts="${myopts} --enable-clear-passwd=y" \
-		|| myopts="${myopts} --enable-clear-passwd=n"
-
-	econf \
-		${myopts} \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-qmaildir=/var/qmail \
-		--enable-qmail-newu=/var/qmail/bin/qmail-newu \
-		--enable-qmail-inject=/var/qmail/bin/qmail-inject \
-		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-many-domains=y \
-		--enable-vpopgroup=vpopmail \
-		--enable-file-locking=y \
-		--enable-file-sync=y \
-		--enable-md5-passwords=y \
-		--enable-logging=y \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--enable-domainquotas \
-		--disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users \
-		|| die
-
-	# TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
-	#--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-	#--disable-rebuild-tcpserver-file \
-
-	emake || die "Make failed."
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install || die
-	dosed ${VPOP_HOME}/etc/inc_deps
-	dosed ${VPOP_HOME}/etc/lib_deps
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dodoc doc/doc_html/* doc/man_html/*
-	rm -rf ${D}/${VPOP_HOME}/doc
-	dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
-
-	# Create /etc/vpopmail.conf
-	if use mysql ; then
-		einfo "Installing vpopmail mysql configuration file"
-		dodir /etc
-		#config file position
-		mv ${D}/var/vpopmail/etc/vpopmail.mysql ${D}/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf /var/vpopmail/etc/vpopmail.mysql
-		sed -e '12d' -i ${D}/etc/vpopmail.conf
-		echo '# Read-only DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		echo '# Write DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	# Install a proper cronjob instead of the old nastiness
-	#einfo "Installing cronjob"
-	#dodir /etc/cron.hourly
-	#insinto /etc/cron.hourly
-	#doins ${FILESDIR}/vpopmail.clearopensmtp
-	#fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/99vpopmail
-
-	# Configure b0rked. We'll do this manually
-	#echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
-	#local libs_extra
-	#use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
-	#echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
-
-	einfo "Locking down vpopmail permissions"
-	# secure things more, i don't want the vpopmail user being able to write this stuff!
-	chown -R root:0 ${D}${VPOP_HOME}/{bin,etc,include}
-}
-
-pkg_preinst() {
-	vpopmail_set_homedir
-
-	# Keep DATA
-	keepdir ${VPOP_HOME}/domains
-
-	# This is a workaround until portage handles binary packages+users better.
-	pkg_setup
-
-	upgradewarning
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}."
-
-	if use mysql ; then
-		echo
-		einfo "You have 'mysql' turned on in your USE"
-		einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		einfo "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		echo
-		einfo "First log into mysql as your mysql root user and pass. Then:"
-		einfo "> create database vpopmail;"
-		einfo "> use mysql;"
-		einfo "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		einfo "  vpopmail@localhost identified by 'your password';"
-		einfo "> flush privileges;"
-		echo
-		einfo "If you have problems with vpopmail not accepting mail properly,"
-		einfo "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		einfo "owned by root:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ] ; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	einfo "The vpopmail DATA will NOT be removed automatically."
-	einfo "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	echo
-	einfo "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	einfo "using net-mail/relay-ctrl instead."
-}