gentoo resync : 31.05.2021

4 files changed, 2 insertions, 126 deletions

diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
index 18328213d1a7..4a6fa1a48264 100644
--- a/dev-python/pyscreenshot/Manifest
+++ b/dev-python/pyscreenshot/Manifest
@@ -1,7 +1,3 @@
-DIST pyscreenshot-2.2.tar.gz 29726 BLAKE2B d1e314be360d4716b35b4302de82010dfc9a97212b3f4472b42e40f9470fd0575fe8f0ceb976adfe13059c0566413414e03f78189d4afa193d88a0aaf4c5c26e SHA512 6689ccbcd5c6164aeb12d911ee93c8958f6c6b5aaba5ba7d4073ee855e6398180ed27fce6299480b18b3d7ffad12cd17694c3db1f1c7373d4b25be0073d49338
-DIST pyscreenshot-2.3.tar.gz 34543 BLAKE2B a9ae6fc51ac62efabca7e9b4e08ee8ee05d778a3f8ea0bfaec5f0958bea7f6dd266e18a938350aac6fa1058fdb378cfa69cf6c5490768c39d7312be51e3d2630 SHA512 6919e4529a932b9a6e3dd28d60c628447b0e6f25df567db742b5bf14455373ad7340237bb4b77696c436be6f31211030b206d7152f4b61d16d6745f439f84425
 DIST pyscreenshot-3.0.tar.gz 32865 BLAKE2B b39d338be4f1dc23fc30fe84a6f8ee6b6346761b023222438e8ff33e01beafc347d34118332efb053057c54383f5468e73049041889a6140a70c0f928c655661 SHA512 f8070941ade2bc710157238f47c9575df1504ef63152980b2bc0edd1f69c9ca4aeec3f738929de1c81a51fed79838053674626981ec61d95dafa7b9998004606
-EBUILD pyscreenshot-2.2.ebuild 1618 BLAKE2B af871f3177aec6da987058dcee2e8cc9447d0d40c881b8035fbafaf210450047240d4e71648a6b83846f7034b8559ec2f2dad939d65c5fdcec771c6b64d07d09 SHA512 d1faac137a5b51b73a79290822900e3d941a362bfc376976aed8239d0c4130e5da53be1421732bdc9f2972053938dae5d239da8598a3889d9d7576cdaa2f4308
-EBUILD pyscreenshot-2.3.ebuild 1013 BLAKE2B 4a3a8abaf23dc546cc907bc931972c6a6e926e275e3decd3337a6ee0ed1582071f9c819ac4ea5c366bc4d362c80054e7784bf7666bc33cec4179ff4ca0d00360 SHA512 3f0b7f0c31755dda3b3475ae6ddf24a609f8a03155cde9936fd3397b2e3416e9b3ae87bb30c13f2242cc33cddcdb1f24c38e52f6c3213bc7e4646a639f86cc2c
-EBUILD pyscreenshot-3.0.ebuild 975 BLAKE2B 92bb0f42fb44a84c44de0700840452e23fe006967ccb07492c3a133cd45733729c574d4db650e4b05bea0143c57394cbcf6831c041debf1bb4f3b5b4da9d0bb2 SHA512 74ff8ebb5458c68e019350d0c17c8cfe0780ee2bb006d48e09ac637df3844e13e29971f3f7c2b628e857451cd0eae9df6e854b0271ce3c5cf558e7a4df808c6c
+EBUILD pyscreenshot-3.0.ebuild 973 BLAKE2B 2f438e2098c661c838e5808992830bc1f85911f96d0c4002f0a6c9edfa4e06c096c4dceaee9241b277b53716270c74314ed50971053ca3927c6c3b040aefa8f1 SHA512 288e088e78af9de43b02c71ea33895ef657fd59d6b162c25b069c6e0b52f9f76dbe2c4b159181e117cbab3d96ee8d9c6cde93eb745464fb83519961746ef9ef8
 MISC metadata.xml 458 BLAKE2B e057d5382e811b727d46b04ac0ffbbfa2e57799f2b7182e0a0b81cf891b44db37fbb201934810b2ebc353b073fcd4b632612292fc93230904669c276983b46c7 SHA512 5347be673d2628faf4660a3d25f39d340b00aae8155b4e3463a9a8a92554249be3ab5cce1af89c39e33bccac9ff5c0c72b97a5d16db01194586bd0acd75225b9
diff --git a/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild b/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
deleted file mode 100644
index 67e2ca1a19be..000000000000
--- a/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
+++ /dev/null
@@ -1,73 +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 virtualx
-
-DESCRIPTION="Python screenshot library"
-HOMEPAGE="https://github.com/ponty/pyscreenshot"
-SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	media-gfx/pqiv
-)"
-
-DEPEND="
-	dev-python/easyprocess[${PYTHON_USEDEP}]
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/mss[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# easyprocess.EasyProcessError: start error fails inside emerge env
-	sed -i -e 's:test_default:_&:' \
-			tests/test_default.py || die
-
-	# AssertionError
-	sed -i -e 's:test_imagemagick:_&:' \
-			tests/test_imagemagick.py || die
-
-	# Needs access to dbus
-	sed -i -e 's:test_kwin_dbus:_&:' \
-			tests/test_kwin_dbus.py || die
-
-	# AssertionError
-	sed -i -e 's:test_mss:_&:' \
-			tests/test_mss.py || die
-
-	# AssertionError
-	sed -i -e 's:test_pygdk3:_&:' \
-			tests/test_pygdk3.py || die
-
-	# AssertionError
-	sed -i -e 's:test_pyqt5:_&:' \
-			tests/test_pyqt5.py || die
-
-	# AssertionError
-	sed -i -e 's:test_qtpy:_&:' \
-			tests/test_qtpy.py || die
-
-	# AssertionError
-	sed -i -e 's:test_scrot:_&:' \
-			tests/test_scrot.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild b/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild
deleted file mode 100644
index 1cb95e4a350b..000000000000
--- a/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild
+++ /dev/null
@@ -1,47 +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,9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python screenshot library"
-HOMEPAGE="https://github.com/ponty/pyscreenshot"
-SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	media-gfx/imagemagick
-	media-gfx/pqiv
-	kde-apps/gwenview
-	x11-apps/xdpyinfo
-)"
-
-DEPEND="
-	dev-python/easyprocess[${PYTHON_USEDEP}]
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/mss[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Needs access to dbus
-	sed -i -e 's:test_kwin_dbus:_&:' \
-			tests/test_kwin_dbus.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild b/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
index ea317eb5ece9..71f557e8e35f 100644
--- a/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
+++ b/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/easyprocess[${PYTHON_USEDEP}]