diff options
| author |   Sam James <sam@gentoo.org> | 2023-01-16 16:04:22 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-01-16 16:05:08 +0000 |
| commit | 2575ec6caaa80ed8d3c9361312c797837c7c2ec3 (patch) | |
| tree | 87fd6e282e103bb8ce2676c13d0f9e1357372790 /sys-apps/ed | |
| parent | app-misc/ranger: add myself as a maintainer (diff) | |
| download | gentoo-2575ec6caaa80ed8d3c9361312c797837c7c2ec3.tar.gz gentoo-2575ec6caaa80ed8d3c9361312c797837c7c2ec3.tar.bz2 gentoo-2575ec6caaa80ed8d3c9361312c797837c7c2ec3.zip | |
sys-apps/ed: workaround unpacker.eclass/Portage dep resolution bug
1. unpacker_src_uri_depends doesn't flatten the deps (bug #891133) and emits
several || ( ... ) blocks (4).
2. Portage doesn't handle several repeated identical || ( ...) blocks correctly
and takes ages to resolve (bug #891137). It should merge them together.
Bug: https://bugs.gentoo.org/891137
Bug: https://bugs.gentoo.org/891133
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/ed')
| -rw-r--r-- | sys-apps/ed/ed-1.19-r1.ebuild (renamed from sys-apps/ed/ed-1.19.ebuild) | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys-apps/ed/ed-1.19.ebuild b/sys-apps/ed/ed-1.19-r1.ebuild index 65951958803d..8f805d415665 100644 --- a/sys-apps/ed/ed-1.19.ebuild +++ b/sys-apps/ed/ed-1.19-r1.ebuild @@ -26,9 +26,19 @@ if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi +# We don't use unpacker_src_uri_depends here right now because: +# 1. unpacker_src_uri_depends doesn't flatten the deps (bug #891133) and emits +# several || ( ... ) blocks (4). +# 2. Portage doesn't handle several repeated identical || ( ...) blocks correctly +# and takes ages to resolve (bug #891137). It should merge them together. BDEPEND=" sys-apps/texinfo - $(unpacker_src_uri_depends) + || ( + >=app-arch/xz-utils-5.4.0 + app-arch/plzip + app-arch/pdlzip + app-arch/lzip + ) verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz ) " |