[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/

[Sam James]

commit:     9fddd648ec082fee2718115dbe3183cbbe8adb45
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 10:20:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 10:23:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fddd648

sys-fs/btrfs-progs: optimize src_unpack further

As mentioned in c8e331071da74d11d651ebd32bbf4efbd25e0f8e.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild  | 14 ++++++++------
 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild
index 40632b73ce14..b4d9a3171bef 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild
@@ -96,13 +96,15 @@ pkg_setup() {
 
 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
+               # Upstream sign the decompressed .tar
+               if use verify-sig; then
+                       einfo "Unpacking ${MY_P}.tar.xz ..."
+                       verify-sig_verify_detached - 
"${DISTDIR}"/${MY_P}.tar.sign \
+                               < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee 
>(tar -x))
+                       assert "Unpack failed"
+               else
+                       default
                fi
-               default
        }
 fi
 

diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 40632b73ce14..b4d9a3171bef 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -96,13 +96,15 @@ pkg_setup() {
 
 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
+               # Upstream sign the decompressed .tar
+               if use verify-sig; then
+                       einfo "Unpacking ${MY_P}.tar.xz ..."
+                       verify-sig_verify_detached - 
"${DISTDIR}"/${MY_P}.tar.sign \
+                               < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee 
>(tar -x))
+                       assert "Unpack failed"
+               else
+                       default
                fi
-               default
        }
 fi