From f9e0458427eb4247fb233b3f75f7ee48f3c81d43 Mon Sep 17 00:00:00 2001
From: Aleksej Lebedev <root@zta.lk>
Date: Fri, 29 May 2020 22:13:41 +0200
Subject: [PATCH] py-shapely: updated to 1.7.0

---
 py-shapely/Makefile |   5 +-
 py-shapely/PLIST    | 324 +++++++++++++++-----------------------------
 py-shapely/distinfo |   7 +-
 3 files changed, 112 insertions(+), 224 deletions(-)

diff --git a/py-shapely/Makefile b/py-shapely/Makefile
index a5f65a5f7f..251f21ffcb 100644
--- a/py-shapely/Makefile
+++ b/py-shapely/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.8 2014/06/20 10:40:28 jihbed Exp $
 
-DISTNAME=	Shapely-1.3.2
+DISTNAME=	Shapely-1.7.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=S/Shapely/}
@@ -11,10 +11,9 @@ COMMENT=	Geometric objects, predicates, and operations
 LICENSE=	2-clause-bsd
 
 INSTALLATION_DIRS=		share/doc/py-shapely
-PYTHON_VERSIONS_ACCEPTED=	27
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/docs/manual.txt ${DESTDIR}${PREFIX}/share/doc/py-shapely
+	${INSTALL_DATA} ${WRKSRC}/docs/manual.rst ${DESTDIR}${PREFIX}/share/doc/py-shapely
 
 .include "../../geography/geos/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/py-shapely/PLIST b/py-shapely/PLIST
index dc1ba62673..efde2b4505 100644
--- a/py-shapely/PLIST
+++ b/py-shapely/PLIST
@@ -1,238 +1,126 @@
-@comment $NetBSD: PLIST,v 1.2 2014/01/17 15:58:20 jihbed Exp $
+@comment $NetBSD$
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/shapely/__init__.py
-${PYSITELIB}/shapely/__init__.pyc
 ${PYSITELIB}/shapely/__init__.pyo
-${PYSITELIB}/shapely/affinity.py
-${PYSITELIB}/shapely/affinity.pyc
+${PYSITELIB}/shapely/__init__.pyc
+${PYSITELIB}/shapely/_buildcfg.pyo
+${PYSITELIB}/shapely/_buildcfg.pyc
 ${PYSITELIB}/shapely/affinity.pyo
-${PYSITELIB}/shapely/algorithms/__init__.py
-${PYSITELIB}/shapely/algorithms/__init__.pyc
-${PYSITELIB}/shapely/algorithms/__init__.pyo
-${PYSITELIB}/shapely/algorithms/cga.py
-${PYSITELIB}/shapely/algorithms/cga.pyc
-${PYSITELIB}/shapely/algorithms/cga.pyo
-${PYSITELIB}/shapely/coords.py
-${PYSITELIB}/shapely/coords.pyc
+${PYSITELIB}/shapely/affinity.pyc
 ${PYSITELIB}/shapely/coords.pyo
-${PYSITELIB}/shapely/ctypes_declarations.py
-${PYSITELIB}/shapely/ctypes_declarations.pyc
+${PYSITELIB}/shapely/coords.pyc
 ${PYSITELIB}/shapely/ctypes_declarations.pyo
