gentoo resync : 27.03.2021

4 files changed, 2 insertions, 101 deletions

diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index f0bcba4e3c6b..d698090e3ca4 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,6 +1,3 @@
-AUX pyperclip-1.7.0-test-pyqt.patch 1098 BLAKE2B 4fe453df11842615f1c2f2206553b3b98642bef61cc596bf7951f3dca2f15988e5a41bf577a4543ff692ddb7ef22e184c76f53dc982a5c658f067677cc563098 SHA512 4135204bb98d4148524bc6699a39917d4b5d04f5a686e61d283414889a4b6891c3ec5c0a7492a7a0ca95eca12bcce4cfd80beb3c2420a7fc6f4512efa30e2706
-DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
 DIST pyperclip-1.8.2.tar.gz 20920 BLAKE2B d14a7d977b434db5ae3218792ccd73428bab244a6f6a92d3fd7f059ee99f841853b69a8e039a8192a6cca693adc943a93f24835d25471888975b306b7be4a36a SHA512 ade0cdf2bfdbe3ce807a02b64bb1e839afc9955254ddeb3e0fe7c1dd9fd9fddc11f8386a02590690b039045b46e9103e4d094f1bad3e272f532fda4db5ed1c1a
-EBUILD pyperclip-1.7.0.ebuild 1224 BLAKE2B 9a9c14f66381071ea284bea31e98aaf7c215b9e5b2e27549246fcd16eb89f649e8a54a2952b458c8e4e3d4c3c0d12eb934fb770f8c63b06b10c7d85165878dcb SHA512 cf10f385fac732e85a8a846305cf00ef95ba652398c13ff0303e4f682743ac3dee55cc860d930887d81dfa9885726540f8ed366d058864a3c4f1881ac75be5bd
-EBUILD pyperclip-1.8.2.ebuild 1180 BLAKE2B b2e30adad634560de79cac5dcebd984d87bdb62315760dbce3469e02a4e91ca64823a70c738a43b2d925bfc25f1678a489ada60b9336a079dfa3e656a377b001 SHA512 860e8d07bdfac263f35a7d132d3f785bb3be36704cb5a910f6a81fa387c884ad0c8dc41307486c443b873f5e232734a5e220785a93c3d4e00e361754b965b76a
+EBUILD pyperclip-1.8.2.ebuild 1175 BLAKE2B de8da8d34c1686662802ceb5602b546098cb733cc0a81b956b934198cb3f73ecf2c6d585bec94988babbcc61dc6b3f6484d09318a302749d1cedbd188a5468f9 SHA512 d5f088860495001aa637880b2943f7caacf54ed10b8a5d2c62da8f77aa06acb585b34714324f0cf2ba6757ffa02f975af13a3026e4d82f50afc61e5228aeb04a
 MISC metadata.xml 429 BLAKE2B c77e5ac40cfbc1893883c615eed7bc511ae3d146a2b2350516e06bcb08fd50872a53758c0be0750ac70950dabcdce986cea5c8d52019930ac74be9e25ea9c259 SHA512 38ecc541684be21065234c1ea7939ed99e4abeac6cce9b1fe1ee8a05ab487afdb15c57736dd2c4e111502751fd38fe98e862d1433c2cb58812f020476a8b344a
diff --git a/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch b/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch
deleted file mode 100644
index 4f1a94955f44..000000000000
--- a/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From be59ac638e26aff5204a32333f7ebe046003065a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 9 Jun 2020 08:46:46 +0200
-Subject: [PATCH] Make PyQt checks in tests more specific
-
-Test whether the widgets module can be imported rather than 'PyQt?'
-in general.  The latter gives false positives if PyQt is uninstalled
-but there are leftover subpackages such as qscintilla.  In this case,
-Python 3 imports 'PyQt?' as a namespace.
----
- tests/test_pyperclip.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_pyperclip.py b/tests/test_pyperclip.py
-index 7519d94..2942639 100644
---- a/tests/test_pyperclip.py
-+++ b/tests/test_pyperclip.py
-@@ -146,10 +146,10 @@ class TestGtk(_TestClipboard):
- class TestQt(_TestClipboard):
-     if HAS_DISPLAY:
-         try:
--            import PyQt5
-+            import PyQt5.QtWidgets
-         except ImportError:
-             try:
--                import PyQt4
-+                import PyQt4.QtGui
-             except ImportError:
-                 pass
-             else:
--- 
-2.27.0
-
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
deleted file mode 100644
index ed8610f66825..000000000000
--- a/dev-python/pyperclip/pyperclip-1.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A cross-platform clipboard module for Python."
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
-
-RDEPEND="
-	|| (
-		(
-			x11-misc/xsel
-			sys-apps/which
-		)
-		(
-			x11-misc/xclip
-			sys-apps/which
-		)
-		(
-			kde-plasma/plasma-workspace
-			sys-apps/which
-		)
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/QtPy[${PYTHON_USEDEP}]
-	)
-"
-# test at least one backend
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-pyqt.patch
-)
-
-src_prepare() {
-	# stupid windows
-	find -type f -exec sed -i -e 's:\r$::' {} + || die
-	# klipper is hard to get working, and once we make it work,
-	# it breaks most of the other backends
-	sed -e 's:_executable_exists("klipper"):False:' \
-		-i tests/test_pyperclip.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/test_pyperclip.py -vv ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
index 43129c28df83..361a2543afb3 100644
--- a/dev-python/pyperclip/pyperclip-1.8.2.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
 
 RDEPEND="
 	|| (