gentoo auto-resync : 12:11:2024 - 03:02:41

20 files changed, 207 insertions, 26 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index abadfdd0b98c..1165e4dc6a36 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/badkeys/Manifest b/app-crypt/badkeys/Manifest
index a57518c47a06..45abcdd1ade0 100644
--- a/app-crypt/badkeys/Manifest
+++ b/app-crypt/badkeys/Manifest
@@ -1,5 +1,5 @@
 DIST badkeys-0.0.11.tar.gz 374536 BLAKE2B d06ffa109ab99c6d747349fc01e0039900c7674524bec50e6dd25fe1f20bed6ad723087ab3f4726d7821bf89da098fcd54255d5286ea3a79e4ec87a855fe20ef SHA512 72e24935caacda35e20234a801e844f801422d59b7d6d5f831bada4e8e184ff5ce831d6aee677b9ac43eb8f49b6621ad479310a8dbd34bed03eafa33f0763cbd
 DIST badkeys-0.0.12.tar.gz 374956 BLAKE2B 4d9670d12bccb72e3ce3cc686967c58602da559da4cbf2157576f5122c3064059def1154b2c7bda1bc6f9e13f8dc8a1cd341917610ffb36e0bf10616c614d955 SHA512 b76dd0b6cd10b4136d83d8b2e44adc8b8fb7d4ef7ae78ec404826283de2410356c3abecaac8c1434e181b8ccd0b77b6ae1dd5eaf568be15c8124868c25027e96
-EBUILD badkeys-0.0.11.ebuild 687 BLAKE2B 6ddb9cb6d3da1106a0b8057a35874b182bc160f795f09f264d3460e8dabc4a0f5957cf03a140f54237a367d0c171cfe6cfa2e0e00117479de64622505e72c66d SHA512 b18290ce35810407231438956027bf0295c175cd4f5ac2f232ddb37937c991652138517911b3a90eb0746f26c795146519178e629de83a068ba4b80e080bd449
-EBUILD badkeys-0.0.12.ebuild 687 BLAKE2B 6ddb9cb6d3da1106a0b8057a35874b182bc160f795f09f264d3460e8dabc4a0f5957cf03a140f54237a367d0c171cfe6cfa2e0e00117479de64622505e72c66d SHA512 b18290ce35810407231438956027bf0295c175cd4f5ac2f232ddb37937c991652138517911b3a90eb0746f26c795146519178e629de83a068ba4b80e080bd449
+EBUILD badkeys-0.0.11.ebuild 689 BLAKE2B 781d70c9e1b9f4375236a71793cbf5b3fc00e1831425bfee30721716eb93e631b8454291038006afdca69df159b46fd950d34aed277d188dd7b7d2ae8a40a604 SHA512 2c993afb69bab1c1650538a6095bd0a7463f3b56e0759de9ed013efc1ddb28e8a504d14dc1d2ceca1a3def585e1158cfc2c2fda6d5852dbb7abc31f04ddd4fb6
+EBUILD badkeys-0.0.12.ebuild 689 BLAKE2B 781d70c9e1b9f4375236a71793cbf5b3fc00e1831425bfee30721716eb93e631b8454291038006afdca69df159b46fd950d34aed277d188dd7b7d2ae8a40a604 SHA512 2c993afb69bab1c1650538a6095bd0a7463f3b56e0759de9ed013efc1ddb28e8a504d14dc1d2ceca1a3def585e1158cfc2c2fda6d5852dbb7abc31f04ddd4fb6
 MISC metadata.xml 508 BLAKE2B cf3826ad646dff67f5d0094f91c2bb1d8598f65c31774894cb95b02680225d756541cfd921341dde90e91a176e4b5962608b08c202f9b312937bfd3a47aa3090 SHA512 0fa2d7cc7f7a49115fa10377f54461261d45fb1641f22a750f748eb5c41bbe261acdeaaaf39b6c3cca0072e07332e3222b15ae2ea9345664e81df629254fd855
