gentoo auto-resync : 10:11:2024 - 03:03:09

20 files changed, 322 insertions, 101 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 490c1bdf86d7..abadfdd0b98c 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 714075b924f0..2d409fb4444d 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,6 @@
 DIST libsecret-0.21.1.tar.xz 190796 BLAKE2B 862c2aac0c519d2607c1c5b057d1e0d00d3d5bce06744ab8c6e074393ede2f154af9ab3ee988820c936c8c22dba205ee7bd570287aaa47e64fde21ae3a7dfc2b SHA512 e201b2292280c355d08f8bd2d90d6d785d7b618c82e731eb9c051599a24d8f6a0cc3e271b1876d738f4a15aab24c2b6607b6d15d4335a990e74bb0371fe941ae
 DIST libsecret-0.21.4.tar.xz 206636 BLAKE2B c2f938e667b229e3dbe05e4193459b24f79d874348fda39423712ef92fa0c056129eaf646fbcfab1d7a1ae40982909f4882b5e66c294a2ba648fdd07c88e5909 SHA512 4731d9b2809a867f59e0702a55d1577ee0a968826c3df40717b1a6f6ea3f9d94ed95457dd82070d2914f5b1911d49fd6ae340bec6f4bcf88b6c804782ae7a24e
 EBUILD libsecret-0.21.1.ebuild 3632 BLAKE2B 9ea840eb408ebac6ab30c2a2f33d51a888c04794b2b0b369b12b2e640ece9fd12942f1a7d42f4c9ca8667f004230f903003f7160b9d5c4ade7714a19267ce2a5 SHA512 52e39f15751e5b30166107a00bf63114091b6bc445d9a031b72ca33f700117fb915d0c581f6a2ab5c53c2ae6325ec6a384cdbaf17976c11306736355230c6607
+EBUILD libsecret-0.21.4-r1.ebuild 3971 BLAKE2B 3260709583467ddca09d188531568cc415d5071f72031de0d06d30844bac125410015ac47cdd87ee9fce0ab024d35a58969b2400b0d21e79cb88ba8b5073d2a2 SHA512 5166a4f5299db595950f314b1fcfe15df572ad4efe5111372547676fedccb3da2f63f8c933fed80612a5324026b04136dc2305b76e0b22a697b6f31978b6bb7d
 EBUILD libsecret-0.21.4.ebuild 3941 BLAKE2B a621ea9ee9ae823a3a0df32668f19c79981f754633a0746040eb7d643a6790f78413dd3f670fcdcc9c98aec71ca22945baa9a2f33a8e400d495f8a62ae2efad6 SHA512 b74fdf1cb92ef42e09357625fb661b6f279b795d470fa6a84cc5d83d359c6e1b5d8783b4ce920ab19a35c90e2901d7818897bee0e997585f754e44f4383d1664
