some clean up due to EAPI=5 bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 17 insertions, 13 deletions

diff --git a/net-analyzer/nikto/ChangeLog b/net-analyzer/nikto/ChangeLog
index 705963286aa8..086094959f60 100644
--- a/net-analyzer/nikto/ChangeLog
+++ b/net-analyzer/nikto/ChangeLog
@@ -1,6 +1,9 @@
 # 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.30 2014/08/30 18:18:59 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.31 2014/08/30 20:44:39 monsieurp Exp $
+
+  30 Aug 2014;  <patrice@gentoo.org> nikto-2.1.5.ebuild:
+  some clean up due to EAPI=5 bump
 
   30 Aug 2014;  <patrice@gentoo.org> nikto-2.1.5.ebuild:
   #489240: version bump to 2.1.5 + EAPI bump to 5
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 0351c09b96bb..84bc5b6709fc 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -3,6 +3,6 @@ DIST nikto-2.03.tar.bz2 399643 SHA256 61b78434560c5c311f38c47e7e6816012c9c83a3cf
 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.5.ebuild 1537 SHA256 ce1c761fd6d6975e93b24944fd2ff1b585b728e44d736b37488fe665a64cc9c0 SHA512 0eccd65c4b31618de491186f9e1367e7610fb05677fa02ba4551ea92a05450a753db3401c3df9eecbe4098bf0a4e1067227e84d6c6e18b9ae2e6061b73c6dc05 WHIRLPOOL 494fcfea54b9035638eb774f8e14be8311db8b07fcfaa8180eea51cefb754acf44c7e2dd4751eef427a8f73cb601a95f7c90d3941b36adb42d9404d1c19ccb58
-MISC ChangeLog 4382 SHA256 89754818115f5c0036bca92bd74d8bad7308d0a76c73301a75f2cc4d063983fc SHA512 611c2fd0a42261edf6c269f864047097de3154c11b4078affde381b5eb71af536387f65b12b5ed88fbee36a32db0e6229439bddcc17f1d951a4df8d004dac0f1 WHIRLPOOL 4376ae6742b529717538cb7219bbf3bbc91b1c8f762b331555d7be940d43e851cbb84a93a6e0283fdbc84e987374be7edd33b6bcecff09f59cf33417360a8df5
+EBUILD nikto-2.1.5.ebuild 1444 SHA256 6ed58e948c0caa31029cd5ecf8270dec4264a98de5657a36d4ab3e324094e074 SHA512 6bc7495d1fce9c7e7a2f38d6ba2a7755a6161808caec63ca09f57eb4bf1cab5396aa39c988d0feab78628ace4854fe8b7dff5b8183f56429280e19ee72a6af8f WHIRLPOOL 64bac4976a043995f1b816009b7e9f68642b0f8de118cc38668ce585cca6e3986545d8a994ba5f27467c8fca29657c0d16d6a83b91e757d6add851c4f5035f63
+MISC ChangeLog 4475 SHA256 263617190afb79d67f5407edc3db155c5160ac81541dbd83dfdf5f8277374811 SHA512 781b2e090f7e80c1ecc9cffd9dd8b258418b000e2bef7f7d23e73ed22c38b49c860733f48975b6ccc6d25212e453a4e51e076633d21b97e0b8d4d308409bb4e7 WHIRLPOOL 5c0f35cfd8641f8d527d520f1229e00da763883660db7b21e4784c49b12fcc0ce147df48a9083195e61ade936c56c22c1f0ee48044bf5d14b73fb5e44fc96fcd
 MISC metadata.xml 157 SHA256 6a11fd41a2a210a9760849de398ef8c62cf46cc742d09b2e1781def7848fa1ec SHA512 95158d74d42674de03bc271c8dffa2264759c77681436de71fa9b3ad67f50b09394b0401e6df6dde526bc8dcd6ea666ed6767662bd63c3e92cb33b7b23e4ede8 WHIRLPOOL d3fdf14c384070120719ad4076cd04630790564f5bceda2a273e6481ea27a6fc6291e55d78cbf8bf99b73c7b42e8a1f286927c990702dceee97a63815cb33846
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild
index 74dc7f257607..4bdb97d29324 100644
--- a/net-analyzer/nikto/nikto-2.1.5.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2014/08/30 18:18:59 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-2.1.5.ebuild,v 1.3 2014/08/30 20:44:39 monsieurp Exp $
 EAPI=5
 inherit perl-module
 
@@ -21,12 +21,12 @@ RDEPEND="dev-lang/perl
 		)"
 
 src_prepare() {
-	sed -i -e 's:config.txt:nikto.conf:g' plugins/* || die
+	sed -i -e 's:config.txt:nikto.conf:g' plugins/* 
 
 	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
+	s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl 
 }
 
 src_compile() {
@@ -36,23 +36,24 @@ src_compile() {
 
 src_install() {
 	insinto /etc/nikto
-	doins nikto.conf || die "config install failed"
+	doins nikto.conf 
 
-	dobin nikto.pl || die "install failed"
-	dosym /usr/bin/nikto.pl /usr/bin/nikto || die
+	dobin nikto.pl
+	dosym /usr/bin/nikto.pl /usr/bin/nikto
 
-	unset ${NIKTO_PMS}
 	dodir /usr/share/nikto
 	insinto /usr/share/nikto
-	doins -r plugins templates databases || die
+	doins -r plugins templates databases
 
 	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
+	unset ${NIKTO_PMS}
+
+	dodoc docs/*.txt
+	dohtml docs/nikto_manual.html
 
 	insinto ${VENDOR_PERL}
 }