gentoo resync : 25.08.2020

3 files changed, 3 insertions, 28 deletions

diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 5e99238d2d44..80710d812ceb 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 653 BLAKE2B 035de653d10042b0d42adabe9677ebe38add21b84d0de4e4df3de1478554013bfe226e74bd78600200b53ea2fe1947fd4793570a2ebcd97a62697c47483cffc7 SHA512 c80404793739f5afcd0187d4eebc05fa2e0011d68ddeb0e971c36511a06e0e4039aaac933ef7bac86e5f52e8c25623d3f4e291b4f980319b7f645538afdf3f74
-EBUILD pytest-expect-1.1.0.ebuild 685 BLAKE2B 9774b9b955ae1d19d34979e9c8c1254ae2aa5b65f38d1e186f4f043a75f4679a2d19a0ec46b2a16ee38ca6e3b70a1a3635c46ad62ceb1388453e3f9c0eee65cd SHA512 84c2d74b5255fe18f7c9a33f32a750b8aaf76a85019ae8e752ea074d35b4b622b3eeb8d62ef9868919853c43027943f1ea7215d977a761d20d86ae50a41f0cfe
+EBUILD pytest-expect-1.1.0-r1.ebuild 646 BLAKE2B 2c19e380454c57f0dd9022a41b18650fee3c8af32b6b56bbe0af85e5b564c31f9c924e97401eee4696914f7a091aa07ed0080c3dbefbc8d1ceb810ff7059f1ba SHA512 064f79933aa0367060aaacadb37fe253f9a7d9b6f1fc4835ab8a22b5cb0a4b6a99d908eeb9905d3ad8685cf68b4b604628a7680cc1fb3c2f6e080acdee5bbe55
 MISC metadata.xml 458 BLAKE2B b8e23df2621be3f2cf2818753ab7a18102fd3e1ff32e80aa425c50b36f9f7ea736a1e9eb9030920c2882e65bdb2372afb0ece371ee13dbb45b3be3144d73f8fa SHA512 a366c816a1513376742bf1d43bb4cc60df9923b3e191d169ae56ee9706f60cbf8edbe35a195f41fd214bdc4cc10fc35c106d798845b3d45ac6b878f16718eeae
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index d594e0cfcf23..87a8f34bb03a 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
deleted file mode 100644
index dd0c5cac25a5..000000000000
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin that stores test expectations by saving the set of failing tests"
-HOMEPAGE="https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/u-msgpack[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"