CVS commit: pkgsrc/devel/py-tortoisehg

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Apr 30 14:24:07 UTC 2022

Modified Files:
        pkgsrc/devel/py-tortoisehg: Makefile PLIST

Log Message:
py-tortoisehg: use latest sphinx

Fixes build; mark as not-for-python-2.x since latest sphinx isn't.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/devel/py-tortoisehg/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-tortoisehg/PLIST

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-tortoisehg/Makefile
diff -u pkgsrc/devel/py-tortoisehg/Makefile:1.84 pkgsrc/devel/py-tortoisehg/Makefile:1.85
--- pkgsrc/devel/py-tortoisehg/Makefile:1.84    Sat Apr 23 12:01:23 2022
+++ pkgsrc/devel/py-tortoisehg/Makefile Sat Apr 30 14:24:07 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2022/04/23 12:01:23 nros Exp $
+# $NetBSD: Makefile,v 1.85 2022/04/30 14:24:07 wiz Exp $
 
 DISTNAME=              tortoisehg-6.1.1
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            devel python
 MASTER_SITES=          https://www.mercurial-scm.org/release/tortoisehg/targz/
 
@@ -10,14 +11,15 @@ HOMEPAGE=           https://tortoisehg.bitbucket.
 COMMENT=               GUI for Mercurial
 LICENSE=               gnu-gpl-v2
 
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+DEPENDS+=      ${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
+DEPENDS+=      ${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial
+DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
+
 USE_TOOLS+=            pax
 
 REPLACE_PYTHON+=       thg
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.3.4nb1<2:../../textproc/py-sphinx1
-DEPENDS+=      ${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
-DEPENDS+=      ${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial
-
 thg_icon=              /share/pixmaps/tortoisehg/icons/thg_logo.ico
 SUBST_CLASSES+=                df
 SUBST_STAGE.df=                post-configure
@@ -30,7 +32,7 @@ INSTALLATION_DIRS+=   share/doc/tortoisehg
 
 PYTHON_SELF_CONFLICT=  yes
 
-PYTHON_VERSIONED_DEPENDENCIES= pygments
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 pre-build:
        ${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html
@@ -46,7 +48,6 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/py-qt5-qscintilla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-tortoisehg/PLIST
diff -u pkgsrc/devel/py-tortoisehg/PLIST:1.22 pkgsrc/devel/py-tortoisehg/PLIST:1.23
--- pkgsrc/devel/py-tortoisehg/PLIST:1.22       Thu Jan 27 08:15:02 2022
+++ pkgsrc/devel/py-tortoisehg/PLIST    Sat Apr 30 14:24:07 2022
@@ -1,13 +1,12 @@
-@comment $NetBSD: PLIST,v 1.22 2022/01/27 08:15:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2022/04/30 14:24:07 wiz Exp $
 bin/thg
 ${PYSITELIB}/hgext3rd/thg.py
 ${PYSITELIB}/hgext3rd/thg.pyc
 ${PYSITELIB}/hgext3rd/thg.pyo
-${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}
-${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}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/tortoisehg/__init__.py
 ${PYSITELIB}/tortoisehg/__init__.pyc
 ${PYSITELIB}/tortoisehg/__init__.pyo
@@ -424,7 +423,6 @@ share/doc/tortoisehg/html/_images/deskto
 share/doc/tortoisehg/html/_images/dock-toolbar.png
 share/doc/tortoisehg/html/_images/edit-toolbar.png
 share/doc/tortoisehg/html/_images/email.png
-share/doc/tortoisehg/html/_images/email1.png
 share/doc/tortoisehg/html/_images/file-menu.png
 share/doc/tortoisehg/html/_images/filter-toolbar.png
 share/doc/tortoisehg/html/_images/guess.png
@@ -474,19 +472,13 @@ share/doc/tortoisehg/html/_sources/shelv
 share/doc/tortoisehg/html/_sources/sync.txt
 share/doc/tortoisehg/html/_sources/whatsnew.txt
 share/doc/tortoisehg/html/_sources/workbench.txt
-share/doc/tortoisehg/html/_static/ajax-loader.gif
 share/doc/tortoisehg/html/_static/alabaster.css
 share/doc/tortoisehg/html/_static/basic.css
-share/doc/tortoisehg/html/_static/comment-bright.png
-share/doc/tortoisehg/html/_static/comment-close.png
-share/doc/tortoisehg/html/_static/comment.png
 share/doc/tortoisehg/html/_static/custom.css
 share/doc/tortoisehg/html/_static/doctools.js
 share/doc/tortoisehg/html/_static/documentation_options.js
-share/doc/tortoisehg/html/_static/down-pressed.png
-share/doc/tortoisehg/html/_static/down.png
 share/doc/tortoisehg/html/_static/file.png
-share/doc/tortoisehg/html/_static/jquery-3.2.1.js
+share/doc/tortoisehg/html/_static/jquery-3.5.1.js
 share/doc/tortoisehg/html/_static/jquery.js
 share/doc/tortoisehg/html/_static/language_data.js
 share/doc/tortoisehg/html/_static/minus.png
@@ -495,11 +487,8 @@ share/doc/tortoisehg/html/_static/pygmen
 share/doc/tortoisehg/html/_static/searchtools.js
 share/doc/tortoisehg/html/_static/thg_logo_92x50.png
 share/doc/tortoisehg/html/_static/tortoisehg.css
-share/doc/tortoisehg/html/_static/underscore-1.3.1.js
+share/doc/tortoisehg/html/_static/underscore-1.13.1.js
 share/doc/tortoisehg/html/_static/underscore.js
-share/doc/tortoisehg/html/_static/up-pressed.png
-share/doc/tortoisehg/html/_static/up.png
-share/doc/tortoisehg/html/_static/websupport.js
 share/doc/tortoisehg/html/archive.html
 share/doc/tortoisehg/html/clone.html
 share/doc/tortoisehg/html/commit.html