-MISC metadata.xml 753 BLAKE2B d5443d99217f25701661fead61c655a14171ba91421d01b1d6871b7f31ba8d229b3b7e3016317e3c8cc67ca246dfe6598d71e6ca25f599e07f95507c4c067eb6 SHA512 67dcafbfee4b47f0daa50dd2442449ea4e144e723b80b56faf29667e32ef7a2b0fd8515d43f033f091bb140470fb0bbf25cd9255344c58aa8319e13d85e29d76
+MISC metadata.xml 812 BLAKE2B d36ccd893f4781a8de0189c3afa0c6f4c5c4cc75bb8bf0ed15878a687313aa727973a3d223613064c0d174d24b9b644123b08b2639514f553392f0aa563e4e47 SHA512 7d688d62a72da7bdb98cdd60c16bee970510eba4e6e0a2234bfc7ab561738f35bb117dc9c0141c1966dec1653ca4227150b85bfb19e4387d7e9629c3e4a5804c
diff --git a/app-crypt/libsecret/libsecret-0.21.4-r1.ebuild b/app-crypt/libsecret/libsecret-0.21.4-r1.ebuild
new file mode 100644
index 000000000000..3abed3946b52
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.21.4-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+crypt +gcrypt gnutls gtk-doc +introspection pam test test-rust tpm +vala"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+	crypt? ( || ( gcrypt gnutls ) )
+"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	gcrypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.8.2:0=[${MULTILIB_USEDEP}] )
+	pam? (
+		sys-libs/pam
+		sys-libs/pam_wrapper )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		test-rust? ( introspection? ( >=dev-libs/gjs-1.32 ) )
+		tpm? (
+			app-crypt/swtpm
+			app-crypt/tpm2-abrmd
+			>=app-crypt/tpm2-tss-3.2.0:=
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME=${T}/.config/swtpm
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files --overwrite || die
+
+	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate ${XDG_CONFIG_HOME}/mytpm1
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+		--flags startup-clear
+		--ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+		--server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+	export TCTI=tabrmd:bus_type=session
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool pam)
+	)
+
+	if use crypt ; then
+		use gcrypt && emesonargs+=( -Dcrypto=libgcrypt )
+		use gnutls && emesonargs+=( -Dcrypto=gnutls )
+	else
+		emesonargs+=( -Dcrypto=disabled )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use tpm; then
+		dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}"
+	else
+		virtx dbus-run-session meson test -C "${BUILD_DIR}"
+	fi
+}
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index ad92e2ecff7a..933dcfcc68ba 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -6,7 +6,8 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <use>
-    <flag name="crypt">Enable Backend library to implement transport encryption via <pkg>dev-libs/libgcrypt</pkg></flag>
+    <flag name="crypt">Enable transport encryption</flag>
+    <flag name="gcrypt">Enable Backend library to implement transport encryption via <pkg>dev-libs/libgcrypt</pkg></flag>
     <flag name="gnutls">Enable Backend library to implement transport encryption via <pkg>net-libs/gnutls</pkg></flag>
     <flag name="pam">Build PAM module</flag>
     <flag name="tpm">Enable Trusted Platform Module support via <pkg>app-crypt/tpm2-tss</pkg></flag>
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 8f41aef84291..6b9ab8440516 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -61,5 +61,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.4.1.ebuild 2422 BLAKE2B 7cc166eaeb62e47ca7178dce42b7c7b28bee3b0e97795e3bd486ab1e4b30dd0e9efda706c0775739013c7eaeeb50f5df5af3a8f376d6ae76a3aff65884227120 SHA512 1307dbfc2bbe4c462e865d6fb07ae02672d54b73f2c66f99826fefb84eaf1b2deb534c6a9bcb687a06bdebfe8fc1be7555681ad1aa57f491f77fb48c6f483280
+EBUILD nitrocli-0.4.1-r1.ebuild 2484 BLAKE2B 410a9fe356079d9000ad5004e9f3c1f0b8e5c5d5f964bac3ae58d1f14427c8c81b2c43ae8a7a97bcde414820d14fa3e0bd3a1510828b07704f8a2d4b431358b3 SHA512 f1497527bb59b10ba207823b3f9837c72566c04589b4190fcd77dad9d9ba6e55c68656d8885f05c5c1ad76b54d962a96fb5bc9b3c591136f48e22160556130bd
 MISC metadata.xml 714 BLAKE2B 115563d48eedaef70ee7aada807a9ffe530336837f3e44d69854ff5b00581d36deb9483cd9e30668f43ab2a74b29cb5cbdef72c7fbc172d6d3fcbfb6d79ef41e SHA512 85dc7dcabdf3442a1aaecf2e893b2983627cb2628e35e3f0b3116ada3aadffa340abb7916a28fe2678c33b503ae5bd9f98d9b5ff0ed0fd2b466ff470409bfbf3
diff --git a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild b/app-crypt/nitrocli/nitrocli-0.4.1-r1.ebuild
index f41366c4a624..1c560a2e5176 100644
--- a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.4.1-r1.ebuild
@@ -4,75 +4,75 @@
 EAPI=8
 
 CRATES="
