Drop old.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 7 insertions, 191 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/Manifest b/net-analyzer/cacti/Manifest
index 928efe00bb3e..087d0e1414f3 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,21 +1,12 @@
 AUX postinstall-en.txt 2249 RMD160 2703588d7971022699b58b2e5a113ab970124f4d SHA1 8c34cadfe75d1bca0eaaae66a5981f0ab575ea3f SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d
-DIST cacti-0.8.7e.tar.gz 2232297 RMD160 b6e4bb937e69337113d014d4a802455a852e7baf SHA1 6ba93e200e0fbbddfbc5a9a98a9cf0f70842d904 SHA256 1983f16cd5cf5e30b33b43b167e324713f0711167f5dcde57f3cbfbeddbaa7ff
 DIST cacti-0.8.7g.tar.gz 2236916 RMD160 4972f1fe2787925da6a1f0f71990ff4f5e74df7f SHA1 a5a710653e158b1bc950de0a1e2c60ee364bf782 SHA256 d09b3bf54f51bd42b2db0a62521cf6e408716978f75d6509ec56027c49c44585
-DIST cli_add_graph.patch 556 RMD160 21f5ddca4bc22ed7208d468c07c2feba0873e2b2 SHA1 a3eee5b56c2c99fe8a800904572be2fbaf0f3049 SHA256 504af2148efab2699e4cdc17581e8555d1a5d40dfbd30a316e7637378a6c6f11
-DIST cross_site_fix.patch 8705 RMD160 96b72fcc2e17fb0ecd622f4fb627a5ff67f94be2 SHA1 3cf067a88b0c2d4348c88d37c98312760d1f1efe SHA256 75b7d4687722d96e0d32afb3832f93a54e8518c0c949e1dcd9ae634623564b28
 DIST data_source_deactivate.patch 510 RMD160 92c634ba94e0e268a6cbfe299de62e4205ddba17 SHA1 27bb624280ad74cbede70da8984fb28b342b5c2b SHA256 52155c5ca38a8df1adcc8a5b4d0bc1b4befa7ede4c56d10dba64cbde2c54042e
-DIST fix_icmp_on_windows_iis_servers.patch 2997 RMD160 176a28cff430e79433dee4b54aac736548a6cda2 SHA1 466936d06e7a7e4d882b2375ae0cac9dc6434ab1 SHA256 5dd61a9accd5a2872d8efa03bb6b7e49c735568094286a1664f2ae4491ecdeeb
 DIST graph_list_view.patch 7636 RMD160 24df29f9e1c6bff6b7dfc6617770eccfa0ec60ba SHA1 80dbfc9fdb206845726102cee529b221592b91d3 SHA256 e43b2cf3c53029880ac16a9b86036d5136ab2de116bfba868fac2abd2ed14778
 DIST html_output.patch 7317 RMD160 2f4e418ae9dd0fea0471fbdb5f899d6308599554 SHA1 f4c98092fbdf894f667be419dd114da47a6abf67 SHA256 276811704d6f4353542461c04a2561721bcc784326feefff460fae45c3849278
 DIST ldap_group_authenication.patch 591 RMD160 8d1a72bf0a0e27d95acd70ec3bdea678b2b356c0 SHA1 7fdedb203493ea139f2590ccd38840e108705ef4 SHA256 413a781c5aaa4c6ce8eb152f1ecbeb87c4efa5623c5b839c9c5103b6db6e0989
 DIST ping.patch 1033 RMD160 32946f8a0fa169fd711a2ff1c292e5022e772211 SHA1 23e5844a311bd5549d71bf784366d7e4969a4f41 SHA256 63c56b55aaf41a5e10908bb8ecffb47f74e11254d7e46223d8d04a9df48eda5e
 DIST poller_interval.patch 5852 RMD160 06a6edbb80c4c05ec00cf17340a68252e8b26b27 SHA1 2764aad8ab9335c105e5aa8e3fb9f80b9a2bcb9d SHA256 64a6748573395956565c9886cc999a92655ad7f5ba62c53b3299d047912d3aaf
 DIST script_server_command_line_parse.patch 3038 RMD160 b87ecd44d0d31ceead87e67447990407d84fbeb5 SHA1 72b35e1b7388062301ed8c8bed99b98dec62bd22 SHA256 40c8ad2dcc6664360ee9941849d7fff1c136e1d942f7ba2a2ea602da20a39e56
-DIST snmp_invalid_response.patch 921 RMD160 02d1f7fc63473fefbfee9a2edc020f5ec960d103 SHA1 8308f02d69ac3fb1a2ced5ad66c6c5c2078fc75f SHA256 4259979a2d9fdc51a6ef3a88368fe97adace3a7f1c3b895dea61757de9822db8
-DIST sql_injection_template_export.patch 636 RMD160 b62eb338359ea666aa72b5cff4a84d47ec88223e SHA1 d64c9173d1a66ef4b47487ee089050a664f58f97 SHA256 cdcec3946e81edde690b34627c52620bb702de0a3a823bcb571f421b093effed
-DIST template_duplication.patch 9190 RMD160 ba1d35cc207484b17c30044bb9f025ed6281c37b SHA1 27f3ee2eb37bd3c9430933cf00a30e63b2b05829 SHA256 c6ab6d2396f6b6519607f7908df642a575d32a75430e2b74381a6046d57f8ad9
-EBUILD cacti-0.8.7e-r2.ebuild 2114 RMD160 83366dce807d276876e98d0cbd5cdc4890a3a8b4 SHA1 1bf6db92d0dfc0742d414079d6b4a5b008886a97 SHA256 ec44680716ef713c0d3ff84ed1a77a885d69791cc38e2657f2f60958738ed556
-EBUILD cacti-0.8.7e-r3.ebuild 2127 RMD160 353217e1349c7085763b656cddc9395e8be0eae8 SHA1 e5d928f16fb14f1576c8f62331d089246b08a722 SHA256 dbc246ad5338c1474210a32ccd2b59e813a65a3209e363d1491352bccaa9eab2
 EBUILD cacti-0.8.7g.ebuild 2112 RMD160 698aea63163d9466fc5fa0700fdb70fe359a64be SHA1 6ee618bf59ae3a9f5e33bedf0b2a23418ef501b4 SHA256 46c31fdae7c68d06d7f411a9c46c5655a4046d94ed40e7f94fe9cf9370e29364
-MISC ChangeLog 25587 RMD160 c9b2cd54adbe2d9fe33e66dceddabfeab6e4ec23 SHA1 beb23f3992b21a32240525cb496a25a7941df1df SHA256 02a35d97f48d88c14d37db3a5e92820dcf803c7149e3adbb1b4ae8b42580b830
+MISC ChangeLog 25694 RMD160 79dd26f74f026cdad3ffe1b98df7bfe82a701af1 SHA1 f70c8dc8fc59f70b8c86c6250585b2ae0326e1ca SHA256 1976b61419653099464313c3386e49c427e4e36aeef90dc27169e7b675b61c38
 MISC metadata.xml 803 RMD160 b497804bac33062b7f13330acef0ef28bea19f65 SHA1 031e32c4f5ffe0fc67943674530e880d02f5f2a0 SHA256 db81b920eb3683d9e4fc323bb2399156dfc4a8a0f5d4874505e0c1891dd17819
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
-}