removed old ebuild, added mysql-5 block, fixed RDEPEND

(Portage version: 2.0.51.22-r3)

6 files changed, 18 insertions, 57 deletions

diff --git a/net-analyzer/cacti-cactid/ChangeLog b/net-analyzer/cacti-cactid/ChangeLog
index 276de20dc3f3..aa10dbf6552e 100644
--- a/net-analyzer/cacti-cactid/ChangeLog
+++ b/net-analyzer/cacti-cactid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/cacti-cactid
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.12 2005/10/23 22:23:15 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.13 2005/11/18 05:25:53 ramereth Exp $
+
+  18 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  -cacti-cactid-0.8.6d-r1.ebuild, cacti-cactid-0.8.6e.ebuild,
+  cacti-cactid-0.8.6f_p1.ebuild:
+  * Removed old ebuild
+  * Added >=dev-db/mysql-5 block (bug #112010)
+  * Fixed RDEPEND
 
 *cacti-cactid-0.8.6f_p1 (23 Oct 2005)
 
diff --git a/net-analyzer/cacti-cactid/Manifest b/net-analyzer/cacti-cactid/Manifest
index 9a609e2015c0..60d333d6be35 100644
--- a/net-analyzer/cacti-cactid/Manifest
+++ b/net-analyzer/cacti-cactid/Manifest
@@ -1,8 +1,6 @@
 MD5 528bed3e0527d5e490f39fdd9c98daa6 metadata.xml 682
 MD5 95de26d3c2b4c10d7d7b91c66e0d4469 ChangeLog 2256
-MD5 a56f754ebfd757e6dd9dd30f85126412 cacti-cactid-0.8.6d-r1.ebuild 1418
-MD5 f93151052ef5a016c91ff59b3e0e2122 cacti-cactid-0.8.6e.ebuild 1415
-MD5 d160b092c3276c6a14afd1b6e2f065d3 cacti-cactid-0.8.6f_p1.ebuild 1459
-MD5 612a831c92034aceeb7afa0d6275c06e files/digest-cacti-cactid-0.8.6d-r1 71
+MD5 2a1b33f6c459d8b049cf96a6df3aa1e6 cacti-cactid-0.8.6e.ebuild 1435
+MD5 ea293835207f77e31674e93f1887cbd9 cacti-cactid-0.8.6f_p1.ebuild 1538
 MD5 58c86d50c9315285ddaf0c5f24269e2d files/digest-cacti-cactid-0.8.6e 71
 MD5 c0e5c0f4c74e06f2c99e6e086be7dfd7 files/digest-cacti-cactid-0.8.6f_p1 73
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d-r1.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d-r1.ebuild
deleted file mode 100644
index 07c15128eff1..000000000000
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d-r1.ebuild,v 1.6 2005/07/09 18:35:31 swegener Exp $
-
-DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
-as possible"
-HOMEPAGE="http://cacti.net/cactid_info.php"
-SRC_URI="http://www.cacti.net/downloads/cactid/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE=""
-
-DEPEND="net-analyzer/net-snmp
-		net-analyzer/rrdtool
-		dev-db/mysql
-		>=sys-devel/autoconf-2.53"
-RDEPEND="net-analyzer/cacti"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-	sed -i -e 's/mysqlclient/mysqlclient_r/g' configure.ac
-	sed -i -e 's/wwwroot\/cacti\/log/var\/log/g' cactid.h
-}
-
-src_compile() {
-	export WANT_AUTOCONF=2.53
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto usr/sbin ; doexe ${S}/cactid
-	insinto etc/ ; insopts -m0640 -o root -g apache ; doins ${S}/cactid.conf
-	dodoc CHANGELOG INSTALL README
-}
-
-pkg_postinst() {
-	einfo "Please see cacti's site for installation instructions."
-	einfo "Theres no need to change the crontab for this, just"
-	einfo "read the	instructions on how to implement it"
-	einfo
-	einfo "http://cacti.net/cactid_install.php"
-}
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
index a7c263959ad0..f58e2c712308 100644
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
+++ b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild,v 1.2 2005/08/24 05:58:08 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild,v 1.3 2005/11/18 05:25:53 ramereth Exp $
 
 DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
 as possible"
@@ -14,6 +14,7 @@ IUSE=""
 
 DEPEND="net-analyzer/net-snmp
 		net-analyzer/rrdtool
+		!>=dev-db/mysql-5
 		dev-db/mysql
 		>=sys-devel/autoconf-2.53"
 RDEPEND="net-analyzer/cacti"
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
index 2f02ef428fb8..7a4253a3d518 100644
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
+++ b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild,v 1.1 2005/10/23 22:23:15 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild,v 1.2 2005/11/18 05:25:53 ramereth Exp $
 
 MY_PV=${PV/_p/-}
 DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
@@ -14,9 +14,13 @@ KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="net-analyzer/net-snmp
+		!>=dev-db/mysql-5
 		dev-db/mysql
 		>=sys-devel/autoconf-2.59"
-RDEPEND="net-analyzer/cacti"
+RDEPEND="net-analyzer/cacti
+		net-analyzer/net-snmp
+		!>=dev-db/mysql-5
+		dev-db/mysql"
 
 src_unpack() {
 	unpack ${A} ; mv ${WORKDIR}/${PN}-${MY_PV} ${S} ; cd ${S}
diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6d-r1 b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6d-r1
deleted file mode 100644
index e9ed38be0cb2..000000000000
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6d-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8fbd96cbe73af9cd3a7dc2e5de1f0a92 cacti-cactid-0.8.6d.tar.gz 115333