gentoo resync : 17.02.2018

3 files changed, 77 insertions, 17 deletions

diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 7aa547e16783..95b3cd7dcb14 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,6 +1,8 @@
 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
 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-9999.ebuild 798 BLAKE2B c11b548fb7034bf030e60bead05db494d793deb1ff6b97184cef73f3d6fef3a6da96885f0c2062223b1891ec9a4af252f13ad98087b78a4b6884b679ac6e8152 SHA512 a1697b2fe97f24fb201595461c81f3e0add75edd7f354a634c0fdde81a949f2bc8fb4b88fbc6a1ca1d09ac75fc01928fce6ee98b65a96f1f090066bb0a744ec2
+EBUILD scapy-2.4.0_rc4.ebuild 1052 BLAKE2B 3b3c822b646da0a135436fac328a5d486e23fede27fa2382e18b3478a2e0ce6512eba033da1976d9ae985eb53cf970499ebc5b7bb288b5e89b6ac10e4592b580 SHA512 48d72227b96a78d46e5e1e5bddbfc9824d3c40c04f83959732cb3ee98f8eb556864a2316b7bb6a8eae8539783dd7332812f06ff1c90f0714116992c1d118086c
+EBUILD scapy-9999.ebuild 1014 BLAKE2B bca076704e8490453c80ceb80873d17b78f94f0f77c9ad28fb1641674f9f5b03872ddd63421a65a89d217fb1859083e7119fba3bcc8b8480c4ad808a7642f003 SHA512 785a45b51097a15d68d8f069cd84bf6e59a1b09a3c2e970cf8d62340ce3df3c7a0a443a694a452d00f6b0cf2f8befc3c6fe5bc17379b1690013741d356044537
 MISC metadata.xml 761 BLAKE2B 53a142c9861099fda37030b396c87f8cb67c4cc3672e6ef5116258759d0d4c7b2dcacee6973fd09596ae2a4f7ec6cd01b10289a8740994d5cd7ceaa78729c753 SHA512 a5d6f2cb43d82333ec33bb655b9251ec9f04a1f4718f4a54306f1938b19e75027ca62c47945d76462c1ad7f9ce7710e5df206b60962c1f9928fd82fd0272402c
diff --git a/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild b/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild
new file mode 100644
index 000000000000..1e5186715f7e
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RDEPEND="
+	net-analyzer/tcpdump
+"
+S=${WORKDIR}/${P/_/}
+DOC_CONTENTS="
+Scapy has optional support for the following packages:
+
+	dev-python/cryptography
+	dev-python/gnuplot-py
+	dev-python/ipython
+	dev-python/pyx
+	dev-python/visual
+	media-gfx/graphviz
+	net-analyzer/tcpreplay
+	virtual/imagemagick-tools
+
+	See also ${EPREFIX}/usr/share/doc/${PF}/installation.rst
+"
+
+src_prepare() {
+	echo ${PV/_/} > ${PN}/VERSION
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc -r doc/${PN}/*
+	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
+}
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index 7d971be6c7c6..ab2b39168b26 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -1,28 +1,43 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1 git-r3
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/"
+HOMEPAGE="http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy"
 EGIT_REPO_URI="https://github.com/secdev/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-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/pycrypto[${PYTHON_USEDEP}] )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( virtual/imagemagick-tools )
-	visual? ( dev-python/visual )
-	tcpreplay? ( net-analyzer/tcpreplay )
 "
+S=${WORKDIR}/${P/_/}
+DOC_CONTENTS="
+Scapy has optional support for the following packages:
+
+	dev-python/cryptography
+	dev-python/gnuplot-py
+	dev-python/ipython
+	dev-python/pyx
+	dev-python/visual
+	media-gfx/graphviz
+	net-analyzer/tcpreplay
+	virtual/imagemagick-tools
+
+	See also ${EPREFIX}/usr/share/doc/${PF}/installation.rst
+"
+
+src_prepare() {
+	echo ${PV/_/} > ${PN}/VERSION
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc -r doc/${PN}/*
+	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
+}