-${PYSITELIB}/shapely/examples/__init__.py
-${PYSITELIB}/shapely/examples/__init__.pyc
-${PYSITELIB}/shapely/examples/__init__.pyo
-${PYSITELIB}/shapely/examples/dissolve.py
-${PYSITELIB}/shapely/examples/dissolve.pyc
-${PYSITELIB}/shapely/examples/dissolve.pyo
-${PYSITELIB}/shapely/examples/geoms.py
-${PYSITELIB}/shapely/examples/geoms.pyc
-${PYSITELIB}/shapely/examples/geoms.pyo
-${PYSITELIB}/shapely/examples/intersect.py
-${PYSITELIB}/shapely/examples/intersect.pyc
-${PYSITELIB}/shapely/examples/intersect.pyo
-${PYSITELIB}/shapely/examples/world.py
-${PYSITELIB}/shapely/examples/world.pyc
-${PYSITELIB}/shapely/examples/world.pyo
-${PYSITELIB}/shapely/ftools.py
-${PYSITELIB}/shapely/ftools.pyc
-${PYSITELIB}/shapely/ftools.pyo
-${PYSITELIB}/shapely/geometry/__init__.py
-${PYSITELIB}/shapely/geometry/__init__.pyc
-${PYSITELIB}/shapely/geometry/__init__.pyo
-${PYSITELIB}/shapely/geometry/base.py
-${PYSITELIB}/shapely/geometry/base.pyc
-${PYSITELIB}/shapely/geometry/base.pyo
-${PYSITELIB}/shapely/geometry/collection.py
-${PYSITELIB}/shapely/geometry/collection.pyc
-${PYSITELIB}/shapely/geometry/collection.pyo
-${PYSITELIB}/shapely/geometry/geo.py
-${PYSITELIB}/shapely/geometry/geo.pyc
-${PYSITELIB}/shapely/geometry/geo.pyo
-${PYSITELIB}/shapely/geometry/linestring.py
-${PYSITELIB}/shapely/geometry/linestring.pyc
-${PYSITELIB}/shapely/geometry/linestring.pyo
-${PYSITELIB}/shapely/geometry/multilinestring.py
-${PYSITELIB}/shapely/geometry/multilinestring.pyc
-${PYSITELIB}/shapely/geometry/multilinestring.pyo
-${PYSITELIB}/shapely/geometry/multipoint.py
-${PYSITELIB}/shapely/geometry/multipoint.pyc
-${PYSITELIB}/shapely/geometry/multipoint.pyo
-${PYSITELIB}/shapely/geometry/multipolygon.py
-${PYSITELIB}/shapely/geometry/multipolygon.pyc
-${PYSITELIB}/shapely/geometry/multipolygon.pyo
-${PYSITELIB}/shapely/geometry/point.py
-${PYSITELIB}/shapely/geometry/point.pyc
-${PYSITELIB}/shapely/geometry/point.pyo
-${PYSITELIB}/shapely/geometry/polygon.py
-${PYSITELIB}/shapely/geometry/polygon.pyc
-${PYSITELIB}/shapely/geometry/polygon.pyo
-${PYSITELIB}/shapely/geometry/proxy.py
-${PYSITELIB}/shapely/geometry/proxy.pyc
-${PYSITELIB}/shapely/geometry/proxy.pyo
-${PYSITELIB}/shapely/geos.py
-${PYSITELIB}/shapely/geos.pyc
+${PYSITELIB}/shapely/ctypes_declarations.pyc
+${PYSITELIB}/shapely/errors.pyo
+${PYSITELIB}/shapely/errors.pyc
 ${PYSITELIB}/shapely/geos.pyo
-${PYSITELIB}/shapely/impl.py
-${PYSITELIB}/shapely/impl.pyc
+${PYSITELIB}/shapely/geos.pyc
 ${PYSITELIB}/shapely/impl.pyo
-${PYSITELIB}/shapely/iterops.py
-${PYSITELIB}/shapely/iterops.pyc
+${PYSITELIB}/shapely/impl.pyc
 ${PYSITELIB}/shapely/iterops.pyo
-${PYSITELIB}/shapely/linref.py
-${PYSITELIB}/shapely/linref.pyc
+${PYSITELIB}/shapely/iterops.pyc
 ${PYSITELIB}/shapely/linref.pyo
-${PYSITELIB}/shapely/ops.py
-${PYSITELIB}/shapely/ops.pyc
+${PYSITELIB}/shapely/linref.pyc
 ${PYSITELIB}/shapely/ops.pyo
-${PYSITELIB}/shapely/predicates.py
-${PYSITELIB}/shapely/predicates.pyc
+${PYSITELIB}/shapely/ops.pyc
 ${PYSITELIB}/shapely/predicates.pyo
-${PYSITELIB}/shapely/prepared.py
-${PYSITELIB}/shapely/prepared.pyc
+${PYSITELIB}/shapely/predicates.pyc
 ${PYSITELIB}/shapely/prepared.pyo
