Added official upstream patch. Cleaned out php4 stuff. Removed bundled-adodb USE flag, thank Donnie Berkholz for kind review. Removed old and unused ebuilds.

(Portage version: 2.1.4.4)

3 files changed, 18 insertions, 117 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index d82994a7a56d..675952c0faa3 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,14 @@
 # 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.133 2008/02/26 14:40:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.134 2008/03/03 18:50:54 pva Exp $
+
+*cacti-0.8.7b-r1 (03 Mar 2008)
+
+  03 Mar 2008; <pva@gentoo.org> -cacti-0.8.6j-r7.ebuild,
+  -cacti-0.8.7a-r2.ebuild, +cacti-0.8.7b-r1.ebuild:
+  Added official upstream patch. Cleaned out php4 stuff. Removed bundled-adodb
+  USE flag, thank Donnie Berkholz for kind review. Removed old and unused
+  ebuilds.
 
   26 Feb 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7b.ebuild:
   alpha/sparc stable wrt #210840
diff --git a/net-analyzer/cacti/cacti-0.8.6j-r7.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r7.ebuild
deleted file mode 100644
index 1922c416e581..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6j-r7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.6j-r7.ebuild,v 1.6 2008/01/22 23:43:13 ranger 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
-					  graph_debug_lockup_fix
-					  snmpwalk_fix
-					  sec_sql_injection-0.8.6j"
-	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
-
-	epatch "${FILESDIR}/${P}"-dos-large-values.patch
-
-	use bundled-adodb || sed -i -e \
-	's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
-	"${S}"/include/config.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
-}
diff --git a/net-analyzer/cacti/cacti-0.8.7a-r2.ebuild b/net-analyzer/cacti/cacti-0.8.7b-r1.ebuild
index b2a1de2d7f03..dea5f0620863 100644
--- a/net-analyzer/cacti/cacti-0.8.7a-r2.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.7b-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7a-r2.ebuild,v 1.1 2008/02/13 13:00:08 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7b-r1.ebuild,v 1.1 2008/03/03 18:50:54 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -14,9 +14,7 @@ SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 # patches
 if [ "${HAS_PATCHES}" == "1" ] ; then
-	UPSTREAM_PATCHES="graph-issue-wrra-specs
-					cmd-php-non-unique-hosts
-					multiple_vulnerabilities-0.8.7a"
+	UPSTREAM_PATCHES="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
@@ -24,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp bundled-adodb"
+IUSE="snmp"
 
 DEPEND=""
 
@@ -35,7 +33,7 @@ need_php_httpd
 RDEPEND="!apache2? ( www-servers/lighttpd )
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
-	!bundled-adodb? ( dev-php/adodb )
+	dev-php/adodb
 	virtual/mysql
 	virtual/cron"
 
@@ -51,21 +49,15 @@ src_unpack() {
 		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
+	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}
+	require_php_with_use cli mysql xml session pcre sockets
 }
 
 src_compile() {
@@ -78,7 +70,7 @@ src_install() {
 	rm LICENSE README
 	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
 	rm -rf docs
-	use bundled-adodb || rm -rf lib/adodb
+	rm -rf lib/adodb
 
 	edos2unix `find -type f -name '*.php'`