diff options
94 files changed, 52 insertions, 94 deletions
diff --git a/profiles/base/virtuals b/profiles/base/virtuals index 3effef1d21f0..cbef8f396066 100644 --- a/profiles/base/virtuals +++ b/profiles/base/virtuals @@ -1,6 +1,6 @@ # Copyright 2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.49 2005/02/01 14:20:05 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.50 2005/02/21 04:08:53 dragonheart 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 @@ -63,7 +63,6 @@ virtual/quicktime media-libs/libquicktime virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/squeak-image dev-lang/squeak-fullimage virtual/ssh net-misc/openssh virtual/sylpheed mail-client/sylpheed diff --git a/profiles/cobalt-mips-1.4/use.defaults b/profiles/cobalt-mips-1.4/use.defaults index dc43358f674f..3839b5475911 100644 --- a/profiles/cobalt-mips-1.4/use.defaults +++ b/profiles/cobalt-mips-1.4/use.defaults @@ -49,7 +49,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/cobalt-mips-1.4/virtuals b/profiles/cobalt-mips-1.4/virtuals index 803594f91762..15b41803ddc9 100644 --- a/profiles/cobalt-mips-1.4/virtuals +++ b/profiles/cobalt-mips-1.4/virtuals @@ -44,7 +44,6 @@ virtual/python dev-lang/python virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/sylpheed mail-client/sylpheed virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/cobalt-mips-2004.1/use.defaults b/profiles/cobalt-mips-2004.1/use.defaults index dc43358f674f..3839b5475911 100644 --- a/profiles/cobalt-mips-2004.1/use.defaults +++ b/profiles/cobalt-mips-2004.1/use.defaults @@ -49,7 +49,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/cobalt-mips-2004.1/virtuals b/profiles/cobalt-mips-2004.1/virtuals index 803594f91762..15b41803ddc9 100644 --- a/profiles/cobalt-mips-2004.1/virtuals +++ b/profiles/cobalt-mips-2004.1/virtuals @@ -44,7 +44,6 @@ virtual/python dev-lang/python virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/sylpheed mail-client/sylpheed virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/default-1.0-gcc3/packages b/profiles/default-1.0-gcc3/packages index 7595853324a2..821d75f5cf07 100644 --- a/profiles/default-1.0-gcc3/packages +++ b/profiles/default-1.0-gcc3/packages @@ -135,7 +135,7 @@ dev-lang/perl >=app-admin/mon-0.38.20-r6 >=app-admin/syslog-ng-1.4.12-r6 >=net-www/apache-1.3.20-r6 ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-ftp/oftpd-0.3.6-r6 >=net-ftp/proftpd-1.2.4-r6 >=net-misc/dhcp-3.0_rc12-r6 diff --git a/profiles/default-1.0-gcc3/use.defaults b/profiles/default-1.0-gcc3/use.defaults index 2b2a99febebc..c1056b1d37bc 100644 --- a/profiles/default-1.0-gcc3/use.defaults +++ b/profiles/default-1.0-gcc3/use.defaults @@ -52,7 +52,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-1.0-gcc3/virtuals b/profiles/default-1.0-gcc3/virtuals index f910bbf2264e..95574f9d5783 100644 --- a/profiles/default-1.0-gcc3/virtuals +++ b/profiles/default-1.0-gcc3/virtuals @@ -36,7 +36,6 @@ virtual/modutils sys-apps/modutils virtual/inetd sys-apps/xinetd virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-1.0/packages b/profiles/default-1.0/packages index 7c2b553b8f25..e5825e166558 100644 --- a/profiles/default-1.0/packages +++ b/profiles/default-1.0/packages @@ -132,7 +132,7 @@ dev-lang/perl >=app-admin/mon-0.38.20-r6 >=app-admin/syslog-ng-1.4.12-r6 >=net-www/apache-1.3.20-r6 ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-ftp/oftpd-0.3.6-r6 >=net-ftp/proftpd-1.2.4-r6 >=net-misc/dhcp-3.0_rc12-r6 diff --git a/profiles/default-1.0/use.defaults b/profiles/default-1.0/use.defaults index 605cc36f9d99..4caac93c29fc 100644 --- a/profiles/default-1.0/use.defaults +++ b/profiles/default-1.0/use.defaults @@ -49,7 +49,7 @@ ruby dev-lang/ruby scanner media-gfx/sane-backends sdl media-libs/libsdl slang sys-libs/slang -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp ssl dev-libs/openssl svga media-libs/svgalib tcltk dev-lang/tcl dev-lang/tk diff --git a/profiles/default-1.0/virtuals b/profiles/default-1.0/virtuals index ac975fbcc388..24d7d68dc2bb 100644 --- a/profiles/default-1.0/virtuals +++ b/profiles/default-1.0/virtuals @@ -36,7 +36,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/imap-c-client net-libs/c-client virtual/wine app-emulation/wine diff --git a/profiles/default-alpha-1.4/use.defaults b/profiles/default-alpha-1.4/use.defaults index 7fa6187cab0f..9a9015cbc485 100644 --- a/profiles/default-alpha-1.4/use.defaults +++ b/profiles/default-alpha-1.4/use.defaults @@ -40,7 +40,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-alpha-1.4/virtuals b/profiles/default-alpha-1.4/virtuals index a520334e7585..aac5767e29a7 100644 --- a/profiles/default-alpha-1.4/virtuals +++ b/profiles/default-alpha-1.4/virtuals @@ -36,7 +36,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-alpha-2004.0/use.defaults b/profiles/default-alpha-2004.0/use.defaults index 7fa6187cab0f..9a9015cbc485 100644 --- a/profiles/default-alpha-2004.0/use.defaults +++ b/profiles/default-alpha-2004.0/use.defaults @@ -40,7 +40,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-alpha-2004.0/virtuals b/profiles/default-alpha-2004.0/virtuals index 3cfdfe5eb552..61649f1b4ed8 100644 --- a/profiles/default-alpha-2004.0/virtuals +++ b/profiles/default-alpha-2004.0/virtuals @@ -36,7 +36,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-amd64-2004.0/use.defaults b/profiles/default-amd64-2004.0/use.defaults index 0ee59561a754..dff11f4636cf 100644 --- a/profiles/default-amd64-2004.0/use.defaults +++ b/profiles/default-amd64-2004.0/use.defaults @@ -51,7 +51,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-amd64-2004.0/virtuals b/profiles/default-amd64-2004.0/virtuals index e9753fae6826..100fe5f249f0 100644 --- a/profiles/default-amd64-2004.0/virtuals +++ b/profiles/default-amd64-2004.0/virtuals @@ -38,7 +38,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-amd64-2004.2/use.defaults b/profiles/default-amd64-2004.2/use.defaults index a41758eb47c2..2e75de83128e 100644 --- a/profiles/default-amd64-2004.2/use.defaults +++ b/profiles/default-amd64-2004.2/use.defaults @@ -51,7 +51,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-amd64-2004.2/virtuals b/profiles/default-amd64-2004.2/virtuals index 9926e4da2a1b..a35b9d389afc 100644 --- a/profiles/default-amd64-2004.2/virtuals +++ b/profiles/default-amd64-2004.2/virtuals @@ -38,7 +38,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-arm-2004.0/use.defaults b/profiles/default-arm-2004.0/use.defaults index 4f31b72a1ccb..16f3e8c2a576 100644 --- a/profiles/default-arm-2004.0/use.defaults +++ b/profiles/default-arm-2004.0/use.defaults @@ -50,7 +50,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-arm-2004.0/virtuals b/profiles/default-arm-2004.0/virtuals index baa0617049f8..a76c59becdeb 100644 --- a/profiles/default-arm-2004.0/virtuals +++ b/profiles/default-arm-2004.0/virtuals @@ -38,7 +38,6 @@ virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv virtual/ghc dev-lang/ghc-bin -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-darwin/virtuals b/profiles/default-darwin/virtuals index bc9346dae882..c10d1e0a3b5b 100644 --- a/profiles/default-darwin/virtuals +++ b/profiles/default-darwin/virtuals @@ -24,7 +24,6 @@ virtual/os-headers sys-libs/libsystem virtual/php dev-php/mod_php virtual/python dev-lang/python virtual/ruby dev-lang/ruby -virtual/snmp net-analyzer/net-snmp virtual/ssh net-misc/openssh virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/default-hppa-2004.0/use.defaults b/profiles/default-hppa-2004.0/use.defaults index dc43358f674f..3839b5475911 100644 --- a/profiles/default-hppa-2004.0/use.defaults +++ b/profiles/default-hppa-2004.0/use.defaults @@ -49,7 +49,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-hppa-2004.0/virtuals b/profiles/default-hppa-2004.0/virtuals index 05c70beec0a1..988d7bfff26e 100644 --- a/profiles/default-hppa-2004.0/virtuals +++ b/profiles/default-hppa-2004.0/virtuals @@ -36,7 +36,6 @@ virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv virtual/ghc dev-lang/ghc-bin -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-linux/x86/gcc2/packages b/profiles/default-linux/x86/gcc2/packages index 122e9d64228b..42162bf509c3 100644 --- a/profiles/default-linux/x86/gcc2/packages +++ b/profiles/default-linux/x86/gcc2/packages @@ -37,7 +37,7 @@ >=app-admin/mon-0.38.20-r6 >=app-admin/syslog-ng-1.4.12-r6 >=net-www/apache-1.3.20-r6 ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-ftp/oftpd-0.3.6-r6 >=net-ftp/proftpd-1.2.4-r6 >=net-misc/dhcp-3.0_rc12-r6 diff --git a/profiles/default-linux/x86/gcc31/packages b/profiles/default-linux/x86/gcc31/packages index cb3b32a61e50..227324c20f78 100644 --- a/profiles/default-linux/x86/gcc31/packages +++ b/profiles/default-linux/x86/gcc31/packages @@ -41,7 +41,7 @@ >=app-admin/mon-0.38.20-r6 >=app-admin/syslog-ng-1.4.12-r6 >=net-www/apache-1.3.20-r6 ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-ftp/oftpd-0.3.6-r6 >=net-ftp/proftpd-1.2.4-r6 >=net-misc/dhcp-3.0_rc12-r6 diff --git a/profiles/default-macos-10.3/use.defaults b/profiles/default-macos-10.3/use.defaults index 06021fd0d0fb..2639350114a3 100644 --- a/profiles/default-macos-10.3/use.defaults +++ b/profiles/default-macos-10.3/use.defaults @@ -13,7 +13,7 @@ qt x11-libs/qt readline sys-libs/readline ruby dev-lang/ruby sdl media-libs/libsdl -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp ssl dev-libs/openssl tcltk dev-lang/tcl dev-lang/tk tcpd sys-apps/tcp-wrappers diff --git a/profiles/default-macos-10.3/virtuals b/profiles/default-macos-10.3/virtuals index fb4dc2aaf04f..e594093f4937 100644 --- a/profiles/default-macos-10.3/virtuals +++ b/profiles/default-macos-10.3/virtuals @@ -16,7 +16,6 @@ virtual/mda mail-filter/procmail virtual/mta mail-mta/postfix virtual/php dev-php/mod_php virtual/httpd-php dev-php/mod_php -virtual/snmp net-analyzer/net-snmp virtual/ssh net-misc/openssh virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/default-macos-10.4/use.defaults b/profiles/default-macos-10.4/use.defaults index 06021fd0d0fb..2639350114a3 100644 --- a/profiles/default-macos-10.4/use.defaults +++ b/profiles/default-macos-10.4/use.defaults @@ -13,7 +13,7 @@ qt x11-libs/qt readline sys-libs/readline ruby dev-lang/ruby sdl media-libs/libsdl -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp ssl dev-libs/openssl tcltk dev-lang/tcl dev-lang/tk tcpd sys-apps/tcp-wrappers diff --git a/profiles/default-macos-10.4/virtuals b/profiles/default-macos-10.4/virtuals index fb4dc2aaf04f..e594093f4937 100644 --- a/profiles/default-macos-10.4/virtuals +++ b/profiles/default-macos-10.4/virtuals @@ -16,7 +16,6 @@ virtual/mda mail-filter/procmail virtual/mta mail-mta/postfix virtual/php dev-php/mod_php virtual/httpd-php dev-php/mod_php -virtual/snmp net-analyzer/net-snmp virtual/ssh net-misc/openssh virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/default-mips-1.4/use.defaults b/profiles/default-mips-1.4/use.defaults index dc43358f674f..3839b5475911 100644 --- a/profiles/default-mips-1.4/use.defaults +++ b/profiles/default-mips-1.4/use.defaults @@ -49,7 +49,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-mips-1.4/virtuals b/profiles/default-mips-1.4/virtuals index d4f07744730a..9f2586ed34ac 100644 --- a/profiles/default-mips-1.4/virtuals +++ b/profiles/default-mips-1.4/virtuals @@ -44,7 +44,6 @@ virtual/python dev-lang/python virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/sylpheed mail-client/sylpheed virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/default-mips-2004.1/use.defaults b/profiles/default-mips-2004.1/use.defaults index dc43358f674f..3839b5475911 100644 --- a/profiles/default-mips-2004.1/use.defaults +++ b/profiles/default-mips-2004.1/use.defaults @@ -49,7 +49,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-mips-2004.1/virtuals b/profiles/default-mips-2004.1/virtuals index d4f07744730a..9f2586ed34ac 100644 --- a/profiles/default-mips-2004.1/virtuals +++ b/profiles/default-mips-2004.1/virtuals @@ -44,7 +44,6 @@ virtual/python dev-lang/python virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/sylpheed mail-client/sylpheed virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/default-mips64-1.4/use.defaults b/profiles/default-mips64-1.4/use.defaults index dc43358f674f..3839b5475911 100644 --- a/profiles/default-mips64-1.4/use.defaults +++ b/profiles/default-mips64-1.4/use.defaults @@ -49,7 +49,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-mips64-1.4/virtuals b/profiles/default-mips64-1.4/virtuals index 803594f91762..15b41803ddc9 100644 --- a/profiles/default-mips64-1.4/virtuals +++ b/profiles/default-mips64-1.4/virtuals @@ -44,7 +44,6 @@ virtual/python dev-lang/python virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/sylpheed mail-client/sylpheed virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/default-ppc-1.0/packages b/profiles/default-ppc-1.0/packages index 3e847530dcce..bd19747c30cb 100644 --- a/profiles/default-ppc-1.0/packages +++ b/profiles/default-ppc-1.0/packages @@ -165,7 +165,7 @@ net-misc/rsync >=app-admin/mon-0.38.20-r6 >=app-admin/syslog-ng-1.4.12-r6 >=net-www/apache-1.3.20-r6 ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-ftp/oftpd-0.3.6-r6 >=net-ftp/proftpd-1.2.4-r6 >=net-misc/dhcp-3.0_rc12-r6 diff --git a/profiles/default-ppc-1.0/use.defaults b/profiles/default-ppc-1.0/use.defaults index a690f140a8f5..236c293d37a2 100644 --- a/profiles/default-ppc-1.0/use.defaults +++ b/profiles/default-ppc-1.0/use.defaults @@ -52,7 +52,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-ppc-1.0/virtuals b/profiles/default-ppc-1.0/virtuals index 2469286fdd10..e159616392f6 100644 --- a/profiles/default-ppc-1.0/virtuals +++ b/profiles/default-ppc-1.0/virtuals @@ -33,7 +33,6 @@ virtual/inetd sys-apps/xinetd virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv virtual/ghc dev-lang/ghc-bin -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-ppc-1.4/packages b/profiles/default-ppc-1.4/packages index 82a1025674e9..fa75dc3ad57a 100644 --- a/profiles/default-ppc-1.4/packages +++ b/profiles/default-ppc-1.4/packages @@ -90,7 +90,7 @@ >=app-admin/syslog-ng-1.4.12-r6 >=app-text/dictd-1.5.5-r6 >=media-sound/alsa-utils-0.5.10-r6 ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-dialup/ppp-2.4.1-r6 >=net-fs/samba-2.2.2-r6 >=net-fs/samba-winbind-20010329-r6 diff --git a/profiles/default-ppc-1.4/use.defaults b/profiles/default-ppc-1.4/use.defaults index 7985f2e13397..84182686dfca 100644 --- a/profiles/default-ppc-1.4/use.defaults +++ b/profiles/default-ppc-1.4/use.defaults @@ -52,7 +52,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-ppc-1.4/virtuals b/profiles/default-ppc-1.4/virtuals index 67aecb07170e..7d20766a63d2 100644 --- a/profiles/default-ppc-1.4/virtuals +++ b/profiles/default-ppc-1.4/virtuals @@ -35,7 +35,6 @@ virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv virtual/ghc dev-lang/ghc-bin -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-ppc-2004.0/use.defaults b/profiles/default-ppc-2004.0/use.defaults index fd5dcbda48df..2bb115841d38 100644 --- a/profiles/default-ppc-2004.0/use.defaults +++ b/profiles/default-ppc-2004.0/use.defaults @@ -35,7 +35,7 @@ ruby dev-lang/ruby scanner media-gfx/sane-backends sdl media-libs/libsdl slang sys-libs/slang -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp ssl dev-libs/openssl svga media-libs/svgalib tcltk dev-lang/tcl dev-lang/tk diff --git a/profiles/default-ppc-2004.0/virtuals b/profiles/default-ppc-2004.0/virtuals index b3a686b551fc..fa7ded80c094 100644 --- a/profiles/default-ppc-2004.0/virtuals +++ b/profiles/default-ppc-2004.0/virtuals @@ -49,7 +49,6 @@ virtual/quicktime media-libs/libquicktime virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/squeak-image dev-lang/squeak-fullimage virtual/ssh net-misc/openssh virtual/sylpheed mail-client/sylpheed diff --git a/profiles/default-ppc-2004.1/use.defaults b/profiles/default-ppc-2004.1/use.defaults index fd5dcbda48df..2bb115841d38 100644 --- a/profiles/default-ppc-2004.1/use.defaults +++ b/profiles/default-ppc-2004.1/use.defaults @@ -35,7 +35,7 @@ ruby dev-lang/ruby scanner media-gfx/sane-backends sdl media-libs/libsdl slang sys-libs/slang -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp ssl dev-libs/openssl svga media-libs/svgalib tcltk dev-lang/tcl dev-lang/tk diff --git a/profiles/default-ppc-2004.1/virtuals b/profiles/default-ppc-2004.1/virtuals index 2fc029bee5e8..c3c89412fdda 100644 --- a/profiles/default-ppc-2004.1/virtuals +++ b/profiles/default-ppc-2004.1/virtuals @@ -49,7 +49,6 @@ virtual/quicktime media-libs/libquicktime virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/squeak-image dev-lang/squeak-fullimage virtual/ssh net-misc/openssh virtual/sylpheed mail-client/sylpheed diff --git a/profiles/default-ppc-2004.2/use.defaults b/profiles/default-ppc-2004.2/use.defaults index fd5dcbda48df..2bb115841d38 100644 --- a/profiles/default-ppc-2004.2/use.defaults +++ b/profiles/default-ppc-2004.2/use.defaults @@ -35,7 +35,7 @@ ruby dev-lang/ruby scanner media-gfx/sane-backends sdl media-libs/libsdl slang sys-libs/slang -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp ssl dev-libs/openssl svga media-libs/svgalib tcltk dev-lang/tcl dev-lang/tk diff --git a/profiles/default-ppc-2004.2/virtuals b/profiles/default-ppc-2004.2/virtuals index 2fc029bee5e8..c3c89412fdda 100644 --- a/profiles/default-ppc-2004.2/virtuals +++ b/profiles/default-ppc-2004.2/virtuals @@ -49,7 +49,6 @@ virtual/quicktime media-libs/libquicktime virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/squeak-image dev-lang/squeak-fullimage virtual/ssh net-misc/openssh virtual/sylpheed mail-client/sylpheed diff --git a/profiles/default-ppc-2004.3/use.defaults b/profiles/default-ppc-2004.3/use.defaults index fd5dcbda48df..2bb115841d38 100644 --- a/profiles/default-ppc-2004.3/use.defaults +++ b/profiles/default-ppc-2004.3/use.defaults @@ -35,7 +35,7 @@ ruby dev-lang/ruby scanner media-gfx/sane-backends sdl media-libs/libsdl slang sys-libs/slang -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp ssl dev-libs/openssl svga media-libs/svgalib tcltk dev-lang/tcl dev-lang/tk diff --git a/profiles/default-ppc-2004.3/virtuals b/profiles/default-ppc-2004.3/virtuals index 14d3ab9916d9..a04e18de5e14 100644 --- a/profiles/default-ppc-2004.3/virtuals +++ b/profiles/default-ppc-2004.3/virtuals @@ -50,7 +50,6 @@ virtual/quicktime media-libs/libquicktime virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/squeak-image dev-lang/squeak-fullimage virtual/ssh net-misc/openssh virtual/sylpheed mail-client/sylpheed diff --git a/profiles/default-ppc/packages b/profiles/default-ppc/packages index 14220f97bfd1..a22187b00c61 100644 --- a/profiles/default-ppc/packages +++ b/profiles/default-ppc/packages @@ -141,7 +141,7 @@ net-misc/rsync >=app-admin/mon-0.38.20-r6 >=app-admin/syslog-ng-1.4.12-r6 >=net-www/apache-1.3.20-r6 ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-ftp/oftpd-0.3.6-r6 >=net-ftp/proftpd-1.2.4-r6 >=net-misc/dhcp-3.0_rc12-r6 diff --git a/profiles/default-ppc/use.defaults b/profiles/default-ppc/use.defaults index 3d6984b4c126..f445a94e70e5 100644 --- a/profiles/default-ppc/use.defaults +++ b/profiles/default-ppc/use.defaults @@ -51,7 +51,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-ppc/virtuals b/profiles/default-ppc/virtuals index 860c3e863394..dc80157c0332 100644 --- a/profiles/default-ppc/virtuals +++ b/profiles/default-ppc/virtuals @@ -30,7 +30,6 @@ virtual/inetd sys-apps/xinetd virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv virtual/ghc dev-lang/ghc-bin -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-ppc64-2004.2/packages b/profiles/default-ppc64-2004.2/packages index 08ea84810fa6..f0a906c694dc 100644 --- a/profiles/default-ppc64-2004.2/packages +++ b/profiles/default-ppc64-2004.2/packages @@ -101,7 +101,7 @@ sys-fs/reiserfsprogs *sys-libs/readline *sys-libs/zlib ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-dialup/ppp-2.4.1-r6 diff --git a/profiles/default-ppc64-2004.2/use.defaults b/profiles/default-ppc64-2004.2/use.defaults index 8634030e4997..cd1fc2edf606 100644 --- a/profiles/default-ppc64-2004.2/use.defaults +++ b/profiles/default-ppc64-2004.2/use.defaults @@ -52,7 +52,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-ppc64-2004.2/virtuals b/profiles/default-ppc64-2004.2/virtuals index 8a28637fdfb9..7ad37df83a91 100644 --- a/profiles/default-ppc64-2004.2/virtuals +++ b/profiles/default-ppc64-2004.2/virtuals @@ -35,7 +35,6 @@ virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv virtual/ghc dev-lang/ghc-bin -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-ppc64-2004.3/packages b/profiles/default-ppc64-2004.3/packages index 08ea84810fa6..f0a906c694dc 100644 --- a/profiles/default-ppc64-2004.3/packages +++ b/profiles/default-ppc64-2004.3/packages @@ -101,7 +101,7 @@ sys-fs/reiserfsprogs *sys-libs/readline *sys-libs/zlib ->=net-analyzer/ucd-snmp-4.1.2-r6 +>=net-analyzer/net-snmp-5.1.1 >=net-dialup/ppp-2.4.1-r6 diff --git a/profiles/default-ppc64-2004.3/use.defaults b/profiles/default-ppc64-2004.3/use.defaults index 8634030e4997..cd1fc2edf606 100644 --- a/profiles/default-ppc64-2004.3/use.defaults +++ b/profiles/default-ppc64-2004.3/use.defaults @@ -52,7 +52,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-ppc64-2004.3/virtuals b/profiles/default-ppc64-2004.3/virtuals index d165702fd723..7890b6dfe165 100644 --- a/profiles/default-ppc64-2004.3/virtuals +++ b/profiles/default-ppc64-2004.3/virtuals @@ -36,7 +36,6 @@ virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv virtual/ghc dev-lang/ghc-bin -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-s390-2004.0/use.defaults b/profiles/default-s390-2004.0/use.defaults index 988d986fc803..7d8edcaf8896 100644 --- a/profiles/default-s390-2004.0/use.defaults +++ b/profiles/default-s390-2004.0/use.defaults @@ -39,7 +39,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-s390-2004.0/virtuals b/profiles/default-s390-2004.0/virtuals index 3dda47394c71..f83213050f2f 100644 --- a/profiles/default-s390-2004.0/virtuals +++ b/profiles/default-s390-2004.0/virtuals @@ -35,7 +35,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-s390-2004.1/use.defaults b/profiles/default-s390-2004.1/use.defaults index 988d986fc803..7d8edcaf8896 100644 --- a/profiles/default-s390-2004.1/use.defaults +++ b/profiles/default-s390-2004.1/use.defaults @@ -39,7 +39,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-s390-2004.1/virtuals b/profiles/default-s390-2004.1/virtuals index 3dda47394c71..f83213050f2f 100644 --- a/profiles/default-s390-2004.1/virtuals +++ b/profiles/default-s390-2004.1/virtuals @@ -35,7 +35,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-sparc-1.4/use.defaults b/profiles/default-sparc-1.4/use.defaults index 988d986fc803..7d8edcaf8896 100644 --- a/profiles/default-sparc-1.4/use.defaults +++ b/profiles/default-sparc-1.4/use.defaults @@ -39,7 +39,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-sparc-1.4/virtuals b/profiles/default-sparc-1.4/virtuals index e216270c3cb4..20eaec6075dd 100644 --- a/profiles/default-sparc-1.4/virtuals +++ b/profiles/default-sparc-1.4/virtuals @@ -35,7 +35,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-sparc-2004.0/use.defaults b/profiles/default-sparc-2004.0/use.defaults index 988d986fc803..7d8edcaf8896 100644 --- a/profiles/default-sparc-2004.0/use.defaults +++ b/profiles/default-sparc-2004.0/use.defaults @@ -39,7 +39,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-sparc-2004.0/virtuals b/profiles/default-sparc-2004.0/virtuals index c0a24b1c247c..7fc84f1ac72f 100644 --- a/profiles/default-sparc-2004.0/virtuals +++ b/profiles/default-sparc-2004.0/virtuals @@ -35,7 +35,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-sparc64-1.4/use.defaults b/profiles/default-sparc64-1.4/use.defaults index 040a0804506c..d3c6103d8d60 100644 --- a/profiles/default-sparc64-1.4/use.defaults +++ b/profiles/default-sparc64-1.4/use.defaults @@ -39,7 +39,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-sparc64-1.4/virtuals b/profiles/default-sparc64-1.4/virtuals index bdc7bd40280f..14f7d903eb32 100644 --- a/profiles/default-sparc64-1.4/virtuals +++ b/profiles/default-sparc64-1.4/virtuals @@ -35,7 +35,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-sparc64-2004.0/use.defaults b/profiles/default-sparc64-2004.0/use.defaults index 040a0804506c..d3c6103d8d60 100644 --- a/profiles/default-sparc64-2004.0/use.defaults +++ b/profiles/default-sparc64-2004.0/use.defaults @@ -39,7 +39,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-sparc64-2004.0/virtuals b/profiles/default-sparc64-2004.0/virtuals index 5d31d13f3b29..f0322ac7e5b0 100644 --- a/profiles/default-sparc64-2004.0/virtuals +++ b/profiles/default-sparc64-2004.0/virtuals @@ -35,7 +35,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/default-x86-1.4/use.defaults b/profiles/default-x86-1.4/use.defaults index fd6ef79f53ac..5db01c4acab6 100644 --- a/profiles/default-x86-1.4/use.defaults +++ b/profiles/default-x86-1.4/use.defaults @@ -52,7 +52,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends emboss sci-biology/emboss diff --git a/profiles/default-x86-1.4/virtuals b/profiles/default-x86-1.4/virtuals index 81fe45754848..e990b9a5ad7e 100644 --- a/profiles/default-x86-1.4/virtuals +++ b/profiles/default-x86-1.4/virtuals @@ -37,7 +37,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/imap-c-client net-libs/c-client virtual/wine app-emulation/wine diff --git a/profiles/default-x86-2004.0/use.defaults b/profiles/default-x86-2004.0/use.defaults index fd6ef79f53ac..5db01c4acab6 100644 --- a/profiles/default-x86-2004.0/use.defaults +++ b/profiles/default-x86-2004.0/use.defaults @@ -52,7 +52,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends emboss sci-biology/emboss diff --git a/profiles/default-x86-2004.0/virtuals b/profiles/default-x86-2004.0/virtuals index 9f0205245e15..567bcd939d00 100644 --- a/profiles/default-x86-2004.0/virtuals +++ b/profiles/default-x86-2004.0/virtuals @@ -37,7 +37,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/imap-c-client net-libs/c-client virtual/wine app-emulation/wine diff --git a/profiles/default-x86-2004.2/use.defaults b/profiles/default-x86-2004.2/use.defaults index fd6ef79f53ac..5db01c4acab6 100644 --- a/profiles/default-x86-2004.2/use.defaults +++ b/profiles/default-x86-2004.2/use.defaults @@ -52,7 +52,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends emboss sci-biology/emboss diff --git a/profiles/default-x86-2004.2/virtuals b/profiles/default-x86-2004.2/virtuals index 29f3fea14aa6..79e297f335c9 100644 --- a/profiles/default-x86-2004.2/virtuals +++ b/profiles/default-x86-2004.2/virtuals @@ -37,7 +37,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/imap-c-client net-libs/c-client virtual/wine app-emulation/wine diff --git a/profiles/default-x86-obsd-2004/use.defaults b/profiles/default-x86-obsd-2004/use.defaults index 1cc2a7856fd1..4940d2f7efdf 100644 --- a/profiles/default-x86-obsd-2004/use.defaults +++ b/profiles/default-x86-obsd-2004/use.defaults @@ -49,7 +49,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/default-x86-obsd-2004/virtuals b/profiles/default-x86-obsd-2004/virtuals index e4af0de77845..e489a05f1bff 100644 --- a/profiles/default-x86-obsd-2004/virtuals +++ b/profiles/default-x86-obsd-2004/virtuals @@ -35,7 +35,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/imap-c-client net-libs/c-client virtual/wine app-emulation/wine diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals index c8c01b41ebad..9ebebaf4bdb6 100644 --- a/profiles/embedded/virtuals +++ b/profiles/embedded/virtuals @@ -39,7 +39,6 @@ virtual/quicktime media-libs/libquicktime virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/ssh net-misc/openssh virtual/sylpheed mail-client/sylpheed virtual/tetex app-text/tetex diff --git a/profiles/gcc33-sparc64-1.4/use.defaults b/profiles/gcc33-sparc64-1.4/use.defaults index 20895b1870c8..19e77aa5fff2 100644 --- a/profiles/gcc33-sparc64-1.4/use.defaults +++ b/profiles/gcc33-sparc64-1.4/use.defaults @@ -41,7 +41,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/gcc33-sparc64-1.4/virtuals b/profiles/gcc33-sparc64-1.4/virtuals index 534cbd0c9048..7cda03037dea 100644 --- a/profiles/gcc33-sparc64-1.4/virtuals +++ b/profiles/gcc33-sparc64-1.4/virtuals @@ -35,7 +35,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/imap-c-client net-libs/c-client virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/gcc34-amd64-2004.1/use.defaults b/profiles/gcc34-amd64-2004.1/use.defaults index 0ee59561a754..dff11f4636cf 100644 --- a/profiles/gcc34-amd64-2004.1/use.defaults +++ b/profiles/gcc34-amd64-2004.1/use.defaults @@ -51,7 +51,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/gcc34-amd64-2004.1/virtuals b/profiles/gcc34-amd64-2004.1/virtuals index 682764c70c79..805750ad0f74 100644 --- a/profiles/gcc34-amd64-2004.1/virtuals +++ b/profiles/gcc34-amd64-2004.1/virtuals @@ -38,7 +38,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/flim app-emacs/flim virtual/semi app-emacs/semi diff --git a/profiles/gcc34-x86-2004.2/use.defaults b/profiles/gcc34-x86-2004.2/use.defaults index fd6ef79f53ac..5db01c4acab6 100644 --- a/profiles/gcc34-x86-2004.2/use.defaults +++ b/profiles/gcc34-x86-2004.2/use.defaults @@ -52,7 +52,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends emboss sci-biology/emboss diff --git a/profiles/gcc34-x86-2004.2/virtuals b/profiles/gcc34-x86-2004.2/virtuals index b382de1afbbc..a7999bbc3c54 100644 --- a/profiles/gcc34-x86-2004.2/virtuals +++ b/profiles/gcc34-x86-2004.2/virtuals @@ -37,7 +37,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/imap-c-client net-libs/c-client virtual/wine app-emulation/wine diff --git a/profiles/hardened-x86-2004.0/use.defaults b/profiles/hardened-x86-2004.0/use.defaults index 1b53c7c68afc..280c553aa6ae 100644 --- a/profiles/hardened-x86-2004.0/use.defaults +++ b/profiles/hardened-x86-2004.0/use.defaults @@ -55,7 +55,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/hardened-x86-2004.0/virtuals b/profiles/hardened-x86-2004.0/virtuals index e4658d5663d9..2fccf25791a1 100644 --- a/profiles/hardened-x86-2004.0/virtuals +++ b/profiles/hardened-x86-2004.0/virtuals @@ -36,7 +36,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/imap-c-client net-libs/c-client virtual/wine app-emulation/wine diff --git a/profiles/hardened/amd64/use.defaults b/profiles/hardened/amd64/use.defaults index 0ee59561a754..dff11f4636cf 100644 --- a/profiles/hardened/amd64/use.defaults +++ b/profiles/hardened/amd64/use.defaults @@ -51,7 +51,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/n32-mips-2004.1/use.defaults b/profiles/n32-mips-2004.1/use.defaults index dc43358f674f..3839b5475911 100644 --- a/profiles/n32-mips-2004.1/use.defaults +++ b/profiles/n32-mips-2004.1/use.defaults @@ -49,7 +49,7 @@ motif x11-libs/openmotif opengl virtual/opengl mozilla net-www/mozilla ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends diff --git a/profiles/n32-mips-2004.1/virtuals b/profiles/n32-mips-2004.1/virtuals index 4ccee50d538e..4b054e2f4fa7 100644 --- a/profiles/n32-mips-2004.1/virtuals +++ b/profiles/n32-mips-2004.1/virtuals @@ -44,7 +44,6 @@ virtual/python dev-lang/python virtual/ruby dev-lang/ruby virtual/semi app-emacs/semi virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/sylpheed mail-client/sylpheed virtual/tetex app-text/tetex virtual/textbrowser net-www/links diff --git a/profiles/updates/1Q-2005 b/profiles/updates/1Q-2005 index a121a277a96b..c9f55d63dfd2 100644 --- a/profiles/updates/1Q-2005 +++ b/profiles/updates/1Q-2005 @@ -125,3 +125,4 @@ slotmove =kde-base/korundum-3.3* 3.3 0 slotmove =kde-base/korundum-3.4* 3.4 0 slotmove =media-libs/libmusepack-1.1 1.1 0 slotmove =media-libs/flac-1.2 1.2 0 +move net-analyzer/ucd-snmp net-analyzer/net-snmp diff --git a/profiles/xbox-x86-2004.0/use.defaults b/profiles/xbox-x86-2004.0/use.defaults index fd6ef79f53ac..5db01c4acab6 100644 --- a/profiles/xbox-x86-2004.0/use.defaults +++ b/profiles/xbox-x86-2004.0/use.defaults @@ -52,7 +52,7 @@ opengl virtual/opengl mozilla net-www/mozilla gphoto2 media-gfx/gphoto2 ldap net-nds/openldap -snmp net-analyzer/ucd-snmp +snmp net-analyzer/net-snmp cdr app-cdr/cdrtools scanner media-gfx/sane-backends emboss sci-biology/emboss diff --git a/profiles/xbox-x86-2004.0/virtuals b/profiles/xbox-x86-2004.0/virtuals index c14aa75806f8..64a58d02ebf0 100644 --- a/profiles/xbox-x86-2004.0/virtuals +++ b/profiles/xbox-x86-2004.0/virtuals @@ -36,7 +36,6 @@ virtual/inetd sys-apps/xinetd virtual/antivirus app-antivirus/clamav virtual/aspell-dict app-dicts/aspell-en virtual/skkserv app-i18n/skkserv -virtual/snmp net-analyzer/net-snmp virtual/winkernel sys-kernel/win4lin-sources virtual/imap-c-client net-libs/c-client virtual/wine app-emulation/wine |