version bump, stable on x86, ebuild cleanup

(Portage version: 2.0.53)

8 files changed, 31 insertions, 127 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 6fb97bd05314..e393d711f99f 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,15 @@
 # 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.60 2005/12/19 10:00:57 kloeri Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.61 2006/01/04 16:26:57 ramereth Exp $
+
+*cacti-0.8.6h (04 Jan 2006)
+
+  04 Jan 2006; Lance Albertson <ramereth@gentoo.org>
+  -cacti-0.8.6f-r1.ebuild, -cacti-0.8.6f-r2.ebuild,
+  cacti-0.8.6g_p20051023.ebuild, +cacti-0.8.6h.ebuild:
+  * Version bump
+  * Stable on x86
+  * Clean out old ebuilds
 
   19 Dec 2005; Bryan Østergaard <kloeri@gentoo.org cacti-0.8.6g.ebuild:
   Stable on alpha.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index ee4156acdffa..90332b1cce71 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3edc5614e4a14034681fb24f0d00b6bd ChangeLog 8690
-MD5 9f7924c1cca1e3e091dc4bcdef67ac63 cacti-0.8.6f-r2.ebuild 1990
 MD5 8e19108be4619e53fa7e51c02e1dd872 cacti-0.8.6g.ebuild 1710
-MD5 c8c05fffd3c21c0297b9ad7cc47144fd cacti-0.8.6f-r1.ebuild 1997
-MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
-MD5 61ad387dad6e606772e27f6c9404e0e4 cacti-0.8.6g_p20051023.ebuild 1859
-MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r2 874
+MD5 43e1132c7bf9a419e565144b110e03d2 cacti-0.8.6g_p20051023.ebuild 1858
+MD5 3ad9dd154501cf06d76d6f76770d679d cacti-0.8.6h.ebuild 1694
 MD5 b9b37ff105d9d50fb2c9a7b0b2a60429 files/digest-cacti-0.8.6g 65
-MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
-MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r1 874
 MD5 80642855127d3174cad394f11f138243 files/digest-cacti-0.8.6g_p20051023 346
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDppNBugEuf3OQ0akRAjZcAJ9hmXFKjJKuNc2pcztHTh2/q8yQ6ACfWB4H
-tlxXTy4dAWhnc7+0bqfj8W8=
-=P50z
------END PGP SIGNATURE-----
+MD5 ede2752b4bd41c56fbb8dd6085875f58 files/digest-cacti-0.8.6h 65
+MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
+MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
diff --git a/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild b/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild
deleted file mode 100644
index e5efbc84b621..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild
+++ /dev/null
@@ -1,71 +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-r1.ebuild,v 1.4 2005/11/18 03:29:12 ramereth Exp $
-
-inherit eutils webapp
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="http://www.cacti.net/"
-# patches as of end of July
-UPSTREAM_PATCHES="html_mouseover_title.patch multi_field_output_script_server.patch old_net_snmp_command_options.patch poller_invalid_data_sources.patch script_server_buffer_size.patch unix_syslog_compatibility.patch graph_view_preview_mode_filter.patch poller_reindex_cache_orphans.patch safari_zoom.patch ldap_copy_user_problem.patch script_server_file_header.patch"
-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"
-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-5
-	dev-db/mysql
-	virtual/cron
-	dev-php/php
-	dev-php/mod_php"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	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"
-}
-
-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_p20051023.ebuild b/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
index e02b8a5132c2..d4b5c940fa45 100644
--- a/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.4 2005/12/17 21:40:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild,v 1.5 2006/01/04 16:26:57 ramereth Exp $
 
 inherit eutils webapp depend.apache
 
@@ -17,7 +17,7 @@ for i in $UPSTREAM_PATCHES ; do
 done
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="snmp"
 
 DEPEND=""
diff --git a/net-analyzer/cacti/cacti-0.8.6f-r2.ebuild b/net-analyzer/cacti/cacti-0.8.6h.ebuild
index 50c923b5890a..b58281f16b42 100644
--- a/net-analyzer/cacti/cacti-0.8.6f-r2.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6h.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2005/09/09 21:32:35 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6h.ebuild,v 1.1 2006/01/04 16:26:57 ramereth Exp $
 
 inherit eutils webapp
 
 DESCRIPTION="Cacti is a complete frontend to rrdtool"
 HOMEPAGE="http://www.cacti.net/"
