CVS commit: pkgsrc/www/py-pystache

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

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

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-pystache/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/py-pystache/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/py-pystache/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-pystache/Makefile
diff -u pkgsrc/www/py-pystache/Makefile:1.2 pkgsrc/www/py-pystache/Makefile:1.3
--- pkgsrc/www/py-pystache/Makefile:1.2 Sun Jul 30 22:32:27 2017
+++ pkgsrc/www/py-pystache/Makefile     Mon Dec  6 14:17:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/07/30 22:32:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/06 14:17:03 wiz Exp $
 
 DISTNAME=      pystache-0.5.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,6 +12,9 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+post-extract:
+       cd ${WRKSRC} && 2to3-${PYVERSSUFFIX} -w --no-diffs pystache
+
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} test_pystache.py
 

Index: pkgsrc/www/py-pystache/distinfo
diff -u pkgsrc/www/py-pystache/distinfo:1.3 pkgsrc/www/py-pystache/distinfo:1.4
--- pkgsrc/www/py-pystache/distinfo:1.3 Tue Oct 26 11:30:45 2021
+++ pkgsrc/www/py-pystache/distinfo     Mon Dec  6 14:17:03 2021
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:30:45 nia Exp $
+$NetBSD: distinfo,v 1.4 2021/12/06 14:17:03 wiz Exp $
 
 BLAKE2s (pystache-0.5.4.tar.gz) = 5dd976b9ed5fb277d5cb8385fa57e5b4d3d792d83ae3eaba5da8464a6ecce2b9
 SHA512 (pystache-0.5.4.tar.gz) = 4ac325e1431f58f740218c9ec309821db82d89989ef4ca7fc3536dea0ef1c90e8e85ebaa7df27f33129ca02252b84bcbd7429a1ed999b496f62f174dd66502cb
 Size (pystache-0.5.4.tar.gz) = 75131 bytes
+SHA1 (patch-setup.py) = 401a8d1196a0f0bd870c833671494de9a3902d97

Added files:

Index: pkgsrc/www/py-pystache/patches/patch-setup.py
diff -u /dev/null pkgsrc/www/py-pystache/patches/patch-setup.py:1.1
--- /dev/null   Mon Dec  6 14:17:03 2021
+++ pkgsrc/www/py-pystache/patches/patch-setup.py       Mon Dec  6 14:17:03 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-setup.py,v 1.1 2021/12/06 14:17:03 wiz Exp $
+
+Fix build with latest setuptools.
+
+--- setup.py.orig      2014-05-12 12:15:34.000000000 +0000
++++ setup.py
+@@ -351,12 +351,6 @@ def get_extra_args():
+ 
+     """
+     extra = {}
+-    # TODO: it might be more correct to check whether we are using
+-    #   Distribute instead of setuptools, since use_2to3 doesn't take
+-    #   effect when using Python 2, even when using Distribute.
+-    if py_version >= (3, ):
+-        # Causes 2to3 to be run during the build step.
+-        extra['use_2to3'] = True
+ 
+     return extra
+