gentoo resync : 22.05.2021

5 files changed, 5 insertions, 122 deletions

diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 9c81f0f65e38..ed7dcd48a86e 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,7 +1,3 @@
 DIST PyVirtualDisplay-2.1.tar.gz 40798 BLAKE2B 315bb794b81948357919e98637b6276cca11739d019333c873a2b9c3d28d0bbece6996a70fe619f7acae658bcbaa2743dbbdfb23b7b8515c3a40858a83b07712 SHA512 f95a1622adfa1198d7f35757110e923e45bbfc18b31945c9efedb578e1a27fc91ffec403cc68269b2414837260b2b56ae9a58323ed5020af962757722d7a4517
-DIST pyvirtualdisplay-1.3.2.tar.gz 38532 BLAKE2B 2c0cb3af426abc58dc895667c5fecb40ee9aa870dbb08a51ac32fbd5bd3620b97498b3dfc6e7026362604c82f67b60885370f0704a1349a65668628d9a21e80c SHA512 422e1530bb740fc77cc0b7abb73cb8e7326689c80c5f49b58be70b262e8a2c28274d3b83a0ec7753adfbf78b780047f61cf7b18fb14f935d483a5e3d04953210
-DIST pyvirtualdisplay-2.0.tar.gz 40480 BLAKE2B 8243f88a3878124aebf45624ab5712052e3ee9bdae77c150bdfcf109cd7528db8b47a7328aa9a149e8fdb3d8437e84076631adb539185a16a8e64ab97265a45e SHA512 bb5c789723c96d4f2952626c063f749c9f07045231af90d21ccda41697319a4d2f27db8c0f352fd273db114c0d5e65e8c6151b7f858b8ea4e19660a1e941514f
-EBUILD pyvirtualdisplay-1.3.2.ebuild 1378 BLAKE2B 251f36c32e53a76604d98d8166e6a32e5a663994c6729cff60d0e759089d3cc52a87d459e41783c4fdcc68df2ed77d1979bf92b4c288c92ce52ed0d7a90cbaa4 SHA512 ed8dfae1439ccaf1c0b5936024f9f91ebafaa0efbf324f0d8070797a3c6c2dd2751b672cdb5b39acc56c79a4faf9de4ce6683513b1faa6de224719e2213840dd
-EBUILD pyvirtualdisplay-2.0.ebuild 1383 BLAKE2B 57eadd7da3a9c5f32936a282416785f7c3c78e3c2ad41c6307a184f742e20951351863f3b03e29cd09497c259df13d433bcb52227ebea8667c0789e0810f2ec5 SHA512 0365e68ea9ad8600139c197ca8b21539309b08c197f710e6f0db191cd404ede12dc81b43431b4fe1ec6cecf4400bd58797140ff96c8b831d7e1ad2cedbefe49e
-EBUILD pyvirtualdisplay-2.1.ebuild 1132 BLAKE2B 8614287b52fa44eebc5e416c99b33e2708d84d7a9d8d914dd1e88c85bb3c25843163803882616cfd6c23ef983710020c3cfdc50f9a615e7c0792582a255c09ee SHA512 09a658600ade0e19b4ac9d4658b9f3f0a4405c60d24ee148c4eb057ddbf9fdcab17fbebd69587dbcc3ecc92d13e7223c16b8bed53a30c50ec500b227a91fc848
-MISC metadata.xml 609 BLAKE2B 4c4ce234d946f745ecdbef02661a7bf4e644ea03482a7a643929453d1b0b62115d8e5d901de9d61d3228d45a11f53571134298e8b3670383a9f043921b04ab5d SHA512 895bbb8dbdbb90711d7857d5f85f210d20e858df9438879e9ec882ff92607dae33686d9ba39a6b8c3f14414a2c0911dc905ffc8093e3cc25e0441a4db760087d
+EBUILD pyvirtualdisplay-2.1.ebuild 1130 BLAKE2B e09b3b90e6867f9a31738696ea25bf50e341e7f076dcd045b1eb686df36e1c3b0c432636f5f56517472c28298f6b58dd5d9c2650beb66d8af2ef868a30dfa6c4 SHA512 dee845a6a462ba14b0c2091f616a3928522f58b613d86b3f254d931eba196f654d039c62888eb2a3c0263269319776450fb89309b3ae22c8b1115f032b9dcd6a
+MISC metadata.xml 462 BLAKE2B f073d91b8a3d4abe16621a1f22c7e00b650dfb74ffe5685803c2b1dd828d1f4cf7f182b008077daceb7bb43ba740901b5edfc8b2c5b8dcb6509ef6eb670348d2 SHA512 4c68e76fbddc9f6d840287dc38c5c869c6c258f160dcb684da50d0bb7749f0ed3580e638eb5b4a6c2fc38b66909afe0d502fde0a9799e0ef362016e8429a2451
diff --git a/dev-python/pyvirtualdisplay/metadata.xml b/dev-python/pyvirtualdisplay/metadata.xml
index 4c3f22067ecf..caf8a8a7b062 100644
--- a/dev-python/pyvirtualdisplay/metadata.xml
+++ b/dev-python/pyvirtualdisplay/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
deleted file mode 100644
index 293aff4cf873..000000000000
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
-HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
-SRC_URI="https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/backports-tempfile[${PYTHON_USEDEP}]
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyscreenshot[${PYTHON_USEDEP}]
-	~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb,xephyr]
-	x11-misc/x11vnc
-)"
-
-DEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/PyVirtualDisplay-${PV}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# all of this fails: AssertionError
-	rm tests/test_examples.py || die
-
-	# Assertion error No such file or directory: 'Xvnc': 'Xvnc'
-	sed -i -e 's:test_race_10_xvnc:_&:' \
-			tests/test_race.py || die
-
-	# No such file or directory: 'Xvnc': 'Xvnc'
-	sed -i -e 's:test_slowshot:_&:' \
-		-e 's:test_slowshot_with:_&:' \
-			tests/test_smart.py || die
-
-	# No such file or directory: 'Xvnc': 'Xvnc'
-	sed -i -e 's:test_double:_&:' \
-			tests/test_smart2.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.ebuild
deleted file mode 100644
index 132a2cde78b6..000000000000
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
-HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
-SRC_URI="https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? (
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/pillow[xcb,${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb,xephyr]
-	x11-misc/x11vnc
-)"
-
-DEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/PyVirtualDisplay-${PV}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# all of this fails: AssertionError
-	rm tests/test_examples.py || die
-
-	# Hangs forever
-	sed -i -e 's:test_race_100_xvfb:_&:' \
-	-e 's:test_race_100_xe:_&:' \
-			tests/test_race.py || die
-
-	# Hangs forever
-	sed -i -e 's:test_slowshot:_&:' \
-		-e 's:test_slowshot_with:_&:' \
-			tests/test_smart.py || die
-
-	# Hangs forever
-	sed -i -e 's:test_double:_&:' \
-			tests/test_smart2.py || die
-
-	# pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:1.8 timeout:1
-	sed -i -e 's:test_smart:_&:' \
-			tests/test_smart_thread.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
index 2a90301748b0..a43d0d517c0e 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:60.3 timeout:60
 # tests hang in xvfb