diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild | 34 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 34 |
2 files changed, 22 insertions, 46 deletions
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild index 59e32bcafd5d..a3192a87f3a1 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild @@ -94,29 +94,17 @@ pkg_setup() { : # Prevent python-any-r1_python_setup } -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && 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 - rm -r "${T}"/verify-sig || die - fi - - default -} +if [[ ${PV} != 9999 ]]; then + src_unpack() { + 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 + fi + default + } +fi src_prepare() { default diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 59e32bcafd5d..a3192a87f3a1 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -94,29 +94,17 @@ pkg_setup() { : # Prevent python-any-r1_python_setup } -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && 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 - rm -r "${T}"/verify-sig || die - fi - - default -} +if [[ ${PV} != 9999 ]]; then + src_unpack() { + 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 + fi + default + } +fi src_prepare() { default |