commit: 5cc8ea52655a502cf3f1bc818d163e5154c05b3d
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 02:11:24 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 02:11:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc8ea52
dev-python/btrfsutil: optimize src_unpack
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-python/btrfsutil/btrfsutil-6.8.1.ebuild | 19 ++++---------------
dev-python/btrfsutil/btrfsutil-6.9.ebuild | 19 ++++---------------
2 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/dev-python/btrfsutil/btrfsutil-6.8.1.ebuild
b/dev-python/btrfsutil/btrfsutil-6.8.1.ebuild
index 92b9fab71ba3..6da2d87766a8 100644
--- a/dev-python/btrfsutil/btrfsutil-6.8.1.ebuild
+++ b/dev-python/btrfsutil/btrfsutil-6.8.1.ebuild
@@ -35,20 +35,9 @@ RDEPEND+=" !sys-fs/btrfs-progs[python(-)]"
src_unpack() {
if 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}"/${MY_P}.tar.xz . || die
- xz -d ${MY_P}.tar.xz || die
- verify-sig_verify_detached ${MY_P}.tar
"${DISTDIR}"/${MY_P}.tar.sign
-
- popd >/dev/null || die
- unpack "${T}"/verify-sig/${MY_P}.tar
- rm -r "${T}"/verify-sig || die
- else
- default
+ verify-sig_verify_detached \
+ <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \
+ "${DISTDIR}"/${MY_P}.tar.sign
fi
+ default
}
diff --git a/dev-python/btrfsutil/btrfsutil-6.9.ebuild
b/dev-python/btrfsutil/btrfsutil-6.9.ebuild
index 92b9fab71ba3..6da2d87766a8 100644
--- a/dev-python/btrfsutil/btrfsutil-6.9.ebuild
+++ b/dev-python/btrfsutil/btrfsutil-6.9.ebuild
@@ -35,20 +35,9 @@ RDEPEND+=" !sys-fs/btrfs-progs[python(-)]"
src_unpack() {
if 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}"/${MY_P}.tar.xz . || die
- xz -d ${MY_P}.tar.xz || die
- verify-sig_verify_detached ${MY_P}.tar
"${DISTDIR}"/${MY_P}.tar.sign
-
- popd >/dev/null || die
- unpack "${T}"/verify-sig/${MY_P}.tar
- rm -r "${T}"/verify-sig || die
- else
- default
+ verify-sig_verify_detached \
+ <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \
+ "${DISTDIR}"/${MY_P}.tar.sign
fi
+ default
}