new version bump, remove old version

Package-Manager: portage-2.0.51.22-r2

5 files changed, 33 insertions, 13 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index f9de1a7aba00..ba28a1577ac0 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.53 2005/09/09 21:32:35 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.54 2005/09/10 19:56:26 ramereth Exp $
+
+*cacti-0.8.6g (10 Sep 2005)
+
+  10 Sep 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6e.ebuild,
+  +cacti-0.8.6g.ebuild:
+  * New version release bump
+  * Remove old version
 
 *cacti-0.8.6f-r2 (09 Sep 2005)
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 6ee5ac2772ba..dca825a6ca7f 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,11 +1,11 @@
-MD5 eb9f0ee90a5112c237b5826addd3e4a8 ChangeLog 7560
+MD5 0b692c64cc48118b14b29857b88febf5 ChangeLog 7741
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 MD5 da5af63344c45ecb0fc0a082ada38c17 cacti-0.8.6f-r1.ebuild 1979
 MD5 9f7924c1cca1e3e091dc4bcdef67ac63 cacti-0.8.6f-r2.ebuild 1990
-MD5 7b9904b1e9182a6468bbcbf50ff16191 cacti-0.8.6e.ebuild 1335
 MD5 55a8b1b00a00c05ecd18d44c3565dc42 cacti-0.8.6f.ebuild 1335
+MD5 fc7deaa26202106634402d81e0bde91f cacti-0.8.6g.ebuild 1696
 MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r1 874
 MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
-MD5 ce21d377ddb344aa5a4ebea091e369d8 files/digest-cacti-0.8.6e 65
+MD5 b9b37ff105d9d50fb2c9a7b0b2a60429 files/digest-cacti-0.8.6g 65
 MD5 5a259a769627accb5e3de215ff0f93f5 files/digest-cacti-0.8.6f 65
 MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r2 874
diff --git a/net-analyzer/cacti/cacti-0.8.6e.ebuild b/net-analyzer/cacti/cacti-0.8.6g.ebuild
index 699110313122..47b3a8d190a6 100644
--- a/net-analyzer/cacti/cacti-0.8.6e.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6g.ebuild
@@ -1,15 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6e.ebuild,v 1.2 2005/06/21 20:31:50 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6g.ebuild,v 1.1 2005/09/10 19:56:27 ramereth Exp $
 
 inherit eutils webapp
 
 DESCRIPTION="Cacti is a complete frontend to rrdtool"
 HOMEPAGE="http://www.cacti.net/"
+# patches (none needed for new 0.8.6g)
+#UPSTREAM_PATCHES=""
 SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
+#for i in $UPSTREAM_PATCHES ; do
+#	SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV}/${i}"
+#done
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="snmp"
 
 DEPEND=""
@@ -21,15 +26,23 @@ RDEPEND="net-www/apache
 	net-analyzer/rrdtool
 	dev-db/mysql
 	virtual/cron
-	dev-php/php
-	dev-php/mod_php"
+	virtual/php
+	virtual/httpd-php"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	# patches (none needed for new 0.8.6g)
+	#for i in ${UPSTREAM_PATCHES} ; do
+	#	EPATCH_OPTS="-p1 -d ${S} -N" epatch ${DISTDIR}/${i}
+	#done ;
+}
 
 pkg_setup() {
 	webapp_pkg_setup
-	built_with_use dev-php/php mysql || \
-		die "dev-php/php must be compiled with USE=mysql"
-	built_with_use dev-php/mod_php mysql || \
-		die "dev-php/mod_php must be compiled with USE=mysql"
+	built_with_use virtual/php mysql || \
+		die "php cli sapi must be compiled with USE=mysql"
+	built_with_use virtual/httpd-php mysql || \
+		die "php apache/cgi sapi must be compiled with USE=mysql"
 }
 
 src_compile() {
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6e b/net-analyzer/cacti/files/digest-cacti-0.8.6e
deleted file mode 100644
index a8398841f30e..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6e
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be02abac3bb65c9fec089d9e0bbf684d cacti-0.8.6e.tar.gz 1061986
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6g b/net-analyzer/cacti/files/digest-cacti-0.8.6g
new file mode 100644
index 000000000000..6d16176266e7
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6g
@@ -0,0 +1 @@
+MD5 b3cf31349d2db47d14dcf347b8422bc2 cacti-0.8.6g.tar.gz 1076607