CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 1 Jan 2022 21:21:42 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan  1 21:21:41 UTC 2022

Modified Files:
        pkgsrc/devel/py-pep517: Makefile PLIST
        pkgsrc/devel/py-stem: Makefile PLIST
        pkgsrc/devel/py-tortoisehg: Makefile PLIST
        pkgsrc/devel/py-traitlets4: Makefile PLIST
        pkgsrc/net/py-nyx: Makefile

Log Message:
*: convert more to egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-pep517/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-pep517/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-stem/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-stem/PLIST
cvs rdiff -u -r1.78 -r1.79 pkgsrc/devel/py-tortoisehg/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-tortoisehg/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-traitlets4/Makefile \
    pkgsrc/devel/py-traitlets4/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-nyx/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-pep517/Makefile
diff -u pkgsrc/devel/py-pep517/Makefile:1.5 pkgsrc/devel/py-pep517/Makefile:1.6
--- pkgsrc/devel/py-pep517/Makefile:1.5 Tue Oct 26 17:13:01 2021
+++ pkgsrc/devel/py-pep517/Makefile     Sat Jan  1 21:21:41 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2021/10/26 17:13:01 adam Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/01 21:21:41 wiz Exp $
 
 DISTNAME=      pep517-0.12.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pep517/}
 
@@ -19,5 +20,10 @@ USE_LANGUAGES=       # none
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+ 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-pep517/PLIST
diff -u pkgsrc/devel/py-pep517/PLIST:1.2 pkgsrc/devel/py-pep517/PLIST:1.3
--- pkgsrc/devel/py-pep517/PLIST:1.2    Mon Mar 15 12:08:11 2021
+++ pkgsrc/devel/py-pep517/PLIST        Sat Jan  1 21:21:41 2022
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2021/03/15 12:08:11 adam Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.3 2022/01/01 21:21:41 wiz Exp $
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pep517/__init__.py
 ${PYSITELIB}/pep517/__init__.pyc
 ${PYSITELIB}/pep517/__init__.pyo

Index: pkgsrc/devel/py-stem/Makefile
diff -u pkgsrc/devel/py-stem/Makefile:1.4 pkgsrc/devel/py-stem/Makefile:1.5
--- pkgsrc/devel/py-stem/Makefile:1.4   Thu Jan 30 23:32:23 2020
+++ pkgsrc/devel/py-stem/Makefile       Sat Jan  1 21:21:41 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2020/01/30 23:32:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/01 21:21:41 wiz Exp $
 
 DISTNAME=      stem-1.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/stem/}
 
@@ -28,9 +29,11 @@ REPLACE_PYTHON+=     run_tests.py
 REPLACE_PYTHON+=       setup.py
 REPLACE_PYTHON+=       tor-prompt
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 do-test:
        cd ${WRKSRC} && ./run_tests.py --unit
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-stem/PLIST
diff -u pkgsrc/devel/py-stem/PLIST:1.2 pkgsrc/devel/py-stem/PLIST:1.3
--- pkgsrc/devel/py-stem/PLIST:1.2      Thu Jan 30 23:32:23 2020
+++ pkgsrc/devel/py-stem/PLIST  Sat Jan  1 21:21:41 2022
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2020/01/30 23:32:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/01/01 21:21:41 wiz Exp $
 bin/tor-prompt
