[pkgsrc/trunk]: pkgsrc/geography/qgis geography/qgis: De-optionize python

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a1bac56c08c
branches:  trunk
changeset: 452981:0a1bac56c08c
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu May 20 23:08:30 2021 +0000

description:
geography/qgis: De-optionize python

This commit removes the python option, but keeps python -- what was
formerly included with the option is now simply always included.  In
today's qgis world, python support is simply part of qgis and building
without it is close to unthinkable.  python is tiny compared to qgis
or even qt.

The rationale for removal is that having a split PLIST, and two ways
to build is some maintenance headache, and I believe that zero people
want to build qgis without python.  My guess is that no one has tried
in years.

No PKGREVISOIN++ as there is no change to the default build.

diffstat:

 geography/qgis/Makefile     |    23 +-
 geography/qgis/PLIST        |  1311 ++++++++++++++++++++++++++++++++++++++++++-
 geography/qgis/PLIST.python |  1310 ------------------------------------------
 geography/qgis/options.mk   |    44 -
 4 files changed, 1330 insertions(+), 1358 deletions(-)

diffs (truncated from 2752 to 300 lines):

diff -r 48ea6f7fb63e -r 0a1bac56c08c geography/qgis/Makefile
--- a/geography/qgis/Makefile   Thu May 20 21:41:26 2021 +0000
+++ b/geography/qgis/Makefile   Thu May 20 23:08:30 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2021/05/03 16:28:47 gdt Exp $
+# $NetBSD: Makefile,v 1.117 2021/05/20 23:08:30 gdt Exp $
 
 # This is intentionally 3.16 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
@@ -31,8 +31,6 @@
 
 PLIST_SRC=             PLIST
 
-.include "options.mk"
-
 DEPENDS+=              qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl
 # This is needed to find qca2.
 CMAKE_PREFIX_PATH+=    ${QTDIR}
@@ -59,6 +57,21 @@
 SUBST_SED.pyqt+=               -e '/^SET/s,pyuic5,&-${PYVERSSUFFIX},'
 SUBST_SED.pyqt+=               -e '/^SET/s,pyrcc5,&-${PYVERSSUFFIX},'
 
+CMAKE_ARGS+=           -DWITH_BINDINGS:BOOL=TRUE
+CMAKE_ARGS+=           -DSIP_BINARY_PATH:PATH=${BUILDLINK_PREFIX.py-sip}/bin
+CMAKE_ARGS+=           -DWITH_INTERNAL_MARKUPSAFE=FALSE
+
+.include "../../lang/python/application.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+DEPENDS+=      ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+DEPENDS+=      ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
+DEPENDS+=      ${PYPKGPREFIX}-gdal-[0-9]*:../../geography/py-gdal
+DEPENDS+=      ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+DEPENDS+=      ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
+# py-owslib # metasearch
+# py-yaml # quickosm
+
 CMAKE_ARGS+=   -DWITH_QTWEBKIT=FALSE
 CMAKE_ARGS+=   -DQWT_DIR=${QWT_DIR}
 # Useful for package development:
@@ -79,6 +92,7 @@
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/fcgi/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
@@ -86,6 +100,9 @@
 .include "../../geography/spatialindex/buildlink3.mk"
 .include "../../security/qca2-qt5/buildlink3.mk"
 .include "../../security/qt5-qtkeychain/buildlink3.mk"
+.include "../../x11/py-sip/buildlink3.mk"
+.include "../../x11/py-qt5/buildlink3.mk"
+.include "../../x11/py-qt5-qscintilla/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qwt6-qt5/buildlink3.mk"
diff -r 48ea6f7fb63e -r 0a1bac56c08c geography/qgis/PLIST
--- a/geography/qgis/PLIST      Thu May 20 21:41:26 2021 +0000
+++ b/geography/qgis/PLIST      Thu May 20 23:08:30 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2021/03/01 00:03:35 gdt Exp $
+@comment $NetBSD: PLIST,v 1.15 2021/05/20 23:08:30 gdt Exp $
 bin/qgis
 bin/qgis_bench
 bin/qgis_process
@@ -1406,6 +1406,8 @@
 lib/libqgis_gui.so.${PKGVERSION}
 lib/libqgis_native.so
 lib/libqgis_native.so.${PKGVERSION}
+lib/libqgispython.so
+lib/libqgispython.so.${PKGVERSION}
 lib/qgis/crssync
 lib/qgis/plugins/libarcgisfeatureserverprovider.so
 lib/qgis/plugins/libarcgismapserverprovider.so
