fixup for qmail move.

29 files changed, 63 insertions, 63 deletions

diff --git a/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild b/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
index b21d179a37e3..ca6e85da96c8 100644
--- a/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
+++ b/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild,v 1.2 2003/09/05 08:56:53 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild,v 1.3 2004/05/30 10:58:08 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Delayed delivery notification for qmail."
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~sparc"
 DEPEND="virtual/glibc"
 
 RDEPEND="virtual/cron
-	net-mail/qmail"
+	mail-mta/qmail"
 
 src_compile() {
 	cd ${S}
diff --git a/net-mail/qmail-notify/qmail-notify-0.93.ebuild b/net-mail/qmail-notify/qmail-notify-0.93.ebuild
index 513d95e1562a..139b3fb67aaf 100644
--- a/net-mail/qmail-notify/qmail-notify-0.93.ebuild
+++ b/net-mail/qmail-notify/qmail-notify-0.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-notify/qmail-notify-0.93.ebuild,v 1.9 2004/02/22 16:25:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-notify/qmail-notify-0.93.ebuild,v 1.10 2004/05/30 10:58:08 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Delayed delivery notification for qmail."
@@ -14,7 +14,7 @@ KEYWORDS="x86 sparc"
 DEPEND="virtual/glibc"
 
 RDEPEND="virtual/cron
-	net-mail/qmail"
+	mail-mta/qmail"
 
 src_compile() {
 	cd ${S}
diff --git a/net-mail/qmail-qfilter/qmail-qfilter-1.5.ebuild b/net-mail/qmail-qfilter/qmail-qfilter-1.5.ebuild
index e32b0931c72d..58ed278abc4e 100644
--- a/net-mail/qmail-qfilter/qmail-qfilter-1.5.ebuild
+++ b/net-mail/qmail-qfilter/qmail-qfilter-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-qfilter/qmail-qfilter-1.5.ebuild,v 1.1 2003/08/01 04:44:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-qfilter/qmail-qfilter-1.5.ebuild,v 1.2 2004/05/30 10:58:20 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="qmail-queue multi-filter front end"
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~ppc"
 
 DEPEND="virtual/glibc"
-RDEPEND=">=net-mail/qmail-1.03-r8"
+RDEPEND=">=mail-mta/qmail-1.03-r8"
 
 QMAIL_BINDIR="/var/qmail/bin/"
 
diff --git a/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
index e00141bca029..1b92df9abcd3 100644
--- a/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
+++ b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild,v 1.1 2003/08/05 06:42:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild,v 1.2 2004/05/30 10:58:32 robbat2 Exp $
 DESCRIPTION="qmail-qsanity checks your queue data structures for internal consistency."
 HOMEPAGE="http://www.qmail.org/"
 SRC_URI="mirror://qmail/${P}"
@@ -10,7 +10,7 @@ KEYWORDS="~x86"
 # Should run on all platforms without issue
 IUSE=""
 DEPEND=""
-RDEPEND="net-mail/qmail dev-lang/perl"
+RDEPEND="mail-mta/qmail dev-lang/perl"
 S=${WORKDIR}
 
 src_unpack() {
diff --git a/net-mail/qmail-scanner/ChangeLog b/net-mail/qmail-scanner/ChangeLog
index 7b6244919c36..614c37877d87 100644
--- a/net-mail/qmail-scanner/ChangeLog
+++ b/net-mail/qmail-scanner/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-mail/qmail-scanner
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/ChangeLog,v 1.13 2004/04/24 08:01:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/ChangeLog,v 1.14 2004/05/30 10:58:47 robbat2 Exp $
 
   24 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
   qmail-scanner-1.16-r2.ebuild, qmail-scanner-1.20.ebuild:
diff --git a/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild b/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild
index 8ed7163adf2a..80cf7bc22061 100644
--- a/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild
+++ b/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild,v 1.5 2003/09/05 02:26:58 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild,v 1.6 2004/05/30 10:58:47 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 
@@ -13,7 +13,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 	>=net-mail/tnef-1.1.1
 	>=net-mail/maildrop-1.3.9
 	>=dev-perl/DB_File-1.803-r2
-	>=net-mail/qmail-1.03-r8
+	>=mail-mta/qmail-1.03-r8
 	>=app-arch/unzip-5.42-r1
 	virtual/antivirus"
 
diff --git a/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild b/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild
index c6624000eb87..694807e1b86f 100644
--- a/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild
+++ b/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild,v 1.3 2004/04/24 08:01:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild,v 1.4 2004/05/30 10:58:47 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,9 +14,9 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 	>=net-mail/maildrop-1.3.9
 	>=dev-perl/DB_File-1.803-r2
 	|| (
-	>=net-mail/qmail-1.03-r8
-	>=net-mail/qmail-ldap-1.03-r1
-	net-mail/qmail-mysql
+	>=mail-mta/qmail-1.03-r8
+	>=mail-mta/qmail-ldap-1.03-r1
+	  mail-mta/qmail-mysql
 	)
 	>=app-arch/unzip-5.42-r1
 	virtual/antivirus"
diff --git a/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild b/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild
index 96e65d4d03ec..35e57777a099 100644
--- a/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild
+++ b/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild,v 1.5 2004/05/30 01:39:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild,v 1.6 2004/05/30 10:58:47 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,7 +14,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 	>=app-antivirus/f-prot-3.12a
 	>=net-mail/maildrop-1.3.9
 	>=dev-perl/DB_File-1.803-r2
-	>=net-mail/qmail-1.03-r8
+	>=mail-mta/qmail-1.03-r8
 	>=app-arch/unzip-5.42-r1"
 
 SLOT="0"
diff --git a/net-mail/qmail-scanner/qmail-scanner-1.20.ebuild b/net-mail/qmail-scanner/qmail-scanner-1.20.ebuild
index b498ceac2a5b..0aa95d160878 100644
--- a/net-mail/qmail-scanner/qmail-scanner-1.20.ebuild
+++ b/net-mail/qmail-scanner/qmail-scanner-1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.20.ebuild,v 1.4 2004/04/24 08:01:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.20.ebuild,v 1.5 2004/05/30 10:58:47 robbat2 Exp $
 
 inherit fixheadtails gcc eutils
 
@@ -18,9 +18,9 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 	>=dev-perl/DB_File-1.803-r2
 	>=net-mail/ripmime-1.3.0.4
 	|| (
-	>=net-mail/qmail-1.03-r8
-	>=net-mail/qmail-ldap-1.03-r1
-	net-mail/qmail-mysql
+	>=mail-mta/qmail-1.03-r8
+	>=mail-mta/qmail-ldap-1.03-r1
+	  mail-mta/qmail-mysql
 	)
 	>=app-arch/unzip-5.42-r1
 	virtual/antivirus"
diff --git a/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild b/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild
index b4539e0e0fdd..737abb1039fe 100644
--- a/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild
+++ b/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild,v 1.10 2004/02/22 16:25:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild,v 1.11 2004/05/30 10:59:00 robbat2 Exp $
 
 S=${WORKDIR}
 DESCRIPTION="qmail with vmailmgr - a fullfletched virtual domains hosting enviroment"
@@ -11,7 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc"
 
-RDEPEND=">=net-mail/qmail-1.03-r7
+RDEPEND=">=mail-mta/qmail-1.03-r7
 >=net-mail/vmailmgr-0.96.9-r1
 >=net-mail/cvm-vmailmgr-0.3
 >=net-mail/mailfront-0.74"
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.0_rc1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.0_rc1.ebuild
index f60af4e8534a..1174bc76fdf3 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.0_rc1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.0_rc1.ebuild,v 1.2 2004/01/05 08:49:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.0_rc1.ebuild,v 1.3 2004/05/30 10:59:16 robbat2 Exp $
 
 inherit gnuconfig
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="net-mail/qmail
+DEPEND="mail-mta/qmail
 		>=net-mail/vpopmail-5.3
 		net-mail/autorespond"
 
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild
index 6fe3032fa996..5dc5367e8cc7 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild,v 1.1 2004/01/16 06:02:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild,v 1.2 2004/05/30 10:59:16 robbat2 Exp $
 
 inherit gnuconfig
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="net-mail/qmail
+DEPEND="mail-mta/qmail
 		>=net-mail/vpopmail-5.3
 		net-mail/autorespond"
 
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.0_rc2.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.0_rc2.ebuild
index 07442b505ab2..aa5253426199 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.0_rc2.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.0_rc2.ebuild,v 1.2 2004/01/05 08:49:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.0_rc2.ebuild,v 1.3 2004/05/30 10:59:16 robbat2 Exp $
 
 inherit gnuconfig
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="net-mail/qmail
+DEPEND="mail-mta/qmail
 		>=net-mail/vpopmail-5.3
 		net-mail/autorespond"
 
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild
index a1561abc1878..985dab1fd627 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild,v 1.1 2004/05/24 06:46:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild,v 1.2 2004/05/30 10:59:16 robbat2 Exp $
 
 inherit gnuconfig
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="net-mail/qmail
+DEPEND="mail-mta/qmail
 		>=net-mail/vpopmail-5.3
 		net-mail/autorespond"
 
diff --git a/net-mail/qmhandle/qmhandle-1.1.1.ebuild b/net-mail/qmhandle/qmhandle-1.1.1.ebuild
index 29a7c48f5a91..39b9a2661dd7 100644
--- a/net-mail/qmhandle/qmhandle-1.1.1.ebuild
+++ b/net-mail/qmhandle/qmhandle-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmhandle/qmhandle-1.1.1.ebuild,v 1.7 2004/05/05 07:12:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmhandle/qmhandle-1.1.1.ebuild,v 1.8 2004/05/30 10:59:29 robbat2 Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 ~alpha ~hppa ~ppc ~sparc amd64 ia64"
 # Should run on all platforms without issue
 IUSE=""
-RDEPEND="|| ( net-mail/qmail net-mail/qmail-mysql net-mail/qmail-ldap ) dev-lang/perl sys-apps/psmisc"
+RDEPEND="|| ( mail-mta/qmail mail-mta/qmail-mysql mail-mta/qmail-ldap ) dev-lang/perl sys-apps/psmisc"
 DEPEND=""
 S=${WORKDIR}
 
diff --git a/net-mail/queue-fix/queue-fix-1.4-r1.ebuild b/net-mail/queue-fix/queue-fix-1.4-r1.ebuild
index 716732955899..beaff86b9e02 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r1.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/queue-fix/queue-fix-1.4-r1.ebuild,v 1.2 2004/04/27 21:04:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/queue-fix/queue-fix-1.4-r1.ebuild,v 1.3 2004/05/30 11:02:43 robbat2 Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ LICENSE="as-is"
 KEYWORDS="x86"
 IUSE=""
 DEPEND="sys-devel/gcc-config"
-PDEPEND="net-mail/qmail"
+PDEPEND="mail-mta/qmail"
 
 src_unpack() {
 	unpack ${P}.tar.gz
diff --git a/net-mail/queue-fix/queue-fix-1.4-r2.ebuild b/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
index e63ec8e6ca12..0d13683f9bf9 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/queue-fix/queue-fix-1.4-r2.ebuild,v 1.9 2004/05/25 21:53:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/queue-fix/queue-fix-1.4-r2.ebuild,v 1.10 2004/05/30 11:02:43 robbat2 Exp $
 
 inherit eutils gcc
 
@@ -17,9 +17,9 @@ IUSE=""
 DEPEND="sys-devel/gcc-config"
 RDEPEND="
 	|| (
-		net-mail/qmail
-		net-mail/qmail-mysql
-		net-mail/qmail-ldap
+		mail-mta/qmail
+		mail-mta/qmail-mysql
+		mail-mta/qmail-ldap
 	)"
 
 src_unpack() {
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild
index ffae5d4ffb41..b55f69b65981 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild,v 1.9 2004/05/26 15:59:19 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild,v 1.10 2004/05/30 10:59:43 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="SMTP Relaying Control for qmail & tcpserver."
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 
 DEPEND="virtual/glibc"
-RDEPEND="net-mail/qmail"
+RDEPEND="mail-mta/qmail"
 
 src_compile() {
 	cd ${S}
diff --git a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild b/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
index 0f9d6346f7d3..dab8f89c7a6c 100644
--- a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
+++ b/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.16 2004/02/22 16:30:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.17 2004/05/30 11:03:07 robbat2 Exp $
 
 inherit gcc
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~sparc"
 
 DEPEND="virtual/glibc"
 RDEPEND=">=sys-apps/ucspi-unix-0.34
-	>=net-mail/qmail-1.03-r7
+	>=mail-mta/qmail-1.03-r7
 	>=net-mail/qmail-autoresponder-0.95"
 
 src_unpack() {
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
index 7e297aaab507..a70d4e704b0c 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.8 2004/04/26 12:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild,v 1.9 2004/05/30 11:00:03 robbat2 Exp $
 
 IUSE="mysql ipalias"
 
@@ -17,7 +17,7 @@ KEYWORDS="x86 sparc"
 DEPEND="sys-apps/sed
 	sys-apps/ucspi-tcp
 	mysql? ( >=dev-db/mysql-3.23* )"
-RDEPEND="net-mail/qmail
+RDEPEND="mail-mta/qmail
 	virtual/cron
 	mysql? ( >=dev-db/mysql-3.23* )"
 
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
index 1c9c30e621eb..1e522baf0c7a 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.12 2004/04/26 12:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild,v 1.13 2004/05/30 11:00:03 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
-DEPEND_COMMON="net-mail/qmail
+DEPEND_COMMON="mail-mta/qmail
 	mysql? ( >=dev-db/mysql-3.23* )"
 DEPEND="sys-apps/sed
 		sys-apps/ucspi-tcp
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
index 87fe2db450bc..500f88241e1b 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4 2004/04/26 12:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild,v 1.5 2004/05/30 11:00:03 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
-DEPEND_COMMON="net-mail/qmail
+DEPEND_COMMON="mail-mta/qmail
 	mysql? ( >=dev-db/mysql-3.23* )"
 DEPEND="sys-apps/sed
 		sys-apps/ucspi-tcp
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
index c415ff170db3..ebcc6e5d488f 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.5 2004/04/26 12:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild,v 1.6 2004/05/30 11:00:03 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
-DEPEND_COMMON="net-mail/qmail
+DEPEND_COMMON="mail-mta/qmail
 	mysql? ( >=dev-db/mysql-3.23* )"
 DEPEND="sys-apps/sed
 		sys-apps/ucspi-tcp
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
index 687423991f8b..e430a7401413 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4 2004/04/26 12:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild,v 1.5 2004/05/30 11:00:03 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
-DEPEND_COMMON="net-mail/qmail
+DEPEND_COMMON="mail-mta/qmail
 	mysql? ( >=dev-db/mysql-3.23* )"
 DEPEND="sys-apps/sed
 		sys-apps/ucspi-tcp
diff --git a/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild b/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild
index f96610305802..1b6f61312482 100644
--- a/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild,v 1.4 2004/04/26 12:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild,v 1.5 2004/05/30 11:00:03 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
-DEPEND_COMMON="net-mail/qmail
+DEPEND_COMMON="mail-mta/qmail
 	mysql? ( >=dev-db/mysql-3.23* )"
 DEPEND="sys-apps/sed
 		sys-apps/ucspi-tcp
diff --git a/net-mail/vpopmail/vpopmail-5.2.2.ebuild b/net-mail/vpopmail/vpopmail-5.2.2.ebuild
index 08d400e36398..97640c669600 100644
--- a/net-mail/vpopmail/vpopmail-5.2.2.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.3 2004/04/26 12:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.2.ebuild,v 1.4 2004/05/30 11:00:03 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc"
-DEPEND_COMMON="net-mail/qmail
+DEPEND_COMMON="mail-mta/qmail
 	mysql? ( >=dev-db/mysql-3.23* )"
 DEPEND="sys-apps/sed
 		sys-apps/ucspi-tcp
diff --git a/net-mail/vpopmail/vpopmail-5.4.0.ebuild b/net-mail/vpopmail/vpopmail-5.4.0.ebuild
index dee0010c91e6..36de248ded0f 100644
--- a/net-mail/vpopmail/vpopmail-5.4.0.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4 2004/04/25 17:00:45 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.0.ebuild,v 1.5 2004/05/30 11:00:03 robbat2 Exp $
 
 inherit eutils gnuconfig fixheadtails
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64"
 IUSE="mysql ipalias clearpasswd"
 
-DEPEND_COMMON="net-mail/qmail
+DEPEND_COMMON="mail-mta/qmail
 	mysql? ( >=dev-db/mysql-3.23* )"
 DEPEND="sys-apps/sed
 	sys-apps/ucspi-tcp
diff --git a/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild b/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild
index 770af3d7fa09..4cc3cae48a8d 100644
--- a/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.5 2004/04/26 12:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild,v 1.6 2004/05/30 11:00:03 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc"
-DEPEND_COMMON="net-mail/qmail
+DEPEND_COMMON="mail-mta/qmail
 	mysql? ( >=dev-db/mysql-3.23* )"
 DEPEND="sys-apps/sed
 		sys-apps/ucspi-tcp
diff --git a/net-mail/vqadmin/vqadmin-2.3.6.ebuild b/net-mail/vqadmin/vqadmin-2.3.6.ebuild
index e6b91e213216..82010fc8d6e0 100644
--- a/net-mail/vqadmin/vqadmin-2.3.6.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vqadmin/vqadmin-2.3.6.ebuild,v 1.1 2004/01/05 09:48:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vqadmin/vqadmin-2.3.6.ebuild,v 1.2 2004/05/30 11:01:11 robbat2 Exp $
 
 inherit gnuconfig
 
@@ -12,7 +12,7 @@ KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND=">=net-mail/vpopmail-5.3
-		net-mail/qmail"
+		mail-mta/qmail"
 RDEPEND="${DEPEND}
 	net-mail/qmailadmin
 	net-www/apache"