Use net-snmp's built-in lm_sensors support, thanks to Daniel Willmann <willmann dot daniel at web dot de> in bug 109785.

(Portage version: 2.0.54)

5 files changed, 23 insertions, 37 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index b7125fa80930..dff4222c28d1 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.132 2006/01/26 18:49:13 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.133 2006/02/04 18:10:22 vanquirius Exp $
+
+  04 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  net-snmp-5.2.1.2-r1.ebuild, net-snmp-5.2.2-r1.ebuild,
+  net-snmp-5.3.0.1.ebuild:
+  Use net-snmp's built-in lm_sensors support, thanks to Daniel Willmann
+  <willmann dot daniel at web dot de> in bug 109785. Our patch is still
+  commented out.
 
 *net-snmp-5.3.0.1 (26 Jan 2006)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 7880874b1459..7997045602e8 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -11,6 +11,6 @@ MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
 MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
 MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
-MD5 7355c88ff408670bc0fc6d97eac0eeaf net-snmp-5.2.1.2-r1.ebuild 5238
-MD5 c2142a72b904670376f237ea16a284d1 net-snmp-5.2.2-r1.ebuild 5270
-MD5 524cb28d42cbff034673c0f1325f577c net-snmp-5.3.0.1.ebuild 5382
+MD5 4d44b58895e7d75811f7e34b5c795a68 net-snmp-5.2.1.2-r1.ebuild 5091
+MD5 e1945c11df1887ea75012b4f2d6dadf7 net-snmp-5.2.2-r1.ebuild 5123
+MD5 d997bb25d16b9e3ec26b6ee183ffb483 net-snmp-5.3.0.1.ebuild 5235
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
index 72946d44c9a1..863e99ad43c3 100644
--- 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.4 2006/01/23 01:24:35 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild,v 1.5 2006/02/04 18:10:22 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -20,8 +20,8 @@ DEPEND=">=sys-libs/zlib-1.1.4
 		dev-libs/popt
 		app-arch/bzip2
 	)
-	elf? ( dev-libs/elfutils )"
-#	lm_sensors? ( sys-apps/lm_sensors )
+	elf? ( dev-libs/elfutils )
+	lm_sensors? ( sys-apps/lm_sensors )"
 
 RDEPEND="${DEPEND}
 	perl? (
@@ -78,7 +78,7 @@ src_compile() {
 
 	mibs="host ucd-snmp/dlmod"
 	use smux && mibs="${mibs} smux"
-#	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
 
 	econf \
 		--with-install-prefix="${D}" \
@@ -167,10 +167,3 @@ src_install () {
 		use ipv6 || rm -rf ${D}/usr/share/snmp/mibs/IPV6*
 	fi
 }
-
-pkg_postinst() {
-	if use lm_sensors ; then
-		ewarn "lm_sensors support is no longer available because it"
-		ewarn "causes a memory leak."
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild
index 589b35d3a494..b4b532940f85 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2-r1.ebuild,v 1.3 2006/01/23 01:24:35 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild,v 1.4 2006/02/04 18:10:22 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -20,8 +20,8 @@ DEPEND=">=sys-libs/zlib-1.1.4
 		dev-libs/popt
 		app-arch/bzip2
 	)
-	elf? ( dev-libs/elfutils )"
-#	lm_sensors? ( sys-apps/lm_sensors )
+	elf? ( dev-libs/elfutils )
+	lm_sensors? ( sys-apps/lm_sensors )"
 
 RDEPEND="${DEPEND}
 	perl? (
@@ -80,7 +80,7 @@ src_compile() {
 
 	mibs="host ucd-snmp/dlmod"
 	use smux && mibs="${mibs} smux"
-#	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
 
 	econf \
 		--with-install-prefix="${D}" \
@@ -169,10 +169,3 @@ src_install () {
 		use ipv6 || rm -rf "${D}"/usr/share/snmp/mibs/IPV6*
 	fi
 }
-
-pkg_postinst() {
-	if use lm_sensors ; then
-		ewarn "lm_sensors support is no longer available because it"
-		ewarn "causes a memory leak."
-	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
index 6d2b02d20a98..14bbd1dfebc0 100644
--- a/net-analyzer/net-snmp/net-snmp-5.3.0.1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1 2006/01/26 18:49:13 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3.0.1.ebuild,v 1.2 2006/02/04 18:10:22 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -21,8 +21,8 @@ DEPEND=">=sys-libs/zlib-1.1.4
 		dev-libs/popt
 		app-arch/bzip2
 	)
-	elf? ( dev-libs/elfutils )"
-#	lm_sensors? ( sys-apps/lm_sensors )
+	elf? ( dev-libs/elfutils )
+	lm_sensors? ( sys-apps/lm_sensors )"
 
 RDEPEND="${DEPEND}
 	perl? (
@@ -79,7 +79,7 @@ src_compile() {
 
 	mibs="host ucd-snmp/dlmod"
 	use smux && mibs="${mibs} smux"
-#	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
 	use diskio && mibs="${mibs} ucd-snmp/diskio"
 
 	econf \
@@ -169,10 +169,3 @@ src_install () {
 		use ipv6 || rm -rf "${D}"/usr/share/snmp/mibs/IPV6*
 	fi
 }
-
-pkg_postinst() {
-	if use lm_sensors ; then
-		ewarn "lm_sensors support is no longer available because it"
-		ewarn "causes a memory leak."
-	fi
-}