Bump to EAPI=3, add prefix keywords, cleanup QA issues

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 61 insertions, 28 deletions

diff --git a/net-analyzer/nikto/ChangeLog b/net-analyzer/nikto/ChangeLog
index f7ed59f0062b..690097bb20e5 100644
--- a/net-analyzer/nikto/ChangeLog
+++ b/net-analyzer/nikto/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nikto
-# 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 $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.25 2010/05/26 16:38:56 abcd Exp $
+
+  26 May 2010; Jonathan Callen <abcd@gentoo.org> nikto-2.03.ebuild:
+  Bump to EAPI=3, add prefix keywords, cleanup QA issues
 
 *nikto-2.03 (20 Mar 2009)
 
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 5025688852ad..46ccc8f3a1e2 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST nikto-1.36.tar.gz 206921 RMD160 29aa7008a065ae5a2b39bc72f72fbddbc2665a51 SHA1 522487b04168d7646d456331fa5fc5434b4af15f SHA256 a5c7f10e73b3ab9d262732a1377902589a7cde268666db892cc59f4b00e1bedc
 DIST nikto-2.03.tar.bz2 399643 RMD160 977bb791115c54259766db10602c7000e7882bda SHA1 24211a3be1a66b7304abf77fcdd9f1ac9909ec72 SHA256 61b78434560c5c311f38c47e7e6816012c9c83a3cfdf4a978ceaaf34718a3b73
 EBUILD nikto-1.36.ebuild 1383 RMD160 87fa6af1e086e36764d369bea58be4ea959ec44f SHA1 d835baebdc59e712c77775bb2b1c6137d64cb90f SHA256 1b78d3eb2ca68064756bce809009242f9cc0a39398a66cb9bb7509431662e95a
-EBUILD nikto-2.03.ebuild 1279 RMD160 d20293bb47267aa9e546c1247ebbc767cbaaed71 SHA1 2bf88cc448a021863159f3bd11ce2587b8ef7ba5 SHA256 4eb3566b3b6184f372d1bc0a12d5c6f49512ce48960cccf232bd5572c0f6c444
-MISC ChangeLog 3580 RMD160 720f33db07a8eac6c8988a820401d4596c315476 SHA1 967602b3b0bd11dccd98de1fb82ed1e386f7bd8c SHA256 52b5df935c49e28cbce13e812b04dbdeca227648b9f032dd4c6dc487d77cf809
+EBUILD nikto-2.03.ebuild 1406 RMD160 ebdb90593772c0ac8ef536ac1ad5f15448f8e2f0 SHA1 3ef5c19bf8cd385c0b1f474182fcd73d81e3142e SHA256 8d56e02996052aaf09e454a5bf7dd9da2372ff9ebe04d7b05ccc1e9a57752719
+MISC ChangeLog 3700 RMD160 0ee7d5fdd10392f0ab3242851fcb1d754f18e98d SHA1 43c057a027e529611c5d3d9610c683b1f0e5280d SHA256 f123d8042e1a75cbe5ec3d117aad88d37c709ccb1e26774265e4dd6ac4052d19
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBCAAGBQJL/U6lAAoJELHSF2kinlg4m3IP/in4cgM9YnkjzuyZlprL2BcF
+mlfNW/UZ2JI6wtOycklWY5yNFj33HuDKstS30sOEyaYUdap+n4c7PiNLukA08VF5
+kvDoQTIlTTz7h1WF+S0iQHuuVrHNBMb7VT7GKraIjdbdGXdQtsqqFRyxuTj4xMa2
+GIwDQ8Lk5geopmSVFktSL3khHOFzi65DmH06pjog+mjCZvFaf/yz8RJkexS5EMfm
+rItsNuBPlb3RJo3ceRMkmX9LwCGvGt17y/0anc9gXHuW1WJLCaI1zQFmiuaSVIWd
+wSLs9ApRiC80uRkwSx/WZwx0G/FDvF1jtkQZcu1ra2O0wbeZTysInhySuACCW3lV
+5RYbI0psinNyg8auRjXS9mP/THI/NZ8Yat0ysUV0DoxJ5JwKbBvsRsSVD3KrM6Kb
+ZUgg1T/VQ68B9g2lbWOfla49B97hpllEAVLL5QSsod5Zg0dOq9Qh/iZyM51eiif8
+1X9HEWUthC7Xnzwpm0zzx0LGSOaD/b2JH2CaxnnCUf6hbEpKc593I8T6JwimtS23
+WJkgvixyQn7KoIZHj425riRrq/ZmUru8sSVaYcbRae7EpV0T4lIXkf5IX8cPWcH4
+G51ZFXEL1ZVH+fWYEJB7VfJKPJQRPV2PCeoYbhcdNSpMzAmAjbsWi0cRPUCCYRPG
+LuvR3ARxy+ImQf8WNkDz
+=tFEW
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nikto/nikto-2.03.ebuild b/net-analyzer/nikto/nikto-2.03.ebuild
index 46c21ad3c63b..c7e70c7160f1 100644
--- a/net-analyzer/nikto/nikto-2.03.ebuild
+++ b/net-analyzer/nikto/nikto-2.03.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.1 2009/03/20 16:02:06 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-2.03.ebuild,v 1.2 2010/05/26 16:38:56 abcd Exp $
+
+EAPI="3"
 
 DESCRIPTION="Web Server vulnerability scanner."
 HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
@@ -8,7 +10,7 @@ SRC_URI="http://www.cirt.net/source/nikto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
@@ -18,37 +20,35 @@ RDEPEND="dev-lang/perl
 			dev-perl/Net-SSLeay
 		)"
 
