move net-mail/clamav app-antivirus/clamav

45 files changed, 47 insertions, 47 deletions

diff --git a/profiles/base/virtuals b/profiles/base/virtuals
index e163ecc74f7b..01ccd47ce599 100644
--- a/profiles/base/virtuals
+++ b/profiles/base/virtuals
@@ -1,13 +1,13 @@
 # Copyright 2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.13 2004/05/17 03:40:01 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.14 2004/05/30 00:50:48 robbat2 Exp $
 
 # This file describes the packages that by default satisfy a certain virtual
 # That this file exists in the base profile implies that these packages will
 # work on any architecture that needs that virtual
 
 virtual/alsa					media-sound/alsa-driver    
-virtual/antivirus				net-mail/clamav
+virtual/antivirus				app-antivirus/clamav
 virtual/aspell-dict				app-dicts/aspell-en
 virtual/bittorrent				net-p2p/bittorrent
 virtual/blackbox				x11-wm/blackbox
diff --git a/profiles/cobalt-mips-1.4/virtuals b/profiles/cobalt-mips-1.4/virtuals
index 1670211513c6..501b34296aa2 100644
--- a/profiles/cobalt-mips-1.4/virtuals
+++ b/profiles/cobalt-mips-1.4/virtuals
@@ -31,7 +31,7 @@ virtual/bootloader      sys-boot/dvhtool
 virtual/os-headers		sys-kernel/mips-headers
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/cobalt-mips-2004.1/virtuals b/profiles/cobalt-mips-2004.1/virtuals
index 1670211513c6..501b34296aa2 100644
--- a/profiles/cobalt-mips-2004.1/virtuals
+++ b/profiles/cobalt-mips-2004.1/virtuals
@@ -31,7 +31,7 @@ virtual/bootloader      sys-boot/dvhtool
 virtual/os-headers		sys-kernel/mips-headers
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-1.0/virtuals b/profiles/default-1.0/virtuals
index 37d40dc8ea1b..d379bed3b1f8 100644
--- a/profiles/default-1.0/virtuals
+++ b/profiles/default-1.0/virtuals
@@ -32,7 +32,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
 virtual/modutils		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/skkserv			app-i18n/skkserv
 virtual/snmp			net-analyzer/net-snmp
diff --git a/profiles/default-alpha-1.4/virtuals b/profiles/default-alpha-1.4/virtuals
index 07a237cbf9ad..ac8200483515 100644
--- a/profiles/default-alpha-1.4/virtuals
+++ b/profiles/default-alpha-1.4/virtuals
@@ -32,7 +32,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
 virtual/modutils		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/skkserv			app-i18n/skkserv
 virtual/snmp			net-analyzer/net-snmp
diff --git a/profiles/default-alpha-2004.0/virtuals b/profiles/default-alpha-2004.0/virtuals
index efeac239d6b3..ed4d9c12ea42 100644
--- a/profiles/default-alpha-2004.0/virtuals
+++ b/profiles/default-alpha-2004.0/virtuals
@@ -32,7 +32,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
 virtual/modutils		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/skkserv			app-i18n/skkserv
 virtual/snmp			net-analyzer/net-snmp
