gentoo resync : 18.08.2019

4 files changed, 5 insertions, 49 deletions

diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index c3ffdfbf862f..65238e453d01 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,10 +1,8 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
 DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db
-DIST scapy-2.4.3_rc2.tar.gz 2785738 BLAKE2B f0318b90d02f2e54033d1d2c6c0d3eff63302a3df3e4b6f14913741c7f677b3cfa79abcfcfed38c81dfb893434009eb3f809dfccb8b493a0f42c8547d67f7a18 SHA512 0d7dac163028fcb596175c532b594fe8bf80f1382518e971259c9e92eafd8c7665e517d9bc7bf8f335b147fcc14d0225d7e24fd08adca0029fb5e4e6e5ae09c5
-DIST scapy-2.4.3_rc3.tar.gz 2947420 BLAKE2B 43c9ffebfd87c6918c15dd403a58e85cb44f38c540fd28117a5586b2ad1f341ad793a5f6b2e5c1a8204e9c682c1ef6da3c20a313c0ba7f4ff3617ec674f5bb2d SHA512 ef0c6ef97868a3489eaa30acbd7eb203a61f311e50ecd9ec375fb05ae78ba5f33f854928440aa84dbd35e4178469c93a4f6073a33082572b133df93ee18000bd
+DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
 EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
 EBUILD scapy-2.4.2.ebuild 1015 BLAKE2B 84ed365afa54aca1f499902ebc7a200f3464f9f7e9157fdab17749ce59cf25524e18ae9f7181e09e760d2a02ddd701eeccb5b10371573e33961f0037ebfced13 SHA512 434e19fcee3d9c71b7967440cd8af2dd2cae36f8e26f99e9b02de202fe80116a0e8eb501be8db7ff7d633f6f1bec7202b5b65826a7a21881042f1b9b5f723dc4
-EBUILD scapy-2.4.3_rc2.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
-EBUILD scapy-2.4.3_rc3.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
-EBUILD scapy-9999.ebuild 977 BLAKE2B a15521edc49f7bf13c8aed716444ad120bde4d1208a4dee50737e21ab49b79870dbefb3a0793814bf81dffc778da0902f31fd6bc7ffe8268214c25da62db3e54 SHA512 d038dfbb47a750cc6cd7067f97d92f8f728e82d446fda21d1110d55886e9fc2defe54299946ca30be335b4dac40eb7fffc79ae5aa9f1b0f04149bd7e978fc4c5
+EBUILD scapy-2.4.3.ebuild 1009 BLAKE2B caacdac8cebdf60d50f02589e0cf0232cc0fef9e1f327b1d3143235703fcee0b162b31c2b3c0d2195be2ec42538e8f7ec198331d4d12bf1e31c5cb01fb75969f SHA512 585bb1d4ed1c391ff7727d847c4fd3ed9ab8598ef00898c41f852c9843719f00d1f07bd4d41186dbac472031d501084754bfd26cd307d347c8799f7c065d1a3d
+EBUILD scapy-9999.ebuild 971 BLAKE2B 633a8a0de6c713957cd4d0c775244310fc039057295602ef127e2f899e7f3fca94ffd61d5964ab44cae4bdae19041a99f8b774df17f325ddea8eeebda0f4be07 SHA512 8e367a693eb6d62ffba9e8db226314c0524c258501c024a0dbeb395f4f1fd1ed4a29b2550c6c5e3eb41cfb274309119763f5f1d977849d7fbfe20ec65a2c8908
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.4.3_rc2.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild
index 25877178edf3..ccaf35b48e6c 100644
--- a/net-analyzer/scapy/scapy-2.4.3_rc2.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/scapy/scapy-2.4.3_rc3.ebuild b/net-analyzer/scapy/scapy-2.4.3_rc3.ebuild
deleted file mode 100644
index 25877178edf3..000000000000
--- a/net-analyzer/scapy/scapy-2.4.3_rc3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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 55240a18ff01..955a856de149 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"