gentoo resync : 16.09.2021

4 files changed, 5 insertions, 61 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index b6f4e95baa2b..ba5e63bd1858 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,9 +1,8 @@
 AUX QtPy-1.9.0-python3_9.patch 401 BLAKE2B a28d4344fd4dfed3270d4dcfeae7df6a12ed38fcab779dcbf3e43798a0385960b3fa45e5077ef9c7d00cb9fe69e84653668a09c50c5ba9dfb5eb13e7b23cb554 SHA512 c0996c53cd3b7401986c11510cbe9717ec7448c9b4d6acfed43d64c2c4035e6d474c90783f7d26d8eb530c9ad91297e02d4b27c95fc1ed026344273be455404e
 DIST QtPy-1.10.0.tar.gz 34339 BLAKE2B cbae5eb38bf8ee4ab1528bca0afa93c57b70f48eb44639eac04344f4bbef28a4277bd3727ed5ac25f8ef18cc5391fafd33bb8ea42037eabee10cd4d13d7d3d1c SHA512 5ca326ae64cc85b48b02daa344d23387a9165a0097d59c31d921c7f67141afe31dad8a46abd0b201b31446f97405d7dce4dacd936b24c5faf9484dc37665e974
-DIST QtPy-1.11.0.tar.gz 36855 BLAKE2B 6e505241a59fa0b5bf8b82a4de2ee0d8e04e56975a7bc9857af212d5511769d2819ea627fc30605f0459c566ca5a2fce4303a2e282c3230bf5a8155a326097b5 SHA512 589626bd61ec94a6c9c5eb0c436c4b96a5d387e7aa4e7ea22a5de6e9e6f73d2034cda0144783837e8bd4798cd6da1415b8478b2e92ff5fd826800bfbc0751859
+DIST QtPy-1.11.1.tar.gz 37068 BLAKE2B 5eef91a8aaad5d8354d123481e434a2b32b1aa1eddd4b6cc0205a40249533c2f6211b13ea049485243e510b0d820c35f0f5833df4c42276d15f3f8269cff3604 SHA512 467780e353b9658234cc164a11bc1526165a31a2021fd75efdd109ea516de5f279bb601130c98fd295aba99c40f20ab3d2c4758951180d4dc05e47bbc3e8408c
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
 EBUILD QtPy-1.10.0.ebuild 5708 BLAKE2B 84fe6cf1d5f3a309a6c4ff3fbcd6c7223b785c9d1fce5086102b4be37c2e98047ffcd836ba66ffcba7aab3d6abefb583cdce1ed79096e74381549b75aa312448 SHA512 335a76cf409e529e47d275b2e8da1437c59d5730b1d0429e5e7605cc124292298225fa53af8ccaa8344aa9278823ec2756dcbb6c4f4344e53dbef06efe9c4723
-EBUILD QtPy-1.11.0.ebuild 5708 BLAKE2B 84fe6cf1d5f3a309a6c4ff3fbcd6c7223b785c9d1fce5086102b4be37c2e98047ffcd836ba66ffcba7aab3d6abefb583cdce1ed79096e74381549b75aa312448 SHA512 335a76cf409e529e47d275b2e8da1437c59d5730b1d0429e5e7605cc124292298225fa53af8ccaa8344aa9278823ec2756dcbb6c4f4344e53dbef06efe9c4723
-EBUILD QtPy-1.9.0-r3.ebuild 1985 BLAKE2B 82aaa05d5afd83b1ecaed22a5f0b69fe03c9520dbdcb847004447361e49cd47e02276a07abd866d4fc601ebca9d93e24f70d73ea4729a7b3eedc5e40f51701d5 SHA512 d4225cdb1b33c28f8c31a6253fdb52d5a55c27a539e1632bf4c375c38357d9000447a549049949e850cc0b1d5b3f9ba9f5c63b4dca35ad8176bc109bc2e029f7
+EBUILD QtPy-1.11.1.ebuild 5707 BLAKE2B c3efe90e18116a2e051898a7f649f2f15011bd8ecc78a459ac61b56faba8040529e25b5b203cd63c4e7d2445201896ed8c29d72e80899a816790c530258bd6de SHA512 031ecbe5877c6bc9cfd5aec6328882e800a47c3edacd146e5de9dfdd6a4f017f283e27bc750e60ea402831c786995df7ca516f5082c726a52e790571bb3a8884
 EBUILD QtPy-1.9.0-r5.ebuild 5740 BLAKE2B 8209c68896c4af894eb6367bd28800c7e73b18fdad3699cd2c730ade95e76d175b40597145dec8edd8b4ac873bc721af329ebbc69d0dbdcf16e17450b80fdab5 SHA512 e1e78067fb64d692b1b46aae1853f977b9e950a6f8d81ea2344dc87f74b5b953f2a2385080a3cc241329163906415733a1873ccf1dd7b3212ef907f4cfb883d4
-MISC metadata.xml 2903 BLAKE2B d3efb9532ee6bf7bb8d995baf356d022be803b0c0649c01558087f62bdb9b7751f4fa1df63d57916faa701cfe1111ab23c31f8f4badad2944a4522eba2d85068 SHA512 8af6cde3b273124f804aa6d91448baa3344982aa6f533ded0492296c27cc630782356397d11bc4b8289d7c081849402e780a79a18b086ab93632c1baf3615025
+MISC metadata.xml 2904 BLAKE2B f951ee9cfb1e57da9c1b528015cf56bf72e36fbcea6973f5bd237e86c8039d82d9700166ab76773b9bfbc8e499df492994e5dd73aee0bb2d35914d36bcf1bd78 SHA512 e6e13d0c24f16379ac03711f02c5201d1ab28bcbbddd7063f0487bbaaeda99e5a2ef87f00d8df834d822c9230a50ddead93b44affccf07b80bfc275140f4e9ff
diff --git a/dev-python/QtPy/QtPy-1.11.0.ebuild b/dev-python/QtPy/QtPy-1.11.1.ebuild
index 7dee17becfaf..4f256a44dd52 100644
--- a/dev-python/QtPy/QtPy-1.11.0.ebuild
+++ b/dev-python/QtPy/QtPy-1.11.1.ebuild
@@ -46,7 +46,7 @@ REQUIRED_USE="
 # 	scripttools? ( pyside2 )
 
 # WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work.  The package only checks whether PyQt5/pyside2 is installed, it does
+# to work. The package only checks whether PyQt5/pyside2 is installed, it does
 # not verify whether they have the necessary modules (i.e. satisfy the USE dep).
 #
 # Webengine is a special case, because PyQt5 provides this in a separate package
diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
deleted file mode 100644
index 7ee5dea86d8e..000000000000
--- a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 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="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="designer gui opengl printsupport svg testlib webengine"
-
-# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work.  The package only checks whether PyQt5/pyside2 is installed, it does
-# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,printsupport?,svg?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
-# The QtPy testsuite skips tests for bindings that are
-# not installed, so here we ensure that everything
-# is available and all tests are run.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
-		dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
-		dev-python/PyQt5[sensors,serialport,sql,svg,testlib,webchannel]
-		dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}
-
-python_test() {
-	local -x QT_API="pyqt5"
-	virtx pytest -vv
-}
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 8238afd31862..7fa9451ae932 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>