diff --git a/profiles/default-amd64-1.4/virtuals b/profiles/default-amd64-1.4/virtuals
index 849d58a22179..654347f45deb 100644
--- a/profiles/default-amd64-1.4/virtuals
+++ b/profiles/default-amd64-1.4/virtuals
@@ -40,7 +40,7 @@ virtual/ghc             dev-lang/ghc-bin
 #virtual/modutils		sys-apps/module-init-tools
 virtual/modutils		sys-apps/module-init-tools
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-amd64-2004.0/virtuals b/profiles/default-amd64-2004.0/virtuals
index 9ff19a92bc1e..03cfbb45cde6 100644
--- a/profiles/default-amd64-2004.0/virtuals
+++ b/profiles/default-amd64-2004.0/virtuals
@@ -40,7 +40,7 @@ virtual/ghc             dev-lang/ghc-bin
 #virtual/modutils		sys-apps/module-init-tools
 virtual/modutils		sys-apps/module-init-tools
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-arm-2004.0/virtuals b/profiles/default-arm-2004.0/virtuals
index 6b61ab21d705..4f87eea97fc4 100644
--- a/profiles/default-arm-2004.0/virtuals
+++ b/profiles/default-arm-2004.0/virtuals
@@ -33,7 +33,7 @@ virtual/quicktime		media-libs/libquicktime
 virtual/os-headers		sys-kernel/linux-headers
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-hppa-1.4/virtuals b/profiles/default-hppa-1.4/virtuals
index 53fc6cbc7010..44adca259f4f 100644
--- a/profiles/default-hppa-1.4/virtuals
+++ b/profiles/default-hppa-1.4/virtuals
@@ -31,7 +31,7 @@ virtual/editor		app-editors/nano
 virtual/os-headers	sys-kernel/hppa-headers
 virtual/modutils 	sys-apps/modutils
 virtual/inetd		sys-apps/xinetd
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-hppa-2004.0/virtuals b/profiles/default-hppa-2004.0/virtuals
index 60503837ff70..575c6515c8bd 100644
--- a/profiles/default-hppa-2004.0/virtuals
+++ b/profiles/default-hppa-2004.0/virtuals
@@ -31,7 +31,7 @@ virtual/editor		app-editors/nano
 virtual/os-headers	sys-kernel/hppa-headers
 virtual/modutils 	sys-apps/modutils
 virtual/inetd		sys-apps/xinetd
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-ia64-1.4/virtuals b/profiles/default-ia64-1.4/virtuals
index d7e29ea45dce..91759b243bab 100644
--- a/profiles/default-ia64-1.4/virtuals
+++ b/profiles/default-ia64-1.4/virtuals
@@ -32,7 +32,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
 virtual/modutils		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/skkserv			app-i18n/skkserv
 virtual/snmp			net-analyzer/net-snmp
diff --git a/profiles/default-linux/ppc/1.4/virtuals b/profiles/default-linux/ppc/1.4/virtuals
index 4e56212d5145..70219cdf323d 100644
--- a/profiles/default-linux/ppc/1.4/virtuals
+++ b/profiles/default-linux/ppc/1.4/virtuals
@@ -30,7 +30,7 @@ virtual/editor		app-editors/nano
 virtual/os-headers	sys-kernel/linux-headers
 virtual/modutils 	sys-apps/modutils
 virtual/inetd		sys-apps/xinetd
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-linux/ppc/2004.0/virtuals b/profiles/default-linux/ppc/2004.0/virtuals
index 4fb43638947d..4c75dbe2cea4 100644
--- a/profiles/default-linux/ppc/2004.0/virtuals
+++ b/profiles/default-linux/ppc/2004.0/virtuals
@@ -1,7 +1,7 @@
 sys-apps/console-tools  sys-apps/kbd
 sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	    media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/default-linux/ppc/2004.1/virtuals b/profiles/default-linux/ppc/2004.1/virtuals
index 4fb43638947d..4c75dbe2cea4 100644
--- a/profiles/default-linux/ppc/2004.1/virtuals
+++ b/profiles/default-linux/ppc/2004.1/virtuals
@@ -1,7 +1,7 @@
 sys-apps/console-tools  sys-apps/kbd
 sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	    media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/default-linux/ppc/2004.2/virtuals b/profiles/default-linux/ppc/2004.2/virtuals
index 4fb43638947d..4c75dbe2cea4 100644
--- a/profiles/default-linux/ppc/2004.2/virtuals
+++ b/profiles/default-linux/ppc/2004.2/virtuals
@@ -1,7 +1,7 @@
 sys-apps/console-tools  sys-apps/kbd
 sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	    media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/default-linux/sparc/sparc32/virtuals b/profiles/default-linux/sparc/sparc32/virtuals
