diff --git a/net-misc/sherlock/Manifest b/net-misc/sherlock/Manifest
index 4164a02d1..94ebaa2e2 100644
--- a/net-misc/sherlock/Manifest
+++ b/net-misc/sherlock/Manifest
@@ -1,5 +1 @@
-DIST sherlock-0.10.4.tar.gz 1423062 BLAKE2B 8d9dee38544c5d2b87897306b954ed25d7f301b967b5c2c4c093f66dc387c9da7605654e14143b46a77c7ccdde167299a72328175c5995d23d908997452c708e SHA512 954fcc9ddc2ff0bb96b9f4bc5e26e955d2372ae4a2535a1d5751f949bd7359671335a8fd1ae23aed87dab77d82a3ca6f97152f6d7f0972305f77d10b79326776
-DIST sherlock-0.10.5.tar.gz 1425148 BLAKE2B deeab0fe0b29b9cda237bfc4f8d5bbef6b76ad0854175ea997367872c2ca5ef3da6664d2b0e14d864e712e99f8278bfb7a36f36b3376b6ad4876d48d0765b877 SHA512 2515f111105322f28e5b648cfae37ce58d1f3db81611055949a514e1b87b3af18072e2a1b03164b3d3ccc3b0fb1b8bd873cdd9dda18770743762ae477558c924
-DIST sherlock-0.10.9.tar.gz 1426029 BLAKE2B 34330e450ddb3530e78002cbb5db5677a897ca30ad1837089bd69fad56c28be65147360ce9b669af28f711d28be44b9bf3e752d8f69c1eb3a6d2f17711e67032 SHA512 3ebce5a54114804a8b120f1f1bc4105f6140290c846ce335d694239fbe440c71ca772437cd5bcadc8cc9ba8f7e1918e912e55c02c6a1f750504ed6c66390b199
-DIST sherlock-0.11.1.tar.gz 1429824 BLAKE2B dd7eaa96e14978d5e96b0d504109554ceaf1272109d463a8574504a7ba85f0426fb911932518869eff44f9df555360e987b0c89c9ebc8f72126a7ad2769cce53 SHA512 29ba0de78169f550b05b2b0a7f36184aecce26fbcc1ba663bbe80e2a3f264cf209818c209b384e4d5e3fe1d0038c27d7be94570c181b940194605ca0cbdc993f
 DIST sherlock-0.12.9.tar.gz 2523164 BLAKE2B 5b717212d82d3194e99e4aacddb9f9c97df56209286ba0ec983da8a16a094d98bb4bc646be9c79cd5712b88e9f97e82cf68640574f3025f06f447f4a1e1a46f9 SHA512 d459541991b292e360385693c891803e1bfc87991e9f2c6e002b51aea3977fe42f1a6798f8bfb16df7c0d55a0faa19323314918da985061766506445a560ce4e
