summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klausmann <klausman@gentoo.org>2016-08-31 19:04:11 +0200
committerTobias Klausmann <klausman@gentoo.org>2016-08-31 19:04:11 +0200
commit326109b068b0fb2875ecec1bd6e553d557247036 (patch)
tree3599452c786c132be9e5a5287de5500191ed6ada /dev-python/scapy-python3
parentsys-apps/openrc: Stable for HPPA (bug #588786). (diff)
downloadgentoo-326109b068b0fb2875ecec1bd6e553d557247036.tar.gz
gentoo-326109b068b0fb2875ecec1bd6e553d557247036.tar.bz2
gentoo-326109b068b0fb2875ecec1bd6e553d557247036.zip
dev-python/scapy-python3: block against net-analyzer/scapy
Put in a block while I figure out how to fix the file collision. Gentoo-Bug: 592612
Diffstat (limited to 'dev-python/scapy-python3')
-rw-r--r--dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild (renamed from dev-python/scapy-python3/scapy-python3-0.18.ebuild)7
1 files changed, 5 insertions, 2 deletions
diff --git a/dev-python/scapy-python3/scapy-python3-0.18.ebuild b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild
index 69e8b43a7e55..501586c100bc 100644
--- a/dev-python/scapy-python3/scapy-python3-0.18.ebuild
+++ b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,4 +17,7 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ !net-analyzer/scapy
+ "