x11-toolkits/py-qt6-graphs: Fix PLIST_SUBs

Fix failure to package after 4b51612759. PYQT_PYQTVERSION should have
been PYQTGRAPHS_VERSION as these components don't always have the same
version. [1]

Fix over-agressive PYTHON_MAJOR_VER substitutions.

Add missing Qt components.

Reported by:	pkg-fallout [1]
MFH:		2025Q1
This commit is contained in:
Jason E. Hale 2025-02-12 01:04:25 -05:00
parent 0e104f8715
commit 66bfb74382
2 changed files with 26 additions and 23 deletions

View file

@ -1,5 +1,6 @@
PORTNAME= graphs
DISTVERSION= ${PYQTGRAPHS_VERSION}
PORTREVISION= 1
CATEGORIES= x11-toolkits devel python
MASTER_SITES= ${MASTER_SITES_PYQTGRAPHS}
PKGNAMEPREFIX= ${PYQT_PY_RELNAME}-
@ -15,9 +16,11 @@ USES= gl pyqt:6,dist python qt:6
USE_GL= opengl
USE_PYQT= pyqt6 qtbuilder:build sip:build
USE_PYTHON= concurrent flavors
USE_QT= base graphs
USE_QT= base declarative graphs quick3d shadertools
PLIST_SUB= PYQTGRAPHS_VERSION=${DISTVERSION}
PLIST_SUB= PYQTGRAPHS_VERSION=${DISTVERSION} \
PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \
PYTHON_MAJOR_VER_regex=[[:<:]]${PYTHON_MAJOR_VER}[[:>:]]
post-install:
@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \

View file

@ -1,26 +1,26 @@
%%PYQT_APIDIR%%/PyQt6-Graphs.api
%%PYQT_SIPDIR%%/QtGraphs/QtGraphs.toml
%%PYQT_SIPDIR%%/QtGraphs/QtGraphsmod.sip
%%PYQT_SIPDIR%%/QtGraphs/q%%PYTHON_MAJOR_VER%%dscene.sip
%%PYQT_SIPDIR%%/QtGraphs/qabstract%%PYTHON_MAJOR_VER%%daxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qabstract%%PYTHON_MAJOR_VER%%dseries.sip
%%PYQT_SIPDIR%%/QtGraphs/q3dscene.sip
%%PYQT_SIPDIR%%/QtGraphs/qabstract3daxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qabstract3dseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qabstractaxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qabstractdataproxy.sip
%%PYQT_SIPDIR%%/QtGraphs/qabstractseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qareaseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qbar%%PYTHON_MAJOR_VER%%dseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qbar3dseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qbarcategoryaxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qbardataitem.sip
%%PYQT_SIPDIR%%/QtGraphs/qbardataproxy.sip
%%PYQT_SIPDIR%%/QtGraphs/qbarmodelmapper.sip
%%PYQT_SIPDIR%%/QtGraphs/qbarseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qbarset.sip
%%PYQT_SIPDIR%%/QtGraphs/qcategory%%PYTHON_MAJOR_VER%%daxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%ditem.sip
%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%dlabel.sip
%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%dvolume.sip
%%PYQT_SIPDIR%%/QtGraphs/qcategory3daxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qcustom3ditem.sip
%%PYQT_SIPDIR%%/QtGraphs/qcustom3dlabel.sip
%%PYQT_SIPDIR%%/QtGraphs/qcustom3dvolume.sip
%%PYQT_SIPDIR%%/QtGraphs/qdatetimeaxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qgraphs%%PYTHON_MAJOR_VER%%dnamespace.sip
%%PYQT_SIPDIR%%/QtGraphs/qgraphs3dnamespace.sip
%%PYQT_SIPDIR%%/QtGraphs/qgraphstheme.sip
%%PYQT_SIPDIR%%/QtGraphs/qheightmapsurfacedataproxy.sip
%%PYQT_SIPDIR%%/QtGraphs/qitemmodelbardataproxy.sip
@ -28,32 +28,32 @@
%%PYQT_SIPDIR%%/QtGraphs/qitemmodelsurfacedataproxy.sip
%%PYQT_SIPDIR%%/QtGraphs/qlineseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qlist.sip
%%PYQT_SIPDIR%%/QtGraphs/qlogvalue%%PYTHON_MAJOR_VER%%daxisformatter.sip
%%PYQT_SIPDIR%%/QtGraphs/qlogvalue3daxisformatter.sip
%%PYQT_SIPDIR%%/QtGraphs/qpiemodelmapper.sip
%%PYQT_SIPDIR%%/QtGraphs/qpieseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qpieslice.sip
%%PYQT_SIPDIR%%/QtGraphs/qscatter%%PYTHON_MAJOR_VER%%dseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qscatter3dseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qscatterdataitem.sip
%%PYQT_SIPDIR%%/QtGraphs/qscatterdataproxy.sip
%%PYQT_SIPDIR%%/QtGraphs/qscatterseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qsplineseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qsurface%%PYTHON_MAJOR_VER%%dseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qsurface3dseries.sip
%%PYQT_SIPDIR%%/QtGraphs/qsurfacedataitem.sip
%%PYQT_SIPDIR%%/QtGraphs/qsurfacedataproxy.sip
%%PYQT_SIPDIR%%/QtGraphs/qutils.sip
%%PYQT_SIPDIR%%/QtGraphs/qvalue%%PYTHON_MAJOR_VER%%daxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qvalue%%PYTHON_MAJOR_VER%%daxisformatter.sip
%%PYQT_SIPDIR%%/QtGraphs/qvalue3daxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qvalue3daxisformatter.sip
%%PYQT_SIPDIR%%/QtGraphs/qvalueaxis.sip
%%PYQT_SIPDIR%%/QtGraphs/qxymodelmapper.sip
%%PYQT_SIPDIR%%/QtGraphs/qxyseries.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/QtGraphsWidgets.toml
%%PYQT_SIPDIR%%/QtGraphsWidgets/QtGraphsWidgetsmod.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dbarswidgetitem.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dgraphswidgetitem.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dscatterwidgetitem.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dsurfacewidgetitem.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dbarswidgetitem.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dgraphswidgetitem.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dscatterwidgetitem.sip
%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dsurfacewidgetitem.sip
%%PYTHON_SITELIBDIR%%/PyQt6/QtGraphs.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt6/QtGraphsWidgets.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/RECORD
%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/RECORD