| 1 |
commit: b01ebc09ebf754cec82f06d3475cf9580d74f504 |
| 2 |
Author: Mike Auty <ikelos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 4 12:08:38 2017 +0000 |
| 4 |
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 4 12:08:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01ebc09 |
| 7 |
|
| 8 |
net-analyzer/scapy: Allow pycryptodump (bug 611622). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
| 11 |
|
| 12 |
net-analyzer/scapy/scapy-2.2.0-r3.ebuild | 3 ++- |
| 13 |
net-analyzer/scapy/scapy-2.3.0-r1.ebuild | 3 ++- |
| 14 |
net-analyzer/scapy/scapy-2.3.1-r1.ebuild | 3 ++- |
| 15 |
net-analyzer/scapy/scapy-2.3.2-r1.ebuild | 3 ++- |
| 16 |
4 files changed, 8 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-analyzer/scapy/scapy-2.2.0-r3.ebuild b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild |
| 19 |
index 900d952428c..1f232e43f06 100644 |
| 20 |
--- a/net-analyzer/scapy/scapy-2.2.0-r3.ebuild |
| 21 |
+++ b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild |
| 22 |
@@ -20,7 +20,8 @@ RDEPEND=" |
| 23 |
net-analyzer/tcpdump |
| 24 |
gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) |
| 25 |
pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) |
| 26 |
- crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) |
| 27 |
+ crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] |
| 28 |
+ dev-python/pycrypto[${PYTHON_USEDEP}] ) ) |
| 29 |
graphviz? ( media-gfx/graphviz ) |
| 30 |
imagemagick? ( virtual/imagemagick-tools ) |
| 31 |
visual? ( dev-python/visual ) |
| 32 |
|
| 33 |
diff --git a/net-analyzer/scapy/scapy-2.3.0-r1.ebuild b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild |
| 34 |
index 8d06e958490..a25003746d5 100644 |
| 35 |
--- a/net-analyzer/scapy/scapy-2.3.0-r1.ebuild |
| 36 |
+++ b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild |
| 37 |
@@ -20,7 +20,8 @@ RDEPEND=" |
| 38 |
net-analyzer/tcpdump |
| 39 |
gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) |
| 40 |
pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) |
| 41 |
- crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) |
| 42 |
+ crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] |
| 43 |
+ dev-python/pycrypto[${PYTHON_USEDEP}] ) ) |
| 44 |
graphviz? ( media-gfx/graphviz ) |
| 45 |
imagemagick? ( virtual/imagemagick-tools ) |
| 46 |
visual? ( dev-python/visual ) |
| 47 |
|
| 48 |
diff --git a/net-analyzer/scapy/scapy-2.3.1-r1.ebuild b/net-analyzer/scapy/scapy-2.3.1-r1.ebuild |
| 49 |
index 8d06e958490..a25003746d5 100644 |
| 50 |
--- a/net-analyzer/scapy/scapy-2.3.1-r1.ebuild |
| 51 |
+++ b/net-analyzer/scapy/scapy-2.3.1-r1.ebuild |
| 52 |
@@ -20,7 +20,8 @@ RDEPEND=" |
| 53 |
net-analyzer/tcpdump |
| 54 |
gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) |
| 55 |
pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) |
| 56 |
- crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) |
| 57 |
+ crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] |
| 58 |
+ dev-python/pycrypto[${PYTHON_USEDEP}] ) ) |
| 59 |
graphviz? ( media-gfx/graphviz ) |
| 60 |
imagemagick? ( virtual/imagemagick-tools ) |
| 61 |
visual? ( dev-python/visual ) |
| 62 |
|
| 63 |
diff --git a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild |
| 64 |
index 8ddeaf38a4f..a9f89fcaf6c 100644 |
| 65 |
--- a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild |
| 66 |
+++ b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild |
| 67 |
@@ -20,7 +20,8 @@ RDEPEND=" |
| 68 |
net-analyzer/tcpdump |
| 69 |
gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) |
| 70 |
pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) |
| 71 |
- crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) |
| 72 |
+ crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] |
| 73 |
+ dev-python/pycrypto[${PYTHON_USEDEP}] ) ) |
| 74 |
graphviz? ( media-gfx/graphviz ) |
| 75 |
imagemagick? ( virtual/imagemagick-tools ) |
| 76 |
visual? ( dev-python/visual ) |
Archives