From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E786158042 for ; Sun, 10 Nov 2024 13:03:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A4BAE090A; Sun, 10 Nov 2024 13:03:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DFE2E0918 for ; Sun, 10 Nov 2024 13:03:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33481335DCC for ; Sun, 10 Nov 2024 13:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92DEC11DF for ; Sun, 10 Nov 2024 13:03:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1731243730.d859c906462b56fab05deb6170d4ed639d41549c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-common/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust-common/rust-common-1.81.0.ebuild dev-lang/rust-common/rust-common-1.82.0.ebuild X-VCS-Directories: dev-lang/rust-common/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d859c906462b56fab05deb6170d4ed639d41549c X-VCS-Branch: master Date: Sun, 10 Nov 2024 13:03:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 15dbdbd1-d82a-4a37-a397-4cb74d0abf20 X-Archives-Hash: c43ba7bc7f5b07b1fbc3223a0cec6f60 commit: d859c906462b56fab05deb6170d4ed639d41549c Author: Sam James gentoo org> AuthorDate: Sun Nov 10 13:01:52 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 10 13:02:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d859c906 dev-lang/rust-common: wire up USE=verify-sig The USE was there but it wasn't doing anything. Note that we don't use verify-sig_src_unpack to avoid unpacking everything, see also 2d190c9e5b1db3292ea5d36f77a314eee019f99d. Signed-off-by: Sam James gentoo.org> dev-lang/rust-common/rust-common-1.81.0.ebuild | 12 +++++++++--- dev-lang/rust-common/rust-common-1.82.0.ebuild | 11 ++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dev-lang/rust-common/rust-common-1.81.0.ebuild b/dev-lang/rust-common/rust-common-1.81.0.ebuild index b977c5aa1b92..83fbbf485e6c 100644 --- a/dev-lang/rust-common/rust-common-1.81.0.ebuild +++ b/dev-lang/rust-common/rust-common-1.81.0.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit bash-completion-r1 +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc +inherit bash-completion-r1 verify-sig DESCRIPTION="Common files shared between multiple slots of Rust" HOMEPAGE="https://www.rust-lang.org/" @@ -25,16 +26,21 @@ SRC_URI=" S="${WORKDIR}/${MY_P}-src" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT=0 +SLOT="0" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="verify-sig" +# Legacy non-slotted versions bash completions will collide. RDEPEND=" !dev-lang/rust:stable !dev-lang/rust-bin:stable " +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-rust )" src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${SRC} "${DISTDIR}"/${SRC}.asc + fi + # Avoid unpacking the whole tarball which would need check-reqs tar -xf "${DISTDIR}"/${SRC} ${SRC%%.tar.xz}/src/tools/cargo/src/etc/cargo.bashcomp.sh || die } diff --git a/dev-lang/rust-common/rust-common-1.82.0.ebuild b/dev-lang/rust-common/rust-common-1.82.0.ebuild index 0d4b5aa7b8ae..285a9a5b8e5f 100644 --- a/dev-lang/rust-common/rust-common-1.82.0.ebuild +++ b/dev-lang/rust-common/rust-common-1.82.0.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit bash-completion-r1 +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc +inherit bash-completion-r1 verify-sig DESCRIPTION="Common files shared between multiple slots of Rust" HOMEPAGE="https://www.rust-lang.org/" @@ -25,17 +26,21 @@ SRC_URI=" S="${WORKDIR}/${MY_P}-src" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT=0 +SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="verify-sig" # Legacy non-slotted versions bash completions will collide. RDEPEND=" !dev-lang/rust:stable !dev-lang/rust-bin:stable " +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-rust )" src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${SRC} "${DISTDIR}"/${SRC}.asc + fi + # Avoid unpacking the whole tarball which would need check-reqs tar -xf "${DISTDIR}"/${SRC} ${SRC%%.tar.xz}/src/tools/cargo/src/etc/cargo.bashcomp.sh || die }