From dcda72f33ba7bf37ab34636e4ddd389a4d31a8d8 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Sat, 15 Dec 2018 10:30:54 +0800
Subject: [PATCH] theHarvester: 3.0.4 bump

---
 net-analyzer/theHarvester/Manifest            |  2 +-
 ...2.7.3.ebuild => theHarvester-3.0.4.ebuild} | 16 +++++++-------
 net-analyzer/wfuzz/Manifest                   |  1 -
 net-analyzer/wfuzz/wfuzz-2.3.1.ebuild         |  8 +++----
 net-analyzer/wfuzz/wfuzz-2.3.ebuild           | 21 -------------------
 5 files changed, 12 insertions(+), 36 deletions(-)
 rename net-analyzer/theHarvester/{theHarvester-2.7.3.ebuild => theHarvester-3.0.4.ebuild} (81%)
 delete mode 100644 net-analyzer/wfuzz/wfuzz-2.3.ebuild

diff --git a/net-analyzer/theHarvester/Manifest b/net-analyzer/theHarvester/Manifest
index 34dfcf71d..f130e9fe7 100644
--- a/net-analyzer/theHarvester/Manifest
+++ b/net-analyzer/theHarvester/Manifest
@@ -1,2 +1,2 @@
-DIST theHarvester-2.7.3.tar.gz 62170 BLAKE2B aa565850506f1dc11cacd8e8fda67579972f35d45863b7a0af97706391943fcb272cffa89a9ccb267e42f9aac6849aaf58288aff961fb71e50f880d679c89b0b SHA512 9e4d1cf04ff49291d0366486fc80eb84f42d82fc34da0d270e10b3544e66f2026c680798e5652528bdce3383024b7eb023206eed4d1d99e21f1ead2cda1cd627
 DIST theHarvester-3.0.1.tar.gz 1060133 BLAKE2B fb1cc59d6e1034e31273e5f2bc65d1e21c1f4615dc4a85c2d457ba7281f9b125282c848fe9abdc0ddb09c0059fed9acf6767d68bf0f6050c7b4b15af5d9e6145 SHA512 1a673dc6e10a3a70119714d0fd6baf10bb627a26835534afc0e3f83b7cee2fbe89e0a96686968b9813f536429b63e27963655aebf90b61bf23264f15e2e498a7
+DIST theHarvester-3.0.4.tar.gz 1061009 BLAKE2B b1943d2e6346d323d76a9e88e6f1451eabb35bae1f95cd40dc5f87ba1fb56fe0d39f57186e9f06d3eff1087df7bfb971eec5c104ba109e4bfe6b9260d3cc1b45 SHA512 c4ed5dda6ab94d25dab60d28b151081c0643e38efcb8c29b889e140cb247c1d27fe11bb30857a415837b1cc0c1735f86a6f150c5c353097d6e2e54cb35428d31
diff --git a/net-analyzer/theHarvester/theHarvester-2.7.3.ebuild b/net-analyzer/theHarvester/theHarvester-3.0.4.ebuild
similarity index 81%
rename from net-analyzer/theHarvester/theHarvester-2.7.3.ebuild
rename to net-analyzer/theHarvester/theHarvester-3.0.4.ebuild
index dd72113f9..237b90879 100644
--- a/net-analyzer/theHarvester/theHarvester-2.7.3.ebuild
+++ b/net-analyzer/theHarvester/theHarvester-3.0.4.ebuild
@@ -3,27 +3,25 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit python-single-r1 python-utils-r1
 
 DESCRIPTION="The Harvester is a tool designed to collect email accounts of the target domain"
 HOMEPAGE="http://www.edge-security.com/theharvester.php"
-
-COMMIT="5b1fc4634cc0436a1e693183c09a6a6d3ecb9004"
-MY_P="${PN}-${COMMIT}"
-SRC_URI="https://github.com/laramies/theHarvester/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/laramies/theHarvester/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="net-analyzer/wfuzz[${PYTHON_USEDEP}]"
+RDEPEND="net-analyzer/wfuzz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/"${PN}-${COMMIT}"
-
 src_prepare() {
 	python_fix_shebang .
 
@@ -53,5 +51,5 @@ src_install() {
 #	doins lib/*.py
 
 	newbin theHarvester.py theharvester
-	dodoc README LICENSES
+	dodoc README.md LICENSES
 }
diff --git a/net-analyzer/wfuzz/Manifest b/net-analyzer/wfuzz/Manifest
index 250413855..daee6bb32 100644
--- a/net-analyzer/wfuzz/Manifest
+++ b/net-analyzer/wfuzz/Manifest
@@ -1,3 +1,2 @@
 DIST wfuzz-2.2.11.tar.gz 383889 BLAKE2B 17080d7bdf846918bd156e3082441e9310acd17b457e74b626fd74ec392e91d039a1504975f0abf180567763458954940c0ed0236aba3c3fb9ab884bcb9efba0 SHA512 2203582d275dd93b1a2a456088b2975d717b3e9eff92b85f986845111e72ced0c69b2531e1b0735eb959b69efe3d8c7d128f9f7e95cee25e1253cd72e37ce051
 DIST wfuzz-2.3.1.tar.gz 391296 BLAKE2B 29b6c3fa8d28e4d1d52355e301097660227b1c168b0b00b03f77c8b33e085a8cb59f381f387ad622c38784650b9d39e51b03ff6a09b09d1abfd70ce415f01b43 SHA512 6706cb18ca8c78ea7ab3cdc4a10c02ff778e0da62cec2f0e47d108d5f9f9de763390d5453f9299c261e9b5476d14a0e6b48476472ed80300e8aac60efbaf928c
-DIST wfuzz-2.3.tar.gz 391155 BLAKE2B 9979b12dc5ba864a816b800c2e2a4c8fa503a0dd169e8a716bf1d36bc69f95ed062616c5c4e95b5a6083265cb5d30da307d44cbf75f474f02712e4ae9e0e1936 SHA512 a5adeafecef42b208c99ae53d72ccb1f20a0d09489fc65682dbf8c11b653e4692426bd4f9e26a73e12388d56997673f5644b44d75ada68048e20f645d26c54ae
diff --git a/net-analyzer/wfuzz/wfuzz-2.3.1.ebuild b/net-analyzer/wfuzz/wfuzz-2.3.1.ebuild
index 8f52347a8..62a2a940e 100644
--- a/net-analyzer/wfuzz/wfuzz-2.3.1.ebuild
+++ b/net-analyzer/wfuzz/wfuzz-2.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
-PYTHON_COMPAT=( python2_7 )
-#inherit python-single-r1 multilib
 inherit distutils-r1 multilib
 
 DESCRIPTION="Wfuzz is a tool designed for bruteforcing Web Applications"
diff --git a/net-analyzer/wfuzz/wfuzz-2.3.ebuild b/net-analyzer/wfuzz/wfuzz-2.3.ebuild
deleted file mode 100644
index 8f52347a8..000000000
--- a/net-analyzer/wfuzz/wfuzz-2.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-#inherit python-single-r1 multilib
-inherit distutils-r1 multilib
-
-DESCRIPTION="Wfuzz is a tool designed for bruteforcing Web Applications"
-HOMEPAGE="http://www.edge-security.com/wfuzz.php"
-SRC_URI="https://github.com/xmendez/wfuzz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]"