Version bump (#208165), Cleanup

(Portage version: 2.2_rc26/cvs/Linux x86_64)

8 files changed, 31 insertions, 327 deletions

diff --git a/net-analyzer/nikto/ChangeLog b/net-analyzer/nikto/ChangeLog
index c24e2439ba0e..f7ed59f0062b 100644
--- a/net-analyzer/nikto/ChangeLog
+++ b/net-analyzer/nikto/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nikto
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.23 2007/12/28 10:48:14 dertobi123 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.24 2009/03/20 16:02:06 dertobi123 Exp $
+
+*nikto-2.03 (20 Mar 2009)
+
+  20 Mar 2009; Tobias Scherbaum <dertobi123@gentoo.org> -nikto-1.31.ebuild,
+  -nikto-1.32.ebuild, -nikto-1.34.ebuild, -nikto-1.34-r1.ebuild,
+  -nikto-1.34-r2.ebuild, -nikto-1.35.ebuild, -nikto-2.01.ebuild,
+  +nikto-2.03.ebuild:
+  Version bump (#208165), Cleanup
 
 *nikto-2.01 (28 Dec 2007)
 
diff --git a/net-analyzer/nikto/nikto-1.31.ebuild b/net-analyzer/nikto/nikto-1.31.ebuild
deleted file mode 100644
index 2e05be141e92..000000000000
--- a/net-analyzer/nikto/nikto-1.31.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.31.ebuild,v 1.7 2005/03/13 20:51:10 mcummings Exp $
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/source/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-RDEPEND=${DEPEND}
-RDEPEND=">=dev-lang/perl-5.6.1
-		>=net-libs/libwhisker-1.5
-		>=net-analyzer/nmap-3.00
-		ssl? ( dev-libs/openssl ) "
-IUSE="ssl"
-
-src_unpack() {
-	unpack ${A}
-	#einfo ${WORKDIR}
-	cd  ${S}
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
-		 nikto.pl
-	mv config.txt nikto.conf
-	sed -i -e 's:^#NMAP:NMAP:' \
-		-i -e 's:^PROXYHOST:#PROXYHOST:' \
-		-i -e 's:^PROXYPORT:#PROXYPORT:' \
-		-i -e 's:^PROXYUSER:#PROXYUSER:' \
-		-i -e 's:^PROXYPASS:#PROXYPASS:' \
-		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
-		 nikto.conf
-}
-
-src_install() {
-	cd ${S}
-	insinto /etc/nikto
-	doins nikto.conf
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
-	dohtml nikto_usage.html
-	cd ..
-	dodir /usr/bin
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	cd plugins
-	doins *
-}
diff --git a/net-analyzer/nikto/nikto-1.32.ebuild b/net-analyzer/nikto/nikto-1.32.ebuild
deleted file mode 100644
index 61d709d39a6c..000000000000
--- a/net-analyzer/nikto/nikto-1.32.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.32.ebuild,v 1.7 2005/03/13 20:51:10 mcummings Exp $
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
-RDEPEND=${DEPEND}
-RDEPEND="dev-lang/perl
-		>=net-libs/libwhisker-1.5
-		>=net-analyzer/nmap-3.00
-		ssl? ( dev-libs/openssl ) "
-IUSE="ssl"
-
-src_unpack() {
-	unpack ${A}
-	#einfo ${WORKDIR}
-	cd  ${S}
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
-		 nikto.pl
-	mv config.txt nikto.conf
-	sed -i -e 's:^#NMAP:NMAP:' \
-		-i -e 's:^PROXYHOST:#PROXYHOST:' \
-		-i -e 's:^PROXYPORT:#PROXYPORT:' \
-		-i -e 's:^PROXYUSER:#PROXYUSER:' \
-		-i -e 's:^PROXYPASS:#PROXYPASS:' \
-		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
-		 nikto.conf
-}
-
-src_install() {
-	cd ${S}
-	insinto /etc/nikto
-	doins nikto.conf
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
-	dohtml nikto_usage.html
-	cd ..
-	dodir /usr/bin
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	cd plugins
-	doins *
-}
diff --git a/net-analyzer/nikto/nikto-1.34-r1.ebuild b/net-analyzer/nikto/nikto-1.34-r1.ebuild
deleted file mode 100644
index f5a807c39b04..000000000000
--- a/net-analyzer/nikto/nikto-1.34-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.34-r1.ebuild,v 1.2 2005/05/14 13:38:27 mcummings Exp $
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz
-		http://www.cirt.net/nikto/${P}.man"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-RDEPEND="dev-lang/perl
-		>=net-analyzer/nmap-3.00
-		ssl? ( dev-libs/openssl )"
-IUSE="ssl"
-
-src_compile() {
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
-		 nikto.pl
-
-	mv config.txt nikto.conf
-
-	sed -i -e 's:^#NMAP:NMAP:' \
-		-i -e 's:^PROXYHOST:#PROXYHOST:' \
-		-i -e 's:^PROXYPORT:#PROXYPORT:' \
-		-i -e 's:^PROXYUSER:#PROXYUSER:' \
-		-i -e 's:^PROXYPASS:#PROXYPASS:' \
-		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
-		 nikto.conf
-
-		 cp ${DISTDIR}/${P}.man ${WORKDIR}/${P}.1
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf
-
-	dodir /usr/bin
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	doins plugins/*
-
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
-	dohtml nikto_usage.html
-	doman ${WORKDIR}/${P}.1
-}
diff --git a/net-analyzer/nikto/nikto-1.34-r2.ebuild b/net-analyzer/nikto/nikto-1.34-r2.ebuild
deleted file mode 100644
index d74cd7007265..000000000000
--- a/net-analyzer/nikto/nikto-1.34-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.34-r2.ebuild,v 1.1 2005/05/14 13:44:22 mcummings Exp $
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz
-		http://www.cirt.net/nikto/${P}.man"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-RDEPEND="dev-lang/perl
-		>=net-analyzer/nmap-3.00
-		ssl? ( dev-libs/openssl )"
-IUSE="ssl"
-
-src_compile() {
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
-		 nikto.pl
-
-	mv config.txt nikto.conf
-
-	sed -i -e 's:^#NMAP:NMAP:' \
-		-i -e 's:^PROXYHOST:#PROXYHOST:' \
-		-i -e 's:^PROXYPORT:#PROXYPORT:' \
-		-i -e 's:^PROXYUSER:#PROXYUSER:' \
-		-i -e 's:^PROXYPASS:#PROXYPASS:' \
-		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
-		 nikto.conf
-
-		 cp ${DISTDIR}/${P}.man ${WORKDIR}/${P}.1
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf
-
-	dodir /usr/bin
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	doins plugins/*
-
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
-	dohtml nikto_usage.html
-	doman ${WORKDIR}/${P}.1
-}
diff --git a/net-analyzer/nikto/nikto-1.34.ebuild b/net-analyzer/nikto/nikto-1.34.ebuild
deleted file mode 100644
index 23814fb3c01f..000000000000
--- a/net-analyzer/nikto/nikto-1.34.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.34.ebuild,v 1.2 2005/03/13 20:51:10 mcummings Exp $
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-RDEPEND="dev-lang/perl
-		>=net-libs/libwhisker-1.5
-		>=net-analyzer/nmap-3.00
-		ssl? ( dev-libs/openssl )"
-IUSE="ssl"
-
-src_compile() {
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
-		 nikto.pl
-
-	mv config.txt nikto.conf
-
-	sed -i -e 's:^#NMAP:NMAP:' \
-		-i -e 's:^PROXYHOST:#PROXYHOST:' \
-		-i -e 's:^PROXYPORT:#PROXYPORT:' \
-		-i -e 's:^PROXYUSER:#PROXYUSER:' \
-		-i -e 's:^PROXYPASS:#PROXYPASS:' \
-		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
-		 nikto.conf
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf
-
-	dodir /usr/bin
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	doins plugins/*
-
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
-	dohtml nikto_usage.html
-}
diff --git a/net-analyzer/nikto/nikto-1.35.ebuild b/net-analyzer/nikto/nikto-1.35.ebuild
deleted file mode 100644
index 80ca59159789..000000000000
--- a/net-analyzer/nikto/nikto-1.35.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.35.ebuild,v 1.4 2007/03/22 14:47:31 gustavoz Exp $
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-RDEPEND="dev-lang/perl
-		>=net-analyzer/nmap-3.00
-		ssl? ( dev-libs/openssl )"
-IUSE="ssl"
-
-src_compile() {
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
-		 nikto.pl
-
-	mv config.txt nikto.conf
-
-	sed -i -e 's:^#NMAP:NMAP:' \
-		-i -e 's:^PROXYHOST:#PROXYHOST:' \
-		-i -e 's:^PROXYPORT:#PROXYPORT:' \
-		-i -e 's:^PROXYUSER:#PROXYUSER:' \
-		-i -e 's:^PROXYPASS:#PROXYPASS:' \
-		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
-		 nikto.conf
-
-		 cp ${S}/docs/nikto-1.34.man ${WORKDIR}/${PN}.1
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf
-
-	dodir /usr/bin
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	doins plugins/*
-
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
-	dohtml nikto_usage.html
-	doman ${WORKDIR}/${PN}.1
-}
diff --git a/net-analyzer/nikto/nikto-2.01.ebuild b/net-analyzer/nikto/nikto-2.03.ebuild
index e407f9ca6f0a..46c21ad3c63b 100644
--- a/net-analyzer/nikto/nikto-2.01.ebuild
+++ b/net-analyzer/nikto/nikto-2.03.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-2.01.ebuild,v 1.1 2007/12/28 10:48:14 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-2.03.ebuild,v 1.1 2009/03/20 16:02:06 dertobi123 Exp $
 
 DESCRIPTION="Web Server vulnerability scanner."
 HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.bz2"
+SRC_URI="http://www.cirt.net/source/nikto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,38 +19,38 @@ RDEPEND="dev-lang/perl
 		)"
 
 src_compile() {
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:"\$NIKTO{execdir}/kbase/nikto.kbase":"/var/nikto/kbase/nikto.kbase":' \
-		-i -e 's:\$NIKTO{configfile} = "nikto.conf":\$NIKTO{configfile} = "/etc/nikto/nikto.conf":' \
-		 nikto.pl
+	cd nikto
 
 	mv config.txt nikto.conf
 
+	sed -i -e 's:config.txt:nikto.conf:g' \
+		plugins/* docs/nikto.1 nikto.pl
+
+	sed	-i -e 's:config.txt:nikto.conf:' \
+		-i -e 's:\($NIKTO{configfile} = \)"nikto.conf":\1"/etc/nikto/nikto.conf":' \
+		nikto.pl
+
 	sed -i -e 's:/usr/local/bin/nmap:/usr/bin/nmap:' \
 		-i -e 's:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:' \
-		 nikto.conf
+		nikto.conf
+
+	rm -rf $(find -name .svn -type d)
 }
 
 src_install() {
+	cd nikto
+
 	insinto /etc/nikto
 	doins nikto.conf
 
-	dodir /usr/bin
 	dobin nikto.pl
 	dosym /usr/bin/nikto.pl /usr/bin/nikto
 
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	doins plugins/*
-
-	dodir /usr/share/nikto/templates
-	insinto /usr/share/nikto/templates
-	doins templates/*
-
-	dodir /var/nikto/kbase
+	dodir /usr/share/nikto
+	insinto /usr/share/nikto
+	doins -r plugins templates
 
 	dodoc plugins/nikto_plugin_order.txt
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt
-	dohtml nikto_manual.html
+	dodoc docs/*.txt
+	dohtml docs/nikto_manual.html
 }