[gentoo-commits] gentoo-x86 commit in net-analyzer/cacti: ChangeLog cacti-0.8.6j-r6.ebuild cacti-0.8.7-r1.ebuild

[Peter Volkov (pva)]

pva         07/11/03 18:53:22

  Modified:             ChangeLog cacti-0.8.6j-r6.ebuild
  Added:                cacti-0.8.7-r1.ebuild
  Log:
  Added patches from upstream, fix bug #194166, small changes in 0.8.6j-r6 to shut up repoman.
  (Portage version: 2.1.3.16)

Revision  Changes    Path
1.113                net-analyzer/cacti/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/ChangeLog?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/ChangeLog?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/ChangeLog?r1=1.112&r2=1.113

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog	29 Oct 2007 15:03:46 -0000	1.112
+++ ChangeLog	3 Nov 2007 18:53:22 -0000	1.113
@@ -1,6 +1,13 @@
 # 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.112 2007/10/29 15:03:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.113 2007/11/03 18:53:22 pva Exp $
+
+*cacti-0.8.7-r1 (03 Nov 2007)
+
+  03 Nov 2007; <pva@g.o> cacti-0.8.6j-r6.ebuild,
+  +cacti-0.8.7-r1.ebuild:
+  Added patches from upstream, fix bug #194166, small changes in 0.8.6j-r6 to
+  shut up repoman.
 
 *cacti-0.8.7 (29 Oct 2007)
 



1.12                 net-analyzer/cacti/cacti-0.8.6j-r6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild?r1=1.11&r2=1.12

Index: cacti-0.8.6j-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti-0.8.6j-r6.ebuild	19 Jul 2007 13:27:37 -0000	1.11
+++ cacti-0.8.6j-r6.ebuild	3 Nov 2007 18:53:22 -0000	1.12
@@ -1,6 +1,6 @@
 # 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-r6.ebuild,v 1.11 2007/07/19 13:27:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild,v 1.12 2007/11/03 18:53:22 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -79,9 +79,7 @@
 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



1.1                  net-analyzer/cacti/cacti-0.8.7-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.7-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.7-r1.ebuild?rev=1.1&content-type=text/plain

Index: cacti-0.8.7-r1.ebuild
===================================================================
# 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.7-r1.ebuild,v 1.1 2007/11/03 18:53:22 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="graph_create_xml_warning
					  sec_sql_injection-0.8.7"
	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

RDEPEND="!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":"adodb/adodb.inc.php":' \
	"${S}"/include/global.php
}

pkg_setup() {
	webapp_pkg_setup
	has_php
	if [ $PHP_VERSION = 5 ] ; then
		phpUseFlags="cli mysql xml session pcre"
	elif [ $PHP_VERSION = 4 ] ; then
		phpUseFlags="cli mysql xml session pcre expat"
	fi
	use bundled-adodb || phpUseFlags="${phpUseFlags} sockets"
	require_php_with_use ${phpUseFlags}
}

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
	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
}



-- 
gentoo-commits@g.o mailing list