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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A33E11581D3 for ; Sat, 25 May 2024 06:47:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB835E2A49; Sat, 25 May 2024 06:47:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id B0B9BE2A49 for ; Sat, 25 May 2024 06:47:32 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07B95342F65 for ; Sat, 25 May 2024 06:47:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A9571B51 for ; Sat, 25 May 2024 06:47:29 +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: <1716619610.fe60141870ef7485a1337d4cf8b42aea4597de75.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/loop-aes-losetup/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild X-VCS-Directories: app-crypt/loop-aes-losetup/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fe60141870ef7485a1337d4cf8b42aea4597de75 X-VCS-Branch: master Date: Sat, 25 May 2024 06:47:29 +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: 0593576f-fe85-4d87-9e87-9e1573884922 X-Archives-Hash: 8254ad5234ca60ba07219cc5aa0694d7 commit: fe60141870ef7485a1337d4cf8b42aea4597de75 Author: Sam James gentoo org> AuthorDate: Sat May 25 06:45:17 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 25 06:46:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe601418 app-crypt/loop-aes-losetup: misc tweaks * Respect BROOT in src_unpack for util-linux portion * Move verify-sig deps from RDEPEND to BDEPEND * Style tweaks Signed-off-by: Sam James gentoo.org> .../loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild index fbd85c5d3ba5..b26e9ece0c23 100644 --- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild +++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild @@ -20,6 +20,7 @@ SRC_URI=" ) " S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" @@ -27,10 +28,10 @@ IUSE="nls selinux static" RDEPEND=" selinux? ( >=sys-libs/libselinux-2.2.2-r4 ) - verify-sig? ( - >=sec-keys/openpgp-keys-karelzak-20230517 - >=sec-keys/openpgp-keys-jariruusu-20240521 - ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers " BDEPEND=" virtual/pkgconfig @@ -38,10 +39,10 @@ BDEPEND=" app-text/po4a sys-devel/gettext ) -" -DEPEND=" - ${RDEPEND} - virtual/os-headers + verify-sig? ( + >=sec-keys/openpgp-keys-karelzak-20230517 + >=sec-keys/openpgp-keys-jariruusu-20240521 + ) " PATCHES=( @@ -49,7 +50,6 @@ PATCHES=( ) src_unpack() { - if use verify-sig ; then mkdir "${T}"/verify-sig || die pushd "${T}"/verify-sig &>/dev/null || die @@ -59,7 +59,7 @@ src_unpack() { # effects on normal unpack. cp "${DISTDIR}"/${MY_P}.tar.xz . || die xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign /usr/share/openpgp-keys/karelzak.asc + verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign "${BROOT}"/usr/share/openpgp-keys/karelzak.asc popd &>/dev/null || die rm -r "${T}"/verify-sig || die