From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 16 Sep 2020 09:32:48 +0100
Subject: gentoo resync : 16.09.2020

---
 dev-python/pytest-qt/Manifest                               |  3 ++-
 .../files/pytest-qt-3.3.0-fix-file-match-test.patch         | 13 +++++++++++++
 dev-python/pytest-qt/pytest-qt-3.3.0.ebuild                 | 10 ++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch

(limited to 'dev-python/pytest-qt')

diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 5cb4abede9eb..233de20189ed 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,4 +1,5 @@
+AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0e0886eeee5eb4bf447544a0f712e8906edc5ea62f60555917b97c143a4804fe76e5244090907abf51bf69f98c2893552115af64fd2 SHA512 ab68967a2f30acc2aaed1c8eadeee84283b469b3465c5e79d9c37ee14236ea0e2fe827ba83efa92d5d33c369298e548cea72f80109949426aa38121ba7edb45f
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
-EBUILD pytest-qt-3.3.0.ebuild 944 BLAKE2B 3a9fda78bae4be8b255f98fceaebc183a9319f6ba93e56b03fd7660e65842da7ea6a7b7ed96e12f6d2fb711231bdcc855385af372676609fcf53a4e9fb01d180 SHA512 bcd3d27da564f383c09083beb1ae4f5c7ecc9c55756862106aa1964cde88a3499c8f1f4c4647f22c4c4256f8eebf4520d14059b16d7a27f6eb1b2e32f3f0b2da
+EBUILD pytest-qt-3.3.0.ebuild 1219 BLAKE2B a22f09af353a6846703b7977f60dabd2116c6a566a44a31ce2eb2c8eda031d1d795a5c34ff8a0ac9ab2e22ef30d0045fd98d9c48531314e668fdbf0c47c2fed8 SHA512 7cfd33c2e2ffff7aa17f0548b7866af8fb5232391a1583103b201d835654ec96cefa48229dbb891d2bc1a167c67911cde8c684447e6e12ebb19e96938ed93d8f
 MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch b/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch
new file mode 100644
index 000000000000..cbdeb80c1c56
--- /dev/null
+++ b/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_modeltest.py b/tests/test_modeltest.py
+index ef9371c..becd3ae 100644
+--- a/tests/test_modeltest.py
++++ b/tests/test_modeltest.py
+@@ -350,7 +350,7 @@ def test_qt_tester_invalid(testdir):
+             "test_qt_tester_invalid.py:*: Qt modeltester errors",
+             "*-- Captured Qt messages --*",
+             "* QtWarningMsg: FAIL! model->columnCount(QModelIndex()) >= 0 () returned FALSE "
+-            "(qabstractitemmodeltester.cpp:*)",
++            "(*qabstractitemmodeltester.cpp:*)",
+             "*-- Captured stdout call --*",
+             "modeltest: Using Qt C++ tester",
+             "*== 1 failed in * ==*",
diff --git a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
index 1a43c9248d65..55715700f9e8 100644
--- a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -19,7 +19,13 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${P}-skip-show-window-test.patch" )
+# Patch 1 skips a test that does not work inside the emerge environment:
+# pytestqt.exceptions.TimeoutError: widget <PyQt5.QtWidgets.QWidget object at 0x7f57d8527af8> not activated in 1000 ms.
+# Patch 2 fixes upstream bug 314
+PATCHES=(
+	"${FILESDIR}/${P}-skip-show-window-test.patch"
+	"${FILESDIR}/${P}-fix-file-match-test.patch"
+)
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-- 
cgit v1.2.3