[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/

[Sam James]

commit:     b534772e7ad5744049921be64ee39bbb7cd4ef6a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 10:18:47 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=b534772e

sys-apps/util-linux: optimize src_unpack further

As mentioned in c8e331071da74d11d651ebd32bbf4efbd25e0f8e.

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

 sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 25 +++++++++++++------------
 sys-apps/util-linux/util-linux-9999.ebuild      | 15 ++++++++-------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild 
b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
index ac289f40eb68..1205062fedfc 100644
--- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
@@ -110,19 +110,20 @@ pkg_pretend() {
 }
 
 src_unpack() {
-       if [[ ${PV} == 9999 ]] ; then
-               git-r3_src_unpack
-               return
-       fi
-
-       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
+        if [[ ${PV} == 9999 ]] ; then
+                git-r3_src_unpack
+                return
+        fi
+
+       # 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
 }
 
 src_prepare() {

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild 
b/sys-apps/util-linux/util-linux-9999.ebuild
index c9f50b8ca79a..8e74d1439e60 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -115,14 +115,15 @@ src_unpack() {
                return
        fi
 
-       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
 }
 
 src_prepare() {