1 |
commit: 326109b068b0fb2875ecec1bd6e553d557247036 |
2 |
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 31 17:04:11 2016 +0000 |
4 |
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 31 17:04:11 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326109b0 |
7 |
|
8 |
dev-python/scapy-python3: block against net-analyzer/scapy |
9 |
|
10 |
Put in a block while I figure out how to fix the file collision. |
11 |
|
12 |
Gentoo-Bug: 592612 |
13 |
|
14 |
.../{scapy-python3-0.18.ebuild => scapy-python3-0.18-r1.ebuild} | 7 +++++-- |
15 |
1 file changed, 5 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/scapy-python3/scapy-python3-0.18.ebuild b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild |
18 |
similarity index 77% |
19 |
rename from dev-python/scapy-python3/scapy-python3-0.18.ebuild |
20 |
rename to dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild |
21 |
index 69e8b43..501586c 100644 |
22 |
--- a/dev-python/scapy-python3/scapy-python3-0.18.ebuild |
23 |
+++ b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2015 Gentoo Foundation |
26 |
+# Copyright 1999-2016 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
# $Id$ |
29 |
|
30 |
@@ -17,4 +17,7 @@ LICENSE="BSD" |
31 |
SLOT="0" |
32 |
KEYWORDS="~amd64" |
33 |
|
34 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
35 |
+DEPEND=" |
36 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
37 |
+ !net-analyzer/scapy |
38 |
+ " |