| 1 |
commit: 177e937de0c2b6e47cf6fbc306f409305016ab86 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Apr 30 14:46:43 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 15:39:50 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177e937d |
| 7 |
|
| 8 |
net-analyzer/wireshark: Clean media-libs/speex dependencies. |
| 9 |
|
| 10 |
net-analyzer/wireshark/wireshark-2.4.5.ebuild | 6 ++---- |
| 11 |
net-analyzer/wireshark/wireshark-2.4.6.ebuild | 6 ++---- |
| 12 |
net-analyzer/wireshark/wireshark-2.6.0.ebuild | 6 ++---- |
| 13 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 6 ++---- |
| 14 |
4 files changed, 8 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild |
| 17 |
index 0ea23bd2575..d5a957dd425 100644 |
| 18 |
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild |
| 19 |
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild |
| 20 |
@@ -52,10 +52,8 @@ CDEPEND=" |
| 21 |
dev-qt/qtmultimedia:5 |
| 22 |
dev-qt/qtprintsupport:5 |
| 23 |
dev-qt/qtwidgets:5 |
| 24 |
- || ( |
| 25 |
- media-libs/speexdsp |
| 26 |
- <media-libs/speex-1.2.0 |
| 27 |
- ) |
| 28 |
+ >=media-libs/speex-1.2.0 |
| 29 |
+ media-libs/speexdsp |
| 30 |
x11-misc/xdg-utils |
| 31 |
) |
| 32 |
sbc? ( media-libs/sbc ) |
| 33 |
|
| 34 |
diff --git a/net-analyzer/wireshark/wireshark-2.4.6.ebuild b/net-analyzer/wireshark/wireshark-2.4.6.ebuild |
| 35 |
index f0e31f02e87..9ab79ccdd07 100644 |
| 36 |
--- a/net-analyzer/wireshark/wireshark-2.4.6.ebuild |
| 37 |
+++ b/net-analyzer/wireshark/wireshark-2.4.6.ebuild |
| 38 |
@@ -52,10 +52,8 @@ CDEPEND=" |
| 39 |
dev-qt/qtmultimedia:5 |
| 40 |
dev-qt/qtprintsupport:5 |
| 41 |
dev-qt/qtwidgets:5 |
| 42 |
- || ( |
| 43 |
- media-libs/speexdsp |
| 44 |
- <media-libs/speex-1.2.0 |
| 45 |
- ) |
| 46 |
+ >=media-libs/speex-1.2.0 |
| 47 |
+ media-libs/speexdsp |
| 48 |
x11-misc/xdg-utils |
| 49 |
) |
| 50 |
sbc? ( media-libs/sbc ) |
| 51 |
|
| 52 |
diff --git a/net-analyzer/wireshark/wireshark-2.6.0.ebuild b/net-analyzer/wireshark/wireshark-2.6.0.ebuild |
| 53 |
index 75b779a4898..6af27d0f383 100644 |
| 54 |
--- a/net-analyzer/wireshark/wireshark-2.6.0.ebuild |
| 55 |
+++ b/net-analyzer/wireshark/wireshark-2.6.0.ebuild |
| 56 |
@@ -53,10 +53,8 @@ CDEPEND=" |
| 57 |
dev-qt/qtmultimedia:5 |
| 58 |
dev-qt/qtprintsupport:5 |
| 59 |
dev-qt/qtwidgets:5 |
| 60 |
- || ( |
| 61 |
- media-libs/speexdsp |
| 62 |
- <media-libs/speex-1.2.0 |
| 63 |
- ) |
| 64 |
+ >=media-libs/speex-1.2.0 |
| 65 |
+ media-libs/speexdsp |
| 66 |
x11-misc/xdg-utils |
| 67 |
) |
| 68 |
sbc? ( media-libs/sbc ) |
| 69 |
|
| 70 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 71 |
index 59a4a67005b..e39d7345ef9 100644 |
| 72 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 73 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 74 |
@@ -53,10 +53,8 @@ CDEPEND=" |
| 75 |
dev-qt/qtmultimedia:5 |
| 76 |
dev-qt/qtprintsupport:5 |
| 77 |
dev-qt/qtwidgets:5 |
| 78 |
- || ( |
| 79 |
- media-libs/speexdsp |
| 80 |
- <media-libs/speex-1.2.0 |
| 81 |
- ) |
| 82 |
+ >=media-libs/speex-1.2.0 |
| 83 |
+ media-libs/speexdsp |
| 84 |
x11-misc/xdg-utils |
| 85 |
) |
| 86 |
sbc? ( media-libs/sbc ) |
Archives