From b01ebc09ebf754cec82f06d3475cf9580d74f504 Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Sat, 4 Mar 2017 12:08:38 +0000 Subject: [PATCH] net-analyzer/scapy: Allow pycryptodump (bug 611622). Package-Manager: Portage-2.3.4, Repoman-2.3.2 --- net-analyzer/scapy/scapy-2.2.0-r3.ebuild | 3 ++- net-analyzer/scapy/scapy-2.3.0-r1.ebuild | 3 ++- net-analyzer/scapy/scapy-2.3.1-r1.ebuild | 3 ++- net-analyzer/scapy/scapy-2.3.2-r1.ebuild | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net-analyzer/scapy/scapy-2.2.0-r3.ebuild b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild index 900d952428c2..1f232e43f06a 100644 --- a/net-analyzer/scapy/scapy-2.2.0-r3.ebuild +++ b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild @@ -20,7 +20,8 @@ RDEPEND=" net-analyzer/tcpdump gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) + crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/pycrypto[${PYTHON_USEDEP}] ) ) graphviz? ( media-gfx/graphviz ) imagemagick? ( virtual/imagemagick-tools ) visual? ( dev-python/visual ) diff --git a/net-analyzer/scapy/scapy-2.3.0-r1.ebuild b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild index 8d06e9584908..a25003746d53 100644 --- a/net-analyzer/scapy/scapy-2.3.0-r1.ebuild +++ b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild @@ -20,7 +20,8 @@ RDEPEND=" net-analyzer/tcpdump gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) + crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/pycrypto[${PYTHON_USEDEP}] ) ) graphviz? ( media-gfx/graphviz ) imagemagick? ( virtual/imagemagick-tools ) visual? ( dev-python/visual ) diff --git a/net-analyzer/scapy/scapy-2.3.1-r1.ebuild b/net-analyzer/scapy/scapy-2.3.1-r1.ebuild index 8d06e9584908..a25003746d53 100644 --- a/net-analyzer/scapy/scapy-2.3.1-r1.ebuild +++ b/net-analyzer/scapy/scapy-2.3.1-r1.ebuild @@ -20,7 +20,8 @@ RDEPEND=" net-analyzer/tcpdump gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) + crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/pycrypto[${PYTHON_USEDEP}] ) ) graphviz? ( media-gfx/graphviz ) imagemagick? ( virtual/imagemagick-tools ) visual? ( dev-python/visual ) diff --git a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild index 8ddeaf38a4fa..a9f89fcaf6c9 100644 --- a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild +++ b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild @@ -20,7 +20,8 @@ RDEPEND=" net-analyzer/tcpdump gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) + crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/pycrypto[${PYTHON_USEDEP}] ) ) graphviz? ( media-gfx/graphviz ) imagemagick? ( virtual/imagemagick-tools ) visual? ( dev-python/visual ) -- 2.26.2