drop old; fix SLOT operators

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 44 insertions, 101 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/Manifest b/net-analyzer/nikto/Manifest
index da083f93938f..14f0709b8b08 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST nikto-1.36.tar.gz 206921 SHA256 a5c7f10e73b3ab9d262732a1377902589a7cde268666db892cc59f4b00e1bedc
-DIST nikto-2.03.tar.bz2 399643 SHA256 61b78434560c5c311f38c47e7e6816012c9c83a3cfdf4a978ceaaf34718a3b73
 DIST nikto-2.1.5.tar.bz2 311580 SHA256 65b99c1fdec14d1d5e7cbc964f70fce162cbec50aee878e1500e2d22df079b34 SHA512 623b0fa923c05ecc4b69087321b544941f09b4d84fb7a32f6970e2ea42b2018f2c4e2d1cd0fabfc1c99a2ca7b57fd8c0d9f5f13c86e7eb102f00bdfd3062a95f WHIRLPOOL c4b15484b3fcb9df9219743cc138073b9b24673cf1e20d066dd632da3dc8aa0ac21d5cd7bc5e012a8bfea8d75fc82d25d85fd37e0038bf9c217e8437eb2cea0d
 EBUILD nikto-1.36.ebuild 1382 SHA256 0fd16e0a2b2d9b3c52349c72f284fa0ff1efc7c8c3969178f9de4840f94f9629 SHA512 a794b51ad58c49c0043d110d2ddadadb48162f5c54f827efbb5417a838d593d1774d87d700dad11aa75c21ec362222c402558e86a263f79ad28a1abf81260924 WHIRLPOOL ed3e9ad60a79b2dc63c3b3767f034603f34c3cf87691c8c586e7c711d230628a216a6b0cc4089ee79dc5c1c08a25f65b7dedeb26c32b7dbc4006c1218a6390e9
