From c14bb696b72c8a5c8e2cef68d5f02a66935e8994 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Tue, 15 Dec 2020 09:07:41 +0000
Subject: py-landslide: updated to 1.1.8

v1.1.8
- Explicitly support Python v3.8
- Test Python v3.7 and v3.8 with CI
- Fix sample slideshow link in `setup.py`

v1.1.7
- Change "PrinceXML" references to "Prince"
- Upgrade `Jinja2` from v2.10 to v2.10.1
- Support `markdown` v3.0+
- Fix Prince integration for PDF output
- Use HTTPS URLs in generated HTML code
---
 www/py-landslide/Makefile                          |  6 +++---
 www/py-landslide/distinfo                          | 13 ++++++-------
 www/py-landslide/patches/patch-landslide_parser.py | 16 ----------------
 www/py-landslide/patches/patch-setup.py            |  8 ++++----
 4 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 www/py-landslide/patches/patch-landslide_parser.py

diff --git a/www/py-landslide/Makefile b/www/py-landslide/Makefile
index b93cf36ab30..3d9c5ee4c82 100644
--- a/www/py-landslide/Makefile
+++ b/www/py-landslide/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2019/07/02 04:19:59 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/12/15 09:07:41 adam Exp $
 
-DISTNAME=	landslide-1.1.6
+DISTNAME=	landslide-1.1.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=l/landslide/}
@@ -11,7 +11,7 @@ COMMENT=	Generate HTML5 slideshows from markdown, ReST, or textile
 LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.14:../../textproc/py-docutils
-DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.10:../../textproc/py-jinja2
+DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.10.1:../../textproc/py-jinja2
 DEPENDS+=	${PYPKGPREFIX}-markdown>=2.6.11:../../textproc/py-markdown
 DEPENDS+=	${PYPKGPREFIX}-pygments>=2.2.0:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
diff --git a/www/py-landslide/distinfo b/www/py-landslide/distinfo
index fe507ad16ef..d1cd6b4a843 100644
--- a/www/py-landslide/distinfo
+++ b/www/py-landslide/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/07/02 04:19:59 adam Exp $
+$NetBSD: distinfo,v 1.4 2020/12/15 09:07:41 adam Exp $
 
-SHA1 (landslide-1.1.6.tar.gz) = a714a0bdff7b049fa2d610c7595e2ab003de2fbf
-RMD160 (landslide-1.1.6.tar.gz) = 3a0b9e717b352e93480aa8162b0fd7857b14718f
-SHA512 (landslide-1.1.6.tar.gz) = 944d958432ac3564bf292aa354d7b4122d060d4bcb49445531a01041407886e24fd80fabacf52d18d8c2915c703e8935c76899182b2cf967b19abf6f505f881e
-Size (landslide-1.1.6.tar.gz) = 148250 bytes
-SHA1 (patch-landslide_parser.py) = 0ada02373749cde3d953e17dbaa791a0008ea28e
-SHA1 (patch-setup.py) = 94b7fcc7039b80a1b912c82a24132c1f5571f4f8
+SHA1 (landslide-1.1.8.tar.gz) = 0499fc9ddf200a3e6dfdce3c993939b2632323f4
+RMD160 (landslide-1.1.8.tar.gz) = 56ed96b906fce7741264bf02419e429a0dba0e65
+SHA512 (landslide-1.1.8.tar.gz) = 6ff2a3d40662b0178d2fd2828814f0808ed0e7df9ad1dcd14e7c24b832867039bf50af65c44616b8a8c15d2f0a858173c8ed815562ccd522570d503bcd111f89
+Size (landslide-1.1.8.tar.gz) = 152361 bytes
+SHA1 (patch-setup.py) = c3205b05323fb1d085d2dd1e743930da041228d5
diff --git a/www/py-landslide/patches/patch-landslide_parser.py b/www/py-landslide/patches/patch-landslide_parser.py
deleted file mode 100644
index a780299663c..00000000000
--- a/www/py-landslide/patches/patch-landslide_parser.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-landslide_parser.py,v 1.1 2019/07/02 04:19:59 adam Exp $
-
-Fix for py-markdown >= 3.0.0
-https://github.com/adamzap/landslide/pull/211
-
---- landslide/parser.py.orig	2015-03-12 03:47:59.000000000 +0000
-+++ landslide/parser.py
-@@ -58,7 +58,7 @@ class Parser(object):
-             if text.startswith(u'\ufeff'):  # check for unicode BOM
-                 text = text[1:]
- 
--            return markdown.markdown(text, self.md_extensions)
-+            return markdown.markdown(text, extensions=self.md_extensions)
-         elif self.format == 'restructuredtext':
-             try:
-                 from landslide.rst import html_body
diff --git a/www/py-landslide/patches/patch-setup.py b/www/py-landslide/patches/patch-setup.py
index 951a2eb1d30..dd70f3eeb03 100644
--- a/www/py-landslide/patches/patch-setup.py
+++ b/www/py-landslide/patches/patch-setup.py
@@ -1,19 +1,19 @@
-$NetBSD: patch-setup.py,v 1.1 2019/07/02 04:19:59 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2020/12/15 09:07:41 adam Exp $
 
 Relax dependencies.
 
---- setup.py.orig	2019-07-02 04:14:10.000000000 +0000
+--- setup.py.orig	2020-08-20 22:45:13.000000000 +0000
 +++ setup.py
 @@ -23,11 +23,11 @@ setup(
          'textile'
      ],
      install_requires=[
--        'Jinja2==2.10',
+-        'Jinja2==2.10.1',
 -        'Markdown==2.6.11',
 -        'Pygments==2.2.0',
 -        'docutils==0.14',
 -        'six==1.11.0'
-+        'Jinja2>=2.10',
++        'Jinja2>=2.10.1',
 +        'Markdown>=2.6.11',
 +        'Pygments>=2.2.0',
 +        'docutils>=0.14',
-- 
cgit v1.2.3