diff --git a/dev-libs/libsignal-ffi/Manifest b/dev-libs/libsignal-ffi/Manifest
index 1ee6c0f..c50d8dc 100644
--- a/dev-libs/libsignal-ffi/Manifest
+++ b/dev-libs/libsignal-ffi/Manifest
@@ -1,4 +1,2 @@
-DIST libsignal-ffi-0.57.1-vendor.tar.xz 48036284 BLAKE2B 502983ec4b6a5d4db3376d23e8a4b1a45ebc60786f3a7ba4df7e18755f5a6f76e04644c7f19afa5beaf67152b7ab11e92c36c4e2f8a5ec8a5a9d699f2273115f SHA512 489022a25987caa785dcd2fa40735662c217276342e37e4c5947b983fd1fd55a2f7350eb7dd887ccf6e3e0876804ac959b90d7e1f7bb7482f12bd178b748e084
-DIST libsignal-ffi-0.57.1.gh.tar.gz 1664107 BLAKE2B 9e00a7a7878d62cca468050843114f6bee0ed7d2592a5c7eb46d0fc98c1e1f95ba142ddf71be1df00fed55fe3054b0285729a43d46534cbdb21540bf1c9c3f73 SHA512 88560c23ece6b8cbbf38020b1ae7ecf1b90c10a484d270c83dc56c402dcbd1013e6b260ac0e150b28a912cd4c190817a71c7de4632c0ee360f6b4e9c7f82dcd3
 DIST libsignal-ffi-0.62.0-vendor.tar.xz 42333112 BLAKE2B 10d412420ab9c21217ee0fa28f1d4c4243afc0c43833723b84688b5b3a6b1eb34fd1033bbc8b1ed4ef8a4ec6ce4801a9273188309da9953d6e868599c9f2b3c4 SHA512 f1440b6c74d9b6d6176a6d31e6b563843edef4a993e75fb8b52b5195aebb0f32bb498c425fedc0a1479b7087ee95af47b93779be82a15fb6ace54d448071880e
 DIST libsignal-ffi-0.62.0.gh.tar.gz 1784929 BLAKE2B 5dea79062c1f1342d64a9bbac8fdd7980260c73962a2eef60a61b84ecf3c21a471f6d400b5777c1ee3a297d32c63bfceaa6fa229bd0212d2bd492934470ccb8f SHA512 2a1d171a6bf9f1dfea9fc1fbc4f200c8b9e2ccb30d9d63f29007f252ff79ae7d149ab5707a8e430010da90ad1e3112475bd0eba8efb5cc011d5e3098aa1e26de
diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.57.1.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.57.1.ebuild
deleted file mode 100644
index 54c9f73..0000000
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.57.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.13.1
-
-EAPI=8
-
-CRATES=" "
-
-inherit cargo rust-toolchain
-
-DESCRIPTION="A C ABI library which exposes Signal protocol logic"
-HOMEPAGE="https://github.com/signalapp/libsignal"
-SRC_URI="
-	https://github.com/signalapp/libsignal/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://herbizarre.swordarmor.fr/garbage/${P}-vendor.tar.xz
-"
-S="${WORKDIR}/libsignal-${PV}/rust/bridge/ffi"
-
-LICENSE="AGPL-3"
-# Dependent crate licenses
-LICENSE+=" AGPL-3 Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-BDEPEND="
-	dev-libs/protobuf
-	sys-devel/clang
-"
-
-src_unpack() {
-	default
-	cargo_gen_config
-	ln -s "${WORKDIR}/vendor/" "${WORKDIR}/libsignal-${PV}/vendor" || die
-	sed -i "${ECARGO_HOME}/config.toml" -e '/source.crates-io/d'  || die
-	sed -i "${ECARGO_HOME}/config.toml" -e '/replace-with = "gentoo"/d'  || die
-	sed -i "${ECARGO_HOME}/config.toml" -e '/local-registry = "\/nonexistent"/d'  || die
-	cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config.toml" || die
-}
-
-src_install() {
-	if use debug; then
-		TARGET=debug
-	else
-		TARGET=release
-	fi
-
-	dolib.a "${WORKDIR}/${P/-ffi/}/target/$(rust_abi)/${TARGET}/${PN/-/_}.a"
-}
diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.62.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.62.0.ebuild
index 54c9f73..15913c9 100644
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.62.0.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.62.0.ebuild
@@ -26,7 +26,7 @@ IUSE="debug"
 
 BDEPEND="
 	dev-libs/protobuf
