Version bump (5.1.3 final); tidy old ebuilds/patches/cruft. Also added BSD to LICENSE.

(Portage version: 2.0.51.22-r1)

19 files changed, 33 insertions, 665 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 9bcc83d9a4ba..3b4ca41cfa3c 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.112 2005/07/03 02:54:17 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.113 2005/07/04 11:59:12 ka0ttic Exp $
+
+*net-snmp-5.1.3 (04 Jul 2005)
+
+  04 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> -files/net-snmp-proc.patch,
+  -files/snmpd.conf, -files/snmpd.rc6, -net-snmp-5.1.1.ebuild,
+  net-snmp-5.1.1-r1.ebuild, -net-snmp-5.1.3_pre1.ebuild,
+  +net-snmp-5.1.3.ebuild, -net-snmp-5.2.ebuild, -net-snmp-5.2-r3.ebuild,
+  -net-snmp-5.2.1.ebuild, net-snmp-5.2.1-r1.ebuild,
+  net-snmp-5.3.20050624.ebuild:
+  Version bump (5.1.3 final); tidy old ebuilds/patches/cruft. Also added BSD
+  to LICENSE.
 
   03 Jul 2005; Hardave Riar <hardave@gentoo.org> net-snmp-5.2.1-r1.ebuild:
   Stable on mips bug #91792.
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index f6d2dea1e39f..b731942de9e9 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,27 +1,16 @@
-MD5 79f0f8bd28bd21b1bc9f614ca30b45f6 ChangeLog 17074
+MD5 ae4219e77f46e22388203a76a569a501 net-snmp-5.1.3.ebuild 4779
+MD5 452d65ea71b3def96a6b05134770b29f net-snmp-5.3.20050624.ebuild 4929
+MD5 adf15b4b4eb57bb1087da4fea6785221 net-snmp-5.1.1-r1.ebuild 3624
+MD5 b2a14c96954a10c8de0f5856e77d5247 net-snmp-5.2.1-r1.ebuild 5025
+MD5 13efd9b2a486c4b9cadb3abd6ba3ece3 ChangeLog 17551
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
-MD5 c7fcfd97775be54f8312fb4605d92997 net-snmp-5.1.1-r1.ebuild 3620
-MD5 5df973d405e13b29aaaa4a7d4f10aea5 net-snmp-5.1.1.ebuild 2449
-MD5 5347376cc2b2b4139224d86e62c17152 net-snmp-5.1.3_pre1.ebuild 4862
-MD5 e4fde68a956e20a8794b3fb1526fa7e4 net-snmp-5.2-r3.ebuild 4175
-MD5 8a16a36a6fb9398b40d0f700b87bcf22 net-snmp-5.2.1-r1.ebuild 5021
-MD5 22d3d9ac88083c760a07ed3d9c1c32bf net-snmp-5.2.1.ebuild 4876
-MD5 e49bb6c8e7157f872c01c973a1c5fec6 net-snmp-5.2.ebuild 3713
-MD5 d3c7b25c76afd85388df2d2470d3085f net-snmp-5.3.20050624.ebuild 4925
-MD5 b492aa2a6ad459eb41a26932d4c0740b files/digest-net-snmp-5.1.1 67
 MD5 b492aa2a6ad459eb41a26932d4c0740b files/digest-net-snmp-5.1.1-r1 67
-MD5 6cfdd6f7369bc0f4f6456a7feeb1c39c files/digest-net-snmp-5.1.3_pre1 72
-MD5 93ce82e69e9c66badd05144fd498530c files/digest-net-snmp-5.2 65
-MD5 93ce82e69e9c66badd05144fd498530c files/digest-net-snmp-5.2-r3 65
-MD5 f4562e4c61904b17dab28aae2836ff6e files/digest-net-snmp-5.2.1 67
 MD5 f4562e4c61904b17dab28aae2836ff6e files/digest-net-snmp-5.2.1-r1 67
-MD5 cf7d3f5d505c262b2477f1759b908bad files/digest-net-snmp-5.3.20050624 74
-MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
+MD5 a31eeb8af378e385491966360f79a5a7 files/digest-net-snmp-5.1.3 67
 MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
-MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
-MD5 1cc5b20de8fc9e7c807195c320ab2f4b files/net-snmp-proc.patch 2448
+MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
+MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
 MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
+MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
 MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
-MD5 00ce9b4fa6d597e08af7ce82d3a5c246 files/snmpd.conf 599
-MD5 662833e61042a47d4bd8aaae404f4245 files/snmpd.rc6 710
-MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
+MD5 cf7d3f5d505c262b2477f1759b908bad files/digest-net-snmp-5.3.20050624 74
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1
deleted file mode 100644
index b8c9c3775eda..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68f6c946387718e4f300cbb8b6c4bd43 net-snmp-5.1.1.tar.gz 2977122
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3 b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3
new file mode 100644
index 000000000000..f9ac3a8a580b
--- /dev/null
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3
@@ -0,0 +1 @@
+MD5 66e54fe54709f98e45a466df069224cd net-snmp-5.1.3.tar.gz 3329840
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3_pre1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3_pre1
deleted file mode 100644
index 58485c0e13eb..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a856cb6d0f15b7c0f9df2c112d79b1a net-snmp-5.1.3.pre1.tar.gz 3323892
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2
deleted file mode 100644
index 947c6aadbcc3..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af1c18209474ec4851b06504aae2a7c1 net-snmp-5.2.tar.gz 3853153
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2-r3 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2-r3
deleted file mode 100644
index 947c6aadbcc3..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af1c18209474ec4851b06504aae2a7c1 net-snmp-5.2.tar.gz 3853153
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1
deleted file mode 100644
index ea1106d64bfd..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c38451b1f5914789da370b79dc06124 net-snmp-5.2.1.tar.gz 3971320
diff --git a/net-analyzer/net-snmp/files/net-snmp-proc.patch b/net-analyzer/net-snmp/files/net-snmp-proc.patch
deleted file mode 100644
index 9d68b7b12cda..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-proc.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-===================================================================
-RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/ucd-snmp/proc.c,v
-retrieving revision 5.4
-retrieving revision 5.6
-diff -u -r5.4 -r5.6
---- net-snmp/net-snmp/agent/mibgroup/ucd-snmp/proc.c	2002/12/19 15:07:33	5.4
-+++ net-snmp/net-snmp/agent/mibgroup/ucd-snmp/proc.c	2003/02/07 05:17:42	5.6
-@@ -413,13 +413,15 @@
- sh_count_procs(char *procname)
- {
-     DIR *dir;
--    char cmdline[512];
-+    char cmdline[512], *tmpc;
-     struct dirent *ent;
-     int fd,len,plen=strlen(procname),total = 0;
-+    FILE *status;
- 
-     if ((dir = opendir("/proc")) == NULL) return -1;
-     while (NULL != (ent = readdir(dir))) {
-       if(!(ent->d_name[0] >= '0' && ent->d_name[0] <= '9')) continue;
-+#ifdef USE_PROC_CMDLINE  /* old method */
-       /* read /proc/XX/cmdline */
-       sprintf(cmdline,"/proc/%s/cmdline",ent->d_name);
-       if((fd = open(cmdline, O_RDONLY)) < 0) break;
-@@ -430,6 +432,30 @@
-       while(--len && !cmdline[len]);
-       while(--len) if(!cmdline[len]) cmdline[len] = ' ';
-       if(!strncmp(cmdline,procname,plen)) total++;
-+#else
-+      /* read /proc/XX/status */
-+      sprintf(cmdline,"/proc/%s/status",ent->d_name);
-+      if ((status = fopen(cmdline, "r")) == NULL)
-+          break;
-+      if (fgets(cmdline, sizeof(cmdline), status) == NULL) {
-+          fclose(status);
-+          break;
-+      }
-+      fclose(status);
-+      cmdline[sizeof(cmdline)-1] = '\0';
-+      /* XXX: assumes Name: is first */
-+      if (strncmp("Name:",cmdline, 5) != 0)
-+          break;
-+      tmpc = skip_token(cmdline);
-+      if (!tmpc)
-+          break;
-+      DEBUGMSGTL(("proc","Comparing wanted %s against %s\n",
-+                  procname, tmpc));
-+      if(!strncmp(tmpc,procname,plen)) {
-+          total++;
-+          DEBUGMSGTL(("proc", " Matched.  total count now=%d\n", total));
-+      }
-+#endif      
-     }
-     closedir(dir);
-     return total;
-@@ -662,8 +688,14 @@
-             /*
-              * Zombie process 
-              */
--        } else if (!strcmp(procname, info.pr_fname))
--            total++;
-+        } else {
-+            DEBUGMSGTL(("proc","Comparing wanted %s against %s\n",
-+                        procname, info.pr_fname));
-+            if (!strcmp(procname, info.pr_fname)) {
-+                total++;
-+                DEBUGMSGTL(("proc", " Matched.  total count now=%d\n", total));
-+            }
-+        }
- 
-         close(fd);
-     }
diff --git a/net-analyzer/net-snmp/files/snmpd.conf b/net-analyzer/net-snmp/files/snmpd.conf
deleted file mode 100644
index 3fc3eec88827..000000000000
--- a/net-analyzer/net-snmp/files/snmpd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.conf,v 1.6 2004/08/14 14:49:15 swegener Exp $
-
-# Initial (empty) options.
-SNMPD_FLAGS=""
-
-# Enable connection logging.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -a"
-
-# Enable syslog and disable file log.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -s -l /dev/null"
-
-# Enable agentx socket as /var/agentx/master
-# *NOTE* Before uncommenting this, make sure
-#        the /var/agentx directory exists.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master"
diff --git a/net-analyzer/net-snmp/files/snmpd.rc6 b/net-analyzer/net-snmp/files/snmpd.rc6
deleted file mode 100644
index da4e9d15a7d9..000000000000
--- a/net-analyzer/net-snmp/files/snmpd.rc6
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.rc6,v 1.7 2004/07/14 23:06:06 agriffis Exp $
-
-depend() {
-	use logger
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/snmp/snmpd.conf ] ; then
-		eerror "You need an /etc/snmp/snmpd.conf config file to run snmpd"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting net-snmpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/snmpd \
-		-- -P /var/run/snmpd.pid ${SNMPD_FLAGS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping net-snmpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/snmpd.pid
-	eend $?
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild
index 42504e6f375a..c33d8c5785ff 100644
--- a/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild,v 1.20 2005/05/25 16:54:17 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild,v 1.21 2005/07/04 11:59:12 ka0ttic Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ~arm hppa amd64 ~ia64 ~s390 ~ppc64 ~mips"
 IUSE="perl ipv6 ssl tcpd X lm_sensors minimal selinux"
diff --git a/net-analyzer/net-snmp/net-snmp-5.1.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.1.1.ebuild
deleted file mode 100644
index b3bebb812ef6..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.1.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.1.1.ebuild,v 1.23 2005/05/25 16:54:38 mcummings Exp $
-
-inherit eutils
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="perl ipv6 ssl tcpd X selinux"
-
-DEPEND="virtual/libc
-	<sys-libs/db-2
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/sed-4
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	perl? (
-		>=sys-devel/libperl-5.8.0
-		>=perl-core/ExtUtils-MakeMaker-6.11-r1
-	)"
-RDEPEND="${DEPEND}
-	dev-perl/TermReadKey
-	perl? ( X? ( dev-perl/perl-tk ) )
-	selinux? ( sec-policy/selinux-snmpd )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#wrt to bugs 68467, 68254
-	sed -i -e 's/^NSC_AGENTLIBS="@AGENTLIBS@"/NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@"/' net-snmp-config.in
-
-	sed -i -e '551s;embed_perl="yes",;embed_perl=$enableval,;' configure.in
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_enable perl embedded-perl`"
-	myconf="${myconf} `use_with ssl openssl` `use_enable !ssl internal-md5`"
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_enable ipv6`"
-
-	econf \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="host smux ucd-snmp/dlmod" \
-		--with-logfile=/var/log/net-snmpd.log \
-		--with-persistent-directory=/var/lib/net-snmp \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "compile problem"
-
-	if use perl ; then
-		emake perlmodules || die "compile perl modules problem"
-	fi
-}
-
-src_install () {
-	einstall exec_prefix="${D}/usr" persistentdir="${D}/var/lib/net-snmp"
-
-	if use perl ; then
-		make DESTDIR="${D}" perlinstall || die "make perlinstall failed"
-		if ! use X ; then
-			rm -f "${D}/usr/bin/tkmib"
-		fi
-	else
-		rm -f "${D}/usr/bin/mib2c" "${D}/usr/bin/tkmib"
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/snmpd-5.1.rc6" snmpd
-	insinto /etc/conf.d
-	newins "${FILESDIR}/snmpd-5.1.conf" snmpd
-
-	keepdir /etc/snmp /var/lib/net-snmp
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.1.3_pre1.ebuild b/net-analyzer/net-snmp/net-snmp-5.1.3.ebuild
index f1d59d97e7ae..f2a00251b55b 100644
--- a/net-analyzer/net-snmp/net-snmp-5.1.3_pre1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.1.3.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.1.3_pre1.ebuild,v 1.1 2005/06/21 05:05:35 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.1.3.ebuild,v 1.1 2005/07/04 11:59:12 ka0ttic Exp $
 
-inherit eutils fixheadtails perl-module versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '.')"
-S="${WORKDIR}/${MY_P}"
+inherit eutils fixheadtails perl-module
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc"
diff --git a/net-analyzer/net-snmp/net-snmp-5.2-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.2-r3.ebuild
deleted file mode 100644
index ea902de0a424..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.2-r3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2-r3.ebuild,v 1.6 2005/03/15 15:27:12 ka0ttic Exp $
-
-inherit eutils fixheadtails perl-module
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64 ~mips"
-IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc"
-
-DEPEND="virtual/libc
-	!minimal? ( <sys-libs/db-2 )
-	>=sys-libs/zlib-1.1.4
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	lm_sensors? (
-		x86?   ( sys-apps/lm_sensors )
-		amd64? ( sys-apps/lm_sensors )
-	)"
-RDEPEND="${DEPEND}
-	dev-perl/TermReadKey
-	perl? ( X? ( dev-perl/perl-tk ) )
-	selinux? ( sec-policy/selinux-snmpd )"
-
-DEPEND="${DEPEND}
-	>=sys-apps/sed-4
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	if use lm_sensors; then
-		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-lm_sensors.patch
-		else
-			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
-			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
-			eerror "your arch, please file a bug about this."
-			die "lm_sensors patch error: unsupported arch."
-		fi
-	fi
-
-	#wrt to bugs 68467, 68254
-	sed -i -e \
-		's/^NSC_AGENTLIBS="@AGENTLIBS@"/NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@"/' \
-		net-snmp-config.in || die "sed net-snmp-config.in"
-	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
-		|| die "sed configure.in failed"
-
-	ht_fix_all
-}
-
-src_compile() {
-	local myconf mibs
-
-	autoconf || die "autoconf failed"
-
-	myconf="${myconf} `use_enable perl embedded-perl`"
-	myconf="${myconf} `use_with ssl openssl` `use_enable !ssl internal-md5`"
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_enable ipv6`"
-
-	mibs="host ucd-snmp/dlmod"
-	use smux && mibs="${mibs} smux"
-
-	econf \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="${mibs}" \
-		--with-logfile="${ROOT}/var/log/net-snmpd.log" \
-		--with-persistent-directory="${ROOT}/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		--with-install-prefix="${D}" \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "compile problem"
-
-	if use perl ; then
-		emake perlmodules || die "compile perl modules problem"
-	fi
-
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		make docsdox || die "failed to build docs"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use perl ; then
-		make DESTDIR="${D}" perlinstall || die "make perlinstall failed"
-		fixlocalpod
-
-		use X || rm -f "${D}/usr/bin/tkmib"
-	else
-		rm -f "${D}/usr/bin/mib2c" "${D}/usr/bin/tkmib"
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /etc/snmp /var/lib/net-snmp
-
-	newinitd ${FILESDIR}/snmpd-5.1.rc6 snmpd
-	newconfd ${FILESDIR}/snmpd-5.1.conf snmpd
-
-	# snmptrapd can use the same rc script just slightly modified
-	sed -e 's/net-snmpd/snmptrapd/g' \
-		-e 's/snmpd/snmptrapd/g' \
-		-e 's/SNMPD/SNMPTRAPD/g' \
-		${D}/etc/init.d/snmpd > ${D}/etc/init.d/snmptrapd || die
-	chmod 0755 ${D}/etc/init.d/snmptrapd
-
-	newconfd ${FILESDIR}/snmptrapd.conf snmptrapd
-
-	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
-	if use minimal; then
-		einfo "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
-		rm -rf ${D}/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform}}
-		rm -rf ${D}/usr/share/snmp/snmpconf-data ${D}/usr/share/snmp/*.conf
-		rm -rf ${D}/usr/bin/{net-snmp-config,fixproc,traptoemail} ${D}/usr/bin/snmpc{heck,onf}
-		find ${D} -name '*.pl' -exec rm -f '{}' \;
-		use ipv6 || rm -rf ${D}/usr/share/snmp/mibs/IPV6*
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild
index c30bd66f2ec6..b8dc5c167952 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild,v 1.9 2005/07/03 02:54:18 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild,v 1.10 2005/07/04 11:59:12 ka0ttic Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -8,7 +8,7 @@ DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild
deleted file mode 100644
index fd8cdc7f0034..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild,v 1.15 2005/05/17 14:51:35 ka0ttic Exp $
-
-inherit eutils fixheadtails perl-module
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sparc x86"
-IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	!minimal? ( <sys-libs/db-2 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	lm_sensors? (
-		x86?   ( sys-apps/lm_sensors )
-		amd64? ( sys-apps/lm_sensors )
-	)
-	rpm? ( app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-	)
-	elf? ( dev-libs/elfutils )"
-
-RDEPEND="${DEPEND}
-	perl? ( X? ( dev-perl/perl-tk ) !minimal? ( dev-perl/TermReadKey ) )
-	selinux? ( sec-policy/selinux-snmpd )"
-
-DEPEND="${DEPEND}
-	>=sys-apps/sed-4
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	if use lm_sensors; then
-		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-lm_sensors.patch
-		else
-			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
-			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
-			eerror "your arch, please file a bug about this."
-			die "lm_sensors patch error: unsupported arch."
-		fi
-	fi
-
-	#wrt to bugs 68467, 68254
-	sed -i -e \
-		's/^NSC_AGENTLIBS="@AGENTLIBS@"/NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@"/' \
-		net-snmp-config.in || die "sed net-snmp-config.in"
-	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
-		|| die "sed configure.in failed"
-
-	ht_fix_all
-
-	epatch ${FILESDIR}/${P}-conf-elf-rpm-bz2.patch || die "patch failed"
-
-	# fix access violation in make check
-	sed -i 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
-		die "sed eval_tools.sh failed"
-}
-
-src_compile() {
-	local myconf mibs
-
-	autoconf || die "autoconf failed"
-
-	myconf="${myconf} `use_enable perl embedded-perl`"
-	myconf="${myconf} `use_with ssl openssl` `use_enable !ssl internal-md5`"
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_enable ipv6`"
-
-	mibs="host ucd-snmp/dlmod"
-	use smux && mibs="${mibs} smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
-
-	econf \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="${mibs}" \
-		--with-logfile="${ROOT}/var/log/net-snmpd.log" \
-		--with-persistent-directory="${ROOT}/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		`use_with rpm` \
-		`use_with rpm bzip2` \
-		`use_with elf` \
-		--with-install-prefix="${D}" \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "compile problem"
-
-	if use perl ; then
-		emake perlmodules || die "compile perl modules problem"
-	fi
-
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		make docsdox || die "failed to build docs"
-	fi
-}
-
-src_test() {
-	cd testing
-	if ! make test ; then
-		echo
-		einfo "Don't be alarmed if a few tests FAIL."
-		einfo "This could happen for several reasons:"
-		einfo "    - You don't already have a working configuration."
-		einfo "    - Your ethernet interface isn't properly configured."
-		echo
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use perl ; then
-		make DESTDIR="${D}" perlinstall || die "make perlinstall failed"
-		fixlocalpod
-
-		use X || rm -f "${D}/usr/bin/tkmib"
-	else
-		rm -f "${D}/usr/bin/mib2c" "${D}/usr/bin/tkmib"
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /etc/snmp /var/lib/net-snmp
-
-	newinitd ${FILESDIR}/snmpd-5.1.rc6 snmpd
-	newconfd ${FILESDIR}/snmpd-5.1.conf snmpd
-
-	# snmptrapd can use the same rc script just slightly modified
-	sed -e 's/net-snmpd/snmptrapd/g' \
-		-e 's/snmpd/snmptrapd/g' \
-		-e 's/SNMPD/SNMPTRAPD/g' \
-		${D}/etc/init.d/snmpd > ${D}/etc/init.d/snmptrapd || die
-	chmod 0755 ${D}/etc/init.d/snmptrapd
-
-	newconfd ${FILESDIR}/snmptrapd.conf snmptrapd
-
-	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
-	if use minimal; then
-		einfo "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
-		rm -rf ${D}/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform}}
-		rm -rf ${D}/usr/share/snmp/snmpconf-data ${D}/usr/share/snmp/*.conf
-		rm -rf ${D}/usr/bin/{net-snmp-config,fixproc,traptoemail} ${D}/usr/bin/snmpc{heck,onf}
-		find ${D} -name '*.pl' -exec rm -f '{}' \;
-		use ipv6 || rm -rf ${D}/usr/share/snmp/mibs/IPV6*
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.ebuild
deleted file mode 100644
index 7f63d29802aa..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.ebuild,v 1.13 2005/05/25 16:54:59 mcummings Exp $
-
-inherit eutils
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha arm hppa amd64 ia64 s390 ~ppc64 mips"
-IUSE="perl ipv6 ssl tcpd X lm_sensors minimal selinux"
-
-DEPEND="virtual/libc
-	!minimal? ( <sys-libs/db-2 )
-	>=sys-libs/zlib-1.1.4
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	perl? (
-		>=sys-devel/libperl-5.8.0
-		>=perl-core/ExtUtils-MakeMaker-6.11-r1
-	)
-	lm_sensors? (
-		x86?   ( sys-apps/lm_sensors )
-		amd64? ( sys-apps/lm_sensors )
-	)"
-RDEPEND="${DEPEND}
-	dev-perl/TermReadKey
-	perl? ( X? ( dev-perl/perl-tk ) )
-	selinux? ( sec-policy/selinux-snmpd )"
-
-DEPEND="${DEPEND} >=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	if use lm_sensors; then
-		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-lm_sensors.patch
-		else
-			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
-			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
-			eerror "your arch, please file a bug about this."
-			die "lm_sensors patch error: unsupported arch."
-		fi
-	fi
-
-	#wrt to bugs 68467, 68254
-	sed -i -e 's/^NSC_AGENTLIBS="@AGENTLIBS@"/NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@"/' net-snmp-config.in
-
-	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in
-	sed -i -e 's;tail -1;tail -n 1;g' * dist/net-snmp-solaris-build/DEVENV
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_enable perl embedded-perl`"
-	myconf="${myconf} `use_with ssl openssl` `use_enable !ssl internal-md5`"
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_enable ipv6`"
-
-	econf \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="host smux ucd-snmp/dlmod" \
-		--with-logfile=${ROOT}/var/log/net-snmpd.log \
-		--with-persistent-directory=${ROOT}/var/lib/net-snmp \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		--with-install-prefix=${D} \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "compile problem"
-
-	if use perl ; then
-		emake perlmodules || die "compile perl modules problem"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use perl ; then
-		make DESTDIR="${D}" perlinstall || die "make perlinstall failed"
-		if ! use X ; then
-			rm -f "${D}/usr/bin/tkmib"
-		fi
-	else
-		rm -f "${D}/usr/bin/mib2c" "${D}/usr/bin/tkmib"
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/snmpd-5.1.rc6" snmpd
-	insinto /etc/conf.d
-	newins "${FILESDIR}/snmpd-5.1.conf" snmpd
-
-	keepdir /etc/snmp /var/lib/net-snmp
-
-	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
-	if use minimal; then
-		einfo "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
-		rm -rf ${D}/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform}}
-		rm -rf ${D}/usr/share/snmp/snmpconf-data ${D}/usr/share/snmp/*.conf
-		rm -rf ${D}/usr/bin/{net-snmp-config,fixproc,traptoemail} ${D}/usr/bin/snmpc{heck,onf}
-		find ${D} -name '*.pl' -exec rm -f '{}' \;
-		use ipv6 || rm -rf ${D}/usr/share/snmp/mibs/IPV6*
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild b/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
index 4408e27df4d2..0e07bd5dfe9e 100644
--- a/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild,v 1.1 2005/06/25 12:44:26 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild,v 1.2 2005/07/04 11:59:12 ka0ttic Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -8,7 +8,7 @@ DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"