@@ -1638,6 +1640,1313 @@
 share/qgis/images/icons/sponsor_medals/2011/gold_medal_2011.png
 share/qgis/images/icons/sponsor_medals/2011/platin_medal_2011.png
 share/qgis/images/icons/sponsor_medals/2011/silver_medal_2011.png
+share/qgis/python/console/__init__.py
+share/qgis/python/console/console.py
+share/qgis/python/console/console_compile_apis.py
+share/qgis/python/console/console_editor.py
+share/qgis/python/console/console_output.py
+share/qgis/python/console/console_sci.py
+share/qgis/python/console/console_settings.py
+share/qgis/python/console/ui_console_compile_apis.py
+share/qgis/python/console/ui_console_history_dlg.py
+share/qgis/python/console/ui_console_settings.py
+share/qgis/python/plugins/MetaSearch/LICENSE.txt
+share/qgis/python/plugins/MetaSearch/__init__.py
+share/qgis/python/plugins/MetaSearch/dialogs/__init__.py
+share/qgis/python/plugins/MetaSearch/dialogs/maindialog.py
+share/qgis/python/plugins/MetaSearch/dialogs/manageconnectionsdialog.py
+share/qgis/python/plugins/MetaSearch/dialogs/newconnectiondialog.py
+share/qgis/python/plugins/MetaSearch/dialogs/recorddialog.py
+share/qgis/python/plugins/MetaSearch/dialogs/xmldialog.py
+share/qgis/python/plugins/MetaSearch/images/MetaSearch.svg
+share/qgis/python/plugins/MetaSearch/link_types.py
+share/qgis/python/plugins/MetaSearch/metadata.txt
+share/qgis/python/plugins/MetaSearch/plugin.py
+share/qgis/python/plugins/MetaSearch/resources/connections-default.xml
+share/qgis/python/plugins/MetaSearch/resources/templates/record_metadata_dc.html
+share/qgis/python/plugins/MetaSearch/resources/templates/service_metadata.html
+share/qgis/python/plugins/MetaSearch/resources/templates/xml_highlight.html
+share/qgis/python/plugins/MetaSearch/ui/maindialog.ui
+share/qgis/python/plugins/MetaSearch/ui/manageconnectionsdialog.ui
+share/qgis/python/plugins/MetaSearch/ui/newconnectiondialog.ui
+share/qgis/python/plugins/MetaSearch/ui/recorddialog.ui
+share/qgis/python/plugins/MetaSearch/ui/xmldialog.ui
+share/qgis/python/plugins/MetaSearch/util.py
+share/qgis/python/plugins/db_manager/LICENSE
+share/qgis/python/plugins/db_manager/TODO
+share/qgis/python/plugins/db_manager/__init__.py
+share/qgis/python/plugins/db_manager/db_manager.py
+share/qgis/python/plugins/db_manager/db_manager_plugin.py
+share/qgis/python/plugins/db_manager/db_model.py
+share/qgis/python/plugins/db_manager/db_plugins/__init__.py
+share/qgis/python/plugins/db_manager/db_plugins/connector.py
+share/qgis/python/plugins/db_manager/db_plugins/data_model.py
+share/qgis/python/plugins/db_manager/db_plugins/gpkg/__init__.py
+share/qgis/python/plugins/db_manager/db_plugins/gpkg/connector.py
+share/qgis/python/plugins/db_manager/db_plugins/gpkg/data_model.py
+share/qgis/python/plugins/db_manager/db_plugins/gpkg/info_model.py
+share/qgis/python/plugins/db_manager/db_plugins/gpkg/plugin.py
+share/qgis/python/plugins/db_manager/db_plugins/gpkg/sql_dictionary.py
+share/qgis/python/plugins/db_manager/db_plugins/html_elems.py
+share/qgis/python/plugins/db_manager/db_plugins/info_model.py
+share/qgis/python/plugins/db_manager/db_plugins/plugin.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/__init__.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/connector.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/connector_test.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/data_model.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/info_model.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugin.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugin_test.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_label.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_left.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_mbr.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_right.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_seed.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_left.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_right.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node_label.qml
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py
+share/qgis/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
+share/qgis/python/plugins/db_manager/db_plugins/spatialite/__init__.py
+share/qgis/python/plugins/db_manager/db_plugins/spatialite/connector.py
+share/qgis/python/plugins/db_manager/db_plugins/spatialite/data_model.py
+share/qgis/python/plugins/db_manager/db_plugins/spatialite/info_model.py
+share/qgis/python/plugins/db_manager/db_plugins/spatialite/plugin.py
+share/qgis/python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py
+share/qgis/python/plugins/db_manager/db_plugins/vlayers/__init__.py
+share/qgis/python/plugins/db_manager/db_plugins/vlayers/connector.py
+share/qgis/python/plugins/db_manager/db_plugins/vlayers/data_model.py
+share/qgis/python/plugins/db_manager/db_plugins/vlayers/info_model.py
+share/qgis/python/plugins/db_manager/db_plugins/vlayers/plugin.py
+share/qgis/python/plugins/db_manager/db_plugins/vlayers/sql_dictionary.py
+share/qgis/python/plugins/db_manager/db_tree.py
+share/qgis/python/plugins/db_manager/dlg_add_geometry_column.py
+share/qgis/python/plugins/db_manager/dlg_create_constraint.py
+share/qgis/python/plugins/db_manager/dlg_create_index.py
+share/qgis/python/plugins/db_manager/dlg_create_table.py
+share/qgis/python/plugins/db_manager/dlg_db_error.py
+share/qgis/python/plugins/db_manager/dlg_export_vector.py
+share/qgis/python/plugins/db_manager/dlg_field_properties.py
+share/qgis/python/plugins/db_manager/dlg_import_vector.py
+share/qgis/python/plugins/db_manager/dlg_query_builder.py
+share/qgis/python/plugins/db_manager/dlg_sql_layer_window.py
+share/qgis/python/plugins/db_manager/dlg_sql_window.py
+share/qgis/python/plugins/db_manager/dlg_table_properties.py
+share/qgis/python/plugins/db_manager/icons/about.png
+share/qgis/python/plugins/db_manager/icons/dbmanager.svg
+share/qgis/python/plugins/db_manager/icons/layer_unknown.png
+share/qgis/python/plugins/db_manager/icons/namespace.png
+share/qgis/python/plugins/db_manager/icons/namespaces.xpm
+share/qgis/python/plugins/db_manager/icons/plugged.png
+share/qgis/python/plugins/db_manager/icons/sql.gif
+share/qgis/python/plugins/db_manager/icons/tables.xpm
+share/qgis/python/plugins/db_manager/icons/unplugged.png
+share/qgis/python/plugins/db_manager/icons/user.xpm
+share/qgis/python/plugins/db_manager/icons/users.xpm
+share/qgis/python/plugins/db_manager/icons/view.png
+share/qgis/python/plugins/db_manager/icons/view_materialized.png
+share/qgis/python/plugins/db_manager/icons/warning-20px.png
+share/qgis/python/plugins/db_manager/info_viewer.py
+share/qgis/python/plugins/db_manager/layer_preview.py
+share/qgis/python/plugins/db_manager/metadata.txt
+share/qgis/python/plugins/db_manager/resources_rc.py
+share/qgis/python/plugins/db_manager/sql_dictionary.py
+share/qgis/python/plugins/db_manager/sqledit.py
+share/qgis/python/plugins/db_manager/table_viewer.py
+share/qgis/python/plugins/db_manager/ui/__init__.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgAddGeometryColumn.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgCancelTaskQuery.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgCreateConstraint.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgCreateIndex.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgCreateTable.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgDbError.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgExportVector.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgFieldProperties.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgImportVector.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgQueryBuilder.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgSqlLayerWindow.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgSqlWindow.py
+share/qgis/python/plugins/db_manager/ui/ui_DlgTableProperties.py
+share/qgis/python/plugins/processing/ProcessingPlugin.py
+share/qgis/python/plugins/processing/__init__.py
+share/qgis/python/plugins/processing/algs/__init__.py
+share/qgis/python/plugins/processing/algs/gdal/AssignProjection.py
+share/qgis/python/plugins/processing/algs/gdal/Buffer.py
+share/qgis/python/plugins/processing/algs/gdal/ClipRasterByExtent.py
+share/qgis/python/plugins/processing/algs/gdal/ClipRasterByMask.py
+share/qgis/python/plugins/processing/algs/gdal/ClipVectorByExtent.py
+share/qgis/python/plugins/processing/algs/gdal/ClipVectorByMask.py
+share/qgis/python/plugins/processing/algs/gdal/ColorRelief.py
+share/qgis/python/plugins/processing/algs/gdal/Datasources2Vrt.py
+share/qgis/python/plugins/processing/algs/gdal/Dissolve.py
+share/qgis/python/plugins/processing/algs/gdal/ExecuteSql.py
+share/qgis/python/plugins/processing/algs/gdal/GdalAlgorithm.py
+share/qgis/python/plugins/processing/algs/gdal/GdalAlgorithmDialog.py
+share/qgis/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
+share/qgis/python/plugins/processing/algs/gdal/GdalUtils.py
+share/qgis/python/plugins/processing/algs/gdal/GridAverage.py
+share/qgis/python/plugins/processing/algs/gdal/GridDataMetrics.py
+share/qgis/python/plugins/processing/algs/gdal/GridInverseDistance.py
+share/qgis/python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py
+share/qgis/python/plugins/processing/algs/gdal/GridLinear.py
+share/qgis/python/plugins/processing/algs/gdal/GridNearestNeighbor.py
+share/qgis/python/plugins/processing/algs/gdal/OffsetCurve.py
+share/qgis/python/plugins/processing/algs/gdal/OgrToPostGis.py
+share/qgis/python/plugins/processing/algs/gdal/OneSideBuffer.py
+share/qgis/python/plugins/processing/algs/gdal/PointsAlongLines.py
+share/qgis/python/plugins/processing/algs/gdal/__init__.py
+share/qgis/python/plugins/processing/algs/gdal/aspect.py
+share/qgis/python/plugins/processing/algs/gdal/buildvrt.py
+share/qgis/python/plugins/processing/algs/gdal/contour.py
+share/qgis/python/plugins/processing/algs/gdal/extractprojection.py
+share/qgis/python/plugins/processing/algs/gdal/fillnodata.py
+share/qgis/python/plugins/processing/algs/gdal/gdal2tiles.py
+share/qgis/python/plugins/processing/algs/gdal/gdal2xyz.py
+share/qgis/python/plugins/processing/algs/gdal/gdaladdo.py
+share/qgis/python/plugins/processing/algs/gdal/gdalcalc.py
+share/qgis/python/plugins/processing/algs/gdal/gdalinfo.py
+share/qgis/python/plugins/processing/algs/gdal/gdaltindex.py
+share/qgis/python/plugins/processing/algs/gdal/hillshade.py
+share/qgis/python/plugins/processing/algs/gdal/merge.py
+share/qgis/python/plugins/processing/algs/gdal/nearblack.py
+share/qgis/python/plugins/processing/algs/gdal/ogr2ogr.py
+share/qgis/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
+share/qgis/python/plugins/processing/algs/gdal/ogrinfo.py
+share/qgis/python/plugins/processing/algs/gdal/pansharp.py
+share/qgis/python/plugins/processing/algs/gdal/pct2rgb.py
+share/qgis/python/plugins/processing/algs/gdal/polygonize.py
+share/qgis/python/plugins/processing/algs/gdal/proximity.py
+share/qgis/python/plugins/processing/algs/gdal/rasterize.py
+share/qgis/python/plugins/processing/algs/gdal/rasterize_over.py
+share/qgis/python/plugins/processing/algs/gdal/rasterize_over_fixed_value.py
+share/qgis/python/plugins/processing/algs/gdal/rearrange_bands.py
+share/qgis/python/plugins/processing/algs/gdal/retile.py
+share/qgis/python/plugins/processing/algs/gdal/rgb2pct.py
+share/qgis/python/plugins/processing/algs/gdal/roughness.py
+share/qgis/python/plugins/processing/algs/gdal/sieve.py
+share/qgis/python/plugins/processing/algs/gdal/slope.py
+share/qgis/python/plugins/processing/algs/gdal/tpi.py
+share/qgis/python/plugins/processing/algs/gdal/translate.py
+share/qgis/python/plugins/processing/algs/gdal/tri.py
+share/qgis/python/plugins/processing/algs/gdal/ui/RasterOptionsWidget.py
+share/qgis/python/plugins/processing/algs/gdal/ui/__init__.py
+share/qgis/python/plugins/processing/algs/gdal/viewshed.py
+share/qgis/python/plugins/processing/algs/gdal/warp.py
+share/qgis/python/plugins/processing/algs/grass7/Grass7Algorithm.py
+share/qgis/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
+share/qgis/python/plugins/processing/algs/grass7/Grass7Utils.py
+share/qgis/python/plugins/processing/algs/grass7/__init__.py
+share/qgis/python/plugins/processing/algs/grass7/description/i.albedo.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.aster.toar.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.atcorr.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.biomass.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.cca.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.cluster.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.colors.enhance.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.eb.eta.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.eb.evapfr.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.eb.hsebal01.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.eb.netrad.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.eb.soilheatflux.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.emissivity.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.evapo.mh.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.evapo.pm.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.evapo.pt.txt
+share/qgis/python/plugins/processing/algs/grass7/description/i.evapo.time.txt