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 2774E15817D for ; Thu, 20 Jun 2024 02:12:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FB8CE2A1B; Thu, 20 Jun 2024 02:12:34 +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 B80E8E2A1B for ; Thu, 20 Jun 2024 02:12:33 +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 A29A433BF03 for ; Thu, 20 Jun 2024 02:12:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0372E1C86 for ; Thu, 20 Jun 2024 02:12:31 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1718849013.7e4aeaf563a8d9b6997d872e9ce513e01b7ee022.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild sys-fs/btrfs-progs/btrfs-progs-9999.ebuild X-VCS-Directories: sys-fs/btrfs-progs/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 7e4aeaf563a8d9b6997d872e9ce513e01b7ee022 X-VCS-Branch: master Date: Thu, 20 Jun 2024 02:12:31 +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: 183d821d-9270-41fe-ad28-438e31da0559 X-Archives-Hash: 12a19da4184b8c150d39875f635a07a2 commit: 7e4aeaf563a8d9b6997d872e9ce513e01b7ee022 Author: Mike Gilbert gentoo org> AuthorDate: Thu Jun 20 02:03:33 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Jun 20 02:03:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4aeaf5 sys-fs/btrfs-progs: optimize src_unpack We can avoid using a temp file via bash command substitution. Signed-off-by: Mike Gilbert gentoo.org> sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild | 34 ++++++++++-------------------- sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 34 ++++++++++-------------------- 2 files changed, 22 insertions(+), 46 deletions(-) diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild index 59e32bcafd5d..a3192a87f3a1 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild @@ -94,29 +94,17 @@ pkg_setup() { : # Prevent python-any-r1_python_setup } -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # 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 - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} +if [[ ${PV} != 9999 ]]; then + src_unpack() { + if use verify-sig ; then + # Upstream sign the decompressed .tar + verify-sig_verify_detached \ + <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ + "${DISTDIR}"/${MY_P}.tar.sign + fi + default + } +fi src_prepare() { default diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 59e32bcafd5d..a3192a87f3a1 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -94,29 +94,17 @@ pkg_setup() { : # Prevent python-any-r1_python_setup } -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # 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 - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} +if [[ ${PV} != 9999 ]]; then + src_unpack() { + if use verify-sig ; then + # Upstream sign the decompressed .tar + verify-sig_verify_detached \ + <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ + "${DISTDIR}"/${MY_P}.tar.sign + fi + default + } +fi src_prepare() { default