commit: 6d4d9292ab25548e9dbd30beedf3dbda38b19d67 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Oct 10 16:30:07 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 ) "
