diff --git a/net-analyzer/theHarvester/Manifest b/net-analyzer/theHarvester/Manifest
index ea94cd59d..e2dd1d843 100644
--- a/net-analyzer/theHarvester/Manifest
+++ b/net-analyzer/theHarvester/Manifest
@@ -1,4 +1,2 @@
-DIST theHarvester-3.0.4.tar.gz 1061009 BLAKE2B b1943d2e6346d323d76a9e88e6f1451eabb35bae1f95cd40dc5f87ba1fb56fe0d39f57186e9f06d3eff1087df7bfb971eec5c104ba109e4bfe6b9260d3cc1b45 SHA512 c4ed5dda6ab94d25dab60d28b151081c0643e38efcb8c29b889e140cb247c1d27fe11bb30857a415837b1cc0c1735f86a6f150c5c353097d6e2e54cb35428d31
-DIST theHarvester-3.0.6.tar.gz 1067923 BLAKE2B 7a3bfd6176f48e4fd13f8580066677a1e932553f3d770740a415b5db57ef5a7d9bc568dfb6af58fc1a26e0f01e81ed8e3c6b41a469f294267d1e0b9874c3f271 SHA512 79e00cf4fddc0a6bed6377756f60cae8868ebdae49df57e5876ca5e1e952640faeb8a4513180abd6fe736b92d44e1854725ec44ea5ca07d02c47e65791711ce0
 DIST theHarvester-3.0.6_p20190415.tar.gz 1035110 BLAKE2B b773cbd9a4820c22c00b748756ea45c6f89f07347ef14a69860368357e1addfcdb6ddc0a52bb60dca3335d17e41b4d68deab144c0458aaee3f51967f2770e613 SHA512 8147c23224fcfea273c3c8ce6cb642586794424f833fe615ef302790167d84c1303d9a2c02c0a633ff07b80833ed9f19bbfc924deda07989fccee5a6a07b6fd5
 DIST theHarvester-3.1.tar.gz 1027411 BLAKE2B 54150f4bc407e884873a0f381a9ea304319648058b87fb551cfe2e63171751a84f8e72dfea9c5a0f01aded06012f3babb204db984cc00bc79202c27a28461a3f SHA512 57137de6688a494dff8fed092bac5bc1eb429f8d558c02a8075b7b8357900af3bf51792e0a8dcb0fe1badab627c355785fca58a0e55b04cd0eb64ef369950d4c
diff --git a/net-analyzer/theHarvester/theHarvester-3.0.4.ebuild b/net-analyzer/theHarvester/theHarvester-3.0.4.ebuild
deleted file mode 100644
index 5014806ad..000000000
--- a/net-analyzer/theHarvester/theHarvester-3.0.4.ebuild
+++ /dev/null
@@ -1,55 +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,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"
-SRC_URI="https://github.com/laramies/theHarvester/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-analyzer/wfuzz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	python_fix_shebang .
-
-	#make it a module
-	sed -e 's|from discovery|from theHarvester.discovery|' -i theHarvester.py || die "sed failed"
-	sed -e 's|from lib|from theHarvester.lib|' -i theHarvester.py || die "sed failed"
-	sed -e 's|import stash|import theHarvester.stash|' -i theHarvester.py || die "sed failed"
-	sed -e 's|from lib|from theHarvester.lib|' -i lib/htmlExport.py || die "sed failed"
-	for i in discovery/*.py; do
-		sed -e 's|import myparser|from theHarvester import myparser|' -i $i
-	done
-	touch __init__.py
-
-	default
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule __init__.py myparser.py stash.py discovery lib
-
-#	old installation, just in case
-#	insinto $(python_get_sitedir)
-#	doins myparser.py
-#	insinto $(python_get_sitedir)/discovery
-#	doins -r discovery/*
-#	insinto $(python_get_sitedir)/lib
-#	doins lib/*.py
-
-	newbin theHarvester.py theharvester
-	dodoc README.md LICENSES
-}
diff --git a/net-analyzer/theHarvester/theHarvester-3.0.6.ebuild b/net-analyzer/theHarvester/theHarvester-3.0.6.ebuild
deleted file mode 100644
index 79371af1b..000000000
--- a/net-analyzer/theHarvester/theHarvester-3.0.6.ebuild
+++ /dev/null
@@ -1,55 +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,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"
-SRC_URI="https://github.com/laramies/theHarvester/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-analyzer/wfuzz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	python_fix_shebang .
-
-	#make it a module
-	sed -e 's|from discovery|from theHarvester.discovery|' -i theHarvester.py || die "sed failed"
-	sed -e 's|from lib|from theHarvester.lib|' -i theHarvester.py || die "sed failed"
-	sed -e 's|import stash|import theHarvester.stash|' -i theHarvester.py || die "sed failed"
-	sed -e 's|from lib|from theHarvester.lib|' -i lib/htmlExport.py || die "sed failed"
-	for i in discovery/*.py; do
-		sed -e 's|import myparser|from theHarvester import myparser|' -i $i
-	done
-	touch __init__.py
-
-	default
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule __init__.py myparser.py stash.py discovery lib
-
-#	old installation, just in case
-#	insinto $(python_get_sitedir)
-#	doins myparser.py
-#	insinto $(python_get_sitedir)/discovery
-#	doins -r discovery/*
-#	insinto $(python_get_sitedir)/lib
-#	doins lib/*.py
-
-	newbin theHarvester.py theharvester
-	dodoc README.md LICENSES
-}
diff --git a/net-analyzer/theHarvester/theHarvester-3.1.ebuild b/net-analyzer/theHarvester/theHarvester-3.1-r1.ebuild
similarity index 96%
rename from net-analyzer/theHarvester/theHarvester-3.1.ebuild
rename to net-analyzer/theHarvester/theHarvester-3.1-r1.ebuild
index b64a0f199..d8799406c 100644
--- a/net-analyzer/theHarvester/theHarvester-3.1.ebuild
+++ b/net-analyzer/theHarvester/theHarvester-3.1-r1.ebuild
@@ -20,9 +20,7 @@ RDEPEND="
 	>=dev-python/aiodns-2.0.0[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	>=dev-python/dnspython-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.5.0[${PYTHON_USEDEP}]
 	>=dev-python/grequests-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy-0.701[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
 	>=dev-python/plotly-1.9.6[${PYTHON_USEDEP}]
 	>=dev-python/pytest-3.10.1[${PYTHON_USEDEP}]
@@ -31,10 +29,14 @@ RDEPEND="
 	>=dev-python/shodan-1.17.0[${PYTHON_USEDEP}]
 	>=dev-python/texttable-1.6.2[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]"
+
 #	net-analyzer/wfuzz[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] 
+	>=dev-python/flake8-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy-0.701[${PYTHON_USEDEP}]
+	)"
 
 src_prepare() {
 	rm -r tests