gentoo resync : 04.08.2018

3 files changed, 33 insertions, 24 deletions

diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 612f7d5fb351..65c8cfde3aa6 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,6 +1,6 @@
-DIST wapiti-2.3.0.tar.gz 305739 BLAKE2B a425694bf334e373acd4e7a60734b1162a709a996eb322fd8d8c6a92c9db34e7ae3c8bab4f1b0a514e7f88cda8f9f7ba5f5d24e20425993c36d8283a12470d1f SHA512 a72e87f4c2aec3884d5de7018c7fe1ab32721fc86420167c0b7636f31d9718661c787ff3d4ee66cc27e3932497543d0324b0bd238c33ce16f41f39213c119af2
 DIST wapiti-3.0.0.tar.gz 528316 BLAKE2B f1845e762fa155746b9706cb379ac187d0b8136082f6545ad5c486b915975561dcea272eb8213c9a3347b42bb7e9653fd2303e47c12c91f4d66f31047afd5a44 SHA512 5a04dde6e4bc051a05d55fb4f3f7171ee659a64c51f807d3c6d4dd0d8d182688d9e48e8449a1aeedab34f04fbf89dc13fa97d13fb0fdb45ba6820bde6936e36e
-EBUILD wapiti-2.3.0.ebuild 508 BLAKE2B 72b4b8d4cc830ee3b1151f6aed2828e40be1a43f0097aea47d59ecba3044f219519b47e6cd51fc957bec475d43fdd2a965139ef8391aada1fabd43506bb73c48 SHA512 dea28c6d333d56e36a35f4d6aee96b36896a205e95cd799146f6cecb660dc12bb9ea6359af83b03a50f5772b71e69a4fad9545e20b48d2aa73d02e117f445eec
+DIST wapiti3-3.0.1.tar.gz 530486 BLAKE2B ccc13a14404269059d154aa32126cca6603be8d4f56b2adf2ffdd18c242ac2ea14306171a0ff5e4e654c3451db209668d4e5c9471bc3d5765cea71b1e9ff1fda SHA512 596df444d19cc2b98dd88f033c66ac65bcc8ab6e34508c1fa201503d2e61ca053ecddaa7a0814329c87e1e10c013306dd7dd4b56e644d4b5dab5924d75c6f4d7
 EBUILD wapiti-3.0.0.ebuild 778 BLAKE2B a7385fb08636ec161fd3a9c11061bf1af9806eed34e472cfe6d3fb2578d6483f13ad0cc7628f75c1f293523b04eef08fe9cc7e61a61d88c5631a78966345c31f SHA512 753e4d61b6be4ed012fc4251a7561dd8546632865f7485d5c68604718a8d2c1d73d1b518b2a99377be785091eef6e8fa0160aef6c46e1639fb257bb47ad325a7
+EBUILD wapiti-3.0.1.ebuild 820 BLAKE2B a30e47142ccb4747e39b9d592948430c3d68f43f2b07c9add6a00c909981dcbb9f71ff99339d5139bc7a0c20ad7346e5d766721df7b1daed9f9c210ba25fe905 SHA512 4eb9ce2415ef8ddfd95617319d714bd417ac7e539552d1809bd98d190cb1ea3983a00c643dae5160a168c159c01583d763f9f34756c217663cf1082fc9fd9755
 EBUILD wapiti-9999.ebuild 800 BLAKE2B e9b0f9d54f3c94904cbd217b7218141a6179528b6efd1c89f2356817df98ba902e8be297b72ad965ad5a70ee8a3d22f7b7def35ff3bee0a258dd08c053ac681d SHA512 10fb2896b49e009a38b8ca555197c0bb09d815e299c5dbc165217228e0817c6a983a2d47ac7c57625bb951777510dfcc04ece6e7a20808eb255be3b75064e9fc
 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/wapiti-2.3.0.ebuild b/net-analyzer/wapiti/wapiti-2.3.0.ebuild
deleted file mode 100644
index 00b046e1aac3..000000000000
--- a/net-analyzer/wapiti/wapiti-2.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml'
-
-inherit distutils-r1
-
-DESCRIPTION="Web-application vulnerability scanner"
-HOMEPAGE="http://wapiti.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-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.1.ebuild b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
new file mode 100644
index 000000000000..0b0c74416a8a
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+MY_P=${PN}3-${PV}
+DESCRIPTION="Web-application vulnerability scanner"
+HOMEPAGE="http://wapiti.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos ntlm"
+
+DEPEND=""
+RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	dev-python/tld[${PYTHON_USEDEP}]
+	dev-python/yaswfp[${PYTHON_USEDEP}]
+	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
+	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}