CVS commit: pkgsrc/x11/py-qt5-qscintilla

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec  2 15:40:15 UTC 2022

Modified Files:
        pkgsrc/x11/py-qt5-qscintilla: Makefile PLIST
Removed Files:
        pkgsrc/x11/py-qt5-qscintilla: buildlink3.mk

Log Message:
py-qt5-qscintilla: update to 2.13.3.

Use sip6, wheel.mk.

Changes:
See qt5-qscintilla


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/py-qt5-qscintilla/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/py-qt5-qscintilla/PLIST
cvs rdiff -u -r1.12 -r0 pkgsrc/x11/py-qt5-qscintilla/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/py-qt5-qscintilla/Makefile
diff -u pkgsrc/x11/py-qt5-qscintilla/Makefile:1.16 pkgsrc/x11/py-qt5-qscintilla/Makefile:1.17
--- pkgsrc/x11/py-qt5-qscintilla/Makefile:1.16  Fri Nov 25 13:31:34 2022
+++ pkgsrc/x11/py-qt5-qscintilla/Makefile       Fri Dec  2 15:40:15 2022
@@ -1,34 +1,24 @@
-# $NetBSD: Makefile,v 1.16 2022/11/25 13:31:34 wiz Exp $
-
-PKGREVISION=   6
-
-PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
+# $NetBSD: Makefile,v 1.17 2022/12/02 15:40:15 wiz Exp $
 
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
-PKGNAME=       ${PYPKGPREFIX}-qt5-${DISTNAME:tl}
+PKGNAME=       ${PYPKGPREFIX}-qt5-${DISTNAME:S/_src//:tl}
 COMMENT=       QScintilla -- Python bindings
 
-BUILD_DIRS=    Python
-PY_PATCHPLIST= yes
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
+TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
+
+WRKSRC=                ${WRKDIR}/${DISTNAME}/Python
+
+WHEEL_NAME=    ${DISTNAME:S/_src//}
+
+post-extract:
+       cd ${WRKSRC} && ${CP} pyproject-qt5.toml pyproject.toml
 
-MAKE_FLAGS+=           TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
-INSTALL_MAKE_FLAGS+=   INSTALL_ROOT=${DESTDIR}
-LIBS+=                 -lqscintilla2
-MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}\ ${LIBS:Q}
-
-do-configure:
-       cd ${WRKSRC}/Python && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
-               --pyqt PyQt5 \
-               --qmake=${QTDIR}/bin/qmake \
-               --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
-               --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
-               --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
-               --qsci-libdir=${QTDIR}/lib \
-               --apidir=${QTDIR}/qsci${PYVERSSUFFIX}
+pre-configure:
+       ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
-.include "../../lang/python/extension.mk"
-.include "../../x11/py-sip/buildlink3.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../x11/py-qt5/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt5-qscintilla+= qt5-qscintilla>=${PKGVERSION_NOREV}
 .include "../../x11/qt5-qscintilla/buildlink3.mk"

Index: pkgsrc/x11/py-qt5-qscintilla/PLIST
diff -u pkgsrc/x11/py-qt5-qscintilla/PLIST:1.3 pkgsrc/x11/py-qt5-qscintilla/PLIST:1.4
--- pkgsrc/x11/py-qt5-qscintilla/PLIST:1.3      Sun Jan 26 12:53:34 2020
+++ pkgsrc/x11/py-qt5-qscintilla/PLIST  Fri Dec  2 15:40:15 2022
@@ -1,62 +1,62 @@
-@comment $NetBSD: PLIST,v 1.3 2020/01/26 12:53:34 rhialto Exp $
-${PYSITELIB}/PyQt5/Qsci.pyi
-${PYSITELIB}/PyQt5/Qsci.so
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/INSTALLER
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/METADATA
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/RECORD
-qt5/qsci${PYVERSSUFFIX}/api/python/QScintilla2.api
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciabstractapis.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciapis.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscicommand.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscicommandset.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscidocument.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexer.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeravs.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerbash.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerbatch.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercmake.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercoffeescript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercpp.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercsharp.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercss.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercustom.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerd.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerdiff.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeredifact.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerfortran.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerfortran77.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerhtml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeridl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjava.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjavascript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjson.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerlua.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermakefile.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermarkdown.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermatlab.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeroctave.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpascal.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerperl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpo.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpostscript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpov.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerproperties.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpython.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerruby.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerspice.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexersql.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexertcl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexertex.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerverilog.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexervhdl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerxml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeryaml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimacro.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimod4.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimod5.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimodcommon.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciprinter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciscintilla.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciscintillabase.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscistyle.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscistyledtext.sip
+@comment $NetBSD: PLIST,v 1.4 2022/12/02 15:40:15 wiz Exp $
+${PYSITELIB}/PyQt5/Qsci.abi3.so
+${PYSITELIB}/PyQt5/bindings/Qsci/Qsci.toml
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciabstractapis.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciapis.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscicommand.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscicommandset.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscidocument.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexer.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeravs.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbash.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbatch.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercmake.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercoffeescript.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercpp.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercsharp.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercss.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercustom.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerd.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerdiff.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerfortran.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerfortran77.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerhtml.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeridl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjava.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjavascript.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjson.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerlua.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermakefile.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermarkdown.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermatlab.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeroctave.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpascal.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerperl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpo.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpostscript.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpov.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerproperties.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpython.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerruby.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerspice.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexersql.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertcl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertex.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerverilog.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexervhdl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerxml.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeryaml.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscimacro.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscimod5.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscimodcommon.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciprinter.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintilla.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintillabase.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscistyle.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscistyledtext.sip
+${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json