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
 }