Drop net-analyzer/cacti as I haven't touched it in a long time.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>

9 files changed, 0 insertions, 616 deletions

diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
deleted file mode 100644
index d2f1420..0000000
--- a/net-analyzer/cacti/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cacti-0.8.8a.tar.gz 2273280 SHA256 9fea2b6c438ebf2740b5982a6ff7cfd2816e48ea88a347ef0ef238c7b4875955 SHA512 186df9d208a7726f7cfa6f4d6fff6faf17235ccd5f365a92f064be550b2d8274fba1d269eca0f18c4e4617f75d714ac4cb1db9d5a23504a38173182b01b7d1dc WHIRLPOOL 651b2778fb44dabbce3b56a29a4a2754fabbc70e38382743cff81eddbccf60e3193a48ce1eda4dfd3f2bc7977bca5a5186bf4726831132f50741be549bca991d
-DIST cacti-0.8.8b.tar.gz 2272130 SHA256 ef0e2a813139e0b4c2e066f0fdae1f4ad086bef0aa23446055df6331cb1af98c SHA512 98b216f3beb8e90dc554a16ca07cc8b3c9e247335786d8b5e76001d7293251a8a6e03bbe2464f7e9f8e0721359e7cd4a40615dd93ac7b1cc0bec507f01fa24c1 WHIRLPOOL 60a1cd0f7b80bf7dbef336a3cf76797ec1d29c10a91bbfabce71be30e23c5f8f1c750ce0f582c45d8bba5498e19dc824fbb0347b56735b842c4fea362086b86c
-DIST snmpv3_priv_proto_none.patch 1407 SHA256 8d48d9cf89f2ba47a6dbce884ab3f3c164b52ed4771b8b76c656a3ae967211f8 SHA512 d678dc0dcde509358fbe38fcf3649d5c4569b9b5b7d34b9e739664592060bbaa28f753c0de47548bbc169b4de42d097fb6338ac68465fe49b41bfad108bfc0f4 WHIRLPOOL 902282412047ddacde750ab553c65062e455a793f06d3f3190800edda6b860886207f32c9cb7b18377fd971f885ea8c6511b4fd489a3ac85bea9117bf681441a
diff --git a/net-analyzer/cacti/cacti-0.8.8a.ebuild b/net-analyzer/cacti/cacti-0.8.8a.ebuild
deleted file mode 100644
index 1647bf5..0000000
--- a/net-analyzer/cacti/cacti-0.8.8a.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit depend.php eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-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
-UPSTREAM_PATCHES="snmpv3_priv_proto_none"
-if [[ -n ${UPSTREAM_PATCHES} ]]; then
-	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 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-DEPEND=""
-RDEPEND="
-	dev-lang/php[cli,mysql,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool
-	virtual/cron
-	virtual/mysql
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if [[ -n ${UPSTREAM_PATCHES} ]]; then
-		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
-	fi
-}
-
-src_prepare() {
-	if [[ -n ${UPSTREAM_PATCHES} ]]; then
-		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 || die
-
-	rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-
-	rm LICENSE README || die
-	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.8b-r1.ebuild b/net-analyzer/cacti/cacti-0.8.8b-r1.ebuild
deleted file mode 100644
index 41c8e58..0000000
--- a/net-analyzer/cacti/cacti-0.8.8b-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit depend.php eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-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
-UPSTREAM_PATCHES=""
-if [[ -n ${UPSTREAM_PATCHES} ]]; then
-	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 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-DEPEND=""
-RDEPEND="
-	dev-lang/php[cli,mysql,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool
-	virtual/cron
-	virtual/mysql
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	if [[ -n ${UPSTREAM_PATCHES} ]]; then
-		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
-	fi
-}
-
-src_prepare() {
-	# Patch to address http://bugs.cacti.net/view.php?id=2383
-	# Fixes bug 482424 (CVE-2013-5588, CVE-2013-5589)
-	epatch "${FILESDIR}/${PN}-r7420.patch"
-
-	if [[ -n ${UPSTREAM_PATCHES} ]]; then
-		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 || die
-
-	rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-
-	rm LICENSE README || die
-	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.8b-r2.ebuild b/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
deleted file mode 100644
index d162f47..0000000
--- a/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit depend.php eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-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
-UPSTREAM_PATCHES=""
-if [[ -n ${UPSTREAM_PATCHES} ]]; then
-	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 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-DEPEND=""
-RDEPEND="
-	dev-lang/php[cli,mysql,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool
-	virtual/cron
-	virtual/mysql
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	if [[ -n ${UPSTREAM_PATCHES} ]]; then
-		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
-	fi
-}
-
-src_prepare() {
-	# Patch to address http://bugs.cacti.net/view.php?id=2383
-	# Fixes bug 482424 (CVE-2013-5588, CVE-2013-5589)
-	epatch "${FILESDIR}/${PN}-r7420.patch"
-
-	# Patch to address a regression on preview mode on 0.8.8b
-	# http://forums.cacti.net/viewtopic.php?f=21&t=50645
-	epatch "${FILESDIR}/${P}_empty_comment.patch"
-
-	if [[ -n ${UPSTREAM_PATCHES} ]]; then
-		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 || die
-
-	rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-
-	rm LICENSE README || die
-	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.8b.ebuild b/net-analyzer/cacti/cacti-0.8.8b.ebuild
deleted file mode 100644
index bcab49f..0000000
--- a/net-analyzer/cacti/cacti-0.8.8b.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit depend.php eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-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
-UPSTREAM_PATCHES=""
-if [[ -n ${UPSTREAM_PATCHES} ]]; then
-	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 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-DEPEND=""
-RDEPEND="
-	dev-lang/php[cli,mysql,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool
-	virtual/cron
-	virtual/mysql
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if [[ -n ${UPSTREAM_PATCHES} ]]; then
-		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
-	fi
-}
-
-src_prepare() {
-	if [[ -n ${UPSTREAM_PATCHES} ]]; then
-		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 || die
-
-	rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-
-	rm LICENSE README || die
-	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/files/cacti-0.8.8b_empty_comment.patch b/net-analyzer/cacti/files/cacti-0.8.8b_empty_comment.patch
deleted file mode 100644
index ca1d81a..0000000
--- a/net-analyzer/cacti/files/cacti-0.8.8b_empty_comment.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P cacti088
-Index: lib/rrd.php
-===================================================================
---- lib/rrd.php	(Revision 7407)
-+++ lib/rrd.php	(Arbeitskopie)
-@@ -1343,20 +1343,20 @@
- 		$need_rrd_nl = TRUE;
- 
- 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
-+			# perform variable substitution first (in case this will yield an empty results or brings command injection problems)
-+			$comment_arg = rrd_substitute_host_query_data($graph_variables["text_format"][$graph_item_id], $graph, $graph_item);
-+			# next, compute the argument of the COMMENT statement and perform injection counter measures
-+			if (trim($comment_arg) == '') { # an empty COMMENT must be treated with care
-+				$comment_arg = cacti_escapeshellarg(' ' . $hardreturn[$graph_item_id]);
-+			} else {
-+				$comment_arg = cacti_escapeshellarg($comment_arg . $hardreturn[$graph_item_id]);
-+			}
-+
-+			# create rrdtool specific command line
- 			if (read_config_option("rrdtool_version") != "rrd-1.0.x") {
--				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":" . str_replace(":", "\:", cacti_escapeshellarg($graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id])) . " ";
--				if (trim($comment_string) == 'COMMENT:"\n"') {
--					$txt_graph_items .= 'COMMENT:" \n"'; # rrdtool will skip a COMMENT that holds a NL only; so add a blank to make NL work
--				} else if (trim($comment_string) != "COMMENT:\"\"") {
--					$txt_graph_items .= rrd_substitute_host_query_data($comment_string, $graph, $graph_item);
--				}
-+				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":" . str_replace(":", "\:", $comment_arg) . " ";
- 			}else {
--				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":" . cacti_escapeshellarg($graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id]) . " ";
--				if (trim($comment_string) == 'COMMENT:"\n"') {
--					$txt_graph_items .= 'COMMENT:" \n"'; # rrdtool will skip a COMMENT that holds a NL only; so add a blank to make NL work
--				} else if (trim($comment_string) != "COMMENT:\"\"") {
--					$txt_graph_items .= rrd_substitute_host_query_data($comment_string, $graph, $graph_item);
--				}
-+				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":" . $comment_arg . " ";
- 			}
- 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
- 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */
diff --git a/net-analyzer/cacti/files/cacti-r7420.patch b/net-analyzer/cacti/files/cacti-r7420.patch
deleted file mode 100644
index 55a244e..0000000
--- a/net-analyzer/cacti/files/cacti-r7420.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Index: cacti-0.8.8b/host.php
-===================================================================
---- cacti-0.8.8b/host.php	(revision 7419)
-+++ cacti-0.8.8b/host.php	(revision 7420)
-@@ -149,6 +149,9 @@
- 		if ($_POST["snmp_version"] == 3 && ($_POST["snmp_password"] != $_POST["snmp_password_confirm"])) {
- 			raise_message(4);
- 		}else{
-+			input_validate_input_number(get_request_var_post("id"));
-+			input_validate_input_number(get_request_var_post("host_template_id"));
-+
- 			$host_id = api_device_save($_POST["id"], $_POST["host_template_id"], $_POST["description"],
- 				trim($_POST["hostname"]), $_POST["snmp_community"], $_POST["snmp_version"],
- 				$_POST["snmp_username"], $_POST["snmp_password"],
-Index: cacti-0.8.8b/lib/api_device.php
-===================================================================
---- cacti-0.8.8b/lib/api_device.php	(revision 7419)
-+++ cacti-0.8.8b/lib/api_device.php	(revision 7420)
-@@ -107,7 +107,7 @@
- 		$_host_template_id = db_fetch_cell("select host_template_id from host where id=$id");
- 	}
- 
--	$save["id"] = $id;
-+	$save["id"]                   = form_input_validate($id, "id", "^[0-9]+$", false, 3);
- 	$save["host_template_id"]     = form_input_validate($host_template_id, "host_template_id", "^[0-9]+$", false, 3);
- 	$save["description"]          = form_input_validate($description, "description", "", false, 3);
- 	$save["hostname"]             = form_input_validate(trim($hostname), "hostname", "", false, 3);
-Index: cacti-0.8.8b/install/index.php
-===================================================================
---- cacti-0.8.8b/install/index.php	(revision 7419)
-+++ cacti-0.8.8b/install/index.php	(revision 7420)
-@@ -310,27 +310,28 @@
- }
- 
- /* pre-processing that needs to be done for each step */
--if (empty($_REQUEST["step"])) {
--	$_REQUEST["step"] = 1;
--}else{
--	if ($_REQUEST["step"] == "1") {
--		$_REQUEST["step"] = "2";
--	}elseif (($_REQUEST["step"] == "2") && ($_REQUEST["install_type"] == "1")) {
--		$_REQUEST["step"] = "3";
--	}elseif (($_REQUEST["step"] == "2") && ($_REQUEST["install_type"] == "3")) {
--		$_REQUEST["step"] = "8";
--	}elseif (($_REQUEST["step"] == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) {
--		$_REQUEST["step"] = "9";
--	}elseif ($_REQUEST["step"] == "8") {
--		$_REQUEST["step"] = "3";
--	}elseif ($_REQUEST["step"] == "9") {
--		$_REQUEST["step"] = "3";
--	}elseif ($_REQUEST["step"] == "3") {
--		$_REQUEST["step"] = "4";
-+if (isset($_REQUEST["step"]) && $_REQUEST["step"] > 0) {
-+	$step = intval($_REQUEST["step"]);
-+	if ($step == "1") {
-+		$step = "2";
-+	} elseif (($step == "2") && ($_REQUEST["install_type"] == "1")) {
-+		$step = "3";
-+	} elseif (($step == "2") && ($_REQUEST["install_type"] == "3")) {
-+		$step = "8";
-+	} elseif (($step == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) {
-+		$step = "9";
-+	} elseif ($step == "8") {
-+		$step = "3";
-+	} elseif ($step == "9") {
-+		$step = "3";
-+	} elseif ($step == "3") {
-+		$step = "4";
- 	}
-+} else {
-+	$step = 1;
- }
- 
--if ($_REQUEST["step"] == "4") {
-+if ($step == "4") {
- 	include_once("../lib/data_query.php");
- 	include_once("../lib/utility.php");
- 
-@@ -366,7 +367,7 @@
- 
- 	header ("Location: ../index.php");
- 	exit;
--}elseif (($_REQUEST["step"] == "8") && ($_REQUEST["install_type"] == "3")) {
-+}elseif (($step == "8") && ($_REQUEST["install_type"] == "3")) {
- 	/* if the version is not found, die */
- 	if (!is_int($old_version_index)) {
- 		print "	<p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p>
-@@ -505,7 +506,7 @@
- 				</tr>
- 				<tr>
- 					<td width="100%" style="font-size: 12px;">
--						<?php if ($_REQUEST["step"] == "1") { ?>
-+						<?php if ($step == "1") { ?>
- 
- 						<p>Thanks for taking the time to download and install cacti, the complete graphing
- 						solution for your network. Before you can start making cool graphs, there are a few
-@@ -530,7 +531,7 @@
- 						MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- 						GNU General Public License for more details.</p>
- 
--						<?php }elseif ($_REQUEST["step"] == "2") { ?>
-+						<?php }elseif ($step == "2") { ?>
- 
- 						<p>Please select the type of installation</p>
- 
-@@ -551,7 +552,7 @@
- 							print "Server Operating System Type: " . $config["cacti_server_os"] . "<br>"; ?>
- 						</p>
- 
--						<?php }elseif ($_REQUEST["step"] == "3") { ?>
-+						<?php }elseif ($step == "3") { ?>
- 
- 						<p>Make sure all of these values are correct before continuing.</p>
- 						<?php
-@@ -609,7 +610,7 @@
- 						is an upgrade. You can change any of the settings on this screen at a later
- 						time by going to "Cacti Settings" from within Cacti.</p>
- 
--						<?php }elseif ($_REQUEST["step"] == "8") { ?>
-+						<?php }elseif ($step == "8") { ?>
- 
- 						<p>Upgrade results:</p>
- 
-@@ -659,7 +660,7 @@
- 						print $upgrade_results;
- 						?>
- 
--						<?php }elseif ($_REQUEST["step"] == "9") { ?>
-+						<?php }elseif ($step == "9") { ?>
- 
- 						<p style='font-size: 16px; font-weight: bold; color: red;'>Important Upgrade Notice</p>
- 
-@@ -673,7 +674,7 @@
- 
- 						<?php }?>
- 
--						<p align="right"><input type="image" src="install_<?php if ($_REQUEST["step"] == "3") {?>finish<?php }else{?>next<?php }?>.gif" alt="<?php if ($_REQUEST["step"] == "3"){?>Finish<?php }else{?>Next<?php }?>"></p>
-+						<p align="right"><input type="image" src="install_<?php if ($step == "3") {?>finish<?php }else{?>next<?php }?>.gif" alt="<?php if ($step == "3"){?>Finish<?php }else{?>Next<?php }?>"></p>
- 					</td>
- 				</tr>
- 			</table>
-@@ -681,7 +682,7 @@
- 	</tr>
- </table>
- 
--<input type="hidden" name="step" value="<?php print $_REQUEST["step"];?>">
-+<input type="hidden" name="step" value="<?php print $step;?>">
- 
- </form>
- 
diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt
deleted file mode 100644
index 732c718..0000000
--- a/net-analyzer/cacti/files/postinstall-en.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-New Install
-
-1. Create the new cacti database
-   shell> mysqladmin -p --user=root create cacti
-2. Import the default cacti database:
-   shell> mysql -p --user=root cacti < ${MY_INSTALLDIR}/cacti.sql
-3. Create a MySQL username and password for cacti.
-   shell> mysql -p --user=root mysql
-   mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
-   mysql> flush privileges;
-4. Edit ${MY_INSTALLDIR}/include/config.php and modify the MySQL user,
-   password and database for your cacti configuration.
-
-   Example:
-	\$database_default = "cacti";
-	\$database_hostname = "localhost";
-	\$database_username = "cactiuser";
-	\$database_password = "somepassword";
-
-5. Point your web browser to:  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/
-   Make sure to fill in all of the path variables carefully and
-    correctly on the following screen.
-6. After you've gone through the setup wizard, go back to the main cacti page
-   and login as:
-	Username: admin
-	Password: admin
-
-Upgrading
-
-1. Backup DB in the case that something goes wrong.
-   shell> mysqldump -l --add-drop-table cacti > mysql.cacti
-2. Backup your rra/ directory and any custom scripts in your scripts/
-   directory.
-3. Edit ${MY_INSTALLDIR}/include/config.php, and confirm that the MySQL user,
-   password and database is correct for your cacti configuration.
-   
-   Example:
-        \$database_default = "cacti";
-        \$database_hostname = "localhost";
-        \$database_username = "cactiuser";
-        \$database_password = "somepassword";
-4. Point your web browser to: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/
-   Select "Upgrade".
-   Make sure to fill in all of the path variables carefully and
-   correctly on the following screen.
-
-Cronjob
-
-Either new or upgrading, make sure you have a cron job - Add this line to 
-your /etc/crontab file:
-
-   */5 * * * * ${VHOST_SERVER_GID} /usr/bin/php ${MY_INSTALLDIR}/poller.php > /dev/null 2>&1
-
-Note that you should use poller.php as the cronjob instead of cmd.php (as it was with 
-earlier versions) to enable you to switch between cmd.php and cactid.
-
-Also make sure that the user poller.php runs as ( ${VHOST_SERVER_GID} ) has
-permission to create new files in Cacti's 'rra/' directory which is
-${MY_INSTALLDIR}/rra
-
-
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
deleted file mode 100644
index 2c847f4..0000000
--- a/net-analyzer/cacti/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
-</maintainer>
-<longdescription lang="en">
-	Cacti is a complete network graphing solution designed to harness the
-	power of RRDTool's data storage and graphing functionality. Cacti
-	provides a fast poller, advanced graph templating, multiple data
-	acquisition methods, and user management features out of the box. All of
-	this is wrapped in an intuitive, easy to use interface that makes sense
-	for LAN-sized installations up to complex networks with hundreds of
-	devices.
-</longdescription>
-<use>
-	<flag name='doc'>install html documentation</flag>
-</use>
-</pkgmetadata>