index 4cc520dbca23..b02ccd0b3907 100644
--- a/profiles/default-linux/sparc/sparc32/virtuals
+++ b/profiles/default-linux/sparc/sparc32/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-linux/sparc/virtuals b/profiles/default-linux/sparc/virtuals
index 90c0240c13c3..af2be3b5a6a8 100644
--- a/profiles/default-linux/sparc/virtuals
+++ b/profiles/default-linux/sparc/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-mips-1.4/virtuals b/profiles/default-mips-1.4/virtuals
index 8a327dc6e5e8..475426ee4920 100644
--- a/profiles/default-mips-1.4/virtuals
+++ b/profiles/default-mips-1.4/virtuals
@@ -31,7 +31,7 @@ virtual/bootloader      sys-boot/dvhtool
 virtual/os-headers		sys-kernel/mips-headers
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-mips-2004.1/virtuals b/profiles/default-mips-2004.1/virtuals
index 8a327dc6e5e8..475426ee4920 100644
--- a/profiles/default-mips-2004.1/virtuals
+++ b/profiles/default-mips-2004.1/virtuals
@@ -31,7 +31,7 @@ virtual/bootloader      sys-boot/dvhtool
 virtual/os-headers		sys-kernel/mips-headers
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-mips64-1.4/virtuals b/profiles/default-mips64-1.4/virtuals
index 8a327dc6e5e8..475426ee4920 100644
--- a/profiles/default-mips64-1.4/virtuals
+++ b/profiles/default-mips64-1.4/virtuals
@@ -31,7 +31,7 @@ virtual/bootloader      sys-boot/dvhtool
 virtual/os-headers		sys-kernel/mips-headers
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-ppc-1.4/virtuals b/profiles/default-ppc-1.4/virtuals
index e1d9faa95c0e..81c9b31ea521 100644
--- a/profiles/default-ppc-1.4/virtuals
+++ b/profiles/default-ppc-1.4/virtuals
@@ -30,7 +30,7 @@ virtual/editor		app-editors/nano
 virtual/os-headers	sys-kernel/linux-headers
 virtual/modutils 	sys-apps/modutils
 virtual/inetd		sys-apps/xinetd
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-ppc-2004.0/virtuals b/profiles/default-ppc-2004.0/virtuals
index 7e465e3440f6..19de334ad5f3 100644
--- a/profiles/default-ppc-2004.0/virtuals
+++ b/profiles/default-ppc-2004.0/virtuals
@@ -1,7 +1,7 @@
 sys-apps/console-tools  sys-apps/kbd
 sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	    media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/default-ppc-2004.1/virtuals b/profiles/default-ppc-2004.1/virtuals
index 7e465e3440f6..19de334ad5f3 100644
--- a/profiles/default-ppc-2004.1/virtuals
+++ b/profiles/default-ppc-2004.1/virtuals
@@ -1,7 +1,7 @@
 sys-apps/console-tools  sys-apps/kbd
 sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	    media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/default-ppc-2004.2/virtuals b/profiles/default-ppc-2004.2/virtuals
index 7e465e3440f6..19de334ad5f3 100644
--- a/profiles/default-ppc-2004.2/virtuals
+++ b/profiles/default-ppc-2004.2/virtuals
@@ -1,7 +1,7 @@
 sys-apps/console-tools  sys-apps/kbd
 sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	    media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/default-ppc64-1.4/virtuals b/profiles/default-ppc64-1.4/virtuals
