gentoo resync : 30.04.2018

5 files changed, 12 insertions, 20 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index afda93101373..6aaf1784eb2e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,8 +6,8 @@ AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f92022
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a SHA512 171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
 DIST wireshark-2.6.0.tar.xz 28314868 BLAKE2B 2121a667115474ac4b1fe05d50ffc02383bf7a8057ea072480455562c62a75d18f3c6b6886ca1e7345101d15057a67a250a3d2a2050777ff5bb1654279b1ac87 SHA512 a419ed32caeb9f25fc26e345c7baf7d847fee35730c64efad66870a786b26b9f8d5a8665b8b99be88f9cf504f6d9e640584d9849558ff09efc83400588dc6da8
-EBUILD wireshark-2.4.5.ebuild 7392 BLAKE2B 833313e93273e8a70800ace0fd0118b0c110d57201ab93fca9874deb5a31054151c38b18f9d8afab1f9bd3d32937500d587f96687341b4c34552fd3f026d0f89 SHA512 f0fd759e54e070e1821c63f998711c59f0d12aca3511f6bbe5b1b04788e4d7f69c26c387e9ce8b0468bfe6e83e61157869f905016759ccb383a87fff1a395c82
-EBUILD wireshark-2.4.6.ebuild 7400 BLAKE2B b7285588257633fc37bd8065c9dbef66c5a89cc2fe181bf3a4345beb8f144d889c6227939265ba152795eaac3cc08c84828455f35dd431f54f8e51e4f6536077 SHA512 f372729872f52aee8ab308bb97f284b198308af4abc9fe25f2edf2b6b9535ac17c548fde0720a46e409a53708067b8e00bb67811a79907fff5521585e1a926c7
-EBUILD wireshark-2.6.0.ebuild 6669 BLAKE2B 71ff363e37f83bdf5529346c7943b2c758d0ed50bf01471630b8f3f1f669bf7faea0e2e10373b36a453023b24b165b2c2575ebd0437161ff63a85ab29560cb0a SHA512 517a363489eff99f5d8dfa9e64025ac9940598824253c2b59598060804a7bcc1cc10fe94aeb007ec8f4fcfec0e8b02b9be0465b0373d76f403435b4c947132e5
-EBUILD wireshark-99999999.ebuild 7143 BLAKE2B 1f37c8e34e6d65965ba0b54056198c7d1fd15f763c987a9a753cf8a6c6c8487ebf977c8ccd6171d1336e1074cad7fe28620721b8b4eae74f1dc7e84b6a0ab38d SHA512 ef42790fdbf27aed911a8922abc7e094e2ccf08ea2c34f04587f17a3b9b892238bc401a4a9a9b017a1025098ddc17a8c47970d5b84811dd6690a742969d276ba
+EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
+EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
+EBUILD wireshark-2.6.0.ebuild 6657 BLAKE2B b067e041801abaf66207c7841e41d7d359d3e8d5300be0bb78f484e75feae8889c50cd75d566e4c3e32e12728df261f44dccb6784ecab7da8ac67eb9fb1675b5 SHA512 d213869467b91e8b7d4bb176441d2905bb7de877ae88651b1e8f4f16cb54c86b0eb189efdf8b0387bfc694cf61c0f6978f655639d77ea469ce1788e6f94985c6
+EBUILD wireshark-99999999.ebuild 7131 BLAKE2B 33279bcabaa939b5262335b2d3d589fcd6b954111788e5bd42eb4c13594a0239b214b3a340978c95b0b10e246be6c3430d9da5d7ad03380ae07c2a098ebcea61 SHA512 d43c61aa3f810821ff74315fdaf6dd10e2d3755ed9b167105412a87fa51d2df64809258b8541e480ea2af49934b51ccbbc14ffb3995cb02a8b81d36ae7f3dde7
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index 0ea23bd25755..d5a957dd4257 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 f0e31f02e870..9ab79ccdd073 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 75b779a48983..6af27d0f383c 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 59a4a67005b5..e39d7345ef96 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 )