-${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
 ${PYSITELIB}/stem/__init__.py
 ${PYSITELIB}/stem/__init__.pyc
 ${PYSITELIB}/stem/__init__.pyo

Index: pkgsrc/devel/py-tortoisehg/Makefile
diff -u pkgsrc/devel/py-tortoisehg/Makefile:1.78 pkgsrc/devel/py-tortoisehg/Makefile:1.79
--- pkgsrc/devel/py-tortoisehg/Makefile:1.78    Tue Dec 21 17:17:20 2021
+++ pkgsrc/devel/py-tortoisehg/Makefile Sat Jan  1 21:21:41 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2021/12/21 17:17:20 nros Exp $
+# $NetBSD: Makefile,v 1.79 2022/01/01 21:21:41 wiz Exp $
 
 DISTNAME=              tortoisehg-6.0
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            devel python
 MASTER_SITES=          https://www.mercurial-scm.org/release/tortoisehg/targz/
 
@@ -45,7 +46,12 @@ post-install:
        cd ${WRKSRC}/doc/build && ${PAX} -pp -rw html ${DESTDIR}${PREFIX}/share/doc/tortoisehg
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+ 
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/py-qt5-qscintilla/buildlink3.mk"

Index: pkgsrc/devel/py-tortoisehg/PLIST
diff -u pkgsrc/devel/py-tortoisehg/PLIST:1.20 pkgsrc/devel/py-tortoisehg/PLIST:1.21
--- pkgsrc/devel/py-tortoisehg/PLIST:1.20       Thu May 20 09:32:37 2021
+++ pkgsrc/devel/py-tortoisehg/PLIST    Sat Jan  1 21:21:41 2022
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.20 2021/05/20 09:32:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2022/01/01 21:21:41 wiz Exp $
 bin/thg
 ${PYSITELIB}/hgext3rd/thg.py
 ${PYSITELIB}/hgext3rd/thg.pyc
 ${PYSITELIB}/hgext3rd/thg.pyo
-${PYSITELIB}/${EGG_FILE}
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/tortoisehg/__init__.py
 ${PYSITELIB}/tortoisehg/__init__.pyc
 ${PYSITELIB}/tortoisehg/__init__.pyo

Index: pkgsrc/devel/py-traitlets4/Makefile
diff -u pkgsrc/devel/py-traitlets4/Makefile:1.1 pkgsrc/devel/py-traitlets4/Makefile:1.2
--- pkgsrc/devel/py-traitlets4/Makefile:1.1     Thu Jun 10 05:43:23 2021
+++ pkgsrc/devel/py-traitlets4/Makefile Sat Jan  1 21:21:41 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2021/06/10 05:43:23 adam Exp $
+# $NetBSD: Makefile,v 1.2 2022/01/01 21:21:41 wiz Exp $
 
 DISTNAME=      traitlets-4.3.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/traitlets/}
 
@@ -21,5 +22,10 @@ DEPENDS+=    ${PYPKGPREFIX}-enum34-[0-9]*:.
 
 USE_LANGUAGES= # none
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
+
+.if ${_PYTHON_VERSION} == 27
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/py-traitlets4/PLIST
diff -u pkgsrc/devel/py-traitlets4/PLIST:1.1 pkgsrc/devel/py-traitlets4/PLIST:1.2
--- pkgsrc/devel/py-traitlets4/PLIST:1.1        Thu Jun 10 05:43:23 2021
+++ pkgsrc/devel/py-traitlets4/PLIST    Sat Jan  1 21:21:41 2022
@@ -1,80 +1,84 @@
-@comment $NetBSD: PLIST,v 1.1 2021/06/10 05:43:23 adam Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.2 2022/01/01 21:21:41 wiz Exp $
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/traitlets/__init__.py
-${PYSITELIB}/traitlets/__init__.pyo
 ${PYSITELIB}/traitlets/__init__.pyc
-${PYSITELIB}/traitlets/_version.pyo
-${PYSITELIB}/traitlets/_version.pyc
-${PYSITELIB}/traitlets/log.pyo
-${PYSITELIB}/traitlets/log.pyc
-${PYSITELIB}/traitlets/traitlets.pyo
-${PYSITELIB}/traitlets/traitlets.pyc
+${PYSITELIB}/traitlets/__init__.pyo
 ${PYSITELIB}/traitlets/_version.py
+${PYSITELIB}/traitlets/_version.pyc
+${PYSITELIB}/traitlets/_version.pyo
 ${PYSITELIB}/traitlets/config/__init__.py
-${PYSITELIB}/traitlets/config/__init__.pyo
 ${PYSITELIB}/traitlets/config/__init__.pyc
-${PYSITELIB}/traitlets/config/application.pyo
-${PYSITELIB}/traitlets/config/application.pyc
-${PYSITELIB}/traitlets/config/configurable.pyo
-${PYSITELIB}/traitlets/config/configurable.pyc
-${PYSITELIB}/traitlets/config/loader.pyo
-${PYSITELIB}/traitlets/config/loader.pyc
-${PYSITELIB}/traitlets/config/manager.pyo
-${PYSITELIB}/traitlets/config/manager.pyc
+${PYSITELIB}/traitlets/config/__init__.pyo
 ${PYSITELIB}/traitlets/config/application.py
