CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan  1 17:31:36 UTC 2022

Modified Files:
        pkgsrc/devel/py-gflags: Makefile PLIST
        pkgsrc/www/py-google-apitools: Makefile

Log Message:
py-gflags: convert to egg.mk

Disable python 2.7 version, which would need a hack.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-gflags/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-gflags/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-google-apitools/Makefile

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-gflags/Makefile
diff -u pkgsrc/devel/py-gflags/Makefile:1.10 pkgsrc/devel/py-gflags/Makefile:1.11
--- pkgsrc/devel/py-gflags/Makefile:1.10        Sun Nov  3 10:18:27 2019
+++ pkgsrc/devel/py-gflags/Makefile     Sat Jan  1 17:31:36 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2019/11/03 10:18:27 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/01 17:31:36 wiz Exp $
 
 DISTNAME=      python-gflags-3.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-gflags/}
 
@@ -11,15 +11,15 @@ HOMEPAGE=   https://github.com/google/pyth
 COMMENT=       Python equivalent of gflags, a commandline flag implementation
 LICENSE=       modified-bsd
 
-REPLACE_PYTHON+=       *.py
-PYDISTUTILSPKG=                yes
-
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
+REPLACE_PYTHON+=               *.py
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/gflags2man.py ${DESTDIR}${PREFIX}/bin/gflags2man${PYVERSSUFFIX}.py 
        ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/gflags2man${PYVERSSUFFIX}.py 
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-gflags/PLIST
diff -u pkgsrc/devel/py-gflags/PLIST:1.4 pkgsrc/devel/py-gflags/PLIST:1.5
--- pkgsrc/devel/py-gflags/PLIST:1.4    Thu May 31 20:07:00 2018
+++ pkgsrc/devel/py-gflags/PLIST        Sat Jan  1 17:31:36 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/05/31 20:07:00 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/01/01 17:31:36 wiz Exp $
 bin/gflags2man${PYVERSSUFFIX}.py
 ${PYSITELIB}/gflags/__init__.py
 ${PYSITELIB}/gflags/__init__.pyc
@@ -36,4 +36,7 @@ ${PYSITELIB}/gflags/third_party/pep257/_
 ${PYSITELIB}/gflags/validators.py
 ${PYSITELIB}/gflags/validators.pyc
 ${PYSITELIB}/gflags/validators.pyo
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt

Index: pkgsrc/www/py-google-apitools/Makefile
diff -u pkgsrc/www/py-google-apitools/Makefile:1.7 pkgsrc/www/py-google-apitools/Makefile:1.8
--- pkgsrc/www/py-google-apitools/Makefile:1.7  Thu May  6 04:49:56 2021
+++ pkgsrc/www/py-google-apitools/Makefile      Sat Jan  1 17:31:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/05/06 04:49:56 adam Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/01 17:31:36 wiz Exp $
 
 DISTNAME=      google-apitools-0.5.32
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-six>=1.12.0:../
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=1.0.1:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-gflags
+
 USE_LANGUAGES= # none
 
 post-install: