net-analyzer/wireshark: Preferentially depend on media-libs/speexdsp over media-libs...

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index e28e464712200dedd52ccbfbade94aa2ea47e417..dcdf77d1de68dc58d3111eaba9aa8723c5371328 100644 (file)
--- 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 77aa34a9b99ed2427d20da0732ef5dca831cb797..e886059b19aa22c53965b1cf633b5896197dbde2 100644 (file)
--- 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 5fbf5cfe70b6b168add000e62a9f43692fcac2e5..f006ba339014a7ca6688b37ddf5d3f1b3cd46064 100644 (file)
--- 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 32ecbd608dd8c92c1b3039fc4fa02aa209d9be37..9d9fca8d8a032835b2c09596fb3353e52238ef71 100644 (file)
--- 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 )