summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2018-04-30 16:46:43 +0200
committerMike Gilbert <floppym@gentoo.org>2018-04-30 11:39:50 -0400
commit177e937de0c2b6e47cf6fbc306f409305016ab86 (patch)
tree52fb9aa5f32d6aaddae5d25296813a0f05de2fee /net-analyzer/wireshark
parentmedia-sound/pulseaudio: Clean media-libs/speex dependencies. (diff)
downloadgentoo-177e937de0c2b6e47cf6fbc306f409305016ab86.tar.gz
gentoo-177e937de0c2b6e47cf6fbc306f409305016ab86.tar.bz2
gentoo-177e937de0c2b6e47cf6fbc306f409305016ab86.zip
net-analyzer/wireshark: Clean media-libs/speex dependencies.
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.5.ebuild6
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.6.ebuild6
-rw-r--r--net-analyzer/wireshark/wireshark-2.6.0.ebuild6
-rw-r--r--net-analyzer/wireshark/wireshark-99999999.ebuild6
4 files changed, 8 insertions, 16 deletions
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index 0ea23bd25755..d5a957dd4257 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -52,10 +52,8 @@ CDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
- || (
- media-libs/speexdsp
- <media-libs/speex-1.2.0
- )
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )
diff --git a/net-analyzer/wireshark/wireshark-2.4.6.ebuild b/net-analyzer/wireshark/wireshark-2.4.6.ebuild
index f0e31f02e870..9ab79ccdd073 100644
--- a/net-analyzer/wireshark/wireshark-2.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.6.ebuild
@@ -52,10 +52,8 @@ CDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
- || (
- media-libs/speexdsp
- <media-libs/speex-1.2.0
- )
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )
diff --git a/net-analyzer/wireshark/wireshark-2.6.0.ebuild b/net-analyzer/wireshark/wireshark-2.6.0.ebuild
index 75b779a48983..6af27d0f383c 100644
--- a/net-analyzer/wireshark/wireshark-2.6.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.0.ebuild
@@ -53,10 +53,8 @@ CDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
- || (
- media-libs/speexdsp
- <media-libs/speex-1.2.0
- )
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
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 59a4a67005b5..e39d7345ef96 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -53,10 +53,8 @@ CDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
- || (
- media-libs/speexdsp
- <media-libs/speex-1.2.0
- )
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
x11-misc/xdg-utils
)
sbc? ( media-libs/sbc )