CVS commit: pkgsrc/textproc/py-rst2pdf

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/py-rst2pdf
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 8 May 2019 10:20:17 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed May  8 10:20:17 UTC 2019

Modified Files:
        pkgsrc/textproc/py-rst2pdf: Makefile PLIST distinfo
Added Files:
        pkgsrc/textproc/py-rst2pdf/patches: patch-rst2pdf_createpdf.py
            patch-rst2pdf_flowables.py

Log Message:
py-rst2pdf: use distfile from GitHub; fixes PR 54161


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-rst2pdf/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-rst2pdf/PLIST \
    pkgsrc/textproc/py-rst2pdf/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/py-rst2pdf/patches/patch-rst2pdf_createpdf.py \
    pkgsrc/textproc/py-rst2pdf/patches/patch-rst2pdf_flowables.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/py-rst2pdf/Makefile
diff -u pkgsrc/textproc/py-rst2pdf/Makefile:1.3 pkgsrc/textproc/py-rst2pdf/Makefile:1.4
--- pkgsrc/textproc/py-rst2pdf/Makefile:1.3     Wed Apr  3 15:23:24 2019
+++ pkgsrc/textproc/py-rst2pdf/Makefile Wed May  8 10:20:16 2019
@@ -1,9 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2019/04/03 15:23:24 adam Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/08 10:20:16 adam Exp $
 
 DISTNAME=      rst2pdf-0.94
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    python textproc
-MASTER_SITES=  ${MASTER_SITE_PYPI:=r/rst2pdf/}
+# PyPI distfile does not include images, styles, and templates
+#MASTER_SITES= ${MASTER_SITE_PYPI:=r/rst2pdf/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=rst2pdf/}
+GITHUB_PROJECT=        rst2pdf
+# TODO: remove on next update
+DIST_SUBDIR=   rst2pdf
 
 MAINTAINER=    darcy%NetBSD.org@localhost
 HOMEPAGE=      https://rst2pdf.org/
@@ -18,18 +24,19 @@ DEPENDS+=   ${PYPKGPREFIX}-reportlab-[0-9]
 DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-smartypants-[0-9]*:../../textproc/py-smartypants
+TEST_DEPENDS+= ${PYPKGPREFIX}-PDF2-[0-9]*:../../print/py-PDF2
 
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_ACCEPTED=      27
 
+# setup.cfg contains only 'tag_build = .dev', which we don't want.
+pre-configure:
+       ${RM} ${WRKSRC}/setup.cfg
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} rst2pdf rst2pdf-${PYVERSSUFFIX} || ${TRUE}
 
-# tests not included
-do-test:
-       ${DO_NADA}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-rst2pdf/PLIST
diff -u pkgsrc/textproc/py-rst2pdf/PLIST:1.2 pkgsrc/textproc/py-rst2pdf/PLIST:1.3
--- pkgsrc/textproc/py-rst2pdf/PLIST:1.2        Wed Apr  3 15:23:24 2019
+++ pkgsrc/textproc/py-rst2pdf/PLIST    Wed May  8 10:20:16 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/04/03 15:23:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/05/08 10:20:16 adam Exp $
 bin/rst2pdf-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -69,6 +69,8 @@ ${PYSITELIB}/rst2pdf/genpdftext.pyo
 ${PYSITELIB}/rst2pdf/image.py
 ${PYSITELIB}/rst2pdf/image.pyc
 ${PYSITELIB}/rst2pdf/image.pyo
+${PYSITELIB}/rst2pdf/images/image-missing.jpg
+${PYSITELIB}/rst2pdf/images/image-missing.png
 ${PYSITELIB}/rst2pdf/languages.py
 ${PYSITELIB}/rst2pdf/languages.pyc
 ${PYSITELIB}/rst2pdf/languages.pyo
@@ -117,9 +119,72 @@ ${PYSITELIB}/rst2pdf/sphinxnodes.pyo
 ${PYSITELIB}/rst2pdf/styles.py
 ${PYSITELIB}/rst2pdf/styles.pyc
 ${PYSITELIB}/rst2pdf/styles.pyo