-${PYSITELIB}/shapely/speedups/__init__.py
-${PYSITELIB}/shapely/speedups/__init__.pyc
-${PYSITELIB}/shapely/speedups/__init__.pyo
-${PYSITELIB}/shapely/speedups/_speedups.so
-${PYSITELIB}/shapely/tests/__init__.py
-${PYSITELIB}/shapely/tests/__init__.pyc
-${PYSITELIB}/shapely/tests/__init__.pyo
-${PYSITELIB}/shapely/tests/test_affinity.py
-${PYSITELIB}/shapely/tests/test_affinity.pyc
-${PYSITELIB}/shapely/tests/test_affinity.pyo
-${PYSITELIB}/shapely/tests/test_box.py
-${PYSITELIB}/shapely/tests/test_box.pyc
-${PYSITELIB}/shapely/tests/test_box.pyo
-${PYSITELIB}/shapely/tests/test_cga.py
-${PYSITELIB}/shapely/tests/test_cga.pyc
-${PYSITELIB}/shapely/tests/test_cga.pyo
-${PYSITELIB}/shapely/tests/test_collection.py
-${PYSITELIB}/shapely/tests/test_collection.pyc
-${PYSITELIB}/shapely/tests/test_collection.pyo
-${PYSITELIB}/shapely/tests/test_delegated.py
-${PYSITELIB}/shapely/tests/test_delegated.pyc
-${PYSITELIB}/shapely/tests/test_delegated.pyo
-${PYSITELIB}/shapely/tests/test_dlls.py
-${PYSITELIB}/shapely/tests/test_dlls.pyc
-${PYSITELIB}/shapely/tests/test_dlls.pyo
-${PYSITELIB}/shapely/tests/test_doctests.py
-${PYSITELIB}/shapely/tests/test_doctests.pyc
-${PYSITELIB}/shapely/tests/test_doctests.pyo
-${PYSITELIB}/shapely/tests/test_emptiness.py
-${PYSITELIB}/shapely/tests/test_emptiness.pyc
-${PYSITELIB}/shapely/tests/test_emptiness.pyo
-${PYSITELIB}/shapely/tests/test_equality.py
-${PYSITELIB}/shapely/tests/test_equality.pyc
-${PYSITELIB}/shapely/tests/test_equality.pyo
-${PYSITELIB}/shapely/tests/test_geointerface.py
-${PYSITELIB}/shapely/tests/test_geointerface.pyc
-${PYSITELIB}/shapely/tests/test_geointerface.pyo
-${PYSITELIB}/shapely/tests/test_geomseq.py
-${PYSITELIB}/shapely/tests/test_geomseq.pyc
-${PYSITELIB}/shapely/tests/test_geomseq.pyo
-${PYSITELIB}/shapely/tests/test_getitem.py
-${PYSITELIB}/shapely/tests/test_getitem.pyc
-${PYSITELIB}/shapely/tests/test_getitem.pyo
-${PYSITELIB}/shapely/tests/test_invalid_geometries.py
-${PYSITELIB}/shapely/tests/test_invalid_geometries.pyc
-${PYSITELIB}/shapely/tests/test_invalid_geometries.pyo
-${PYSITELIB}/shapely/tests/test_iterops.py
-${PYSITELIB}/shapely/tests/test_iterops.pyc
-${PYSITELIB}/shapely/tests/test_iterops.pyo
-${PYSITELIB}/shapely/tests/test_linear_referencing.py
-${PYSITELIB}/shapely/tests/test_linear_referencing.pyc
-${PYSITELIB}/shapely/tests/test_linear_referencing.pyo
-${PYSITELIB}/shapely/tests/test_linemerge.py
-${PYSITELIB}/shapely/tests/test_linemerge.pyc
-${PYSITELIB}/shapely/tests/test_linemerge.pyo
-${PYSITELIB}/shapely/tests/test_linestring.py
-${PYSITELIB}/shapely/tests/test_linestring.pyc
-${PYSITELIB}/shapely/tests/test_linestring.pyo
-${PYSITELIB}/shapely/tests/test_locale.py
-${PYSITELIB}/shapely/tests/test_locale.pyc
-${PYSITELIB}/shapely/tests/test_locale.pyo
-${PYSITELIB}/shapely/tests/test_mapping.py
-${PYSITELIB}/shapely/tests/test_mapping.pyc
-${PYSITELIB}/shapely/tests/test_mapping.pyo
-${PYSITELIB}/shapely/tests/test_multilinestring.py
-${PYSITELIB}/shapely/tests/test_multilinestring.pyc
-${PYSITELIB}/shapely/tests/test_multilinestring.pyo
-${PYSITELIB}/shapely/tests/test_multipoint.py
-${PYSITELIB}/shapely/tests/test_multipoint.pyc
-${PYSITELIB}/shapely/tests/test_multipoint.pyo
-${PYSITELIB}/shapely/tests/test_multipolygon.py
-${PYSITELIB}/shapely/tests/test_multipolygon.pyc
-${PYSITELIB}/shapely/tests/test_multipolygon.pyo
-${PYSITELIB}/shapely/tests/test_ndarrays.py
-${PYSITELIB}/shapely/tests/test_ndarrays.pyc
-${PYSITELIB}/shapely/tests/test_ndarrays.pyo
-${PYSITELIB}/shapely/tests/test_operations.py
-${PYSITELIB}/shapely/tests/test_operations.pyc
-${PYSITELIB}/shapely/tests/test_operations.pyo
-${PYSITELIB}/shapely/tests/test_operators.py
-${PYSITELIB}/shapely/tests/test_operators.pyc
-${PYSITELIB}/shapely/tests/test_operators.pyo
-${PYSITELIB}/shapely/tests/test_persist.py
-${PYSITELIB}/shapely/tests/test_persist.pyc
-${PYSITELIB}/shapely/tests/test_persist.pyo
-${PYSITELIB}/shapely/tests/test_pickle.py
-${PYSITELIB}/shapely/tests/test_pickle.pyc
-${PYSITELIB}/shapely/tests/test_pickle.pyo
-${PYSITELIB}/shapely/tests/test_point.py
-${PYSITELIB}/shapely/tests/test_point.pyc
-${PYSITELIB}/shapely/tests/test_point.pyo
-${PYSITELIB}/shapely/tests/test_polygon.py
-${PYSITELIB}/shapely/tests/test_polygon.pyc
-${PYSITELIB}/shapely/tests/test_polygon.pyo
-${PYSITELIB}/shapely/tests/test_polygonize.py
-${PYSITELIB}/shapely/tests/test_polygonize.pyc
-${PYSITELIB}/shapely/tests/test_polygonize.pyo
-${PYSITELIB}/shapely/tests/test_predicates.py
-${PYSITELIB}/shapely/tests/test_predicates.pyc
-${PYSITELIB}/shapely/tests/test_predicates.pyo
-${PYSITELIB}/shapely/tests/test_prepared.py
-${PYSITELIB}/shapely/tests/test_prepared.pyc
-${PYSITELIB}/shapely/tests/test_prepared.pyo
-${PYSITELIB}/shapely/tests/test_products_z.py
-${PYSITELIB}/shapely/tests/test_products_z.pyc
-${PYSITELIB}/shapely/tests/test_products_z.pyo
-${PYSITELIB}/shapely/tests/test_singularity.py
-${PYSITELIB}/shapely/tests/test_singularity.pyc
-${PYSITELIB}/shapely/tests/test_singularity.pyo
-${PYSITELIB}/shapely/tests/test_speedups.py
-${PYSITELIB}/shapely/tests/test_speedups.pyc
-${PYSITELIB}/shapely/tests/test_speedups.pyo
-${PYSITELIB}/shapely/tests/test_styles.py
-${PYSITELIB}/shapely/tests/test_styles.pyc
-${PYSITELIB}/shapely/tests/test_styles.pyo
-${PYSITELIB}/shapely/tests/test_transform.py
-${PYSITELIB}/shapely/tests/test_transform.pyc
-${PYSITELIB}/shapely/tests/test_transform.pyo
-${PYSITELIB}/shapely/tests/test_union.py
-${PYSITELIB}/shapely/tests/test_union.pyc
-${PYSITELIB}/shapely/tests/test_union.pyo
-${PYSITELIB}/shapely/tests/test_validation.py
-${PYSITELIB}/shapely/tests/test_validation.pyc
-${PYSITELIB}/shapely/tests/test_validation.pyo
-${PYSITELIB}/shapely/tests/test_xy.py
-${PYSITELIB}/shapely/tests/test_xy.pyc
-${PYSITELIB}/shapely/tests/test_xy.pyo
-${PYSITELIB}/shapely/tests/threading_test.py
-${PYSITELIB}/shapely/tests/threading_test.pyc
-${PYSITELIB}/shapely/tests/threading_test.pyo
-${PYSITELIB}/shapely/topology.py
-${PYSITELIB}/shapely/topology.pyc
+${PYSITELIB}/shapely/prepared.pyc
+${PYSITELIB}/shapely/strtree.pyo
+${PYSITELIB}/shapely/strtree.pyc
 ${PYSITELIB}/shapely/topology.pyo
