drop old; fix SLOT operators

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 25 insertions, 80 deletions

diff --git a/net-analyzer/nikto/ChangeLog b/net-analyzer/nikto/ChangeLog
index 3b9af6c7164d..42182bbda43a 100644
--- a/net-analyzer/nikto/ChangeLog
+++ b/net-analyzer/nikto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nikto
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.34 2014/12/19 19:18:28 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.35 2015/03/21 14:37:40 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -nikto-2.03.ebuild, metadata.xml,
+  nikto-2.1.5.ebuild:
+  drop old; fix SLOT operators
 
   19 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Drop to maintainer-needed
diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml
index 91f4e72fb544..1470e032181b 100644
--- a/net-analyzer/nikto/metadata.xml
+++ b/net-analyzer/nikto/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nikto/nikto-2.03.ebuild b/net-analyzer/nikto/nikto-2.03.ebuild
deleted file mode 100644
index 8edcd38057f5..000000000000
--- a/net-analyzer/nikto/nikto-2.03.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-2.03.ebuild,v 1.4 2014/08/10 20:59:48 slyfox Exp $
-
-EAPI="3"
-
-DESCRIPTION="Web Server vulnerability scanner"
-HOMEPAGE="http://www.cirt.net/Nikto2"
-SRC_URI="http://www.cirt.net/source/nikto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ssl"
-
-RDEPEND="dev-lang/perl
-		>=net-analyzer/nmap-3.00
-		ssl? (
-			dev-libs/openssl
-			dev-perl/Net-SSLeay
-		)"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	mv config.txt nikto.conf
-
-	sed -i -e 's:config.txt:nikto.conf:g' \
-		plugins/* docs/nikto.1 nikto.pl || die
-
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e "s:\(\$NIKTO{configfile} = \)\"nikto.conf\":\1\"${EPREFIX}/etc/nikto/nikto.conf\":" \
-		nikto.pl || die
-
-	sed -i -e "s:/usr/local/bin/nmap:${EPREFIX}/usr/bin/nmap:" \
-		-i -e "s:# EXECDIR=/usr/local/nikto:EXECDIR=${EPREFIX}/usr/share/nikto:" \
-		nikto.conf || die
-
-	find -depth -name .svn -type d -exec rm -rf {} +
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf || die
-
-	dobin nikto.pl || die
-	dosym nikto.pl /usr/bin/nikto || die
-
-	dodir /usr/share/nikto
-	insinto /usr/share/nikto
-	doins -r plugins templates || die
-
-	dodoc plugins/nikto_plugin_order.txt
-	dodoc docs/*.txt
-	dohtml docs/nikto_manual.html
-}
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild
index 05b562dc8f40..f825b7a2c465 100644
--- a/net-analyzer/nikto/nikto-2.1.5.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.5.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-2.1.5.ebuild,v 1.5 2014/11/09 23:30:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-2.1.5.ebuild,v 1.6 2015/03/21 14:37:40 jlec Exp $
+
 EAPI=5
+
 inherit perl-module
 
 DESCRIPTION="Web Server vulnerability scanner"
@@ -13,34 +15,31 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ssl"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	dev-lang/perl
 	>=net-libs/libwhisker-2.5
-		ssl? (
-			dev-libs/openssl
-			dev-perl/Net-SSLeay
-		)"
+	ssl? (
+		dev-libs/openssl:0=
+		dev-perl/Net-SSLeay
+	)"
 
 src_prepare() {
-	sed -i -e 's:config.txt:nikto.conf:g' plugins/*
+	sed -i -e 's:config.txt:nikto.conf:g' plugins/* || die
 	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:;
 	s:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:;
 	s:# use LW2:use LW2:;
-	s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl
+	s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die
 }
 
-src_compile() {
-	einfo "nothing to compile"
-	true
-}
+src_compile() { :; }
 
 src_install() {
 	insinto /etc/nikto
 	doins nikto.conf
 
 	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
+	dosym nikto.pl /usr/bin/nikto
 
-	dodir /usr/share/nikto
 	insinto /usr/share/nikto
 	doins -r plugins templates databases
 
@@ -48,12 +47,10 @@ src_install() {
 	einfo "symlinking ${NIKTO_PMS} to ${VENDOR_LIB}"
 
 	for _PM in ${NIKTO_PMS}; do
-	_TARGET=${VENDOR_LIB}/${_PM}
-	dosym /usr/share/nikto/plugins/${_PM} ${_TARGET}
+		_TARGET=${VENDOR_LIB}/${_PM}
+		dosym /usr/share/nikto/plugins/${_PM} ${_TARGET}
 	done
 
 	dodoc docs/*.txt
 	dohtml docs/nikto_manual.html
-
-	insinto ${VENDOR_PERL}
 }