CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 21 21:45:40 UTC 2019

Modified Files:
        pkgsrc/devel/py-requests-mock: Makefile
        pkgsrc/devel/py-trytond: options.mk
        pkgsrc/emulators/qemu: Makefile

Log Message:
Switch sphinx to versioned deps.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-requests-mock/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-trytond/options.mk
cvs rdiff -u -r1.217 -r1.218 pkgsrc/emulators/qemu/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-requests-mock/Makefile
diff -u pkgsrc/devel/py-requests-mock/Makefile:1.7 pkgsrc/devel/py-requests-mock/Makefile:1.8
--- pkgsrc/devel/py-requests-mock/Makefile:1.7  Mon Sep  2 07:34:54 2019
+++ pkgsrc/devel/py-requests-mock/Makefile      Mon Oct 21 21:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/09/02 07:34:54 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/21 21:45:40 adam Exp $
 
 DISTNAME=      requests-mock-1.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,15 +16,17 @@ BUILD_DEPENDS+=     ${PYPKGPREFIX}-pbr-[0-9]
 TEST_DEPENDS+= ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-purl-[0-9]*:../../www/py-purl
-TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.1.2:../../textproc/py-sphinx
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-testrepository>=0.0.18:../../devel/py-testrepository
 TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:test
+
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-trytond/options.mk
diff -u pkgsrc/devel/py-trytond/options.mk:1.15 pkgsrc/devel/py-trytond/options.mk:1.16
--- pkgsrc/devel/py-trytond/options.mk:1.15     Mon Sep  2 13:19:37 2019
+++ pkgsrc/devel/py-trytond/options.mk  Mon Oct 21 21:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/09/02 13:19:37 adam Exp $
+# $NetBSD: options.mk,v 1.16 2019/10/21 21:45:40 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-trytond
 PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx
@@ -36,5 +36,6 @@ DEPENDS+=             ${PYPKGPREFIX}-simplejson-[0-
 .endif
 
 .if !empty(PKG_OPTIONS:Msphinx)
-DEPENDS+=              ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES= sphinx
+.include "../../lang/python/versioned_dependencies.mk"
 .endif

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.217 pkgsrc/emulators/qemu/Makefile:1.218
--- pkgsrc/emulators/qemu/Makefile:1.217        Thu Aug 22 12:23:05 2019
+++ pkgsrc/emulators/qemu/Makefile      Mon Oct 21 21:45:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.217 2019/08/22 12:23:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.218 2019/10/21 21:45:39 adam Exp $
 
 DISTNAME=      qemu-4.1.0
 PKGREVISION=   1
@@ -19,7 +19,8 @@ UNLIMIT_RESOURCES=    datasize
 HAS_CONFIGURE=         yes
 
 GMAKE_REQD=            4.1 # needed for docs
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
 
 SUBST_CLASSES+=                        prefix
 SUBST_STAGE.prefix=            pre-configure
@@ -33,7 +34,7 @@ SUBST_MESSAGE.sphinx-build=   Fix hardcode
 SUBST_FILES.sphinx-build+=     Makefile configure
 SUBST_FILES.sphinx-build+=     roms/skiboot/doc/Makefile
 SUBST_FILES.sphinx-build+=     roms/u-boot/Documentation/Makefile
-SUBST_SED.sphinx-build+=       -e 's/sphinx-build/sphinx-build${PYVERSSUFFIX}/g'
+SUBST_SED.sphinx-build+=       -e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
 
 .include "options.mk"
 
@@ -154,6 +155,7 @@ post-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/extension.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"