#489240: version bump to 2.1.5 + EAPI bump to 5

3 files changed, 62 insertions, 69 deletions

diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index b9c2417c46b1..09cf7882b9ed 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST nikto-1.36.tar.gz 206921 SHA256 a5c7f10e73b3ab9d262732a1377902589a7cde268666db892cc59f4b00e1bedc
 DIST nikto-2.03.tar.bz2 399643 SHA256 61b78434560c5c311f38c47e7e6816012c9c83a3cfdf4a978ceaaf34718a3b73
-DIST nikto-2.1.4.tar.bz2 288160 SHA256 9af930fea3f124e262d0e63977244b6bd19e22749f4defa818bb4d9b107ad603
+DIST nikto-2.1.4.tar.bz2 288160 SHA256 9af930fea3f124e262d0e63977244b6bd19e22749f4defa818bb4d9b107ad603 SHA512 75cf3eeeefc4f70dbf27d76fed60db76afc1aac53847366ff83deaa7237c16cbfb7590ccbde40edd4d3ecab83a75bd3b7dcc24533d608317f6dca932d457813d WHIRLPOOL fcb04a9203068d28be4bc99537c7dc26b0fcc50fee25c3f49bbad2e943a918952e42d17a1e1640cb6def6145bfc238860977a1ab6db20dc808fed34690654e25
+DIST nikto-2.1.5.tar.bz2 311580 SHA256 65b99c1fdec14d1d5e7cbc964f70fce162cbec50aee878e1500e2d22df079b34 SHA512 623b0fa923c05ecc4b69087321b544941f09b4d84fb7a32f6970e2ea42b2018f2c4e2d1cd0fabfc1c99a2ca7b57fd8c0d9f5f13c86e7eb102f00bdfd3062a95f WHIRLPOOL c4b15484b3fcb9df9219743cc138073b9b24673cf1e20d066dd632da3dc8aa0ac21d5cd7bc5e012a8bfea8d75fc82d25d85fd37e0038bf9c217e8437eb2cea0d
 EBUILD nikto-1.36.ebuild 1375 SHA256 726c5d56248380d58d8cd60500d76da2d4b84f2e417d2271651e87897f0ae12b SHA512 bafe781edbda314180190a38b6146a0781081e6fce5849eeaba480ddf8896d8c2b3e738e373837cebe701e5028486632ac61176450c7b48c1477d1dea22a9f62 WHIRLPOOL 67181a194d9856c9edded0dcdbe89b6ba01293f7956e3c5409a7bd10bd2eff99bd48ec76e7a4e0cdd805fb8ceced0d614b21cc363ce1d0e7b4dd970d360fb7e1
 EBUILD nikto-2.03.ebuild 1397 SHA256 0c30d686069dd943a2ed46907bd320ef2536eaab3a45eb97b198dda2854cd189 SHA512 43199162dd23a601114bbd125d033e6a8573eb866ae4595780560b66d19e2fc4336d07e2fe3c8e88ecb12ff552b532fba0c451ae149c62d74240341846ab2484 WHIRLPOOL a7a0d695995034760222b7f160ba5365feb5008f72057d53ba77adbeeffbeaf712c2d53a42b78656b65a47ddc0ded1062ffd3258fe99654b9a1f9a8c449b921c
 EBUILD nikto-2.1.4.ebuild 1431 SHA256 70cfb1a669999eb226622fe09f7bafb08a0b3a668800ac695bdbc96fab14c4bf SHA512 fd001ef0b200caab8f2ae2669ae12e522fec7d997d55d2e49e1952a6e672fe059905b978d7f122c44f0cb39a7dd0a63adf4bc49784eacf976a1afe984070cb31 WHIRLPOOL 38676af764e11f03d28a08f0c7ec8c73893084c2bd81c7f5b04e116f625346c47f2cd569a8bbfbc1e32273534049b6ebf964c1d5e1dd775049c4270c94a0ca25