+${PYSITELIB}/traitlets/config/application.pyc
+${PYSITELIB}/traitlets/config/application.pyo
 ${PYSITELIB}/traitlets/config/configurable.py
+${PYSITELIB}/traitlets/config/configurable.pyc
+${PYSITELIB}/traitlets/config/configurable.pyo
 ${PYSITELIB}/traitlets/config/loader.py
+${PYSITELIB}/traitlets/config/loader.pyc
+${PYSITELIB}/traitlets/config/loader.pyo
 ${PYSITELIB}/traitlets/config/manager.py
+${PYSITELIB}/traitlets/config/manager.pyc
+${PYSITELIB}/traitlets/config/manager.pyo
 ${PYSITELIB}/traitlets/config/tests/__init__.py
-${PYSITELIB}/traitlets/config/tests/__init__.pyo
 ${PYSITELIB}/traitlets/config/tests/__init__.pyc
-${PYSITELIB}/traitlets/config/tests/test_application.pyo
-${PYSITELIB}/traitlets/config/tests/test_application.pyc
-${PYSITELIB}/traitlets/config/tests/test_configurable.pyo
-${PYSITELIB}/traitlets/config/tests/test_configurable.pyc
-${PYSITELIB}/traitlets/config/tests/test_loader.pyo
-${PYSITELIB}/traitlets/config/tests/test_loader.pyc
+${PYSITELIB}/traitlets/config/tests/__init__.pyo
 ${PYSITELIB}/traitlets/config/tests/test_application.py
+${PYSITELIB}/traitlets/config/tests/test_application.pyc
+${PYSITELIB}/traitlets/config/tests/test_application.pyo
 ${PYSITELIB}/traitlets/config/tests/test_configurable.py
+${PYSITELIB}/traitlets/config/tests/test_configurable.pyc
+${PYSITELIB}/traitlets/config/tests/test_configurable.pyo
 ${PYSITELIB}/traitlets/config/tests/test_loader.py
+${PYSITELIB}/traitlets/config/tests/test_loader.pyc
+${PYSITELIB}/traitlets/config/tests/test_loader.pyo
 ${PYSITELIB}/traitlets/log.py
+${PYSITELIB}/traitlets/log.pyc
+${PYSITELIB}/traitlets/log.pyo
 ${PYSITELIB}/traitlets/tests/__init__.py
-${PYSITELIB}/traitlets/tests/__init__.pyo
 ${PYSITELIB}/traitlets/tests/__init__.pyc
-${PYSITELIB}/traitlets/tests/_warnings.pyo
-${PYSITELIB}/traitlets/tests/_warnings.pyc
-${PYSITELIB}/traitlets/tests/test_traitlets.pyo
-${PYSITELIB}/traitlets/tests/test_traitlets.pyc
-${PYSITELIB}/traitlets/tests/test_traitlets_enum.pyo
-${PYSITELIB}/traitlets/tests/test_traitlets_enum.pyc
-${PYSITELIB}/traitlets/tests/utils.pyo
-${PYSITELIB}/traitlets/tests/utils.pyc
+${PYSITELIB}/traitlets/tests/__init__.pyo
 ${PYSITELIB}/traitlets/tests/_warnings.py
+${PYSITELIB}/traitlets/tests/_warnings.pyc
+${PYSITELIB}/traitlets/tests/_warnings.pyo
 ${PYSITELIB}/traitlets/tests/test_traitlets.py
+${PYSITELIB}/traitlets/tests/test_traitlets.pyc
+${PYSITELIB}/traitlets/tests/test_traitlets.pyo
 ${PYSITELIB}/traitlets/tests/test_traitlets_enum.py
+${PYSITELIB}/traitlets/tests/test_traitlets_enum.pyc
+${PYSITELIB}/traitlets/tests/test_traitlets_enum.pyo
 ${PYSITELIB}/traitlets/tests/utils.py
+${PYSITELIB}/traitlets/tests/utils.pyc
+${PYSITELIB}/traitlets/tests/utils.pyo
 ${PYSITELIB}/traitlets/traitlets.py
