summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2017-12-18 09:54:11 +0100
committerJeroen Roovers <jer@gentoo.org>2017-12-18 09:55:26 +0100
commit68e22dda8c90b2369d79cfb0ea885f42008776cc (patch)
tree2a23b96a765c10a3b0708a4e43b49c20271c05c1 /net-analyzer/wireshark
parentnet-dns/dnssec-validator: Remove old. (diff)
downloadgentoo-68e22dda8c90b2369d79cfb0ea885f42008776cc.tar.gz
gentoo-68e22dda8c90b2369d79cfb0ea885f42008776cc.tar.bz2
gentoo-68e22dda8c90b2369d79cfb0ea885f42008776cc.zip
net-analyzer/wireshark: Preferentially depend on media-libs/speexdsp over media-libs/speex (bug #611766).
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r--net-analyzer/wireshark/wireshark-2.2.7.ebuild5
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.2.ebuild5
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.3.ebuild5
-rw-r--r--net-analyzer/wireshark/wireshark-99999999.ebuild5
4 files changed, 16 insertions, 4 deletions
diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index e28e46471220..dcdf77d1de68 100644
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -48,7 +48,10 @@ CDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
- media-libs/speex
+ || (
+ media-libs/speexdsp
+ <media-libs/speex-1.2.0
+ )
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
index 77aa34a9b99e..e886059b19aa 100644
--- a/net-analyzer/wireshark/wireshark-2.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
@@ -51,7 +51,10 @@ CDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
- media-libs/speex
+ || (
+ media-libs/speexdsp
+ <media-libs/speex-1.2.0
+ )
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )
diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
index 5fbf5cfe70b6..f006ba339014 100644
--- a/net-analyzer/wireshark/wireshark-2.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
@@ -52,7 +52,10 @@ CDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
- media-libs/speex
+ || (
+ media-libs/speexdsp
+ <media-libs/speex-1.2.0
+ )
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 32ecbd608dd8..9d9fca8d8a03 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -52,7 +52,10 @@ CDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
- media-libs/speex
+ || (
+ media-libs/speexdsp
+ <media-libs/speex-1.2.0
+ )
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )