added new version for bug #97475, cleaned out old ebuilds

Package-Manager: portage-2.0.51.19

10 files changed, 15 insertions, 131 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 53d06b8d8b2d..07fe8d920047 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.47 2005/06/30 04:17:08 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.48 2005/07/02 02:13:10 ramereth Exp $
+
+*cacti-0.8.6f (02 Jul 2005)
+
+  02 Jul 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6b.ebuild,
+  -cacti-0.8.6c.ebuild, -cacti-0.8.6d.ebuild, +cacti-0.8.6f.ebuild:
+  * Added 0.8.6f for a security bump (bug #97475)
+  * Cleaned out old ebuilds
 
   30 Jun 2005; Lance Albertson <ramereth@gentoo.org>
   files/digest-cacti-0.8.6e, Manifest:
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 9373290014ef..31028716e2d2 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,11 +1,7 @@
-MD5 e687eecc5fb57c85292a32e714ff0b75 ChangeLog 6684
-MD5 7f0c51f9165a9663ba08719cf80c8a34 metadata.xml 744
-MD5 678f83d4332c7064ed3c3b9f05887a57 cacti-0.8.6b.ebuild 1332
-MD5 eb29792b90b350f2cd49623037fe5d42 cacti-0.8.6c.ebuild 1332
-MD5 8aace6320fe87eaeb6a06eb4986751aa cacti-0.8.6d.ebuild 1332
+MD5 a420cfeb1e5bd7df1802c1a35a19ae98 ChangeLog 6935
+MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 MD5 7b9904b1e9182a6468bbcbf50ff16191 cacti-0.8.6e.ebuild 1335
-MD5 5415dc0df13fd1528eb90acce7f44989 files/digest-cacti-0.8.6b 65
-MD5 92214d64b7a546022d81ca37cb137262 files/digest-cacti-0.8.6c 65
+MD5 7d23a61bb264deb1d122b468056df278 cacti-0.8.6f.ebuild 1337
 MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
-MD5 e77a5f6b9f7c97f061348312cd9e1004 files/digest-cacti-0.8.6d 65
 MD5 ce21d377ddb344aa5a4ebea091e369d8 files/digest-cacti-0.8.6e 65
+MD5 5a259a769627accb5e3de215ff0f93f5 files/digest-cacti-0.8.6f 65
diff --git a/net-analyzer/cacti/cacti-0.8.6c.ebuild b/net-analyzer/cacti/cacti-0.8.6c.ebuild
deleted file mode 100644
index 51efbd48e61c..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6c.ebuild
+++ /dev/null
@@ -1,58 +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/cacti-0.8.6c.ebuild,v 1.6 2005/05/02 11:23:48 eldad Exp $
-
-inherit eutils webapp
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="http://www.cacti.net/"
-SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha ~amd64"
-IUSE="snmp"
-
-DEPEND=""
-
-# TODO: RDEPEND Not just apache... but there's no virtual/webserver (yet)
-
-RDEPEND="net-www/apache
-	snmp? ( net-analyzer/net-snmp )
-	net-analyzer/rrdtool
-	dev-db/mysql
-	virtual/cron
-	dev-php/php
-	dev-php/mod_php"
-
-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"
-}
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc LICENSE
-	rm LICENSE README
-
-	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
-	rm -rf docs
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${MY_HTDOCSDIR}
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
-
diff --git a/net-analyzer/cacti/cacti-0.8.6d.ebuild b/net-analyzer/cacti/cacti-0.8.6d.ebuild
deleted file mode 100644
index 1432a34e58c7..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6d.ebuild
+++ /dev/null
@@ -1,58 +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/cacti-0.8.6d.ebuild,v 1.2 2005/05/02 11:23:48 eldad Exp $
-
-inherit eutils webapp
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="http://www.cacti.net/"
-SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha ~amd64"
-IUSE="snmp"
-
-DEPEND=""
-
-# TODO: RDEPEND Not just apache... but there's no virtual/webserver (yet)
-
-RDEPEND="net-www/apache
-	snmp? ( net-analyzer/net-snmp )
-	net-analyzer/rrdtool
-	dev-db/mysql
-	virtual/cron
-	dev-php/php
-	dev-php/mod_php"
-
-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"
-}
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc LICENSE
-	rm LICENSE README
-
-	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
-	rm -rf docs
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${MY_HTDOCSDIR}
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
-
diff --git a/net-analyzer/cacti/cacti-0.8.6b.ebuild b/net-analyzer/cacti/cacti-0.8.6f.ebuild
index 394a3e79004d..a1ced828e8e8 100644
--- a/net-analyzer/cacti/cacti-0.8.6b.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6f.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/cacti-0.8.6b.ebuild,v 1.8 2005/05/02 11:23:48 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6f.ebuild,v 1.1 2005/07/02 02:13:10 ramereth Exp $
 
 inherit eutils webapp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.cacti.net/"
 SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="snmp"
 
 DEPEND=""
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6b b/net-analyzer/cacti/files/digest-cacti-0.8.6b
deleted file mode 100644
index 0343fd123fdc..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c6304aed42823b70648b4d5a3c329bd cacti-0.8.6b.tar.gz 1021894
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6c b/net-analyzer/cacti/files/digest-cacti-0.8.6c
deleted file mode 100644
index a383b6b0200c..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f48b1cc12ebdf96358563760c812e227 cacti-0.8.6c.tar.gz 1038183
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6d b/net-analyzer/cacti/files/digest-cacti-0.8.6d
deleted file mode 100644
index a3225a381655..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f149a874dd06b639a5b6b78cf994b4cb cacti-0.8.6d.tar.gz 1037551
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6f b/net-analyzer/cacti/files/digest-cacti-0.8.6f
new file mode 100644
index 000000000000..a96c3cf5faa8
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6f
@@ -0,0 +1 @@
+MD5 032b8b22225f137e2a2294e89a2af2ec cacti-0.8.6f.tar.gz 1062562
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index af9574da0aa4..5079e8cf393e 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -16,4 +16,3 @@
 		devices.
 	</longdescription>
 </pkgmetadata>
-