diff --git a/app-crypt/badkeys/badkeys-0.0.11.ebuild b/app-crypt/badkeys/badkeys-0.0.11.ebuild
index 9af1570815ed..c6fcf93434e2 100644
--- a/app-crypt/badkeys/badkeys-0.0.11.ebuild
+++ b/app-crypt/badkeys/badkeys-0.0.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="dkim ssh"
 
 DEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/gmpy[${PYTHON_USEDEP}]"
+	dev-python/gmpy2[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dkim? ( dev-python/dnspython[${PYTHON_USEDEP}] )
 	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
diff --git a/app-crypt/badkeys/badkeys-0.0.12.ebuild b/app-crypt/badkeys/badkeys-0.0.12.ebuild
index 9af1570815ed..c6fcf93434e2 100644
--- a/app-crypt/badkeys/badkeys-0.0.12.ebuild
+++ b/app-crypt/badkeys/badkeys-0.0.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="dkim ssh"
 
 DEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/gmpy[${PYTHON_USEDEP}]"
+	dev-python/gmpy2[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dkim? ( dev-python/dnspython[${PYTHON_USEDEP}] )
 	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index cc8f4f42f156..06f00f31a527 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -3,6 +3,9 @@ AUX gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch 771 BLAKE2B c0ab8ad6
 AUX gpgme-1.23.1-tests-gnupg-no-tofu.patch 828 BLAKE2B a46a844bc2e44ceb2c647486eb108dc43b0b517ab2171317a936e9a3f8f4d5f0e1c0e3cbd4881540c4f48940975d72a8199e0554d93918be121585223f83032c SHA512 533ed3810736d5cbea3a9cc30cd1b8b3f02051853afab80f564e860afc70097fc0cc6d1d269664b68d58eca78601f90c399a9dcd995c16d65f9bd29e85724b8f
 DIST gpgme-1.23.2.tar.bz2 1836904 BLAKE2B 563e470e861c7cc64ecb3e8dd0a0ed8436bc0867105093abcec09f4d1e1dd95cbf64c8161cf8500b9842583b57f6583efff63e5111234e36fda1e6fbedce2f78 SHA512 6cfcd07e81a93de240582de5a46545420cee93d1f27fe20ea2c983780fdd3036b69fdba073cf549d68a20791e189bf4b3cdde14a43f912d2ab9ef3414c83ac75
 DIST gpgme-1.23.2.tar.bz2.sig 238 BLAKE2B fafba6e2f1f34c53fa3f7e05953298132f7b046048660b9f2df5bc11ccb9694b581117ca78883a8f4ca9af060397a39f3132a3711be1cd28183b7c2f8f93a8b7 SHA512 65b7cdd4ce06bb0b15b13033d226423380338efdcb47ffc3f33780a92973453053f8f59b12a3f37e392e773bdd207a7420c25aa3a210c15eec45b7bfef6e891e
+DIST gpgme-1.24.0.tar.bz2 1889410 BLAKE2B 059045790c85e456c426fa5dab1cd2e6ffa6f279f1784f20c28ba2dc96b22b895115cc0fc707c9eba7bd347f7ce23b36ed477eebc3f972b81bdeacfee3b58f3f SHA512 f9d3786f27eaf88b6544a453e4b0f800cf2259d5321bf387bd1978c5ba5824b3746d28af4ec5491502cd4d5c776361805b75cb02d9bbbae26cf2a8fcfd86b871
+DIST gpgme-1.24.0.tar.bz2.sig 119 BLAKE2B 35a2960f6be62c3bfc9ea518904c5fe5e7f4e36ffa2f56b940548f7601e5b47fc3cdbf5026d6f7a080778b4e2387438ad099702f028e3d27caa59250f45b0a38 SHA512 0bb6049a44708baf3b8d001d1bb2b196f723464861404d82b9876bc2f15949d9a4438e7cc1cb0ead6f7c3e0f87bbb38a72264628fa5a116fb97a87c6c837c194
 EBUILD gpgme-1.23.2-r1.ebuild 6068 BLAKE2B 1b33d1d0f31374d0a088f99c713c776bbdc99627bc31a4b98668b29ba2ed541c6f40ed7dc1b793c5bdd9123016722f867c594e463b636d1faff0f5acf0334283 SHA512 9d4585824bd5c9a16c588746583dbbc9807cc37cac4b725e4363fd5ef8d0bd80e403af7cbe9745b66879c5e8798462d507bf9c03be994336f350dc9aad61a674
 EBUILD gpgme-1.23.2-r2.ebuild 6058 BLAKE2B c6a0f78406386360883618d0820a4f21de71fa4a54293ae791fc8d11cf738359f35d4e1d4eb2e0f179d80250a42536e5aaa4944558ac2d800b0cd1a4868cd48b SHA512 264b838f5b3c89476a1800b59aa18f0153d186103eb395f37d4513094fdb1ced89e6d929cd38712de419542762eaa80d983a13ef27ae16843aca4ee0e30fdf38
+EBUILD gpgme-1.24.0.ebuild 4689 BLAKE2B 02147c31b32d6bdb4c7b6c4ee3cd4be433223780886e55120fd77fa81b12f6667f76a8d22fc280c03f9548ad987b073895b29c647c6e842d97779f0a15a1c56f SHA512 c5b7f8108baedf8e2fbafdec44158d916559ac78ad631976b13260ac06d5ceb1e8f3ed671f21f4aea8bdc28477c5ea5e2971edc87aa6fe5d7b7a4d802ba34ae5
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.24.0.ebuild b/app-crypt/gpgme/gpgme-1.24.0.ebuild
new file mode 100644
index 000000000000..503a688b29e8
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.24.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+
+# in-source builds are not supported:
+# * https://dev.gnupg.org/T6313#166339
+# * https://dev.gnupg.org/T6673#174545
+inherit distutils-r1 libtool flag-o-matic out-of-source qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
+SRC_URI="
+	mirror://gnupg/gpgme/${P}.tar.bz2
+	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
+# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
+# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
+SLOT="1/11.6.15.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="common-lisp static-libs +cxx python qt5 qt6 test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	qt5? ( cxx )
+	qt6? ( cxx )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# - On each bump, update dep bounds on each version from configure.ac!
+RDEPEND="
+	>=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.46-r1:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )
+	qt6? ( dev-qt/qtbase:6 )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+#doc? ( app-text/doxygen[dot] )
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		dev-lang/swig
+	)
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
+	"${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	# bug #697456
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+		die "Could not run tests as requested with too-long WORKDIR."
+	fi
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	S="${WORKDIR}/b"
+}
+
+my_src_configure() {
+	# bug #847955
+	append-lfs-flags
+
+	cd "${BUILD_DIR}" || die
+
+	local languages=(
+		$(usev common-lisp 'cl')
+		$(usev cxx 'cpp')
+		$(usev qt5 'qt5')
+		$(usev qt6 'qt6')
+	)
+
+	use qt5 && export MOC5="$(qt5_get_bindir)/moc"
+	use qt6 && export MOC6="$(qt6_get_libdir)/qt6/libexec/moc"
+
+	local myeconfargs=(
+		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test")
+		--enable-languages="${languages[*]}"
+		$(use_enable static-libs static)
+		GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use python ; then
+		emake -C lang/python prepare
+
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+my_src_compile() {
+	cd "${BUILD_DIR}" || die
+
+	emake
+
+	if use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+my_src_test() {
+	cd "${BUILD_DIR}" || die
+
+	emake check
+
+	if use python ; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	emake -C lang/python/tests check \
+		PYTHON=${EPYTHON} \
+		PYTHONS=${EPYTHON} \
+		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+my_src_install() {
+	einstalldocs
+
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	if use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Backward compatibility for gentoo
+	# (in the past, we had slots)
+	dodir /usr/include/gpgme
+	dosym -r /usr/include/gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/rpm-sequoia/Manifest b/app-crypt/rpm-sequoia/Manifest
index f8b07ecbe161..1a626bf17899 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-r1.ebuild 6088 BLAKE2B 4cbb384794480bf3266ae3c151c164b8d228e4bccfb3c37c92c54702c275f66c8322696ae04b8663be35980d2d11b8ee73abb90e1de07cc3684648f3ff6866ed SHA512 07a5b86e9083d1fdd55bb19fa173cd3bd85f200c3f9886e7737aa9c71e0a230aad27f8badc39e52cb44ba828b76c38bb43a21199b1345ec2a1c1c2b12e8a6107
-EBUILD rpm-sequoia-1.7.0-r1.ebuild 6271 BLAKE2B 0786faf24329483ab63a19fedc13950f01d52014996a5deaa7b9ae576b4bab429d5c8bf962555d6e0eb42a285d4512d6bddfe94e44fb6cb9a192be09f81b9112 SHA512 24bd71089d7e0f1042371a1e828eefcbf13edd9ee42135b2e8106d1bd755212f93b50f17b00f18376454dd8634d107d6ea199a930669c1948dd6f71d993329ed
+EBUILD rpm-sequoia-1.6.0-r1.ebuild 6088 BLAKE2B 4aac4f6ea7fe0ef14fc64456d50015f658854fd367cced2c3cf09fddca51db31a428b28ec0634ed7ee4d349be1f5c3cc8e1e6d72ba24a3fb2190fb03798451a6 SHA512 46724192693191b13361b1937e609c157d45eef29b4f104250bc7b0e9992e957e75a8cb5cfb8e18d8fa1d7fadd54f51d8764af4595d8a8c0ff2fe028c2ee2aea
+EBUILD rpm-sequoia-1.7.0-r1.ebuild 6271 BLAKE2B 1e8baf7851a2fe74a3fd22698c06462edcc49a51cfb0ab79b78d5994d0e93be79e4bece2cf5d6e878da6c409f15722489ba78fb369623afc129f36f9c521ff05 SHA512 6b6ffcd843f0efa769727071c36ceaa9eda533a10c698814d4c2a2bec9e6c51da05d3a99cb3f46417ce77a0a19d2bac95ca99e7fe5f22f44dfb89ec1fcbdd452
 MISC metadata.xml 677 BLAKE2B ef639f0cedd83cf162d928db6409331c199ee34e8a9ba8b1861d1b5ae22d79eb586e9c7c6725910aeedaf5f5a06a7477677062613f376db262b12bd6c1c2cba6 SHA512 478ca30d1961b6dceb053e1afb04a1d57e3a9bc8b7de003367b7d111c4cfb675dfe803a973c6c368bb8541d66d23b91e67733177820d9f0d90c2d7ffeb3c0fb1
diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
index 1563c0d6977e..afd0c9eb297b 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
@@ -238,7 +238,7 @@ CRATES="
 LLVM_COMPAT=( 17 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo
+inherit cargo llvm-r1
 
 DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
 HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"
diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
index c5c225f601ba..6c85a5471878 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
@@ -252,7 +252,7 @@ LLVM_COMPAT=( 17 18 )
 RUST_MIN_VER="1.74.1"
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo
+inherit cargo llvm-r1
 
 DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
 HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"
diff --git a/app-crypt/sequoia-chameleon-gnupg/Manifest b/app-crypt/sequoia-chameleon-gnupg/Manifest
index a1d0ba88fcd2..fa9291a6486a 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-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
+EBUILD sequoia-chameleon-gnupg-0.10.0-r1.ebuild 8779 BLAKE2B 78b099eb690c4b56a7403820ec0ccb2d3190ac06844780ae97103980cebc56a1d7386aae17d0f21ca1ee2b15a4877e8740f37d8b6b1c28ee20c3e617df5c5587 SHA512 ded68a47292a8b8a9c4f5c50b44da057cbec376932286ba8ea5ea6c10d0abe0122fc8035e92c4170c4824b5da87b4207b8c4ef7c312d9c7a910e7e52e9b074f9
+EBUILD sequoia-chameleon-gnupg-0.10.1-r1.ebuild 8749 BLAKE2B 7872d5b9977d9d41e6575b1cfab18ef16db50551493c16f573e808f92031a8c09e023a33b0119a630b825b24455ad1dd50def05621e64f4cc8021ff817708e6b SHA512 b84719bc8489e8d732b3acb5caa188097920a3cdafacd6c5d9c3eea96f9f01d071e42593089754bf09549cb0d59677b020d149ebe0c51606e6bfd5ccc91ebd88
+EBUILD sequoia-chameleon-gnupg-0.8.0-r1.ebuild 8183 BLAKE2B a2398b756f363599762f9b84fad6128c6b91661900608881651cbcc6450105cc1fedd4851670134c6fed54e39a167580b956f80f1240ff14abbc8b1c86aaf438 SHA512 330fe4a69d3babf0813dfef3a7419ca3c22d7e1d1c8eea19fcb1f941afba0ac40647b7fded6a5e8781f13decdb9ee5d8445128c20f93e3727942687b1c816d51
+EBUILD sequoia-chameleon-gnupg-0.9.0-r1.ebuild 8249 BLAKE2B dadb1ab31d6724d92bae31abfb521e2b21ac72005aa58708765cb84ea4ce9761b3f001e3e95419f581660f288193bbc6f93878652b077a93d1b55850438b883a SHA512 ba30848f7d320cb58250332f39c5c84aaa26cb18292d678efe9682948352f3a8e3b7c1f29f4b11daf4adf4111992da58a5d35a4c62840c058b130c8787f53d4c
 MISC metadata.xml 447 BLAKE2B a876bb1a6e3290305705c7b732d4225f658687095bcba12285f3c3e258177ffe9dd3ba0cd4e3b309dcb6e076906a8d568f9af1d932870ee1a4d471b9989a07cf SHA512 7d2d5e66179740cc71a73bc918c20ce0e022053841f60a1b8bbe71b9ef7df64457c39d2113e98043eaadc435953475823c0d8945e59f2ba3700b505680953afe
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
index d9f7fe6ff6c5..64b191ed02db 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
@@ -397,7 +397,7 @@ CRATES="
 LLVM_COMPAT=( 17 18 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo xdg-utils
+inherit cargo llvm-r1 xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
index 0e7e1f4a83bc..afaeb7fd6362 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
@@ -395,7 +395,7 @@ CRATES="
 LLVM_COMPAT=( 17 18 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo xdg-utils
+inherit cargo llvm-r1 xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
index 9d7e03abe6f4..95658418e7e9 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
@@ -368,7 +368,7 @@ CRATES="
 LLVM_COMPAT=( 17 18 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo xdg-utils
+inherit cargo llvm-r1 xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
index 15f622ec15e0..e1f74372c492 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
@@ -371,7 +371,7 @@ CRATES="
 LLVM_COMPAT=( 17 18 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo xdg-utils
+inherit cargo llvm-r1 xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
diff --git a/app-crypt/sequoia-sq/Manifest b/app-crypt/sequoia-sq/Manifest
index 3ba9bb000b32..5527031e482b 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-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
+EBUILD sequoia-sq-0.35.0-r1.ebuild 10677 BLAKE2B 34c603a25333789f848a30f90ccfa1876e4687f08a4edeea16c9b8a05d05616005a3c35047edddd0ea00cb332084bc45846aebd4b855eea38724204b068df0ba SHA512 c816c13ed11447b76740134845f2d78990d54fe68ad8edbf8b2868bbf8eef4eb9f6cdf750568d9de910f3f7b9432db349e0b0ea45934ff3401c42829e60b08c9
+EBUILD sequoia-sq-0.36.0-r1.ebuild 10771 BLAKE2B 008911130d25fa7b77ec18d0ea3fbf7d7946fa610c3f6fea012074fa69adc489efb8cacc21284cc59a3084ab5af77395dddb8358d1c01e1e53ed621330745358 SHA512 2b22f5c958aa32ec00ba866be423191395d7852be6d62e0313eccbb24e68fc735360ab4f74e24322037e489061858a0f3bd7dcbf5b5d4e4416214a327936abbe
+EBUILD sequoia-sq-0.37.0-r1.ebuild 11297 BLAKE2B 5aa21ab31f0d50d37a67f188bfdae5922f2ae58d281122e7bb117434c80e8e922bd65178971897103ffb77a694321dca0d0e6b550f145a90d1eb007df7ba72fb SHA512 cd74c081bdbe313df9aa42257d4d9e6aacae7adf232b8bd4a1a69d574a5674fd4c84389837893f76a070c3dfd71b4ba26e6be9d6d2aafbcd914b3fcea9b61262
 MISC metadata.xml 493 BLAKE2B fe962d673ec673634b5f8451d0438206935ae852dcaf7cf6b96dfe33b408785cbd8a19779f91d35bdcbc3c21ffd756f8fe9fe4b2bcaf02856d8d5be64532dcbd SHA512 97b04243d9a88ea6b816b66f5e771cedca887ac44c66b35db69ecfd917480ee2f8e81498a22cb0fe85713fe4ad276aa7178f47e83a7604b097fae3bb23cc62af
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
index 17375661ac23..bac089222857 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
@@ -487,7 +487,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..17} )
 
-inherit llvm-r1 cargo shell-completion
+inherit cargo llvm-r1 shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
index 9a186810fb28..784b920e5d85 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
@@ -491,7 +491,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..18} )
 
-inherit llvm-r1 cargo shell-completion
+inherit cargo llvm-r1 shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
index c51436d42641..16c18d31960d 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
@@ -517,7 +517,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..18} )
 
-inherit llvm-r1 cargo shell-completion
+inherit cargo llvm-r1 shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
diff --git a/app-crypt/sequoia-sqv/Manifest b/app-crypt/sequoia-sqv/Manifest
index 0c8599a9d230..9e5b316552fa 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-r1.ebuild 6199 BLAKE2B cb1fc37c61c1606d862cc6e4110c5d28bc3340bb09afa38a4127a1dbb3fe06510b338c90a46fae12692aec31c92b8b67a60b3bcbe0ef62b6201da249aa718a44 SHA512 f0116dac9789b5ecee99bb55cb5327b6391c36f94e63c25f45f2ce389f68e7085c16ba27bc71146eb09df79919b0e5294fd03c86a3b2f02590864654cf855c7d
+EBUILD sequoia-sqv-1.2.1-r1.ebuild 6199 BLAKE2B 724e1e81c19f38817b6ee3b08a2510ddb628081cb0553b8d6c29a4a7cb8d7c3664939a382fd56a998aed327467ce5c57647da09aa12480d9309db64c626dcf74 SHA512 aee586df47ebce5164e4bbb074ef80f51cb886e85975fcb9ffda14a482db3c53e2995d0aae578d40400052b223ca7c2b62ff6306bd4b42eeb7f261fa1e4194d9
 MISC metadata.xml 435 BLAKE2B 0d2b4ad9f546657d9736088eb9deea2622976a78128476013fad90173d2c0e837df89a527e597fc70108e38289dd74b55417a1edb01430a5393d24c7c5142a1d SHA512 c230769f501b0abe786f94d36cb6583bf8c85ef957fab89db4258fe773473b8940748029fa158ffe17e1db02f2c6ee8a2481ffebfb5b0d3e4e86a1a2ebcad99d
diff --git a/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild b/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
index cd4d8540631c..980514150d8f 100644
--- a/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
+++ b/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
@@ -253,7 +253,7 @@ CRATES="
 LLVM_COMPAT=( {17..18} )
 RUST_NEEDS_LLVM=1
 
-inherit bash-completion-r1 llvm-r1 cargo
+inherit bash-completion-r1 cargo llvm-r1
 
 DESCRIPTION="A simple OpenPGP signature verification program"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sqv"