-src_compile() {
-	cd nikto
+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
+		plugins/* docs/nikto.1 nikto.pl || die
 
 	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\($NIKTO{configfile} = \)"nikto.conf":\1"/etc/nikto/nikto.conf":' \
-		nikto.pl
+		-i -e "s:\(\$NIKTO{configfile} = \)\"nikto.conf\":\1\"${EPREFIX}/etc/nikto/nikto.conf\":" \
+		nikto.pl || die
 
-	sed -i -e 's:/usr/local/bin/nmap:/usr/bin/nmap:' \
-		-i -e 's:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:' \
-		nikto.conf
+	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
 
-	rm -rf $(find -name .svn -type d)
+	find -depth -name .svn -type d -exec rm -rf {} +
 }
 
 src_install() {
-	cd nikto
-
 	insinto /etc/nikto
-	doins nikto.conf
+	doins nikto.conf || die
 
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
+	dobin nikto.pl || die
+	dosym nikto.pl /usr/bin/nikto || die
 
 	dodir /usr/share/nikto
 	insinto /usr/share/nikto
-	doins -r plugins templates
+	doins -r plugins templates || die
 
 	dodoc plugins/nikto_plugin_order.txt
 	dodoc docs/*.txt
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 1dc150194ad4..52c5f45e5b9f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX nmap-4.75-include.patch 476 RMD160 5ac50ccc48dbbc1c654558c97c0b6c5f777cc843 SHA1 10ec6eb55e60175417c37785f274d3872ccd22bf SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca
 AUX nmap-4.75-nolua.patch 364 RMD160 90ec068c5a267dd43737fb39828b3c9c372e19b1 SHA1 aab37cdb0a19891fd55038b05d1ab843d1fcf255 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619
@@ -10,13 +10,23 @@ AUX nmap-5.21-python.patch 1219 RMD160 87b07436f42950341403ee0f92edf02abfe88614
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
 AUX su-to-zenmap.sh.diff 407 RMD160 60d66ce051777897d69b353eba08225a4fdb0892 SHA1 d4fcf25792851e1a1a3288588eedfcfec7af631c SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36
 DIST nmap-5.21.tar.bz2 10015121 RMD160 85e912c3c6a7ed03eb1b399c812836071e4dcf9f SHA1 ce5ff792161dae0037e41b31e0c2ef683ce94655 SHA256 9fcb24f86157541c2f17cc8a0cc1e5d15d909b51720d163fcad5faaa6201b0ba
-EBUILD nmap-5.21.ebuild 1628 RMD160 a793e489249dfd55f533a4974176d2bd46612fab SHA1 34c29c0430277227392d9b4935e395a776539ce6 SHA256 6ee501f26b241c4522e01eb8115e1eaf14cedff8161bc554da931e93c37eec1f
-MISC ChangeLog 27964 RMD160 4aff50f38a3fe0ee410b7362a3d693997f6786b8 SHA1 41b51e9324fc84578ec0590a8b4148df156fe5d4 SHA256 b36c4389e8d245f598bfdc6fe60359e018103bf677492c777c0f28b15f57eb6c
+EBUILD nmap-5.21.ebuild 1726 RMD160 cb0695755809ad31020ba4a7eaad72d19964272d SHA1 20594b1e33f47f2f4a4d870eaddc896223b6f8fb SHA256 ae68ea5e1af2b33ad4eeab5ad9d41d8b977af634bcd54a5dd1ac6d79769b5e68
+MISC ChangeLog 28069 RMD160 f7910a356fdc0b395100686c78529e6f5656943a SHA1 39a192815c67f7d44d130d9fbb18b19d9c9def14 SHA256 841ca60cb8e4659a5ed23fa1393003e8cac095381f6d794ea341900921bf716b
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv1GDcACgkQchej4aZK9/d9hQCeJYzk2jWxYZqK21TkY0Ds4NSP
-MkEAnRvbeGlwWIDVDF1pkaWGhcFnx3lY
-=/MxJ
+iQIcBAEBCAAGBQJL/U82AAoJELHSF2kinlg4pfQP/iYUx61VnfBMs3nAbqO3d73l
+hOj0ncGLJS7kVFY6whmkxGBDH/qJ2c01JSC15MwHq1q9hVaWh/wdvJ30Sr5ABisL
+fJ0T9KPO9jYTkNQwD5wsr3yquN4fK/FPb1JyuFtjEg6bRoVZMOmVJfW2ohd2UFuS
+mXN+ku69p7s750UsfORu61rWSCAFZ5fcH/7/qfEgEv2gLnkoNX6PZipbmhJdF53L
+Hav9JsovUxIuXx11DAJRo85G+aocYCP2AVwKZILXREIRMdXdg//v7JN9/2/CyUTr
+kYUyhtoP/weyKhiIEGvYL1rBnrmB1Wa0Mco0ji6T9vLB0IYsrZBJczm5bZ0onIZO
+awNPg1UGCZ3w+HUsKOqO6yOZVihQf0u6Y9JaYXubN/4fgYGAxljmmWzJLN0LVoMc
+z1d6jz5Hs2anyVi3w8blWmFoUgSQDgWuyk+emMIvYKXBg5q6uWW4qJ5T0RJAFIIV
+MGcs+xBHRuBFzhSjaWlkQhUMqVRjVnPo+ECtPWuI0bXalnCpMGw7XSgOgV0g1NjX
+m1U89Hrflt2zxMkYjFxtxEcEjJhKL/rCGqUe/ZxQCbNYAh0LdxDRefT3PfeQjuGI
+MrqtG+j1gb1PNkTNtadTZyLgoYwI/XDe/YeTQoDJ+clN4qghnvo06/N0WSDvYTZ6
+yYVHk4pUBSlICOgq8UDj
+=7LMx
 -----END PGP SIGNATURE-----