commit: 6a7439c65bfa3ca3a13e09022607dccc30113d78
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Oct 4 15:57:28 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 6 15:41:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7439c6
dev-python/pyside: add 6.9.3
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/pyside/Manifest | 1 +
.../{pyside-6.9999.ebuild => pyside-6.9.3.ebuild} | 36 ++++++++++++++++++----
dev-python/pyside/pyside-6.9999.ebuild | 36 ++++++++++++++++++----
3 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index 9601a889f69d..7d9f1c286bde 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1 +1,2 @@
DIST pyside-setup-everywhere-src-6.9.2.tar.xz 16659400 BLAKE2B
baf8955d6a16b56807f202577a54737857fed5c7d7394f7d843111832a3b71978a1ae8b6561a1df041913875f32ba5a836cb219f53e8a13a218f2866a54ae9c3
SHA512
643bf42241e952ed028eb44830387864fd7343587a568d8be9d8a179af8b76b8ac5d0bb92a93db45abc83120c0cd627667312cc248f1924f4797fd74242c1808
+DIST pyside-setup-everywhere-src-6.9.3.tar.xz 16663380 BLAKE2B
10834a35c3de13657256892111e3f54dceeb4fef61618b61672018bbffa007cfac0b602bd39b3ef7a472ba47f9444c7e7cf6d43cb411de0dd26333faa0814e7a
SHA512
457a447146a8e5be94940b06172a21cdc9f1407c9c48e6449d410ae3f122002f5970c3841cba6135fb4d889c58a4ed1b648f03b708f9a5cfb9f1cc93cbb9d561
diff --git a/dev-python/pyside/pyside-6.9999.ebuild
b/dev-python/pyside/pyside-6.9.3.ebuild
similarity index 93%
copy from dev-python/pyside/pyside-6.9999.ebuild
copy to dev-python/pyside/pyside-6.9.3.ebuild
index 3324c4cc64dc..25c2467c6f20 100644
--- a/dev-python/pyside/pyside-6.9999.ebuild
+++ b/dev-python/pyside/pyside-6.9.3.ebuild
@@ -13,7 +13,7 @@ LLVM_COMPAT=( {16..20} )
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_EXT=1
-inherit distutils-r1 llvm-r1 multiprocessing qmake-utils virtualx
+inherit distutils-r1 llvm-r2 multiprocessing qmake-utils virtualx
MY_PN=${PN}-setup-everywhere-src
MY_P=${MY_PN}-${PV}
@@ -257,11 +257,18 @@ python_prepare_all() {
's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${LLVM_SLOT}"'/include"))~'
\
-i
sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp || die
+ sed -e \
+ 's~set(libclang_directory_suffix
"lib")~set(libclang_directory_suffix "'"$(get_libdir)"'")~' \
+ -i sources/shiboken6/cmake/ShibokenHelpers.cmake || die
+
# blacklist.txt works like XFAIL
cat <<- EOF >> build_history/blacklist.txt || die
# segfaults with QOpenGLContext::create
[pysidetest::qapp_like_a_macro_test]
linux
+ # no mypy
+ [pysidetest::mypy_correctness_test]
+ linux
# Tries to execute pip install
[pyside6-deploy::test_pyside6_deploy]
linux
@@ -290,6 +297,8 @@ python_prepare_all() {
}
python_configure_all() {
+ export LLVM_INSTALL_DIR="$(get_llvm_prefix)"
+
ENABLED_QT_MODULES=()
# The order matters, dependencies must come first so process
@@ -499,13 +508,28 @@ python_compile() {
python_test() {
# Otherwise it picks the last built directory breaking assumption for
multi target builds
- mkdir -p build_history/9999-99-99_999999/ || die
- local pyside_build_dir=qfp$(usev debug
d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_build_id}
- echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V
| tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die
- echo "${pyside_build_dir}" >>
build_history/9999-99-99_999999/build_dir.txt || die
+ local pyside_build_dir="qfp$(usev debug
d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_build_id}"
+
+ local buildno=$(find "${BUILD_DIR}"/build* -name "${pyside_build_dir}"
| sort -V | tail -n1)
+ if [[ -z "${buildno}" ]]; then
+ die "could not find any build directories for
${pyside_build_dir}"
+ fi
+
+ buildno="${buildno#"${BUILD_DIR}/build"}"
+ buildno="${buildno%"/${pyside_build_dir}"}"
+
+ local -x PYTHONPATH="${BUILD_DIR}/install$(python_get_sitedir)"
+ local -x QTEST_ENVIRONMENT=ci
- virtx ${EPYTHON} testrunner.py test --projects=shiboken6 $(usev core
'--projects=pyside6') ||
+ # test shiboken6 build
+ virtx ${EPYTHON} testrunner.py test --buildno "$((buildno - 1))"
--projects=shiboken6 ||
die "Tests failed with ${EPYTHON}"
+
+ if use core; then
+ # test pyside6 build
+ virtx ${EPYTHON} testrunner.py test --buildno "${buildno}"
--projects=pyside6 ||
+ die "Tests failed with ${EPYTHON}"
+ fi
}
pkg_preinst() {
diff --git a/dev-python/pyside/pyside-6.9999.ebuild
b/dev-python/pyside/pyside-6.9999.ebuild
index 3324c4cc64dc..25c2467c6f20 100644
--- a/dev-python/pyside/pyside-6.9999.ebuild
+++ b/dev-python/pyside/pyside-6.9999.ebuild
@@ -13,7 +13,7 @@ LLVM_COMPAT=( {16..20} )
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_EXT=1
-inherit distutils-r1 llvm-r1 multiprocessing qmake-utils virtualx
+inherit distutils-r1 llvm-r2 multiprocessing qmake-utils virtualx
MY_PN=${PN}-setup-everywhere-src
MY_P=${MY_PN}-${PV}
@@ -257,11 +257,18 @@ python_prepare_all() {
's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${LLVM_SLOT}"'/include"))~'
\
-i
sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp || die
+ sed -e \
+ 's~set(libclang_directory_suffix
"lib")~set(libclang_directory_suffix "'"$(get_libdir)"'")~' \
+ -i sources/shiboken6/cmake/ShibokenHelpers.cmake || die
+
# blacklist.txt works like XFAIL
cat <<- EOF >> build_history/blacklist.txt || die
# segfaults with QOpenGLContext::create
[pysidetest::qapp_like_a_macro_test]
linux
+ # no mypy
+ [pysidetest::mypy_correctness_test]
+ linux
# Tries to execute pip install
[pyside6-deploy::test_pyside6_deploy]
linux
@@ -290,6 +297,8 @@ python_prepare_all() {
}
python_configure_all() {
+ export LLVM_INSTALL_DIR="$(get_llvm_prefix)"
+
ENABLED_QT_MODULES=()
# The order matters, dependencies must come first so process
@@ -499,13 +508,28 @@ python_compile() {
python_test() {
# Otherwise it picks the last built directory breaking assumption for
multi target builds
- mkdir -p build_history/9999-99-99_999999/ || die
- local pyside_build_dir=qfp$(usev debug
d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_build_id}
- echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V
| tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die
- echo "${pyside_build_dir}" >>
build_history/9999-99-99_999999/build_dir.txt || die
+ local pyside_build_dir="qfp$(usev debug
d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_build_id}"
+
+ local buildno=$(find "${BUILD_DIR}"/build* -name "${pyside_build_dir}"
| sort -V | tail -n1)
+ if [[ -z "${buildno}" ]]; then
+ die "could not find any build directories for
${pyside_build_dir}"
+ fi
+
+ buildno="${buildno#"${BUILD_DIR}/build"}"
+ buildno="${buildno%"/${pyside_build_dir}"}"
+
+ local -x PYTHONPATH="${BUILD_DIR}/install$(python_get_sitedir)"
+ local -x QTEST_ENVIRONMENT=ci
- virtx ${EPYTHON} testrunner.py test --projects=shiboken6 $(usev core
'--projects=pyside6') ||
+ # test shiboken6 build
+ virtx ${EPYTHON} testrunner.py test --buildno "$((buildno - 1))"
--projects=shiboken6 ||
die "Tests failed with ${EPYTHON}"
+
+ if use core; then
+ # test pyside6 build
+ virtx ${EPYTHON} testrunner.py test --buildno "${buildno}"
--projects=pyside6 ||
+ die "Tests failed with ${EPYTHON}"
+ fi
}
pkg_preinst() {
