From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B991F1584AD for ; Mon, 21 Apr 2025 08:53:30 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A5057342FA8 for ; Mon, 21 Apr 2025 08:53:30 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 7F07B1104B1; Mon, 21 Apr 2025 08:53:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 76DFA1104B1 for ; Mon, 21 Apr 2025 08:53:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25B6F34306F for ; Mon, 21 Apr 2025 08:53:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 770831C78 for ; Mon, 21 Apr 2025 08:53:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1745225569.fe7e86d14a9bf3b85692531b4971ed52c4563ff3.sam@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdeutils-meta/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdeutils-meta/kdeutils-meta-25.04.49.9999.ebuild kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild kde-apps/kdeutils-meta/metadata.xml X-VCS-Directories: kde-apps/kdeutils-meta/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fe7e86d14a9bf3b85692531b4971ed52c4563ff3 X-VCS-Branch: master Date: Mon, 21 Apr 2025 08:53:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a8558fe7-829a-4462-bbb4-e818a7364c44 X-Archives-Hash: 0bff1d3f31c64cde5d693638b0b51e7a commit: fe7e86d14a9bf3b85692531b4971ed52c4563ff3 Author: Alfred Wingate protonmail com> AuthorDate: Mon Apr 14 19:18:09 2025 +0000 Commit: Sam James gentoo 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 protonmail.com> Closes: https://github.com/gentoo/kde/pull/1032 Signed-off-by: Sam James 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 @@ https://bugs.kde.org/ - Install app-arch/p7zip for 7zip archive support in kde-apps/ark + Install app-arch/p7zip or app-arch/7zip[symlink] for 7zip archive support in kde-apps/ark Install kde-apps/kgpg which depends on kde-apps/akonadi Install app-arch/lrzip for LRZ archive support in kde-apps/ark Install one of app-arch/rar, app-arch/unrar or app-arch/unar for RAR archive support in kde-apps/ark