-aho-corasick-0.7.18
-anyhow-1.0.40
-autocfg-1.0.1
-base32-0.4.0
-bitflags-1.2.1
-cc-1.0.67
-cfg-if-1.0.0
-clap-2.33.3
-directories-3.0.2
-dirs-sys-0.3.6
-envy-0.4.2
-getrandom-0.1.16
-getrandom-0.2.2
-heck-0.3.2
-lazy_static-1.4.0
-libc-0.2.146
-log-0.4.14
-memchr-2.4.0
-merge-0.1.0
-merge_derive-0.1.0
-nitrocli-0.4.1
-nitrokey-0.9.0
-nitrokey-sys-3.6.0
-nitrokey-test-0.5.0
-nitrokey-test-state-0.1.0
-num-traits-0.2.14
-numtoa-0.1.0
-ppv-lite86-0.2.10
-proc-macro-error-1.0.4
-proc-macro-error-attr-1.0.4
-proc-macro2-1.0.26
-progressing-3.0.2
-quote-1.0.9
-rand-0.8.3
-rand_chacha-0.3.0
-rand_core-0.5.1
-rand_core-0.6.2
-rand_hc-0.3.0
-redox_syscall-0.2.8
-redox_termios-0.1.2
-redox_users-0.4.0
-regex-1.5.4
-regex-syntax-0.6.25
-remove_dir_all-0.5.3
-serde-1.0.125
-serde_derive-1.0.125
-structopt-0.3.21
-structopt-derive-0.4.14
-syn-1.0.72
-tempfile-3.2.0
-termion-1.5.6
-textwrap-0.11.0
-toml-0.5.8
-unicode-segmentation-1.7.1
-unicode-width-0.1.8
-unicode-xid-0.2.2
-version_check-0.9.3
-wasi-0.9.0+wasi-snapshot-preview1
-wasi-0.10.2+wasi-snapshot-preview1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
+	aho-corasick@0.7.18
+	anyhow@1.0.40
+	autocfg@1.0.1
+	base32@0.4.0
+	bitflags@1.2.1
+	cc@1.0.67
+	cfg-if@1.0.0
+	clap@2.33.3
+	directories@3.0.2
+	dirs-sys@0.3.6
+	envy@0.4.2
+	getrandom@0.1.16
+	getrandom@0.2.2
+	heck@0.3.2
+	lazy_static@1.4.0
+	libc@0.2.146
+	log@0.4.14
+	memchr@2.4.0
+	merge@0.1.0
+	merge_derive@0.1.0
+	nitrocli@0.4.1
+	nitrokey@0.9.0
+	nitrokey-sys@3.6.0
+	nitrokey-test@0.5.0
+	nitrokey-test-state@0.1.0
+	num-traits@0.2.14
+	numtoa@0.1.0
+	ppv-lite86@0.2.10
+	proc-macro-error@1.0.4
+	proc-macro-error-attr@1.0.4
+	proc-macro2@1.0.26
+	progressing@3.0.2
+	quote@1.0.9
+	rand@0.8.3
+	rand_chacha@0.3.0
+	rand_core@0.5.1
+	rand_core@0.6.2
+	rand_hc@0.3.0
+	redox_syscall@0.2.8
+	redox_termios@0.1.2
+	redox_users@0.4.0
+	regex@1.5.4
+	regex-syntax@0.6.25
+	remove_dir_all@0.5.3
+	serde@1.0.125
+	serde_derive@1.0.125
+	structopt@0.3.21
+	structopt-derive@0.4.14
+	syn@1.0.72
+	tempfile@3.2.0
+	termion@1.5.6
+	textwrap@0.11.0
+	toml@0.5.8
+	unicode-segmentation@1.7.1
+	unicode-width@0.1.8
+	unicode-xid@0.2.2
+	version_check@0.9.3
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasi@0.10.2+wasi-snapshot-preview1
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
 "
 
 inherit bash-completion-r1 cargo
 
 DESCRIPTION="A command line tool for interacting with Nitrokey devices"
 HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
-SRC_URI="$(cargo_crate_uris)"
+SRC_URI="${CARGO_CRATE_URIS}"
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
diff --git a/app-crypt/rpm-sequoia/Manifest b/app-crypt/rpm-sequoia/Manifest
index f970b9997be6..f8b07ecbe161 100644
--- a/app-crypt/rpm-sequoia/Manifest
+++ b/app-crypt/rpm-sequoia/Manifest
@@ -353,6 +353,6 @@ DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe1
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
 DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd7dfd2924bda921e62f3e09e953fbf50f8d0da99ac6ff6d134f146253846f5663549dcf8df08eaf34b9d4016b3 SHA512 db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0
 DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