-EBUILD nikto-2.03.ebuild 1397 SHA256 0c30d686069dd943a2ed46907bd320ef2536eaab3a45eb97b198dda2854cd189 SHA512 43199162dd23a601114bbd125d033e6a8573eb866ae4595780560b66d19e2fc4336d07e2fe3c8e88ecb12ff552b532fba0c451ae149c62d74240341846ab2484 WHIRLPOOL a7a0d695995034760222b7f160ba5365feb5008f72057d53ba77adbeeffbeaf712c2d53a42b78656b65a47ddc0ded1062ffd3258fe99654b9a1f9a8c449b921c
-EBUILD nikto-2.1.5.ebuild 1434 SHA256 88a7199774c27aba1903b651a5b3113611d8e94d9a6513ad205648dc9154bf53 SHA512 f5fd821fb00a10ab63100a85a9ce9485e11bf7394aeabdc78ed521e129adb50e722d66a011b38b914f4165f903e90333de62894f98749a90758003e876dbd829 WHIRLPOOL 5d4cdbf64006f28b9177d1b1296a90ed749a897411f58b7dc0b8ec6bd63c08b81df662f37a206210b9dcc4a8868d404d82476d1ef42c30a3c3c2cc92d7194538
-MISC ChangeLog 4817 SHA256 751fc67e4531db02955db706229cfd12fc21fa307b503d14785d66753d6cc041 SHA512 492fa1dab4bbecc2709376370b5da11768914a3b08e9817afb5eee740d40f98c6c61d7b5daee293890be36e35db086c60dd3f70bb1510dbd23a184852e5285c1 WHIRLPOOL 2eae01cbd39d4a0dd3fd934a3c411b8007a2f63fca383695ae1d4a8915753eb6b34b94441cd5f7c86d9229e514d51d5f0577009190cf056652e3fbd45c7f6946
-MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
+EBUILD nikto-2.1.5.ebuild 1362 SHA256 9333ed397369ab0664d150390a1db67df59d35ead51b17d57e824b2d54b00d6c SHA512 82f7c671364e9c387a073da5114d7091194713b8330bc7e0a05ed1ecf769447d40fa52dc36046c09a9c69089e66965cbb5eabfb74ab261e4334631f1cdc7e0a5 WHIRLPOOL da6573f8d02d757447779096ce91aaf1e36acd713b289df47642ad8fdc1581d2d0427acdcbb14b8b99598ab1c35ea96036cdb78750befaccf6e2f95a47273d71
+MISC ChangeLog 4947 SHA256 5211dfd76c7a82add297453b20d824be96af47bbf446cd48c19b8f3ca6660ef7 SHA512 79f5bad3c92bed784320506764627c2b050f6245be4605f620b1cf0ab4671a981b057a6e92d46268dc9c9b00c561d790f056b90fb44c162bb3888c8a108591e2 WHIRLPOOL a707338eac115ccd1a573cf8dad0ef36f446c81979266d0a79b81f93cbc483855d17a317762d8a31b80eabef15184fc40275461f8898a660d60b3d1a65aaebb7
+MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUlHoFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcvg0P/0gTksF97EZiOSiIqejPSosr
-AaRxsz1TjWReXb3msDPLm8WRAxo0yWtA6PsLZiA9xprfeJwln9/DITQXMOKPKPF2
-wJm1l/1kUKKDoy7Fi+mOKYSpwDUbpoE0u0o6Lp60Pstylc4vW8htsz9GyyvppNxp
-G7JuzFGKNxfrrctFFdsBQxoQvHv/g5YWpA87quTaDHvpBLS3R4LnNmJQAz3ozuhk
-O3jBr6mZbkdW4ZLKJ+cr++2V0wONcMzMsvFeIYt0LXJ5EidjLp7I2eNGDP3t59gB
-zxgUoCse+j65S39aslU3ImPUbGhk0yYniO8dfDRG8hdyTQN/Shppzb3NST9ta+ww
-Btjo5gcJYNtP2SX3y6EUkk+bkbOmHEefb+gXi6TNuRovKT4BmORYPD/YzTPW6RZ+
-b22S4K8T/6YzmW3K8m5dIStCBmvUP2Gfhj2xz/HmWbsT3ayaPSddMU6smYLKhQBq
-7qld8exb0j+QFOV3Rlr56IxlCysGpQpgzyciUP98ngAG0MqkcCsiOv7VV3wvkQUt
-h7Y7M7Cvk4vR5dR2d5SZdtlqoP8ovW/8WLwG6IrvUJ6B61Pl3xCYmSuPILbkqLqN
-wSy8oSsY8zv5EVBf/aaBHdxsCwYfOXy6FiYeB5XzCery7VPqdYVXrv7QBMjnVBUs
-fXHH54khvb63LOwt1e3E
-=O5XE
+iQJ8BAEBCgBmBQJVDYI1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir9YQP/jKdZIoH1MR/jw+lPd/bKB5Z
+tM+aEBg/qGOiH8P93eIZx0g640VpvXNrL7Cxu6lmJQYFZJin1kNjBDjTtmks6718
+YTpQEiZKz2ezqKVk6HpXSKl47bODSWiYrlXf7tSKwR7io743F+02niPMDHvIw6Mw
+G/L0zCW6ZSqarrEHum5Gri3C8aDK3qHQPnSNr+bvJ6cqsmW+eE4dgjzo+h1OQ3cO
+Xr4ZIJxjVImn3lCL5bBdxWml5GJrHcnEfs9TWVhwL75C3Pf9e7UtqZSSjckpLmKN
+s6e3f1CHvmLSPItMCmYwLZgRWsN1bOfke9dcIkF24Ml1ISqtYpVD6ku1xOazWt38
+NLnl52BHgvHTB0tRqFwJJ7tzWZFGKqbPrECTD/+IquEwXl4hLRicZLQ+PrUL20+V
+GhduAWnlBd/9eanLnYomdSdYn0AlsIhqbCHNo0+yJpYZxL7gReGwH2mXUBTJPlIs
+aYOg6WCmDmiUcvFsAyZU+v4Suv9pQldyMdc8aK8Wcyk6IXTZSUF47Xu+95rEBuwX
+k0Srh7sszcbBwOw7xob3h9Q7XuKaERkkd4nketE7yBygoFf3uxVOgaezrZ1Ah8u4
+cB7VIgtoxWBgr0gnoxupVua6av4s94imBiy/+m1Y5oMfSk/RlQstT5XEULQf3Gyc
+7nCW3qvFbJ1JKynKPm8m
+=RVzC
 -----END PGP SIGNATURE-----
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}
 }