-# patches as of end of July
-UPSTREAM_PATCHES="html_mouseover_title.patch multi_field_output_script_server.patch old_net_snmp_command_options.patch poller_invalid_data_sources.patch script_server_buffer_size.patch unix_syslog_compatibility.patch graph_view_preview_mode_filter.patch poller_reindex_cache_orphans.patch safari_zoom.patch ldap_copy_user_problem.patch script_server_file_header.patch"
+# patches (none needed for new 0.8.6h)
+#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
+#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"
@@ -31,9 +31,10 @@ RDEPEND="net-www/apache
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	for i in ${UPSTREAM_PATCHES} ; do
-		EPATCH_OPTS="-p1 -d ${S} -N" epatch ${DISTDIR}/${i}
-	done ;
+	# patches (none needed for new 0.8.6h)
+	#for i in ${UPSTREAM_PATCHES} ; do
+	#	EPATCH_OPTS="-p1 -d ${S} -N" epatch ${DISTDIR}/${i}
+	#done ;
 }
 
 pkg_setup() {
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6f-r1 b/net-analyzer/cacti/files/digest-cacti-0.8.6f-r1
deleted file mode 100644
index 6dc2c2df5183..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6f-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 032b8b22225f137e2a2294e89a2af2ec cacti-0.8.6f.tar.gz 1062562
-MD5 2354e383adff58725077e95ba8584dba html_mouseover_title.patch 2757
-MD5 c1b8c9d36ff5f4b11f27af8240b6ed42 multi_field_output_script_server.patch 2407
-MD5 75f7f8c59591663dd63f91830fcdb1f1 old_net_snmp_command_options.patch 1124
-MD5 5bdd1c9e4ef4479fafe73ce32e1f43b8 poller_invalid_data_sources.patch 4752
-MD5 5711e9d5f90397ac8f26c7af55d49d12 script_server_buffer_size.patch 1541
-MD5 55c1b16ebe40ea017db8d905de763ce8 unix_syslog_compatibility.patch 703
-MD5 88a34475132b77112910738a3139c01d graph_view_preview_mode_filter.patch 448
-MD5 2afd2acbd1e1b0bf4809996976620c0a poller_reindex_cache_orphans.patch 1054
-MD5 fc5579772103ed98557661866b632997 safari_zoom.patch 1274
-MD5 fe7d23776d828941fc56f72797903f3e ldap_copy_user_problem.patch 2213
-MD5 8598d1419ab589704a79986dd184756c script_server_file_header.patch 264
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6f-r2 b/net-analyzer/cacti/files/digest-cacti-0.8.6f-r2
deleted file mode 100644
index 6dc2c2df5183..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6f-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 032b8b22225f137e2a2294e89a2af2ec cacti-0.8.6f.tar.gz 1062562
-MD5 2354e383adff58725077e95ba8584dba html_mouseover_title.patch 2757
-MD5 c1b8c9d36ff5f4b11f27af8240b6ed42 multi_field_output_script_server.patch 2407
-MD5 75f7f8c59591663dd63f91830fcdb1f1 old_net_snmp_command_options.patch 1124
-MD5 5bdd1c9e4ef4479fafe73ce32e1f43b8 poller_invalid_data_sources.patch 4752
-MD5 5711e9d5f90397ac8f26c7af55d49d12 script_server_buffer_size.patch 1541
-MD5 55c1b16ebe40ea017db8d905de763ce8 unix_syslog_compatibility.patch 703
-MD5 88a34475132b77112910738a3139c01d graph_view_preview_mode_filter.patch 448
-MD5 2afd2acbd1e1b0bf4809996976620c0a poller_reindex_cache_orphans.patch 1054
-MD5 fc5579772103ed98557661866b632997 safari_zoom.patch 1274
-MD5 fe7d23776d828941fc56f72797903f3e ldap_copy_user_problem.patch 2213
-MD5 8598d1419ab589704a79986dd184756c script_server_file_header.patch 264
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6h b/net-analyzer/cacti/files/digest-cacti-0.8.6h
new file mode 100644
index 000000000000..ae1284bd8ac1
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6h
@@ -0,0 +1 @@
+MD5 5f6100b525b5b29e81f43cc7c55f4000 cacti-0.8.6h.tar.gz 1096877