gentoo resync : 16.01.2020

3 files changed, 5 insertions, 37 deletions

diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index d1e257bc0258..234f2e8e6724 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,5 +1,3 @@
-DIST xvfbwrapper-0.2.8.tar.gz 4660 BLAKE2B 464a9f3d41d3c96a72c0cfc56994c32ccb94ac19267f5a701bd0ee18a17010216fd7ee163d8a532e62fd2256dc296201d4150f4f0d03fd4f20eae703b6bcaac1 SHA512 1b29b7e6bb336a9972e51249bbc96805733e305476cc559f5501cd09a343671c10333b5592e4c4868016d4510b37d6c592165a4683b1543e62c2205b1eeb0980
 DIST xvfbwrapper-0.2.9.tar.gz 5575 BLAKE2B a973e6ca6dd85713e7b350397113d63c15fd284c07d3a0d5c0b8b8dceed65c3a17a3e8222b79ec88fb124175259d51fcd31d09a95183f1cbd091ba11d9bbec3b SHA512 800f3489b2e1bbc884d7651e344ed73783d6c00856f3ab7ccfa6b9058dd6d3bb98d38f11172ba89dff5773d6c5b773bc000786c1f6c6aae5a27179b37017851e
-EBUILD xvfbwrapper-0.2.8.ebuild 736 BLAKE2B 72ba03fabcf6f899c286bb794419e8266c29e1739e8f0c52413faf28725539368841ece77570e2aa987f255cf42fcb8ff188cb80ddce9a98f0eed059213c88b8 SHA512 0e9c13162d30e3028745cd75cd8397af0c152ce25b8c9072eb2511b7d880c1bb04b390d6d7ef87defe1ed78c5ae8f21d21fbf2f5e0b645a1226e41696f01a6f4
-EBUILD xvfbwrapper-0.2.9.ebuild 711 BLAKE2B b1f2cd44ef258a2441b991a3573de235d941831b768912c3a1603595939a5328d318642c703735648d80a05534574c78ab2f6c4735e38ab35dc1c86356ca4362 SHA512 48433e07a4381a8763d2125788f3c82e931b858049cba64e3a74f078c8af2f731b875b6d6575465672c7c1b2f66524df7b2b686d1e5c88b8a7650cdb35af0a45
+EBUILD xvfbwrapper-0.2.9.ebuild 701 BLAKE2B f6fd8777f4e7870e0d8f7decd3ed5dd220d5ccb7c6df338bd27d8b173179485192664de8131ce36ee9ec301cde666d7ff3c5817244f094190a06e5b4a361b378 SHA512 309ef6ae753d66c3c7e8e54979869fb7e7b7178be49c28cbd4ec5c99e71b2a867ac8681790ad65d30c294ba45ed5965f1268fb580cc3b9878dea2ea8523b6d05
 MISC metadata.xml 387 BLAKE2B 1371ad91acdddb84e00b9d88497327d9f969686caeb599467b702da40bc0bb59f324d143cbc285e2739c2afb49bf7984eca78ad9e02a89b8c5697ed21d33b3fb SHA512 d9e8ace17387367e585434a5b178a7a1715973828d6cf762ad82f2c4020413239e87b26dbcb9a8db1122ac57e2b09fe01f0f7fec1b48723cde989c0205b84885
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
deleted file mode 100644
index 226d1d3dee61..000000000000
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
-HOMEPAGE="https://github.com/cgoldberg/xvfbwrapper
-	https://pypi.org/project/xvfbwrapper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="x11-base/xorg-server[xvfb]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pep8[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-#	"${PYTHON}" test_xvfb.py || die "Tests failed with ${EPYTHON}"
-	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
index 9c4b8f613007..49aebade00d5 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -12,14 +12,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="x11-base/xorg-server[xvfb]"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
-"
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
 
 python_test() {
 	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"