diff --git a/app-forensics/spiderfoot/Manifest b/app-forensics/spiderfoot/Manifest
index a85350821..f208c9fb5 100644
--- a/app-forensics/spiderfoot/Manifest
+++ b/app-forensics/spiderfoot/Manifest
@@ -1,3 +1,2 @@
 DIST spiderfoot-3.0.tar.gz 3478605 BLAKE2B dbf6e058f01e768dfef85ddcb059ce5c5e5070adf96dbecdf40ef5e6bbbc99e0f25820ee67d68f59aa55d35d867c8648d70b99981840f07f36ed76db58f284b6 SHA512 abf64b6b819f8535f87237649be677af27aaddc729897eff8d4c27bd441e32862a42f8b84cf61ad3a0b9e1fc940fddf9d2e47d7decfcb62812239c5a9e01850a
-DIST spiderfoot-3.3.tar.gz 3324791 BLAKE2B 3f72a8f9de6501d9f030ba8c907c33ba3d7da7704a81fdd141c4e12f4a9e20a7c774966cb3f2202890bb15f69fd882ecaadce2b4930fdf64d420730dacde9350 SHA512 5e888d263ec46466d501dc3b383d5b5bb29b4271556a14f40bedcda3eda910e1e100b00d440b0b5c2e744507273629ce0b18e56d4ca4f45d194d6924ce25794c
-DIST spiderfoot-3.4.tar.gz 3416447 BLAKE2B 642fe3363b26796be61857d4bae668f7ec2770f5460251051e521d37b9f98031f8a03fe12ce99f59d4424fde8944c4bfa20aacdd7d5fada8ba040b352e95b112 SHA512 52297125c4d8aa0db586c3da91bddb6a056889fc144ef21fba8c1a1b2e50da9188cb4ae7793a6b65d48796eb9a909a487bdd723a9989e0c1c9bc038db1a6dd19
+DIST spiderfoot-3.5.tar.gz 3416175 BLAKE2B 16939bd69dca73de4796e7415a03684a2159b7f8e73ac4d6e8f075cbbe56b34f2c62b6c833bb5cf1597504e72b7237a61fb704ccf774521bd6588868d5bfc3b4 SHA512 9c9c1e1c22d95cccac0a2fcbd41db8ecb2a7807864fe67be0c5d2f56fa9a09aefb7b8c9d4cd2778b8bf8bd9f22a4efc9836a34398903b4464c38c49861765539
diff --git a/app-forensics/spiderfoot/spiderfoot-3.3-r2.ebuild b/app-forensics/spiderfoot/spiderfoot-3.3-r2.ebuild
deleted file mode 100644
index cc66aefb9..000000000
--- a/app-forensics/spiderfoot/spiderfoot-3.3-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite,ssl,readline"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="The most complete OSINT collection and reconnaissance tool"
-HOMEPAGE="https://www.spiderfoot.net"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/smicallef/spiderfoot"
-else
-	SRC_URI="https://github.com/smicallef/spiderfoot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-#https://github.com/smicallef/spiderfoot/issues/1176
-#	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	acct-group/spiderfoot
-	acct-user/spiderfoot
-	$(python_gen_cond_dep '
-		>=dev-python/adblockparser-0.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dnspython-1.16.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/exifread-2.1.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cherrypy-18.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cherrypy-cors-1.6[${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.18[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PySocks-1.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		~dev-python/ipwhois-1.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/ipaddr-2.2.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/phonenumbers[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygexf[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyPDF2[${PYTHON_MULTI_USEDEP}]
-		>=net-libs/stem-1.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-whois[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-secure[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-docx[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-pptx[${PYTHON_MULTI_USEDEP}]
-		dev-python/networkx[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		dev-python/publicsuffixlist[${PYTHON_MULTI_USEDEP}]
-	')"
-
-#https://github.com/smicallef/spiderfoot/issues/1176
-PATCHES=(
-#	"${FILESDIR}/${PN}-3.0_fix_module_bug_sfp_hackertarget.patch"
-	"${FILESDIR}/${P}_add_support_user_homedir.patch"
-)
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r dicts/ dyn/ modules/ static/ *.py
-
-	for x in sf sfcli; do
-		make_wrapper $x \
-			"${EPYTHON} /usr/share/${PN}/${x}.py" \
-			"/usr/share/${PN}/"
-	done
-
-	dosym ./sf /usr/bin/${PN}
-	dosym ./sfcli /usr/bin/${PN}-cli
-
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-
-	newinitd "${FILESDIR}"/spiderfoot-daemon.initd-r1 spiderfoot-daemon
-	newconfd "${FILESDIR}"/spiderfoot-daemon.confd-r1 spiderfoot-daemon
-
-	dodoc *.md Dockerfile
-
-	python_optimize "${D}"/usr/share/${PN}
-}
-
-pkg_postinst() {
-	elog "\nJust run:"
-	elog "    ~# rc-service spiderfoot-daemon start"
-	elog "and open in browser http://127.0.0.1:5001\n"
-
-	elog "See documentation: https://www.spiderfoot.net/documentation/\n"
-}
diff --git a/app-forensics/spiderfoot/spiderfoot-3.4-r1.ebuild b/app-forensics/spiderfoot/spiderfoot-3.5.ebuild
similarity index 85%
rename from app-forensics/spiderfoot/spiderfoot-3.4-r1.ebuild
rename to app-forensics/spiderfoot/spiderfoot-3.5.ebuild
index b1e9a10b6..c45cf6e88 100644
--- a/app-forensics/spiderfoot/spiderfoot-3.4-r1.ebuild
+++ b/app-forensics/spiderfoot/spiderfoot-3.5.ebuild
@@ -16,35 +16,34 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/smicallef/spiderfoot"
 else
 	SRC_URI="https://github.com/smicallef/spiderfoot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-#https://github.com/smicallef/spiderfoot/issues/1176
-#	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="${PYTHON_DEPS}"
+
 RDEPEND="${DEPEND}
 	acct-group/spiderfoot
 	acct-user/spiderfoot
 	$(python_gen_cond_dep '
 		>=dev-python/adblockparser-0.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dnspython-1.16.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/exifread-2.1.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cherrypy-18.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dnspython-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/exifread-2.3.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cherrypy-18.6.1[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/cherrypy-cors-1.6[${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mako-1.1.5[${PYTHON_MULTI_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_MULTI_USEDEP}]
 		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.18[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.8.0[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/PySocks-1.7.1[${PYTHON_MULTI_USEDEP}]
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		~dev-python/ipwhois-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/ipwhois-1.1.0[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/ipaddr-2.2.0[${PYTHON_MULTI_USEDEP}]
 		dev-python/phonenumbers[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygexf[${PYTHON_MULTI_USEDEP}]
 		dev-python/PyPDF2[${PYTHON_MULTI_USEDEP}]
-		>=net-libs/stem-1.7.1[${PYTHON_MULTI_USEDEP}]
 		dev-python/python-whois[${PYTHON_MULTI_USEDEP}]
 		dev-python/python-secure[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
@@ -53,6 +52,7 @@ RDEPEND="${DEPEND}
 		dev-python/networkx[${PYTHON_MULTI_USEDEP}]
 		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
 		dev-python/publicsuffixlist[${PYTHON_MULTI_USEDEP}]
+		dev-python/openpyxl[${PYTHON_MULTI_USEDEP}]
 	')"
 
 #https://github.com/smicallef/spiderfoot/issues/1176
diff --git a/dev-python/exifread/Manifest b/dev-python/exifread/Manifest
index 86e28017c..53e78c6fe 100644
--- a/dev-python/exifread/Manifest
+++ b/dev-python/exifread/Manifest
@@ -1,2 +1,2 @@
-DIST exifread-2.2.0.tar.gz 35328 BLAKE2B e6df32b0c16669f2342db064cd02d3523593652914e45ce81dafad0c8fedad983874c8417169a9ebe4c1f4e11baf443377f75e4b07b05fb5fec65ae962b8cbae SHA512 fe7dcb794f1bd088acbe34a1b75ccebed89dcb15124573b721bc97243c6d1a109d07619d902aaf5f118b60e94dc614ae9921803ba7e8fdeed3009558e6d69482
 DIST exifread-2.3.1.tar.gz 42599 BLAKE2B 564050c5bdff51d7e20d8bf35631c6fd8cbe8513e1408721bd01f8d3984e570fb47e0e9f1685d13560ca68dab2e0fed88e33f5a3422199d8ef900df25ab05e04 SHA512 317b4da345ceba9be2b30424b9ab4b81c5f97fcb026414505a2453bea0cd909b1c35ef05b4fd520c9ebaa8369e54c23af3d4b0248eb4261353448640094e825a
+DIST exifread-2.3.2.tar.gz 42796 BLAKE2B 0dca89f484a5f21ee2510af6ab069ba76dfeb4a31bc79261951ef062bb695f6f1adc6c7378ecbdf0e1a46540ec767555cb46bb77ab39b002199ac490ca58fd6b SHA512 d37cc6a70793aa894947b1b24f973ff2f9c15ba3dfe99674c5ea61e5a469b259035fc48a1d2c4d4d7021289bad431e57a4e137e2d4feb0c5352b0b162e61376a
diff --git a/dev-python/exifread/exifread-2.2.0.ebuild b/dev-python/exifread/exifread-2.3.2.ebuild
similarity index 84%
rename from dev-python/exifread/exifread-2.2.0.ebuild
rename to dev-python/exifread/exifread-2.3.2.ebuild
index 63107cc44..4b26955fd 100644
--- a/dev-python/exifread/exifread-2.2.0.ebuild
+++ b/dev-python/exifread/exifread-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ianare/exif-py/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="${PYTHON_DEPS}"
 
diff --git a/dev-python/ipwhois/Manifest b/dev-python/ipwhois/Manifest
index 5814c831d..5ba63e810 100644
--- a/dev-python/ipwhois/Manifest
+++ b/dev-python/ipwhois/Manifest
@@ -1 +1,2 @@
 DIST ipwhois-1.0.0.tar.gz 131837 BLAKE2B 9eed0f646a55a5cda01776afdc62890591ddaf3f04873b4127ade6f0e7ed02efa44d78ceb64ec0153bd423be70dd490ddaa50c910a3f0833d21af1452b120476 SHA512 b8197e67d4ff4cbfae3d9327f231ea0c3c0698d59fe688e1454bc0f469d1a671f6dbaeaf6e5c57c087bea2ab90139673d9bc3b5bd6350d167febeb4f6da5a5ab
+DIST ipwhois-1.2.0.tar.gz 131936 BLAKE2B d10d2f76467ff50787ae3a9f9ab26c7814bc8f4548b49c60f43185702cdf146b787e719cd55e489135e4d6ee7624b28dc3e9a453f303be56718130410125a403 SHA512 08ce0541ea605b9d4ff4ddd07b732a57575b156e126a533304bcfadc24dc809046b3485b72b73703b86c102fce42759987a92c554f114bde17f2142dded29e17
diff --git a/dev-python/ipwhois/files/302.patch b/dev-python/ipwhois/files/302.patch
new file mode 100644
index 000000000..a0ce64269
--- /dev/null
+++ b/dev-python/ipwhois/files/302.patch
@@ -0,0 +1,60 @@
+From 02650702615f915038f42071029dd4a8438943c0 Mon Sep 17 00:00:00 2001
+From: Ian Hellen <ianhelle@microsoft.com>
+Date: Tue, 9 Feb 2021 18:23:11 -0800
+Subject: [PATCH] Adding flexible workaround for dnspython v1.x and v2.x
+ (former uses Resolver().query and latter uses Resolver().resolve) in
+ net.net.py
+
+Updated setup.py requirements to allow v2.x of dnspython.
+---
+ ipwhois/net.py | 9 +++++++--
+ setup.py       | 2 +-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/ipwhois/net.py b/ipwhois/net.py
+index 47468d5..a3142ad 100644
+--- a/ipwhois/net.py
++++ b/ipwhois/net.py
+@@ -126,6 +126,11 @@ def __init__(self, address, timeout=5, proxy_opener=None):
+         self.timeout = timeout
+ 
+         self.dns_resolver = dns.resolver.Resolver()
++        if hasattr(self.dns_resolver, "resolve"):
++            self.dns_resolve = getattr(self.dns_resolver, "resolve")
++        else:
++            self.dns_resolve = getattr(self.dns_resolver, "query")
++        
+         self.dns_resolver.timeout = timeout
+         self.dns_resolver.lifetime = timeout
+ 
+@@ -220,7 +225,7 @@ def get_asn_dns(self):
+         try:
+ 
+             log.debug('ASN query for {0}'.format(self.dns_zone))
+-            data = self.dns_resolver.resolve(self.dns_zone, 'TXT')
++            data = self.dns_resolve(self.dns_zone, 'TXT')
+             return list(data)
+ 
+         except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers,
+@@ -262,7 +267,7 @@ def get_asn_verbose_dns(self, asn=None):
+         try:
+ 
+             log.debug('ASN verbose query for {0}'.format(zone))
+-            data = self.dns_resolver.resolve(zone, 'TXT')
++            data = self.dns_resolve(zone, 'TXT')
+             return str(data[0])
+ 
+         except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers,
+diff --git a/setup.py b/setup.py
+index ef22a09..b639b13 100644
+--- a/setup.py
++++ b/setup.py
+@@ -67,7 +67,7 @@
+ 
+ PACKAGE_DATA = {'ipwhois': ['data/*.xml', 'data/*.csv']}
+ 
+-INSTALL_REQUIRES = ['dnspython<=2.0.0', 'ipaddr==2.2.0;python_version<"3.3"']
++INSTALL_REQUIRES = ['dnspython<=3.0.0', 'ipaddr==2.2.0;python_version<"3.3"']
+ 
+ setup(
+     name=NAME,
diff --git a/dev-python/ipwhois/files/302_fixed.patch b/dev-python/ipwhois/files/302_fixed.patch
new file mode 100644
index 000000000..780b9faf6
--- /dev/null
+++ b/dev-python/ipwhois/files/302_fixed.patch
@@ -0,0 +1,45 @@
+diff -Naur ipwhois-1.2.0.orig/ipwhois/net.py ipwhois-1.2.0/ipwhois/net.py
+--- ipwhois-1.2.0.orig/ipwhois/net.py	2020-09-18 02:39:53.000000000 +0800
++++ ipwhois-1.2.0/ipwhois/net.py	2021-11-11 08:16:51.177848259 +0800
+@@ -126,6 +126,11 @@
+         self.timeout = timeout
+ 
+         self.dns_resolver = dns.resolver.Resolver()
++        if hasattr(self.dns_resolver, "resolve"):
++            self.dns_resolve = getattr(self.dns_resolver, "resolve")
++        else:
++            self.dns_resolve = getattr(self.dns_resolver, "query")
++
+         self.dns_resolver.timeout = timeout
+         self.dns_resolver.lifetime = timeout
+ 
+@@ -220,7 +225,7 @@
+         try:
+ 
+             log.debug('ASN query for {0}'.format(self.dns_zone))
+-            data = self.dns_resolver.query(self.dns_zone, 'TXT')
++            data = self.dns_resolve(self.dns_zone, 'TXT')
+             return list(data)
+ 
+         except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers,
+@@ -262,7 +267,7 @@
+         try:
+ 
+             log.debug('ASN verbose query for {0}'.format(zone))
+-            data = self.dns_resolver.query(zone, 'TXT')
++            data = self.dns_resolve(zone, 'TXT')
+             return str(data[0])
+ 
+         except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers,
+diff -Naur ipwhois-1.2.0.orig/setup.py ipwhois-1.2.0/setup.py
+--- ipwhois-1.2.0.orig/setup.py	2020-09-18 02:39:53.000000000 +0800
++++ ipwhois-1.2.0/setup.py	2021-11-11 08:17:06.050847450 +0800
+@@ -67,7 +67,7 @@
+ 
+ PACKAGE_DATA = {'ipwhois': ['data/*.xml', 'data/*.csv']}
+ 
+-INSTALL_REQUIRES = ['dnspython<=2.0.0', 'ipaddr==2.2.0;python_version<"3.3"']
++INSTALL_REQUIRES = ['dnspython<=3.0.0', 'ipaddr==2.2.0;python_version<"3.3"']
+ 
+ setup(
+     name=NAME,
diff --git a/dev-python/ipwhois/ipwhois-1.2.0.ebuild b/dev-python/ipwhois/ipwhois-1.2.0.ebuild
new file mode 100644
index 000000000..1c1296d6c
--- /dev/null
+++ b/dev-python/ipwhois/ipwhois-1.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve and parse whois data for IPv4 and IPv6 addresses"
+HOMEPAGE="https://github.com/secynic/ipwhois"
+SRC_URI="https://github.com/secynic/ipwhois/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	=dev-python/dnspython-2*[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	#https://github.com/secynic/ipwhois/issues/303
+	"${FILESDIR}"/302_fixed.patch
+)
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
index f015260d1..1e47b5e47 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -230,8 +230,6 @@ dev-python/pycares amd64
 ~dev-python/adblockparser-0.7
 ~dev-python/cheroot-6.5.4
 ~dev-python/cherrypy-17.4.1
-~dev-python/exifread-2.2.0
-~dev-python/ipwhois-1.0.0
 ~dev-python/jaraco-functools-1.20
 ~dev-python/phonenumbers-8.3.1
 ~dev-python/portend-2.2