py-creole: update to 1.3.1

v1.3.1:
Bugfix for “Failed building wheel for python-creole”

4 files changed, 94 insertions, 107 deletions

diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index d495e160448..7b50c8261fa 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -1,53 +1,29 @@
-# $NetBSD: Makefile,v 1.9 2017/09/03 09:22:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/10/07 07:31:14 adam Exp $
 
-VERS=		1.0.5
-DISTNAME=	python-creole-${VERS}
-PKGNAME=	${PYPKGPREFIX}-creole-${VERS}
+DISTNAME=	python-creole-1.3.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^python-//}
 CATEGORIES=	textproc www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-creole/}
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	https://github.com/jedie/python-creole
-COMMENT=	Creole <-> HTML converter
-
+COMMENT=	Markup converter in pure Python
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=		${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils
-DEPENDS+=		${PYPKGPREFIX}-textile>=0:../../textproc/py-textile
-
-USE_LANGUAGES=		#none
-
-SUBST_CLASSES+=		env
-SUBST_SED.env=		-e "s,\#! */usr/bin/env  *python[0-9.]*,\#!${PYTHONBIN},"
-SUBST_MESSAGE.env=	Fixing path to python.
-SUBST_STAGE.env=	post-patch
-SUBST_FILES.env=	creole/exceptions.py
-SUBST_FILES.env+=	creole/html2creole/emitter.py
-SUBST_FILES.env+=	creole/html2rest/emitter.py
-SUBST_FILES.env+=	creole/html2textile/emitter.py
-SUBST_FILES.env+=	creole/html_parser/parser.py
-SUBST_FILES.env+=	creole/html_tools/deentity.py
-SUBST_FILES.env+=	creole/html_tools/strip_html.py
-SUBST_FILES.env+=	creole/html_tools/text_tools.py
-SUBST_FILES.env+=	creole/rest2html/clean_writer.py
-SUBST_FILES.env+=	creole/shared/base_emitter.py
-SUBST_FILES.env+=	creole/shared/document_tree.py
-SUBST_FILES.env+=	creole/shared/unknown_tags.py
-SUBST_FILES.env+=	creole/tests/__init__.py
-SUBST_FILES.env+=	creole/tests/all_tests.py
-SUBST_FILES.env+=	creole/tests/test_creole2html.py
-SUBST_FILES.env+=	creole/tests/test_cross_compare_all.py
-SUBST_FILES.env+=	creole/tests/test_cross_compare_creole.py
-SUBST_FILES.env+=	creole/tests/test_cross_compare_rest.py
-SUBST_FILES.env+=	creole/tests/test_cross_compare_textile.py
-SUBST_FILES.env+=	creole/tests/test_html2creole.py
-SUBST_FILES.env+=	creole/tests/test_html2rest.py
-SUBST_FILES.env+=	creole/tests/test_html2textile.py
-SUBST_FILES.env+=	creole/tests/test_rest2html.py
-SUBST_FILES.env+=	creole/tests/test_setup_utils.py
-SUBST_FILES.env+=	creole/tests/test_utils.py
+DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+DEPENDS+=	${PYPKGPREFIX}-textile-[0-9]*:../../textproc/py-textile
+BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+
+USE_LANGUAGES=		# none
+
+REPLACE_PYTHON+=	creole/*.py
+REPLACE_PYTHON+=	creole/*/*.py
 
 PYTHON_SELF_CONFLICT=	yes
 
+do-test:
+	cd ${WRKSRC} && ${PYTHONBIN} setup.py nosetests
+
+.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-creole/PLIST b/textproc/py-creole/PLIST
index 46924dd9825..2591cb81bbe 100644
--- a/textproc/py-creole/PLIST
+++ b/textproc/py-creole/PLIST
@@ -1,49 +1,38 @@
-@comment $NetBSD: PLIST,v 1.2 2012/10/11 15:35:09 wen Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/10/07 07:31:14 adam Exp $
+bin/creole2html
+bin/html2creole
+bin/html2rest
+bin/html2textile
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/creole/__init__.py
 ${PYSITELIB}/creole/__init__.pyc
 ${PYSITELIB}/creole/__init__.pyo
-${PYSITELIB}/creole/creole2html/__init__.py
-${PYSITELIB}/creole/creole2html/__init__.pyc
-${PYSITELIB}/creole/creole2html/__init__.pyo
-${PYSITELIB}/creole/creole2html/emitter.py
-${PYSITELIB}/creole/creole2html/emitter.pyc
-${PYSITELIB}/creole/creole2html/emitter.pyo
-${PYSITELIB}/creole/creole2html/parser.py
-${PYSITELIB}/creole/creole2html/parser.pyc
-${PYSITELIB}/creole/creole2html/parser.pyo
-${PYSITELIB}/creole/creole2html/rules.py
-${PYSITELIB}/creole/creole2html/rules.pyc
-${PYSITELIB}/creole/creole2html/rules.pyo
+${PYSITELIB}/creole/cmdline.py
+${PYSITELIB}/creole/cmdline.pyc
+${PYSITELIB}/creole/cmdline.pyo
+${PYSITELIB}/creole/emitter/__init__.py
+${PYSITELIB}/creole/emitter/__init__.pyc
+${PYSITELIB}/creole/emitter/__init__.pyo
+${PYSITELIB}/creole/emitter/creol2html_emitter.py
+${PYSITELIB}/creole/emitter/creol2html_emitter.pyc
+${PYSITELIB}/creole/emitter/creol2html_emitter.pyo
+${PYSITELIB}/creole/emitter/html2creole_emitter.py
+${PYSITELIB}/creole/emitter/html2creole_emitter.pyc
+${PYSITELIB}/creole/emitter/html2creole_emitter.pyo
+${PYSITELIB}/creole/emitter/html2rest_emitter.py
+${PYSITELIB}/creole/emitter/html2rest_emitter.pyc
+${PYSITELIB}/creole/emitter/html2rest_emitter.pyo
+${PYSITELIB}/creole/emitter/html2textile_emitter.py
+${PYSITELIB}/creole/emitter/html2textile_emitter.pyc
+${PYSITELIB}/creole/emitter/html2textile_emitter.pyo
 ${PYSITELIB}/creole/exceptions.py
 ${PYSITELIB}/creole/exceptions.pyc
 ${PYSITELIB}/creole/exceptions.pyo
-${PYSITELIB}/creole/html2creole/__init__.py
-${PYSITELIB}/creole/html2creole/__init__.pyc
-${PYSITELIB}/creole/html2creole/__init__.pyo
-${PYSITELIB}/creole/html2creole/emitter.py
-${PYSITELIB}/creole/html2creole/emitter.pyc
-${PYSITELIB}/creole/html2creole/emitter.pyo
-${PYSITELIB}/creole/html2rest/__init__.py
-${PYSITELIB}/creole/html2rest/__init__.pyc
-${PYSITELIB}/creole/html2rest/__init__.pyo
-${PYSITELIB}/creole/html2rest/emitter.py
-${PYSITELIB}/creole/html2rest/emitter.pyc
-${PYSITELIB}/creole/html2rest/emitter.pyo
-${PYSITELIB}/creole/html2textile/__init__.py
-${PYSITELIB}/creole/html2textile/__init__.pyc
-${PYSITELIB}/creole/html2textile/__init__.pyo
-${PYSITELIB}/creole/html2textile/emitter.py
-${PYSITELIB}/creole/html2textile/emitter.pyc
-${PYSITELIB}/creole/html2textile/emitter.pyo
-${PYSITELIB}/creole/html_parser/__init__.py
-${PYSITELIB}/creole/html_parser/__init__.pyc
-${PYSITELIB}/creole/html_parser/__init__.pyo
-${PYSITELIB}/creole/html_parser/config.py
-${PYSITELIB}/creole/html_parser/config.pyc
-${PYSITELIB}/creole/html_parser/config.pyo
-${PYSITELIB}/creole/html_parser/parser.py
-${PYSITELIB}/creole/html_parser/parser.pyc
-${PYSITELIB}/creole/html_parser/parser.pyo
 ${PYSITELIB}/creole/html_tools/__init__.py
 ${PYSITELIB}/creole/html_tools/__init__.pyc
 ${PYSITELIB}/creole/html_tools/__init__.pyo
@@ -56,15 +45,33 @@ ${PYSITELIB}/creole/html_tools/strip_html.pyo
 ${PYSITELIB}/creole/html_tools/text_tools.py
 ${PYSITELIB}/creole/html_tools/text_tools.pyc
 ${PYSITELIB}/creole/html_tools/text_tools.pyo
+${PYSITELIB}/creole/parser/__init__.py
+${PYSITELIB}/creole/parser/__init__.pyc
+${PYSITELIB}/creole/parser/__init__.pyo
+${PYSITELIB}/creole/parser/creol2html_parser.py
+${PYSITELIB}/creole/parser/creol2html_parser.pyc
+${PYSITELIB}/creole/parser/creol2html_parser.pyo
+${PYSITELIB}/creole/parser/creol2html_rules.py
+${PYSITELIB}/creole/parser/creol2html_rules.pyc
+${PYSITELIB}/creole/parser/creol2html_rules.pyo
+${PYSITELIB}/creole/parser/html_parser.py
+${PYSITELIB}/creole/parser/html_parser.pyc
+${PYSITELIB}/creole/parser/html_parser.pyo
+${PYSITELIB}/creole/parser/html_parser_config.py
+${PYSITELIB}/creole/parser/html_parser_config.pyc
+${PYSITELIB}/creole/parser/html_parser_config.pyo
 ${PYSITELIB}/creole/py3compat.py
 ${PYSITELIB}/creole/py3compat.pyc
 ${PYSITELIB}/creole/py3compat.pyo
-${PYSITELIB}/creole/rest2html/__init__.py
-${PYSITELIB}/creole/rest2html/__init__.pyc
-${PYSITELIB}/creole/rest2html/__init__.pyo
-${PYSITELIB}/creole/rest2html/clean_writer.py
-${PYSITELIB}/creole/rest2html/clean_writer.pyc
-${PYSITELIB}/creole/rest2html/clean_writer.pyo
+${PYSITELIB}/creole/rest_tools/__init__.py
+${PYSITELIB}/creole/rest_tools/__init__.pyc
+${PYSITELIB}/creole/rest_tools/__init__.pyo
+${PYSITELIB}/creole/rest_tools/clean_writer.py
+${PYSITELIB}/creole/rest_tools/clean_writer.pyc
+${PYSITELIB}/creole/rest_tools/clean_writer.pyo
+${PYSITELIB}/creole/rest_tools/pypi_rest2html.py
+${PYSITELIB}/creole/rest_tools/pypi_rest2html.pyc
+${PYSITELIB}/creole/rest_tools/pypi_rest2html.pyo
 ${PYSITELIB}/creole/setup_utils.py
 ${PYSITELIB}/creole/setup_utils.pyc
 ${PYSITELIB}/creole/setup_utils.pyo
@@ -98,13 +105,13 @@ ${PYSITELIB}/creole/shared/utils.pyo
 ${PYSITELIB}/creole/tests/__init__.py
 ${PYSITELIB}/creole/tests/__init__.pyc
 ${PYSITELIB}/creole/tests/__init__.pyo
-${PYSITELIB}/creole/tests/all_tests.py
-${PYSITELIB}/creole/tests/all_tests.pyc
-${PYSITELIB}/creole/tests/all_tests.pyo
 ${PYSITELIB}/creole/tests/test_README.creole
 ${PYSITELIB}/creole/tests/test_TODOs.py
 ${PYSITELIB}/creole/tests/test_TODOs.pyc
 ${PYSITELIB}/creole/tests/test_TODOs.pyo
+${PYSITELIB}/creole/tests/test_cli.py
+${PYSITELIB}/creole/tests/test_cli.pyc
+${PYSITELIB}/creole/tests/test_cli.pyo
 ${PYSITELIB}/creole/tests/test_creole2html.py
 ${PYSITELIB}/creole/tests/test_creole2html.pyc
 ${PYSITELIB}/creole/tests/test_creole2html.pyo
@@ -135,9 +142,15 @@ ${PYSITELIB}/creole/tests/test_macros.pyo
 ${PYSITELIB}/creole/tests/test_rest2html.py
 ${PYSITELIB}/creole/tests/test_rest2html.pyc
 ${PYSITELIB}/creole/tests/test_rest2html.pyo
+${PYSITELIB}/creole/tests/test_setup.py
+${PYSITELIB}/creole/tests/test_setup.pyc
+${PYSITELIB}/creole/tests/test_setup.pyo
 ${PYSITELIB}/creole/tests/test_setup_utils.py
 ${PYSITELIB}/creole/tests/test_setup_utils.pyc
 ${PYSITELIB}/creole/tests/test_setup_utils.pyo
+${PYSITELIB}/creole/tests/test_subprocess.py
+${PYSITELIB}/creole/tests/test_subprocess.pyc
+${PYSITELIB}/creole/tests/test_subprocess.pyo
 ${PYSITELIB}/creole/tests/test_utils.py
 ${PYSITELIB}/creole/tests/test_utils.pyc
 ${PYSITELIB}/creole/tests/test_utils.pyo
@@ -147,12 +160,10 @@ ${PYSITELIB}/creole/tests/utils/__init__.pyo
 ${PYSITELIB}/creole/tests/utils/base_unittest.py
 ${PYSITELIB}/creole/tests/utils/base_unittest.pyc
 ${PYSITELIB}/creole/tests/utils/base_unittest.pyo
+${PYSITELIB}/creole/tests/utils/unittest_subprocess.py
+${PYSITELIB}/creole/tests/utils/unittest_subprocess.pyc
+${PYSITELIB}/creole/tests/utils/unittest_subprocess.pyo
 ${PYSITELIB}/creole/tests/utils/utils.py
 ${PYSITELIB}/creole/tests/utils/utils.pyc
 ${PYSITELIB}/creole/tests/utils/utils.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/${EGG_INFODIR}/zip-safe
 share/doc/py-creole/README.creole
diff --git a/textproc/py-creole/distinfo b/textproc/py-creole/distinfo
index 6603a8e555a..cd0fa44dc7a 100644
--- a/textproc/py-creole/distinfo
+++ b/textproc/py-creole/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 02:00:02 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/10/07 07:31:14 adam Exp $
 
-SHA1 (python-creole-1.0.5.tar.gz) = fabef2732acdca81704f16f29222006d8b9e95a3
-RMD160 (python-creole-1.0.5.tar.gz) = c7079a6f46e2e726058944f12b204d9b174f32df
-SHA512 (python-creole-1.0.5.tar.gz) = 0d11325c0fa3a284d759484fc2d2f2f6e5642b31cb543b1c804e141e8de9fc6bb80bc36c0f3f947b77f14d41f40b1e0836236c9a2e898e3a2fce8f3f72c73f95
-Size (python-creole-1.0.5.tar.gz) = 66232 bytes
-SHA1 (patch-setup.py) = 87fedc68753bd108c6c87b0ce6d5187e3627371b
+SHA1 (python-creole-1.3.1.tar.gz) = 39f03906157df6910a5de64b999c39dcdd7972f4
+RMD160 (python-creole-1.3.1.tar.gz) = e715a82b22e6508f299a79bbce940f36b627c3dc
+SHA512 (python-creole-1.3.1.tar.gz) = 15a1fbd2aab578f60ba06a4df6484a73fac47eb594ca85e2a8d1bf79a5315d5f29cdc33ad8f6e81d075a8f9afd44c7b7a6c956e4e800b0c6f5a9413b38356274
+Size (python-creole-1.3.1.tar.gz) = 75834 bytes
+SHA1 (patch-setup.py) = 34bda5f9884544cdf214536e63b7ba12b52fe321
diff --git a/textproc/py-creole/patches/patch-setup.py b/textproc/py-creole/patches/patch-setup.py
index b9e3194fa7e..49633590b74 100644
--- a/textproc/py-creole/patches/patch-setup.py
+++ b/textproc/py-creole/patches/patch-setup.py
@@ -1,15 +1,15 @@
-$NetBSD: patch-setup.py,v 1.1 2012/10/11 15:35:09 wen Exp $
+$NetBSD: patch-setup.py,v 1.2 2017/10/07 07:31:14 adam Exp $
 
 Install README.creole into right directory.
 
---- setup.py.orig	2012-10-11 06:13:34.000000000 +0000
+--- setup.py.orig	2015-08-15 20:26:05.000000000 +0000
 +++ setup.py
-@@ -44,7 +44,7 @@ setup(
-     url='http://code.google.com/p/python-creole/',
+@@ -207,7 +207,7 @@ setup(
+     url='https://github.com/jedie/python-creole/',
      packages=find_packages(),
      include_package_data=True, # include package data under svn source control
 -    data_files=[("", ["README.creole"])], # README used in unittest test_setup_utils.py
 +    data_files=[("share/doc/py-creole", ["README.creole"])], # README used in unittest test_setup_utils.py
-     zip_safe=True, # http://packages.python.org/distribute/setuptools.html#setting-the-zip-safe-flag
-     keywords="creole markup creole2html html2creole rest2html html2rest html2textile",
-     classifiers=[
+     entry_points={
+         "console_scripts": [
+             "creole2html = creole.cmdline:cli_creole2html",