Added extensible USE flag to build extensible mib module, bug 200279, thank Honza <hkmaly AT bigfoot.com> for report.

(Portage version: 2.1.3.19)

15 files changed, 15 insertions, 988 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 7678f243b826..8b9705a23c97 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.163 2007/12/27 17:15:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.164 2007/12/27 20:05:32 pva Exp $
+
+*net-snmp-5.4.1-r3 (27 Dec 2007)
+
+  27 Dec 2007; <pva@gentoo.org>
+  -files/net-snmp-5.2.1-fix-64bit-interface-counters.diff,
+  -files/net-snmp-5.2.1-fix-insecure-fixproc.diff,
+  -net-snmp-5.2.1.2-r1.ebuild, -net-snmp-5.3.0.1.ebuild,
+  -net-snmp-5.3.1.ebuild, -net-snmp-5.4-r1.ebuild, -net-snmp-5.4.1.ebuild,
+  -net-snmp-5.4.1-r2.ebuild, +net-snmp-5.4.1-r3.ebuild:
+  Added extensible USE flag to build extensible mib module, bug 200279, thank
+  Honza <hkmaly AT bigfoot.com> for report. Remove old.
 
 *net-snmp-5.4.1-r2 (27 Dec 2007)
 
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1.2-r1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1.2-r1
deleted file mode 100644
index 2602aada1e86..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 34159770a7fe418d99fdd416a75358b1 net-snmp-5.2.1.2.tar.gz 3869893
-RMD160 30abfbde24caa7d04990bd111822b98b012f4a0c net-snmp-5.2.1.2.tar.gz 3869893
-SHA256 770c56d059e52ee164cfa0d914618a982e40674a269ce28daddc580c4b67fe60 net-snmp-5.2.1.2.tar.gz 3869893
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.0.1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3.0.1
deleted file mode 100644
index 7008f1a40c6d..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db5995ff8fae154cbe7417a4a6f2ca60 net-snmp-5.3.0.1.tar.gz 4183370
-RMD160 86b7e56b512faf73d2a08ac3df2def4560b62945 net-snmp-5.3.0.1.tar.gz 4183370
-SHA256 dc7786ad2b1464edb5d8331a2687fa72f979ce3984df4e94334e8eec0676e69d net-snmp-5.3.0.1.tar.gz 4183370
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3.1
deleted file mode 100644
index c0eb0c226959..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 360a9783dbc853bab6bda90d961daee5 net-snmp-5.3.1.tar.gz 4210843
-RMD160 7bcdd213fb2517d0927b030deab5146522b58b3d net-snmp-5.3.1.tar.gz 4210843
-SHA256 fb6d5113ccdd8c4661fe5d825160e45a7c5035b145e24ec18f71a509ecb0fe43 net-snmp-5.3.1.tar.gz 4210843
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.4-r1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.4-r1
deleted file mode 100644
index 2141580dd27e..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 46d893281056ff476e597659cb91574d net-snmp-5.4.tar.gz 5031685
-RMD160 8ad1f9a3def8022eea48d9b74ae71d8efb59ca61 net-snmp-5.4.tar.gz 5031685
-SHA256 2f43cd6f3c4066f8c17fdc47931a96c1fce808c9d1dd74bcb5a79d9d29d5f947 net-snmp-5.4.tar.gz 5031685
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.4.1-r2 b/net-analyzer/net-snmp/files/digest-net-snmp-5.4.1-r2
deleted file mode 100644
index 34865f92ea1e..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.4.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6c974df7a5a5b1579f72115e6b045bda net-snmp-5.4.1.tar.gz 5122455
-RMD160 3723488dab8d164702a7d55c9c72eeaec07dd50c net-snmp-5.4.1.tar.gz 5122455
-SHA256 0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565 net-snmp-5.4.1.tar.gz 5122455
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.4.1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.4.1-r3
index 34865f92ea1e..34865f92ea1e 100644
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.4.1
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.4.1-r3
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.2.1-fix-64bit-interface-counters.diff b/net-analyzer/net-snmp/files/net-snmp-5.2.1-fix-64bit-interface-counters.diff
deleted file mode 100644
index 18515d44e748..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.2.1-fix-64bit-interface-counters.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -u -p -r5.33 interfaces.c
---- agent/mibgroup/mibII/interfaces.c   9 May 2005 20:06:02 -0000       5.33
-+++ agent/mibgroup/mibII/interfaces.c   9 Jun 2005 20:08:04 -0000
-@@ -1552,19 +1552,19 @@ Interface_Scan_Init(void)
-         if (!strcmp(ifname_buf, "lo") && rec_pkt > 0 && !snd_pkt)
-             snd_pkt = rec_pkt;
-
--        nnew->if_ipackets = rec_pkt;
-+        nnew->if_ipackets = rec_pkt & 0xffffffff;
-         nnew->if_ierrors = rec_err;
--        nnew->if_opackets = snd_pkt;
-+        nnew->if_opackets = snd_pkt & 0xffffffff;
-         nnew->if_oerrors = snd_err;
-         nnew->if_collisions = coll;
-         if (scan_line_to_use == scan_line_2_2) {
--            nnew->if_ibytes = rec_oct;
--            nnew->if_obytes = snd_oct;
-+            nnew->if_ibytes = rec_oct & 0xffffffff;
-+            nnew->if_obytes = snd_oct & 0xffffffff;
-             nnew->if_iqdrops = rec_drop;
-             nnew->if_snd.ifq_drops = snd_drop;
-         } else {
--            nnew->if_ibytes = rec_pkt * 308;
--            nnew->if_obytes = snd_pkt * 308;
-+            nnew->if_ibytes = (rec_pkt * 308) & 0xffffffff;
-+            nnew->if_obytes = (snd_pkt * 308) & 0xffffffff;
-         }
-
-         /*
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.2.1-fix-insecure-fixproc.diff b/net-analyzer/net-snmp/files/net-snmp-5.2.1-fix-insecure-fixproc.diff
deleted file mode 100644
index cad67929e5be..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.2.1-fix-insecure-fixproc.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- local/fixproc.orig	2005-05-18 09:57:16.000000000 -0400
-+++ local/fixproc	2005-05-18 11:00:38.000000000 -0400
-@@ -129,6 +129,9 @@
- #
- # Timothy Kong		3/1995
- 
-+require File::Temp;
-+use File::Temp();
-+
- $database_file = '/local/etc/fixproc.conf';
- 
- $debug = 0;			# specify debug level using -dN
-@@ -196,7 +199,6 @@
-   printf (stderr "create_sh_script\n") if ($debug > 0);
- 
-   $! = $fixproc_error;
--  open (file, ">"."$file") || die "$0: cannot open $file\n";
-   while ( $shell_lines[$i] ne $shell_end_marker )
-     {
-       printf (file "%s", $shell_lines[$i]);
-@@ -231,13 +233,13 @@
-     {
-       # it must be "shell", so execute the shell script defined in database
- 
--      local ($tmpfile) = "/tmp/fix_$$";
-+      local ($tmpfile) = new File::Temp(TEMPLATE => 'fix_XXXXX',
-+					DIR => '/tmp');
- 
-       &create_sh_script ($fix{$proc}, $tmpfile);
- 
-       	# return code is number divided by 256
-       $error_code = (system "$tmpfile") / 256;
--      system "rm $tmpfile";
-       return ($fix_failed_error) if ($error_code != 0);
-         # sleep needed here?
-       return &do_exist ($proc);
-@@ -262,13 +264,13 @@
-       # if not "exist", then it must be "shell", so execute the shell script
-       # defined in database
- 
--      local ($tmpfile) = "/tmp/check_$$";
-+      local ($tmpfile) = new File::Temp(TEMPLATE => 'check_XXXXXX',
-+					DIR => '/tmp');
- 
-       &create_sh_script ($check{$proc}, $tmpfile);
- 
-       	# return code is number divided by 256
-       $error_code = (system "$tmpfile") / 256;
--      system "rm $tmpfile";
-       return ($check_failed_error) if ($error_code != 0);
- 
-       # check passed, continue
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild
deleted file mode 100644
index 9afa566b9cc9..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2007 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.2-r1.ebuild,v 1.8 2007/05/01 18:09:57 genone 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 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? ( app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-	)
-	elf? ( dev-libs/elfutils )
-	lm_sensors? ( sys-apps/lm_sensors )"
-
-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}
-
-	epatch ${FILESDIR}/${PN}-5.2.1-fix-insecure-fixproc.diff
-	epatch ${FILESDIR}/${PN}-5.2.1-conf-elf-rpm-bz2.patch
-
-#	The lm_sensors patch has a memory leak
-#	If you can help, please attach a patch to bug 109785
-
-#	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;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"
-	# fix 64 bit interface counters on sparc64, bug 147609
-	if use sparc; then
-		epatch ${FILESDIR}/${PN}-5.2.1-fix-64bit-interface-counters.diff
-	fi
-
-	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"
-
-	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="/var/log/net-snmpd.log" \
-		--with-persistent-directory="/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
-		elog "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.0.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.3.0.1.ebuild
deleted file mode 100644
index 317ee43a88a6..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.3.0.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2007 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.0.1.ebuild,v 1.8 2007/07/11 23:49:24 mr_bones_ Exp $
-
-inherit fixheadtails flag-o-matic 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 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="diskio doc elf ipv6 lm_sensors mfd-rewrites minimal perl rpm selinux smux ssl tcpd X"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? ( app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-	)
-	elf? ( dev-libs/elfutils )
-	lm_sensors? ( sys-apps/lm_sensors )"
-
-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}"
-
-#	The lm_sensors patch has a memory leak
-#	If you can help, please attach a patch to bug 109785
-
-#	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
-
-	strip-flags
-
-	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="/var/log/net-snmpd.log" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		$(use_enable mfd-rewrites) \
-		$(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
-		elog "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/{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
-
-	# bug 113788, install example config
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-}
-
-pkg_postinst() {
-	elog "An example configuration file has been installed in"
-	elog "/etc/snmp/snmpd.conf.example."
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.3.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.3.1.ebuild
deleted file mode 100644
index ae5faea3857b..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.3.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2007 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.1.ebuild,v 1.4 2007/07/11 23:49:24 mr_bones_ Exp $
-
-inherit fixheadtails flag-o-matic 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 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="diskio doc elf ipv6 lm_sensors mfd-rewrites minimal perl rpm selinux smux ssl tcpd X"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? ( app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-	)
-	elf? ( dev-libs/elfutils )
-	lm_sensors? ( sys-apps/lm_sensors )"
-
-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}"
-
-#	The lm_sensors patch has a memory leak
-#	If you can help, please attach a patch to bug 109785
-
-#	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
-
-	strip-flags
-
-	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="/var/log/net-snmpd.log" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		$(use_enable mfd-rewrites) \
-		$(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
-		elog "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/{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
-
-	# bug 113788, install example config
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-}
-
-pkg_postinst() {
-	elog "An example configuration file has been installed in"
-	elog "/etc/snmp/snmpd.conf.example."
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.4-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.4-r1.ebuild
deleted file mode 100644
index c1b22872f14d..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.4-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2007 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.4-r1.ebuild,v 1.2 2007/11/08 18:04:50 mr_bones_ Exp $
-
-inherit fixheadtails flag-o-matic 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 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="diskio doc elf ipv6 lm_sensors mfd-rewrites minimal perl rpm selinux smux ssl tcpd X sendmail"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-		>=sys-libs/zlib-1.1.4
-	)
-	elf? ( dev-libs/elfutils )
-	lm_sensors? ( sys-apps/lm_sensors )"
-
-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}"
-
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-# For #198346 - from upstream.  Commited 5/7/2007, so 5.4.1+ not affected
-	epatch "${FILESDIR}"/${PN}-maxreps.patch
-
-#	The lm_sensors patch has a memory leak
-#	If you can help, please attach a patch to bug 109785
-
-#	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
-
-	# 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
-
-	strip-flags
-
-	# filter for bug #145960
-	# as it seems that the option is not enough
-	filter-ldflags -Wl,--as-needed
-
-	mibs="host ucd-snmp/dlmod"
-	use smux && mibs="${mibs} smux"
-	use sendmail && mibs="${mibs} mibII/mta_sendmail"
-	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="/var/log/net-snmpd.log" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--enable-as-needed \
-		$(use_enable mfd-rewrites) \
-		$(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 rpm zlib) \
-		$(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" "${D}/usr/bin/snmpcheck"
-	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.rc7 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.rc7 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
-	if use minimal; then
-		elog "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,snmpcheck}}
-		rm -rf "${D}"/usr/share/snmp/snmpconf-data "${D}"/usr/share/snmp/*.conf
-		rm -rf "${D}"/usr/bin/{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
-
-	# bug 113788, install example config
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-}
-
-pkg_postinst() {
-	elog "An example configuration file has been installed in"
-	elog "/etc/snmp/snmpd.conf.example."
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.1-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.1-r3.ebuild
index 66043d919d38..2bd1f884b01c 100644
--- a/net-analyzer/net-snmp/net-snmp-5.4.1-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.4.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4.1-r2.ebuild,v 1.1 2007/12/27 17:15:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.1-r3.ebuild,v 1.1 2007/12/27 20:05:32 pva Exp $
 
 inherit fixheadtails flag-o-matic perl-module python
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="diskio doc elf ipv6 lm_sensors mfd-rewrites minimal perl python rpm selinux smux ssl tcpd X sendmail"
+IUSE="diskio doc elf ipv6 lm_sensors mfd-rewrites minimal perl python rpm selinux smux ssl tcpd X sendmail extensible"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -74,6 +74,7 @@ src_compile() {
 	use sendmail && mibs="${mibs} mibII/mta_sendmail"
 	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
 	use diskio && mibs="${mibs} ucd-snmp/diskio"
+	use extensible && mibs="${mibs} ucd-snmp/extensible"
 
 	econf \
 		--with-install-prefix="${D}" \
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.1.ebuild
deleted file mode 100644
index 2872dc86469a..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.4.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2007 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.4.1.ebuild,v 1.1 2007/08/17 01:13:42 robbat2 Exp $
-
-inherit fixheadtails flag-o-matic 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 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="diskio doc elf ipv6 lm_sensors mfd-rewrites minimal perl rpm selinux smux ssl tcpd X sendmail"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-		>=sys-libs/zlib-1.1.4
-	)
-	elf? ( dev-libs/elfutils )
-	lm_sensors? ( sys-apps/lm_sensors )"
-
-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}"
-
-#	The lm_sensors patch has a memory leak
-#	If you can help, please attach a patch to bug 109785
-
-#	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
-
-	# 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"
-
-	# Fix usage of clientaddr
-	EPATCH_OPTS="-p1" epatch "${FILESDIR}"/${PN}-5.4.1-clientaddr-fix.patch
-
-	ht_fix_all
-}
-
-src_compile() {
-	local mibs
-
-	strip-flags
-
-	# filter for bug #145960
-	# as it seems that the option is not enough
-	filter-ldflags -Wl,--as-needed
-
-	mibs="host ucd-snmp/dlmod"
-	use smux && mibs="${mibs} smux"
-	use sendmail && mibs="${mibs} mibII/mta_sendmail"
-	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="/var/log/net-snmpd.log" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--enable-as-needed \
-		$(use_enable mfd-rewrites) \
-		$(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 rpm zlib) \
-		$(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" "${D}/usr/bin/snmpcheck"
-	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.rc7 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.rc7 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
-	if use minimal; then
-		elog "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,snmpcheck}}
-		rm -rf "${D}"/usr/share/snmp/snmpconf-data "${D}"/usr/share/snmp/*.conf
-		rm -rf "${D}"/usr/bin/{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
-
-	# bug 113788, install example config
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-}
-
-pkg_postinst() {
-	elog "An example configuration file has been installed in"
-	elog "/etc/snmp/snmpd.conf.example."
-}