removed old ebuild, added mysql-5 blocker, adjusted httpd dep for one of the ebuilds

(Portage version: 2.0.51.22-r3)

7 files changed, 26 insertions, 85 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 76f9b6fd0244..f25e877dd92e 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,14 @@
 # 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.57 2005/10/24 21:27:16 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.58 2005/11/18 03:29:12 ramereth Exp $
+
+  18 Nov 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6f.ebuild,
+  cacti-0.8.6f-r1.ebuild, cacti-0.8.6g.ebuild,
+  cacti-0.8.6g_p20051023.ebuild:
+  * Removed old ebuild
+  * Added >=dev-db/mysql-5 blocker (bug #112010)
+  * Adjusted httpd dep (now have a choice between apache1, apache2, or
+    lighttpd (only on 0.8.6g_p20051023)) bug #107512
 
   24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> cacti-0.8.6g.ebuild:
   Stable on sparc
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index a6cd40497ad0..20773064aa5e 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f7e701b3e5197823569f3a452d99a227 cacti-0.8.6f-r1.ebuild 1978
-MD5 55a8b1b00a00c05ecd18d44c3565dc42 cacti-0.8.6f.ebuild 1335
-MD5 9f7924c1cca1e3e091dc4bcdef67ac63 cacti-0.8.6f-r2.ebuild 1990
-MD5 8ad6e5f58c50c465a167015ea5f916b0 cacti-0.8.6g.ebuild 1694
-MD5 c17e5c048b5ecf4635c4b0190cf2cbbe cacti-0.8.6g_p20051023.ebuild 1787
-MD5 fa5c2c230c379ed680895cac84c6480d ChangeLog 8149
+MD5 cb1d72c0f469ea678cd81ad106c91e5b ChangeLog 8501
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
-MD5 80642855127d3174cad394f11f138243 files/digest-cacti-0.8.6g_p20051023 346
+MD5 f4cf9a3ee7a8f8cc2a82a46062c4c2f6 cacti-0.8.6f-r1.ebuild 1997
+MD5 9f7924c1cca1e3e091dc4bcdef67ac63 cacti-0.8.6f-r2.ebuild 1990
+MD5 529e379624d88bb44f435670213093a3 cacti-0.8.6g_p20051023.ebuild 1847
+MD5 f196d0095e2ac369a1431e7028293a17 cacti-0.8.6g.ebuild 1713
+MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r1 874
 MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
-MD5 5a259a769627accb5e3de215ff0f93f5 files/digest-cacti-0.8.6f 65
 MD5 b9b37ff105d9d50fb2c9a7b0b2a60429 files/digest-cacti-0.8.6g 65
-MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r1 874
 MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r2 874
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDXVHJKRy60XGEcJIRAuADAKCvl4pHJrvGK5ivQFFAxs/lHqSAjwCghag0
-YDU32xd4lwLRLrG5z/SeE9c=
-=ZLyx
------END PGP SIGNATURE-----
+MD5 80642855127d3174cad394f11f138243 files/digest-cacti-0.8.6g_p20051023 346
diff --git a/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild b/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild
index 94bb10e02534..e5efbc84b621 100644
--- a/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6f-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/cacti-0.8.6f-r1.ebuild,v 1.3 2005/09/15 21:45:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild,v 1.4 2005/11/18 03:29:12 ramereth Exp $
 
 inherit eutils webapp
 
@@ -24,6 +24,7 @@ DEPEND=""
 RDEPEND="net-www/apache
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
+	!>=dev-db/mysql-5
 	dev-db/mysql
 	virtual/cron
 	dev-php/php
diff --git a/net-analyzer/cacti/cacti-0.8.6f.ebuild b/net-analyzer/cacti/cacti-0.8.6f.ebuild
deleted file mode 100644
index 14ab11cdb5dd..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6f.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.6f.ebuild,v 1.3 2005/07/03 02:55:36 ramereth 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="~alpha ~amd64 ~ppc sparc x86"
-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.6g.ebuild b/net-analyzer/cacti/cacti-0.8.6g.ebuild
index 904a92a2a7c7..6e047039e711 100644
--- a/net-analyzer/cacti/cacti-0.8.6g.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6g.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.6g.ebuild,v 1.3 2005/10/24 21:27:16 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6g.ebuild,v 1.4 2005/11/18 03:29:12 ramereth Exp $
 
 inherit eutils webapp
 
@@ -24,6 +24,7 @@ DEPEND=""
 RDEPEND="net-www/apache
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
+	!>=dev-db/mysql-5
 	dev-db/mysql
 	virtual/cron
 	virtual/php
diff --git a/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild b/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
index 0d0200d0faef..b11b9be8d495 100644
--- a/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
@@ -1,8 +1,8 @@
 # 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.6g_p20051023.ebuild,v 1.1 2005/10/23 22:22:32 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild,v 1.2 2005/11/18 03:29:12 ramereth Exp $
 
-inherit eutils webapp
+inherit eutils webapp depend.apache
 
 MY_P=${P/_p*/}
 
@@ -22,11 +22,13 @@ IUSE="snmp"
 
 DEPEND=""
 
-# TODO: RDEPEND Not just apache... but there's no virtual/webserver (yet)
+want_apache
 
-RDEPEND="net-www/apache
+# alpha doesn't have lighttpd keyworded yet
+RDEPEND="!alpha? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) )
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
+	!>=dev-db/mysql-5
 	dev-db/mysql
 	virtual/cron
 	virtual/php
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6f b/net-analyzer/cacti/files/digest-cacti-0.8.6f
deleted file mode 100644
index a96c3cf5faa8..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6f
+++ /dev/null
@@ -1 +0,0 @@
-MD5 032b8b22225f137e2a2294e89a2af2ec cacti-0.8.6f.tar.gz 1062562