From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37961158094 for ; Mon, 10 Oct 2022 16:30:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EF5CE0843; Mon, 10 Oct 2022 16:30:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 pigeon.gentoo.org (Postfix) with ESMTPS id 47490E0843 for ; Mon, 10 Oct 2022 16:30:32 +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 0A928340FC4 for ; Mon, 10 Oct 2022 16:30:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35AA0523 for ; Mon, 10 Oct 2022 16:30:29 +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: <1665419410.6d4d9292ab25548e9dbd30beedf3dbda38b19d67.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild net-analyzer/wireshark/wireshark-9999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6d4d9292ab25548e9dbd30beedf3dbda38b19d67 X-VCS-Branch: master Date: Mon, 10 Oct 2022 16:30:29 +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: 1d43665d-b0c0-41e9-8cee-56ed04c58202 X-Archives-Hash: 841ba98fac6bc003174baa8517e3440a commit: 6d4d9292ab25548e9dbd30beedf3dbda38b19d67 Author: Sam James gentoo org> AuthorDate: Mon Oct 10 16:30:07 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 10 16:30:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4d9292 net-analyzer/wireshark: shuffle deps again qtdeclarative should be pure DEPEND here, not RDEPEND. Closes: https://bugs.gentoo.org/876265 Signed-off-by: Sam James gentoo.org> ...reshark-4.0.0-r1.ebuild => wireshark-4.0.0-r2.ebuild} | 16 +++++++++------- net-analyzer/wireshark/wireshark-9999.ebuild | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild similarity index 99% rename from net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild rename to net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild index f402d1fc68c0..08b136066287 100644 --- a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild @@ -87,7 +87,14 @@ RDEPEND=" zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" # TODO: 4.0.0_rc1 release notes say: # "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." BDEPEND=" @@ -117,12 +124,7 @@ BDEPEND=" " RDEPEND=" ${RDEPEND} - gui? ( - virtual/freedesktop-icon-theme - !qt6? ( - dev-qt/qtdeclarative:5 - ) - ) + gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) " diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index f402d1fc68c0..08b136066287 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -87,7 +87,14 @@ RDEPEND=" zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" # TODO: 4.0.0_rc1 release notes say: # "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." BDEPEND=" @@ -117,12 +124,7 @@ BDEPEND=" " RDEPEND=" ${RDEPEND} - gui? ( - virtual/freedesktop-icon-theme - !qt6? ( - dev-qt/qtdeclarative:5 - ) - ) + gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) "