From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- net-analyzer/wapiti/Manifest | 8 ++------ net-analyzer/wapiti/wapiti-3.0.0.ebuild | 29 ----------------------------- net-analyzer/wapiti/wapiti-3.0.1.ebuild | 31 ------------------------------- net-analyzer/wapiti/wapiti-3.0.2.ebuild | 2 ++ net-analyzer/wapiti/wapiti-9999.ebuild | 21 +++++++++++++++------ 5 files changed, 19 insertions(+), 72 deletions(-) delete mode 100644 net-analyzer/wapiti/wapiti-3.0.0.ebuild delete mode 100644 net-analyzer/wapiti/wapiti-3.0.1.ebuild (limited to 'net-analyzer/wapiti') diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest index 29392972c26a..7f87e0158d49 100644 --- a/net-analyzer/wapiti/Manifest +++ b/net-analyzer/wapiti/Manifest @@ -1,8 +1,4 @@ -DIST wapiti-3.0.0.tar.gz 528316 BLAKE2B f1845e762fa155746b9706cb379ac187d0b8136082f6545ad5c486b915975561dcea272eb8213c9a3347b42bb7e9653fd2303e47c12c91f4d66f31047afd5a44 SHA512 5a04dde6e4bc051a05d55fb4f3f7171ee659a64c51f807d3c6d4dd0d8d182688d9e48e8449a1aeedab34f04fbf89dc13fa97d13fb0fdb45ba6820bde6936e36e -DIST wapiti3-3.0.1.tar.gz 530486 BLAKE2B ccc13a14404269059d154aa32126cca6603be8d4f56b2adf2ffdd18c242ac2ea14306171a0ff5e4e654c3451db209668d4e5c9471bc3d5765cea71b1e9ff1fda SHA512 596df444d19cc2b98dd88f033c66ac65bcc8ab6e34508c1fa201503d2e61ca053ecddaa7a0814329c87e1e10c013306dd7dd4b56e644d4b5dab5924d75c6f4d7 DIST wapiti3-3.0.2.tar.gz 561658 BLAKE2B f013b7d3c23cc3b655503de9f14d53b24d281604344c558791561c900fbe8b1a591c6b56970b41c961b38f65680799bf254887f4613d8e2bc96ddbc0a6aa7c24 SHA512 02f0e2510ce428b6dd89251ec63b5806b34e8e02302c7fa8fb1d9460a4e8c073b4650c066183ef20dc554440721f0b659a6ea30ad38f05865fb0fccc1cca758f -EBUILD wapiti-3.0.0.ebuild 773 BLAKE2B 523372fe70bcaaf93fae84e7ea22c44016067ffd46b9c520adfa96ab023b4b33fb2bcc6ce3724e618bccc669b9722f536f4535a060c187e7ea26dafeb69d1dd7 SHA512 42cb8736caea7370d225fe13ed51dbcfdd046cff91235f507d7718711e784b55c52b7804c1b8e7c44628bf7b4cfb3ab3cc74e527f2ed9fe95ab4adef00f52141 -EBUILD wapiti-3.0.1.ebuild 815 BLAKE2B eec75ae9d207ba0ab645765ae8cd64244b677418fe7f0a74c6ba115ef8bcd0625d19529ec1a47a1304c25ffbd37652a6a143b3e9eaacce5cb1e06356dd741b5d SHA512 3a93077e01db192a3ad12a27167f756df79427cdece3d7f21c699bc4214884a4f59f5b93928af936d74ba8c76d655aaa8ea4bdaa74e2a161b4b3423d799b1701 -EBUILD wapiti-3.0.2.ebuild 1019 BLAKE2B baed99b6104e5014df3aebeb0f5ef56262788b943397c85318b3664a79ef23051756ac934fa7b5c9e302d4fb33f688602b133621666b8e3a989adfbe0f46befb SHA512 93352a26e9851b3e26f8ba62631a66f0d86ce2e1aada0c5dded2a19868cd034b5e59f1361b2ef75f321a627cd4aa5b54519ac58eba8127bcb4a039f1d0dba760 -EBUILD wapiti-9999.ebuild 795 BLAKE2B 16242bb4ff51572036dac46508be146bbce382b7e4d8fb4721eb88d9e008cfb74a9687f8007fae17daada156b975b879bf8437e5aa0f43042bb664c55765f343 SHA512 f8f0d00c618a4d59e832883636ecfb6279123fc125f7104f82c30088645c7bc2baf0c9ca2ddd27ea53bb3e9c7b25230b8636e0a04f6e113e2088deabf14216d4 +EBUILD wapiti-3.0.2.ebuild 1047 BLAKE2B b3dbfb21b0676bfdd7f5925867425732c7c92230e8a984a151bc041b22e0ca43b938ffc1f5e649c46caa6bbf6146e68581f62a2ab0926281d7da1d25012caa26 SHA512 329e727feca73a88abf22b5b013933f48491973f1d1ae8add7c19b92edff85e03971963bd1dd1c80a94213a3c8bcd58586f2ee79c4f46f032084fd58e1fcd278 +EBUILD wapiti-9999.ebuild 1015 BLAKE2B 20b7a692c73605163dfb9ef9a40340516c2a3d895654d31665d259dfc491beac275727a6b5cb485086470dedae4a064d267f4267c7c4f5c352729ce453ab3a2e SHA512 a9d14f954e9f9a9e85f3d8fd091df7abe55f6014e246bdda0a6208a7157eb7161480bdc0725956225564440104eeab9cb73e0b755d3529e131324ed5cec57e4b MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25 diff --git a/net-analyzer/wapiti/wapiti-3.0.0.ebuild b/net-analyzer/wapiti/wapiti-3.0.0.ebuild deleted file mode 100644 index 9ff47d165002..000000000000 --- a/net-analyzer/wapiti/wapiti-3.0.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -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="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}] )" diff --git a/net-analyzer/wapiti/wapiti-3.0.1.ebuild b/net-analyzer/wapiti/wapiti-3.0.1.ebuild deleted file mode 100644 index b96bead9fad6..000000000000 --- a/net-analyzer/wapiti/wapiti-3.0.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{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} diff --git a/net-analyzer/wapiti/wapiti-3.0.2.ebuild b/net-analyzer/wapiti/wapiti-3.0.2.ebuild index d43c24730794..79510fa709f7 100644 --- a/net-analyzer/wapiti/wapiti-3.0.2.ebuild +++ b/net-analyzer/wapiti/wapiti-3.0.2.ebuild @@ -18,6 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="kerberos ntlm test" +RESTRICT="!test? ( test )" + DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] dev-python/pytest-runner[${PYTHON_USEDEP}] diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild index be4f6180daec..14fd985c3532 100644 --- a/net-analyzer/wapiti/wapiti-9999.ebuild +++ b/net-analyzer/wapiti/wapiti-9999.ebuild @@ -1,24 +1,28 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{5,6} ) PYTHON_REQ_USE='xml' -ESVN_REPO_URI="https://svn.code.sf.net/p/wapiti/code/trunk/" -inherit distutils-r1 subversion +inherit distutils-r1 git-r3 DESCRIPTION="Web-application vulnerability scanner" HOMEPAGE="http://wapiti.sourceforge.net/" -SRC_URI="" +EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="kerberos ntlm" +IUSE="kerberos ntlm test" -DEPEND="" +RESTRICT="!test? ( test )" + +DEPEND="test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-runner[${PYTHON_USEDEP}] + )" RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] dev-python/mako[${PYTHON_USEDEP}] @@ -27,3 +31,8 @@ RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/yaswfp[${PYTHON_USEDEP}] kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] ) ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )" + +python_prepare_all() { + sed -e 's/"pytest-runner"//' -i setup.py || die + distutils-r1_python_prepare_all +} -- cgit v1.2.3