diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.0.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.0.0.ebuild
index 0789084e94..e784b2ceb3 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.0.0.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.0.0.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	>=dev-python/dnspython-2.2.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
 
 # Same than PATCHES but from repository's root directory,
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.1.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.1.0.ebuild
index 0789084e94..e784b2ceb3 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.1.0.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.1.0.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	>=dev-python/dnspython-2.2.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
 
 # Same than PATCHES but from repository's root directory,
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.2.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.2.0.ebuild
index 0789084e94..e784b2ceb3 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.2.0.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.2.0.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	>=dev-python/dnspython-2.2.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
 
 # Same than PATCHES but from repository's root directory,
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
index 0789084e94..e784b2ceb3 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	>=dev-python/dnspython-2.2.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
 
 # Same than PATCHES but from repository's root directory,
diff --git a/app-text/OCRmyPDF/OCRmyPDF-14.0.1-r4.ebuild b/app-text/OCRmyPDF/OCRmyPDF-14.0.1-r4.ebuild
index f92b9e0427..66be4ef2a7 100644
--- a/app-text/OCRmyPDF/OCRmyPDF-14.0.1-r4.ebuild
+++ b/app-text/OCRmyPDF/OCRmyPDF-14.0.1-r4.ebuild
@@ -45,7 +45,7 @@ distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
diff --git a/dev-cpp/xsimd/xsimd-10.0.0.ebuild b/dev-cpp/xsimd/xsimd-10.0.0.ebuild
index 0398f664b8..04d1cc82a4 100644
--- a/dev-cpp/xsimd/xsimd-10.0.0.ebuild
+++ b/dev-cpp/xsimd/xsimd-10.0.0.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# required because of manual install in src_install
+CMAKE_MAKEFILE_GENERATOR="emake"
+
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-any-r1
@@ -47,11 +50,21 @@ src_configure() {
 }
 
 src_compile() {
-	use test && cmake_src_compile xtest
-
 	if use doc; then
 		cd "${WORKDIR}/${P}/docs" || die
 		emake html BUILDDIR="${BUILD_DIR}"
 		HTML_DOCS=( "${BUILD_DIR}/html/." )
 	fi
 }
+
+src_test() {
+	cmake_src_compile xtest
+}
+
+src_install() {
+	# Default install target depends on tests with USE=test enabled.
+	# However, this is a header-only library.
+	DESTDIR="${D}" cmake_build install/fast "$@"
+
+	einstalldocs
+}
diff --git a/dev-cpp/xtensor/xtensor-0.24.4.ebuild b/dev-cpp/xtensor/xtensor-0.24.4.ebuild
index 141d6b4c08..4dd40f3963 100644
--- a/dev-cpp/xtensor/xtensor-0.24.4.ebuild
+++ b/dev-cpp/xtensor/xtensor-0.24.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-# required because of manuall install in src_install
+# required because of manual install in src_install
 CMAKE_MAKEFILE_GENERATOR="emake"
 
 PYTHON_COMPAT=( python3_{9..11} )
@@ -32,7 +32,7 @@ BDEPEND="
 		$(python_gen_any_dep '
 			dev-python/breathe[${PYTHON_USEDEP}]
 			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
 		')
 	)
 	test? ( dev-cpp/doctest )
