fix patch handling

4 files changed, 24 insertions, 15 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 4b46ab370b1c..4a413ef45705 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.14 2003/05/26 08:30:43 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.15 2003/06/05 23:45:07 rac Exp $
+
+  05 Jun 2003; <rac@gentoo.org> net-snmp-5.0.6-r1.ebuild,
+  net-snmp-5.0.8.ebuild:
+  Disable the 5.0.6 patch in 5.0.8, as it doesn't exist, and builds without it.
+  Change ${PF} to ${P} so that 5.0.6-r1 finds the patch.
 
 *net-snmp-5.0.8 (26 May 2003)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index f16a03f5a96c..24704eb4fc92 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,15 +1,15 @@
-MD5 d45ce760ab6826dfaa6716bc11d3ccba ChangeLog 1799
-MD5 07372e3fc940abfd2601968e11d0fbb6 net-snmp-5.0.1.ebuild 1802
-MD5 22ec646d0af5a104570eeda88dc397c6 net-snmp-5.0.2a-r1.ebuild 2033
+MD5 05848e0dcc6fe2c7fc2e899804b402b2 net-snmp-5.0.6-r1.ebuild 2305
 MD5 479216f8ee9cad9c07a8d2e87b761078 net-snmp-5.0.2a.ebuild 1934
+MD5 22ec646d0af5a104570eeda88dc397c6 net-snmp-5.0.2a-r1.ebuild 2033
 MD5 d1f0e81828f147bb73ce38b5337bec58 net-snmp-5.0.6.ebuild 2282
-MD5 e4e56dc26d965d77d685d064da1ef736 net-snmp-5.0.8.ebuild 2310
-MD5 903f8ddd5ef4f35f60a0caff6caa2399 net-snmp-5.0.6-r1.ebuild 2305
-MD5 d127de412720bd3804be2526d4ac7dea files/digest-net-snmp-5.0.1 67
-MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a 68
+MD5 07372e3fc940abfd2601968e11d0fbb6 net-snmp-5.0.1.ebuild 1802
+MD5 ceff7a0bee868952df1dd46b4ca3c19e ChangeLog 2270
+MD5 991f090b108dfdff3a541b9da841ec4f net-snmp-5.0.8.ebuild 2454
+MD5 d967ea531257d3b6328dffa4637b27ff files/net-snmp-5.0.6-gentoo.diff 885
+MD5 c5a8f12d262061bf64af49b18adb2f48 files/digest-net-snmp-5.0.6-r1 67
 MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a-r1 68
+MD5 d127de412720bd3804be2526d4ac7dea files/digest-net-snmp-5.0.1 67
 MD5 c5a8f12d262061bf64af49b18adb2f48 files/digest-net-snmp-5.0.6 67
-MD5 d967ea531257d3b6328dffa4637b27ff files/net-snmp-5.0.6-gentoo.diff 885
-MD5 aab0f5782525e1224951f71ba800f172 files/net-snmpd.rc6 736
 MD5 d87102db9b8bd989270ab11bec140004 files/digest-net-snmp-5.0.8 67
-MD5 c5a8f12d262061bf64af49b18adb2f48 files/digest-net-snmp-5.0.6-r1 67
+MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a 68
+MD5 aab0f5782525e1224951f71ba800f172 files/net-snmpd.rc6 736
diff --git a/net-analyzer/net-snmp/net-snmp-5.0.6-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.0.6-r1.ebuild
index fbbceedc8005..d143a08baff5 100644
--- a/net-analyzer/net-snmp/net-snmp-5.0.6-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.0.6-r1.ebuild,v 1.1 2003/05/26 08:30:43 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.0.6-r1.ebuild,v 1.2 2003/06/05 23:45:07 rac Exp $
 
 IUSE="ssl kerberos ipv6 tcpd"
 PROVIDES="virtual/snmp"
@@ -23,7 +23,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+	patch -p1 < ${FILESDIR}/${P}-gentoo.diff
 
 # Kerberos support trips with a compile error
 #	use kerberos && {
diff --git a/net-analyzer/net-snmp/net-snmp-5.0.8.ebuild b/net-analyzer/net-snmp/net-snmp-5.0.8.ebuild
index b6ebd1ac613c..556d5673f0dc 100644
--- a/net-analyzer/net-snmp/net-snmp-5.0.8.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.0.8.ebuild,v 1.1 2003/05/26 08:30:43 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.0.8.ebuild,v 1.2 2003/06/05 23:45:07 rac Exp $
 
 IUSE="ssl kerberos ipv6 tcpd"
 
@@ -24,7 +24,11 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+
+	# 5.0.8 compiles without this patch, and the filename doesn't
+	# match anyway, so disabling for now
+	# Robert Coie <rac@gentoo.org> 2003.06.05
+	#patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
 
 # Kerberos support trips with a compile error
 #	use kerberos && {