git: f096d0538f2e - main - net/py-errbot: Revert e327fd83e67532c68a0ac11e4c4955a540b3fead

[Po-Chuan Hsieh]

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f096d0538f2e97566676042a36ebc9663877237c

commit f096d0538f2e97566676042a36ebc9663877237c
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-04-29 14:17:18 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-04-29 14:24:03 +0000

    net/py-errbot: Revert e327fd83e67532c68a0ac11e4c4955a540b3fead
    
    It should be committed along with the py-markdown 3.3+ update.
    
    from pkg-fallout [1]:
    ===>   py38-errbot-6.1.7 depends on package: py38-markdown>3.3 - not found
    *** Error code 1
    
    PR:             255278
    Reference:      http://beefy16.nyi.freebsd.org/data/130amd64-default/0ae18b07e470/logs/py38-errbot-6.1.7.log [1]
---
 net/py-errbot/Makefile             |  4 ++--
 net/py-errbot/distinfo             |  6 +++---
 net/py-errbot/files/patch-setup.py | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/net/py-errbot/Makefile b/net/py-errbot/Makefile
index a44c91557937..2cf4d416618c 100644
--- a/net/py-errbot/Makefile
+++ b/net/py-errbot/Makefile
@@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet at FreeBSD.org>
 
 PORTNAME=	errbot
-PORTVERSION=	6.1.7
+PORTVERSION=	6.1.5
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansi>=0:devel/py-ansi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dulwich>=0.19.16:devel/dulwich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}markdown>3.3:textproc/py-markdown@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}markdown>=0<3.0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
diff --git a/net/py-errbot/distinfo b/net/py-errbot/distinfo
index 3d610cc024ed..52a88575397d 100644
--- a/net/py-errbot/distinfo
+++ b/net/py-errbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618944937
-SHA256 (errbot-6.1.7.tar.gz) = 9409cb48b7e9ca780a8b6f18c736d6c63d041465f0d59eeea661ef9516cff546
-SIZE (errbot-6.1.7.tar.gz) = 197371
+TIMESTAMP = 1603378091
+SHA256 (errbot-6.1.5.tar.gz) = 2947fdca8226450fdc77738151fd5b29adbd019222e948e40f7040c43079262e
+SIZE (errbot-6.1.5.tar.gz) = 211958
diff --git a/net/py-errbot/files/patch-setup.py b/net/py-errbot/files/patch-setup.py
index 85c91b609482..d20082386f53 100644
--- a/net/py-errbot/files/patch-setup.py
+++ b/net/py-errbot/files/patch-setup.py
@@ -1,10 +1,10 @@
---- setup.py.orig	2020-12-19 05:26:11 UTC
+--- setup.py.orig	2020-10-10 16:25:15 UTC
 +++ setup.py
-@@ -37,7 +37,6 @@ deps = [
-     'markdown>=3.3',
-     "ansi",
-     "Pygments>=2.0.2",
--    "pygments-markdown-lexer>=0.1.0.dev39",  # sytax coloring to debug md
-     "dulwich>=0.19.16",  # python implementation of git
-     "deepmerge>=0.1.0",
- ]
+@@ -36,7 +36,6 @@ deps = ['webtest',
+         'markdown<3.0',  # rendering stuff, 3.0+ deprecates 'safe()'
+         'ansi',
+         'Pygments>=2.0.2',
+-        'pygments-markdown-lexer>=0.1.0.dev39',  # sytax coloring to debug md
+         'dulwich>=0.19.16',  # python implementation of git
+         'deepmerge>=0.1.0',
+         ]