-EBUILD rpm-sequoia-1.6.0.ebuild 6009 BLAKE2B f83409c9bc73b76653d9790a0071f5e9104140abc79f9fba7aef94d78ff3e5b5a5cb6a9915d5afb694401cfeba6edd4abfc95a55a21603c358fead8242f29db6 SHA512 f8746c063996b4a0f9fa03fb8b451a1a32ff04dd57238493ca36ba3a87a07523c7721090f0bad7740a41951163c13538ac5a4bc1557e03ba58d5abfa16c36bc3
-EBUILD rpm-sequoia-1.7.0.ebuild 6203 BLAKE2B 4dc452e1a2a3fefcab03e0075173a4823f34bf1267eba5fd2b200f738a516e53b209e5292aaa2612031dcb64fa9d0e20d5593d86189db94c59147928a5962d1e SHA512 2034eb58ac48ad9cc1d04be9b6cb21ac9a21f812bc9eabde080d10d2c1bd26825eec4a44c21c89ddb831c23f66c0a0d9e2f1e6a96795e7e01faccc34cb4cdf84
+EBUILD rpm-sequoia-1.6.0-r1.ebuild 6088 BLAKE2B 4cbb384794480bf3266ae3c151c164b8d228e4bccfb3c37c92c54702c275f66c8322696ae04b8663be35980d2d11b8ee73abb90e1de07cc3684648f3ff6866ed SHA512 07a5b86e9083d1fdd55bb19fa173cd3bd85f200c3f9886e7737aa9c71e0a230aad27f8badc39e52cb44ba828b76c38bb43a21199b1345ec2a1c1c2b12e8a6107
+EBUILD rpm-sequoia-1.7.0-r1.ebuild 6271 BLAKE2B 0786faf24329483ab63a19fedc13950f01d52014996a5deaa7b9ae576b4bab429d5c8bf962555d6e0eb42a285d4512d6bddfe94e44fb6cb9a192be09f81b9112 SHA512 24bd71089d7e0f1042371a1e828eefcbf13edd9ee42135b2e8106d1bd755212f93b50f17b00f18376454dd8634d107d6ea199a930669c1948dd6f71d993329ed
 MISC metadata.xml 677 BLAKE2B ef639f0cedd83cf162d928db6409331c199ee34e8a9ba8b1861d1b5ae22d79eb586e9c7c6725910aeedaf5f5a06a7477677062613f376db262b12bd6c1c2cba6 SHA512 478ca30d1961b6dceb053e1afb04a1d57e3a9bc8b7de003367b7d111c4cfb675dfe803a973c6c368bb8541d66d23b91e67733177820d9f0d90c2d7ffeb3c0fb1
diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
index da34f4210ca1..1563c0d6977e 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
@@ -235,9 +235,10 @@ CRATES="
 	zeroize_derive@1.4.2
 "
 
-LLVM_MAX_SLOT=17
+LLVM_COMPAT=( 17 )
+RUST_NEEDS_LLVM=1
 
-inherit cargo llvm
+inherit llvm-r1 cargo
 
 DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
 HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"
@@ -265,11 +266,16 @@ RDEPEND="${DEPEND}"
 # Clang is required for bindgen
 BDEPEND="
 	virtual/pkgconfig
