Drop old.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 6 insertions, 181 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 9dab8e1ceb1f..f4262bdaf8e8 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cacti
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.178 2010/12/20 15:14:03 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.179 2011/04/01 16:06:30 pva Exp $
+
+  01 Apr 2011; Peter Volkov <pva@gentoo.org> -cacti-0.8.7e-r2.ebuild,
+  -cacti-0.8.7e-r3.ebuild:
+  Drop old.
 
   20 Dec 2010; Brent Baude <ranger@gentoo.org> cacti-0.8.7g.ebuild:
   Marking cacti-0.8.7g ppc64 for bug 324031
diff --git a/net-analyzer/cacti/cacti-0.8.7e-r2.ebuild b/net-analyzer/cacti/cacti-0.8.7e-r2.ebuild
deleted file mode 100644
index 13404263b2f1..000000000000
--- a/net-analyzer/cacti/cacti-0.8.7e-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7e-r2.ebuild,v 1.7 2010/06/01 15:22:56 josejx Exp $
-
-inherit eutils webapp 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="cli_add_graph
-		snmp_invalid_response
-		template_duplication
-		fix_icmp_on_windows_iis_servers
-		cross_site_fix
-		sql_injection_template_export"
-	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 doc"
-
-DEPEND=""
-
-need_php_cli
-need_httpd_cgi
-need_php_httpd
-
-RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 )
-	<net-analyzer/rrdtool-1.4
-	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
-
-	rm -rf lib/adodb # don't use bundled adodb
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	require_php_with_use cli mysql xml session pcre sockets
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-
-	rm LICENSE README
-	dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die
-	use doc && dohtml -r docs/html/
-	rm -rf docs
-
-	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.7e-r3.ebuild b/net-analyzer/cacti/cacti-0.8.7e-r3.ebuild
deleted file mode 100644
index 1cda1a33fc6d..000000000000
--- a/net-analyzer/cacti/cacti-0.8.7e-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7e-r3.ebuild,v 1.1 2010/07/03 13:25:29 mabi Exp $
-
-EAPI="2"
-
-inherit eutils webapp 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="cli_add_graph
-		snmp_invalid_response
-		template_duplication
-		fix_icmp_on_windows_iis_servers
-		cross_site_fix
-		sql_injection_template_export"
-	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 doc"
-
-DEPEND=""
-
-need_httpd_cgi
-
-RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 )
-	<net-analyzer/rrdtool-1.4
-	dev-php/adodb
-	virtual/mysql
-	virtual/cron
-	dev-lang/php[cli,mysql,xml,session,sockets]
-	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if [ "${HAS_PATCHES}" == "1" ] ; then
-		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
-	fi
-}
-
-src_prepare() {
-	if [ "${HAS_PATCHES}" == "1" ] ; then
-		# patches
-		for i in ${UPSTREAM_PATCHES} ; do
-			EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch
-		done ;
-	fi
-
-	sed -i -e \
-		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
-		"${S}"/include/global.php
-
-	rm -rf lib/adodb # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-
-	rm LICENSE README
-	dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die
-	use doc && dohtml -r docs/html/
-	rm -rf docs
-
-	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
-}