+${PYSITELIB}/rst2pdf/styles/11x17.style
+${PYSITELIB}/rst2pdf/styles/a0.style
+${PYSITELIB}/rst2pdf/styles/a1-landscape.style
+${PYSITELIB}/rst2pdf/styles/a1.style
+${PYSITELIB}/rst2pdf/styles/a2-landscape.style
+${PYSITELIB}/rst2pdf/styles/a2.style
+${PYSITELIB}/rst2pdf/styles/a3-landscape.style
+${PYSITELIB}/rst2pdf/styles/a3.style
+${PYSITELIB}/rst2pdf/styles/a4-landscape.style
+${PYSITELIB}/rst2pdf/styles/a4.style
+${PYSITELIB}/rst2pdf/styles/a5-landscape.style
+${PYSITELIB}/rst2pdf/styles/a5.style
+${PYSITELIB}/rst2pdf/styles/a6-landscape.style
+${PYSITELIB}/rst2pdf/styles/a6.style
+${PYSITELIB}/rst2pdf/styles/autumn.style
+${PYSITELIB}/rst2pdf/styles/b0.style
+${PYSITELIB}/rst2pdf/styles/b1-landscape.style
+${PYSITELIB}/rst2pdf/styles/b1.style
+${PYSITELIB}/rst2pdf/styles/b2-landscape.style
+${PYSITELIB}/rst2pdf/styles/b2.style
+${PYSITELIB}/rst2pdf/styles/b3-landscape.style
+${PYSITELIB}/rst2pdf/styles/b3.style
+${PYSITELIB}/rst2pdf/styles/b4-landscape.style
+${PYSITELIB}/rst2pdf/styles/b4.style
+${PYSITELIB}/rst2pdf/styles/b5-landscape.style
+${PYSITELIB}/rst2pdf/styles/b5.style
+${PYSITELIB}/rst2pdf/styles/b6-landscape.style
+${PYSITELIB}/rst2pdf/styles/b6.style
+${PYSITELIB}/rst2pdf/styles/borland.style
+${PYSITELIB}/rst2pdf/styles/bw.style
+${PYSITELIB}/rst2pdf/styles/colorful.style
+${PYSITELIB}/rst2pdf/styles/debugtables.style
+${PYSITELIB}/rst2pdf/styles/default.style
+${PYSITELIB}/rst2pdf/styles/dejavu.style
+${PYSITELIB}/rst2pdf/styles/double-sided.style
+${PYSITELIB}/rst2pdf/styles/eightpoint.style
+${PYSITELIB}/rst2pdf/styles/emacs.style
+${PYSITELIB}/rst2pdf/styles/freetype-sans.style
+${PYSITELIB}/rst2pdf/styles/freetype-serif.style
+${PYSITELIB}/rst2pdf/styles/friendly.style
+${PYSITELIB}/rst2pdf/styles/fruity.style
+${PYSITELIB}/rst2pdf/styles/kerning.style
+${PYSITELIB}/rst2pdf/styles/legal.style
+${PYSITELIB}/rst2pdf/styles/letter-landscape.style
+${PYSITELIB}/rst2pdf/styles/letter.style
+${PYSITELIB}/rst2pdf/styles/manni.style
+${PYSITELIB}/rst2pdf/styles/monokai.style
+${PYSITELIB}/rst2pdf/styles/murphy.style
+${PYSITELIB}/rst2pdf/styles/native.style
+${PYSITELIB}/rst2pdf/styles/no-compact-lists.style
+${PYSITELIB}/rst2pdf/styles/pastie.style
+${PYSITELIB}/rst2pdf/styles/perldoc.style
+${PYSITELIB}/rst2pdf/styles/serif.style
+${PYSITELIB}/rst2pdf/styles/sphinx.style
+${PYSITELIB}/rst2pdf/styles/styles.style
+${PYSITELIB}/rst2pdf/styles/tango.style
+${PYSITELIB}/rst2pdf/styles/tenpoint.style
+${PYSITELIB}/rst2pdf/styles/trac.style
+${PYSITELIB}/rst2pdf/styles/twelvepoint.style
+${PYSITELIB}/rst2pdf/styles/twocolumn.style
+${PYSITELIB}/rst2pdf/styles/vs.style
 ${PYSITELIB}/rst2pdf/svgimage.py
 ${PYSITELIB}/rst2pdf/svgimage.pyc
 ${PYSITELIB}/rst2pdf/svgimage.pyo
+${PYSITELIB}/rst2pdf/templates/cover.tmpl
+${PYSITELIB}/rst2pdf/templates/sphinxcover.tmpl
 ${PYSITELIB}/rst2pdf/utils.py
 ${PYSITELIB}/rst2pdf/utils.pyc
 ${PYSITELIB}/rst2pdf/utils.pyo