-	nettle? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)) )
+	nettle? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') )
 "
 
 QA_FLAGS_IGNORED="usr/lib.*/librpm_sequoia.so.1"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 llvm_check_deps() {
 	if use nettle; then
 		has_version -b "sys-devel/clang:${LLVM_SLOT}"
diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
index 082e1f09d371..c5c225f601ba 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
@@ -248,9 +248,11 @@ CRATES="
 	zerovec@0.10.4
 "
 
-LLVM_COMPAT=( {17..18} )
+LLVM_COMPAT=( 17 18 )
+RUST_MIN_VER="1.74.1"
+RUST_NEEDS_LLVM=1
 
-inherit cargo llvm-r1
+inherit llvm-r1 cargo
 
 DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
 HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"
@@ -282,12 +284,16 @@ RDEPEND="${DEPEND}"
 # Clang is required for bindgen
 BDEPEND="
 	virtual/pkgconfig
-	>=virtual/rust-1.73
 	nettle? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') )
 "
 
 QA_FLAGS_IGNORED="usr/lib.*/librpm_sequoia.so.1"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_configure() {
 	local myfeatures=(
 		$(usev nettle crypto-nettle)
diff --git a/app-crypt/sequoia-chameleon-gnupg/Manifest b/app-crypt/sequoia-chameleon-gnupg/Manifest
index 6706c657dcb0..a1d0ba88fcd2 100644
--- a/app-crypt/sequoia-chameleon-gnupg/Manifest
+++ b/app-crypt/sequoia-chameleon-gnupg/Manifest
@@ -527,8 +527,8 @@ DIST zerovec-0.10.2.crate 126403 BLAKE2B f6f7e08c27e5724c9071cf007c09a3fdc80b84b
 DIST zerovec-0.10.3.crate 126403 BLAKE2B ed783804e7852c85f2d19225c2c397f9e87c9c52e1e31b222796aee5772503e9cf7bdf21c44c1566804a5e69585420d57d5af11b8024df69df063acc9704f5e0 SHA512 692ed6150047b131cd540c392351fa953fe477d9eea7a8b05f5e6d3bf27434e27c149099f8875bb0db5aa24ed1c974ab9f8afa14e9557022e91ad168d2831a0d
 DIST zerovec-derive-0.10.2.crate 19366 BLAKE2B 226d599e59c682ba167506d9cedf4f1b004881a624cec3b462ae0d2a1982e9297b9943b70649f0e98e46bf6a6fca68952d181625723a5bdcf779f07cf412dba7 SHA512 da4a056e9147142e51a58c3b16a12179433fc889b4efacbadd1294bb5a750860201a472bf7d72a10e7e82e95d97761a67ec93a727620c1c1844a15362f6736ea
 DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
-EBUILD sequoia-chameleon-gnupg-0.10.0.ebuild 8732 BLAKE2B 5deb38c99245b3be78c306de661a9aa12bbabb6cefe3e3945f50e9831eebf1ecb4a20e3d1c73be91fe5b3beeca324c6b4e4b66ec0d9df245415daecc4ad01c40 SHA512 4b38cf8db1321b2fd2e83a7e863cda06c6b2730d3bab9dd5e326c389f26093abd76e8dd36ac4131d06ed5c4e8bf67cd927020aa5aa2e6cb2f3e4d65380068f85
-EBUILD sequoia-chameleon-gnupg-0.10.1.ebuild 8702 BLAKE2B 49e6c03c3391d65bad6321a4d60bee89f78c0d5677bb82290313ff9bee0370ff5e6cb0e8ab3092e33204973fe1dc6c164f61cde24b029c7b7ad0341480fe60df SHA512 eed43bf33d8d89937c7ef2611cc97690081c1f86ae802b5d882a80814c3b88fcc28d6750d3527feec6a85a749e8ac0755ce9013ccae7ebeca422c11835323c8b
-EBUILD sequoia-chameleon-gnupg-0.8.0.ebuild 8136 BLAKE2B a66d65b2da043df7539a79cd0e8640883fd9c74d1f13321b1a764d23779fca24b6c6d60e9e0b44a6369da50123f7ee52fcc96f82a30a4f2c529e2dd412e32db3 SHA512 dc50b17c85aeba0bf0e28eb695d4652f189c0671d4338e87093eebb53b32fa76e837b5ccfcc6d44282eea82dfa646c3d7357e8d9ebd18b068eef1effe0bb3b8c
-EBUILD sequoia-chameleon-gnupg-0.9.0.ebuild 8202 BLAKE2B 49236fecee50251e91cb8a7274651681b8ad06cf0ad186a974264e36fb4d9c824f0a0acf92104b2ea38bf3c70ef3adb0426457c3d97f3687e40aabd1d0b3015f SHA512 50d4c2d8b9d1c9c604bf0674713ea9367fe9b8408dcca563820f2b5f04cc630fe95821950bf31d9532a446b04b5736f18c92687ff2ccd851e6f18187a249841a
+EBUILD sequoia-chameleon-gnupg-0.10.0-r1.ebuild 8779 BLAKE2B 56c0d02fe747da08dc7017c25a9da811d88173a921ced2a4ed9a0620c59f41986356bda75d55c629f79ba13408fe5b00340d7af55f566cd418c4bd542b17c297 SHA512 d413cefcbb095e82639f535daf154385e4fa8011a1d8b85dc0cb38717c21f6421894db93d62594fdb401e0e73179f150bfc86d021ecb33e65b8541c727d54ca0
+EBUILD sequoia-chameleon-gnupg-0.10.1-r1.ebuild 8749 BLAKE2B 2895e61aa2008d07067c671962d9d6d7316117df9945517250939b45fe980fd6b66943bdaa94b753978869124d6d9ea914891fa511015181aa79f6d4fd8b8047 SHA512 6078fc71d835b52a94c033fbedc3adec5c750085b82582e9e3846dc7a861aca3413ccd9416dead635b00ea785e39ddf60fb00b8347db4c5efc084a551066f1a5
+EBUILD sequoia-chameleon-gnupg-0.8.0-r1.ebuild 8183 BLAKE2B 2e77ef7ac34add9ebe5e76c28d933537af1a7c93cd4a852e2c8cdf9c5ce5d04a1740aeffdd5be2e966434b16852285a082f720f51487ef15086973b37f37fd2e SHA512 3c599c3587f1c479fec24a21f545767f5aaad191142cf04591e459bc45b00533021ee2c4ea86defc076b6266e28b487403b1c8e5215be61292648783bdd5dd20
+EBUILD sequoia-chameleon-gnupg-0.9.0-r1.ebuild 8249 BLAKE2B 594fb6a43e951994851545dd196dc5b6cb7bcbf1b5af5bc289f48a75966d0d7e397ec40df3ef94d93d471ef43aac563d3b77a5ac28dc8c996169329536ee5cf9 SHA512 b3bd32973f677bc18799c746543a7d50190c9a3b2229a3a8821410b21aacae6712d008e1c25862c6f7276093175b436196d19375b43a354971d60ba4f0a03ae1
 MISC metadata.xml 447 BLAKE2B a876bb1a6e3290305705c7b732d4225f658687095bcba12285f3c3e258177ffe9dd3ba0cd4e3b309dcb6e076906a8d568f9af1d932870ee1a4d471b9989a07cf SHA512 7d2d5e66179740cc71a73bc918c20ce0e022053841f60a1b8bbe71b9ef7df64457c39d2113e98043eaadc435953475823c0d8945e59f2ba3700b505680953afe
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
index 48f2892554d8..d9f7fe6ff6c5 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
@@ -394,8 +394,10 @@ CRATES="
 	zerovec@0.10.2
 "
 
-LLVM_COMPAT=( {17..18} )
-inherit cargo llvm-r1 xdg-utils
+LLVM_COMPAT=( 17 18 )
+RUST_NEEDS_LLVM=1
+
+inherit llvm-r1 cargo xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
@@ -429,11 +431,15 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.70
 "
 
 QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_test() {
 	local -x GNUPGHOME="${T}"/.gnupg
 	local -x REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
index c9deedb94c85..0e7e1f4a83bc 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
@@ -392,8 +392,10 @@ CRATES="
 	zerovec@0.10.3
 "
 
-LLVM_COMPAT=( {17..18} )
-inherit cargo llvm-r1 xdg-utils
+LLVM_COMPAT=( 17 18 )
+RUST_NEEDS_LLVM=1
+
+inherit llvm-r1 cargo xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
@@ -427,11 +429,15 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.70
 "
 
 QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_test() {
 	local -x GNUPGHOME="${T}"/.gnupg
 	local -x REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
index b76dcfd07db1..9d7e03abe6f4 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
@@ -365,8 +365,10 @@ CRATES="
 	zeroize@1.7.0
 "
 
-LLVM_COMPAT=( {17..18} )
-inherit cargo llvm-r1 xdg-utils
+LLVM_COMPAT=( 17 18 )
+RUST_NEEDS_LLVM=1
+
+inherit llvm-r1 cargo xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
@@ -400,11 +402,15 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.70
 "
 
 QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_test() {
 	local -x GNUPGHOME="${T}"/.gnupg
 	local -x REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
index b28c6c443ec4..15f622ec15e0 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
@@ -368,8 +368,10 @@ CRATES="
 	zeroize@1.7.0
 "
 
-LLVM_COMPAT=( {17..18} )
-inherit cargo llvm-r1 xdg-utils
+LLVM_COMPAT=( 17 18 )
+RUST_NEEDS_LLVM=1
+
+inherit llvm-r1 cargo xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
@@ -403,11 +405,15 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.70
 "
 
 QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_test() {
 	local -x GNUPGHOME="${T}"/.gnupg
 	local -x REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
diff --git a/app-crypt/sequoia-sq/Manifest b/app-crypt/sequoia-sq/Manifest
index a4082b99a01d..3ba9bb000b32 100644
--- a/app-crypt/sequoia-sq/Manifest
+++ b/app-crypt/sequoia-sq/Manifest
@@ -619,7 +619,7 @@ DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe1
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
 DIST zerovec-0.10.2.crate 126403 BLAKE2B f6f7e08c27e5724c9071cf007c09a3fdc80b84bc3f7a08647d6e312674f82c1e35335e8c72da5d47904a937bdc6f29c26729b35123f6e8119f6991c7055318af SHA512 159cb90d2ee2a2662429141e0948cfb44e7784ba35e92c32b2ac7183d6b69a9318b0617ff4de7b87831f9727f9d5c9d7d4fd3a9b1f54e67ca29a4ed6afc8d046
 DIST zerovec-derive-0.10.2.crate 19366 BLAKE2B 226d599e59c682ba167506d9cedf4f1b004881a624cec3b462ae0d2a1982e9297b9943b70649f0e98e46bf6a6fca68952d181625723a5bdcf779f07cf412dba7 SHA512 da4a056e9147142e51a58c3b16a12179433fc889b4efacbadd1294bb5a750860201a472bf7d72a10e7e82e95d97761a67ec93a727620c1c1844a15362f6736ea
-EBUILD sequoia-sq-0.35.0.ebuild 10646 BLAKE2B dd17e33129a06adbb83d7e2b4e2352c732abda80a90ca1f5435448adb83e5ce33b00cf939e340c10c692c6fc2bf483a917104ffce0d808cc34286f510605c1ca SHA512 87eeadc1e625dca36bf47937f6d767dcfc0685f2e50472a0f7f92e7de6a2baac38b3f413912d17184ae6d8bcd7681508f0e5fe6b843a15be5b7f76d3301078dd
-EBUILD sequoia-sq-0.36.0.ebuild 10740 BLAKE2B 49cfc12de735594ac4449774adb7119c9ce45096167ae749907188854c9f69f895c6e924cf8d0b1790279e6de35e9bbf87d8ddb711b6f3acd1a5469a9fcb9b38 SHA512 8a5ead87080156a0de7c64d846a2b99ef30c8e4469c10df841c81e6f504a913154353bb32fb6d14b37a8f5805289f79e97f94b8c62931971a9d9f8dea2f37935
-EBUILD sequoia-sq-0.37.0.ebuild 11266 BLAKE2B 787fcfe3e8bb51e27e35c83fe6e98aac5478b29c5ba9253c8b68d6e1b312923379625ce256fb23c86f6ee1dec429400610931d73e819e3441ae1e6b8e480691e SHA512 3acb3265bad31d5b787e06f2f37732c58a323b948003deeb365c0c6cd895722f1406f6a9f36d69e35d25fbfcd198eca2de60a06fe969bcb635343e49fb15c577
+EBUILD sequoia-sq-0.35.0-r1.ebuild 10677 BLAKE2B 39aa6beb1bdce6c3653b577a9ed62a8b773c6a52b254295d08b310234297c200338e923b4929d77b0f5e4704ffaa4709a6728676b8f026461e248eccd2c9530a SHA512 676134533ebce3de71d7d37c4edd7468c59702c2c2f389f1515e23b871ea727235a99051f0d9384759fc4f0094c30245d2a149387bac4219ef9259782fe8d2ee
+EBUILD sequoia-sq-0.36.0-r1.ebuild 10771 BLAKE2B f0f95e612fbf4dc0ef157c29f2164b3d82545ee9f4fa2296eb3390b1da7dbfc6336bb90b395ef3b0f73d1ab87d32bbc0b64861e806b63f280ef82063e82b0717 SHA512 ed7307961ab68080dfabef95e441a4a7b93d03f5b39aa47abc0e1917723552bb887687652ebbd817fadd6a11f40e3fd8a6e74f39c7e20aa98db451ae0f1a9379
+EBUILD sequoia-sq-0.37.0-r1.ebuild 11297 BLAKE2B c82c244dbaca8db970c874583ca318b5554cc66af63ef235f1c41a06c1c6f27baba164303c565ceb8af5397c794ee83d518083bda1a2d87b067b7d220b06fc89 SHA512 9b895d8012f29112fa989c29b6f9859d9574c5ca397de29bb20b3468df5626ff3331e53581f53d1bfbe6acab3ebd343f9a8ea2a7aaa2bd2e608ad9c475044044
 MISC metadata.xml 493 BLAKE2B fe962d673ec673634b5f8451d0438206935ae852dcaf7cf6b96dfe33b408785cbd8a19779f91d35bdcbc3c21ffd756f8fe9fe4b2bcaf02856d8d5be64532dcbd SHA512 97b04243d9a88ea6b816b66f5e771cedca887ac44c66b35db69ecfd917480ee2f8e81498a22cb0fe85713fe4ad276aa7178f47e83a7604b097fae3bb23cc62af
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.35.0.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
index 5ff711b14f9a..17375661ac23 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.35.0.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
@@ -487,7 +487,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..17} )
 
-inherit cargo shell-completion llvm-r1
+inherit llvm-r1 cargo shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
@@ -528,9 +528,13 @@ BDEPEND="
 		sys-devel/clang:${LLVM_SLOT}
 	')
 	virtual/pkgconfig
-	>=virtual/rust-1.70
 "
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_compile() {
 	# Set this here so that it doesn't change if we run tests
 	# and cause a recompilation.
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.36.0.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
index b2cd91a0baa2..9a186810fb28 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.36.0.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
@@ -491,7 +491,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..18} )
 
-inherit cargo shell-completion llvm-r1
+inherit llvm-r1 cargo shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
@@ -532,9 +532,13 @@ BDEPEND="
 		sys-devel/clang:${LLVM_SLOT}
 	')
 	virtual/pkgconfig
-	>=virtual/rust-1.70
 "
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_compile() {
 	# Set this here so that it doesn't change if we run tests
 	# and cause a recompilation.
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.37.0.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
index 03427bf5486d..c51436d42641 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.37.0.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
@@ -517,7 +517,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..18} )
 
-inherit cargo shell-completion llvm-r1
+inherit llvm-r1 cargo shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
@@ -558,9 +558,13 @@ BDEPEND="
 		sys-devel/clang:${LLVM_SLOT}
 	')
 	virtual/pkgconfig
-	>=virtual/rust-1.70
 "
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_compile() {
 	# Set this here so that it doesn't change if we run tests
 	# and cause a recompilation.
diff --git a/app-crypt/sequoia-sqv/Manifest b/app-crypt/sequoia-sqv/Manifest
index 736d5c13dad7..0c8599a9d230 100644
--- a/app-crypt/sequoia-sqv/Manifest
+++ b/app-crypt/sequoia-sqv/Manifest
@@ -243,5 +243,5 @@ DIST x25519-dalek-2.0.1.crate 87820 BLAKE2B 039749d0278d95996016260f9e32162b3705
 DIST xxhash-rust-0.8.10.crate 20066 BLAKE2B 5fca80ff05e00d5f78c2655093a963b08a16d2bd40e74e53c9e48e9812f81d668f9d60cd23872cb76ecb643cd381eddb841da5ba93a5f9fc92e42e6d8bb7e871 SHA512 c5a66c4c7a30dffe9d925dbfa8d0b5ae5b825770cb5d52a0d5de2eadf24c9af1b08b11b2e7a94ce60a30dabb2ce61cd3066cc781d05c90bc6a9d46daa2e04b71
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
-EBUILD sequoia-sqv-1.2.1.ebuild 6129 BLAKE2B 3093c5d418631f1bd977eb08b7ada9556f6497ec2cd5e7f39d44612e0d7d1e075ef391a27bd1aa5d0a0e66657b065e466c80ca613993db2f4bd98ab12c106746 SHA512 19bc90de69ecafce6c4f696d4825cc8fde44da308c90b7bc0b5bdbaa373f03e7837349725de627bcdee278b8cf67e6ed027b9c7441d17166ef8e54a02e501691
+EBUILD sequoia-sqv-1.2.1-r1.ebuild 6199 BLAKE2B cb1fc37c61c1606d862cc6e4110c5d28bc3340bb09afa38a4127a1dbb3fe06510b338c90a46fae12692aec31c92b8b67a60b3bcbe0ef62b6201da249aa718a44 SHA512 f0116dac9789b5ecee99bb55cb5327b6391c36f94e63c25f45f2ce389f68e7085c16ba27bc71146eb09df79919b0e5294fd03c86a3b2f02590864654cf855c7d
 MISC metadata.xml 435 BLAKE2B 0d2b4ad9f546657d9736088eb9deea2622976a78128476013fad90173d2c0e837df89a527e597fc70108e38289dd74b55417a1edb01430a5393d24c7c5142a1d SHA512 c230769f501b0abe786f94d36cb6583bf8c85ef957fab89db4258fe773473b8940748029fa158ffe17e1db02f2c6ee8a2481ffebfb5b0d3e4e86a1a2ebcad99d
diff --git a/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1.ebuild b/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
index 4352e534ebb9..cd4d8540631c 100644
--- a/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1.ebuild
+++ b/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
@@ -251,8 +251,9 @@ CRATES="
 "
 
 LLVM_COMPAT=( {17..18} )
+RUST_NEEDS_LLVM=1
 
-inherit bash-completion-r1 cargo llvm-r1
+inherit bash-completion-r1 llvm-r1 cargo
 
 DESCRIPTION="A simple OpenPGP signature verification program"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sqv"
@@ -290,6 +291,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_compile() {
 	# Set this here so that it doesn't change if we run tests
 	# and cause a recompilation.