gentoo resync : 29.12.2022

4 files changed, 60 insertions, 40 deletions

diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index c886da63ba35..a2fa6351c8cb 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,5 +1,3 @@
-DIST anyqt-0.0.13.tar.gz 46677 BLAKE2B 1b6eeb4a3c0ca6a76504c919e41d749d042668e0c9392616518b3b1741d4db270e5a0f354971ba5757da8f906f46149e996895212dcad2d2614d62a3d53bf554 SHA512 33033c90a945524ea1659de557dff36be06cbdbf8f0b580e57e7c8f386dd3d3007465e236d3865b76af4178b9d83eba51405a3257d0226bd117f7d9804146e41
-DIST anyqt-0.0.14.gh.tar.gz 48200 BLAKE2B 15b17e2cb1067dd176d08a267b7fa0272dc9cdaa32c4cae3260053564df22c210a609dad8e4764c9cafeb0241dcabb93bbf8703e0a2ffef38c7f035e9f9f253b SHA512 e3a191cb5e94ee0287405ffff9261100400a78b261fce347268759352ff23a220e46b26882cfdd449be0191080d551d3b16c2feb0a411582ab0aaf1dc79e58cc
-EBUILD anyqt-0.0.13.ebuild 397 BLAKE2B aa255250f278718e0ef0a42ab17065d673e71dff296dfd165e026331557b015735f3c9fe3710fa140e0b8a152f84e6c3df0ad239d5938275a2aef002b28c76ed SHA512 0bfd7b9d03c53c5267fdd6885258be4c30c7c5cdf36e110d3d05b4d2936ae535cc0c4abb774656cd34bd5d44aeddb901aafbf07e8ff29c29f855788ad8cb3e03
-EBUILD anyqt-0.0.14.ebuild 438 BLAKE2B 6f250fed435be2118abbe2cab7828af55b87deb8493a1f82a2574b83e3be34b837e81962fd77291a1a3e606b994cc54395d9164b97d1091bf8115cf66bbbd700 SHA512 d35422f6120cf63f691176155947c5439c0e4051ef5814fe95ad819447068dfb8c8cc782e1d6317081c0aefce7d12369f6f4e0e44e97f943e0075e2cdf6f84c0
+DIST anyqt-0.1.1.gh.tar.gz 54461 BLAKE2B ec78ecf5d326412b953f95379203bc81c92f13ad7b11e44630cf43062a08b9cfa8436b7c18ef6762d43968c87cebc0eadb33b1cecd159c3278e65538cfb80967 SHA512 5e3f6784fe3826b3017365945bc7053a58c4d7db5745c664fa845780212bf89db2b136459afe90df00d63d1507b56fa5b4a579526d9a9f4169943e5d52e230c4
+EBUILD anyqt-0.1.1.ebuild 1131 BLAKE2B 55597d93bea192f212e3581105cf0fcb7535ba0a4b0a67bde02b48fc1f16c883c4066be43e3e09fb3d267809ed7d86b87777d3d4cef3a16319d03bce81b638e0 SHA512 00a6dac4d70f251545103d16bdc7f881fb74787f952edd31f503ded446176b0e26efa05d11110018895f8492298e661c91e6709ffb42db6bc911da83d66a6243
 MISC metadata.xml 286 BLAKE2B 0498e01030909d49b890a4174b0b198548a3cb324b4c85e3cb29108004bcfb71adf01ca64be576bd5a1ac9b36a09a6b600d799e6a0c29152018b4519f18f567b SHA512 0797b1c07ad778e31012eb93070599ddfd687dedf0a073f463c950dd1c213d417708d0a95b26dbf07d4aa11c66c24a22891d285896d87bc2a29728519e5f2cf2
diff --git a/dev-python/anyqt/anyqt-0.0.13.ebuild b/dev-python/anyqt/anyqt-0.0.13.ebuild
deleted file mode 100644
index 8890d4f53405..000000000000
--- a/dev-python/anyqt/anyqt-0.0.13.ebuild
+++ /dev/null
@@ -1,16 +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
-
-DESCRIPTION="PyQt4/PyQt5 compatibility layer"
-HOMEPAGE="https://github.com/ales-erjavec/anyqt"
-SRC_URI="https://github.com/ales-erjavec/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/anyqt/anyqt-0.0.14.ebuild b/dev-python/anyqt/anyqt-0.0.14.ebuild
deleted file mode 100644
index 73085a977eb7..000000000000
--- a/dev-python/anyqt/anyqt-0.0.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="PyQt4/PyQt5 compatibility layer"
-HOMEPAGE="https://github.com/ales-erjavec/anyqt"
-SRC_URI="
-	https://github.com/ales-erjavec/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/anyqt/anyqt-0.1.1.ebuild b/dev-python/anyqt/anyqt-0.1.1.ebuild
new file mode 100644
index 000000000000..66988862ec73
--- /dev/null
+++ b/dev-python/anyqt/anyqt-0.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="PyQt4/PyQt5 compatibility layer"
+HOMEPAGE="
+	https://github.com/ales-erjavec/anyqt/
+	https://pypi.org/project/AnyQt/
+"
+SRC_URI="
+	https://github.com/ales-erjavec/anyqt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x QT_API
+	# plugins may preload Qt modules
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	for QT_API in pyqt5 pyside2; do
+		local EPYTEST_IGNORE=()
+		[[ ${QT_API} == pyside2 ]] && EPYTEST_IGNORE+=(
+			tests/test_qaction_set_menu.py
+		)
+
+		einfo "Testing ${QT_API}"
+		nonfatal epytest tests ||
+			die "Tests failed with ${EPYTHON} / ${QT_API}"
+	done
+}