dev-python/pyside6: sync use flags with PyQt6

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

2 files changed, 41 insertions, 19 deletions

diff --git a/dev-python/pyside6/metadata.xml b/dev-python/pyside6/metadata.xml
index ae61fd0e0866..7e1f3a7d2bd5 100644
--- a/dev-python/pyside6/metadata.xml
+++ b/dev-python/pyside6/metadata.xml
@@ -10,21 +10,30 @@
 		<name>Bernd Waibel</name>
 	</maintainer>
 	<use>
+		<flag name="3d">Build Qt3DCore, Qt3DAnimation, Qt3DExtras, Qt3DInput, Qt3DLogic, and Qt3DRender modules</flag>
+		<flag name="bluetooth">Build QtBluetooth module</flag>
 		<flag name="charts">Build QtCharts module</flag>
 		<flag name="concurrent">Build QtConcurrent module</flag>
 		<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
 		<flag name="gles2-only">Build QtGui "QOpenGL*" classes</flag>
 		<flag name="gui">Build QtGui module</flag>
 		<flag name="help">Build QtHelp module</flag>
+		<flag name="location">Build QtLocation module</flag>
 		<flag name="multimedia">Build QtMultimedia and QtMultimediaWidgets modules</flag>
 		<flag name="network">Build QtNetwork module</flag>
 		<flag name="network-auth">Build QtNetworkAuth module</flag>
+		<flag name="nfc">Build QtNfc module</flag>
+		<flag name="pdfium">Build QtPdf module</flag>
 		<flag name="positioning">Build QtPositioning module</flag>
 		<flag name="printsupport">Build QtPrintSupport module</flag>
 		<flag name="qml">Build QtQml module</flag>
 		<flag name="quick">Build QtQuick and QtQuickWidgets modules</flag>
 		<flag name="quick3d">Build QtQuick3D and QtQuickWidgets modules</flag>
+		<flag name="scxml">Build QtScxml module</flag>
+		<flag name="sensors">Build QtSensors module</flag>
 		<flag name="serialport">Build QtSerialPort modules</flag>
+		<flag name="spatialaudio">Build QtSpatialAudio module</flag>
+		<flag name="speech">Build QtTextToSpeech module</flag>
 		<flag name="sql">Build QtSql module</flag>
 		<flag name="svg">Build QtSvg module</flag>
 		<flag name="testlib">Build QtTest module</flag>
diff --git a/dev-python/pyside6/pyside6-6.6.0.ebuild b/dev-python/pyside6/pyside6-6.6.0-r1.ebuild
index 4d68e8765056..34186ac1320b 100644
--- a/dev-python/pyside6/pyside6-6.6.0.ebuild
+++ b/dev-python/pyside6/pyside6-6.6.0-r1.ebuild
@@ -39,10 +39,10 @@ LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="
-	+dbus charts +concurrent designer gles2-only +gui help multimedia
-	+network network-auth +opengl positioning +printsupport qml quick
-	quick3d serialport +sql svg test +testlib webchannel webengine
-	websockets +widgets +xml
+	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
+	multimedia +network network-auth nfc positioning +opengl pdfium positioning
+	+printsupport qml quick quick3d serialport scxml sensors spatialaudio speech
+	+sql svg test +testlib webchannel webengine	websockets +widgets +xml
 "
 
 # Manually reextract these requirements on version bumps by running the
@@ -50,18 +50,23 @@ IUSE="
 #     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
 # Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	3d? ( gui network )
 	charts? ( gui widgets )
 	designer? ( widgets )
 	gles2-only? ( gui )
 	gui? ( dbus opengl )
 	help? ( network sql widgets )
+	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 )
+	spatialaudio? ( multimedia )
+	speech? ( multimedia )
 	sql? ( widgets )
 	svg? ( gui )
 	testlib? ( widgets )
@@ -80,6 +85,8 @@ QT_PV="$(ver_cut 1-3)*:6"
 RDEPEND="${PYTHON_DEPS}
 	~dev-python/shiboken6-${PV}[${PYTHON_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] )
 	gui? (
@@ -87,12 +94,18 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/libxkbcommon
 	)
 	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
+	location? ( =dev-qt/qtlocation-${QT_PV} )
 	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
 	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} )
+	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] )
@@ -123,14 +136,14 @@ src_configure() {
 	# See collect_module_if_found macros in PySideHelpers.cmake
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes
+		-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=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
@@ -139,16 +152,16 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes
+		-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=yes
+		-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=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes
+		-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)
@@ -157,16 +170,16 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes
+		-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=yes
+		-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=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=$(usex !speech)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)