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

[Jeroen Roovers]

commit:     68e22dda8c90b2369d79cfb0ea885f42008776cc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 08:54:11 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 08:55:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e22dda

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

 net-analyzer/wireshark/wireshark-2.2.7.ebuild    | 5 ++++-
 net-analyzer/wireshark/wireshark-2.4.2.ebuild    | 5 ++++-
 net-analyzer/wireshark/wireshark-2.4.3.ebuild    | 5 ++++-
 net-analyzer/wireshark/wireshark-99999999.ebuild | 5 ++++-
 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 e28e4647122..dcdf77d1de6 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 77aa34a9b99..e886059b19a 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 5fbf5cfe70b..f006ba33901 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 32ecbd608dd..9d9fca8d8a0 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 )