From: Jeroen Roovers <jer@gentoo.org>
Date: Mon, 18 Dec 2017 08:54:11 +0000 (+0100)
Subject: net-analyzer/wireshark: Preferentially depend on media-libs/speexdsp over media-libs... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68e22dda8c90b2369d79cfb0ea885f42008776cc;p=gentoo.git

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
---

diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index e28e46471220..dcdf77d1de68 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 77aa34a9b99e..e886059b19aa 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 5fbf5cfe70b6..f006ba339014 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 32ecbd608dd8..9d9fca8d8a03 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 )