commit: fe7e86d14a9bf3b85692531b4971ed52c4563ff3 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Mon Apr 14 19:18:09 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 21 08:52:49 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe7e86d1
kde-apps/kdeutils-meta: add || ( 7zip[symlink] p7zip ) Bug: https://bugs.gentoo.org/953096 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/kde/pull/1032 Signed-off-by: Sam James <sam <AT> gentoo.org> kde-apps/kdeutils-meta/kdeutils-meta-25.04.49.9999.ebuild | 5 ++++- kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild | 5 ++++- kde-apps/kdeutils-meta/metadata.xml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-25.04.49.9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-25.04.49.9999.ebuild index 13a3487ea8..2e82d7534a 100644 --- a/kde-apps/kdeutils-meta/kdeutils-meta-25.04.49.9999.ebuild +++ b/kde-apps/kdeutils-meta/kdeutils-meta-25.04.49.9999.ebuild @@ -43,7 +43,10 @@ RDEPEND=" " # Optional runtime deps: kde-apps/ark RDEPEND="${RDEPEND} - 7zip? ( app-arch/p7zip ) + 7zip? ( || ( + >=app-arch/7zip-24.09[symlink(+)] + app-arch/p7zip + ) ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild index 13a3487ea8..2e82d7534a 100644 --- a/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild +++ b/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild @@ -43,7 +43,10 @@ RDEPEND=" " # Optional runtime deps: kde-apps/ark RDEPEND="${RDEPEND} - 7zip? ( app-arch/p7zip ) + 7zip? ( || ( + >=app-arch/7zip-24.09[symlink(+)] + app-arch/p7zip + ) ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar diff --git a/kde-apps/kdeutils-meta/metadata.xml b/kde-apps/kdeutils-meta/metadata.xml index 39cf45a7e5..4f23251f59 100644 --- a/kde-apps/kdeutils-meta/metadata.xml +++ b/kde-apps/kdeutils-meta/metadata.xml @@ -9,7 +9,7 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="7zip">Install <pkg>app-arch/p7zip</pkg> for 7zip archive support in <pkg>kde-apps/ark</pkg></flag> + <flag name="7zip">Install <pkg>app-arch/p7zip</pkg> or <pkg>app-arch/7zip</pkg>[symlink] for 7zip archive support in <pkg>kde-apps/ark</pkg></flag> <flag name="gpg">Install <pkg>kde-apps/kgpg</pkg> which depends on <pkg>kde-apps/akonadi</pkg></flag> <flag name="lrz">Install <pkg>app-arch/lrzip</pkg> for LRZ archive support in <pkg>kde-apps/ark</pkg></flag> <flag name="rar">Install one of <pkg>app-arch/rar</pkg>, <pkg>app-arch/unrar</pkg> or <pkg>app-arch/unar</pkg> for RAR archive support in <pkg>kde-apps/ark</pkg></flag>
