[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

[Mike Gilbert]

commit:     177e937de0c2b6e47cf6fbc306f409305016ab86
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 30 14:46:43 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 15:39:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177e937d

net-analyzer/wireshark: Clean media-libs/speex dependencies.

 net-analyzer/wireshark/wireshark-2.4.5.ebuild    | 6 ++----
 net-analyzer/wireshark/wireshark-2.4.6.ebuild    | 6 ++----
 net-analyzer/wireshark/wireshark-2.6.0.ebuild    | 6 ++----
 net-analyzer/wireshark/wireshark-99999999.ebuild | 6 ++----
 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 0ea23bd2575..d5a957dd425 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 f0e31f02e87..9ab79ccdd07 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 75b779a4898..6af27d0f383 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 59a4a67005b..e39d7345ef9 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 )