From c31b192301c282d388f48863ffe04733921c0019 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Tue, 27 Feb 2007 15:14:18 +0000 Subject: [PATCH] Use external adodb instead of bundled with package if bundeled-adodb USE flag is off. Thank Francisco Javier for report. Package-Manager: portage-2.1.2-r9 --- net-analyzer/cacti/ChangeLog | 8 +- net-analyzer/cacti/Manifest | 15 ++- net-analyzer/cacti/cacti-0.8.6j-r3.ebuild | 98 +++++++++++++++++++ .../cacti/files/digest-cacti-0.8.6j-r3 | 12 +++ 4 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 net-analyzer/cacti/cacti-0.8.6j-r3.ebuild create mode 100644 net-analyzer/cacti/files/digest-cacti-0.8.6j-r3 diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog index 64bfbeb9c54a..d7cec34ce13e 100644 --- a/net-analyzer/cacti/ChangeLog +++ b/net-analyzer/cacti/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/cacti # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.88 2007/02/26 06:53:27 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.89 2007/02/27 15:14:18 pva Exp $ + +*cacti-0.8.6j-r3 (27 Feb 2007) + + 27 Feb 2007; +cacti-0.8.6j-r3.ebuild: + Use external adodb instead of bundled with package if bundeled-adodb USE + flag is off. Thank Francisco Javier for report. *cacti-0.8.6j-r2 (26 Feb 2007) diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index 259facbe62c1..c28dd0194f6c 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -19,10 +19,14 @@ EBUILD cacti-0.8.6j-r2.ebuild 2153 RMD160 3b1c0148dfcfa015671eea1e8e468dcd52ead6 MD5 9613b94a237904b1c62e04298d932af2 cacti-0.8.6j-r2.ebuild 2153 RMD160 3b1c0148dfcfa015671eea1e8e468dcd52ead627 cacti-0.8.6j-r2.ebuild 2153 SHA256 624eb035123d8a79a0c0a401394776cb27fdefdd40cdae5a5915db4a657cbc62 cacti-0.8.6j-r2.ebuild 2153 -MISC ChangeLog 13101 RMD160 fa9d53a0ba22287161f4f5629ee2ec37f14a0834 SHA1 014a057e48dde165113a562787d7f12f0db5aaaf SHA256 701c0d58ea576f43866a26f79f5b378fba6507936ad5f8779ddfdd3a956345f7 -MD5 3d35415a30396542bc98e885eea5cb6f ChangeLog 13101 -RMD160 fa9d53a0ba22287161f4f5629ee2ec37f14a0834 ChangeLog 13101 -SHA256 701c0d58ea576f43866a26f79f5b378fba6507936ad5f8779ddfdd3a956345f7 ChangeLog 13101 +EBUILD cacti-0.8.6j-r3.ebuild 2477 RMD160 9879338f282d165bc000e46a592aedbe6107dc7e SHA1 7727c4038642d78168791b39f1c8d8c009a19e2c SHA256 1a1b3ee50f5159e0989e4d1b064c752ecbbce18d6e41b12e8b9bfe26d23bd623 +MD5 ec6e0cacce11291403bdc2e8ab2ff366 cacti-0.8.6j-r3.ebuild 2477 +RMD160 9879338f282d165bc000e46a592aedbe6107dc7e cacti-0.8.6j-r3.ebuild 2477 +SHA256 1a1b3ee50f5159e0989e4d1b064c752ecbbce18d6e41b12e8b9bfe26d23bd623 cacti-0.8.6j-r3.ebuild 2477 +MISC ChangeLog 13339 RMD160 64ffbed22d4485c1178d1639f8b169a661601285 SHA1 9cb9a01a556335ad82b74a6b7ec0b588c8e890cd SHA256 ac809088febdcf661ed240abce006c64fce0b2763f1335b47de3f82b3b93b3a3 +MD5 65411f674e6d028b006538d64367d8f7 ChangeLog 13339 +RMD160 64ffbed22d4485c1178d1639f8b169a661601285 ChangeLog 13339 +SHA256 ac809088febdcf661ed240abce006c64fce0b2763f1335b47de3f82b3b93b3a3 ChangeLog 13339 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743 @@ -33,3 +37,6 @@ SHA256 db0b3cfd6c831c8368801968daf70e8868b73802b120af351e2ea0741ab61a2d files/di MD5 b3423859331f217ba597ee4516502268 files/digest-cacti-0.8.6j-r2 1066 RMD160 a2ea6b39f15b24dde13c23ccf5fbcf8be12ea5df files/digest-cacti-0.8.6j-r2 1066 SHA256 d3689347a3bbe22515239e9b39630c407ec40c241a58ffd8fe43d24016d18e23 files/digest-cacti-0.8.6j-r2 1066 +MD5 b3423859331f217ba597ee4516502268 files/digest-cacti-0.8.6j-r3 1066 +RMD160 a2ea6b39f15b24dde13c23ccf5fbcf8be12ea5df files/digest-cacti-0.8.6j-r3 1066 +SHA256 d3689347a3bbe22515239e9b39630c407ec40c241a58ffd8fe43d24016d18e23 files/digest-cacti-0.8.6j-r3 1066 diff --git a/net-analyzer/cacti/cacti-0.8.6j-r3.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r3.ebuild new file mode 100644 index 000000000000..80f1843443a2 --- /dev/null +++ b/net-analyzer/cacti/cacti-0.8.6j-r3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r3.ebuild,v 1.1 2007/02/27 15:14:18 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="ping_php_version4_snmpgetnext + tree_console_missing_hosts + thumbnail_graphs_not_working" + 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 bundled-adodb" + +DEPEND="" + +want_apache +need_php_cli +need_php_httpd + +# alpha doesn't have lighttpd keyworded yet +# sparc doesn't have a stable keyword for lighttpd yet +RDEPEND="!alpha? ( !sparc? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) ) ) + snmp? ( net-analyzer/net-snmp ) + net-analyzer/rrdtool + !bundled-adodb? ( 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 + + use bundled-adodb || sed -i -e \ + 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"/usr/share/php/adodb/adodb.inc.php":' \ + "${S}"/include/config.php || die "Adodb sed failed." +} + +pkg_setup() { + webapp_pkg_setup + has_php + if [ $PHP_VERSION = 5 ] ; then + require_php_with_use cli mysql xml + elif [ $PHP_VERSION = 4 ] ; then + require_php_with_use cli mysql xml expat + fi + use bundled-adodb || require_php_with_use sockets +} + +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 + use bundled-adodb || 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 +} + diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r3 b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r3 new file mode 100644 index 000000000000..7bc03c5a5855 --- /dev/null +++ b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r3 @@ -0,0 +1,12 @@ +MD5 29436be46b289d13dfce48e7618129e2 cacti-0.8.6j.tar.gz 1126337 +RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe cacti-0.8.6j.tar.gz 1126337 +SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46 cacti-0.8.6j.tar.gz 1126337 +MD5 bedf583646e59dd628d4aced7e83fdf3 ping_php_version4_snmpgetnext.patch 1262 +RMD160 94882973199b8e59c40ad43a132548862654f312 ping_php_version4_snmpgetnext.patch 1262 +SHA256 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170 ping_php_version4_snmpgetnext.patch 1262 +MD5 1a3c9580a1f94d991502c8650d18b617 thumbnail_graphs_not_working.patch 1515 +RMD160 6b228cab1bc99b3f20ddb4e1d45b467fc8dadf35 thumbnail_graphs_not_working.patch 1515 +SHA256 3b18602aed1aa8b9773a75a4e89413cd12ce2670fd185eae113de1aa2c1186bd thumbnail_graphs_not_working.patch 1515 +MD5 109afedcd49dc173da8c27fb23c322fe tree_console_missing_hosts.patch 771 +RMD160 d33f3916317e989b379d1188f3ed23b7d61a7a9e tree_console_missing_hosts.patch 771 +SHA256 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180 tree_console_missing_hosts.patch 771 -- 2.26.2