5.2.2 and 5.3_rc2 version bumps for bug 116392. fix-insecure-fixproc was fixed upstream, so this patch can be dropped.

(Portage version: 2.1_pre1)

11 files changed, 191 insertions, 210 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index cb2412e1df29..cf4d150489f0 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.126 2005/11/26 14:42:27 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.127 2005/12/26 21:58:10 vanquirius Exp $
+
+*net-snmp-5.3_rc2 (26 Dec 2005)
+*net-snmp-5.2.2 (26 Dec 2005)
+
+  26 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch, +net-snmp-5.2.2.ebuild,
+  -net-snmp-5.3_pre4.ebuild, +net-snmp-5.3_rc2.ebuild,
+  -net-snmp-5.3.20050624.ebuild, -net-snmp-5.3.20050624-r1.ebuild:
+  5.2.2 and 5.3_rc2 version bumps for bug 116392. fix-insecure-fixproc was
+  fixed upstream, so this patch can be dropped. Thanks to Frederic Mangeant
+  <frederic dot mangeant at gmail dot com>.
 
 *net-snmp-5.3_pre4 (26 Nov 2005)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index ad2df3581854..2a1808122b6f 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,18 +1,17 @@
-MD5 d62a7ea143cb84f4378aa97a4a110bd7 net-snmp-5.3.20050624-r1.ebuild 5143
-MD5 b60f198a7739db89cfc5db54fda22d03 net-snmp-5.3.20050624.ebuild 5086
-MD5 f9c21a4768653f0035408ae5136fdafe net-snmp-5.1.3.1.ebuild 4933
-MD5 9b7f462b1de1fa21b0f3e9f79c5b72d3 net-snmp-5.2.1.2-r1.ebuild 5055
-MD5 1815412840ada48439add6faaeae3bfb net-snmp-5.3_pre4.ebuild 5234
 MD5 864b66e661b2b00c83b88428abdc4aad ChangeLog 19393
-MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
-MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
-MD5 f6c0b6b48b5933bb1ef85c6343f51558 files/digest-net-snmp-5.3_pre4 70
-MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
+MD5 9791bf52496848c5613de87a95a3b761 files/digest-net-snmp-5.1.3.1 69
 MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2-r1 69
-MD5 cf7d3f5d505c262b2477f1759b908bad files/digest-net-snmp-5.3.20050624-r1 74
+MD5 92b7d3fe0c5dad9c215a170199e3c66c files/digest-net-snmp-5.2.2 67
+MD5 00cef611211aeaa16f95d9bd4bd8da4f files/digest-net-snmp-5.3_rc2 69
 MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
-MD5 9791bf52496848c5613de87a95a3b761 files/digest-net-snmp-5.1.3.1 69
-MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
+MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
+MD5 ca3a2ba5a12a796d29087038828f2c21 files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch 4815
 MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
+MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
 MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
