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

[Sam James]

commit:     1865634376198a229ac110642122bc32935b7637
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 15 23:57:27 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 15 23:57:27 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18656343

sys-fs/btrfs-progs: port to verify-sig_uncompress_verify_unpack

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

 sys-fs/btrfs-progs/btrfs-progs-6.17.1.ebuild | 9 +++------
 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild   | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.17.1.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-6.17.1.ebuild
index 527c906b2c0c..499799992bca 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.17.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2025 Gentoo Authors
+# Copyright 2008-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -98,12 +98,9 @@ pkg_setup() {
 
 if [[ ${PV} != 9999 ]]; then
        src_unpack() {
-               # 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 -xf -))
-                       assert "Unpack failed"
+                       verify-sig_uncompress_verify_unpack 
"${DISTDIR}"/${MY_P}.tar.xz \
+                               "${DISTDIR}"/${MY_P}.tar.sign
                else
                        default
                fi

diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index ad1b1253f165..650a13334749 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2025 Gentoo Authors
+# Copyright 2008-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -98,12 +98,9 @@ pkg_setup() {
 
 if [[ ${PV} != 9999 ]]; then
        src_unpack() {
-               # 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 -xf -))
-                       assert "Unpack failed"
+                       verify-sig_uncompress_verify_unpack 
"${DISTDIR}"/${MY_P}.tar.xz \
+                               "${DISTDIR}"/${MY_P}.tar.sign
                else
                        default
                fi