diff options
| author |   Sam James <sam@gentoo.org> | 2024-06-20 11:28:24 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-06-20 11:28:24 +0100 |
| commit | 7759152a7abd008031b16c6057cddeae66d4fffd (patch) | |
| tree | 26a2cc9f7b494eaea3d7cf93561511ecf4eb80c1 /sys-apps/man-pages | |
| parent | dev-util/pahole: optimize src_unpack (diff) | |
| download | gentoo-7759152a7abd008031b16c6057cddeae66d4fffd.tar.gz gentoo-7759152a7abd008031b16c6057cddeae66d4fffd.tar.bz2 gentoo-7759152a7abd008031b16c6057cddeae66d4fffd.zip | |
sys-apps/man-pages: optimize src_unpack
As just done in util-linux & btrfs-progs.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/man-pages')
| -rw-r--r-- | sys-apps/man-pages/man-pages-6.06.ebuild | 19 | ||||
| -rw-r--r-- | 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() { |