gentoo resync : 29.12.2022

3 files changed, 49 insertions, 7 deletions

diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index 04b0b598f982..70beb1594f3d 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1,5 +1,6 @@
 AUX pivy-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch 703 BLAKE2B b2a183cd4a5d20a1ede7427a1c895766c63f694c38e559e4c7d12a1b8a0a88cfd596b26e31ca35489dc637110dae13f89c671fe52c9555624694ef494f8fcd2d SHA512 7ecc957ac8209aee41c010768d9953fc4820a3e6929dd45be16732385f6e1edd12febc2e05786090835eb35235bb976e1122df2b7da6d0d68c6ae3bdbf9dd9c0
 AUX pivy-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch 940 BLAKE2B d7e25c5690a7ea665d923753bcb0811ec9e9702f5085f6a368f1ffbeb84f7b17e8ee6dc02a5374bc5dd45c195cc068bf825b284a97a69be762e9348e7645067e SHA512 75ea0c401cf35b97c119c5a652b91911151ed878136860a90aa53730632dfb89dcd69fb66149145ae59005a93c89e89d1153c8cc23d4d978f9a68fd9ef65c7e2
-DIST pivy-0.6.6.tar.gz 6618471 BLAKE2B 5bcf2479bf26628e3dfe59c1440901368442de2f32a5680ef1af10d49239d8c73b79809495d7227937fd7784af1e1ded27f93f0255793e713add0c1cc35b8e5d SHA512 e260c6abd0aede7621d5fed66eeceb98a32634af84370ef713d70d583ec017cded4be682fd7e70e5faa19988a5e032a9d2f2308b8ae6dd9495d76e884de1d80c
-EBUILD pivy-0.6.6-r1.ebuild 978 BLAKE2B 0a8c8a54756eee2d06fddba0a4b1f06e35367f990391574bc68f72a8a4e7df24a80ccce426603421346c2ba2bd202f19695f648adaf095d3600202760d5883fb SHA512 7fde8ab0057aba362c92c25f61e75934c4d7717dfa9e1d0a5aac2ec36caf70ebfbaf1b16cab9eb0d61d23aace87884c7a3364cd410ce755f376734810ea5d804
+AUX pivy-0.6.7-find-qmake.patch 1009 BLAKE2B 18789a4592683bfffdd9094f5465d4e33eaa6b75d70843aa882838f09c517aafe5d576bf8587bb191b39403802ecaf683346e4c0c87cc4c28b404f46744dd8aa SHA512 650a2e023cd821609b9b601b2c5fdb7cdd05375a8931b989ded5aa6a3f4d517a789df2151ef6d4947b6d8b9875c0bab83cb48fd02161a8961efc1125c656de25
+DIST pivy-0.6.7.tar.gz 6618410 BLAKE2B 22ebe63a75fa624b772cb3d3ff6f03336258f6c8b638613413c19fcea072f83f73396bc91d35f0e06bc27ec57471ae67965ee492e62a7e73919f7827de645175 SHA512 606eac3527b5906ad6884c25775b5625bfd2a1b1c78f75017b05e662d622c75d30e70fd5785ec2145902f5a02d99098b52cc776aee12fab02f0319762ee104b0
+EBUILD pivy-0.6.7.ebuild 1355 BLAKE2B 7140623a4f62a47af8f66db3f8bfaadaf63b94c3adf2d50cd4a6d732ad98b8f5c08eaac0c1f63b8a9d8c2f3da2b620273cc80096445dc2793badd54e3fa21f75 SHA512 b5a2b69ef3d7563b17340267b7baa1858913f2599d94c2428dcab5d2e14caff31afcd974cdb38c80cc77efc37800c9faf34c4c94321dbd9a488dedd82e8da22d
 MISC metadata.xml 619 BLAKE2B 56498bc9920e301de3dacb10db1c2bee59120b8cd3d15508c3549868700574641916e1d3d6f2a734f87eaa91290fd3b1b7ff1373297ca61cea11e33fbd0fed9f SHA512 fd7b9a70a84749a1eab30c3e4ea56bd15d43266e23298a5be1cf3bbee85c38e34bf062ea2555af724766daa7ed755cf586d8c66dfa2286dbcce9c23535661e66
diff --git a/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch b/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch
new file mode 100644
index 000000000000..6332afa97a3c
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch
@@ -0,0 +1,29 @@
+https://github.com/gentoo/gentoo/pull/25823#issuecomment-1150748775
+
+From 2d654ef2837f2ca934f636fc8a63de47a9d5853d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 9 Jun 2022 18:26:29 +0200
+Subject: [PATCH] find qmake
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/qtinfo.py
++++ b/qtinfo.py
+@@ -7,7 +7,7 @@ class QtInfo(object):
+         if qmake_command:
+             self._qmake_command = qmake_command
+         else:
+-            self._qmake_command = [find_executable("qmake"),]
++            self._qmake_command = [find_executable("qmake5"),]
+         self._dict = {}
+         # bind all variables early at __init__ time.
+         for thing in self.__class__.__dict__:
+@@ -79,4 +79,4 @@ class QtInfo(object):
+     translations_dir = property(getTranslationsPath)
+     headers_dir = property(getHeadersPath)
+     docs_dir = property(getDocsPath)
+-    qml_dir = property(getQmlPath)
+\ No newline at end of file
++    qml_dir = property(getQmlPath)
+-- 
+2.35.1
+
diff --git a/dev-python/pivy/pivy-0.6.6-r1.ebuild b/dev-python/pivy/pivy-0.6.7.ebuild
index 50ca56ff2739..3ea7eff6d17b 100644
--- a/dev-python/pivy/pivy-0.6.6-r1.ebuild
+++ b/dev-python/pivy/pivy-0.6.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -15,13 +15,14 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
 else
-	SRC_URI="https://github.com/coin3d/pivy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="+quarter soqt"
+IUSE="+quarter soqt test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -37,11 +38,22 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/swig
 	dev-util/cmake
+	test? ( ${RDEPEND} )
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
-	"${FILESDIR}"/${P}-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
+	"${FILESDIR}"/${PN}-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
+	"${FILESDIR}"/${PN}-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
+	"${FILESDIR}"/${P}-find-qmake.patch
 )
 
 DOCS=( AUTHORS HACKING NEWS README.md THANKS )
+
+python_test() {
+	# visual_test.py is interactive
+	# pyside_test.py currently fails
+	# quarter_tests.py needs pyside2, which currently lacks py3_11 support
+	for f in tests/coin_tests.py; do
+		"${EPYTHON}" "${f}" || die "Test ${f} failed with ${EPYTHON}"
+	done
+}