index ac002a477f16..4f629cbce4bc 100644
--- a/profiles/default-ppc64-1.4/virtuals
+++ b/profiles/default-ppc64-1.4/virtuals
@@ -30,7 +30,7 @@ virtual/editor		app-editors/nano
 virtual/os-headers	sys-kernel/linux-headers
 virtual/modutils 	sys-apps/modutils
 virtual/inetd		sys-apps/xinetd
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-ppc64-2004.0/virtuals b/profiles/default-ppc64-2004.0/virtuals
index 13d3ccb12ee6..40915cb3cb73 100644
--- a/profiles/default-ppc64-2004.0/virtuals
+++ b/profiles/default-ppc64-2004.0/virtuals
@@ -30,7 +30,7 @@ virtual/editor		app-editors/nano
 virtual/os-headers	sys-kernel/linux-headers
 virtual/modutils 	sys-apps/modutils
 virtual/inetd		sys-apps/xinetd
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/ghc		dev-lang/ghc-bin
diff --git a/profiles/default-s390-2004.0/virtuals b/profiles/default-s390-2004.0/virtuals
index ef634a8e4f8f..0710c83dc289 100644
--- a/profiles/default-s390-2004.0/virtuals
+++ b/profiles/default-s390-2004.0/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-s390-2004.1/virtuals b/profiles/default-s390-2004.1/virtuals
index ef634a8e4f8f..0710c83dc289 100644
--- a/profiles/default-s390-2004.1/virtuals
+++ b/profiles/default-s390-2004.1/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-sparc-1.4/virtuals b/profiles/default-sparc-1.4/virtuals
index 65682878a43f..c4172d997a7e 100644
--- a/profiles/default-sparc-1.4/virtuals
+++ b/profiles/default-sparc-1.4/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-sparc-2004.0/virtuals b/profiles/default-sparc-2004.0/virtuals
index 65682878a43f..c4172d997a7e 100644
--- a/profiles/default-sparc-2004.0/virtuals
+++ b/profiles/default-sparc-2004.0/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-sparc64-1.4/virtuals b/profiles/default-sparc64-1.4/virtuals
index f0f7b185aa36..569d3b842e63 100644
--- a/profiles/default-sparc64-1.4/virtuals
+++ b/profiles/default-sparc64-1.4/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-sparc64-2004.0/virtuals b/profiles/default-sparc64-2004.0/virtuals
index 79ea7392f287..a1994604bb9c 100644
--- a/profiles/default-sparc64-2004.0/virtuals
+++ b/profiles/default-sparc64-2004.0/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/default-x86-1.4/virtuals b/profiles/default-x86-1.4/virtuals
index 3882d5db7a24..be6ff01d3d24 100644
--- a/profiles/default-x86-1.4/virtuals
+++ b/profiles/default-x86-1.4/virtuals
@@ -32,7 +32,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
 virtual/modutils		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/skkserv			app-i18n/skkserv
 virtual/snmp			net-analyzer/net-snmp
diff --git a/profiles/default-x86-2004.0/virtuals b/profiles/default-x86-2004.0/virtuals
index ea44f6a0bb99..0b08af54fd15 100644
--- a/profiles/default-x86-2004.0/virtuals
+++ b/profiles/default-x86-2004.0/virtuals
@@ -32,7 +32,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
 virtual/modutils		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/skkserv			app-i18n/skkserv
 virtual/snmp			net-analyzer/net-snmp
diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals
index f9090d9c2276..4bdae03630ef 100644
--- a/profiles/embedded/virtuals
+++ b/profiles/embedded/virtuals
@@ -1,6 +1,6 @@
 sys-apps/console-tools		sys-apps/kbd
 virtual/alsa			media-sound/alsa-driver
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/bittorrent		net-p2p/bittorrent
 virtual/blackbox		x11-wm/blackbox
diff --git a/profiles/gcc33-sparc64-1.4/virtuals b/profiles/gcc33-sparc64-1.4/virtuals
index 4e5377dcc671..6dcfb6a50f2e 100644
--- a/profiles/gcc33-sparc64-1.4/virtuals
+++ b/profiles/gcc33-sparc64-1.4/virtuals
@@ -31,7 +31,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict	   app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/gcc34-amd64-2004.1/virtuals b/profiles/gcc34-amd64-2004.1/virtuals
index 06bb53b9c4d4..fde2c9399a3c 100644
--- a/profiles/gcc34-amd64-2004.1/virtuals
+++ b/profiles/gcc34-amd64-2004.1/virtuals
@@ -40,7 +40,7 @@ virtual/ghc             dev-lang/ghc-bin
 #virtual/modutils		sys-apps/module-init-tools
 virtual/modutils		sys-apps/module-init-tools
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict           app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/hardened-amd64-2004.0/virtuals b/profiles/hardened-amd64-2004.0/virtuals
index c3403bf0fafe..627e75e6f6d2 100644
--- a/profiles/hardened-amd64-2004.0/virtuals
+++ b/profiles/hardened-amd64-2004.0/virtuals
@@ -39,7 +39,7 @@ virtual/ghc             dev-lang/ghc-bin
 #sys-apps/modutils	sys-apps/module-init-tools
 virtual/modutils	sys-apps/module-init-tools
 virtual/inetd		sys-apps/xinetd
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
diff --git a/profiles/hardened-x86-1.4/virtuals b/profiles/hardened-x86-1.4/virtuals
index b2ea126a4287..48f7cef724fb 100644
--- a/profiles/hardened-x86-1.4/virtuals
+++ b/profiles/hardened-x86-1.4/virtuals
@@ -32,7 +32,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
 virtual/modutils		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/skkserv			app-i18n/skkserv
 virtual/snmp			net-analyzer/net-snmp