+${PYSITELIB}/traitlets/traitlets.pyc
+${PYSITELIB}/traitlets/traitlets.pyo
 ${PYSITELIB}/traitlets/utils/__init__.py
-${PYSITELIB}/traitlets/utils/__init__.pyo
 ${PYSITELIB}/traitlets/utils/__init__.pyc
-${PYSITELIB}/traitlets/utils/bunch.pyo
-${PYSITELIB}/traitlets/utils/bunch.pyc
-${PYSITELIB}/traitlets/utils/getargspec.pyo
-${PYSITELIB}/traitlets/utils/getargspec.pyc
-${PYSITELIB}/traitlets/utils/importstring.pyo
-${PYSITELIB}/traitlets/utils/importstring.pyc
-${PYSITELIB}/traitlets/utils/sentinel.pyo
-${PYSITELIB}/traitlets/utils/sentinel.pyc
+${PYSITELIB}/traitlets/utils/__init__.pyo
 ${PYSITELIB}/traitlets/utils/bunch.py
+${PYSITELIB}/traitlets/utils/bunch.pyc
+${PYSITELIB}/traitlets/utils/bunch.pyo
 ${PYSITELIB}/traitlets/utils/getargspec.py
+${PYSITELIB}/traitlets/utils/getargspec.pyc
+${PYSITELIB}/traitlets/utils/getargspec.pyo
 ${PYSITELIB}/traitlets/utils/importstring.py
+${PYSITELIB}/traitlets/utils/importstring.pyc
+${PYSITELIB}/traitlets/utils/importstring.pyo
 ${PYSITELIB}/traitlets/utils/sentinel.py
+${PYSITELIB}/traitlets/utils/sentinel.pyc
+${PYSITELIB}/traitlets/utils/sentinel.pyo
 ${PYSITELIB}/traitlets/utils/tests/__init__.py
-${PYSITELIB}/traitlets/utils/tests/__init__.pyo
 ${PYSITELIB}/traitlets/utils/tests/__init__.pyc
-${PYSITELIB}/traitlets/utils/tests/test_bunch.pyo
-${PYSITELIB}/traitlets/utils/tests/test_bunch.pyc
-${PYSITELIB}/traitlets/utils/tests/test_importstring.pyo
-${PYSITELIB}/traitlets/utils/tests/test_importstring.pyc
+${PYSITELIB}/traitlets/utils/tests/__init__.pyo
 ${PYSITELIB}/traitlets/utils/tests/test_bunch.py
+${PYSITELIB}/traitlets/utils/tests/test_bunch.pyc
+${PYSITELIB}/traitlets/utils/tests/test_bunch.pyo
 ${PYSITELIB}/traitlets/utils/tests/test_importstring.py
+${PYSITELIB}/traitlets/utils/tests/test_importstring.pyc
+${PYSITELIB}/traitlets/utils/tests/test_importstring.pyo

Index: pkgsrc/net/py-nyx/Makefile
diff -u pkgsrc/net/py-nyx/Makefile:1.2 pkgsrc/net/py-nyx/Makefile:1.3
--- pkgsrc/net/py-nyx/Makefile:1.2      Sun Nov  3 11:45:51 2019
+++ pkgsrc/net/py-nyx/Makefile  Sat Jan  1 21:21:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:51 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/01 21:21:41 wiz Exp $
 
 .include "../../net/py-nyx/Makefile.common"
 
@@ -16,6 +16,8 @@ USE_LANGUAGES=        # none
 
 DEPENDS+=      ${PYPKGPREFIX}-stem>=1.7.0:../../devel/py-stem
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 REPLACE_PYTHON+=       run_nyx
 REPLACE_PYTHON+=       run_tests.py
 REPLACE_PYTHON+=       setup.py

Prev by Date: CVS commit: pkgsrc/textproc/py-libxml2
Next by Date: CVS commit: pkgsrc/devel/scons
Previous by Thread: CVS commit: pkgsrc/textproc/py-libxml2
Next by Thread: CVS commit: pkgsrc/devel/scons
Indexes:

Home | Main Index | Thread Index | Old Index