[gentoo-commits] repo/gentoo:master commit in: sys-apps/man-pages/

[Sam James]

commit:     7759152a7abd008031b16c6057cddeae66d4fffd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 10:28:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 10:28:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7759152a

sys-apps/man-pages: optimize src_unpack

As just done in util-linux & btrfs-progs.

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

 sys-apps/man-pages/man-pages-6.06.ebuild | 19 ++++++-------------
 sys-apps/man-pages/man-pages-9999.ebuild | 19 ++++++-------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/sys-apps/man-pages/man-pages-6.06.ebuild 
b/sys-apps/man-pages/man-pages-6.06.ebuild
index 1f1a2609c79c..82b505a3602c 100644
--- a/sys-apps/man-pages/man-pages-6.06.ebuild
+++ b/sys-apps/man-pages/man-pages-6.06.ebuild
@@ -95,21 +95,14 @@ src_unpack() {
        fi
 
        if [[ ${PV} != *_rc* ]] && ! [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] && 
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}"/${P}.tar.xz . || die
-               xz -d ${P}.tar.xz || die
-               verify-sig_verify_detached ${P}.tar "${DISTDIR}"/${P}.tar.sign
-
-               popd &>/dev/null || die
-               rm -r "${T}"/verify-sig || die
+               einfo "Unpacking ${P}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -x))
+               assert "Unpack failed"
+       else
+               default
        fi
-
-       default
 }
 
 src_prepare() {

diff --git a/sys-apps/man-pages/man-pages-9999.ebuild 
b/sys-apps/man-pages/man-pages-9999.ebuild
index 04246b807452..08ed9e22afe1 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -95,21 +95,14 @@ src_unpack() {
        fi
 
        if [[ ${PV} != *_rc* ]] && ! [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] && 
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}"/${P}.tar.xz . || die
-               xz -d ${P}.tar.xz || die
-               verify-sig_verify_detached ${P}.tar "${DISTDIR}"/${P}.tar.sign
-
-               popd &>/dev/null || die
-               rm -r "${T}"/verify-sig || die
+               einfo "Unpacking ${P}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -x))
+               assert "Unpack failed"
+       else
+               default
        fi
-
-       default
 }
 
 src_prepare() {