marked stable for x86

Package-Manager: portage-2.0.51.19

6 files changed, 21 insertions, 62 deletions

diff --git a/net-analyzer/cacti-cactid/ChangeLog b/net-analyzer/cacti-cactid/ChangeLog
index 2b14ffeba5b5..ee51ba450b64 100644
--- a/net-analyzer/cacti-cactid/ChangeLog
+++ b/net-analyzer/cacti-cactid/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2005/05/02 16:55:52 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.5 2005/05/10 03:27:01 ramereth Exp $
+
+  10 May 2005; Lance Albertson <ramereth@gentoo.org>
+  cacti-cactid-0.8.6c.ebuild, -cacti-cactid-0.8.6d.ebuild,
+  cacti-cactid-0.8.6d-r1.ebuild:
+  marked stable for x86
+  updated 0.8.6c to reflect changed made in 0.8.6d-r1
 
   02 May 2005; Jason Wever <weeve@gentoo.org> cacti-cactid-0.8.6d-r1.ebuild:
   Added ~sparc keyword.
diff --git a/net-analyzer/cacti-cactid/Manifest b/net-analyzer/cacti-cactid/Manifest
index 924ce3a56beb..82a7f2b6f9a4 100644
--- a/net-analyzer/cacti-cactid/Manifest
+++ b/net-analyzer/cacti-cactid/Manifest
@@ -1,8 +1,6 @@
-MD5 ca438f4bd317a355573e505189c1b18d ChangeLog 818
-MD5 4079294855ad6943cef50a6be12cbdc8 cacti-cactid-0.8.6c.ebuild 1238
-MD5 e41ba3e1ab178f3d9c9c7e11af355a93 cacti-cactid-0.8.6d.ebuild 1231
+MD5 f2a72fead1b841803e6bfb5415435a3b cacti-cactid-0.8.6c.ebuild 1392
 MD5 528bed3e0527d5e490f39fdd9c98daa6 metadata.xml 682
-MD5 2aa244b4db3dcf790fd4fcbd7e2f7b45 cacti-cactid-0.8.6d-r1.ebuild 1400
+MD5 f842f2420b4adedd79c8ecf1f87a5536 ChangeLog 1045
+MD5 3f6648e7c76a86f73a15c8f0ece0ad31 cacti-cactid-0.8.6d-r1.ebuild 1402
 MD5 ffd8c4a7927d055eacd63bdbdb0d2308 files/digest-cacti-cactid-0.8.6c 71
-MD5 612a831c92034aceeb7afa0d6275c06e files/digest-cacti-cactid-0.8.6d 71
 MD5 612a831c92034aceeb7afa0d6275c06e files/digest-cacti-cactid-0.8.6d-r1 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
index bb1f95725b96..c2093f190601 100644
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6c.ebuild
+++ b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6c.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.6c.ebuild,v 1.1 2005/04/10 00:18:29 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6c.ebuild,v 1.2 2005/05/10 03:27:01 ramereth Exp $
 
 DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
 as possible"
@@ -9,18 +9,17 @@ SRC_URI="http://www.cacti.net/downloads/cactid/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="net-analyzer/net-snmp
 		net-analyzer/rrdtool
 		dev-db/mysql
 		sys-devel/autoconf"
-RDEPEND="=net-analyzer/cacti-${PV}"
+RDEPEND="net-analyzer/cacti"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	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
@@ -36,11 +35,14 @@ src_compile() {
 
 src_install() {
 	exeinto usr/sbin ; doexe ${S}/cactid
-	insinto etc/ ; doins ${S}/cactid.conf
+	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 "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.6d-r1.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d-r1.ebuild
index 354150ea3eb3..d4a3e55cc84a 100644
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d-r1.ebuild
+++ b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d-r1.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.6d-r1.ebuild,v 1.2 2005/05/02 16:55:52 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d-r1.ebuild,v 1.3 2005/05/10 03:27:01 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="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE=""
 
 DEPEND="net-analyzer/net-snmp
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d.ebuild
deleted file mode 100644
index 3b0a31dc5e5f..000000000000
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6d.ebuild
+++ /dev/null
@@ -1,46 +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.ebuild,v 1.1 2005/04/10 00:32:19 ramereth 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"
-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() {
-	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/ ; doins ${S}/cactid.conf
-	dodoc CHANGELOG INSTALL README
-}
-
-pkg_postinst() {
-	einfo "Please see cacti's site for installation instructions"
-	einfo "http://cacti.net/cactid_install.php"
-}
diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6d b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6d
deleted file mode 100644
index e9ed38be0cb2..000000000000
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8fbd96cbe73af9cd3a7dc2e5de1f0a92 cacti-cactid-0.8.6d.tar.gz 115333