gentoo resync : 09.06.2018

4 files changed, 5 insertions, 36 deletions

diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index d66784fa8d3f..edd217788483 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,8 +1,6 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
-DIST scapy-2.3.3.tar.gz 1459132 BLAKE2B 442e13853cfd4bac4984571367990ce03a2fc1a634564ed7e05641130d435818f161687c530f17280a20f1063aafeeeea35cb867fc2f7d78a4f3ae257dbb6f90 SHA512 47ca2eceafe7b693c569a92c106782037d869c323aaaec41cace07dfdeb3c6a7e9f7bc8ca1150b3c0daea54e6665f93eb1dfc3c511419cfa28eb2e0753bf9ba4
-DIST scapy-2.4.0_rc4.tar.gz 2472251 BLAKE2B 720777e7d19ae1a312ccd78c6d005cf6f1f42fcac8f11956b2fb5521dac17ef477106cef2ee9a9384f764dd1aef337b010faed61f2fb34c3458b3a9c836eb4ed SHA512 003d573fb8ec83029eca93fa9f6333f9a4b4a166ab355a19339194b6a7b8a772d692afeed8d19e0f9422caae326167f1acf819319327f3495dc389fc9a2ea811
+DIST scapy-2.4.0.tar.gz 3182131 BLAKE2B af591b103c90736a5e62801f4c0ebd495e2e71c79ee81f04fdd194739b460c9940b8fcf0c6e279701095979144eff25ca4734926c0251721b37dc63fe8dd9e89 SHA512 0fe80150cd83db7735c9d0b70ec832a4e68eb5160ad8559e9b1bd79c52a9950ef7c9555ea2a1ee1dc8df1f055a885c52552c29e304faf40250ce9c502a5f870a
 EBUILD scapy-2.3.2-r1.ebuild 897 BLAKE2B 6c39e33ab0c611135c34362038461e51e8adaef9828538782b35639a452704892d6ea6d6d1759f475bdf2a35f9b397b5ece3b390a21d73f46ef9964354e8de51 SHA512 c3dff0a0ce1e5929bde3cdecd85654f7f1e070bdff3735359714c3d5d427ca4ae9a339642573274dda1ba13ae041b483fcaf3c46b8ea70c4100685cfee7d89c8
-EBUILD scapy-2.3.3.ebuild 899 BLAKE2B af30ed756c47235b49aa1a20f89e9f9f0d4fe306cc999f11e2ecc55a79bd52342ec85a743dd47b8c76d9f118cb482aa875bc057e4455a4c5b19002b16f8b77fa SHA512 85cd0bb71df5e99fd737753d13f5e33a1811c8d23e38b6bcca2493b78d27e69deb393d0e363ce43d5de4fb0d8ef042768fae5a20b117d9d7befd2052de99825a
-EBUILD scapy-2.4.0_rc4.ebuild 1033 BLAKE2B a153a3ce37f760d3d25b04039df1214b25608f423abb372ecd9d8850d95d3acace29ecce60679f27754525395323b71d3d60ebb928ffc6985fc9199764647c18 SHA512 906406ecdd04d2d0dbd63c23f9fd4f7b264085b99ce695ccf1b63f59c4cc3f0d8733b64b2e327ca6cb3660324d34dc3c827b0d189f476e4ca16991283dd10700
-EBUILD scapy-9999.ebuild 995 BLAKE2B 10bced8b1549478cb7d91214e349f6352f85efec8297153b112e022c513d90933246f014d3a19979fb3bc2bc74c80e40cea4accb1dcfcb2160b0035d79e51767 SHA512 19720ee0a89e9f4b7ee6a3f7f3d3e3cf2744f44e9eea9dcc3e6cdd2ddcb8d51fda73f36c01e9216489c37e138cb81b6af8599389defb72b3a98ce6da8e05d33d
+EBUILD scapy-2.4.0.ebuild 1037 BLAKE2B f3ef7f4a91c9ac52dc34df1b07512cce0193255c0a4c4ef3f7c2888e4108d79977371e408206ad4002eec60f459ff4b473999307bbd98efff1462289325dd668 SHA512 771dd160785c597009bc490cfabbd076f43833bf6f2a350496fa976024caf2b7f2f8457869062e0a35784a4d88aedffebfbd8cbea978198c4d0f3085b81ebd0a
+EBUILD scapy-9999.ebuild 999 BLAKE2B 2c61522bc128d74c8acd148c942eeb0dbbd85482a58c5544dccf7af13aa9d85d0900334e254e38fa373fec380956a2e85d5ce76d241f8b12fc99dce48f706c45 SHA512 3fad60f8813012d4152a7648cd631a9f06f7068d223e30a306c9b32404bb2665e5b0af5f3baf91f0a1342d78173978821137218a8538e5dcf6aa9fd55959a7a9
 MISC metadata.xml 747 BLAKE2B bdfb12b918fe2bd88cac770277ef69fd3bc2d1ef74f6176edbfaed9c9c6bdaa8495bb78f557e24eee8f3b47f7f487a668c76a8d9e532749a9221da0227f3cec8 SHA512 5ee06d7b6cccd1b5939a6f7bd3cbe043285bf630db8f992f627fcd04b929abf70eab31aca5d1270cb1c33e51f1c2460d89b3963af20363122be7f56e1c10ffea
diff --git a/net-analyzer/scapy/scapy-2.3.3.ebuild b/net-analyzer/scapy/scapy-2.3.3.ebuild
deleted file mode 100644
index 391396815ff9..000000000000
--- a/net-analyzer/scapy/scapy-2.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/"
-SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
-
-RDEPEND="
-	net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] )
-	pyx? ( dev-python/pyx[${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 )
-	tcpreplay? ( net-analyzer/tcpreplay )
-"
diff --git a/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild b/net-analyzer/scapy/scapy-2.4.0.ebuild
index 8d3d643afa10..87c9eb983d6f 100644
--- a/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.0.ebuild
@@ -27,7 +27,7 @@ Scapy has optional support for the following packages:
 	net-analyzer/tcpreplay
 	virtual/imagemagick-tools
 
-	See also ${EPREFIX}/usr/share/doc/${PF}/installation.rst
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
 "
 
 src_prepare() {
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index ce815cfb2f7f..37900e5421fc 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -27,7 +27,7 @@ Scapy has optional support for the following packages:
 	net-analyzer/tcpreplay
 	virtual/imagemagick-tools
 
-	See also ${EPREFIX}/usr/share/doc/${PF}/installation.rst
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
 "
 
 src_prepare() {