www-proxy -> net-proxy

4 files changed, 31 insertions, 13 deletions

diff --git a/profiles/categories b/profiles/categories
index 62a069c76e2d..8ac3496608ab 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -92,6 +92,7 @@ net-news
 net-nntp
 net-p2p
 net-print
+net-proxy
 net-wireless
 net-www
 net-zope
@@ -121,7 +122,6 @@ www-apache
 www-apps
 www-client
 www-misc
-www-proxy
 www-servers
 x11-base
 x11-libs
diff --git a/profiles/package.mask b/profiles/package.mask
index 7194896ecf74..6608a8d64089 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 #####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.3859 2005/04/22 19:33:20 pythonhead Exp $#
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.3860 2005/04/22 19:44:10 mrness Exp $#
 # When you add an entry to this file, add your name, the date, and an
 # explanation of why something is getting masked
 #
@@ -31,7 +31,7 @@ app-portage/abeni
 
 # Alin Nastac <mrness@gentoo.org> (21 Apr 2005)
 # viruses are filtered only on the first request of the URL (bug #89948)
-www-proxy/dansguardian-dgav
+net-proxy/dansguardian-dgav
 
 # Marcus D. Hanwell <cryos@gentoo.org> (21 Apr 2005)
 # Initial testing of new boinc ebuilds
diff --git a/profiles/updates/2Q-2005 b/profiles/updates/2Q-2005
index bad51b00c00f..46b41db21c88 100644
--- a/profiles/updates/2Q-2005
+++ b/profiles/updates/2Q-2005
@@ -12,3 +12,21 @@ move net-misc/lrzsz net-dialup/lrzsz
 move net-misc/cutecom net-dialup/cutecom
 move net-misc/slirp net-dialup/slirp
 move sys-apps/acpi sys-power/acpi
+move www-proxy/amphetadesk net-news/amphetadesk
+move www-proxy/adzapper net-proxy/adzapper
+move www-proxy/dansguardian net-proxy/dansguardian
+move www-proxy/dansguardian-dgav net-proxy/dansguardian-dgav
+move www-proxy/httpush net-proxy/httpush
+move www-proxy/junkbuster net-proxy/junkbuster
+move www-proxy/middleman net-proxy/middleman
+move www-proxy/ntlmaps net-proxy/ntlmaps
+move www-proxy/oops net-proxy/oops
+move www-proxy/paros net-proxy/paros
+move www-proxy/polipo net-proxy/polipo
+move www-proxy/privoxy net-proxy/privoxy
+move www-proxy/squid net-proxy/squid
+move www-proxy/squidguard net-proxy/squidguard
+move www-proxy/squirm net-proxy/squirm
+move www-proxy/tinyproxy net-proxy/tinyproxy
+move www-proxy/webscarab net-proxy/webscarab
+move www-proxy/wwwoffle net-proxy/wwwoffle
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c523d6976fae..3a610d8df242 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.1099 2005/04/22 18:56:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.1100 2005/04/22 19:44:10 mrness Exp $
 
 # This file contains descriptions of local USE flags, and the ebuilds which
 # contain them.
@@ -846,15 +846,15 @@ www-client/w3m:async - Enables asynchronous fetch
 www-client/w3m:imlib2 - If you want to link imlib2 instead of imlib against w3mimgdisplay
 www-client/w3m:lynxkeymap - If you prefer Lynx-like key binding
 www-misc/nsxml:xslt - Enables xslt support
-www-proxy/squid:customlog - Add support for custom log file formats
-www-proxy/squid:logrotate - Use logrotate for rotating logs
-www-proxy/squid:underscores - Enables support for domain names containing underscores
-www-proxy/tinyproxy:transparent-proxy - enable support for transparent proxies
-www-servers/fnord:diet - Compile and link with dietlibc
-www-servers/lighttpd:xattr - if you want extended attributes enabled
-www-servers/pound:msdav - if you want the Microsoft DAV extensions enabled
-www-servers/pound:unsafe - if you want the 'unsafe' characters passed through to the web servers
-www-servers/skunkweb:apache1 - enable apache1 support if internal server and apache2 support not wanted
+net-proxy/squid:customlog - Add support for custom log file formats
+net-proxy/squid:logrotate - Use logrotate for rotating logs
+net-proxy/squid:underscores - Enables support for domain names containing underscores
+net-proxy/tinyproxy:transparent-proxy - enable support for transparent proxies
+net-servers/fnord:diet - Compile and link with dietlibc
+net-servers/lighttpd:xattr - if you want extended attributes enabled
+net-servers/pound:msdav - if you want the Microsoft DAV extensions enabled
+net-servers/pound:unsafe - if you want the 'unsafe' characters passed through to the web servers
+net-servers/skunkweb:apache1 - enable apache1 support if internal server and apache2 support not wanted
 x11-base/kdrive:fbdev - Enables framebuffer kdrive server
 x11-base/kdrive:font-server - Enables font server support
 x11-base/kdrive:freetype - Enables Freetype font support