-MD5 cf7d3f5d505c262b2477f1759b908bad files/digest-net-snmp-5.3.20050624 74
+MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
+MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+MD5 f9c21a4768653f0035408ae5136fdafe net-snmp-5.1.3.1.ebuild 4933
+MD5 9b7f462b1de1fa21b0f3e9f79c5b72d3 net-snmp-5.2.1.2-r1.ebuild 5055
+MD5 6aa0f62d5526a76e9be1840e2907dd24 net-snmp-5.2.2.ebuild 5040
+MD5 2e0408d27d69527bc48b4d2c7b500c38 net-snmp-5.3_rc2.ebuild 5240
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2
new file mode 100644
index 000000000000..0cbebdac5c7a
--- /dev/null
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2
@@ -0,0 +1 @@
+MD5 2d9cdf956d6be5c5fcf2f898b403389b net-snmp-5.2.2.tar.gz 3919826
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624
deleted file mode 100644
index 0d624c73a669..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c80189cc847c3db4e13cc19f85d40ef net-snmp-5.3.20050624.tar.gz 4003978
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624-r1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624-r1
deleted file mode 100644
index 0d624c73a669..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c80189cc847c3db4e13cc19f85d40ef net-snmp-5.3.20050624.tar.gz 4003978
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3_pre4 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3_pre4
deleted file mode 100644
index aeeaf987b230..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.3_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3c53f4f5cd91ae4a1ad2199b10f903d net-snmp-5.3.pre4.tar.gz 4270081
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3_rc2 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3_rc2
new file mode 100644
index 000000000000..2670c7fb1b23
--- /dev/null
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.3_rc2
@@ -0,0 +1 @@
+MD5 852071981fadb2ecff552497b54c679a net-snmp-5.3.rc2.tar.gz 4176303
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch b/net-analyzer/net-snmp/files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch
new file mode 100644
index 000000000000..362fcbcc87be
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch
@@ -0,0 +1,144 @@
+diff --exclude='*~' -Naur net-snmp-5.2.2.orig/configure net-snmp-5.2.2/configure
+--- net-snmp-5.2.2.orig/configure	2005-12-26 19:05:44.000000000 -0200
++++ net-snmp-5.2.2/configure	2005-12-26 19:10:47.000000000 -0200
+@@ -1254,7 +1254,9 @@
+   --with-gnu-ld           assume the C compiler uses GNU ld default=no
+   --with-pic              try to use only PIC/non-PIC objects default=use both
+   --with-libwrap=LIBPATH Compile in libwrap (tcp_wrappers) support.
++  --without-elf        use elf libraries
+   --with-zlib=DIR        use libz in DIR
++  --with-bzip2=DIR          use libbzip2 in DIR
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -5935,7 +5937,7 @@
+ case $host in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5938 "configure"' > conftest.$ac_ext
++  echo '#line 5940 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -6507,7 +6509,7 @@
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+ compiler_c_o=no
+-if { (eval echo configure:6510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++if { (eval echo configure:6512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+   # The compiler can only warn and ignore the option if not recognized
+   # So say no if there are warnings
+   if test -s out/conftest.err; then
+@@ -8471,7 +8473,7 @@
+     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 8474 "configure"
++#line 8476 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13996,6 +13998,12 @@
+ 
+ # nlist is needed for uptime on some sytems in the generic library
+ # add hosts which don't use nlist to the blank first line
++# Check whether --with-elf or --without-elf was given.
++if test "${with_elf+set}" = set; then
++  withval="$with_elf"
++
++  if test "x$with_elf" != "xno"; then
++
+ case $target_os in
+ 	linux*) ;;
+ 	irix*) # Check for nlist in mld (irix)
+@@ -14226,6 +14234,10 @@
+ 		;;
+ esac
+ 
++  fi
++
++fi;
++
+ # On some platforms (Irix) libnsl and libsocket should not be used.
+ echo "$as_me:$LINENO: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+@@ -16020,7 +16032,16 @@
+ 
+ 
+   # two variants of bzip2 need checking.
+-  echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5
++# Check whether --with-bzip2 or --without-bzip2 was given.
++if test "${with_bzip2+set}" = set; then
++  withval="$with_bzip2"
++
++    if test -d "$withval"; then
++      CPPFLAGS="${CPPFLAGS} -I$withval/include"
++      LDFLAGS="${LDFLAGS} -L$withval/lib"
++    fi
++    if test "x$with_bzip2" != "xno"; then
++      echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5
+ echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6
+ if test "${ac_cv_lib_bz2_bzread+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16157,6 +16178,9 @@
+ 
+ fi
+ 
++    fi
++
++fi;
+ 
+   # two variants of db1 need checking.
+   echo "$as_me:$LINENO: checking for dbopen in -ldb1" >&5
+diff --exclude='*~' -Naur net-snmp-5.2.2.orig/configure.in net-snmp-5.2.2/configure.in
+--- net-snmp-5.2.2.orig/configure.in	2005-12-26 19:05:44.000000000 -0200
++++ net-snmp-5.2.2/configure.in	2005-12-26 19:23:50.000000000 -0200
+@@ -1,3 +1,4 @@
++Wrpm
+ # Portions of this file are subject to the following copyright.  See
+ # the Net-SNMP's COPYING file for more details and other copyrights
+ # that may apply:
+@@ -2152,11 +2153,21 @@
+ case $target_os in
+ 	linux*) ;;
+ 	irix*) # Check for nlist in mld (irix)
+-		AC_CHECK_LIB(elf, nlist)
++		AC_ARG_WITH(elf,
++		[  --without-elf        use elf libraries],[
++		if test "x$with_elf" != "xno"; then
++		   AC_CHECK_LIB(elf, nlist)
++		fi
++		])
+ 		AC_CHECK_LIB(mld, nlist)
+ 		;;
+ 	*) # default
+-		AC_CHECK_LIB(elf, nlist)
++		AC_ARG_WITH(elf,
++		[  --without-elf        use elf libraries],[
++		if test "x$with_elf" != "xno"; then
++		   AC_CHECK_LIB(elf, nlist)
++		fi
++		])
+ 		;;
+ esac
+ 
+@@ -2280,8 +2291,17 @@
+       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+ 
+   # two variants of bzip2 need checking.
+-  AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
+-     AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
++  AC_ARG_WITH(bzip2,
++  [  --with-bzip2[=DIR]          use libbzip2 in DIR],[
++    if test -d "$withval"; then
++      CPPFLAGS="${CPPFLAGS} -I$withval/include"
++      LDFLAGS="${LDFLAGS} -L$withval/lib"
++    fi
++    if test "x$with_bzip2" != "xno"; then
++      AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
++      AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
++    fi
++  ])
+ 
+   # two variants of db1 need checking.
+   AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],
diff --git a/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild
index 8973557cb9f0..571973bce6ad 100644
--- a/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild
@@ -1,12 +1,12 @@
 # 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.3 2005/09/02 12:34:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild,v 1.1 2005/12/26 21:58:10 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="as-is BSD"
 SLOT="0"
