Wed Aug 28 19:44:49 2019 UTC ()
Switch to new upstream, and apply its patch to work around html2text
having gotten rid of unescape(). Mollify pkglint. Bump PKGREVISION.


(schmonz)
diff -r1.43 -r1.44 pkgsrc/mail/rss2email/Makefile
diff -r1.28 -r1.29 pkgsrc/mail/rss2email/distinfo
diff -r0 -r1.3 pkgsrc/mail/rss2email/patches/patch-rss2email_feed.py
cvs diff -r1.43 -r1.44 pkgsrc/mail/rss2email/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/rss2email/Makefile 2019/04/25 07:33:05 1.43
+++ pkgsrc/mail/rss2email/Makefile 2019/08/28 19:44:48 1.44
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.43 2019/04/25 07:33:05 maya Exp $ 1# $NetBSD: Makefile,v 1.44 2019/08/28 19:44:48 schmonz Exp $
2 2
3DISTNAME= rss2email-3.9 3GITHUB_PROJECT= rss2email
4PKGREVISION= 2 4DISTNAME= v3.9
5CATEGORIES= mail 5PKGNAME= ${GITHUB_PROJECT}-${DISTNAME:S/^v//}
6MASTER_SITES= ${MASTER_SITE_GITHUB:=wking/} 6PKGREVISION= 3
7GITHUB_TAG= v${PKGVERSION_NOREV} 7CATEGORIES= mail python
 8MASTER_SITES= ${MASTER_SITE_GITHUB:=rss2email/}
 9DIST_SUBDIR= ${GITHUB_PROJECT}
8 10
9MAINTAINER= schmonz@NetBSD.org 11MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://github.com/wking/rss2email/ 12HOMEPAGE= https://github.com/rss2email/rss2email/
11COMMENT= Get RSS feeds emailed to you 13COMMENT= Get RSS feeds emailed to you
12LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
13 15
14DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 16DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
15DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.0.1:../../textproc/py-feedparser 17DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.0.1:../../textproc/py-feedparser
16DEPENDS+= ${PYPKGPREFIX}-html2text>=2014.4.5:../../textproc/py-html2text 18DEPENDS+= ${PYPKGPREFIX}-html2text>=2014.4.5:../../textproc/py-html2text
17 19
18PYTHON_VERSIONS_INCOMPATIBLE= 27 20PYTHON_VERSIONS_INCOMPATIBLE= 27
19 21
20PYDISTUTILSPKG= yes 22PYDISTUTILSPKG= yes
21PY_PATCHPLIST= yes 23PY_PATCHPLIST= yes
22REPLACE_PYTHON= test/test.py 24REPLACE_PYTHON= test/test.py
23 25
24INSTALLATION_DIRS= ${PKGMANDIR}/man1 26INSTALLATION_DIRS= ${PKGMANDIR}/man1
25 27
26do-test: 28do-test:
27 cd ${WRKSRC} && env PYTHONPATH=.:${LOCALBASE}/share/html2text ./test/test.py 29 cd ${WRKSRC} && env PYTHONPATH=.:${PREFIX}/share/html2text ./test/test.py
28 30
29post-install: 31post-install:
30 set -e; cd ${WRKSRC}; \ 32 set -e; cd ${WRKSRC}; \
31 ${INSTALL_MAN} r2e.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 33 ${INSTALL_MAN} r2e.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
32 34
33.include "../../lang/python/application.mk" 35.include "../../lang/python/application.mk"
34.include "../../lang/python/extension.mk" 36.include "../../lang/python/extension.mk"
35.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/mail/rss2email/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/rss2email/distinfo 2017/05/22 17:51:12 1.28
+++ pkgsrc/mail/rss2email/distinfo 2019/08/28 19:44:48 1.29
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.28 2017/05/22 17:51:12 leot Exp $ 1$NetBSD: distinfo,v 1.29 2019/08/28 19:44:48 schmonz Exp $
2 2
3SHA1 (rss2email-3.9.tar.gz) = 3d82fa1da8a59942c22b74f2f290d7f2ebe33ecc 3SHA1 (rss2email/v3.9.tar.gz) = 3d82fa1da8a59942c22b74f2f290d7f2ebe33ecc
4RMD160 (rss2email-3.9.tar.gz) = d6410a0303a2a24245300d2946852ff2f660dfe5 4RMD160 (rss2email/v3.9.tar.gz) = d6410a0303a2a24245300d2946852ff2f660dfe5
5SHA512 (rss2email-3.9.tar.gz) = 6958eb401d782a027dcf98fbb3cac0d37e58641b800cb1e62916fc898603bb7032900aca34c1744b2c6896963babb61e28dbfedfeaf4206224b15baa2ef09cd9 5SHA512 (rss2email/v3.9.tar.gz) = 6958eb401d782a027dcf98fbb3cac0d37e58641b800cb1e62916fc898603bb7032900aca34c1744b2c6896963babb61e28dbfedfeaf4206224b15baa2ef09cd9
6Size (rss2email-3.9.tar.gz) = 160904 bytes 6Size (rss2email/v3.9.tar.gz) = 160904 bytes
7SHA1 (patch-rss2email_config.py) = f99a023a1f3b207da46e721da112321fa1e5153d 7SHA1 (patch-rss2email_config.py) = f99a023a1f3b207da46e721da112321fa1e5153d
 8SHA1 (patch-rss2email_feed.py) = f626b710703bc70da82eed191872818b130085fc
File Added: pkgsrc/mail/rss2email/patches/Attic/patch-rss2email_feed.py
$NetBSD: patch-rss2email_feed.py,v 1.3 2019/08/28 19:44:48 schmonz Exp $

html2text no longer provides unescape(). Python 3.4's html module does.
<https://github.com/rss2email/rss2email/commit/81824e25723dcd2936f25f64ebc16f2e8ec9f310>

--- rss2email/feed.py.orig	2014-09-01 23:21:01.000000000 +0000
+++ rss2email/feed.py
@@ -48,6 +48,7 @@ import xml.sax.saxutils as _saxutils
 
 import feedparser as _feedparser
 import html2text as _html2text
+import html as _html
 
 from . import __url__
 from . import __version__
@@ -595,7 +596,7 @@ class Feed (object):
         if 'name' in feed.get('publisher_detail', []):
             data['publisher'] = feed.publisher_detail.name
         name = self.name_format.format(**data)
-        return _html2text.unescape(name)
+        return _html.unescape(name)
 
     def _validate_email(self, email, default=None):
         """Do a basic quality check on email address