gentoo resync : 18.05.2019

6 files changed, 55 insertions, 11 deletions

diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index c0c8985be57f..4815cc5859b4 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,8 +1,10 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
 DIST scapy-2.4.0.tar.gz 3182131 BLAKE2B af591b103c90736a5e62801f4c0ebd495e2e71c79ee81f04fdd194739b460c9940b8fcf0c6e279701095979144eff25ca4734926c0251721b37dc63fe8dd9e89 SHA512 0fe80150cd83db7735c9d0b70ec832a4e68eb5160ad8559e9b1bd79c52a9950ef7c9555ea2a1ee1dc8df1f055a885c52552c29e304faf40250ce9c502a5f870a
 DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db
-EBUILD scapy-2.3.2-r1.ebuild 859 BLAKE2B 0ca5a6e0167ba5979444c5e994f7b7cc70ff6956862f757a2303698c71930f1f08815a74e4500a7fe9f5667d9723765461b02b2264c9332e29d9c38820cc8386 SHA512 7b731147b9b3024e00dcaf4ce0c43d23fafcff737389be66d7ad4a9b3f5f4a15ef00d2e255eaf0487377e2c6a4b88017c4fb8265dcc4f9a817ef0785da494661
-EBUILD scapy-2.4.0.ebuild 1032 BLAKE2B fc0f639924d5e7fe3664e5935a569653b3f30964a9ec20900ddf00869c51ecb2ab9260dcf0d1f7615a3fcbf16ae7248f07c3d7be442c245e407ac60ecab6b116 SHA512 60b0c20b04e0463c38e10c1e74fc675e316b0976e85fd0a76abc630cbeecb08fb2159212c493e82077c5f1abeeec09b7cbecc436eb4f06648307602ec24a39d8
-EBUILD scapy-2.4.2.ebuild 1034 BLAKE2B e49261facec1453d9a35955e7c0c959bb1df5a16192052e3c88de498625a2fff1ae72422e5973b6837e59d3fdfde8c223dbd442fe0e5da7c20391de5e5dcda31 SHA512 71f020a55c0748eb1bcb76a27137248460c6c23db5bb5dd7160af6c8f45bf0c761c314ac76aca24c2c1eeef31a40406fa7f614ddce11e77d81220a1ab54d3617
-EBUILD scapy-9999.ebuild 994 BLAKE2B 89b25b3c24f18409eefaf5b29ebe052a2c2dd8436ca8d467d7709f61c570e8006d5277bb7d1a0311334f30146e61a06f5a1dd4a9f358c70a27940fb951af2cc4 SHA512 b848b8bf4752e5eea1bcfc491f328d8a58795fa0719f7861e6e647bf705af36c5ff82cdbcfa5f31ff80875f1d9f0aa35366b5f02ac871bb61bb470cabde101b3
+DIST scapy-2.4.3_rc1.tar.gz 2455703 BLAKE2B 7db2af39afad694b49296d0e02a7e649c31023fbb12d66faccb777e297240b84e39558dd0ba56dab159e8412cec93d868ec02542afa385e2ec49d1a80b8788d4 SHA512 29996996521d5802b435c27dee5ad91fdd3e974dc86a3ba1377c67eb5c81a639fdfa18790ca2275df54685a963f7c69bde10b01887ba54315ddef6d2c002f8d8
+EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
+EBUILD scapy-2.4.0.ebuild 1013 BLAKE2B e3c6a15e9faacdcf4bd5e36b0ab8e97b962012ca80df400393fc3011847829c52ce231e5594a85a611e74b342f1713d9a0679e0dbef71ca251205a22af1aac48 SHA512 e4c1595760abbb32fc7d0545e94974a044201d7219ea9537ef2ccd60550fd1d4fa0d0b30bdb639885c53cdce9077fcd974ea71182bb5d664b3210576c68ae596
+EBUILD scapy-2.4.2.ebuild 1015 BLAKE2B 84ed365afa54aca1f499902ebc7a200f3464f9f7e9157fdab17749ce59cf25524e18ae9f7181e09e760d2a02ddd701eeccb5b10371573e33961f0037ebfced13 SHA512 434e19fcee3d9c71b7967440cd8af2dd2cae36f8e26f99e9b02de202fe80116a0e8eb501be8db7ff7d633f6f1bec7202b5b65826a7a21881042f1b9b5f723dc4
+EBUILD scapy-2.4.3_rc1.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
+EBUILD scapy-9999.ebuild 977 BLAKE2B a15521edc49f7bf13c8aed716444ad120bde4d1208a4dee50737e21ab49b79870dbefb3a0793814bf81dffc778da0902f31fd6bc7ffe8268214c25da62db3e54 SHA512 d038dfbb47a750cc6cd7067f97d92f8f728e82d446fda21d1110d55886e9fc2defe54299946ca30be335b4dac40eb7fffc79ae5aa9f1b0f04149bd7e978fc4c5
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
index 69f18cdf55a9..e3f662d3328b 100644
--- a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ 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/"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/scapy/scapy-2.4.0.ebuild b/net-analyzer/scapy/scapy-2.4.0.ebuild
index f5c9435fdff2..25d400437783 100644
--- a/net-analyzer/scapy/scapy-2.4.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_{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"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/scapy/scapy-2.4.2.ebuild b/net-analyzer/scapy/scapy-2.4.2.ebuild
index 113734a51279..121abefbe78e 100644
--- a/net-analyzer/scapy/scapy-2.4.2.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 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"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/scapy/scapy-2.4.3_rc1.ebuild b/net-analyzer/scapy/scapy-2.4.3_rc1.ebuild
new file mode 100644
index 000000000000..25877178edf3
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.4.3_rc1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="https://scapy.net/ 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
+	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 3005f30dde5d..55240a18ff01 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 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/ https://github.com/secdev/scapy"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 EGIT_REPO_URI="https://github.com/secdev/${PN}"
 
 LICENSE="GPL-2"