@@ -45,7 +45,7 @@ python_check_deps() {
 	python_has_version \
 		"dev-python/breathe[${PYTHON_USEDEP}]" \
 		"dev-python/sphinx[${PYTHON_USEDEP}]" \
-		"dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+		"dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {
@@ -76,8 +76,6 @@ src_configure() {
 }
 
 src_compile() {
-	use test && cmake_src_compile xtest
-
 	if use doc; then
 		cd "${WORKDIR}/${P}/docs" || die
 		emake html BUILDDIR="${BUILD_DIR}"
@@ -85,10 +83,14 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	cmake_src_compile xtest
+}
+
 src_install() {
-	# default install starts compiling more tests
-	# that do not affect the header-only install image
-	DESTDIR="${D}" emake -C "${BUILD_DIR}" install/fast "$@"
+	# Default install target depends on tests with USE=test enabled.
+	# However, this is a header-only library.
+	DESTDIR="${D}" cmake_build install/fast "$@"
 
 	einstalldocs
 }
diff --git a/dev-cpp/xtl/xtl-0.7.5.ebuild b/dev-cpp/xtl/xtl-0.7.5.ebuild
index b1a9cf5daf..83b5fa6f99 100644
--- a/dev-cpp/xtl/xtl-0.7.5.ebuild
+++ b/dev-cpp/xtl/xtl-0.7.5.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# required because of manual install in src_install
+CMAKE_MAKEFILE_GENERATOR="emake"
+
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-any-r1
@@ -47,11 +50,21 @@ src_configure() {
 }
 
 src_compile() {
-	use test && cmake_src_compile xtest
-
 	if use doc; then
 		cd "${WORKDIR}/${P}/docs" || die
 		emake html BUILDDIR="${BUILD_DIR}"
 		HTML_DOCS=( "${BUILD_DIR}/html/." )
 	fi
 }
+
+src_test() {
+	cmake_src_compile xtest
+}
+
+src_install() {
+	# Default install target depends on tests with USE=test enabled.
+	# However, this is a header-only library.
+	DESTDIR="${D}" cmake_build install/fast "$@"
+
+	einstalldocs
+}
diff --git a/dev-libs/cglm/cglm-0.8.8.ebuild b/dev-libs/cglm/cglm-0.8.8.ebuild
index ddb415056e..6c3dd814c3 100644
--- a/dev-libs/cglm/cglm-0.8.8.ebuild
+++ b/dev-libs/cglm/cglm-0.8.8.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DOCS_BUILDER="sphinx"
 DOCS_AUTODOC=1
-DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DEPEND="dev-python/sphinx-rtd-theme"
 DOCS_DIR="${S}/docs/source"
 
 PYTHON_COMPAT=( python3_{8..11} )
diff --git a/dev-libs/cglm/cglm-0.8.9.ebuild b/dev-libs/cglm/cglm-0.8.9.ebuild
index 7ed5a83c3d..614d475d7f 100644
--- a/dev-libs/cglm/cglm-0.8.9.ebuild
+++ b/dev-libs/cglm/cglm-0.8.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DOCS_BUILDER="sphinx"
 DOCS_AUTODOC=1
-DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DEPEND="dev-python/sphinx-rtd-theme"
 DOCS_DIR="${S}/docs/source"
 
 PYTHON_COMPAT=( python3_{8..11} )
diff --git a/dev-libs/cglm/cglm-9999.ebuild b/dev-libs/cglm/cglm-9999.ebuild
index ddb415056e..6c3dd814c3 100644
--- a/dev-libs/cglm/cglm-9999.ebuild
+++ b/dev-libs/cglm/cglm-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DOCS_BUILDER="sphinx"
 DOCS_AUTODOC=1
-DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DEPEND="dev-python/sphinx-rtd-theme"
 DOCS_DIR="${S}/docs/source"
 
 PYTHON_COMPAT=( python3_{8..11} )
diff --git a/dev-libs/open62541/open62541-1.3.4.ebuild b/dev-libs/open62541/open62541-1.3.4.ebuild
index 76fd3ebe32..f18e142222 100644
--- a/dev-libs/open62541/open62541-1.3.4.ebuild
+++ b/dev-libs/open62541/open62541-1.3.4.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 		media-gfx/graphviz
 		$(python_gen_cond_dep '
 			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/dev-python/Pyro5/Pyro5-5.14.ebuild b/dev-python/Pyro5/Pyro5-5.14.ebuild
index eccfd73005..ec6292b273 100644
--- a/dev-python/Pyro5/Pyro5-5.14.ebuild
+++ b/dev-python/Pyro5/Pyro5-5.14.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-python/ascim/ascim-0.1.1.ebuild b/dev-python/ascim/ascim-0.1.1.ebuild
index edaf574292..38406f7de8 100644
--- a/dev-python/ascim/ascim-0.1.1.ebuild
+++ b/dev-python/ascim/ascim-0.1.1.ebuild
@@ -15,4 +15,4 @@ LICENSE="MIT"
 KEYWORDS="~amd64"
 SLOT="0"
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/dev-python/asyncpg/asyncpg-0.26.0.ebuild b/dev-python/asyncpg/asyncpg-0.26.0.ebuild
index 985b394948..1058223455 100644
--- a/dev-python/asyncpg/asyncpg-0.26.0.ebuild
+++ b/dev-python/asyncpg/asyncpg-0.26.0.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
 
 distutils_enable_tests unittest
 
-distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx-rtd-theme
 
 python_test() {
 	cd "${T}" || die
diff --git a/dev-python/asyncpg/asyncpg-0.27.0.ebuild b/dev-python/asyncpg/asyncpg-0.27.0.ebuild
index 8a3356cc1a..e696f61a19 100644
--- a/dev-python/asyncpg/asyncpg-0.27.0.ebuild
+++ b/dev-python/asyncpg/asyncpg-0.27.0.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
 
 distutils_enable_tests unittest
 
-distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx-rtd-theme
 
 python_test() {
 	cd "${T}" || die
diff --git a/dev-python/btrees/btrees-4.11.3.ebuild b/dev-python/btrees/btrees-4.11.3.ebuild
index d38e9be490..b1dda04f49 100644
--- a/dev-python/btrees/btrees-4.11.3.ebuild
+++ b/dev-python/btrees/btrees-4.11.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
 	)
 	test? (
 		dev-python/transaction[${PYTHON_USEDEP}]
diff --git a/dev-python/commandlines/commandlines-0.4.1.ebuild b/dev-python/commandlines/commandlines-0.4.1.ebuild
index dad5618314..7e43a09e30 100644
--- a/dev-python/commandlines/commandlines-0.4.1.ebuild
+++ b/dev-python/commandlines/commandlines-0.4.1.ebuild
@@ -19,4 +19,4 @@ KEYWORDS="~amd64"
 SLOT="0"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/dev-python/convertdate/convertdate-2.3.2.ebuild b/dev-python/convertdate/convertdate-2.3.2.ebuild
index 1b7607ac6d..d6a4786421 100644
--- a/dev-python/convertdate/convertdate-2.3.2.ebuild
+++ b/dev-python/convertdate/convertdate-2.3.2.ebuild
@@ -21,4 +21,4 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/dev-python/convertdate/convertdate-2.4.0.ebuild b/dev-python/convertdate/convertdate-2.4.0.ebuild
index c22d2b9cbb..008870f61c 100644
--- a/dev-python/convertdate/convertdate-2.4.0.ebuild
+++ b/dev-python/convertdate/convertdate-2.4.0.ebuild
@@ -21,4 +21,4 @@ distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
 	dev-python/myst_parser \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
diff --git a/dev-python/dateparser/dateparser-1.1.5.ebuild b/dev-python/dateparser/dateparser-1.1.5.ebuild
index 302f5a91a9..95d4ab91a4 100644
--- a/dev-python/dateparser/dateparser-1.1.5.ebuild
+++ b/dev-python/dateparser/dateparser-1.1.5.ebuild
@@ -42,7 +42,7 @@ EPYTEST_DESELECT=(
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 
 pkg_postinst() {
 	optfeature "calendars support" "dev-python/hijri-converter dev-python/convertdate"
diff --git a/dev-python/dateparser/dateparser-1.1.6.ebuild b/dev-python/dateparser/dateparser-1.1.6.ebuild
index 302f5a91a9..95d4ab91a4 100644
--- a/dev-python/dateparser/dateparser-1.1.6.ebuild
+++ b/dev-python/dateparser/dateparser-1.1.6.ebuild
@@ -42,7 +42,7 @@ EPYTEST_DESELECT=(
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 
 pkg_postinst() {
 	optfeature "calendars support" "dev-python/hijri-converter dev-python/convertdate"
diff --git a/dev-python/digitalocean/Manifest b/dev-python/digitalocean/Manifest
index 717b207918..a3069385eb 100644
--- a/dev-python/digitalocean/Manifest
+++ b/dev-python/digitalocean/Manifest
@@ -1,2 +1 @@
-DIST digitalocean-1.16.0.tar.gz 59077 BLAKE2B b44c045716967a192b4e79d562bd7af8af2ed3a0d6ea54490f2e15195c84476f25a661c80b5f1beda54e724a4177083a5d04682ca96855637cf626cd3397df17 SHA512 110614aeb33e2dab0564b4569058233916626d50da14d42f9702c9275f13442dccb7b77829b2dc8e97e8bbbd53d094116cebe9b3aedad920d2b0c156a5680bf7
 DIST digitalocean-1.17.0.gh.tar.gz 60261 BLAKE2B 1a3b8ffe955fdea616420d67e9cd1b07d81d3395d673770333b150a8044f6f93d16ab6ec93d0d5efb7579a2bd7fde57c394bc3fc3e58ad02db230f5bd48006bb SHA512 3b5f5adb5fac9693450954e568433cecb43152d4cb2b5709126dc7c69c6b84f19428dcd3688718588a986d3ea9170a956387f3050cd10a69ba89d5dcdf8e100c
diff --git a/dev-python/digitalocean/digitalocean-1.16.0.ebuild b/dev-python/digitalocean/digitalocean-1.17.0-r1.ebuild
similarity index 52%
rename from dev-python/digitalocean/digitalocean-1.16.0.ebuild
rename to dev-python/digitalocean/digitalocean-1.17.0-r1.ebuild
index 813a208c71..ac7a7f6ad0 100644
--- a/dev-python/digitalocean/digitalocean-1.16.0.ebuild
+++ b/dev-python/digitalocean/digitalocean-1.17.0-r1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Digitalocean API access library"
 HOMEPAGE="https://github.com/koalalorenzo/python-digitalocean"
-SRC_URI="https://github.com/koalalorenzo/python-digitalocean/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/python-digitalocean-${PV}
+SRC_URI="https://github.com/koalalorenzo/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/python-${P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -21,3 +20,8 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/jsonpickle[${PYTHON_USEDEP}]
 "
+BDEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs dev-python/alabaster
+
+distutils_enable_tests pytest
diff --git a/dev-python/digitalocean/digitalocean-1.17.0.ebuild b/dev-python/digitalocean/digitalocean-1.17.0.ebuild
index 79cdca88b9..69b793acaf 100644
--- a/dev-python/digitalocean/digitalocean-1.17.0.ebuild
+++ b/dev-python/digitalocean/digitalocean-1.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Digitalocean API access library"
diff --git a/dev-python/digitalocean/metadata.xml b/dev-python/digitalocean/metadata.xml
index f1206d1af4..b6df9d379f 100644
--- a/dev-python/digitalocean/metadata.xml
+++ b/dev-python/digitalocean/metadata.xml
@@ -5,4 +5,7 @@
   <email>egorr.berd@gmail.com</email>
   <name>Yahor Berdnikau</name>
 </maintainer>
+<upstream>
+  <remote-id type="github">koalalorenzo/python-digitalocean</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-markdownify/django-markdownify-0.9.2.ebuild b/dev-python/django-markdownify/django-markdownify-0.9.2.ebuild
index 344b4e7709..59df97da2e 100644
--- a/dev-python/django-markdownify/django-markdownify-0.9.2.ebuild
+++ b/dev-python/django-markdownify/django-markdownify-0.9.2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? ( ${RDEPEND} )
-	doc? ( dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] )
 "
 
 distutils_enable_sphinx docs/source --no-autodoc
diff --git a/dev-python/doubles/doubles-1.5.3.ebuild b/dev-python/doubles/doubles-1.5.3.ebuild
index 35e48daff9..843b4e6ab6 100644
--- a/dev-python/doubles/doubles-1.5.3.ebuild
+++ b/dev-python/doubles/doubles-1.5.3.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 
 DOCS=( CHANGES.rst CONTRIBUTING.rst README.rst )
 
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(
diff --git a/dev-python/factory_boy/factory_boy-3.2.1.ebuild b/dev-python/factory_boy/factory_boy-3.2.1.ebuild
index 590f9a8b96..0270fb6545 100644
--- a/dev-python/factory_boy/factory_boy-3.2.1.ebuild
+++ b/dev-python/factory_boy/factory_boy-3.2.1.ebuild
@@ -41,4 +41,4 @@ python_prepare_all() {
 
 distutils_enable_tests --install unittest
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-spelling
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-spelling
diff --git a/dev-python/fastavro/fastavro-1.7.0.ebuild b/dev-python/fastavro/fastavro-1.7.0.ebuild
index c70fe254b8..0ed408778b 100644
--- a/dev-python/fastavro/fastavro-1.7.0.ebuild
+++ b/dev-python/fastavro/fastavro-1.7.0.ebuild
@@ -38,7 +38,7 @@ EPYTEST_DESELECT=(
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 
 src_unpack() {
 	default
diff --git a/dev-python/font-v/font-v-2.1.0.ebuild b/dev-python/font-v/font-v-2.1.0.ebuild
index 6d6372a91d..069561113d 100644
--- a/dev-python/font-v/font-v-2.1.0.ebuild
+++ b/dev-python/font-v/font-v-2.1.0.ebuild
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-vcs/git )"
 
 distutils_enable_tests --install pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 
 src_test() {
 	#it want a git repo
diff --git a/dev-python/graphql-core/graphql-core-3.1.6.ebuild b/dev-python/graphql-core/graphql-core-3.1.6.ebuild
index 4884a2f364..5d07e1a4ab 100644
--- a/dev-python/graphql-core/graphql-core-3.1.6.ebuild
+++ b/dev-python/graphql-core/graphql-core-3.1.6.ebuild
@@ -25,4 +25,4 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/dev-python/grpclib/grpclib-0.4.2.ebuild b/dev-python/grpclib/grpclib-0.4.2.ebuild
index 7c1a95824f..508c55dad5 100644
--- a/dev-python/grpclib/grpclib-0.4.2.ebuild
+++ b/dev-python/grpclib/grpclib-0.4.2.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
-	'dev-python/sphinx_rtd_theme'
+	'dev-python/sphinx-rtd-theme'
 
 python_test() {
 	[[ ${EPYTHON} == python3.10 ]] && local EPYTEST_DESELECT=(
diff --git a/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild b/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
index 626db12681..474f699355 100644
--- a/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
+++ b/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
@@ -41,4 +41,4 @@ BDEPEND="
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
-	'dev-python/sphinx_rtd_theme'
+	'dev-python/sphinx-rtd-theme'
diff --git a/dev-python/hwi/hwi-2.0.2.ebuild b/dev-python/hwi/hwi-2.0.2.ebuild
index ea511a8476..4cec54be74 100644
--- a/dev-python/hwi/hwi-2.0.2.ebuild
+++ b/dev-python/hwi/hwi-2.0.2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 distutils_enable_tests unittest
 
 distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-rtd-theme \
 	dev-python/sphinxcontrib-autoprogram
 
 python_prepare_all() {
diff --git a/dev-python/opentracing/opentracing-2.4.0.ebuild b/dev-python/opentracing/opentracing-2.4.0.ebuild
index dac2e572eb..04314f8884 100644
--- a/dev-python/opentracing/opentracing-2.4.0.ebuild
+++ b/dev-python/opentracing/opentracing-2.4.0.ebuild
@@ -35,4 +35,4 @@ EPYTEST_IGNORE=(
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
diff --git a/dev-python/parsel/parsel-1.7.0.ebuild b/dev-python/parsel/parsel-1.7.0.ebuild
index 30d5eb07b9..f8031bf678 100644
--- a/dev-python/parsel/parsel-1.7.0.ebuild
+++ b/dev-python/parsel/parsel-1.7.0.ebuild
@@ -36,7 +36,7 @@ distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-notfound-page \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 
 src_prepare() {
 	distutils-r1_src_prepare
diff --git a/dev-python/praw/praw-7.6.0.ebuild b/dev-python/praw/praw-7.6.0.ebuild
index 5f75c851cf..a971ea5b3e 100644
--- a/dev-python/praw/praw-7.6.0.ebuild
+++ b/dev-python/praw/praw-7.6.0.ebuild
@@ -34,7 +34,7 @@ EPYTEST_DESELECT=(
 	tests/unit/models/reddit/test_submission.py::TestSubmission::test_comment_sort_warning__disabled
 )
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/praw/praw-7.6.1.ebuild b/dev-python/praw/praw-7.6.1.ebuild
index 5b20a24a89..91824ad075 100644
--- a/dev-python/praw/praw-7.6.1.ebuild
+++ b/dev-python/praw/praw-7.6.1.ebuild
@@ -29,7 +29,7 @@ BDEPEND="test? (
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-rtd-theme \
 	dev-python/sphinx-rtd-dark-mode
 
 python_prepare_all() {
diff --git a/dev-python/pygsl/pygsl-2.3.3.ebuild b/dev-python/pygsl/pygsl-2.3.3.ebuild
index 2f6daa9506..72f4777e01 100644
--- a/dev-python/pygsl/pygsl-2.3.3.ebuild
+++ b/dev-python/pygsl/pygsl-2.3.3.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+distutils_enable_sphinx doc dev-python/sphinx-rtd-theme
 distutils_enable_tests unittest
 
 python_configure() {
diff --git a/dev-python/pymeeus/pymeeus-0.5.11.ebuild b/dev-python/pymeeus/pymeeus-0.5.11.ebuild
index 86fce5fe26..745497b3df 100644
--- a/dev-python/pymeeus/pymeeus-0.5.11.ebuild
+++ b/dev-python/pymeeus/pymeeus-0.5.11.ebuild
@@ -24,4 +24,4 @@ KEYWORDS="~amd64"
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs/source \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
diff --git a/dev-python/pymeeus/pymeeus-0.5.12.ebuild b/dev-python/pymeeus/pymeeus-0.5.12.ebuild
index 86fce5fe26..745497b3df 100644
--- a/dev-python/pymeeus/pymeeus-0.5.12.ebuild
+++ b/dev-python/pymeeus/pymeeus-0.5.12.ebuild
@@ -24,4 +24,4 @@ KEYWORDS="~amd64"
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs/source \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
diff --git a/dev-python/pymemcache/pymemcache-4.0.0.ebuild b/dev-python/pymemcache/pymemcache-4.0.0.ebuild
index 89fbef6caa..3907241219 100644
--- a/dev-python/pymemcache/pymemcache-4.0.0.ebuild
+++ b/dev-python/pymemcache/pymemcache-4.0.0.ebuild
@@ -37,7 +37,7 @@ distutils_enable_tests pytest
 
 #distutils_enable_sphinx docs \
 #	dev-python/sphinxcontrib-apidoc \
-#	dev-python/sphinx_rtd_theme
+#	dev-python/sphinx-rtd-theme
 
 src_test() {
 	ememcached --start 11221
diff --git a/dev-python/python-betterproto/python-betterproto-2.0.0_beta4.ebuild b/dev-python/python-betterproto/python-betterproto-2.0.0_beta4.ebuild
index 83d67433e8..5be1e2ff29 100644
--- a/dev-python/python-betterproto/python-betterproto-2.0.0_beta4.ebuild
+++ b/dev-python/python-betterproto/python-betterproto-2.0.0_beta4.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
-	'>=dev-python/sphinx_rtd_theme-0.5.0'
+	'>=dev-python/sphinx-rtd-theme-0.5.0'
 
 python_prepare() {
 	default
diff --git a/dev-python/python-betterproto/python-betterproto-9999.ebuild b/dev-python/python-betterproto/python-betterproto-9999.ebuild
index 83d67433e8..5be1e2ff29 100644
--- a/dev-python/python-betterproto/python-betterproto-9999.ebuild
+++ b/dev-python/python-betterproto/python-betterproto-9999.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
-	'>=dev-python/sphinx_rtd_theme-0.5.0'
+	'>=dev-python/sphinx-rtd-theme-0.5.0'
 
 python_prepare() {
 	default
diff --git a/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild b/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild
index cd358edc75..3a4e4a1202 100644
--- a/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild
+++ b/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DOCS_BUILDER="sphinx"
 DOCS_DIR="${S}/docs"
-DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DEPEND="dev-python/sphinx-rtd-theme"
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 docs
diff --git a/dev-python/python-telegram-bot/python-telegram-bot-13.14.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-13.14.ebuild
index 768f64c897..952945957b 100644
--- a/dev-python/python-telegram-bot/python-telegram-bot-13.14.ebuild
+++ b/dev-python/python-telegram-bot/python-telegram-bot-13.14.ebuild
@@ -48,7 +48,7 @@ DEPEND="test? (
 )"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
 
 python_prepare_all() {
 	# do not make a test flaky report
diff --git a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
index 768f64c897..952945957b 100644
--- a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
+++ b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
@@ -48,7 +48,7 @@ DEPEND="test? (
 )"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
 
 python_prepare_all() {
 	# do not make a test flaky report
diff --git a/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild b/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
index 72152a861e..243132a9c7 100644
--- a/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
+++ b/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
@@ -41,7 +41,7 @@ distutils_enable_tests unittest
 
 distutils_enable_sphinx doc/source \
 	dev-python/recommonmark \
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 
 python_test() {
 	[[ ${EPYTHON} == pypy3 ]] && \
diff --git a/dev-python/restrictedpython/restrictedpython-6.0.ebuild b/dev-python/restrictedpython/restrictedpython-6.0.ebuild
index e8d2e5d832..bfea3aad73 100644
--- a/dev-python/restrictedpython/restrictedpython-6.0.ebuild
+++ b/dev-python/restrictedpython/restrictedpython-6.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	doc? ( dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild b/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild
index 0cafd2f65a..fc5349f2f5 100644
--- a/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild
+++ b/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 distutils_enable_tests pytest
 
 # requires self to build own documentation
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinx-argparse
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme dev-python/sphinx-argparse
 
 python_prepare_all() {
 	# needs test files in workdir to compile docs for some reason
diff --git a/dev-python/sphinx-hoverxref/sphinx-hoverxref-1.3.0.ebuild b/dev-python/sphinx-hoverxref/sphinx-hoverxref-1.3.0.ebuild
index db85821d6e..3da57d0a9e 100644
--- a/dev-python/sphinx-hoverxref/sphinx-hoverxref-1.3.0.ebuild
+++ b/dev-python/sphinx-hoverxref/sphinx-hoverxref-1.3.0.ebuild
@@ -44,6 +44,6 @@ distutils_enable_sphinx docs \
 	dev-python/sphinx-prompt \
 	dev-python/sphinx-tabs \
 	dev-python/sphinx-version-warning \
-	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-rtd-theme \
 	dev-python/sphinxcontrib-bibtex \
 	dev-python/sphinxemoji
diff --git a/dev-python/sphinx-rtd-dark-mode/sphinx-rtd-dark-mode-1.2.4.ebuild b/dev-python/sphinx-rtd-dark-mode/sphinx-rtd-dark-mode-1.2.4.ebuild
index bad53b4ac8..0ce5ac609a 100644
--- a/dev-python/sphinx-rtd-dark-mode/sphinx-rtd-dark-mode-1.2.4.ebuild
+++ b/dev-python/sphinx-rtd-dark-mode/sphinx-rtd-dark-mode-1.2.4.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-version-warning/sphinx-version-warning-1.1.2.ebuild b/dev-python/sphinx-version-warning/sphinx-version-warning-1.1.2.ebuild
index 5e2f41a343..3e8b9ae33f 100644
--- a/dev-python/sphinx-version-warning/sphinx-version-warning-1.1.2.ebuild
+++ b/dev-python/sphinx-version-warning/sphinx-version-warning-1.1.2.ebuild
@@ -25,5 +25,5 @@ RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 #	dev-python/sphinx-autoapi \
 #	dev-python/sphinx-prompt \
 #	dev-python/sphinx-tabs \
-#	dev-python/sphinx_rtd_theme \
+#	dev-python/sphinx-rtd-theme \
 #	dev-python/sphinxemoji
diff --git a/dev-python/tinyrpc/tinyrpc-1.1.5.ebuild b/dev-python/tinyrpc/tinyrpc-1.1.5.ebuild
index 686920f038..2686fd8d59 100644
--- a/dev-python/tinyrpc/tinyrpc-1.1.5.ebuild
+++ b/dev-python/tinyrpc/tinyrpc-1.1.5.ebuild
@@ -41,7 +41,7 @@ EPYTEST_IGNORE=(
 
 distutils_enable_tests pytest
 
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 
 pkg_postinst() {
 	optfeature "httpclient support" "dev-python/requests dev-python/websocket-client dev-python/gevent-websocket"
diff --git a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
index 5bd221cca2..c3f26e324c 100644
--- a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
+++ b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 DOCS_DEPEND="
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 	dev-python/typing-extensions
 "
 DOCS_DIR="${S}/docs/source"
diff --git a/dev-python/validator-collection/validator-collection-1.5.0.ebuild b/dev-python/validator-collection/validator-collection-1.5.0.ebuild
index a5a8e34081..55d966b306 100644
--- a/dev-python/validator-collection/validator-collection-1.5.0.ebuild
+++ b/dev-python/validator-collection/validator-collection-1.5.0.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	dev-python/jsonschema[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/sphinx-tabs[${PYTHON_USEDEP}]
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-util/reuse/reuse-1.0.0.ebuild b/dev-util/reuse/reuse-1.0.0.ebuild
index c6112b926a..69516ebf95 100644
--- a/dev-util/reuse/reuse-1.0.0.ebuild
+++ b/dev-util/reuse/reuse-1.0.0.ebuild
@@ -52,5 +52,5 @@ distutils_enable_tests pytest
 #distutils_enable_sphinx docs \
 	#dev-python/recommonmark \
 	#dev-python/sphinx-autodoc-typehints \
-	#dev-python/sphinx_rtd_theme \
+	#dev-python/sphinx-rtd-theme \
 	#dev-python/sphinxcontrib-apidoc
diff --git a/dev-util/reuse/reuse-1.1.0.ebuild b/dev-util/reuse/reuse-1.1.0.ebuild
index 23948b5c71..d5a1a9fcb9 100644
--- a/dev-util/reuse/reuse-1.1.0.ebuild
+++ b/dev-util/reuse/reuse-1.1.0.ebuild
@@ -44,7 +44,7 @@ distutils_enable_tests pytest
 #distutils_enable_sphinx docs \
 	#dev-python/recommonmark \
 	#dev-python/sphinx-autodoc-typehints \
-	#dev-python/sphinx_rtd_theme \
+	#dev-python/sphinx-rtd-theme \
 	#dev-python/sphinxcontrib-apidoc
 
 src_install() {
diff --git a/games-emulation/citra-canary/citra-canary-9999.ebuild b/games-emulation/citra-canary/citra-canary-9999.ebuild
index 61b4e81ab3..d008cee0be 100644
--- a/games-emulation/citra-canary/citra-canary-9999.ebuild
+++ b/games-emulation/citra-canary/citra-canary-9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	dev-cpp/cpp-httplib
 	dev-cpp/cpp-jwt
 	dev-cpp/robin-map"
 REQUIRED_USE="|| ( qt5 sdl )"
@@ -144,6 +145,9 @@ src_prepare() {
 		sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
 	fi
 
+	# Unbundle cpp-httplib
+	sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
+
 	# Unbundle cpp-jwt
 	sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
 	sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 02b932c580..3350fa6989 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	dev-cpp/cpp-httplib
 	dev-cpp/cpp-jwt
 	dev-cpp/robin-map"
 REQUIRED_USE="|| ( qt5 sdl )"
@@ -126,6 +127,9 @@ src_prepare() {
 		sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
 	fi
 
+	# Unbundle cpp-httplib
+	sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
+
 	# Unbundle cpp-jwt
 	sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
 	sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
diff --git a/games-emulation/flycast/flycast-9999.ebuild b/games-emulation/flycast/flycast-9999.ebuild
index f5235a1ccf..a77d24c1c2 100644
--- a/games-emulation/flycast/flycast-9999.ebuild
+++ b/games-emulation/flycast/flycast-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -67,12 +67,17 @@ src_prepare() {
 	sed -i -e '/add_subdirectory(core\/deps\/glslang/{N;s/.*/find_library(GLSLANG libglslang.so)\nfind_library(SPIRV libSPIRV.so)\ntarget_link_libraries(${PROJECT_NAME} PRIVATE ${GLSLANG} ${SPIRV})/}' CMakeLists.txt || die
 	sed -i -e '/include.*SPIRV/{s:":<glslang/:;s/"/>/}' core/rend/vulkan/shaders.h \
 		core/rend/vulkan/compiler.cpp || die
+	# Crazy commit fix: 8d0654c
+	sed -i -e '/maxMeshViewCountNV/a256,256,128,128,128,128,128,128,4,' \
+		core/rend/vulkan/compiler.cpp || die
 
 	# Unbundle xxHash
-	sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' CMakeLists.txt || die
+	sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' \
+		CMakeLists.txt || die
 
 	# Unbundle chdr
-	sed -i -e '/add_subdirectory.*chdr/d' -e 's/chdr-static/chdr/' -e 's:core/deps/chdr/include:/usr/include/chdr:' CMakeLists.txt || die
+	sed -i -e '/add_subdirectory.*chdr/d' -e 's/chdr-static/chdr/' \
+		-e 's:core/deps/chdr/include:/usr/include/chdr:' CMakeLists.txt || die
 
 	# Do not use ccache
 	sed -i -e '/find_program(CCACHE_FOUND/d' CMakeLists.txt
@@ -87,6 +92,9 @@ src_prepare() {
 	# Do not use ccache
 	sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt
 
+	# Revert crazy commit: #4408aa7
+	sed -i -e '/if(NOT APPLE AND (/s/.*/if( NOT APPLE )/' CMakeLists.txt
+
 	cmake_src_prepare
 }
 
diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml
index d012102f57..1fbef04469 100644
--- a/games-emulation/yuzu/metadata.xml
+++ b/games-emulation/yuzu/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Samuel Bauer</name>
-	<email>samuel.bauer@yahoo.fr</email>
-</maintainer>
-<use>
-	<flag name="cubeb">Enables the cubeb audio backend</flag>
-	<flag name="compatibility-list">Downloads the latest compatibility list</flag>
-	<flag name="discord">Enables Discord Rich Presence</flag>
-	<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
-	<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
-	<flag name="webservice">Enable web services (telemetry, etc.)</flag>
-</use>
+	<maintainer type="person">
+		<name>Samuel Bauer</name>
+		<email>samuel.bauer@yahoo.fr</email>
+	</maintainer>
+	<use>
+		<flag name="cubeb">Enables the cubeb audio backend</flag>
+		<flag name="compatibility-list">Downloads the latest compatibility list</flag>
+		<flag name="discord">Enables Discord Rich Presence</flag>
+		<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
+		<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
+		<flag name="webservice">Enable web services (telemetry, etc.)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">herumi/xbyak</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 6bc23133b6..77ba325b21 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -55,7 +55,7 @@ BDEPEND="
 	dev-util/glslang
 	discord? ( >=dev-libs/rapidjson-1.1.0 )
 "
-REQUIRED_USE="|| ( qt5 sdl )"
+REQUIRED_USE="|| ( qt5 sdl ) discord? ( webservice )"
 RESTRICT="!test? ( test )"
 
 pkg_setup() {
@@ -132,14 +132,14 @@ src_prepare() {
 	# LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9
 	sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die
 
-	sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die # libfmt >= 9
-
-	# Temporary use lastest gentoo vulkan
-	sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die
-	sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \
-		-e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \
-		-e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \
-		src/video_core/vulkan_common/vulkan_wrapper.cpp
+	# Allow compiling using older glslang
+	if has_version '<dev-util/glslang-1.3.238'; then
+		sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die
+		sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \
+			-e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \
+			-e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \
+			src/video_core/vulkan_common/vulkan_wrapper.cpp
+	fi
 
 	cmake_src_prepare
 }
diff --git a/media-gfx/fontbakery/fontbakery-0.7.38-r1.ebuild b/media-gfx/fontbakery/fontbakery-0.7.38-r1.ebuild
index 5230665434..0cf14ba644 100644
--- a/media-gfx/fontbakery/fontbakery-0.7.38-r1.ebuild
+++ b/media-gfx/fontbakery/fontbakery-0.7.38-r1.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 distutils_enable_tests pytest
 # distutils_enable_sphinx docs/source \
 # 	"<dev-python/sphinx-4.0" \
-# 	dev-python/sphinx_rtd_theme \
+# 	dev-python/sphinx-rtd-theme \
 # 	dev-python/recommonmark
 
 pkg_setup() {
diff --git a/media-gfx/fontbakery/fontbakery-0.8.10-r1.ebuild b/media-gfx/fontbakery/fontbakery-0.8.10-r1.ebuild
index cde5a0d5d2..46bb2b3117 100644
--- a/media-gfx/fontbakery/fontbakery-0.8.10-r1.ebuild
+++ b/media-gfx/fontbakery/fontbakery-0.8.10-r1.ebuild
@@ -56,7 +56,7 @@ DEPEND="
 distutils_enable_tests pytest
 # distutils_enable_sphinx docs/source \
 # 	"<dev-python/sphinx-4.0" \
-# 	dev-python/sphinx_rtd_theme \
+# 	dev-python/sphinx-rtd-theme \
 # 	dev-python/recommonmark
 
 pkg_setup() {
diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.148.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.148.ebuild
index 624da5fd63..1be5fb7ccd 100644
--- a/net-im/discord-canary-bin/discord-canary-bin-0.0.148.ebuild
+++ b/net-im/discord-canary-bin/discord-canary-bin-0.0.148.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl-canary.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="mirror bindist"
+RESTRICT="bindist mirror strip test"
 
 RDEPEND="
 	app-accessibility/at-spi2-atk:2
@@ -55,6 +55,7 @@ S="${WORKDIR}"
 
 QA_PREBUILT="
 	opt/discord-canary/${MY_BIN}
+	opt/discord-canary/chrome_crashpad_handler
 	opt/discord-canary/chrome-sandbox
 	opt/discord-canary/libffmpeg.so
 	opt/discord-canary/libvk_swiftshader.so
diff --git a/sys-boot/limine/Manifest b/sys-boot/limine/Manifest
index 1a3f7d6827..5b31c9a5d8 100644
--- a/sys-boot/limine/Manifest
+++ b/sys-boot/limine/Manifest
@@ -3,3 +3,4 @@ DIST limine-3.0.tar.xz 3164168 BLAKE2B fedd161ec8957fd2b3245d8a7a6bffaeab4fa7629
 DIST limine-3.4.3.tar.xz 3165344 BLAKE2B fe2afef5c960d9cfb78883ebe02d0fab754e40b466630ec3959d77e3f62f533e94d0ba3ecfda06688b8705140514c9aa4bb5c9e3c91ef884879e9e75c24fcd61 SHA512 986f95e3a12b5d4ae5f166f4d7388aa5feb12fa4b03f0acb8aa00a7494fbd37e53961b5afc2a85b1f399a742a78b72f70c9268792f652a64a491a142d3260256
 DIST limine-3.4.4.tar.xz 3166260 BLAKE2B 67645f3461c43b7d600eb9353d8505d2b61abea285eaf4498020c6e19b59b18eccda01316210a918dff712548ad5c08e937c33a5e6ff88bb8a81cc584ae11d87 SHA512 cf5b781963e98379bd8b53819c3afd1e4160f8f088f257131e392aa76f7f7ef71c3a67ae7274514afe30e52f06eb3c52d24a86a482ca6631c4ebddb692be6794
 DIST limine-3.4.5.tar.xz 3166660 BLAKE2B 55ddb79af352c1e515b0d423a4e41c50c2ca67f7c3715182c27696c1f41cb271d2d7d967b41430f7782f183899675c3e6c7622805a2953d6e4459cd33ed1d343 SHA512 cc72d3612e757ad79aa5801540581e8e8de568d5cb60b3e4edd6e68ccba40f2a42ceaa6b649aa1c60895be1c528c6e5892a3dfc3791b78d9d3780baf47b98eb0
+DIST limine-4.20230212.1.tar.xz 725084 BLAKE2B d602c70d2d716f7025d81ead55139f3a964f23dbf55a30bc74d11ef920cc698e3e519400df119f4b718e654d176c5b3fb23ac08fa506655c331f5866771fe541 SHA512 416b43d205b8034bb0cbd5ffd0eda9cc972ca5718c71ec5253275c3611b4560a92f99a0fa7c207ff9fb35d2636826cd51d0088e1cda7f1d5e83b7d31108c6f01
diff --git a/sys-boot/limine/limine-4.20230212.1.ebuild b/sys-boot/limine/limine-4.20230212.1.ebuild
new file mode 100644
index 0000000000..a87c8f4a01
--- /dev/null
+++ b/sys-boot/limine/limine-4.20230212.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Limine is a modern, advanced x86/x86_64 BIOS/UEFI multiprotocol bootloader"
+HOMEPAGE="https://limine-bootloader.org/"
+SRC_URI="https://github.com/limine-bootloader/limine/releases/download/v${PV}/limine-${PV}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+bios +bios-pxe +bios-cd +limine-deploy +uefi +cd-efi +uefi32 +uefi64 +uefiaa64"
+REQUIRED_USE="
+	uefi32? ( uefi )
+	uefi64? ( uefi )
+	uefiaa64? ( uefi )
+	cd-efi? ( uefi )
+	uefi? ( || ( uefi32 uefi64 uefiaa64 cd-efi ) )
+
+	bios-pxe? ( bios )
+	bios-cd? ( bios )
+	limine-deploy? ( bios )
+	bios? ( || ( bios-pxe bios-cd limine-deploy ) )
+"
+
+MY_LLVM_TARGETS="AArch64 ARM X86"
+MY_LLVM_FLAGS="llvm_targets_${MY_LLVM_TARGETS// /(-),llvm_targets_}(-)"
+
+BDEPEND="
+	app-arch/gzip
+	dev-lang/nasm
+	sys-apps/findutils
+	sys-devel/clang[${MY_LLVM_FLAGS}]
+	sys-devel/lld
+	sys-devel/llvm[${MY_LLVM_FLAGS}]
+
+	cd-efi? ( sys-fs/mtools )
+"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable bios)"
+		"$(use_enable bios-cd)"
+		"$(use_enable bios-pxe)"
+		"$(use_enable limine-deploy)"
+
+		"$(use_enable uefi)"
+		"$(use_enable uefi32 uefi-ia32)"
+		"$(use_enable uefi64 uefi-x86-64)"
+		"$(use_enable uefiaa64 uefi-aarch64)"
+		"$(use_enable cd-efi)"
+	)
+
+	CROSS_TOOLCHAIN=llvm \
+	econf "${myconf[@]}"
+}
diff --git a/sys-boot/limine/metadata.xml b/sys-boot/limine/metadata.xml
index 62b2da5b84..2497aa5fe3 100644
--- a/sys-boot/limine/metadata.xml
+++ b/sys-boot/limine/metadata.xml
@@ -2,9 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>arsen@aarsen.me</email>
+    <email>arsen@gentoo.org</email>
     <name>Arsen Arsenović</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">limine-bootloader/limine</remote-id>
+  </upstream>
   <use>
     <flag name="uefi">
       Enable UEFI support.
@@ -15,6 +18,9 @@
     <flag name="uefi64">
       Enable 64-bit UEFI support.
     </flag>
+    <flag name="uefiaa64">
+      Enable AArch64 UEFI support.
+    </flag>
     <flag name="eltorito-efi">
       Enable building eltorito-efi.bin using <pkg>sys-fs/mtools</pkg>.
     </flag>
diff --git a/sys-cluster/fti/fti-1.6-r1.ebuild b/sys-cluster/fti/fti-1.6-r1.ebuild
index 74bb2c5804..e10d794818 100644
--- a/sys-cluster/fti/fti-1.6-r1.ebuild
+++ b/sys-cluster/fti/fti-1.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 DOCS_BUILDER="sphinx"
 DOCS_DEPEND="
 	dev-python/breathe
-	dev-python/sphinx_rtd_theme
+	dev-python/sphinx-rtd-theme
 "
 DOCS_DIR="${S}/docs/source"
 FORTRAN_NEEDED="fortran"
diff --git a/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild b/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild
index 4bb32ac07d..f580f67e43 100644
--- a/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild
+++ b/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild
@@ -15,12 +15,13 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-BDEPEND="
-	dev-lang/lazarus
-"
+BDEPEND="dev-lang/lazarus"
 
-# I don't know yet how not to strip debug info during lazbuild build
-QA_PRESTRIPPED="usr/bin/ddrescueview"
+# Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it.
+QA_FLAGS_IGNORED="usr/bin/ddrescueview"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+RESTRICT="strip"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild b/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild
index a367100ef6..6991153059 100644
--- a/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild
+++ b/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 BDEPEND="
 	doc? (
 		dev-python/sphinx
-		dev-python/sphinx_rtd_theme
+		dev-python/sphinx-rtd-theme
 		dev-python/sphinxemoji
 	)
 "