commit: 0254b513dd6c9210f989d37ce3882c967c2f0e56 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Mon Apr 14 18:00:41 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 14 23:28:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0254b513
app-arch/patool: use app-arch/7zip if possible 7zip is also keyworded on x86 now due to https://bugs.gentoo.org/953098. 7zip + || ( 7zip[symlink] p7zip ) is to get maximum test coverage as patool supports both 7zz and 7z. Bug: https://bugs.gentoo.org/953092 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/41593 Signed-off-by: Sam James <sam <AT> gentoo.org> app-arch/patool/patool-4.0.0.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app-arch/patool/patool-4.0.0.ebuild b/app-arch/patool/patool-4.0.0.ebuild index a11332d4ab07..7775199ee8a5 100644 --- a/app-arch/patool/patool-4.0.0.ebuild +++ b/app-arch/patool/patool-4.0.0.ebuild @@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~x86" BDEPEND=" test? ( + app-arch/7zip app-arch/arj app-arch/bzip2 app-arch/bzip3 @@ -33,7 +34,6 @@ BDEPEND=" app-arch/lzip app-arch/lzop app-arch/ncompress - app-arch/p7zip app-arch/pbzip2 app-arch/pdlzip app-arch/pigz @@ -58,9 +58,12 @@ BDEPEND=" sys-apps/diffutils sys-apps/file sys-apps/grep + || ( + >=app-arch/7zip-24.09[symlink(+)] + app-arch/p7zip + ) !elibc_musl? ( app-arch/rar ) !x86? ( - app-arch/7zip app-arch/clzip app-arch/lrzip app-arch/unar @@ -76,7 +79,6 @@ BDEPEND=" # app-arch/clzip is unkeyworded on x86 # app-arch/lrzip bug #916317 on x86 # app-arch/unar is unkeyworded on x86 -# app-arch/7zip is unkeyworded on x86 # Unpackaged testable dependencies # archmage
