CVS commit: [pkgsrc-2016Q3] pkgsrc/devel/py-logilab-astng

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Oct  1 14:37:08 UTC 2016

Modified Files:
        pkgsrc/devel/py-logilab-astng [pkgsrc-2016Q3]: Makefile distinfo
        pkgsrc/devel/py-logilab-astng/patches [pkgsrc-2016Q3]: patch-aa

Log Message:
Pullup ticket #5113 - requested by joerg
devel/py-logilab-astng: build fix

Revisions pulled up:
- devel/py-logilab-astng/Makefile                               1.14
- devel/py-logilab-astng/distinfo                               1.4
- devel/py-logilab-astng/patches/patch-aa                       1.3

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Sat Oct  1 13:00:10 UTC 2016

   Modified Files:
        pkgsrc/devel/py-logilab-astng: Makefile distinfo
        pkgsrc/devel/py-logilab-astng/patches: patch-aa

   Log Message:
   Fix 2to3 invocation.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 pkgsrc/devel/py-logilab-astng/Makefile
cvs rdiff -u -r1.3 -r1.3.8.1 pkgsrc/devel/py-logilab-astng/distinfo
cvs rdiff -u -r1.2 -r1.2.16.1 pkgsrc/devel/py-logilab-astng/patches/patch-aa

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

Modified files:

Index: pkgsrc/devel/py-logilab-astng/Makefile
diff -u pkgsrc/devel/py-logilab-astng/Makefile:1.13 pkgsrc/devel/py-logilab-astng/Makefile:1.13.2.1
--- pkgsrc/devel/py-logilab-astng/Makefile:1.13 Mon Aug 29 15:44:26 2016
+++ pkgsrc/devel/py-logilab-astng/Makefile      Sat Oct  1 14:37:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/29 15:44:26 darcy Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2016/10/01 14:37:08 bsiegert Exp $
 
 DISTNAME=      logilab-astng-0.24.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,6 +14,8 @@ DEPENDS+=     ${PYPKGPREFIX}-logilab-common>
 
 USE_LANGUAGES= # none
 
+ALL_ENV+=      PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+
 do-test:
        cd ${WRKSRC} && ${SH} test/fulltest.sh ${PYVERSSUFFIX}
 

Index: pkgsrc/devel/py-logilab-astng/distinfo
diff -u pkgsrc/devel/py-logilab-astng/distinfo:1.3 pkgsrc/devel/py-logilab-astng/distinfo:1.3.8.1
--- pkgsrc/devel/py-logilab-astng/distinfo:1.3  Tue Nov  3 03:29:10 2015
+++ pkgsrc/devel/py-logilab-astng/distinfo      Sat Oct  1 14:37:08 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 03:29:10 agc Exp $
+$NetBSD: distinfo,v 1.3.8.1 2016/10/01 14:37:08 bsiegert Exp $
 
 SHA1 (logilab-astng-0.24.3.tar.gz) = a4a155008fa9955f2034972f2bfd91228e1c87de
 RMD160 (logilab-astng-0.24.3.tar.gz) = 8c5627208b2bd365a8313f7aa9e3af38985152fd
 SHA512 (logilab-astng-0.24.3.tar.gz) = fb1e46ebf7111d727cd9d187968cb349dc23dfba0d4d8c6c793a8c081d4506f11e488074cc51b632c525aa264cfa50279dda90f0cf35dc2120ebbf4714902525
 Size (logilab-astng-0.24.3.tar.gz) = 106660 bytes
-SHA1 (patch-aa) = b82835ac2b2136eddc4c5ce24ee1d1bb52ea02d5
+SHA1 (patch-aa) = dd61d88f06b06aa16a11fff4bd2cb14da62b26f6

Index: pkgsrc/devel/py-logilab-astng/patches/patch-aa
diff -u pkgsrc/devel/py-logilab-astng/patches/patch-aa:1.2 pkgsrc/devel/py-logilab-astng/patches/patch-aa:1.2.16.1
--- pkgsrc/devel/py-logilab-astng/patches/patch-aa:1.2  Fri Dec  5 17:20:56 2014
+++ pkgsrc/devel/py-logilab-astng/patches/patch-aa      Sat Oct  1 14:37:08 2016
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2014/12/05 17:20:56 rodent Exp $
+$NetBSD: patch-aa,v 1.2.16.1 2016/10/01 14:37:08 bsiegert Exp $
 
 Don't creat this file for pkgsrc.
+Call versioned 2to3 binary.
 
 --- setup.py.orig      2013-04-17 09:38:31.000000000 +0000
 +++ setup.py
@@ -19,3 +20,12 @@ Don't creat this file for pkgsrc.
  
  
  class MyBuildPy(build_py):
+@@ -140,7 +132,7 @@ class MyBuildPy(build_py):
+                     # process manually python file in include_dirs (test data)
+                     from subprocess import check_call
+                     print('running 2to3 on', dest) # parens are NOT optional here for py3k compat
+-                    check_call(['2to3', '-wn', dest])
++                    check_call(['2to3-' + os.environ['PYVERSSUFFIX'], '-wn', dest])
+ 
+ def install(**kwargs):
+     """setup entry point"""