diff options
Diffstat (limited to 'sys-apps/util-linux/util-linux-9999.ebuild')
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 55 |
1 files changed, 39 insertions, 16 deletions
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index f3ea42edeeff..6cdf721aeeef 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -115,22 +115,15 @@ src_unpack() { return fi - 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 - rm -r "${T}"/verify-sig || die + # Upstream sign the decompressed .tar + if use verify-sig; then + einfo "Unpacking ${MY_P}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + else + default fi - - default } src_prepare() { @@ -152,11 +145,40 @@ src_prepare() { lsfd/option-inet utmp/last-ipv6 + # Flaky + rename/subdir + # Permission issues on /dev/random lsfd/mkfds-eventpoll lsfd/column-xmode ) + # debug prints confuse the tests which look for a diff + # in output + if has_version "=app-shells/bash-5.3_alpha*" ; then + known_failing_tests+=( + lsfd/column-ainodeclass + lsfd/mkfds-netlink-protocol + lsfd/column-type + lsfd/mkfds-eventfd + lsfd/mkfds-signalfd + lsfd/mkfds-mqueue + lsfd/mkfds-tcp6 + lsfd/mkfds-tcp + lsfd/filter-floating-point-nums + lsfd/mkfds-unix-stream-requiring-sockdiag + lsfd/mkfds-unix-dgram + lsfd/mkfds-directory + lsfd/mkfds-pty + lsfd/mkfds-pipe-no-fork + lsfd/mkfds-unix-stream + lsfd/mkfds-ro-regular-file + lsfd/mkfds-timerfd + lsfd/mkfds-udp + lsfd/mkfds-udp6 + ) + fi + local known_failing_test for known_failing_test in "${known_failing_tests[@]}" ; do einfo "Removing known-failing test: ${known_failing_test}" @@ -367,7 +389,8 @@ multilib_src_install() { fi # This needs to be called AFTER python_install call, bug #689190 - emake DESTDIR="${D}" install + # XXX: -j1 as temporary workaround for bug #931301 + emake DESTDIR="${D}" install -j1 } multilib_src_install_all() { |