diff --git a/profiles/hardened-x86-2004.0/virtuals b/profiles/hardened-x86-2004.0/virtuals
index b2ea126a4287..48f7cef724fb 100644
--- a/profiles/hardened-x86-2004.0/virtuals
+++ b/profiles/hardened-x86-2004.0/virtuals
@@ -32,7 +32,7 @@ virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
 virtual/modutils		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
-virtual/antivirus		net-mail/clamav
+virtual/antivirus		app-antivirus/clamav
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/skkserv			app-i18n/skkserv
 virtual/snmp			net-analyzer/net-snmp
diff --git a/profiles/selinux-ppc-1.4/virtuals b/profiles/selinux-ppc-1.4/virtuals
index efa267d44b06..1cbd4ac8b1f1 100644
--- a/profiles/selinux-ppc-1.4/virtuals
+++ b/profiles/selinux-ppc-1.4/virtuals
@@ -1,7 +1,7 @@
 sys-apps/console-tools  sys-apps/kbd
 sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	    media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/selinux-sparc64-1.4/virtuals b/profiles/selinux-sparc64-1.4/virtuals
index 38af8d24a184..6e4faf6ddf91 100644
--- a/profiles/selinux-sparc64-1.4/virtuals
+++ b/profiles/selinux-sparc64-1.4/virtuals
@@ -1,6 +1,6 @@
 sys-apps/console-tools	sys-apps/kbd
 sys-apps/reiserfs-utils	sys-fs/reiserfsprogs
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/selinux-x86-1.4/virtuals b/profiles/selinux-x86-1.4/virtuals
index 5198e2126b65..cd1f4e66c356 100644
--- a/profiles/selinux-x86-1.4/virtuals
+++ b/profiles/selinux-x86-1.4/virtuals
@@ -1,7 +1,7 @@
 sys-apps/console-tools  sys-apps/kbd
 sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	    media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
+virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 68a14d2f97db..cf4a04984def 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -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/profiles/use.local.desc,v 1.394 2004/05/29 17:13:33 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.395 2004/05/30 00:50:48 robbat2 Exp $
 
 # This file contains descriptions of local USE flags, and the ebuilds which
 # contain them.
@@ -11,6 +11,7 @@ app-admin/amanda:xfs - Support for backing up raw XFS filesystems using xfsdump
 app-admin/lcap:lids - If you have the Linux Intrusion Detection System
 app-admin/sdsc-syslog:beep - Use beep libraries (net-libs/roadrunner)
 app-admin/webalizer:geoip - Enable support for IP country lookup
+app-antivirus/clamav:milter - Build sendmail mail filter (milter) support
 app-cdr/k3b:monkey - Enable support for Monkey's audio codec
 app-crypt/gnupg:idea - Use the patented IDEA algorithm
 app-crypt/johntheripper:ntlm - enables john to crack Windows NT/2000 MD4 (case-sensitive) password hashes
@@ -255,7 +256,6 @@ net-libs/libsoup:gnutls - Use GnuTLS instead of OpenSSL for SSL support
 net-libs/libvncserver:no24bpp - disable 24bpp support
 net-libs/libvncserver:nobackchannel - disable backchannel support
 net-mail/amavisd-new:milter - Enable Sendmail milter support
-net-mail/clamav:milter - Build sendmail mail filter (milter) support
 net-mail/courier:fax - Enables fax support in the courier mail server
 net-mail/courier:norewrite - Prevents courier mail server from mangling virtual user addresses when sending
 net-mail/cyrus-imapd:drac - Enable dynamic relay support in the cyrus imap server