diff --git a/net-misc/sherlock/sherlock-0.10.4-r1.ebuild b/net-misc/sherlock/sherlock-0.10.4-r1.ebuild
deleted file mode 100644
index 2121f4d0a..000000000
--- a/net-misc/sherlock/sherlock-0.10.4-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Find usernames across social networks"
-HOMEPAGE="https://github.com/sherlock-project/sherlock"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sherlock-project/sherlock"
-else
-	# snapshot: 20200109
-	HASH_COMMIT="639d781a02d20acac02a751100ee1fcd5ca72220"
-
-	SRC_URI="https://github.com/sherlock-project/sherlock/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
-	S="${WORKDIR}/${PN}-${HASH_COMMIT}"
-fi
-
-LICENSE="MIT"
-SLOT=0
-#IUSE="test"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/certifi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/PySocks[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-futures[${PYTHON_USEDEP}]
-		dev-python/soupsieve[${PYTHON_USEDEP}]
-		dev-python/torrequest[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		>=net-libs/stem-1.7.0[${PYTHON_USEDEP}]
-	')"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/add_support_custom_data_json.patch
-
-	if [[ ${PV} != *9999 ]]; then
-		sed -e "s/__version__ = \"\(.*\)\"/__version__ = \"${PV}\"/" \
-			-i sherlock.py || die
-	fi
-
-	python_fix_shebang "${S}"
-	default
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins data.json *.py
-
-	python_optimize "${D}/usr/share/${PN}"
-
-	make_wrapper ${PN} "${EPYTHON} /usr/share/${PN}/sherlock.py"
-	make_wrapper ${PN}-get-sitelist "${EPYTHON} /usr/share/${PN}/site_list.py"
-
-	dodoc *.md Dockerfile
-}
diff --git a/net-misc/sherlock/sherlock-0.10.5-r1.ebuild b/net-misc/sherlock/sherlock-0.10.5-r1.ebuild
deleted file mode 100644
index dd6689a58..000000000
--- a/net-misc/sherlock/sherlock-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Find usernames across social networks"
-HOMEPAGE="https://github.com/sherlock-project/sherlock"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sherlock-project/sherlock"
-else
-	# snapshot: 20200213
-	HASH_COMMIT="f3a61fe7afa4abc0305c802e51c814c3d31d4b56"
-
-	SRC_URI="https://github.com/sherlock-project/sherlock/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
-	S="${WORKDIR}/${PN}-${HASH_COMMIT}"
-fi
-
-LICENSE="MIT"
-SLOT=0
-#IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/certifi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/PySocks[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-futures[${PYTHON_USEDEP}]
-		dev-python/soupsieve[${PYTHON_USEDEP}]
-		dev-python/torrequest[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		>=net-libs/stem-1.7.0[${PYTHON_USEDEP}]
-	')"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/add_support_custom_data_json.patch
-
-	if [[ ${PV} != *9999 ]]; then
-		sed -e "s/__version__ = \"\(.*\)\"/__version__ = \"${PV}\"/" \
-			-i sherlock.py || die
-	fi
-
-	python_fix_shebang "${S}"
-	default
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins data.json *.py
-
-	python_optimize "${D}/usr/share/${PN}"
-
-	make_wrapper ${PN} "${EPYTHON} /usr/share/${PN}/sherlock.py"
-	make_wrapper ${PN}-get-sitelist "${EPYTHON} /usr/share/${PN}/site_list.py"
-
-	dodoc *.md Dockerfile
-}
diff --git a/net-misc/sherlock/sherlock-0.10.9-r1.ebuild b/net-misc/sherlock/sherlock-0.10.9-r1.ebuild
deleted file mode 100644
index 390ae275f..000000000
--- a/net-misc/sherlock/sherlock-0.10.9-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Find usernames across social networks"
-HOMEPAGE="https://github.com/sherlock-project/sherlock"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sherlock-project/sherlock"
-else
-	# snapshot: 20200314
-	HASH_COMMIT="e781ed5e260e1fdb58410a3103adb2b95ce547c8"
-
-	SRC_URI="https://github.com/sherlock-project/sherlock/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
-	S="${WORKDIR}/${PN}-${HASH_COMMIT}"
-fi
-
-LICENSE="MIT"
-SLOT=0
-#IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/certifi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/PySocks[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-futures[${PYTHON_USEDEP}]
-		dev-python/soupsieve[${PYTHON_USEDEP}]
-		dev-python/torrequest[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		>=net-libs/stem-1.7.0[${PYTHON_USEDEP}]
-	')"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/add_support_custom_data_json.patch
-
-	if [[ ${PV} != *9999 ]]; then
-		sed -e "s/__version__ = \"\(.*\)\"/__version__ = \"${PV}\"/" \
-			-i sherlock.py || die
-	fi
-
-	python_fix_shebang "${S}"
-	default
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins data.json *.py
-
-	python_optimize "${D}/usr/share/${PN}"
-
-	make_wrapper ${PN} "${EPYTHON} /usr/share/${PN}/sherlock.py"
-	make_wrapper ${PN}-get-sitelist "${EPYTHON} /usr/share/${PN}/site_list.py"
-
-	dodoc *.md Dockerfile
-}
diff --git a/net-misc/sherlock/sherlock-0.11.1-r1.ebuild b/net-misc/sherlock/sherlock-0.11.1-r1.ebuild
deleted file mode 100644
index 7c6d1b4f1..000000000
--- a/net-misc/sherlock/sherlock-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Find usernames across social networks"
-HOMEPAGE="https://github.com/sherlock-project/sherlock"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sherlock-project/sherlock"
-else
-	# snapshot: 20200509
-	HASH_COMMIT="0ba49808878b3efe24029639dfcac7f55a02c0d0"
-
-	SRC_URI="https://github.com/sherlock-project/sherlock/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
-	S="${WORKDIR}/${PN}-${HASH_COMMIT}"
-fi
-
-LICENSE="MIT"
-SLOT=0
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/certifi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		>=dev-python/colorama-0.4.1[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-		dev-python/requests-futures[${PYTHON_USEDEP}]
-		dev-python/soupsieve[${PYTHON_USEDEP}]
-		dev-python/torrequest[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		>=net-libs/stem-1.8.0[${PYTHON_USEDEP}]
-	')"
-
-PATCHES=( "${FILESDIR}"/${P}_add_support_custom_data_json-r1.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}"
-
-	if [[ ${PV} != *9999 ]]; then
-		sed -e "s/__version__ = \"\(.*\)\"/__version__ = \"${PV}\"/" \
-			-i sherlock/sherlock.py || die
-	fi
-
-	if ! use test; then
-		rm -rf sherlock/tests || die
-	fi
-}
-
-src_test() {
-	"${EPYTHON}" -m unittest discover -v || die
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r *.py sherlock/* data_bad_site.json
-
-	python_optimize "${D}/usr/share/${PN}"
-
-	make_wrapper ${PN} "${EPYTHON} /usr/share/${PN}/sherlock.py"
-	make_wrapper ${PN}-get-sitelist "${EPYTHON} /usr/share/${PN}/site_list.py"
-
-	dodoc *.md Dockerfile
-}
diff --git a/net-misc/sherlock/sherlock-0.12.9-r1.ebuild b/net-misc/sherlock/sherlock-0.12.9-r1.ebuild
index f2f59b8a1..846034d12 100644
--- a/net-misc/sherlock/sherlock-0.12.9-r1.ebuild
+++ b/net-misc/sherlock/sherlock-0.12.9-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit eutils python-single-r1
+inherit python-single-r1 wrapper
 
 DESCRIPTION="Find usernames across social networks"
 HOMEPAGE="https://github.com/sherlock-project/sherlock"
diff --git a/net-misc/sherlock/sherlock-9999.ebuild b/net-misc/sherlock/sherlock-9999.ebuild
index abae8fae3..42d9fe689 100644
--- a/net-misc/sherlock/sherlock-9999.ebuild
+++ b/net-misc/sherlock/sherlock-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit eutils python-single-r1
+inherit python-single-r1 wrapper
 
 DESCRIPTION="Find usernames across social networks"
 HOMEPAGE="https://github.com/sherlock-project/sherlock"