old

Package-Manager: portage-2.0.51-r15

22 files changed, 0 insertions, 2380 deletions

diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r5 b/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r5
deleted file mode 100644
index a6a45f2be1e6..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e299a467db955c95c2966c7aa0ef6e5 vpopmail-5.2.1.tar.gz 273353
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r6 b/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r6
deleted file mode 100644
index a6a45f2be1e6..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e299a467db955c95c2966c7aa0ef6e5 vpopmail-5.2.1.tar.gz 273353
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r7 b/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r7
deleted file mode 100644
index a6a45f2be1e6..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e299a467db955c95c2966c7aa0ef6e5 vpopmail-5.2.1.tar.gz 273353
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r8 b/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r8
deleted file mode 100644
index a6a45f2be1e6..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e299a467db955c95c2966c7aa0ef6e5 vpopmail-5.2.1.tar.gz 273353
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r9 b/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r9
deleted file mode 100644
index a6a45f2be1e6..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e299a467db955c95c2966c7aa0ef6e5 vpopmail-5.2.1.tar.gz 273353
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.2 b/net-mail/vpopmail/files/digest-vpopmail-5.2.2
deleted file mode 100644
index befa612f58c1..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.2.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 57253be349b25bfd5b86083ffcd42283 vpopmail-5.2.2.tar.gz 280075
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.0 b/net-mail/vpopmail/files/digest-vpopmail-5.4.0
deleted file mode 100644
index dc0be8292cfc..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.4.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6de751d3794b091a58464fd85f7bc00c vpopmail-5.4.0.tar.gz 418736
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.0-r1 b/net-mail/vpopmail/files/digest-vpopmail-5.4.0-r1
deleted file mode 100644
index dc0be8292cfc..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.4.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6de751d3794b091a58464fd85f7bc00c vpopmail-5.4.0.tar.gz 418736
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.0_rc1 b/net-mail/vpopmail/files/digest-vpopmail-5.4.0_rc1
deleted file mode 100644
index c804fe80f254..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.4.0_rc1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3a9edac0e60e4fb1e06d009bd11ade3b vpopmail-5.4.0-rc1.tar.gz 372969
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.6 b/net-mail/vpopmail/files/digest-vpopmail-5.4.6
deleted file mode 100644
index 771391da70a4..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2db38c521b5fad4d76868d2582a72221 vpopmail-5.4.6.tar.gz 425910
diff --git a/net-mail/vpopmail/files/vpopmail-5.2.1-gcc33mysql.diff b/net-mail/vpopmail/files/vpopmail-5.2.1-gcc33mysql.diff
deleted file mode 100644
index cfbd1cddf53b..000000000000
--- a/net-mail/vpopmail/files/vpopmail-5.2.1-gcc33mysql.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur vpopmail-5.2.1.orig/vmysql.h vpopmail-5.2.1/vmysql.h
---- vpopmail-5.2.1.orig/vmysql.h	2003-10-08 15:14:24.000000000 -0700
-+++ vpopmail-5.2.1/vmysql.h	2003-10-08 15:23:03.000000000 -0700
-@@ -77,11 +77,11 @@
- primary key (pw_name, pw_domain ) "
- #else
- #define TABLE_LAYOUT "pw_name char(32) not null, \
--pw_domain char(64) not null, 
-+pw_domain char(64) not null, \
- pw_passwd char(40), \
- pw_uid int, pw_gid int, \
- pw_gecos char(48), \
--pw_dir char(160), 
-+pw_dir char(160), \
- pw_shell char(20), \
- primary key (pw_name, pw_domain ) "
- #endif
diff --git a/net-mail/vpopmail/files/vpopmail.diff b/net-mail/vpopmail/files/vpopmail.diff
deleted file mode 100644
index afa08c4b6354..000000000000
--- a/net-mail/vpopmail/files/vpopmail.diff
+++ /dev/null
@@ -1,88 +0,0 @@
---- vpopmail.c	Sat May 18 02:25:49 2002
-+++ vb/vpopmail.c	Mon Jul 29 15:06:47 2002
-@@ -1012,51 +1012,45 @@
-  int  buff_size;
- {
-  int i;
-- int j;
-- int k;
-- int found;
--
--    for( i=0,j=0,found=0; found==0 && j<buff_size && email[i]!=0; ++i,++j) {
--        for(k=0;ATCHARS[k]!=0;++k){
--            if ( email[i] == ATCHARS[k] ) {
--                found = 1;
--                continue;
--            }
--        }
--        if ( found == 0 )  { 
--          user[j] = email[i];
--        }
--    }
--    user[j] = 0;
--    lowerit(user);
--
-+ int n;
-+ int len;
-+ char *at = NULL;
-+
-+  lowerit(email);
-+
-+  len = strlen(ATCHARS);
-+  for(i=0;i<len; ++i ) if ((at=strchr(email,ATCHARS[i]))) break;
-+
-+  if ( at!=NULL ) {
-+    n = at - email + 1;
-+    if ( n > buff_size ) n = buff_size;
-+    strncpy(user, email, n);
-+    user[n-1] = 0;
-+    strncpy(domain, ++at, buff_size);
-+    domain[buff_size-1] = 0;
-+  } else {
-+    strncpy(user, email, buff_size);
-+    user[buff_size-1] = 0;
-     domain[0] = 0;
--    if (email[i]!=0) {
--        for(j=0;j<buff_size&&email[i]!=0&&email[i]!='@';++i,++j) {
--            domain[j] = email[i];
--        }
--        domain[j] = 0;
--        lowerit(domain);
--    }
--
--    if ( is_username_valid( user ) != 0 ) {
--       printf("user invalid %s\n", user);
--       return(-1);
--    }
-+  }
- 
--    if ( is_domain_valid( domain ) != 0 ) {
--       printf("domain invalid %s\n", domain);
--       return(-1);
--    }
-+  if ( is_username_valid( user ) != 0 ) {
-+    printf("user invalid %s\n", user);
-+    return(-1);
-+  }
- 
--    /* if the domain is blank put in the default domain 
--     * if it was configured with --enable-default-domain=something
--     */
--    vset_default_domain(domain);
-+  if ( is_domain_valid( domain ) != 0 ) {
-+    printf("domain invalid %s\n", domain);
-+    return(-1);
-+  }
- 
--    vget_real_domain(domain, buff_size);
-+  /* if the domain is blank put in the default domain 
-+   * if it was configured with --enable-default-domain=something
-+   */
-+  vset_default_domain(domain);
-+  vget_real_domain(domain, buff_size);
- 
--    return(0);
-+  return(0);
- } 
- 
- /*
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
deleted file mode 100644
index 27329f05b663..000000000000
--- a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
+++ /dev/null
@@ -1,181 +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/vpopmail/vpopmail-5.2.1-r5.ebuild,v 1.13 2004/09/06 20:48:55 ciaranm Exp $
-
-IUSE="mysql ipalias"
-
-inherit eutils
-
-# TODO: all ldap, sybase support
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${P}-mysql.diff )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-DEPEND="sys-apps/sed
-	sys-apps/ucspi-tcp
-	mysql? ( >=dev-db/mysql-3.23* )"
-RDEPEND="mail-mta/qmail
-	virtual/cron
-	mysql? ( >=dev-db/mysql-3.23* )"
-
-# 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=`grep vpopmail /etc/passwd | cut -d: -f6`
-	if [ -z "$VPOP_HOME" ]; then
-		echo -ne "\a"
-	  eerror "vpopmail's home directory is null in /etc/passwd"
-	  eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		ebeep 3
-		VPOP_HOME="/var/vpopmail"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	if [ -z `getent group vpopmail` ]; then
-		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	if use mysql; then
-		einfo "Applying MySQL patch..."
-		# Thanks to Nicholas Jones (carpaski@gentoo.org)
-		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
-	fi
-
-	# Thanks to Vadim Berezniker (vadim@berezniker.com)
-	# This patch backports a bug fix from the devel version re: logons
-	epatch ${FILESDIR}/vpopmail.diff
-}
-
-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-mysql=y \
-			--enable-libs=/usr/include/mysql \
-			--enable-sqllibdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# the configure script tries to force root and make directories not using ${D}
-	sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
-	mv --force configure.new configure
-	chmod u+x configure
-
-	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-clear-passwd=y \
-		--enable-defaultquota=30000000,1000C \
-		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-		--enable-logging=y \
-		--enable-log-name=vpopmail || die "econf failed"
-
-	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
-
-	emake || die "Make failed."
-}
-
-src_install () {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install-strip || die
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
-	dodoc README README.* RELEASE.NOTES UPGRADE.*
-	dodoc doc/doc_html/* doc/man_html/*
-	rm -rf ${D}/${VPOP_HOME}/doc
-	dosym /usr/share/doc/${PVR}/ ${VPOP_HOME}/doc
-	chown vpopmail:vpopmail ${D}/${VPOP_HOME}/doc
-
-	# Create symlink in /usr/bin for executables
-	dodir /usr/bin/
-	for item in `ls -1 ${D}${VPOP_HOME}/bin`; do dosym ${VPOP_HOME}/bin/${item} usr/bin/${item} ; done
-
-	# Create /etc/vpopmail.conf
-	use mysql && dodir /etc && cp ${FILESDIR}/vpopmail.conf ${D}/etc/
-
-	# Configure b0rked. We'll do this manually
-	echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
-	if use mysql; then
-		echo "-L${VPOP_HOME}/lib -lvpopmail -L/usr/lib/mysql -lmysqlclient -lz" > ${D}/${VPOP_HOME}/etc/lib_deps
-	else
-		echo "-L${VPOP_HOME}/lib -lvpopmail" > ${D}/${VPOP_HOME}/etc/lib_deps
-	fi
-}
-
-pkg_preinst() {
-	vpopmail_set_homedir
-
-	# Keep DATA
-	touch ${VPOP_HOME}/domains # this is valid as keepdir will not work here
-
-	# This is a workaround until portage handles binary packages+users better.
-	pkg_setup
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}."
-	echo "40 * * * * /usr/bin/clearopensmtp 2>&1 > /dev/null" >> /var/spool/cron/crontabs/root
-
-	if use mysql; then
-		einfo ""
-		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"
-		einfo ""
-		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;"
-		einfo ""
-	fi
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	sed "/^40.*\/usr\/bin\/clearopensmtp.*null$/d" /var/spool/cron/crontabs/root > /var/spool/cron/crontabs/root.new
-	mv --force /var/spool/cron/crontabs/root.new /var/spool/cron/crontabs/root
-	einfo "The vpopmail DATA will NOT be removed automatically."
-	einfo "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
deleted file mode 100644
index 34d8a8d4de46..000000000000
--- a/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
+++ /dev/null
@@ -1,202 +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/vpopmail/vpopmail-5.2.1-r6.ebuild,v 1.17 2004/09/06 20:48:55 ciaranm Exp $
-
-IUSE="mysql ipalias clearpasswd"
-
-inherit eutils
-
-# TODO: all ldap, sybase support
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${P}-mysql.diff )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-DEPEND="sys-apps/sed
-		sys-apps/ucspi-tcp
-		${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	 	 virtual/cron"
-
-# 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."
-		ebeep 3
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	if [ -z `getent group vpopmail` ]; then
-		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
-
-	if use mysql; then
-		einfo "Applying MySQL patch..."
-		# Thanks to Nicholas Jones (carpaski@gentoo.org)
-		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
-	fi
-
-	# Thanks to Vadim Berezniker (vadim@berezniker.com)
-	# This patch backports a bug fix from the devel version re: logons
-	epatch ${FILESDIR}/vpopmail.diff
-}
-
-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-mysql=y \
-			--enable-libs=/usr/include/mysql \
-			--enable-sqllibdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# the configure script tries to force root and make directories not using ${D}
-	sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
-	mv --force configure.new configure
-	chmod u+x configure
-
-	# 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-defaultquota=30000000,1000C \
-		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-		--enable-logging=y \
-		--enable-log-name=vpopmail || die "econf failed"
-
-	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
-
-	emake || die "Make failed."
-}
-
-src_install () {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install-strip || die
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
-	dodoc README README.* RELEASE.NOTES UPGRADE.*
-	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
-		insinto /etc
-		doins ${FILESDIR}/vpopmail.conf
-		fperms 600 /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:root ${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
-}
-
-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
-	fi
-	# do this for good measure
-	[ -e /etc/vpopmail.conf ] && chmod 600 /etc/vpopmail.conf
-}
-
-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."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
deleted file mode 100644
index 74c00f26dadb..000000000000
--- a/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
+++ /dev/null
@@ -1,202 +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/vpopmail/vpopmail-5.2.1-r7.ebuild,v 1.9 2004/09/06 20:48:55 ciaranm Exp $
-
-IUSE="mysql ipalias clearpasswd"
-
-inherit eutils
-
-# TODO: all ldap, sybase support
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${P}-mysql.diff )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-DEPEND="sys-apps/sed
-		sys-apps/ucspi-tcp
-		${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	 	 virtual/cron"
-
-# 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."
-		ebeep 3
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	if [ -z `getent group vpopmail` ]; then
-		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
-
-	if use mysql; then
-		einfo "Applying MySQL patch..."
-		# Thanks to Nicholas Jones (carpaski@gentoo.org)
-		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
-	fi
-
-	# Thanks to Vadim Berezniker (vadim@berezniker.com)
-	# This patch backports a bug fix from the devel version re: logons
-	epatch ${FILESDIR}/vpopmail.diff
-}
-
-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-mysql=y \
-			--enable-libs=/usr/include/mysql \
-			--enable-sqllibdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# the configure script tries to force root and make directories not using ${D}
-	sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
-	mv --force configure.new configure
-	chmod u+x configure
-
-	# 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-defaultquota=30000000,1000C \
-		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-		--enable-logging=y \
-		--enable-log-name=vpopmail || die "econf failed"
-
-	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
-
-	emake || die "Make failed."
-}
-
-src_install () {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install-strip || die
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
-	dodoc README README.* RELEASE.NOTES UPGRADE.*
-	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
-		insinto /etc
-		doins ${FILESDIR}/vpopmail.conf
-		fperms 600 /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:root ${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
-}
-
-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
-	fi
-	# do this for good measure
-	[ -e /etc/vpopmail.conf ] && chmod 600 /etc/vpopmail.conf
-}
-
-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."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
deleted file mode 100644
index 3ec6a9034787..000000000000
--- a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
+++ /dev/null
@@ -1,211 +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/vpopmail/vpopmail-5.2.1-r8.ebuild,v 1.10 2004/09/06 20:48:55 ciaranm Exp $
-
-IUSE="mysql ipalias clearpasswd"
-
-inherit eutils
-
-# TODO: all ldap, sybase support
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${P}-mysql.diff )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-DEPEND="sys-apps/sed
-		sys-apps/ucspi-tcp
-		${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	 	 virtual/cron"
-
-# 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."
-		ebeep 3
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	if [ -z `getent group vpopmail` ]; then
-		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
-
-	if use mysql; then
-		einfo "Applying MySQL patch..."
-		# Thanks to Nicholas Jones (carpaski@gentoo.org)
-		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
-	fi
-	# gcc3.3 fix
-	epatch ${FILESDIR}/vpopmail-5.2.1-gcc33mysql.diff
-
-	# Thanks to Vadim Berezniker (vadim@berezniker.com)
-	# This patch backports a bug fix from the devel version re: logons
-	epatch ${FILESDIR}/vpopmail.diff
-}
-
-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-mysql=y \
-			--enable-libs=/usr/include/mysql \
-			--enable-sqllibdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# the configure script tries to force root and make directories not using ${D}
-	sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
-	mv --force configure.new configure
-	chmod u+x configure
-
-	# 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-defaultquota=30000000,1000C \
-		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-		--enable-logging=y \
-		--enable-log-name=vpopmail || die "econf failed"
-
-	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
-
-	emake || die "Make failed."
-}
-
-src_install () {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install-strip || die
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
-	dodoc README README.* RELEASE.NOTES UPGRADE.*
-	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
-		insinto /etc
-		doins ${FILESDIR}/vpopmail.conf
-		fowners vpopmail:vpopmail /etc/vpopmail.conf
-		fperms 600 /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:root ${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
-}
-
-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 600 and"
-		einfo "owned by vpopmail:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ]; then
-		chmod 600 /etc/vpopmail.conf
-		chown vpopmail:vpopmail /etc/vpopmail.conf
-	fi
-}
-
-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."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
deleted file mode 100644
index b7da97bd4156..000000000000
--- a/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
+++ /dev/null
@@ -1,237 +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/vpopmail/vpopmail-5.2.1-r9.ebuild,v 1.9 2004/09/06 20:48:55 ciaranm Exp $
-
-IUSE="mysql ipalias clearpasswd"
-
-inherit eutils
-
-# TODO: all ldap, sybase support
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${P}-mysql.diff )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-DEPEND="sys-apps/sed
-		sys-apps/ucspi-tcp
-		${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	 	 virtual/cron"
-
-# 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."
-		ebeep 3
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	if [ -z `getent group vpopmail` ]; then
-		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
-
-	if use mysql; then
-		einfo "Applying MySQL patch..."
-		# Thanks to Nicholas Jones (carpaski@gentoo.org)
-		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
-	fi
-	# gcc3.3 fix
-	epatch ${FILESDIR}/vpopmail-5.2.1-gcc33mysql.diff
-
-	# Thanks to Vadim Berezniker (vadim@berezniker.com)
-	# This patch backports a bug fix from the devel version re: logons
-	epatch ${FILESDIR}/vpopmail.diff
-
-	for i in vchkpw.c vconvert.c vdelivermail.c vpopbull.c vpopmail.c vqmaillocal.c vuserinfo.c; do
-		sed -e 's|Maildir|.maildir|g' -i $i || die "Failed to change s/Maildir/.maildir/g in $i"
-	done
-
-	# the configure script tries to force root and make directories not using ${D}
-	cp configure configure.orig
-	sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
-	mv --force configure.new configure
-	chmod u+x configure
-}
-
-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-mysql=y \
-			--enable-libs=/usr/include/mysql \
-			--enable-sqllibdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# Bug 20127
-	use clearpasswd &&
-		myopts="${myopts} --enable-clear-passwd=y" ||
-		myopts="${myopts} --enable-clear-passwd=n"
-
-	addpredict /var/vpopmail/etc/lib_deps
-	addpredict /var/vpopmail/etc/inc_deps
-
-	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-defaultquota=30000000,1000C \
-		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-		--enable-logging=y \
-		--enable-log-name=vpopmail || die "econf failed"
-
-	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
-
-	emake || die "Make failed."
-}
-
-src_install () {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install-strip || die
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
-	dodoc README README.* RELEASE.NOTES UPGRADE.*
-	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
-		insinto /etc
-		doins ${FILESDIR}/vpopmail.conf
-		fowners vpopmail:vpopmail /etc/vpopmail.conf
-		fperms 600 /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:root ${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 600 and"
-		einfo "owned by vpopmail:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ]; then
-		chmod 600 /etc/vpopmail.conf
-		chown vpopmail: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!"
-	ewarn "You should be able to run it right away without any changes."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.2.2.ebuild b/net-mail/vpopmail/vpopmail-5.2.2.ebuild
deleted file mode 100644
index 082d684bd8ac..000000000000
--- a/net-mail/vpopmail/vpopmail-5.2.2.ebuild
+++ /dev/null
@@ -1,234 +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/vpopmail/vpopmail-5.2.2.ebuild,v 1.8 2004/09/06 20:48:56 ciaranm Exp $
-
-IUSE="mysql ipalias clearpasswd"
-
-inherit eutils gnuconfig
-
-# TODO: all ldap, sybase support
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-DEPEND="sys-apps/sed
-		sys-apps/ucspi-tcp
-		${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	 	 virtual/cron"
-
-# 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."
-		ebeep 3
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	if [ -z `getent group vpopmail` ]; then
-		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
-	fi
-	upgradewarning
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
-
-	if use mysql; then
-		einfo "Applying MySQL patch..."
-		# Thanks to Nicholas Jones (carpaski@gentoo.org)
-		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
-	fi
-
-	for i in vchkpw.c vconvert.c vdelivermail.c vpopbull.c vpopmail.c vqmaillocal.c vuserinfo.c; do
-		sed -e 's|Maildir|.maildir|g' -i $i || die "Failed to change s/Maildir/.maildir/g in $i"
-	done
-
-	gnuconfig_update
-
-	# the configure script tries to force root and make directories not using ${D}
-	cp configure configure.orig
-	#sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
-	sed -e '1304,1311d' -e '1582,1589d' -e '2129d' -e '2364d' -e '2371d' -i configure
-}
-
-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-mysql=y \
-			--enable-libs=/usr/include/mysql \
-			--enable-sqllibdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# Bug 20127
-	use clearpasswd &&
-		myopts="${myopts} --enable-clear-passwd=y" ||
-		myopts="${myopts} --enable-clear-passwd=n"
-
-	addpredict /var/vpopmail/etc/lib_deps
-	addpredict /var/vpopmail/etc/inc_deps
-
-	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-defaultquota=30000000,1000C \
-		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-		--enable-logging=y \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext || die "econf failed"
-
-	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> ${S}/config.h
-
-	emake || die "Make failed."
-}
-
-src_install () {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install-strip || die
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
-	dodoc README README.* RELEASE.NOTES UPGRADE.*
-	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
-		insinto /etc
-		doins ${FILESDIR}/vpopmail.conf
-		fowners vpopmail:vpopmail /etc/vpopmail.conf
-		fperms 600 /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:root ${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 600 and"
-		einfo "owned by vpopmail:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ]; then
-		chmod 600 /etc/vpopmail.conf
-		chown vpopmail: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."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.0-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.0-r1.ebuild
deleted file mode 100644
index 94ceaa41f9a8..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,243 +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/vpopmail/vpopmail-5.4.0-r1.ebuild,v 1.5 2004/08/04 09:49:12 tomk Exp $
-
-inherit eutils gnuconfig 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 or Postfix mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="mysql ipalias clearpasswd"
-RESTRICT="nouserpriv"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-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 /bin/false ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.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"
-
-	gnuconfig_update
-	ht_fix_file ${S}/cdb/Makefile
-}
-
-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-sqllibdir=/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:root ${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."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.0.ebuild b/net-mail/vpopmail/vpopmail-5.4.0.ebuild
deleted file mode 100644
index a1714a7e23cf..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.0.ebuild
+++ /dev/null
@@ -1,244 +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/vpopmail/vpopmail-5.4.0.ebuild,v 1.9 2004/08/04 09:49:12 tomk Exp $
-
-inherit eutils gnuconfig 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 or Postfix mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="mysql ipalias clearpasswd"
-
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-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 /bin/false ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.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"
-
-	gnuconfig_update
-	ht_fix_file ${S}/cdb/Makefile
-}
-
-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-sqllibdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n \
-			--enable-mysql-limits" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# 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:root ${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."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild b/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild
deleted file mode 100644
index 13ac673e7009..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild
+++ /dev/null
@@ -1,257 +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/vpopmail/vpopmail-5.4.0_rc1.ebuild,v 1.10 2004/09/06 20:48:56 ciaranm Exp $
-
-IUSE="mysql ipalias clearpasswd"
-
-inherit eutils gnuconfig fixheadtails
-
-# TODO: all ldap, sybase support
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-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."
-		ebeep 3
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	if [ -z `getent group vpopmail` ]; then
-		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
-	fi
-	upgradewarning
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.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"
-
-	gnuconfig_update
-	ht_fix_file ${S}/cdb/Makefile
-}
-
-src_compile() {
-	vpopmail_set_homedir
-	addpredict /var/vpopmail/etc/lib_deps
-	addpredict /var/vpopmail/etc/inc_deps
-
-	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-sqllibdir=/usr/lib/mysql \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n \
-			--enable-mysql-limits" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# 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-defaultquota=30000000,1000C \
-		--enable-logging=y \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--enable-domainquotas \
-		--disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users || die "econf failed"
-
-	# 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 \
-
-
-	# fix some borkage
-	sed -re 's:(/var/vpopmail/etc/inc_deps):$(DESTDIR)/\1:g' -i ${S}/Makefile || die "failed to fix"
-	sed -re 's:(/var/vpopmail/etc/lib_deps):$(DESTDIR)/\1:g' -i ${S}/Makefile || die "failed to fix"
-	if use mysql; then
-		sed -re 's:@USE_MYSQL@:"1":g' -i ${S}/Makefile || die "failed to fix"
-	else
-		sed -re 's:@USE_MYSQL@:"0":g' -i ${S}/Makefile || die "failed to fix"
-	fi
-
-	emake || die "Make failed."
-}
-
-src_install () {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install || die
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
-	dodoc README* RELEASE.NOTES UPGRADE.*
-	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:root ${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."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.6.ebuild b/net-mail/vpopmail/vpopmail-5.4.6.ebuild
deleted file mode 100644
index cac65829da22..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.6.ebuild
+++ /dev/null
@@ -1,245 +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/vpopmail/vpopmail-5.4.6.ebuild,v 1.4 2004/08/24 18:11:06 robbat2 Exp $
-
-inherit eutils gnuconfig 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 or Postfix mail servers."
-SRC_URI="mirror://sourceforge/${P}.tar.gz"
-#	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~amd64 ppc"
-IUSE="mysql ipalias clearpasswd"
-
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23* )"
-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 /bin/false ${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."
-
-	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"
-
-	gnuconfig_update
-	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" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# 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 \
-
-	make || 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:root ${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."
-}