[pkgsrc/trunk]: pkgsrc/x11 Be consistent with py-sip and install files in sha...

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2c71525b983
branches:  trunk
changeset: 343084:e2c71525b983
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Tue Oct 29 19:17:09 2019 +0000

description:
Be consistent with py-sip and install files in share/sip${PYVERSSUFFIX}/,
not share/sip/. Otherwise sip doesn't find the files.
bump PKGREVISIONs.
No changes expected in packages dependant on py-qt5, so no recursive bump.

diffstat:

 x11/py-qt5-qscintilla/Makefile |     8 +-
 x11/py-qt5-qscintilla/PLIST    |   112 +-
 x11/py-qt5/Makefile            |     5 +-
 x11/py-qt5/PLIST               |  1578 ++++++++++++++++++++--------------------
 4 files changed, 853 insertions(+), 850 deletions(-)

diffs (truncated from 1760 to 300 lines):

diff -r 4c0603c0a7f3 -r e2c71525b983 x11/py-qt5-qscintilla/Makefile
--- a/x11/py-qt5-qscintilla/Makefile    Tue Oct 29 19:17:08 2019 +0000
+++ b/x11/py-qt5-qscintilla/Makefile    Tue Oct 29 19:17:09 2019 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2019/10/29 17:46:36 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/29 19:17:09 bouyer Exp $
 
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
+
 PKGNAME=       ${PYPKGPREFIX}-qt5-${DISTNAME:tl:S/_gpl-/-/}
 COMMENT=       QScintilla -- Python bindings
+PKGREVISION=   1
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/Python
 
@@ -18,8 +20,8 @@
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
            --pyqt PyQt5 \
            --qmake=${QTDIR}/bin/qmake --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
-           --pyqt-sipdir=${PREFIX}/share/sip/PyQt5 \
-           --qsci-sipdir=${PREFIX}/share/sip/PyQt5 \
+           --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
+           --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
            --qsci-libdir=${QTDIR}/lib
 
 .include "../../lang/python/extension.mk"
