diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
new file mode 100644
index 000000000..9684ae35d
--- /dev/null
+++ b/dev-python/pluginbase/Manifest
@@ -0,0 +1 @@
+DIST pluginbase-1.0.0.tar.gz 41795 BLAKE2B 68d7704b52db39af4f0c2e1f790802eb5f2fd15d91726752605901b3e8a3c736204fad93d96b5dd1a4199586b4d9b42895cbe8290acaed1b4051e8103efb43f9 SHA512 95c3b770980fa5ec745b8d788df29c6219ed6e5af7666f9830d56c6acae01f90831655127bcef69b2dfc423d09429373ae7d4c8b45c76c62a41f909d0747c0a0
diff --git a/dev-python/pluginbase/metadata.xml b/dev-python/pluginbase/metadata.xml
new file mode 100644
index 000000000..30a59affa
--- /dev/null
+++ b/dev-python/pluginbase/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pluginbase</remote-id>
+		<remote-id type="github">mitsuhiko/pluginbase</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pluginbase/pluginbase-1.0.0.ebuild b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
new file mode 100644
index 000000000..b5c0f8eca
--- /dev/null
+++ b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#https://bugs.gentoo.org/789264
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Support library for building plugins sytems in Python"
+HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -e "s/, 'sphinx.ext.intersphinx'//" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	cd tests && PYTHONPATH=.. py.test --tb=native || die "Tests fail with ${EPYTHON}"
+}
diff --git a/net-analyzer/wafw00f/Manifest b/net-analyzer/wafw00f/Manifest
index 4cafa75d1..a2e515435 100644
--- a/net-analyzer/wafw00f/Manifest
+++ b/net-analyzer/wafw00f/Manifest
@@ -1,3 +1 @@
-DIST wafw00f-1.0.0.tar.gz 40326 BLAKE2B 9eef76ca52567a780912cdfbc21d767250267df1064c470bcda2b553f9629ab7b7fb45c456c1e30abf25f6a61826252ac3266a646cf121170a74db48538162ce SHA512 9a5a0e1d0cbdc1eb47e67730b53632f41e3e8102c76307129fa2b2c11613bcf3c167db65ad93eb8a32e895bb9082b2be1c1924ac6fabf36f349f5cad62c43e20
-DIST wafw00f-2.0.0.tar.gz 37433 BLAKE2B 15ca4c7719390fa21e2dae0cedfed0aeb99e4f1b0b702fe853bca56556102771e94dba040329dcf0f78fbbfc22a1063871be36ecc0ecf79efa407af1b3f6dd04 SHA512 bb6ab12b5f7540b460a3556eb16efc045b57da7515ac588c3d2df5ae0940b30ce2cab158a9f639e28d12ba780ea25a83b1943e3ac7994722e4aded6231e0da4e
 DIST wafw00f-2.1.0.tar.gz 39387 BLAKE2B 83442afa5873911c2145d1aaf1860613f4fe2d2ac38b7a1d44151d4d8a3346b1c7d2cb1cecc8ac1ea8cda1738a7a1d931ca8bd761dcd20275dbc871f882457cc SHA512 7faf271cf3cb8db0d45dfff7081f53f9041b7d646cc94ed4925c98e9b7d4ec24b3aeef9240b7c7ad56b9568a2033f74b58db1142c8f83252633e355b1a44a9b2
diff --git a/net-analyzer/wafw00f/wafw00f-2.1.0-r1.ebuild b/net-analyzer/wafw00f/wafw00f-2.1.0-r1.ebuild
index d1dd94140..ad06cbf4c 100644
--- a/net-analyzer/wafw00f/wafw00f-2.1.0-r1.ebuild
+++ b/net-analyzer/wafw00f/wafw00f-2.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -14,9 +14,10 @@ SRC_URI="https://github.com/EnableSecurity/wafw00f/archive/v${PV}.tar.gz -> ${P}
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="socks5"
 
 DEPEND=""
 RDEPEND="${DEPEND}
+	dev-python/requests[socks5?,${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	>=dev-python/pluginbase-0.3[${PYTHON_USEDEP}]"