removing ucd-snmp as per bug #69451

(Portage version: 2.0.51.16)

5 files changed, 11 insertions, 42 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index 3ae6d4201100..462f49929bcf 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/apcupsd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.54 2004/12/20 13:42:13 tantive Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.55 2005/02/21 02:36:38 dragonheart Exp $
+
+  21 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/3.10.15/ucd-snmp.patch, -files/3.10.16/ucd-snmp.patch,
+  apcupsd-3.10.15-r1.ebuild, apcupsd-3.10.16-r3.ebuild:
+  removing ucd-snmp as per bug #69451
 
 *apcupsd-3.10.16-r3 (20 Dec 2004)
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild
index 3fd87c8d4470..29a0038cee04 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild,v 1.7 2004/10/29 22:25:47 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild,v 1.8 2005/02/21 02:36:38 dragonheart Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE="doc snmp usb apache2"
 DEPEND=">=sys-apps/baselayout-1.8.4
 	virtual/libc
 	virtual/mta
-	snmp? ( virtual/snmp )
+	snmp? ( net-analyzer/net-snmp )
 	>=media-libs/gd-1.8.4
 	sys-libs/ncurses"
 RDEPEND="${DEPEND}
@@ -32,10 +32,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/platforms/gentoo
 	epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-	cd ${S}
-	if has_version net-analyzer/ucd-snmp; then
-	    epatch ${FILESDIR}/${PV}/ucd-snmp.patch
-	    fi
 }
 
 src_compile() {
diff --git a/sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild b/sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild
index 64d8a34b6f02..373d06749ade 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild,v 1.1 2004/12/20 13:42:14 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.16-r3.ebuild,v 1.2 2005/02/21 02:36:38 dragonheart Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE="doc snmp usb apache2 gd"
 DEPEND=">=sys-apps/baselayout-1.8.4
 	virtual/libc
 	virtual/mta
-	snmp? ( virtual/snmp )
+	snmp? ( net-analyzer/net-snmp )
 	gd? ( >=media-libs/gd-1.8.4 )
 	sys-libs/ncurses"
 RDEPEND="${DEPEND}
@@ -32,10 +32,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/platforms/gentoo
 	epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-	cd ${S}
-	if has_version net-analyzer/ucd-snmp; then
-	    epatch ${FILESDIR}/${PV}/ucd-snmp.patch
-	    fi
 }
 
 src_compile() {
diff --git a/sys-apps/apcupsd/files/3.10.15/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.15/ucd-snmp.patch
deleted file mode 100644
index af9c363b2328..000000000000
--- a/sys-apps/apcupsd/files/3.10.15/ucd-snmp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/drivers/snmp/snmp.c 2003-04-05 14:58:00.000000000 +0200
-+++ src/drivers/snmp/snmp.c 2003-08-21 14:25:11.000000000 +0200
-@@ -245,7 +245,10 @@
-     return ret;
- }
-
--int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+/*int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+ * Modified for debian
-+*/
-+int snmp_ups_program_eeprom(UPSINFO *ups, int command, void *data)
- {
-     return 0;
- }
diff --git a/sys-apps/apcupsd/files/3.10.16/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.16/ucd-snmp.patch
deleted file mode 100644
index af9c363b2328..000000000000
--- a/sys-apps/apcupsd/files/3.10.16/ucd-snmp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/drivers/snmp/snmp.c 2003-04-05 14:58:00.000000000 +0200
-+++ src/drivers/snmp/snmp.c 2003-08-21 14:25:11.000000000 +0200
-@@ -245,7 +245,10 @@
-     return ret;
- }
-
--int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+/*int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+ * Modified for debian
-+*/
-+int snmp_ups_program_eeprom(UPSINFO *ups, int command, void *data)
- {
-     return 0;
- }