Update to 2014.4.5 (new upstream and versioning). From the git log:

* Make html2text.py compatible with python 3.*.
* PEP8ize the script.
* Switch tests to unittest (w/generated test cases).
* Remove .editorconfig.
* Remove deprecated function has_key.
* Handle invalid literals for start attribute.
* Add bodywidth parameter instead of module-wide BODY_WIDTH.

4 files changed, 26 insertions, 43 deletions

diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile
index 55cdd63ab3e..b5f1555d3eb 100644
--- a/textproc/py-html2text/Makefile
+++ b/textproc/py-html2text/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2014/04/18 13:00:01 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2014/04/20 01:44:53 schmonz Exp $
 
-DISTNAME=		html2text-3.200.3
+DISTNAME=		html2text-2014.4.5
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		textproc python
 MASTER_SITES=		http://pypi.python.org/packages/source/h/html2text/
@@ -10,16 +10,8 @@ HOMEPAGE=		https://pypi.python.org/pypi/html2text/
 COMMENT=		Convert HTML into easy-to-read plain ASCII text
 LICENSE=		gnu-gpl-v2
 
-PYTHON_SELF_CONFLICT=		yes
+PYTHON_SELF_CONFLICT=	yes
+PYDISTUTILSPKG=		yes
 
-NO_BUILD=		yes
-
-REPLACE_PYTHON=		html2text.py
-
-INSTALLATION_DIRS=	share/html2text
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/html2text.py ${DESTDIR}${PREFIX}/share/html2text
-
-.include "../../lang/python/application.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-html2text/PLIST b/textproc/py-html2text/PLIST
index 60d5ff1850b..1a6d816a162 100644
--- a/textproc/py-html2text/PLIST
+++ b/textproc/py-html2text/PLIST
@@ -1,2 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:17:25 joerg Exp $
-share/html2text/html2text.py
+@comment $NetBSD: PLIST,v 1.4 2014/04/20 01:44:53 schmonz Exp $
+bin/html2text
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/html2text.py
+${PYSITELIB}/html2text.pyc
+${PYSITELIB}/html2text.pyo
+${PYSITELIB}/test/__init__.py
+${PYSITELIB}/test/__init__.pyc
+${PYSITELIB}/test/__init__.pyo
+${PYSITELIB}/test/test_html2text.py
+${PYSITELIB}/test/test_html2text.pyc
+${PYSITELIB}/test/test_html2text.pyo
diff --git a/textproc/py-html2text/distinfo b/textproc/py-html2text/distinfo
index 4fe3496940d..116135b74f6 100644
--- a/textproc/py-html2text/distinfo
+++ b/textproc/py-html2text/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.16 2013/06/06 01:52:01 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2014/04/20 01:44:53 schmonz Exp $
 
-SHA1 (html2text-3.200.3.tar.gz) = ad16673a3e999b7b20ee9c83794d84f641321ae3
-RMD160 (html2text-3.200.3.tar.gz) = c17fe2f1fd558bba544f94aa8a669f5365e8d201
-Size (html2text-3.200.3.tar.gz) = 21446 bytes
-SHA1 (patch-aa) = bb965a3ab2f6015fa3e71e21d535ad1ef701b12a
+SHA1 (html2text-2014.4.5.tar.gz) = 4e8370a389eabdab7bdc203775114abe0698a3a7
+RMD160 (html2text-2014.4.5.tar.gz) = db84c4c932a1027a7d23da81a1e0790e8a4d3344
+Size (html2text-2014.4.5.tar.gz) = 25098 bytes
diff --git a/textproc/py-html2text/patches/patch-aa b/textproc/py-html2text/patches/patch-aa
deleted file mode 100644
index dcfbe724c0e..00000000000
--- a/textproc/py-html2text/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2013/06/06 01:52:01 schmonz Exp $
-
-Small cleanup patch from Debian.
-
---- html2text.py.orig	2012-01-07 15:00:40.000000000 +0000
-+++ html2text.py
-@@ -479,6 +479,7 @@ class HTML2Text(HTMLParser.HTMLParser):
-             if has_key(attrs, 'src'):
-                 attrs['href'] = attrs['src']
-                 alt = attrs.get('alt', '')
-+                alt = re.sub('\n', ' ', alt)
-                 if self.inline_links:
-                     self.o("![")
-                     self.o(alt)
-@@ -512,7 +513,7 @@ class HTML2Text(HTMLParser.HTMLParser):
-                     list_style = tag
-                 numbering_start = list_numbering_start(attrs)
-                 self.list.append({'name':list_style, 'num':numbering_start})
--            else:
-+            elif self.list:
-                 if self.list: self.list.pop()
-             self.lastWasList = True
-         else: