Another patch from upstream, finally it applies correctly.

Package-Manager: portage-2.1.4.4

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 675952c0faa3dd31821d5fb1a9a3d1649dc8ea3c..bdc8d6e4b6668c9762bbd52d03a06d1e9ea9f1cd 100644 (file)
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.134 2008/03/03 18:50:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.135 2008/03/07 16:44:03 pva Exp $
+
+*cacti-0.8.7b-r2 (07 Mar 2008)
+
+  07 Mar 2008; <pva@gentoo.org> +cacti-0.8.7b-r2.ebuild:
+  Another patch from upstream, finally it applies correctly.
 
 *cacti-0.8.7b-r1 (03 Mar 2008)
 

diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 1102beffb368c2cece361b39149c54619d8baef4..604ac6091bb3f86bb583b8fe66b4eb594b3c34fb 100644 (file)
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -10,8 +10,10 @@ DIST snmp_auth_none_notice.patch 527 RMD160 3b29b0928babf1df9019691b494c0eab50a7
 DIST snmpwalk_fix.patch 1056 RMD160 ba1a70dc95ceba6f5716dd8d8351db4a400abcc3 SHA1 e5cb384b87224e26e31063d13bb15e0bea12383c SHA256 ecf344ff6674306c52f6bbeea621d56310444ad12f679202b0de141485429106
 DIST thumbnail_graphs_not_working.patch 1515 RMD160 6b228cab1bc99b3f20ddb4e1d45b467fc8dadf35 SHA1 3684fe33e37105c719c59bd3ba7e1aaf2795c9a8 SHA256 3b18602aed1aa8b9773a75a4e89413cd12ce2670fd185eae113de1aa2c1186bd
 DIST tree_console_missing_hosts.patch 771 RMD160 d33f3916317e989b379d1188f3ed23b7d61a7a9e SHA1 bccc1293567c9160971537a3cbbf69ab0ca9cf81 SHA256 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180
+DIST upgrade_from_086k_fix.patch 847 RMD160 ab5da2f9ae47a6affd4ff0ec1473a5193353df61 SHA1 105309cc259f80e17e550d53384b125782b02b9f SHA256 9385e019c25d5638a39b10a3afd7ee375d8de911d713a6c79443053419af7ec4
 EBUILD cacti-0.8.6j-r8.ebuild 2508 RMD160 18ade21d0f57b202d6f8c60177a770f9f5f5ad13 SHA1 705d85857d3373b47b24c666211e4c5a112fd38e SHA256 1d249406491a8025cf957cab5ac263045d7c951e9d7d41035c80b91d7e95bb4e
 EBUILD cacti-0.8.7b-r1.ebuild 1997 RMD160 7e827cf22fa43a822ccc6b37092ca83857f0b69d SHA1 b1861acc30554ae901391dddcff2e2f5fc9dc397 SHA256 56f11f91710649c0c89686c6cb90cdf0190eb16c232becf8e5b8bbef1c3769b5
+EBUILD cacti-0.8.7b-r2.ebuild 2024 RMD160 98ac848b46b36cf2d40d388b89cc21753abe4246 SHA1 52228799e2acc610edaeed33c04102bf593cbf92 SHA256 24d69ed5be5e3c83818e7b6a6f7c7a16372bde9bed91a2514ef7b1505ad41bd3
 EBUILD cacti-0.8.7b.ebuild 2246 RMD160 4c5bad414f811a6222cf54da1eafd2a03709c8fa SHA1 3c317ae02747f92e1b474cfba9e31e63f73c91e3 SHA256 93e3a321b934431cb56ed8eaa456a190d177d9b3524cbfca9df5a15ccfc72982
-MISC ChangeLog 19732 RMD160 0a15599381e4a10486b43b2f868fe8e1e0093116 SHA1 35065f920ff1aa989a737898497707727103778b SHA256 1cec9a8ac49ba630709da80610efeeae417aabcc6641ff00a304990becb36450
+MISC ChangeLog 19883 RMD160 89200259b8c68d2f990b250b3260e3d470f9aa01 SHA1 da32dc1a68e58da719b539a7e8d4574c54a44d6a SHA256 26cac5e2b309fb1f66205c3333dd78803b81b34d06b15095dcfd88374201f71f
 MISC metadata.xml 735 RMD160 d1e8474cb11fdd1d140f1b20c2e1ffc4b23ab330 SHA1 5a41b6f664ee7414c13bf4b38c3bf99a8e3cb6c7 SHA256 d9b5280fb57b197cefec501e8d93fbe9d0a21531d60cd4e2ce3ce8a5ec17eda6

diff --git a/net-analyzer/cacti/cacti-0.8.7b-r2.ebuild b/net-analyzer/cacti/cacti-0.8.7b-r2.ebuild
new file mode 100644 (file)
index 0000000..5612bc6
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.7b-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7b-r2.ebuild,v 1.1 2008/03/07 16:44:03 pva Exp $
+
+inherit eutils webapp depend.apache depend.php
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+HAS_PATCHES=1
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+# patches
+if [ "${HAS_PATCHES}" == "1" ] ; then
+       UPSTREAM_PATCHES="upgrade_from_086k_fix
+                                       snmp_auth_none_notice"
+       for i in $UPSTREAM_PATCHES ; do
+               SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch"
+       done
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp"
+
+DEPEND=""
+
+want_apache
+need_php_cli
+need_php_httpd
+
+RDEPEND="!apache2? ( www-servers/lighttpd )
+       snmp? ( net-analyzer/net-snmp )
+       net-analyzer/rrdtool
+       dev-php/adodb
+       virtual/mysql
+       virtual/cron"
+
+src_unpack() {
+       if [ "${HAS_PATCHES}" == "1" ] ; then
+               unpack ${MY_P}.tar.gz
+               [ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
+               # patches
+               for i in ${UPSTREAM_PATCHES} ; do
+                       EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch
+               done ;
+       else
+               unpack ${MY_P}.tar.gz
+       fi
+
+       sed -i -e \
+               's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+               "${S}"/include/global.php
+}
+
+pkg_setup() {
+       webapp_pkg_setup
+       has_php
+       require_php_with_use cli mysql xml session pcre sockets
+}
+
+src_compile() {
+       einfo "Nothing to compile."
+}
+
+src_install() {
+       webapp_src_preinst
+
+       rm LICENSE README
+       dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
+       rm -rf docs
+       rm -rf lib/adodb
+
+       edos2unix `find -type f -name '*.php'`
+
+       dodir ${MY_HTDOCSDIR}
+       cp -r . "${D}"${MY_HTDOCSDIR}
+
+       webapp_serverowned ${MY_HTDOCSDIR}/rra
+       webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
+       webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+       webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+       webapp_src_install
+}