From 0600be0c7956a1d8c53bbab4d84c14f5a31e0742 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Mon, 21 May 2018 19:21:14 +0800
Subject: [PATCH] wapiti: v3.0.1 bump

---
 net-analyzer/wapiti/Manifest                  |  3 ++-
 .../wapiti/wapiti-2.3.0_p20141111.ebuild      | 24 -------------------
 ...pre20170603.ebuild => wapiti-3.0.1.ebuild} | 12 ++++++----
 .../base/package.accept_keywords/net-analyzer |  3 +--
 4 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 net-analyzer/wapiti/wapiti-2.3.0_p20141111.ebuild
 rename net-analyzer/wapiti/{wapiti-3.0.0_pre20170603.ebuild => wapiti-3.0.1.ebuild} (75%)

diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 56fd56b02..94e05c125 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1 +1,2 @@
-DIST wapiti-3.0.0.tar.gz 528316 SHA256 4708fa1d8159b0a5e606bdb26e1454e8df1d8bf6e11d9ad63c84e12e8edc8daa SHA512 5a04dde6e4bc051a05d55fb4f3f7171ee659a64c51f807d3c6d4dd0d8d182688d9e48e8449a1aeedab34f04fbf89dc13fa97d13fb0fdb45ba6820bde6936e36e WHIRLPOOL 950c3034f47fdae2be6dcb53746419b04ae5da12f786ce700a682d42dbbc3757f3040c5ab682b5a1651822c243b76d9544c89e8efb497a4d5fdc36b1b81f6a56
+DIST wapiti-3.0.0.tar.gz 528316 BLAKE2B f1845e762fa155746b9706cb379ac187d0b8136082f6545ad5c486b915975561dcea272eb8213c9a3347b42bb7e9653fd2303e47c12c91f4d66f31047afd5a44 SHA512 5a04dde6e4bc051a05d55fb4f3f7171ee659a64c51f807d3c6d4dd0d8d182688d9e48e8449a1aeedab34f04fbf89dc13fa97d13fb0fdb45ba6820bde6936e36e
+DIST wapiti3-3.0.1.tar.gz 530486 BLAKE2B ccc13a14404269059d154aa32126cca6603be8d4f56b2adf2ffdd18c242ac2ea14306171a0ff5e4e654c3451db209668d4e5c9471bc3d5765cea71b1e9ff1fda SHA512 596df444d19cc2b98dd88f033c66ac65bcc8ab6e34508c1fa201503d2e61ca053ecddaa7a0814329c87e1e10c013306dd7dd4b56e644d4b5dab5924d75c6f4d7
diff --git a/net-analyzer/wapiti/wapiti-2.3.0_p20141111.ebuild b/net-analyzer/wapiti/wapiti-2.3.0_p20141111.ebuild
deleted file mode 100644
index e44517084..000000000
--- a/net-analyzer/wapiti/wapiti-2.3.0_p20141111.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE='xml'
-
-inherit subversion distutils-r1
-
-DESCRIPTION="Web application security auditor"
-HOMEPAGE="http://wapiti.sourceforge.net/"
-ESVN_REPO_URI="http://svn.code.sf.net/p/wapiti/code/trunk/"
-ESVN_REVISION="356"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/wapiti/wapiti-3.0.0_pre20170603.ebuild b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
similarity index 75%
rename from net-analyzer/wapiti/wapiti-3.0.0_pre20170603.ebuild
rename to net-analyzer/wapiti/wapiti-3.0.1.ebuild
index ce38f312c..c3c26ee18 100644
--- a/net-analyzer/wapiti/wapiti-3.0.0_pre20170603.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,12 +6,13 @@ EAPI=6
 PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE='xml'
 
-inherit subversion distutils-r1
+inherit distutils-r1
+
+IDIOT_P="${PN}3-${PV}"
 
 DESCRIPTION="Web application security auditor"
 HOMEPAGE="http://wapiti.sourceforge.net/"
-ESVN_REPO_URI="http://svn.code.sf.net/p/wapiti/code/trunk/"
-ESVN_REVISION="373"
+SRC_URI="mirror://sourceforge/${PN}/${IDIOT_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,8 +24,11 @@ DEPEND=""
 RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/tld[${PYTHON_USEDEP}]
 	dev-python/yaswfp[${PYTHON_USEDEP}]
 	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )
 	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
 	"
+
+S="${WORKDIR}/${IDIOT_P}"
diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer
index 8c186555b..1e3be363e 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@@ -102,8 +102,7 @@ net-analyzer/snort
 ~net-analyzer/upnpscan-0.4
 ~net-analyzer/upnpwn-0.8.0
 ~net-analyzer/vomit-0.2c
-=net-analyzer/wapiti-2.3.0*
-=net-analyzer/wapiti-3.0.0*
+=net-analyzer/wapiti-3*
 =net-analyzer/wfuzz-2.2*
 ~net-analyzer/wolpertinger-0.6
 =net-analyzer/xplico-1.2*