Stable on x86, ebuild cleanup

(Portage version: 2.0.51.22-r2)

5 files changed, 9 insertions, 54 deletions

diff --git a/net-analyzer/cacti-cactid/ChangeLog b/net-analyzer/cacti-cactid/ChangeLog
index 7d52cc98cbaf..71f5dd448814 100644
--- a/net-analyzer/cacti-cactid/ChangeLog
+++ b/net-analyzer/cacti-cactid/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2005/07/10 21:13:12 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.11 2005/08/24 05:58:08 ramereth Exp $
+
+  24 Aug 2005; Lance Albertson <ramereth@gentoo.org>
+  -cacti-cactid-0.8.6c.ebuild, cacti-cactid-0.8.6e.ebuild:
+  * Stable on x86
+  * Ebuild cleanup
 
 *cacti-cactid-0.8.6e (10 Jul 2005)
 
diff --git a/net-analyzer/cacti-cactid/Manifest b/net-analyzer/cacti-cactid/Manifest
index f18fc760a2ed..17a0a7c5daca 100644
--- a/net-analyzer/cacti-cactid/Manifest
+++ b/net-analyzer/cacti-cactid/Manifest
@@ -1,8 +1,7 @@
-MD5 84391c3de8a1f14ec77560ac8f5a0ee2 cacti-cactid-0.8.6c.ebuild 1403
 MD5 528bed3e0527d5e490f39fdd9c98daa6 metadata.xml 682
 MD5 1be40f268211f446d871d93f261b589f ChangeLog 1962
 MD5 a56f754ebfd757e6dd9dd30f85126412 cacti-cactid-0.8.6d-r1.ebuild 1418
-MD5 4242819807496af6e93e91028107cedf cacti-cactid-0.8.6e.ebuild 1416
+MD5 2c6b765054a8459c4528663f5b1eb232 cacti-cactid-0.8.6e.ebuild 1415
 MD5 ffd8c4a7927d055eacd63bdbdb0d2308 files/digest-cacti-cactid-0.8.6c 71
 MD5 612a831c92034aceeb7afa0d6275c06e files/digest-cacti-cactid-0.8.6d-r1 71
 MD5 58c86d50c9315285ddaf0c5f24269e2d files/digest-cacti-cactid-0.8.6e 71
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6c.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6c.ebuild
deleted file mode 100644
index 050f7ced7433..000000000000
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6c.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.6c.ebuild,v 1.4 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"
-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 f8ea2115772a..a7c263959ad0 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.1 2005/07/10 21:13:12 ramereth Exp $
+# $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 $
 
 DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
 as possible"
@@ -9,7 +9,7 @@ SRC_URI="http://www.cacti.net/downloads/cactid/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="net-analyzer/net-snmp
diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6c b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6c
deleted file mode 100644
index a6dc5911c5b7..000000000000
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e4c2b592b7fc714d77cb54540a64319 cacti-cactid-0.8.6c.tar.gz 116413