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 70774158041 for ; Thu, 4 Apr 2024 12:13:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2C4EE2A23; Thu, 4 Apr 2024 12:13:21 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7CF93E2A23 for ; Thu, 4 Apr 2024 12:13:21 +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 D9672343130 for ; Thu, 4 Apr 2024 12:13:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A1B415E5 for ; Thu, 4 Apr 2024 12:13:18 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1712232778.1c35b7a2a22fcc25c80ec1b02ec152ad94591f33.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sec-keys/signify-keys-lanodan/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild X-VCS-Directories: sec-keys/signify-keys-lanodan/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 1c35b7a2a22fcc25c80ec1b02ec152ad94591f33 X-VCS-Branch: dev Date: Thu, 4 Apr 2024 12:13:18 +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: 5a04093a-1443-4491-b389-82d68806db37 X-Archives-Hash: c6f3e1aa90db7c4a8a750eae151ad637 commit: 1c35b7a2a22fcc25c80ec1b02ec152ad94591f33 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Thu Apr 4 12:12:24 2024 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu Apr 4 12:12:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1c35b7a2 sec-keys/signify-keys-lanodan: Fix installation when USE=-verify-sig Closes: https://bugs.gentoo.org/928481 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild | 10 ++++++---- sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild index 321dda971d..7df00ba72f 100644 --- a/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild +++ b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild @@ -24,13 +24,15 @@ BDEPEND="verify-sig? ( sec-keys/signify-keys-lanodan:${MY_PREV_PV} )" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-${MY_PREV_PV//-/.}.pub" src_unpack() { + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + if use verify-sig; then - # Too many levels of symbolic links - cd "${DISTDIR}" || die - cp ${A} "${WORKDIR}" || die - cd "${WORKDIR}" || die verify-sig_verify_detached "${P}.pub" "${P}.pub.${MY_PREV_PV}.sig" fi + default } diff --git a/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild index f41946bf96..d658cef284 100644 --- a/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild +++ b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild @@ -24,13 +24,15 @@ BDEPEND="verify-sig? ( sec-keys/signify-keys-lanodan:${MY_PREV_PV} )" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-${MY_PREV_PV}.pub" src_unpack() { + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + if use verify-sig; then - # Too many levels of symbolic links - cd "${DISTDIR}" || die - cp ${A} "${WORKDIR}" || die - cd "${WORKDIR}" || die verify-sig_verify_detached "${P}.pub" "${P}.pub.${MY_PREV_PV}.sig" fi + default }