Index: pkgsrc/textproc/py-rst2pdf/distinfo
diff -u pkgsrc/textproc/py-rst2pdf/distinfo:1.2 pkgsrc/textproc/py-rst2pdf/distinfo:1.3
--- pkgsrc/textproc/py-rst2pdf/distinfo:1.2     Wed Apr  3 15:23:24 2019
+++ pkgsrc/textproc/py-rst2pdf/distinfo Wed May  8 10:20:16 2019
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/04/03 15:23:24 adam Exp $
+$NetBSD: distinfo,v 1.3 2019/05/08 10:20:16 adam Exp $
 
-SHA1 (rst2pdf-0.94.tar.gz) = 3f15856abf07dcd29af9bd3eca8137d98b533492
-RMD160 (rst2pdf-0.94.tar.gz) = 61c8c07a21cd6deee252be894a6003f0de154c44
-SHA512 (rst2pdf-0.94.tar.gz) = 9666989f819fd173b14f1366faba420dc5040a9249f24641445c840d7d8a46675bb7545e2954d9e0cac128fffde764d365d9ff0e9c36d5062303733f53c30425
-Size (rst2pdf-0.94.tar.gz) = 112652 bytes
+SHA1 (rst2pdf/rst2pdf-0.94.tar.gz) = d027320ff1162a95b127b63d59ffaae910e154f5
+RMD160 (rst2pdf/rst2pdf-0.94.tar.gz) = ad8fa5436c37c939b878cc3d734a5173ca6f91ab
+SHA512 (rst2pdf/rst2pdf-0.94.tar.gz) = 7f99dfab63b4a3074841bdc5de5487298203ab9c6db69af11535662c76277bf45df45a2e583b556a209584b8fdaa647920614a9000985887a111e38769a677c5
+Size (rst2pdf/rst2pdf-0.94.tar.gz) = 10314162 bytes
+SHA1 (patch-rst2pdf_createpdf.py) = dae3e14b3e35f5cc8bf3292ec5dc4cd13724447c
+SHA1 (patch-rst2pdf_flowables.py) = 13c639110fd34bcecfc6a79f0c1c6002af301201

Added files:

Index: pkgsrc/textproc/py-rst2pdf/patches/patch-rst2pdf_createpdf.py
diff -u /dev/null pkgsrc/textproc/py-rst2pdf/patches/patch-rst2pdf_createpdf.py:1.1
--- /dev/null   Wed May  8 10:20:17 2019
+++ pkgsrc/textproc/py-rst2pdf/patches/patch-rst2pdf_createpdf.py       Wed May  8 10:20:16 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-rst2pdf_createpdf.py,v 1.1 2019/05/08 10:20:16 adam Exp $
+
+Add missing import.
+
+--- rst2pdf/createpdf.py.orig  2019-05-08 10:08:54.000000000 +0000
++++ rst2pdf/createpdf.py
+@@ -76,6 +76,7 @@ try:
+ except ImportError:
+     from docutils.utils.roman import toRoman
+ 
++import reportlab
+ from reportlab.platypus import *
+ from reportlab.platypus.doctemplate import IndexingFlowable
+ from reportlab.platypus.flowables import _listWrapOn, _Container
Index: pkgsrc/textproc/py-rst2pdf/patches/patch-rst2pdf_flowables.py
diff -u /dev/null pkgsrc/textproc/py-rst2pdf/patches/patch-rst2pdf_flowables.py:1.1
--- /dev/null   Wed May  8 10:20:17 2019
+++ pkgsrc/textproc/py-rst2pdf/patches/patch-rst2pdf_flowables.py       Wed May  8 10:20:16 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-rst2pdf_flowables.py,v 1.1 2019/05/08 10:20:16 adam Exp $
+
+Add missing import.
+
+--- rst2pdf/flowables.py.orig  2019-05-08 09:52:12.000000000 +0000
++++ rst2pdf/flowables.py
+@@ -12,7 +12,7 @@ import re
+ from reportlab.platypus import *
+ from reportlab.platypus.doctemplate import *
+ from reportlab.lib.enums import *
+-
++import reportlab
+ 
+ from reportlab.lib.units import *
+ from reportlab.lib.enums import TA_LEFT, TA_CENTER, TA_RIGHT

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/print/py-reportlab
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/print/py-reportlab
Indexes:

Home | Main Index | Thread Index | Old Index