diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild
index 924742f74d..adc0251a2b 100644
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild
@@ -5,7 +5,9 @@
 
 EAPI=8
 
-inherit cargo
+LLVM_COMPAT=( {18..19} )
+
+inherit cargo llvm-r1
 
 DESCRIPTION="A C ABI library which exposes Signal protocol logic"
 HOMEPAGE="https://github.com/signalapp/libsignal"
@@ -23,7 +25,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="
 	dev-libs/protobuf
-	sys-devel/clang
+	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
 "
 
 src_unpack() {
diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild
index 924742f74d..adc0251a2b 100644
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild
@@ -5,7 +5,9 @@
 
 EAPI=8
 
-inherit cargo
+LLVM_COMPAT=( {18..19} )
+
+inherit cargo llvm-r1
 
 DESCRIPTION="A C ABI library which exposes Signal protocol logic"
 HOMEPAGE="https://github.com/signalapp/libsignal"
@@ -23,7 +25,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="
 	dev-libs/protobuf
-	sys-devel/clang
+	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
 "
 
 src_unpack() {
diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild
index 0956528621..6f8f1f580d 100644
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild
@@ -5,7 +5,9 @@
 
 EAPI=8
 
-inherit cargo
+LLVM_COMPAT=( {18..19} )
+
+inherit cargo llvm-r1
 
 DESCRIPTION="A C ABI library which exposes Signal protocol logic"
 HOMEPAGE="https://github.com/signalapp/libsignal"
@@ -23,7 +25,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="
 	dev-libs/protobuf
-	sys-devel/clang
+	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
 "
 
 src_unpack() {