@@ -40,11 +40,13 @@ DEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-5.2.2-conf-elf-rpm-bz2.patch
 
 	if use lm_sensors; then
 		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-lm_sensors.patch
+			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"
@@ -54,9 +56,6 @@ src_unpack() {
 	fi
 
 	# bugs 68467 and 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"
 	# Insecure run-path - bug 103776
@@ -145,26 +144,26 @@ src_install () {
 
 	keepdir /etc/snmp /var/lib/net-snmp
 
-	newinitd ${FILESDIR}/snmpd-5.1.rc6 snmpd || die
-	newconfd ${FILESDIR}/snmpd-5.1.conf snmpd || die
+	newinitd "${FILESDIR}"/snmpd-5.1.rc6 snmpd || die
+	newconfd "${FILESDIR}"/snmpd-5.1.conf snmpd || die
 
 	# 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 || \
+		"${D}"/etc/init.d/snmpd > "${D}"/etc/init.d/snmptrapd || \
 			die "failed to create snmptrapd init script"
-	chmod 0755 ${D}/etc/init.d/snmptrapd
+	chmod 0755 "${D}"/etc/init.d/snmptrapd
 
-	newconfd ${FILESDIR}/snmptrapd.conf snmptrapd || die
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd || die
 
 	# 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*
+		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-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.3.20050624-r1.ebuild
deleted file mode 100644
index 4dd45fe6334d..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.3.20050624-r1.ebuild
+++ /dev/null
@@ -1,171 +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.3.20050624-r1.ebuild,v 1.1 2005/11/26 13:41:21 strerror Exp $
-
-inherit eutils fixheadtails perl-module
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-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 diskio"
-
-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
-
-	# bugs 68467 and 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"
-	# Insecure run-path - bug 103776
-	sed -i -e 's/\(@(cd perl ; $(MAKE)\)\() ; \\\)/\1 LD_RUN_PATH=\2/g' \
-		Makefile.in || die "sed Makefile.in failed"
-	# fix access violation in make check
-	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
-		die "sed eval_tools.sh failed"
-	# fix path in fixproc
-	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
-		die "sed fixproc failed"
-
-	ht_fix_all
-}
-
-src_compile() {
-	local mibs
-
-	autoconf || die "autoconf failed"
-
-	mibs="host ucd-snmp/dlmod"
-	use smux && mibs="${mibs} smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
-	use diskio && mibs="${mibs} ucd-snmp/diskio"
-
-	econf \
-		--with-install-prefix="${D}" \
-		--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_enable perl embedded-perl) \
-		$(use_enable ipv6) \
-		$(use_enable !ssl internal-md5) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with rpm) \
-		$(use_with rpm bzip2) \
-		$(use_with elf) \
-		|| die "econf failed"
-
-	emake -j1 || die "emake failed"
-
-	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 || die
-	newconfd ${FILESDIR}/snmpd-5.1.conf snmpd || die
-
-	# 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 "failed to create snmptrapd init script"
-	chmod 0755 ${D}/etc/init.d/snmptrapd
-
-	newconfd ${FILESDIR}/snmptrapd.conf snmptrapd || die
-
-	# 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_pre4.ebuild b/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild
index a7b40e17f10f..9907f421ce59 100644
--- a/net-analyzer/net-snmp/net-snmp-5.3_pre4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild
@@ -1,10 +1,10 @@
 # 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_pre4.ebuild,v 1.1 2005/11/26 14:42:27 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild,v 1.1 2005/12/26 21:58:10 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
-MY_P=${P/_pre/.pre}
+MY_P="${P/_rc/.rc}"
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
 #SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
@@ -40,15 +40,15 @@ DEPEND="${DEPEND}
 	>=sys-apps/sed-4
 	doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	if use lm_sensors; then
 		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-lm_sensors.patch
+			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"