[pkgsrc/trunk]: pkgsrc/devel/py-typed-ast py-typed-ast: fix building conflict...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6eaefeb30603
branches:  trunk
changeset: 380784:6eaefeb30603
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue May 22 06:41:30 2018 +0000

description:
py-typed-ast: fix building conflicts; require Python 3.3+; switch to PyPi

diffstat:

 devel/py-typed-ast/Makefile               |  25 ++++++++++++++++++-------
 devel/py-typed-ast/distinfo               |  11 ++++++-----
 devel/py-typed-ast/patches/patch-setup.py |  25 +++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 12 deletions(-)

diffs (83 lines):

diff -r df014e40973d -r 6eaefeb30603 devel/py-typed-ast/Makefile
--- a/devel/py-typed-ast/Makefile       Tue May 22 00:25:28 2018 +0000
+++ b/devel/py-typed-ast/Makefile       Tue May 22 06:41:30 2018 +0000
@@ -1,16 +1,27 @@
-# $NetBSD: Makefile,v 1.1 2018/05/21 23:14:46 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/22 06:41:30 adam Exp $
 
-DISTNAME=      typed_ast-1.1.0
-PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
+DISTNAME=      typed-ast-1.1.0
+PKGREVISION=   1
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=python/}
-GITHUB_PROJECT=        typed_ast
-GITHUB_TAG=    ${PKGVERSION_NOREV}
+MASTER_SITES=  ${MASTER_SITE_PYPI:=t/typed-ast/}
 
 MAINTAINER=    minskim%NetBSD.org@localhost
-HOMEPAGE=      http://mypy-lang.org/
+HOMEPAGE=      https://github.com/python/typed_ast
 COMMENT=       Optional static typing for Python
 LICENSE=       apache-2.0 AND python-software-foundation
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+SUBST_CLASSES+=                fix-incl
+SUBST_STAGE.fix-incl=  pre-configure
+SUBST_MESSAGE.fix-incl=        Make includes more specific to avoid conflicts.
+SUBST_FILES.fix-incl=  ast27/*/*.[ch]
+SUBST_FILES.fix-incl+= ast3/*/*.[ch]
+.for f in Python-ast.h asdl.h ast.h bitset.h compile.h errcode.h graminit.h \
+       grammar.h node.h parsetok.h token.h
+SUBST_SED.fix-incl+=   -e 's,^\#include "${f}",\#include "Include/${f}",'
+.endfor
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r df014e40973d -r 6eaefeb30603 devel/py-typed-ast/distinfo
--- a/devel/py-typed-ast/distinfo       Tue May 22 00:25:28 2018 +0000
+++ b/devel/py-typed-ast/distinfo       Tue May 22 06:41:30 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/05/21 23:14:46 minskim Exp $
+$NetBSD: distinfo,v 1.2 2018/05/22 06:41:30 adam Exp $
 
-SHA1 (typed_ast-1.1.0.tar.gz) = 5c4404d20c1312c37ebe6ee37b02ab950dfe0afb
-RMD160 (typed_ast-1.1.0.tar.gz) = bcf11e8b46c9e1b3a50de9e950d651fbed4f0275
-SHA512 (typed_ast-1.1.0.tar.gz) = 1cde519f6cde535f436066a7f9a78ba9d416457abe995b019b76e49d644ac101a95aa82f6305d762731593648c0faee600e667240baa63a40f36bbfd4ca1bd1f
-Size (typed_ast-1.1.0.tar.gz) = 285167 bytes
+SHA1 (typed-ast-1.1.0.tar.gz) = f9af98899e39661a44296e2ced8de9c5f5187fde
+RMD160 (typed-ast-1.1.0.tar.gz) = 0b5c87b0360d7268ff407bfc18171c6e256343d1
+SHA512 (typed-ast-1.1.0.tar.gz) = 439e949082ee5cb9434fec99021c08401a46ec2ad16d96296c6440aa1fd8158f6605efbdfa55e536c3fddd4018bb0f4c5ee4d5a4a32954242b7902b9ce3463f2
+Size (typed-ast-1.1.0.tar.gz) = 200587 bytes
+SHA1 (patch-setup.py) = 997fc582f7b9e9e068fa8d6d5760acfe792554f2
diff -r df014e40973d -r 6eaefeb30603 devel/py-typed-ast/patches/patch-setup.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-typed-ast/patches/patch-setup.py Tue May 22 06:41:30 2018 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-setup.py,v 1.1 2018/05/22 06:41:30 adam Exp $
+
+Point to a parent directory, to distinguish includes from
+the ones currenly installed with Python.
+
+--- setup.py.orig      2017-07-18 21:23:52.000000000 +0000
++++ setup.py
+@@ -9,7 +9,7 @@ except ImportError:
+ 
+ _ast27 = Extension(
+     '_ast27',
+-    include_dirs = ['ast27/Include'],
++    include_dirs = ['ast27'],
+     sources = [
+         'ast27/Parser/acceler.c',
+         'ast27/Parser/bitset.c',
+@@ -45,7 +45,7 @@ _ast27 = Extension(
+ 
+ _ast3 = Extension(
+     '_ast3',
+-    include_dirs = ['ast3/Include'],
++    include_dirs = ['ast3'],
+     sources = [
+         'ast3/Parser/acceler.c',
+         'ast3/Parser/bitset.c',