diff -r 4c0603c0a7f3 -r e2c71525b983 x11/py-qt5-qscintilla/PLIST
--- a/x11/py-qt5-qscintilla/PLIST       Tue Oct 29 19:17:08 2019 +0000
+++ b/x11/py-qt5-qscintilla/PLIST       Tue Oct 29 19:17:09 2019 +0000
@@ -1,62 +1,62 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/29 17:46:36 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/29 19:17:09 bouyer 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/api/python/QScintilla2.api
-share/sip/PyQt5/Qsci/qsciabstractapis.sip
-share/sip/PyQt5/Qsci/qsciapis.sip
-share/sip/PyQt5/Qsci/qscicommand.sip
-share/sip/PyQt5/Qsci/qscicommandset.sip
-share/sip/PyQt5/Qsci/qscidocument.sip
-share/sip/PyQt5/Qsci/qscilexer.sip
-share/sip/PyQt5/Qsci/qscilexeravs.sip
-share/sip/PyQt5/Qsci/qscilexerbash.sip
-share/sip/PyQt5/Qsci/qscilexerbatch.sip
-share/sip/PyQt5/Qsci/qscilexercmake.sip
-share/sip/PyQt5/Qsci/qscilexercoffeescript.sip
-share/sip/PyQt5/Qsci/qscilexercpp.sip
-share/sip/PyQt5/Qsci/qscilexercsharp.sip
-share/sip/PyQt5/Qsci/qscilexercss.sip
-share/sip/PyQt5/Qsci/qscilexercustom.sip
-share/sip/PyQt5/Qsci/qscilexerd.sip
-share/sip/PyQt5/Qsci/qscilexerdiff.sip
-share/sip/PyQt5/Qsci/qscilexeredifact.sip
-share/sip/PyQt5/Qsci/qscilexerfortran.sip
-share/sip/PyQt5/Qsci/qscilexerfortran77.sip
-share/sip/PyQt5/Qsci/qscilexerhtml.sip
-share/sip/PyQt5/Qsci/qscilexeridl.sip
-share/sip/PyQt5/Qsci/qscilexerjava.sip
-share/sip/PyQt5/Qsci/qscilexerjavascript.sip
-share/sip/PyQt5/Qsci/qscilexerjson.sip
-share/sip/PyQt5/Qsci/qscilexerlua.sip
-share/sip/PyQt5/Qsci/qscilexermakefile.sip
-share/sip/PyQt5/Qsci/qscilexermarkdown.sip
-share/sip/PyQt5/Qsci/qscilexermatlab.sip
-share/sip/PyQt5/Qsci/qscilexeroctave.sip
-share/sip/PyQt5/Qsci/qscilexerpascal.sip
-share/sip/PyQt5/Qsci/qscilexerperl.sip
-share/sip/PyQt5/Qsci/qscilexerpo.sip
-share/sip/PyQt5/Qsci/qscilexerpostscript.sip
-share/sip/PyQt5/Qsci/qscilexerpov.sip
-share/sip/PyQt5/Qsci/qscilexerproperties.sip
-share/sip/PyQt5/Qsci/qscilexerpython.sip
-share/sip/PyQt5/Qsci/qscilexerruby.sip
-share/sip/PyQt5/Qsci/qscilexerspice.sip
-share/sip/PyQt5/Qsci/qscilexersql.sip
-share/sip/PyQt5/Qsci/qscilexertcl.sip
-share/sip/PyQt5/Qsci/qscilexertex.sip
-share/sip/PyQt5/Qsci/qscilexerverilog.sip
-share/sip/PyQt5/Qsci/qscilexervhdl.sip
-share/sip/PyQt5/Qsci/qscilexerxml.sip
-share/sip/PyQt5/Qsci/qscilexeryaml.sip
-share/sip/PyQt5/Qsci/qscimacro.sip
-share/sip/PyQt5/Qsci/qscimod4.sip
-share/sip/PyQt5/Qsci/qscimod5.sip
-share/sip/PyQt5/Qsci/qscimodcommon.sip
-share/sip/PyQt5/Qsci/qsciprinter.sip
-share/sip/PyQt5/Qsci/qsciscintilla.sip
-share/sip/PyQt5/Qsci/qsciscintillabase.sip
-share/sip/PyQt5/Qsci/qscistyle.sip
-share/sip/PyQt5/Qsci/qscistyledtext.sip
+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
diff -r 4c0603c0a7f3 -r e2c71525b983 x11/py-qt5/Makefile
--- a/x11/py-qt5/Makefile       Tue Oct 29 19:17:08 2019 +0000
+++ b/x11/py-qt5/Makefile       Tue Oct 29 19:17:09 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2019/09/18 14:17:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2019/10/29 19:17:09 bouyer Exp $
 
 DISTNAME=      PyQt5_gpl-5.13.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyQt5_gpl/qt5/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11 python
 MASTER_SITES=  https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PKGVERSION_NOREV}/
 
@@ -21,6 +21,7 @@
 USE_TOOLS+=            gmake pkg-config
 CONFIGURE_ARGS+=       -b ${PREFIX}/bin
 CONFIGURE_ARGS+=       -d ${PREFIX}/${PYSITELIB}
