diff --git a/dev-libs/luksmeta/files/luksmeta-tests.patch b/dev-libs/luksmeta/files/luksmeta-tests.patch
index aeca588619..2cf4a4ae26 100644
--- a/dev-libs/luksmeta/files/luksmeta-tests.patch
+++ b/dev-libs/luksmeta/files/luksmeta-tests.patch
@@ -1,4 +1,3 @@
-# Closes Gentoo bug 837308
 # This patch backports the master branch's test-lm-{big,one,two}.c and test-luksmeta.c
 # due to failing tests on v9 tag (see https://bugs.gentoo.org/837308)
 
diff --git a/dev-libs/luksmeta/luksmeta-9.ebuild b/dev-libs/luksmeta/luksmeta-9-r1.ebuild
similarity index 76%
rename from dev-libs/luksmeta/luksmeta-9.ebuild
rename to dev-libs/luksmeta/luksmeta-9-r1.ebuild
index b451e73eb6..1d04bcebd6 100644
--- a/dev-libs/luksmeta/luksmeta-9.ebuild
+++ b/dev-libs/luksmeta/luksmeta-9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,15 +20,19 @@ BDEPEND="man? ( app-text/asciidoc )
 	dev-build/libtool"
 
 PATCHES=(
+	# https://bugs.gentoo.org/837308
 	"${FILESDIR}/${PN}-tests.patch"
 )
 
 src_prepare() {
 	default
 	eautoreconf
+	# Bug https://bugs.gentoo.org/921710
+	sed -i -e '/^-Werror \\$/d' configure.ac || die
 }
 
 src_install() {
 	default
+	# Bug https://bugs.gentoo.org/839609
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 78cc922140..772bab2d85 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,2 +1 @@
-DIST eventlet-0.35.1.tar.gz 548382 BLAKE2B afdbcbaf22c7ec5dc0f73fa03dfe34bab7a5ee53faa76beaf0c624755b3d86835813c0be7f7451d4b9f073c1bb737917dd2a6864a233bf6a41e33fc7dc076af6 SHA512 e7f20514a35a070663c86197e4e5ffb3a0fbf81f386c750d3c5b13c2837df29aa09a0d934cdcb4062a310c20f2f2e4cb33c14777b387887f1114b410f21e4d24
 DIST eventlet-0.35.2.tar.gz 548860 BLAKE2B 0c969b11b375af0ca2e556706da8883d2812d591b005dc2b1de68496fa9e20cfffea42a055d702275dd0aaa0f5195aaf1d71629c477db9169393046b8ac6193e SHA512 81d1a49fc81287dbbeac17dbdd2bd736b9b4e90c85cae6462b3c9af19bf8e052c82bda6b4a2a789e7377faeafe1f0de97b7866662dddd1a480e26d993558697b
diff --git a/dev-python/eventlet/eventlet-0.35.1.ebuild b/dev-python/eventlet/eventlet-0.35.2-r1.ebuild
similarity index 87%
rename from dev-python/eventlet/eventlet-0.35.1.ebuild
rename to dev-python/eventlet/eventlet-0.35.2-r1.ebuild
index cdd4ac7b36..6007a0aee9 100644
--- a/dev-python/eventlet/eventlet-0.35.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.35.2-r1.ebuild
@@ -24,5 +24,9 @@ RDEPEND="
 	test? (	dev-python/pyopenssl[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	dev-python/hatchling[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/eventlet/eventlet-0.35.2.ebuild b/dev-python/eventlet/eventlet-0.35.2.ebuild
deleted file mode 100644
index cdd4ac7b36..0000000000
--- a/dev-python/eventlet/eventlet-0.35.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Concurrent networking library for Python"
-HOMEPAGE="https://github.com/eventlet/eventlet/
-	https://pypi.org/project/eventlet/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (	dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest