CVS commit: pkgsrc/www/py-sparqlwrapper

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Dec  6 14:14:35 UTC 2021

Modified Files:
        pkgsrc/www/py-sparqlwrapper: Makefile distinfo
        pkgsrc/www/py-sparqlwrapper/patches: patch-setup.py

Log Message:
py-sparqlwrapper: fix build with latest setuptools


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/py-sparqlwrapper/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-sparqlwrapper/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-sparqlwrapper/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/www/py-sparqlwrapper/Makefile
diff -u pkgsrc/www/py-sparqlwrapper/Makefile:1.9 pkgsrc/www/py-sparqlwrapper/Makefile:1.10
--- pkgsrc/www/py-sparqlwrapper/Makefile:1.9    Wed May  5 09:54:42 2021
+++ pkgsrc/www/py-sparqlwrapper/Makefile        Mon Dec  6 14:14:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/05/05 09:54:42 adam Exp $
+# $NetBSD: Makefile,v 1.10 2021/12/06 14:14:35 wiz Exp $
 
 DISTNAME=      SPARQLWrapper-1.8.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -16,5 +16,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-networkx via py-rdflib
 
+post-extract:
+       cd ${WRKSRC} && 2to3-${PYVERSSUFFIX} -w --no-diffs SPARQLWrapper
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-sparqlwrapper/distinfo
diff -u pkgsrc/www/py-sparqlwrapper/distinfo:1.7 pkgsrc/www/py-sparqlwrapper/distinfo:1.8
--- pkgsrc/www/py-sparqlwrapper/distinfo:1.7    Tue Oct 26 11:30:48 2021
+++ pkgsrc/www/py-sparqlwrapper/distinfo        Mon Dec  6 14:14:35 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:30:48 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/12/06 14:14:35 wiz Exp $
 
 BLAKE2s (SPARQLWrapper-1.8.5.tar.gz) = 0da51c5a997da20da0b3b0ba7ec02667eca4135dfd8ab4cfd9c00d079bd98e91
 SHA512 (SPARQLWrapper-1.8.5.tar.gz) = b0cbe9f7f13a8a0a1c88a17b5966b46e7811acada2712ee03be97808dcb17ba4a71990c07df5d213d21815d7deaf3526381a2cc864d839e561e242be797b6bb2
 Size (SPARQLWrapper-1.8.5.tar.gz) = 89117 bytes
-SHA1 (patch-setup.py) = 86a25a988bd419ee276de2cd865b59acf843c212
+SHA1 (patch-setup.py) = 72fbace7f2d276b274557d74aaef71e2e34ea487

Index: pkgsrc/www/py-sparqlwrapper/patches/patch-setup.py
diff -u pkgsrc/www/py-sparqlwrapper/patches/patch-setup.py:1.1 pkgsrc/www/py-sparqlwrapper/patches/patch-setup.py:1.2
--- pkgsrc/www/py-sparqlwrapper/patches/patch-setup.py:1.1      Wed May  5 09:54:42 2021
+++ pkgsrc/www/py-sparqlwrapper/patches/patch-setup.py  Mon Dec  6 14:14:35 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-setup.py,v 1.1 2021/05/05 09:54:42 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2021/12/06 14:14:35 wiz Exp $
 
-Fix for Python 3.6.
+Fix for Python 3.6 and latest setuptools.
 
---- setup.py.orig      2021-05-05 09:39:48.000000000 +0000
+--- setup.py.orig      2019-04-18 10:02:26.000000000 +0000
 +++ setup.py
 @@ -23,7 +23,7 @@ _version_re = re.compile(r'__version__\s
  _authors_re = re.compile(r'__authors__\s*=\s*"(.*)"')
@@ -13,3 +13,12 @@ Fix for Python 3.6.
  
      version_match = _version_re.match(line)
      if version_match:
+@@ -75,8 +75,6 @@ setup(
+         'Topic :: Software Development :: Libraries :: Python Modules',
+       ],
+       keywords = ['python', 'sparql', 'rdf', 'rdflib'],
+-      use_2to3 = True,
+-      use_2to3_fixers = ['custom_fixers'],
+       project_urls={
+         'Home': 'https://rdflib.github.io/sparqlwrapper/',
+         'Documentation': 'https://rdflib.github.io/sparqlwrapper/doc/',