+CONFIGURE_ARGS+=       --sipdir ${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5
 CONFIGURE_ARGS+=       -q ${QTDIR}/bin/qmake
 CONFIGURE_ARGS+=       --confirm-license
 CONFIGURE_ARGS+=       --qsci-api
diff -r 4c0603c0a7f3 -r e2c71525b983 x11/py-qt5/PLIST
--- a/x11/py-qt5/PLIST  Tue Oct 29 19:17:08 2019 +0000
+++ b/x11/py-qt5/PLIST  Tue Oct 29 19:17:09 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/09/16 19:50:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/10/29 19:17:09 bouyer Exp $
 bin/pylupdate5
 bin/pyrcc5
 bin/pyuic5
@@ -109,791 +109,791 @@
 qt5/plugins/PyQt5/libpyqt5qmlplugin.so
 qt5/plugins/designer/libpyqt5.so
 qt5/qsci/api/python/PyQt5.api
-share/sip/PyQt5/Enginio/Enginiomod.sip
-share/sip/PyQt5/Enginio/enginio.sip
-share/sip/PyQt5/Enginio/enginioclient.sip
-share/sip/PyQt5/Enginio/enginioclientconnection.sip
-share/sip/PyQt5/Enginio/enginioidentity.sip
-share/sip/PyQt5/Enginio/enginiomodel.sip
-share/sip/PyQt5/Enginio/enginiooauth2authentication.sip
-share/sip/PyQt5/Enginio/enginioreply.sip
-share/sip/PyQt5/QAxContainer/QAxContainermod.sip
-share/sip/PyQt5/QAxContainer/qaxbase.sip
-share/sip/PyQt5/QAxContainer/qaxobject.sip
-share/sip/PyQt5/QAxContainer/qaxwidget.sip
-share/sip/PyQt5/QtAndroidExtras/QtAndroidExtrasmod.sip
-share/sip/PyQt5/QtAndroidExtras/qandroidjniobject.sip
-share/sip/PyQt5/QtAndroidExtras/qtandroid.sip
-share/sip/PyQt5/QtBluetooth/QtBluetoothmod.sip
-share/sip/PyQt5/QtBluetooth/qbluetooth.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothaddress.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothdevicediscoveryagent.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothdeviceinfo.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothhostinfo.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothlocaldevice.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothserver.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothservicediscoveryagent.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothserviceinfo.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothsocket.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothtransfermanager.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothtransferreply.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothtransferrequest.sip
-share/sip/PyQt5/QtBluetooth/qbluetoothuuid.sip
-share/sip/PyQt5/QtBluetooth/qlowenergyadvertisingdata.sip
-share/sip/PyQt5/QtBluetooth/qlowenergyadvertisingparameters.sip
-share/sip/PyQt5/QtBluetooth/qlowenergycharacteristic.sip
-share/sip/PyQt5/QtBluetooth/qlowenergycharacteristicdata.sip
-share/sip/PyQt5/QtBluetooth/qlowenergyconnectionparameters.sip
-share/sip/PyQt5/QtBluetooth/qlowenergycontroller.sip
-share/sip/PyQt5/QtBluetooth/qlowenergydescriptor.sip
-share/sip/PyQt5/QtBluetooth/qlowenergydescriptordata.sip
-share/sip/PyQt5/QtBluetooth/qlowenergyservice.sip
-share/sip/PyQt5/QtBluetooth/qlowenergyservicedata.sip
-share/sip/PyQt5/QtBluetooth/qpybluetooth_qlist.sip
-share/sip/PyQt5/QtBluetooth/qpybluetooth_quint128.sip
-share/sip/PyQt5/QtCore/QtCoremod.sip
-share/sip/PyQt5/QtCore/qabstractanimation.sip
-share/sip/PyQt5/QtCore/qabstracteventdispatcher.sip
-share/sip/PyQt5/QtCore/qabstractitemmodel.sip
-share/sip/PyQt5/QtCore/qabstractnativeeventfilter.sip
-share/sip/PyQt5/QtCore/qabstractproxymodel.sip
-share/sip/PyQt5/QtCore/qabstractstate.sip
-share/sip/PyQt5/QtCore/qabstracttransition.sip
-share/sip/PyQt5/QtCore/qanimationgroup.sip
-share/sip/PyQt5/QtCore/qbasictimer.sip
-share/sip/PyQt5/QtCore/qbitarray.sip
-share/sip/PyQt5/QtCore/qbuffer.sip
-share/sip/PyQt5/QtCore/qbytearray.sip
-share/sip/PyQt5/QtCore/qbytearraymatcher.sip
-share/sip/PyQt5/QtCore/qcborcommon.sip
-share/sip/PyQt5/QtCore/qcborstream.sip
-share/sip/PyQt5/QtCore/qchar.sip
-share/sip/PyQt5/QtCore/qcollator.sip
-share/sip/PyQt5/QtCore/qcommandlineoption.sip
-share/sip/PyQt5/QtCore/qcommandlineparser.sip
-share/sip/PyQt5/QtCore/qconcatenatetablesproxymodel.sip
-share/sip/PyQt5/QtCore/qcoreapplication.sip
-share/sip/PyQt5/QtCore/qcoreevent.sip
-share/sip/PyQt5/QtCore/qcryptographichash.sip
-share/sip/PyQt5/QtCore/qdatastream.sip
-share/sip/PyQt5/QtCore/qdatetime.sip
-share/sip/PyQt5/QtCore/qdeadlinetimer.sip
-share/sip/PyQt5/QtCore/qdir.sip
-share/sip/PyQt5/QtCore/qdiriterator.sip
-share/sip/PyQt5/QtCore/qeasingcurve.sip
-share/sip/PyQt5/QtCore/qelapsedtimer.sip
-share/sip/PyQt5/QtCore/qeventloop.sip
-share/sip/PyQt5/QtCore/qeventtransition.sip
-share/sip/PyQt5/QtCore/qfile.sip
-share/sip/PyQt5/QtCore/qfiledevice.sip
-share/sip/PyQt5/QtCore/qfileinfo.sip
-share/sip/PyQt5/QtCore/qfileselector.sip
-share/sip/PyQt5/QtCore/qfilesystemwatcher.sip
-share/sip/PyQt5/QtCore/qfinalstate.sip
-share/sip/PyQt5/QtCore/qglobal.sip
-share/sip/PyQt5/QtCore/qhistorystate.sip
-share/sip/PyQt5/QtCore/qidentityproxymodel.sip
-share/sip/PyQt5/QtCore/qiodevice.sip
-share/sip/PyQt5/QtCore/qitemselectionmodel.sip
-share/sip/PyQt5/QtCore/qjsonarray.sip
-share/sip/PyQt5/QtCore/qjsondocument.sip
-share/sip/PyQt5/QtCore/qjsonobject.sip
-share/sip/PyQt5/QtCore/qjsonvalue.sip
-share/sip/PyQt5/QtCore/qlibrary.sip
-share/sip/PyQt5/QtCore/qlibraryinfo.sip
-share/sip/PyQt5/QtCore/qline.sip
-share/sip/PyQt5/QtCore/qlocale.sip
-share/sip/PyQt5/QtCore/qlockfile.sip
-share/sip/PyQt5/QtCore/qlogging.sip
-share/sip/PyQt5/QtCore/qloggingcategory.sip
-share/sip/PyQt5/QtCore/qmargins.sip
-share/sip/PyQt5/QtCore/qmessageauthenticationcode.sip
-share/sip/PyQt5/QtCore/qmetaobject.sip
-share/sip/PyQt5/QtCore/qmetatype.sip
-share/sip/PyQt5/QtCore/qmimedata.sip
-share/sip/PyQt5/QtCore/qmimedatabase.sip
-share/sip/PyQt5/QtCore/qmimetype.sip
-share/sip/PyQt5/QtCore/qmutex.sip
-share/sip/PyQt5/QtCore/qnamespace.sip
-share/sip/PyQt5/QtCore/qnumeric.sip
-share/sip/PyQt5/QtCore/qobject.sip
-share/sip/PyQt5/QtCore/qobjectcleanuphandler.sip
-share/sip/PyQt5/QtCore/qobjectdefs.sip
-share/sip/PyQt5/QtCore/qoperatingsystemversion.sip
-share/sip/PyQt5/QtCore/qparallelanimationgroup.sip
-share/sip/PyQt5/QtCore/qpauseanimation.sip
-share/sip/PyQt5/QtCore/qpluginloader.sip
-share/sip/PyQt5/QtCore/qpoint.sip
-share/sip/PyQt5/QtCore/qprocess.sip