--- net-snmp-5.4.2.1-r3.ebuild	2010-04-20 17:15:20.000000000 +0200
+++ net-snmp-5.4.2.1-r3.ebuild	2010-04-29 18:23:34.000000000 +0200
@@ -45,21 +45,14 @@ 
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	# Fix CVE-2008-6123
-	epatch "${FILESDIR}"/CVE-2008-6123.patch
-
-	# lm_sensors-3 support
-	if use lm_sensors ; then
-		epatch "${FILESDIR}"/${PN}-5.4.1-sensors3.patch \
-			"${FILESDIR}"/${PN}-5.4.1-sensors3-version_detect.patch
-	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"
+	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"
+	sed -i \
+		-e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' \
+		local/fixproc || die "sed fixproc failed"
 
 	if use python ; then
 		python_version
@@ -73,12 +66,15 @@ 
 	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
 
 	# remove CFLAGS from net-snmp-config script (bug #257622):
-	sed -i -e 's|@CFLAGS@ ||g' net-snmp-config.in
+	sed -i \
+		-e 's|@CFLAGS@ ||g' \
+		-e 's|@LDFLAGS@ ||g' \
+		net-snmp-config.in || die "sedding CFLAGS failed"
 
 	# Fix version number:
-	sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" snmplib/snmp_version.c
-
-	eautoreconf
+	sed -i \
+		-e "s|PACKAGE_VERSION|\"${PV}\"|g" \
+		snmplib/snmp_version.c || die "sedding version failed"
 
 	ht_fix_all
 }