stable on x86, new patched version for fixes

Package-Manager: portage-2.0.51.22-r3

diff --git a/net-analyzer/cacti-cactid/Manifest b/net-analyzer/cacti-cactid/Manifest
index a1122059c97f159d51f686c3f84dc53ca8b9ae78..9a609e2015c0eba95a97d3cbe27a75c5ef35c6a8 100644 (file)
--- a/net-analyzer/cacti-cactid/Manifest
+++ b/net-analyzer/cacti-cactid/Manifest
@@ -1,6 +1,8 @@
 MD5 528bed3e0527d5e490f39fdd9c98daa6 metadata.xml 682
-MD5 c05eb13c40cf4865febcf83e51e0bc82 ChangeLog 2112
+MD5 95de26d3c2b4c10d7d7b91c66e0d4469 ChangeLog 2256
 MD5 a56f754ebfd757e6dd9dd30f85126412 cacti-cactid-0.8.6d-r1.ebuild 1418
 MD5 f93151052ef5a016c91ff59b3e0e2122 cacti-cactid-0.8.6e.ebuild 1415
+MD5 d160b092c3276c6a14afd1b6e2f065d3 cacti-cactid-0.8.6f_p1.ebuild 1459
 MD5 612a831c92034aceeb7afa0d6275c06e files/digest-cacti-cactid-0.8.6d-r1 71
 MD5 58c86d50c9315285ddaf0c5f24269e2d files/digest-cacti-cactid-0.8.6e 71
+MD5 c0e5c0f4c74e06f2c99e6e086be7dfd7 files/digest-cacti-cactid-0.8.6f_p1 73

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index d995a8792d2a553cad507ca364a99e78e51a68f8..73287f7e2da8dde440d3a6aca962e8f56aba1992 100644 (file)
--- 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.55 2005/09/15 21:45:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.56 2005/10/23 22:22:32 ramereth Exp $
+
+*cacti-0.8.6g_p20051023 (23 Oct 2005)
+
+  23 Oct 2005; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6g.ebuild,
+  +cacti-0.8.6g_p20051023.ebuild:
+  * Stable on x86
+  * Added new patched version for fixes
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> cacti-0.8.6f-r1.ebuild:
   Mark 0.8.6f-r1 stable on alpha

diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index c7f0611fe4ae9c49c2b0f8c963c6103de9b73956..74c3761b2d4fbc6e3b278620e4f5db8153a71677 100644 (file)
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,11 +1,13 @@
+MD5 fe08028137ed407b87ec01b687febd0a ChangeLog 8055
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
-MD5 67d3d8f00cf772beb616f18f59ec039e ChangeLog 7849
-MD5 fc7deaa26202106634402d81e0bde91f cacti-0.8.6g.ebuild 1696
+MD5 f7e701b3e5197823569f3a452d99a227 cacti-0.8.6f-r1.ebuild 1978
 MD5 9f7924c1cca1e3e091dc4bcdef67ac63 cacti-0.8.6f-r2.ebuild 1990
+MD5 c17e5c048b5ecf4635c4b0190cf2cbbe cacti-0.8.6g_p20051023.ebuild 1787
 MD5 55a8b1b00a00c05ecd18d44c3565dc42 cacti-0.8.6f.ebuild 1335
-MD5 f7e701b3e5197823569f3a452d99a227 cacti-0.8.6f-r1.ebuild 1978
+MD5 0a66195f8cbc85217a2ce7410ae6a674 cacti-0.8.6g.ebuild 1695
 MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r1 874
-MD5 5a259a769627accb5e3de215ff0f93f5 files/digest-cacti-0.8.6f 65
 MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
-MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r2 874
 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
+MD5 80642855127d3174cad394f11f138243 files/digest-cacti-0.8.6g_p20051023 346

diff --git a/net-analyzer/cacti/cacti-0.8.6g.ebuild b/net-analyzer/cacti/cacti-0.8.6g.ebuild
index 47b3a8d190a66e196bb45091536eafc1976dc574..98c767e73381d5a0a28da4e242e95d71b57f7959 100644 (file)
--- 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.1 2005/09/10 19:56:27 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6g.ebuild,v 1.2 2005/10/23 22:22:32 ramereth Exp $
 
 inherit eutils webapp
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
 #done
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE="snmp"
 
 DEPEND=""

diff --git a/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild b/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
new file mode 100644 (file)
index 0000000..0d0200d
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
@@ -0,0 +1,74 @@
+# 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 $
+
+inherit eutils webapp
+
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+# patches 
+UPSTREAM_PATCHES="short_open_tag_parse_error graph_properties_zoom
+script_server_snmp_auth mib_file_loading"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+for i in $UPSTREAM_PATCHES ; do
+       SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch"
+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
+       virtual/cron
+       virtual/php
+       virtual/httpd-php"
+
+src_unpack() {
+       unpack ${MY_P}.tar.gz ; mv ${MY_P} ${P}
+       # patches
+       for i in ${UPSTREAM_PATCHES} ; do
+               EPATCH_OPTS="-p1 -d ${S} -N" epatch ${DISTDIR}/${i}.patch
+       done ;
+}
+
+pkg_setup() {
+       webapp_pkg_setup
+       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() {
+       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/files/digest-cacti-0.8.6g_p20051023 b/net-analyzer/cacti/files/digest-cacti-0.8.6g_p20051023
new file mode 100644 (file)
index 0000000..985200f
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6g_p20051023
@@ -0,0 +1,5 @@
+MD5 b3cf31349d2db47d14dcf347b8422bc2 cacti-0.8.6g.tar.gz 1076607
+MD5 a68318191df3363e3f591bebdb08d238 short_open_tag_parse_error.patch 1818
+MD5 1c50c7167e118ca55ddd13cbece373a9 graph_properties_zoom.patch 1387
+MD5 09fbc74b3867b1bb6196d195f5fa57ac script_server_snmp_auth.patch 4911
+MD5 826201b2d96415f81d800aa32e31ee4c mib_file_loading.patch 477