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

diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index 0ea23bd2575537ac590b2cf9a5c1c6b50027d938..d5a957dd4257abb11c9de1cae195edacfe38762c 100644 (file)
--- 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 f0e31f02e8703e0ef24f8875e43919403f793af6..9ab79ccdd0737944a8f45951bd7abb9e2d8f6e16 100644 (file)
--- 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 75b779a48983b11a0f41b3466661ec74019b313d..6af27d0f383c0bba1fa7848733cda22033edda16 100644 (file)
--- 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 59a4a67005b52d3ff91427deba04ddebe35c499b..e39d7345ef966a3b2b2c7a2059379c68d10394d3 100644 (file)
--- 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 )