-	sys-devel/clang
+	llvm-core/clang
 "
 
 src_unpack() {
diff --git a/metadata/md5-cache/dev-libs/libsignal-ffi-0.57.1 b/metadata/md5-cache/dev-libs/libsignal-ffi-0.57.1
deleted file mode 100644
index e80aceb..0000000
--- a/metadata/md5-cache/dev-libs/libsignal-ffi-0.57.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/protobuf sys-devel/clang || ( dev-lang/rust-bin:1.83.0 dev-lang/rust:1.83.0 dev-lang/rust-bin:1.82.0 dev-lang/rust:1.82.0 dev-lang/rust-bin:1.81.0 dev-lang/rust:1.81.0 dev-lang/rust-bin:1.80.1 dev-lang/rust:1.80.1 dev-lang/rust-bin:1.79.0 dev-lang/rust:1.79.0 dev-lang/rust-bin:1.78.0 dev-lang/rust:1.78.0 dev-lang/rust-bin:1.77.1 dev-lang/rust:1.77.1 dev-lang/rust-bin:1.76.0 dev-lang/rust:1.76.0 dev-lang/rust-bin:1.75.0 dev-lang/rust:1.75.0 dev-lang/rust-bin:1.74.1 dev-lang/rust:1.74.1 dev-lang/rust-bin:1.71.1 dev-lang/rust:1.71.1 )
-DEFINED_PHASES=compile configure install setup test unpack
-DESCRIPTION=A C ABI library which exposes Signal protocol logic
-EAPI=8
-HOMEPAGE=https://github.com/signalapp/libsignal
-INHERIT=cargo rust-toolchain
-IUSE=debug debug
-KEYWORDS=~amd64
-LICENSE=AGPL-3 AGPL-3 Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016
-SLOT=0
-SRC_URI=https://github.com/signalapp/libsignal/archive/v0.57.1.tar.gz -> libsignal-ffi-0.57.1.gh.tar.gz https://herbizarre.swordarmor.fr/garbage/libsignal-ffi-0.57.1-vendor.tar.xz
-_eclasses_=toolchain-funcs	fa554cc3cff825d21dfe3f24841e29cf	multilib	b2a329026f2e404e9e371097dda47f96	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multiprocessing	1e32df7deee68372153dca65f4a7c21f	rust	55e231f09fddb09cbbaa254cf234368b	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	cargo	b5f350ebe96460cff090d0f2ae7e698a
-_md5_=a71dd12bf938d4ed85fdabf4cb73716d
diff --git a/metadata/md5-cache/dev-libs/libsignal-ffi-0.62.0 b/metadata/md5-cache/dev-libs/libsignal-ffi-0.62.0
index bdc0f6e..bc07292 100644
--- a/metadata/md5-cache/dev-libs/libsignal-ffi-0.62.0
+++ b/metadata/md5-cache/dev-libs/libsignal-ffi-0.62.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-libs/protobuf sys-devel/clang || ( dev-lang/rust-bin:1.83.0 dev-lang/rust:1.83.0 dev-lang/rust-bin:1.82.0 dev-lang/rust:1.82.0 dev-lang/rust-bin:1.81.0 dev-lang/rust:1.81.0 dev-lang/rust-bin:1.80.1 dev-lang/rust:1.80.1 dev-lang/rust-bin:1.79.0 dev-lang/rust:1.79.0 dev-lang/rust-bin:1.78.0 dev-lang/rust:1.78.0 dev-lang/rust-bin:1.77.1 dev-lang/rust:1.77.1 dev-lang/rust-bin:1.76.0 dev-lang/rust:1.76.0 dev-lang/rust-bin:1.75.0 dev-lang/rust:1.75.0 dev-lang/rust-bin:1.74.1 dev-lang/rust:1.74.1 dev-lang/rust-bin:1.71.1 dev-lang/rust:1.71.1 )
+BDEPEND=dev-libs/protobuf llvm-core/clang || ( dev-lang/rust-bin:1.83.0 dev-lang/rust:1.83.0 dev-lang/rust-bin:1.82.0 dev-lang/rust:1.82.0 dev-lang/rust-bin:1.81.0 dev-lang/rust:1.81.0 dev-lang/rust-bin:1.80.1 dev-lang/rust:1.80.1 dev-lang/rust-bin:1.79.0 dev-lang/rust:1.79.0 dev-lang/rust-bin:1.78.0 dev-lang/rust:1.78.0 dev-lang/rust-bin:1.77.1 dev-lang/rust:1.77.1 dev-lang/rust-bin:1.76.0 dev-lang/rust:1.76.0 dev-lang/rust-bin:1.75.0 dev-lang/rust:1.75.0 dev-lang/rust-bin:1.74.1 dev-lang/rust:1.74.1 dev-lang/rust-bin:1.71.1 dev-lang/rust:1.71.1 )
 DEFINED_PHASES=compile configure install setup test unpack
 DESCRIPTION=A C ABI library which exposes Signal protocol logic
 EAPI=8
@@ -10,4 +10,4 @@ LICENSE=AGPL-3 AGPL-3 Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016
 SLOT=0
 SRC_URI=https://github.com/signalapp/libsignal/archive/v0.62.0.tar.gz -> libsignal-ffi-0.62.0.gh.tar.gz https://herbizarre.swordarmor.fr/garbage/libsignal-ffi-0.62.0-vendor.tar.xz
 _eclasses_=toolchain-funcs	fa554cc3cff825d21dfe3f24841e29cf	multilib	b2a329026f2e404e9e371097dda47f96	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multiprocessing	1e32df7deee68372153dca65f4a7c21f	rust	55e231f09fddb09cbbaa254cf234368b	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	cargo	b5f350ebe96460cff090d0f2ae7e698a
-_md5_=a71dd12bf938d4ed85fdabf4cb73716d
+_md5_=0a1b1e8e0a2f499322447e2e869e7206