net-analyzer/scapy: Allow pycryptodump (bug 611622).

Package-Manager: Portage-2.3.4, Repoman-2.3.2

diff --git a/net-analyzer/scapy/scapy-2.2.0-r3.ebuild b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild
index 900d952428c21ee9d82e13f5cf20f9def000ecec..1f232e43f06a0cefc2c74647af25dcd44cf5795b 100644 (file)
--- 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 8d06e9584908931098f366a61b14c6fc9a817167..a25003746d53151c8a39fa6c175572f7e1e53b91 100644 (file)
--- 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 8d06e9584908931098f366a61b14c6fc9a817167..a25003746d53151c8a39fa6c175572f7e1e53b91 100644 (file)
--- 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 8ddeaf38a4fac440d11414c161cf62b2a5802e5e..a9f89fcaf6c9e9b1dc9363233f34296eb7a3f66a 100644 (file)
--- 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 )