-${PYSITELIB}/shapely/validation.py
-${PYSITELIB}/shapely/validation.pyc
+${PYSITELIB}/shapely/topology.pyc
 ${PYSITELIB}/shapely/validation.pyo
-${PYSITELIB}/shapely/wkb.py
-${PYSITELIB}/shapely/wkb.pyc
+${PYSITELIB}/shapely/validation.pyc
 ${PYSITELIB}/shapely/wkb.pyo
-${PYSITELIB}/shapely/wkt.py
-${PYSITELIB}/shapely/wkt.pyc
+${PYSITELIB}/shapely/wkb.pyc
 ${PYSITELIB}/shapely/wkt.pyo
-share/doc/py-shapely/manual.txt
+${PYSITELIB}/shapely/wkt.pyc
+${PYSITELIB}/shapely/_buildcfg.py
+${PYSITELIB}/shapely/_geos.pxi
+${PYSITELIB}/shapely/affinity.py
+${PYSITELIB}/shapely/algorithms/__init__.py
+${PYSITELIB}/shapely/algorithms/__init__.pyo
+${PYSITELIB}/shapely/algorithms/__init__.pyc
+${PYSITELIB}/shapely/algorithms/cga.pyo
+${PYSITELIB}/shapely/algorithms/cga.pyc
+${PYSITELIB}/shapely/algorithms/polylabel.pyo
+${PYSITELIB}/shapely/algorithms/polylabel.pyc
+${PYSITELIB}/shapely/algorithms/cga.py
+${PYSITELIB}/shapely/algorithms/polylabel.py
+${PYSITELIB}/shapely/coords.py
+${PYSITELIB}/shapely/ctypes_declarations.py
+${PYSITELIB}/shapely/errors.py
+${PYSITELIB}/shapely/examples/__init__.py
+${PYSITELIB}/shapely/examples/__init__.pyo
+${PYSITELIB}/shapely/examples/__init__.pyc
+${PYSITELIB}/shapely/examples/dissolve.pyo
+${PYSITELIB}/shapely/examples/dissolve.pyc
+${PYSITELIB}/shapely/examples/geoms.pyo
+${PYSITELIB}/shapely/examples/geoms.pyc
+${PYSITELIB}/shapely/examples/intersect.pyo
+${PYSITELIB}/shapely/examples/intersect.pyc
+${PYSITELIB}/shapely/examples/dissolve.py
+${PYSITELIB}/shapely/examples/geoms.py
+${PYSITELIB}/shapely/examples/intersect.py
+${PYSITELIB}/shapely/geometry/__init__.py
+${PYSITELIB}/shapely/geometry/__init__.pyo
+${PYSITELIB}/shapely/geometry/__init__.pyc
+${PYSITELIB}/shapely/geometry/base.pyo
+${PYSITELIB}/shapely/geometry/base.pyc
+${PYSITELIB}/shapely/geometry/collection.pyo
+${PYSITELIB}/shapely/geometry/collection.pyc
+${PYSITELIB}/shapely/geometry/geo.pyo
+${PYSITELIB}/shapely/geometry/geo.pyc
+${PYSITELIB}/shapely/geometry/linestring.pyo
+${PYSITELIB}/shapely/geometry/linestring.pyc
+${PYSITELIB}/shapely/geometry/multilinestring.pyo
+${PYSITELIB}/shapely/geometry/multilinestring.pyc
+${PYSITELIB}/shapely/geometry/multipoint.pyo
+${PYSITELIB}/shapely/geometry/multipoint.pyc
+${PYSITELIB}/shapely/geometry/multipolygon.pyo
+${PYSITELIB}/shapely/geometry/multipolygon.pyc
+${PYSITELIB}/shapely/geometry/point.pyo
+${PYSITELIB}/shapely/geometry/point.pyc
+${PYSITELIB}/shapely/geometry/polygon.pyo
+${PYSITELIB}/shapely/geometry/polygon.pyc
+${PYSITELIB}/shapely/geometry/proxy.pyo
+${PYSITELIB}/shapely/geometry/proxy.pyc
+${PYSITELIB}/shapely/geometry/base.py
+${PYSITELIB}/shapely/geometry/collection.py
+${PYSITELIB}/shapely/geometry/geo.py
+${PYSITELIB}/shapely/geometry/linestring.py
+${PYSITELIB}/shapely/geometry/multilinestring.py
+${PYSITELIB}/shapely/geometry/multipoint.py
+${PYSITELIB}/shapely/geometry/multipolygon.py
+${PYSITELIB}/shapely/geometry/point.py
+${PYSITELIB}/shapely/geometry/polygon.py
+${PYSITELIB}/shapely/geometry/proxy.py
+${PYSITELIB}/shapely/geos.py
+${PYSITELIB}/shapely/impl.py
+${PYSITELIB}/shapely/iterops.py
+${PYSITELIB}/shapely/linref.py
+${PYSITELIB}/shapely/ops.py
+${PYSITELIB}/shapely/predicates.py
+${PYSITELIB}/shapely/prepared.py
+${PYSITELIB}/shapely/speedups/__init__.py
+${PYSITELIB}/shapely/speedups/__init__.pyo
+${PYSITELIB}/shapely/speedups/__init__.pyc
+${PYSITELIB}/shapely/speedups/_speedups.c
+${PYSITELIB}/shapely/speedups/_speedups.pyx
+${PYSITELIB}/shapely/strtree.py
+${PYSITELIB}/shapely/topology.py
+${PYSITELIB}/shapely/validation.py
+${PYSITELIB}/shapely/vectorized/__init__.py
+${PYSITELIB}/shapely/vectorized/__init__.pyo
+${PYSITELIB}/shapely/vectorized/__init__.pyc
+${PYSITELIB}/shapely/vectorized/_vectorized.c
+${PYSITELIB}/shapely/vectorized/_vectorized.pyx
+${PYSITELIB}/shapely/wkb.py
+${PYSITELIB}/shapely/wkt.py
+share/doc/py-shapely/manual.rst
diff --git a/py-shapely/distinfo b/py-shapely/distinfo
index 4dc08a148c..a848741dc3 100644
--- a/py-shapely/distinfo
+++ b/py-shapely/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.4 2014/06/20 10:40:28 jihbed Exp $
 
-SHA1 (Shapely-1.3.2.tar.gz) = 57ba373a0c9127c4e0a442c125e7673f2b77772a
-RMD160 (Shapely-1.3.2.tar.gz) = 679ba67e2268081b5c100d3ee3245681c0634afb
-Size (Shapely-1.3.2.tar.gz) = 120179 bytes
+SHA1 (Shapely-1.7.0.tar.gz) = 4fc1aa753c7bdacef71816c385a187b1cbfc22f8
+RMD160 (Shapely-1.7.0.tar.gz) = e8d1a60b020ddaa7ed7d1accf3915557cb5a68ba
+SHA512 (Shapely-1.7.0.tar.gz) = ff7a14f20c05e3949c1e689175b80ec1f8248a0f45370a6313dbf4319ec018a8fafcfd171efbaa81bd8ceaab9c54488feca61bb03067e22a275da2b8663dc8bc
+Size (Shapely-1.7.0.tar.gz) = 349089 bytes