From dc5e496803c338b54a126e2739e10fe7fa6b12ec Mon Sep 17 00:00:00 2001
From: danj <danj@openbsd.org>
Date: Tue, 12 Dec 2017 01:45:10 +0000
Subject: [PATCH] Update to py-relatorio-0.8.0 and add a py3 flavor

from semarie
---
 print/py-relatorio/Makefile  | 22 +++++++++++++++-------
 print/py-relatorio/distinfo  |  4 ++--
 print/py-relatorio/pkg/PLIST | 25 ++++++++++++++-----------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/print/py-relatorio/Makefile b/print/py-relatorio/Makefile
index e97d4be1647..1cd6cccbfa4 100644
--- a/print/py-relatorio/Makefile
+++ b/print/py-relatorio/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2017/10/09 15:51:26 danj Exp $
+# $OpenBSD: Makefile,v 1.8 2017/12/12 01:45:10 danj Exp $
 
 COMMENT=		templating library able to output odt and pdf files
 
-MODPY_EGG_VERSION=	0.7.1
+MODPY_EGG_VERSION=	0.8.0
 DISTNAME=		relatorio-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 
@@ -19,12 +19,20 @@ MODULES=		lang/python
 
 MODPY_SETUPTOOLS=	Yes
 
-RUN_DEPENDS=		www/py-genshi \
-			graphics/pycha \
-			textproc/py-yaml \
-			textproc/py-lxml
+FLAVOR?=
+FLAVORS=		python3
+
+RUN_DEPENDS=		www/py-genshi${MODPY_FLAVOR} \
+			textproc/py-lxml${MODPY_FLAVOR} \
+			devel/py-libmagic${MODPY_FLAVOR}
+
+.if !${FLAVOR:Mpython3}
+RUN_DEPENDS+=		graphics/pycha \
+			textproc/py-yaml
+.endif
 
 TEST_DEPENDS=		${RUN_DEPENDS} \
-			devel/py-nose
+			devel/py-nose${MODPY_FLAVOR}
+
 
 .include <bsd.port.mk>
diff --git a/print/py-relatorio/distinfo b/print/py-relatorio/distinfo
index e5d5ff1c33f..829674d2fc1 100644
--- a/print/py-relatorio/distinfo
+++ b/print/py-relatorio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (relatorio-0.7.1.tar.gz) = dE8eOTE/A3oKtSoVQzjs4VHYPlRCqSeNsfjORQzmws0=
-SIZE (relatorio-0.7.1.tar.gz) = 970049
+SHA256 (relatorio-0.8.0.tar.gz) = vd+F0CnFyFoPl21zkH4U5MMJMGX+hScXDJGr8CGFRtk=
+SIZE (relatorio-0.8.0.tar.gz) = 1096794
diff --git a/print/py-relatorio/pkg/PLIST b/print/py-relatorio/pkg/PLIST
index 80251e6c31b..4e8df4b2019 100644
--- a/print/py-relatorio/pkg/PLIST
+++ b/print/py-relatorio/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2017/10/09 15:51:26 danj Exp $
+@comment $OpenBSD: PLIST,v 1.4 2017/12/12 01:45:10 danj Exp $
 lib/python${MODPY_VERSION}/site-packages/relatorio/
 lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -7,23 +7,28 @@ lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODP
 lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/relatorio/__init__.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}reporting.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/reporting.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/reporting.pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/__init__.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/templates/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}chart.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}opendocument.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}pdf.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/base.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/templates/base.pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/chart.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/templates/chart.pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/opendocument.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/templates/opendocument.pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/pdf.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/templates/pdf.pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/tests/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/relatorio/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/${MODPY_PYCACHE}test_api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/${MODPY_PYCACHE}test_odt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/egg.jpg
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/one.jpg
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/templates/
@@ -34,7 +39,5 @@ lib/python${MODPY_VERSION}/site-packages/relatorio/tests/templates/time.tmpl
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test.fodt
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test.odt
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_api.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_api.pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_odt.py
-lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_odt.pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/tests/two.png