From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 785C015817D for ; Thu, 20 Jun 2024 10:31:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7276BE2A28; Thu, 20 Jun 2024 10:31:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5416BE2A28 for ; Thu, 20 Jun 2024 10:31:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BADE33BEED for ; Thu, 20 Jun 2024 10:31:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A873C1D1C for ; Thu, 20 Jun 2024 10:31:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1718879304.7759152a7abd008031b16c6057cddeae66d4fffd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/man-pages/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/man-pages/man-pages-6.06.ebuild sys-apps/man-pages/man-pages-9999.ebuild X-VCS-Directories: sys-apps/man-pages/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7759152a7abd008031b16c6057cddeae66d4fffd X-VCS-Branch: master Date: Thu, 20 Jun 2024 10:31:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 147e88ee-b907-41ba-9cd7-26ff3488be32 X-Archives-Hash: 2928230ffcfbfa6116b483c29b61becf commit: 7759152a7abd008031b16c6057cddeae66d4fffd Author: Sam James gentoo org> AuthorDate: Thu Jun 20 10:28:24 2024 +0000 Commit: Sam James gentoo 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 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() {