diff options
| author |   Sam James <sam@gentoo.org> | 2022-10-10 17:30:07 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-10-10 17:30:10 +0100 |
| commit | 6d4d9292ab25548e9dbd30beedf3dbda38b19d67 (patch) | |
| tree | 1367b0134f0015e393eccf6a33985c765cc2e5b4 /net-analyzer | |
| parent | net-analyzer/wireshark: fix automagic libssh dep for wifidump (diff) | |
| download | gentoo-6d4d9292ab25548e9dbd30beedf3dbda38b19d67.tar.gz gentoo-6d4d9292ab25548e9dbd30beedf3dbda38b19d67.tar.bz2 gentoo-6d4d9292ab25548e9dbd30beedf3dbda38b19d67.zip | |
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@gentoo.org>
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild (renamed from net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild) | 16 | ||||
| -rw-r--r-- | 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 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 ) " |