From: Tobias Klausmann <klausman@gentoo.org>
Date: Wed, 31 Aug 2016 17:04:11 +0000 (+0200)
Subject: dev-python/scapy-python3: block against net-analyzer/scapy
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=326109b068b0fb2875ecec1bd6e553d557247036;p=gentoo.git

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
---

diff --git a/dev-python/scapy-python3/scapy-python3-0.18.ebuild b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild
similarity index 77%
rename from dev-python/scapy-python3/scapy-python3-0.18.ebuild
rename to 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
+	"