+EBUILD nikto-2.1.5.ebuild 1535 SHA256 3e6a36db884ed1d3999d17c9db5f2ff1644cbe845fa89efa2554b9d5cbeb211e SHA512 52364d4c2e2de82f5dd22a647b0d64e89e857be0e40e1161e5400052f11b0f5694e1f91cfbfbaf376b5143d047dc05f58552b3d48018d5d88c077bc91e52b39c WHIRLPOOL 3991521b83ac56db0f51cb1461b3e7ba034411a2e6286ba5015a456f0b4c8d7891e2ba86713be83e22c3c75e6e549e99b441884e532e308648308130093ba918
 MISC ChangeLog 4271 SHA256 b94585cf181f1ca3457360532a1f74e39682f32c7c87bec9c00a8e7cd3e4d994 SHA512 1d28dd55ea69fe4e741fbd571941e676c9ed952d50789bf62ed4e425e6c3170a90d842e7aeff8d8908d85d05c2902d562019bb3cfa7207aafdc208098399d089 WHIRLPOOL ca7b64cfa7e4b1de5ec97724c5f111ba6865e961566d2670cd3a338ee082f1fd5deaf00f07ac72bf510437311561424bf1126bd220fddf6f8acbbd7aec2f9ffb
 MISC metadata.xml 157 SHA256 6a11fd41a2a210a9760849de398ef8c62cf46cc742d09b2e1781def7848fa1ec SHA512 95158d74d42674de03bc271c8dffa2264759c77681436de71fa9b3ad67f50b09394b0401e6df6dde526bc8dcd6ea666ed6767662bd63c3e92cb33b7b23e4ede8 WHIRLPOOL d3fdf14c384070120719ad4076cd04630790564f5bceda2a273e6481ea27a6fc6291e55d78cbf8bf99b73c7b42e8a1f286927c990702dceee97a63815cb33846
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn3UQACgkQcaHudmEf86rnrACfVvE9M7U+Wh5PQm77WOzlRFJ5
-GtoAmwfhB354sg4RAXMRPzaOMHoyopjC
-=a3q2
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nikto/nikto-2.1.4.ebuild b/net-analyzer/nikto/nikto-2.1.4.ebuild
deleted file mode 100644
index 407c3b18e5dd..000000000000
--- a/net-analyzer/nikto/nikto-2.1.4.ebuild
+++ /dev/null
@@ -1,58 +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.1.4.ebuild,v 1.3 2014/08/10 20:59:48 slyfox Exp $
-
-EAPI=2
-
-DESCRIPTION="Web Server vulnerability scanner"
-HOMEPAGE="http://www.cirt.net/Nikto2"
-SRC_URI="http://www.cirt.net/nikto/ARCHIVE/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl"
-
-RDEPEND="dev-lang/perl
-	>=net-libs/libwhisker-2.5
-		ssl? (
-			dev-libs/openssl
-			dev-perl/Net-SSLeay
-		)"
-
-src_prepare() {
-	sed -i -e 's:config.txt:nikto.conf:g' \
-			plugins/* || die
-
-	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' \
-		 nikto.pl || die
-
-	sed -i -e 's:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:' \
-		 nikto.conf || die
-
-	sed -i -e 's:# use LW2:use LW2:' \
-		 nikto.pl || die
-	sed -i -e 's:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":' \
-		 nikto.pl || die
-	rm plugins/LW2.pm || die "removing bundled lib LW2.pm failed"
-}
-
-src_compile() {
-	einfo "nothing to compile"
-	true
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf || die "config install failed"
-
-	dobin nikto.pl || die "install failed"
-	dosym /usr/bin/nikto.pl /usr/bin/nikto || die
-
-	dodir /usr/share/nikto
-	insinto /usr/share/nikto
-	doins -r plugins templates || die
-
-	dodoc docs/*.txt || die
-	dohtml docs/nikto_manual.html || die
-}
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild
new file mode 100644
index 000000000000..2ed270fb4a55
--- /dev/null
+++ b/net-analyzer/nikto/nikto-2.1.5.ebuild
@@ -0,0 +1,59 @@
+# 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.1.5.ebuild,v 1.1 2014/08/30 17:48:49 monsieurp Exp $
+EAPI=5
+inherit perl-module
+
+DESCRIPTION="Web Server vulnerability scanner"
+HOMEPAGE="http://www.cirt.net/Nikto2"
+SRC_URI="http://www.cirt.net/nikto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ssl"
+
+RDEPEND="dev-lang/perl
+	>=net-libs/libwhisker-2.5
+		ssl? (
+			dev-libs/openssl
+			dev-perl/Net-SSLeay
+		)"
+
+src_prepare() {
+	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 || die
+}
+
+src_compile() {
+	einfo "nothing to compile"
+	true
+}
+
+src_install() {
+	insinto /etc/nikto
+	doins nikto.conf || die "config install failed"
+
+	dobin nikto.pl || die "install failed"
+	dosym /usr/bin/nikto.pl /usr/bin/nikto || die
+
+	unset ${NIKTO_PMS}
+	dodir /usr/share/nikto
+	insinto /usr/share/nikto
+	doins -r plugins templates databases || die
+
+	NIKTO_PMS="LW2.pm JSON-PP.pm"
+	einfo "symlinking ${NIKTO_PMS} to ${VENDOR_LIB}"
+	for pm in ${NIKTO_PMS}; do
+		dosym /usr/share/nikto/plugins/${pm} ${VENDOR_LIB}/${pm}
+	done
+
+	dodoc docs/*.txt || die
+	dohtml docs/nikto_manual.html || die
+
+	insinto ${VENDOR_PERL}
+}