Date: Tue, 22 May 2018 05:15:28 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470594 - in head/textproc/py-rst2html5: . files Message-ID: <201805220515.w4M5FScf056857@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Tue May 22 05:15:28 2018 New Revision: 470594 URL: https://svnweb.freebsd.org/changeset/ports/470594 Log: textproc/py-rst2html: Fix conflict with textproc/py-docutils docutils 0.13.1 release included a new rst2html5 frontend, adding rst2html5{.py} to LOCALBASE/bin. This conflicts with files already packages with textproc/py-rst2html [1][2], resulting in a packging error. Also affected (not currently packaged in FreeBSD Ports), is the rst2html5-tools PyPI package [2]. Rename the conflicting script accordingly. While I'm here: - Fix *_DEPENDS versions to match upstream - Remove unecessary limit to Python 2.x - Enable concurrent installation [1] https://bitbucket.org/andre_felipe_dias/rst2html5/issues/27/ [2] https://github.com/getnikola/nikola/issues/2657 [3] https://github.com/marianoguerra/rst2html5/issues/87 PR: 228414 Reported by: roflik (via IRC) Approved by: koobs (python, maintainer) MFH: 2018Q2 Added: head/textproc/py-rst2html5/files/ head/textproc/py-rst2html5/files/patch-setup.py (contents, props changed) Modified: head/textproc/py-rst2html5/Makefile Modified: head/textproc/py-rst2html5/Makefile ============================================================================== --- head/textproc/py-rst2html5/Makefile Tue May 22 04:46:00 2018 (r470593) +++ head/textproc/py-rst2html5/Makefile Tue May 22 05:15:28 2018 (r470594) @@ -11,13 +11,15 @@ MAINTAINER= python@FreeBSD.org COMMENT= Produces HTML5 documents from reStructuredText sources LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1:textproc/py-pygments@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.0.2:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR} -USES= python:2.7 -USE_PYTHON= distutils autoplist +USES= python +USE_PYTHON= distutils concurrent autoplist + NO_ARCH= yes .include <bsd.port.mk> Added: head/textproc/py-rst2html5/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-rst2html5/files/patch-setup.py Tue May 22 05:15:28 2018 (r470594) @@ -0,0 +1,19 @@ +# Conflicts with docutils >-= 0.13.1 +# 1d6174076454 doesn't actually resolve the (file) conflict +# https://bitbucket.org/andre_felipe_dias/rst2html5/issues/27/ +# https://github.com/getnikola/nikola/issues/2657 +# https://github.com/marianoguerra/rst2html5/issues/87 + +--- setup.py.orig 2018-05-22 02:47:00 UTC ++++ setup.py +@@ -51,8 +51,8 @@ setup( + include_package_data=True, + entry_points={ + 'console_scripts': [ +- 'rst2html5 = rst2html5_:main', +- 'rst2html5.py = rst2html5_:main', # overrides docutils' rst2html5.py ++ 'rst2html5-rst2html5 = rst2html5_:main', ++ 'rst2html5-rst2html5.py = rst2html5_:main', # overrides docutils' rst2html5.py + ], + }, + )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805220515.w4M5FScf056857>