gentoo auto-resync : 05:02:2025 - 00:10:55

2 files changed, 56 insertions, 3 deletions

diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index d2d395381096..9b058d67faf3 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -7,5 +7,5 @@ DIST pyside-pyside-setup-6.8.1.gh.tar.gz 18700869 BLAKE2B 5924f8ffc3e5a4f15442af
 DIST pyside-pyside-setup-6.8.2.gh.tar.gz 19305680 BLAKE2B d4da8ec63d35714bf4418cdc9ff5921fe554c1635a7c5c467657b64c2140208b4bba57fc9932f0f96426e1d15c124209b0b29eb9340261d34eed194128a03545 SHA512 30691d27afaeaa3117e68b60745918d9697c8d9e4ee8941eaab51995cb5128c56d44964511f2db731f448bf32219160032e4a4cd4773d3fccc4de8c0e509d1c1
 EBUILD pyside-6.8.1.1.ebuild 10314 BLAKE2B ccdf54f48e1a4e3cc02b0a6210a8551ba88262b16d5bd569ada3ff64b70e868a360f54d43225f20501c298b0e1c42c5e831c774a67d79f08a20efec40335eb4a SHA512 b92d4dbaa0a9b7f7f838c3d99c16e757ade7a91b6c8f39f7c16bdac5a704cc5f5f163011b6f80e0efa654c8ed3e4da038372e0ac8963166904ae477b7b70c2c0
 EBUILD pyside-6.8.1.ebuild 10310 BLAKE2B ca864905f3ed3c13b4ff673fb0db08087075e30a950b40ca29fbeda9402cd8d23e2666c3a846a69704c6f308474dd5a87ad3aee677aa327d79bc149d4695e55d SHA512 501094285ad18dccd664d63819ceee40fb24f5ce61bb982f2c2ea12edaf4995c718080da5d9aa01598afd0d5b3fecdc441f880722e9c8fb3fab2bb28b3dd1e97
-EBUILD pyside-6.8.2.ebuild 14911 BLAKE2B b2aa09c2771620150d1dc01b00d1110589bfa02ca761d2d6145042ec025e037c6ad3084fb4737c9d9592fb4711d5ecc8a04b0b88c68d865e7bc8a2a7ca28c455 SHA512 799248f0354cde09378da066f8a8856916e7c96d376d46d17e97d627bffdff68fd02f18a6e872caea2f4965f852ed396125f3c545575c65511ec3a3dec7e7a38
+EBUILD pyside-6.8.2-r1.ebuild 16364 BLAKE2B f91fe37b066396c193879b5db968bb7ea31bcbd13b9dc5bbbe6496fbf362994c2f5f5c7cf44e02189aba6a741d662aa4ae50a15d9022fc335a3993afc2dc7e82 SHA512 926890eb24e13ea076f7619ae6544275b83c56767a39beaabb1930b662b405ee906ae008cbbde7406f20ac8f2bac927f39bfb7c97db86c0be0eb1370daafb00f
 MISC metadata.xml 2977 BLAKE2B abf5f630457dc13ad1bc9e08ed5fcd3f0beadff9815cf6d7ddb6107410c6584f7acae7d08194c7b621eb4470f844d67e13b97df7620493e27d2df2ec54dbbf77 SHA512 51fd0bdc6059a221fadb7c04b627be5ccd523d28a3234c5f01118d50b6d4b5938fda8390ce5e26e8f1f630b58ef4f5201710804c996607e85d7d69d793a4a09a
diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2-r1.ebuild
index 6a450ecd3f00..3eea6c5ea105 100644
--- a/dev-python/pyside/pyside-6.8.2.ebuild
+++ b/dev-python/pyside/pyside-6.8.2-r1.ebuild
@@ -115,6 +115,12 @@ declare -A QT_REQUIREMENTS=(
 IUSE="${!QT_MODULES[@]} debug doc gles2-only numpy test tools"
 RESTRICT="!test? ( test )"
 
+# majority of QtQml tests require QtQuick support
+REQUIRED_USE="
+	test? (
+		qml? ( quick )
+	)
+"
 for requirement in ${!QT_REQUIREMENTS[@]}; do
 	REQUIRED_USE+=" ${requirement}? ( ${QT_REQUIREMENTS[${requirement}]} ) "
 done
@@ -158,6 +164,7 @@ RDEPEND="
 		=dev-qt/qtbase-${QT_PV}
 		=dev-qt/qtdeclarative-${QT_PV}[qmlls]
 		=dev-qt/qttools-${QT_PV}[assistant,designer,linguist]
+		dev-python/pkginfo[${PYTHON_USEDEP}]
 	)
 	uitools? ( =dev-qt/qttools-${QT_PV}[gles2-only=,widgets] )
 	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
@@ -170,7 +177,7 @@ RDEPEND="
 	webview? ( =dev-qt/qtwebview-${QT_PV} )
 	!dev-python/pyside:0
 	!dev-python/shiboken6
-	!dev-python/pyside6-tool
+	!dev-python/pyside6-tools
 "
 
 DEPEND="${RDEPEND}
@@ -190,6 +197,8 @@ BDEPEND="
 		>=dev-libs/libxml2-2.6.32
 		>=dev-libs/libxslt-1.1.19
 		media-gfx/graphviz
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/myst-parser[${PYTHON_USEDEP}]
 	)
 	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
 "
@@ -232,6 +241,30 @@ python_prepare_all() {
 	sed -e \
 		's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${LLVM_SLOT}"'/include"))~' \
 		-i sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp || die
+
+	# blacklist.txt works like XFAIL
+	cat <<- EOF >> build_history/blacklist.txt || die
+	# segfaults with QOpenGLContext::create
+	[pysidetest::qapp_like_a_macro_test]
+		linux
+	# Tries to execute pip install
+	[pyside6-deploy::test_pyside6_deploy]
+		linux
+	[pyside6-android-deploy::test_pyside6_android_deploy]
+		linux
+	EOF
+
+	if ! use numpy; then
+		cat <<- EOF >> build_history/blacklist.txt || die
+		# Requires numpy support to pass
+		[sample::array_numpy]
+			linux
+		[sample::nontypetemplate]
+			linux
+		[QtGui::qpainter_test]
+			linux
+		EOF
+	fi
 }
 
 python_configure_all() {
@@ -436,5 +469,25 @@ python_compile() {
 }
 
 python_test() {
-	virtx ${EPYTHON} testrunner.py test || die "Tests failed with ${EPYTHON}"
+	# figure out the build dir
+	local build_dir build_classifier
+	build_dir=$(ls -d "${BUILD_DIR}"/build/qfp-*/build/)
+	build_classifier="${build_dir##${BUILD_DIR}/build/qfp-}"
+	build_classifier="${build_dir%%/build}"
+
+	# Otherwise it picks the last built directory breaking assumption for multi target builds
+	mkdir -p build_history/9999-99-99_999999/ || die
+	cat <<- EOF > build_history/9999-99-99_999999/build_dir.txt || die
+	${build_dir}
+	${build_classifier}
+	EOF
+
+	virtx ${EPYTHON} testrunner.py test --projects=shiboken6 $(usev core '--projects=pyside6')  ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+pkg_preinst() {
+	# Avoid symlinks being blocked by directories
+	rm -rf "${EROOT}/usr/include/"{PySide6,shiboken6} || die
+	rm -rf "${EROOT}/usr/share/PySide6" || die
 }