CVS commit: pkgsrc/mail/rss2email

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Aug 28 19:44:49 UTC 2019

Modified Files:
        pkgsrc/mail/rss2email: Makefile distinfo
Added Files:
        pkgsrc/mail/rss2email/patches: patch-rss2email_feed.py

Log Message:
Switch to new upstream, and apply its patch to work around html2text
having gotten rid of unescape(). Mollify pkglint. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/mail/rss2email/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/rss2email/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/mail/rss2email/patches/patch-rss2email_feed.py

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

Modified files:

Index: pkgsrc/mail/rss2email/Makefile
diff -u pkgsrc/mail/rss2email/Makefile:1.43 pkgsrc/mail/rss2email/Makefile:1.44
--- pkgsrc/mail/rss2email/Makefile:1.43 Thu Apr 25 07:33:05 2019
+++ pkgsrc/mail/rss2email/Makefile      Wed Aug 28 19:44:48 2019
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.43 2019/04/25 07:33:05 maya Exp $
+# $NetBSD: Makefile,v 1.44 2019/08/28 19:44:48 schmonz Exp $
 
-DISTNAME=              rss2email-3.9
-PKGREVISION=           2
-CATEGORIES=            mail
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=wking/}
-GITHUB_TAG=            v${PKGVERSION_NOREV}
+GITHUB_PROJECT=                rss2email
+DISTNAME=              v3.9
+PKGNAME=               ${GITHUB_PROJECT}-${DISTNAME:S/^v//}
+PKGREVISION=           3
+CATEGORIES=            mail python
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=rss2email/}
+DIST_SUBDIR=           ${GITHUB_PROJECT}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
-HOMEPAGE=              https://github.com/wking/rss2email/
+HOMEPAGE=              https://github.com/rss2email/rss2email/
 COMMENT=               Get RSS feeds emailed to you
 LICENSE=               gnu-gpl-v2
 
@@ -24,7 +26,7 @@ REPLACE_PYTHON=               test/test.py
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1
 
 do-test:
-       cd ${WRKSRC} && env PYTHONPATH=.:${LOCALBASE}/share/html2text ./test/test.py
+       cd ${WRKSRC} && env PYTHONPATH=.:${PREFIX}/share/html2text ./test/test.py
 
 post-install:
        set -e; cd ${WRKSRC};                                           \

Index: pkgsrc/mail/rss2email/distinfo
diff -u pkgsrc/mail/rss2email/distinfo:1.28 pkgsrc/mail/rss2email/distinfo:1.29
--- pkgsrc/mail/rss2email/distinfo:1.28 Mon May 22 17:51:12 2017
+++ pkgsrc/mail/rss2email/distinfo      Wed Aug 28 19:44:48 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.28 2017/05/22 17:51:12 leot Exp $
+$NetBSD: distinfo,v 1.29 2019/08/28 19:44:48 schmonz Exp $
 
-SHA1 (rss2email-3.9.tar.gz) = 3d82fa1da8a59942c22b74f2f290d7f2ebe33ecc
-RMD160 (rss2email-3.9.tar.gz) = d6410a0303a2a24245300d2946852ff2f660dfe5
-SHA512 (rss2email-3.9.tar.gz) = 6958eb401d782a027dcf98fbb3cac0d37e58641b800cb1e62916fc898603bb7032900aca34c1744b2c6896963babb61e28dbfedfeaf4206224b15baa2ef09cd9
-Size (rss2email-3.9.tar.gz) = 160904 bytes
+SHA1 (rss2email/v3.9.tar.gz) = 3d82fa1da8a59942c22b74f2f290d7f2ebe33ecc
+RMD160 (rss2email/v3.9.tar.gz) = d6410a0303a2a24245300d2946852ff2f660dfe5
+SHA512 (rss2email/v3.9.tar.gz) = 6958eb401d782a027dcf98fbb3cac0d37e58641b800cb1e62916fc898603bb7032900aca34c1744b2c6896963babb61e28dbfedfeaf4206224b15baa2ef09cd9
+Size (rss2email/v3.9.tar.gz) = 160904 bytes
 SHA1 (patch-rss2email_config.py) = f99a023a1f3b207da46e721da112321fa1e5153d
+SHA1 (patch-rss2email_feed.py) = f626b710703bc70da82eed191872818b130085fc

Added files:

Index: pkgsrc/mail/rss2email/patches/patch-rss2email_feed.py
diff -u /dev/null pkgsrc/mail/rss2email/patches/patch-rss2email_feed.py:1.3
--- /dev/null   Wed Aug 28 19:44:49 2019
+++ pkgsrc/mail/rss2email/patches/patch-rss2email_feed.py       Wed Aug 28 19:44:48 2019
@@ -0,0 +1,24 @@
+$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