public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2015-08-26  1:07 Manuel Rüger
  0 siblings, 0 replies; 20+ messages in thread
From: Manuel Rüger @ 2015-08-26  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     db12536e56cab73dd16a1cff31af37252e60b529
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 01:06:50 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 01:07:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db12536e

dev-python/pyside: Remove old.

Package-Manager: portage-2.2.20.1

 dev-python/pyside/pyside-1.2.2.ebuild | 140 ----------------------------------
 1 file changed, 140 deletions(-)

diff --git a/dev-python/pyside/pyside-1.2.2.ebuild b/dev-python/pyside/pyside-1.2.2.ebuild
deleted file mode 100644
index c2ff4b9..0000000
--- a/dev-python/pyside/pyside-1.2.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit cmake-utils multilib python-r1 virtualx
-
-MY_P="${PN}-qt4.8+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://qt-project.org/wiki/PySide"
-SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	declarative? ( X )
-	designer? ( X )
-	help? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	scripttools? ( X script )
-	sql? ( X )
-	svg? ( X )
-	test? ( X )
-	webkit? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/shiboken-${PV}[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	X? (
-		>=dev-qt/qtgui-${QT_PV}[accessibility]
-		>=dev-qt/qttest-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( || (
-		media-libs/phonon[qt4(+)]
-		>=dev-qt/qtphonon-${QT_PV}
-	) )
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtgui-${QT_PV}
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	# Fix generated pkgconfig file to require the shiboken
-	# library suffixed with the correct python version.
-	sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
-		libpyside/pyside.pc.in || die
-
-	if use prefix; then
-		cp "${FILESDIR}"/rpath.cmake . || die
-		sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_disable X QtGui)
-		$(cmake-utils_use_disable X QtTest)
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable designer QtDesigner)
-		$(cmake-utils_use_disable designer QtUiTools)
-		$(cmake-utils_use_disable help QtHelp)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_disable phonon)
-		$(cmake-utils_use_disable script QtScript)
-		$(cmake-utils_use_disable scripttools QtScriptTools)
-		$(cmake-utils_use_disable sql QtSql)
-		$(cmake-utils_use_disable svg QtSvg)
-		$(cmake-utils_use_disable webkit QtWebKit)
-		$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
-	)
-
-	if use phonon && has_version "media-libs/phonon[qt4(+)]"; then
-		# bug 475786
-		mycmakeargs+=(
-			-DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon"
-			-DQT_PHONON_LIBRARY_RELEASE="${EPREFIX}/usr/$(get_libdir)/libphonon.so"
-		)
-	fi
-
-	configuration() {
-		local mycmakeargs=(
-			-DPYTHON_SUFFIX="-${EPYTHON}"
-			"${mycmakeargs[@]}"
-		)
-		cmake-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	VIRTUALX_COMMAND="cmake-utils_src_test" python_foreach_impl virtualmake
-}
-
-src_install() {
-	installation() {
-		cmake-utils_src_install
-		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl installation
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2015-10-19 16:29 Justin Lecher
  0 siblings, 0 replies; 20+ messages in thread
From: Justin Lecher @ 2015-10-19 16:29 UTC (permalink / raw
  To: gentoo-commits

commit:     5f4ad4dffc61657c93992803434538a17f2c5c37
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 14:57:31 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 16:29:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4ad4df

dev-python/pyside: Add python3.5 support

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/pyside/pyside-1.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
index b2f6793..517d88f 100644
--- a/dev-python/pyside/pyside-1.2.2-r1.ebuild
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit cmake-utils multilib python-r1 virtualx
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2017-03-10  9:26 Zac Medico
  0 siblings, 0 replies; 20+ messages in thread
From: Zac Medico @ 2017-03-10  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     29d062175458b892ed4071d34f318c1c5c5330d6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 09:16:33 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 09:16:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d06217

dev-python/pyside: Add python3_6 to PYTHON_COMPAT

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-python/pyside/pyside-1.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
index 7fa2bc00637..0572b4bc2a6 100644
--- a/dev-python/pyside/pyside-1.2.2-r1.ebuild
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit cmake-utils multilib python-r1 virtualx
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2017-04-15 21:56 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2017-04-15 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     29e947882d6a9823010be18ffbdc1e6dfb34ec20
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 21:55:28 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 21:55:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e94788

dev-python/pyside: add missing ssl USE dep

Gentoo-Bug: 615194
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-python/pyside/pyside-1.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
index 0572b4bc2a6..207b7f40ca1 100644
--- a/dev-python/pyside/pyside-1.2.2-r1.ebuild
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -39,7 +39,7 @@ QT_PV="4.8.5:4"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/shiboken-${PV}[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}[ssl]
 	X? (
 		>=dev-qt/qtgui-${QT_PV}[accessibility]
 		>=dev-qt/qttest-${QT_PV}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2017-04-30 19:46 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2017-04-30 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a1ebda7d3e901fb07ee30f95264f02fdf9ae6937
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 19:32:01 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 19:46:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ebda7d

dev-python/pyside: restrict shiboken dep to same SLOT

For future compatibility with shiboken:2

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-python/pyside/pyside-1.2.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
index 207b7f40ca1..ee4cff5cd93 100644
--- a/dev-python/pyside/pyside-1.2.2-r1.ebuild
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit cmake-utils multilib python-r1 virtualx
 MY_P="${PN}-qt4.8+${PV}"
 
 DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://qt-project.org/wiki/PySide"
+HOMEPAGE="http://wiki.qt.io/PySide"
 SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -38,7 +38,7 @@ QT_PV="4.8.5:4"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/shiboken-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}[ssl]
 	X? (
 		>=dev-qt/qtgui-${QT_PV}[accessibility]


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2017-07-08 18:00 Alexis Ballier
  0 siblings, 0 replies; 20+ messages in thread
From: Alexis Ballier @ 2017-07-08 18:00 UTC (permalink / raw
  To: gentoo-commits

commit:     b4f28724c9335335dda75c34ddb1d9fc82323037
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 18:00:44 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 18:00:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f28724

dev-python/pyside: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-python/pyside/pyside-1.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
index ee4cff5cd93..481faa0f988 100644
--- a/dev-python/pyside/pyside-1.2.2-r1.ebuild
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2017-08-31 12:13 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2017-08-31 12:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c856808b911ef6dddbc8d974285fde8ec38aa5bb
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 12:13:08 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 12:13:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c856808b

dev-python/pyside: remove dev-qt/qtphonon dependency

Gentoo-bug: 629144
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-python/pyside/pyside-1.2.2-r1.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
index 481faa0f988..41756cada3e 100644
--- a/dev-python/pyside/pyside-1.2.2-r1.ebuild
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -49,10 +49,7 @@ RDEPEND="
 	help? ( >=dev-qt/qthelp-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
 	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( || (
-		media-libs/phonon[qt4(+)]
-		>=dev-qt/qtphonon-${QT_PV}
-	) )
+	phonon? ( media-libs/phonon[qt4(+)] )
 	script? ( >=dev-qt/qtscript-${QT_PV} )
 	sql? ( >=dev-qt/qtsql-${QT_PV} )
 	svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2018-02-19 14:55 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2018-02-19 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e3c190c5d6b2134da9e069fa307eebf801646e05
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 13:08:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 14:54:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c190c5

dev-python/pyside: Solidify DEPEND on app-crypt/qca[qt4]

Time is running out for USE=qt4.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../pyside/{pyside-1.2.2-r1.ebuild => pyside-1.2.2-r2.ebuild}       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r2.ebuild
similarity index 96%
rename from dev-python/pyside/pyside-1.2.2-r1.ebuild
rename to dev-python/pyside/pyside-1.2.2-r2.ebuild
index 41756cada3e..317dd053bee 100644
--- a/dev-python/pyside/pyside-1.2.2-r1.ebuild
+++ b/dev-python/pyside/pyside-1.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -49,7 +49,7 @@ RDEPEND="
 	help? ( >=dev-qt/qthelp-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
 	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( media-libs/phonon[qt4(+)] )
+	phonon? ( media-libs/phonon[qt4] )
 	script? ( >=dev-qt/qtscript-${QT_PV} )
 	sql? ( >=dev-qt/qtsql-${QT_PV} )
 	svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
@@ -100,7 +100,7 @@ src_configure() {
 		$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
 	)
 
-	if use phonon && has_version "media-libs/phonon[qt4(+)]"; then
+	if use phonon && has_version "media-libs/phonon[qt4]"; then
 		# bug 475786
 		mycmakeargs+=(
 			-DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon"


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-03 17:40 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-03 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     516e3687560a29e7db5c5a1a1c1ed010cfc9544f
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  3 15:21:57 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 17:40:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=516e3687

dev-python/pyside: add 6.8.2

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.2.ebuild | 440 ++++++++++++++++++++++++++++++++++
 1 file changed, 440 insertions(+)

diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2.ebuild
new file mode 100644
index 000000000000..6a450ecd3f00
--- /dev/null
+++ b/dev-python/pyside/pyside-6.8.2.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+LLVM_COMPAT=( {15..19} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+
+inherit distutils-r1 llvm-r1 qmake-utils virtualx
+
+MY_PN=pyside-pyside-setup
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://github.com/qtproject/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
+SLOT="6/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+# If a flag enables multiple Qt modules, they should be ordered
+# according to their dependencies, e.g. for 3d, 3DCore must be first.
+# Widgets for various modules are handled as a special case later
+declare -A QT_MODULES=(
+	["3d"]="3DCore 3DRender 3DLogic 3DInput 3DAnimation 3DExtras"
+	["bluetooth"]="Bluetooth"
+	["charts"]="Charts"
+	["+concurrent"]="Concurrent"
+	["+core"]="Core"
+	["+dbus"]="DBus"
+	["designer"]="Designer"
+	["+gui"]="Gui"
+	["help"]="Help"
+	["httpserver"]="HttpServer"
+	["location"]="Location"
+	["multimedia"]="Multimedia" # plus widgets
+	["network-auth"]="NetworkAuth"
+	["+network"]="Network"
+	["nfc"]="Nfc"
+	["+opengl"]="OpenGL" # plus widgets
+	["pdfium"]="Pdf" # plus widgets
+	["positioning"]="Positioning"
+	["+printsupport"]="PrintSupport"
+	["qml"]="Qml"
+	["quick3d"]="Quick3D"
+	["quick"]="Quick" # plus widgets
+	["remoteobjects"]="RemoteObjects"
+	["scxml"]="Scxml"
+	["sensors"]="Sensors"
+	["serialbus"]="SerialBus"
+	["serialport"]="SerialPort"
+	["spatialaudio"]="SpatialAudio"
+	["+sql"]="Sql"
+	["svg"]="Svg" # plus widgets
+	["speech"]="TextToSpeech"
+	["+testlib"]="Test"
+	["uitools"]="UiTools"
+	["webchannel"]="WebChannel"
+	["webengine"]="WebEngineCore" # plus widgets and quick
+	["websockets"]="WebSockets"
+	["webview"]="WebView"
+	["+widgets"]="Widgets"
+	["+xml"]="Xml"
+)
+
+# Manually reextract these requirements on version bumps by running the
+# following one-liner from within "${S}":
+#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
+declare -A QT_REQUIREMENTS=(
+	["3d"]="gui network opengl"
+	["bluetooth"]="core"
+	["charts"]="core gui widgets"
+	["concurrent"]="core"
+	["dbus"]="core"
+	["designer"]="widgets"
+	["gles2-only"]="gui"
+	["gui"]="core"
+	["help"]="widgets"
+	["httpserver"]="core concurrent network websockets"
+	["location"]="core positioning"
+	["multimedia"]="core gui network"
+	["network-auth"]="network"
+	["network"]="core"
+	["nfc"]="core"
+	["opengl"]="gui"
+	["pdfium"]="core gui network"
+	["positioning"]="core"
+	["printsupport"]="widgets"
+	["qml"]="network"
+	["quick"]="gui network qml opengl"
+	["quick3d"]="gui network qml quick"
+	["remoteobjects"]="core network"
+	["scxml"]="core"
+	["sensors"]="core"
+	["serialbus"]="core network serialport"
+	["serialport"]="core"
+	["spatialaudio"]="core gui network multimedia"
+	["speech"]="core multimedia"
+	["sql"]="widgets"
+	["svg"]="gui"
+	["testlib"]="widgets"
+	["uitools"]="widgets"
+	["webchannel"]="core"
+	["webengine"]="core gui network printsupport quick webchannel"
+	["websockets"]="network"
+	["webview"]="gui"
+	["widgets"]="gui"
+	["xml"]="core"
+)
+
+IUSE="${!QT_MODULES[@]} debug doc gles2-only numpy test tools"
+RESTRICT="!test? ( test )"
+
+for requirement in ${!QT_REQUIREMENTS[@]}; do
+	REQUIRED_USE+=" ${requirement}? ( ${QT_REQUIREMENTS[${requirement}]} ) "
+done
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-3)*:6"
+
+# WebEngine needs sound support, so enable either pulseaudio or alsa
+RDEPEND="
+	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
+	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
+	bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
+	charts? ( =dev-qt/qtcharts-${QT_PV} )
+	designer? ( =dev-qt/qttools-${QT_PV}[designer,widgets,gles2-only=] )
+	gui? (
+		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
+		x11-libs/libxkbcommon
+	)
+	help? ( =dev-qt/qttools-${QT_PV}[assistant,gles2-only=] )
+	httpserver? ( =dev-qt/qthttpserver-${QT_PV} )
+	location? ( =dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[widgets(+)?] )
+	network? ( =dev-qt/qtbase-${QT_PV}[ssl] )
+	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
+	nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] )
+	numpy? ( >=dev-python/numpy-2.1.3[${PYTHON_USEDEP}] )
+	pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
+	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
+	qml? ( =dev-qt/qtdeclarative-${QT_PV}[opengl?,widgets?] )
+	quick3d? ( =dev-qt/qtquick3d-${QT_PV}[opengl?] )
+	remoteobjects? ( =dev-qt/qtremoteobjects-${QT_PV} )
+	scxml? ( =dev-qt/qtscxml-${QT_PV} )
+	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
+	speech? ( =dev-qt/qtspeech-${QT_PV} )
+	serialbus? ( =dev-qt/qtserialbus-${QT_PV} )
+	serialport? ( =dev-qt/qtserialport-${QT_PV} )
+	svg? ( =dev-qt/qtsvg-${QT_PV} )
+	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
+	tools? (
+		=dev-qt/qtbase-${QT_PV}
+		=dev-qt/qtdeclarative-${QT_PV}[qmlls]
+		=dev-qt/qttools-${QT_PV}[assistant,designer,linguist]
+	)
+	uitools? ( =dev-qt/qttools-${QT_PV}[gles2-only=,widgets] )
+	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( || (
+		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
+		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
+		)
+	)
+	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
+	webview? ( =dev-qt/qtwebview-${QT_PV} )
+	!dev-python/pyside:0
+	!dev-python/shiboken6
+	!dev-python/pyside6-tool
+"
+
+DEPEND="${RDEPEND}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+	')
+	dev-util/vulkan-headers
+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
+" # testlib is toggled by the gui flag on qtbase
+
+BDEPEND="
+	dev-build/cmake
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	doc? (
+		>=dev-libs/libxml2-2.6.32
+		>=dev-libs/libxslt-1.1.19
+		media-gfx/graphviz
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	# Needs porting to newer wheel and setuptools
+	"${FILESDIR}/${PN}-6.8.2-quick-fix-build-wheel.patch"
+	# References files not present in our dev-qt/qtbase
+	"${FILESDIR}/${PN}-6.8.2-no-qtexampleicons.patch"
+)
+
+# Build system duplicates system libraries. TODO: fix
+QA_PREBUILT=(
+	"/usr/lib/python*/site-packages/PySide6/*"
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
+	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
+	sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
+			sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp || die
+
+	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
+	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
+	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
+	# the largest version specifier that exists under the "/usr/lib/clang/"
+	# subdirectory. This assumption is false in edge cases, including when
+	# users downgrade from newer Clang versions but fail to remove those
+	# versions with "emerge --depclean". See also:
+	#     https://github.com/leycec/raiagent/issues/85
+	#
+	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
+	# eclass are defective, returning nonsensical placeholder strings if the
+	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
+	# PySide6 does *NOT* care whether the end user has done so or not, as
+	# PySide6 unconditionally requires Clang in either case. See also:
+	#     https://bugs.gentoo.org/619490
+	sed -e \
+		's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${LLVM_SLOT}"'/include"))~' \
+		-i sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp || die
+}
+
+python_configure_all() {
+	ENABLED_QT_MODULES=()
+
+	# The order matters, dependencies must come first so process
+	# REQUIRED_USE and recursively enable modules
+	enable_qt_mod() {
+		local flag=${1}
+		local modules=${QT_MODULES[${flag}]}
+		if [[ -z ${modules} ]]; then
+			die "incorrect flag=${flag}, not registered"
+		fi
+		local dependencies=${QT_REQUIREMENTS[${flag//+}]}
+		if [[ -n ${dependencies} ]]; then
+			local depflag
+			for depflag in ${dependencies}; do
+				if use ${depflag}; then
+					if [[ -z ${QT_MODULES[${depflag}]} ]]; then
+						depflag=+${depflag}
+					fi
+					enable_qt_mod ${depflag}
+				else
+					die "${depflag} is required but not enabled"
+				fi
+			done
+		fi
+		if [[ "${ENABLED_QT_MODULES[*]}" != *${modules}* ]]; then
+			ENABLED_QT_MODULES+=( ${modules} )
+		fi
+	}
+	# Enable specified qt modules
+	local flag
+	for flag in ${!QT_MODULES[@]}; do
+		if use ${flag//+}; then
+			enable_qt_mod ${flag}
+		fi
+	done
+
+	# Special cases
+	if use widgets; then
+		use multimedia && ENABLED_QT_MODULES+=( MultimediaWidgets )
+		use opengl && ENABLED_QT_MODULES+=( OpenGLWidgets )
+		use pdfium && ENABLED_QT_MODULES+=( PdfWidgets )
+		use quick && ENABLED_QT_MODULES+=( QuickWidgets )
+		use svg && ENABLED_QT_MODULES+=( SvgWidgets )
+		use webengine && ENABLED_QT_MODULES+=( WebEngineWidgets )
+	fi
+	if use quick; then
+		use webengine && ENABLED_QT_MODULES+=( WebEngineQuick )
+		use testlib && ENABLED_QT_MODULES+=( QuickTest )
+	fi
+
+	# Arguments listed in options.py
+	MAIN_DISTUTILS_ARGS=(
+		--cmake="${EPREFIX}/usr/bin/cmake"
+		--ignore-git
+		--limited-api=no
+		--module-subset="$(printf '%s,' "${ENABLED_QT_MODULES[@]}")"
+		--no-strip
+		--no-size-optimization
+		--openssl="${EPREFIX}/usr/bin/openssl"
+		--qt=$(ver_cut 1-3)
+		--qtpaths=$(qt6_get_bindir)/qtpaths
+		--verbose-build
+		$(usex debug "--debug" "--relwithdebinfo")
+		$(usex doc "--build-docs" "--skip-docs")
+		$(usex numpy "--enable-numpy-support" "--disable-numpy-support")
+		$(usex test "--build-tests --use-xvfb" "")
+		$(usex tools "" "--no-qt-tools")
+	)
+}
+
+python_compile() {
+	DISTUTILS_ARGS=(
+		"${MAIN_DISTUTILS_ARGS[@]}"
+		--build-type=shiboken6
+	)
+	distutils-r1_python_compile
+	DISTUTILS_ARGS=(
+		"${MAIN_DISTUTILS_ARGS[@]}"
+		--reuse-build
+		--build-type=shiboken6-generator
+	)
+	distutils-r1_python_compile
+	# If no pyside modules enabled, build just shiboken
+	if [[ ${#ENABLED_QT_MODULES[@]} -gt 0 ]]; then
+		DISTUTILS_ARGS=(
+			"${MAIN_DISTUTILS_ARGS[@]}"
+			--reuse-build
+			--shiboken-target-path="$(find "${BUILD_DIR}/build" -type d -name cmake)/../../"
+			--build-type=pyside6
+		)
+		distutils-r1_python_compile
+	fi
+
+	# Link libraries to the usual location for backwards compatibility
+	pushd "${BUILD_DIR}/install/$(python_get_sitedir)" >/dev/null ||
+		die
+	mkdir -p "${BUILD_DIR}/install/usr/$(get_libdir)" || die
+	local lib
+	for lib in */*.cpython-*.so
+	do
+		local base=${lib##*/}
+		ln -s "${base}" "${lib%/*}/${base%%.*}-${EPYTHON}.so" ||
+			die
+	done
+	for lib in */*.cpython-*.so.$(ver_cut 1-2)
+	do
+		local base=${lib##*/}
+		ln -s "${base}" "${lib%/*}/${base%%.*}-${EPYTHON}.so.$(ver_cut 1-2)" ||
+			die
+	done
+	for lib in */*.so*; do
+		ln -s "../../$(python_get_sitedir)/${lib}" \
+			"${BUILD_DIR}/install/usr/$(get_libdir)/${lib#*/}" || die
+	done
+	popd >/dev/null || die
+
+	# Symlinks for compatibility with pypi wheels
+	local dir
+	if [[ -d ${BUILD_DIR}/install/$(python_get_sitedir)/PySide6 ]]
+	then
+		pushd "${BUILD_DIR}/install/$(python_get_sitedir)/PySide6" \
+			>/dev/null || die
+		mkdir -p "${BUILD_DIR}/install/usr/share/PySide6" || die
+		for dir in doc glue typesystems; do
+			ln -s "../../../$(python_get_sitedir)/PySide6/${dir}" \
+				"${BUILD_DIR}/install/usr/share/PySide6/${dir}" ||
+					die
+		done
+		popd >/dev/null || die
+	fi
+	mkdir -p "${BUILD_DIR}/install/usr/include"
+	for dir in PySide6 shiboken6_generator; do
+		if [[ -d ${BUILD_DIR}/install/$(python_get_sitedir)/${dir}/include ]]
+		then
+			ln -s "../../$(python_get_sitedir)/${dir}/include" \
+				"${BUILD_DIR}/install/usr/include/${dir//_generator}" ||
+					die
+		fi
+	done
+
+	# Install misc files from inner install dir
+	find "${BUILD_DIR}"/build/*/install -type f \
+		-name libPySidePlugin.so -exec \
+		mkdir -p "${BUILD_DIR}/install/$(qt6_get_plugindir)/designer/" \; \
+		-exec \
+		cp "{}" "${BUILD_DIR}/install/$(qt6_get_plugindir)/designer/" \; \
+			|| die
+
+	for dir in cmake pkgconfig; do
+		find "${BUILD_DIR}"/build/*/install -type d -name ${dir} \
+			-exec cp -r "{}" "${BUILD_DIR}/install/usr/lib/" \; \
+				|| die
+	done
+
+	# Uniquify the pkgconfigs file for the current Python target,
+	# preserving an unversioned "shiboken6.pc" file arbitrarily
+	# associated with the last Python target.
+	if [[ -f ${BUILD_DIR}/install/usr/lib/pkgconfig/shiboken6.pc ]]
+	then
+		sed -e 's~prefix=.*~prefix=/usr~g' \
+			-e 's~exec_prefix=.*~exec_prefix=${prefix}~g' \
+			-e "s~libdir=.*~libdir=$(python_get_sitedir)/shiboken6~g" \
+			-e "s~includedir=.*~includedir=$(python_get_sitedir)/shiboken6_generator/include~g" \
+			-i "${BUILD_DIR}/install/usr/lib/pkgconfig/shiboken6.pc" || die
+		cp "${BUILD_DIR}/install/usr/lib/pkgconfig/"shiboken6{,-${EPYTHON}}.pc || die
+	fi
+	if [[ -f ${BUILD_DIR}/install/usr/lib/pkgconfig/pyside6.pc ]]
+	then
+		sed -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
+			-e 's~prefix=.*~prefix=/usr~g' \
+			-e 's~exec_prefix=.*~exec_prefix=${prefix}~g' \
+			-e "s~libdir=.*~libdir=$(python_get_sitedir)/PySide6~g" \
+			-e "s~includedir=.*~includedir=$(python_get_sitedir)/PySide6/include~g" \
+			-e "s~typesystemdir=.*~typesystemdir=$(python_get_sitedir)/PySide6/typesystems~g" \
+			-e "s~gluedir=.*~gluedir=$(python_get_sitedir)/PySide6/glue~g" \
+			-e "s~pythonpath=.*~pythonpath=$(python_get_sitedir)~g" \
+			-i "${BUILD_DIR}/install/usr/lib/pkgconfig/pyside6.pc" || die
+		cp "${BUILD_DIR}/install/usr/lib/pkgconfig/"pyside6{,-${EPYTHON}}.pc || die
+	fi
+
+	sed \
+		-e "s~/lib/libshiboken6\.cpython~/$(get_libdir)/libshiboken6\.cpython~g" \
+		-e "s~/lib/libpyside6\.cpython~/$(get_libdir)/libpyside6\.cpython~g" \
+		-e "s~/lib/libpyside6qml\.cpython~/$(get_libdir)/libpyside6qml\.cpython~g" \
+		-e "s~libshiboken6\.cpython.*\.so\.$(ver_cut 1-3)~libshiboken6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libpyside6\.cpython.*\.so\.$(ver_cut 1-3)~libpyside6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libpyside6qml\.cpython.*\.so\.$(ver_cut 1-3)~libpyside6qml\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libshiboken6\.cpython.*\.so\.$(ver_cut 1-2)~libshiboken6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libpyside6\.cpython.*\.so\.$(ver_cut 1-2)~libpyside6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libpyside6qml\.cpython.*\.so\.$(ver_cut 1-2)~libpyside6qml\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-i 	"${BUILD_DIR}/install/usr/lib/cmake/"*/*.cmake || die
+	local file
+	for file in "${BUILD_DIR}/install/usr/lib/cmake/"*/*.cpython-*.cmake
+	do
+		local base=${file##*/}
+		ln -s "${base}" "${file%/*}/${base%%.*}-${EPYTHON}.cmake" ||
+			die
+	done
+}
+
+python_test() {
+	virtx ${EPYTHON} testrunner.py test || die "Tests failed with ${EPYTHON}"
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-04  8:44 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-04  8:44 UTC (permalink / raw
  To: gentoo-commits

commit:     b415d480e6ac322ec4dc4776e0598986f8a558fa
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 08:44:20 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 08:44:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b415d480

add minor missing dep

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2.ebuild
index 6a450ecd3f00..b7da42527ea3 100644
--- a/dev-python/pyside/pyside-6.8.2.ebuild
+++ b/dev-python/pyside/pyside-6.8.2.ebuild
@@ -158,6 +158,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} )


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-04 13:06 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-04 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     1120f8c8a4e30312f7716de9afd7a507b72d7059
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Tue Feb  4 12:45:02 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 13:05:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1120f8c8

dev-python/pyside: fix handling for tests

* QtQml tests expect QtQuick support.
* Add build_dir.txt files to ensure tests use the right build directory.
* Explicitly feed --projects so that USE="-core" works with tests.
* Add tests of xfail and conditional xfail for numpy tests.

Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40437
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.2.ebuild | 44 ++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2.ebuild
index b7da42527ea3..20c58849fc06 100644
--- a/dev-python/pyside/pyside-6.8.2.ebuild
+++ b/dev-python/pyside/pyside-6.8.2.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
@@ -233,6 +239,28 @@ 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
+		EOF
+	fi
 }
 
 python_configure_all() {
@@ -437,5 +465,19 @@ 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}"
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-04 13:12 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-04 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d208b3bbb681e7880b295c60aa3ed76d27d34b2d
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 13:11:38 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 13:11:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d208b3bb

dev-python/pyside: add one more test to numpy excl list

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2.ebuild
index 20c58849fc06..0c62bd856af9 100644
--- a/dev-python/pyside/pyside-6.8.2.ebuild
+++ b/dev-python/pyside/pyside-6.8.2.ebuild
@@ -259,6 +259,8 @@ python_prepare_all() {
 			linux
 		[sample::nontypetemplate]
 			linux
+		[QtGui::qpainter_test]
+			linux
 		EOF
 	fi
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-04 13:12 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-04 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     ecdffb991133bfd12839f8116a5d1beb5f285fb1
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 13:12:33 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 13:12:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecdffb99

dev-python/pyside: fix pyside6-tools blocker

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2.ebuild
index 0c62bd856af9..a674539da548 100644
--- a/dev-python/pyside/pyside-6.8.2.ebuild
+++ b/dev-python/pyside/pyside-6.8.2.ebuild
@@ -177,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}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-04 19:26 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-04 19:26 UTC (permalink / raw
  To: gentoo-commits

commit:     0224f2c0fa72e0e4ed854be1b9eee4641a4153b3
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 19:23:52 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 19:26:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0224f2c0

dev-python/pyside: add some missing doc deps

still more missing so this will be masked

Bug: https://bugs.gentoo.org/949282
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2.ebuild
index a674539da548..96ce8196b217 100644
--- a/dev-python/pyside/pyside-6.8.2.ebuild
+++ b/dev-python/pyside/pyside-6.8.2.ebuild
@@ -197,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}] )
 "


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-04 20:05 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-04 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     60fafe52eb8abb5179c26b611136aaa3a639858e
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 20:03:38 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 20:04:56 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fafe52

dev-python/pyside: workaround for symlink being blocked by dir

Closes: https://bugs.gentoo.org/949287
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/{pyside-6.8.2.ebuild => pyside-6.8.2-r1.ebuild} | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2-r1.ebuild
similarity index 98%
rename from dev-python/pyside/pyside-6.8.2.ebuild
rename to dev-python/pyside/pyside-6.8.2-r1.ebuild
index 96ce8196b217..3eea6c5ea105 100644
--- a/dev-python/pyside/pyside-6.8.2.ebuild
+++ b/dev-python/pyside/pyside-6.8.2-r1.ebuild
@@ -485,3 +485,9 @@ python_test() {
 	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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-19  9:08 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-19  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     1c6464e2184137d21587f1572f68ef1f8204ba04
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 09:06:45 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 09:06:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6464e2

dev-python/pyside: drop 6.8.1

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/Manifest            |   1 -
 dev-python/pyside/pyside-6.8.1.ebuild | 253 ----------------------------------
 2 files changed, 254 deletions(-)

diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index f8b5c86f4f41..a499e5908f63 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1,3 +1,2 @@
 DIST pyside-pyside-setup-6.8.1.1.gh.tar.gz 18699613 BLAKE2B 2c16f305a746106edc770c267900b31fe480b167a615adc82496e0604cc618982bb787a0c173b069c258749364d7d2cac900d8d8b82244fc3b916744b7339537 SHA512 bd258be6e4c5f0b6b4bbdf8887e5f8ab16a90117deb00f9c46c4acb7f6bbcc36fb9f6b6e7c201403556e0ee269947a5f5b2611ff1b05e48f231f81b1eeac7bce
-DIST pyside-pyside-setup-6.8.1.gh.tar.gz 18700869 BLAKE2B 5924f8ffc3e5a4f15442af9191b0531ee9f509595d41ae2759b94c2a7f8d7e08f4a70f9c7fff07f11c5252afb77084dc21ca3b22762d6c8dd66f4fca5944c9f2 SHA512 941844b1f6711859add828cbefe7c39497d45f0936f970f3050631294ed3bfe88d9d7b827a81d61ba3efbbf7920daef6ea6c28fa9c78f8e672d68b8bd3fbb2ad
 DIST pyside-pyside-setup-6.8.2.gh.tar.gz 19305680 BLAKE2B d4da8ec63d35714bf4418cdc9ff5921fe554c1635a7c5c467657b64c2140208b4bba57fc9932f0f96426e1d15c124209b0b29eb9340261d34eed194128a03545 SHA512 30691d27afaeaa3117e68b60745918d9697c8d9e4ee8941eaab51995cb5128c56d44964511f2db731f448bf32219160032e4a4cd4773d3fccc4de8c0e509d1c1

diff --git a/dev-python/pyside/pyside-6.8.1.ebuild b/dev-python/pyside/pyside-6.8.1.ebuild
deleted file mode 100644
index e80e682b8c51..000000000000
--- a/dev-python/pyside/pyside-6.8.1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..13} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1 virtualx
-
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide6/QtGui/CMakeLists.txt" and
-# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_PN=pyside-pyside-setup
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://github.com/qtproject/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}/sources/pyside6"
-
-# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
-IUSE="
-	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help
-	httpserver location multimedia +network network-auth nfc positioning +opengl
-	pdfium positioning +printsupport qml quick quick3d remoteobjects serialport
-	scxml sensors spatialaudio speech +sql svg test +testlib uitools webchannel
-	webengine websockets +widgets +xml
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	designer? ( widgets )
-	gles2-only? ( gui )
-	gui? ( dbus opengl )
-	help? ( network sql widgets )
-	httpserver? ( concurrent network websockets )
-	location? ( gui network positioning quick )
-	multimedia? ( gui network )
-	network-auth? ( network )
-	opengl? ( gui )
-	pdfium? ( gui )
-	printsupport? ( widgets )
-	qml? ( network )
-	quick? ( gui network opengl qml )
-	quick3d? ( gui network opengl qml quick )
-	remoteobjects? ( network )
-	spatialaudio? ( multimedia )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( widgets )
-	uitools? ( widgets )
-	webchannel? ( qml )
-	webengine? ( network gui printsupport quick webchannel )
-	websockets? ( network )
-	widgets? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	=dev-python/shiboken6-${QT_PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
-	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
-	charts? ( =dev-qt/qtcharts-${QT_PV} )
-	designer? ( =dev-qt/qttools-${QT_PV}[designer,widgets] )
-	gui? (
-		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
-		x11-libs/libxkbcommon
-	)
-	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
-	httpserver? ( =dev-qt/qthttpserver-${QT_PV} )
-	location? ( =dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
-	network? ( =dev-qt/qtbase-${QT_PV}[ssl] )
-	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
-	nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] )
-	pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
-	remoteobjects? ( =dev-qt/qtremoteobjects-${QT_PV} )
-	scxml? ( =dev-qt/qtscxml-${QT_PV} )
-	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( =dev-qt/qtspeech-${QT_PV} )
-	serialport? ( =dev-qt/qtserialport-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
-	uitools? ( =dev-qt/qttools-${QT_PV}[widgets] )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( || (
-		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
-		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
-		)
-	)
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-	!dev-python/pyside:0
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-	# References files not present in our dev-qt/qtbase
-	"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch"
-)
-
-src_configure() {
-	# See collect_module_if_found macros in PySideHelpers.cmake
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=$(usex !3d)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=$(usex !bluetooth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=$(usex !httpserver)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=$(usex !nfc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=$(usex !pdfium)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=$(usex !pdfium yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=$(usex !remoteobjects)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=$(usex !spatialaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !uitools)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
-		# try to avoid pre-stripping
-		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
-		-DQFP_NO_STRIP=yes
-
-	)
-
-	pyside6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}6.pc || die
-
-		# Uniquify the PySide6 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside6.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}6{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside6_install
-
-	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside6-tools) to target one
-	# "libpyside6-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-19 17:00 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-19 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     5447e0093d040fabba7f6ad1ed5cbb74288af351
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 16:58:55 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 16:59:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5447e009

dev-python/pyside: drop llvm 15

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.1.1.ebuild  | 2 +-
 dev-python/pyside/pyside-6.8.2-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/pyside/pyside-6.8.1.1.ebuild b/dev-python/pyside/pyside-6.8.1.1.ebuild
index 89ab1f8e8b99..37deb4916077 100644
--- a/dev-python/pyside/pyside-6.8.1.1.ebuild
+++ b/dev-python/pyside/pyside-6.8.1.1.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 #     https://bugreports.qt.io/browse/PYSIDE-535
 PYTHON_COMPAT=( python3_{10..13} )
 
-LLVM_COMPAT=( {15..18} )
+LLVM_COMPAT=( {16..18} )
 
 inherit cmake llvm-r1 python-r1 virtualx
 

diff --git a/dev-python/pyside/pyside-6.8.2-r1.ebuild b/dev-python/pyside/pyside-6.8.2-r1.ebuild
index 3eea6c5ea105..38de7536c40b 100644
--- a/dev-python/pyside/pyside-6.8.2-r1.ebuild
+++ b/dev-python/pyside/pyside-6.8.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-LLVM_COMPAT=( {15..19} )
+LLVM_COMPAT=( {16..19} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-21 16:22 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-02-21 16:22 UTC (permalink / raw
  To: gentoo-commits

commit:     d5f2b99ee4da219a3de8c507a5ae09b4875b3eec
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 16:22:13 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 16:22:13 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f2b99e

dev-python/pyside: drop 6.8.1.1

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/Manifest              |   1 -
 dev-python/pyside/pyside-6.8.1.1.ebuild | 253 --------------------------------
 2 files changed, 254 deletions(-)

diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index a499e5908f63..fed92ca91204 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1,2 +1 @@
-DIST pyside-pyside-setup-6.8.1.1.gh.tar.gz 18699613 BLAKE2B 2c16f305a746106edc770c267900b31fe480b167a615adc82496e0604cc618982bb787a0c173b069c258749364d7d2cac900d8d8b82244fc3b916744b7339537 SHA512 bd258be6e4c5f0b6b4bbdf8887e5f8ab16a90117deb00f9c46c4acb7f6bbcc36fb9f6b6e7c201403556e0ee269947a5f5b2611ff1b05e48f231f81b1eeac7bce
 DIST pyside-pyside-setup-6.8.2.gh.tar.gz 19305680 BLAKE2B d4da8ec63d35714bf4418cdc9ff5921fe554c1635a7c5c467657b64c2140208b4bba57fc9932f0f96426e1d15c124209b0b29eb9340261d34eed194128a03545 SHA512 30691d27afaeaa3117e68b60745918d9697c8d9e4ee8941eaab51995cb5128c56d44964511f2db731f448bf32219160032e4a4cd4773d3fccc4de8c0e509d1c1

diff --git a/dev-python/pyside/pyside-6.8.1.1.ebuild b/dev-python/pyside/pyside-6.8.1.1.ebuild
deleted file mode 100644
index 37deb4916077..000000000000
--- a/dev-python/pyside/pyside-6.8.1.1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..13} )
-
-LLVM_COMPAT=( {16..18} )
-
-inherit cmake llvm-r1 python-r1 virtualx
-
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide6/QtGui/CMakeLists.txt" and
-# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_PN=pyside-pyside-setup
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://github.com/qtproject/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}/sources/pyside6"
-
-# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="
-	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help
-	httpserver location multimedia +network network-auth nfc positioning +opengl
-	pdfium positioning +printsupport qml quick quick3d remoteobjects serialport
-	scxml sensors spatialaudio speech +sql svg test +testlib uitools webchannel
-	webengine websockets +widgets +xml
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	designer? ( widgets )
-	gles2-only? ( gui )
-	gui? ( dbus opengl )
-	help? ( network sql widgets )
-	httpserver? ( concurrent network websockets )
-	location? ( gui network positioning quick )
-	multimedia? ( gui network )
-	network-auth? ( network )
-	opengl? ( gui )
-	pdfium? ( gui )
-	printsupport? ( widgets )
-	qml? ( network )
-	quick? ( gui network opengl qml )
-	quick3d? ( gui network opengl qml quick )
-	remoteobjects? ( network )
-	spatialaudio? ( multimedia )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( widgets )
-	uitools? ( widgets )
-	webchannel? ( qml )
-	webengine? ( network gui printsupport quick webchannel )
-	websockets? ( network )
-	widgets? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
-	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
-	charts? ( =dev-qt/qtcharts-${QT_PV} )
-	designer? ( =dev-qt/qttools-${QT_PV}[designer,widgets] )
-	gui? (
-		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
-		x11-libs/libxkbcommon
-	)
-	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
-	httpserver? ( =dev-qt/qthttpserver-${QT_PV} )
-	location? ( =dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
-	network? ( =dev-qt/qtbase-${QT_PV}[ssl] )
-	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
-	nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] )
-	pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
-	remoteobjects? ( =dev-qt/qtremoteobjects-${QT_PV} )
-	scxml? ( =dev-qt/qtscxml-${QT_PV} )
-	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( =dev-qt/qtspeech-${QT_PV} )
-	serialport? ( =dev-qt/qtserialport-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
-	uitools? ( =dev-qt/qttools-${QT_PV}[widgets] )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( || (
-		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
-		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
-		)
-	)
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-	!dev-python/pyside:0
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-	# References files not present in our dev-qt/qtbase
-	"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch"
-)
-
-src_configure() {
-	# See collect_module_if_found macros in PySideHelpers.cmake
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=$(usex !3d)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=$(usex !bluetooth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=$(usex !httpserver)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=$(usex !nfc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=$(usex !pdfium)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=$(usex !pdfium yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=$(usex !remoteobjects)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=$(usex !spatialaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !uitools)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
-		# try to avoid pre-stripping
-		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
-		-DQFP_NO_STRIP=yes
-
-	)
-
-	pyside6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}6.pc || die
-
-		# Uniquify the PySide6 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside6.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}6{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside6_install
-
-	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside6-tools) to target one
-	# "libpyside6-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-02-26  8:47 Ionen Wolkens
  0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2025-02-26  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     b39b416abfaa7011d498ca72d972ec5c4bd486f6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 05:16:25 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 08:45:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39b416a

dev-python/pyside: keep note to remove example icons patch w/ 6.8.3

Switched to ${P} so it intentionally breaks on bump
for attention given it is not my package.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyside/pyside-6.8.2-r1.ebuild b/dev-python/pyside/pyside-6.8.2-r1.ebuild
index aa061d8a2999..871cec23dd0f 100644
--- a/dev-python/pyside/pyside-6.8.2-r1.ebuild
+++ b/dev-python/pyside/pyside-6.8.2-r1.ebuild
@@ -207,7 +207,7 @@ PATCHES=(
 	# Needs porting to newer wheel and setuptools
 	"${FILESDIR}/${PN}-6.8.2-quick-fix-build-wheel.patch"
 	# References files not present in our dev-qt/qtbase
-	"${FILESDIR}/${PN}-6.8.2-no-qtexampleicons.patch"
+	"${FILESDIR}/${P}-no-qtexampleicons.patch" # TODO: remove in 6.8.3
 )
 
 # Build system duplicates system libraries. TODO: fix


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/
@ 2025-03-09 17:14 Nowa Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Nowa Ammerlaan @ 2025-03-09 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     57f40710a56a8be87ab2071a61dfa0d3e75eec83
Author:     Andrei Horodniceanu <a.horodniceanu <AT> proton <DOT> me>
AuthorDate: Sun Mar  9 11:05:34 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Sun Mar  9 17:14:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f40710

dev-python/pyside: respect MAKEOPTS jobs

Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me>
Closes: https://github.com/gentoo/gentoo/pull/40980
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/pyside/pyside-6.8.2-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-python/pyside/pyside-6.8.2-r1.ebuild b/dev-python/pyside/pyside-6.8.2-r1.ebuild
index 871cec23dd0f..c565fb32f91b 100644
--- a/dev-python/pyside/pyside-6.8.2-r1.ebuild
+++ b/dev-python/pyside/pyside-6.8.2-r1.ebuild
@@ -8,7 +8,7 @@ LLVM_COMPAT=( {16..19} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
 
-inherit distutils-r1 llvm-r1 qmake-utils virtualx
+inherit distutils-r1 llvm-r1 multiprocessing qmake-utils virtualx
 
 MY_PN=pyside-pyside-setup
 MY_P=${MY_PN}-${PV}
@@ -330,6 +330,7 @@ python_configure_all() {
 		--qt=$(ver_cut 1-3)
 		--qtpaths=$(qt6_get_bindir)/qtpaths
 		--verbose-build
+		--parallel=$(makeopts_jobs)
 		$(usex debug "--debug" "--relwithdebinfo")
 		$(usex doc "--build-docs" "--skip-docs")
 		$(usex numpy "--enable-numpy-support" "--disable-numpy-support")


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2025-03-09 17:14 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-04 20:05 [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/ Nowa Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2025-03-09 17:14 Nowa Ammerlaan
2025-02-26  8:47 Ionen Wolkens
2025-02-21 16:22 Nowa Ammerlaan
2025-02-19 17:00 Nowa Ammerlaan
2025-02-19  9:08 Nowa Ammerlaan
2025-02-04 19:26 Nowa Ammerlaan
2025-02-04 13:12 Nowa Ammerlaan
2025-02-04 13:12 Nowa Ammerlaan
2025-02-04 13:06 Nowa Ammerlaan
2025-02-04  8:44 Nowa Ammerlaan
2025-02-03 17:40 Nowa Ammerlaan
2018-02-19 14:55 Andreas Sturmlechner
2017-08-31 12:13 Michael Palimaka
2017-07-08 18:00 Alexis Ballier
2017-04-30 19:46 Davide Pesavento
2017-04-15 21:56 Davide Pesavento
2017-03-10  9:26 Zac Medico
2015-10-19 16:29 Justin Lecher
2015-08-26  1:07 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox