Removed converters/py-html2text, as it's a duplicate of the one in textproc

Merged the updates from the new package to the old one. Updated the Tryton
dependency which uses it.

6 files changed, 1 insertions, 56 deletions

diff --git a/converters/Makefile b/converters/Makefile
index 6c96c45cf1e..32cd336d721 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2016/12/04 21:12:58 rodent Exp $
+# $NetBSD: Makefile,v 1.147 2016/12/04 22:02:00 rodent Exp $
 #
 
 COMMENT=	Document format and character code converters
@@ -98,7 +98,6 @@ SUBDIR+=	psiconv
 SUBDIR+=	pstotext
 SUBDIR+=	py-cairosvg
 SUBDIR+=	py-chardet
-SUBDIR+=	py-html2text
 SUBDIR+=	py-jpCodecs
 SUBDIR+=	py-simplejson
 SUBDIR+=	py-yenc
diff --git a/converters/py-html2text/ALTERNATIVES b/converters/py-html2text/ALTERNATIVES
deleted file mode 100644
index 734fd316850..00000000000
--- a/converters/py-html2text/ALTERNATIVES
+++ /dev/null
@@ -1 +0,0 @@
-bin/html2text @PREFIX@/bin/html2text@PYVERSSUFFIX@
diff --git a/converters/py-html2text/DESCR b/converters/py-html2text/DESCR
deleted file mode 100644
index 1e2f2cdd062..00000000000
--- a/converters/py-html2text/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Turn HTML into equivalent Markdown-structured text. Html2text is a Python script
-that converts a page of HTML into clean, easy-to-read, plain, ASCII text. Better
-yet, that ASCII also happens to be valid Markdown (a text-to-HTML format).
diff --git a/converters/py-html2text/Makefile b/converters/py-html2text/Makefile
deleted file mode 100644
index 0237ca9bab1..00000000000
--- a/converters/py-html2text/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2016/12/04 21:12:59 rodent Exp $
-
-DISTNAME=	html2text-2016.9.19
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	converters python textproc
-MASTER_SITES=	https://files.pythonhosted.org/packages/source/h/html2text/
-
-MAINTAINER=	rodent@NetBSD.org
-HOMEPAGE=	https://github.ccom/Alir3z4/html2text
-COMMENT=	Python script that converts a page of HTML into clean ASCII text
-LICENSE=	gnu-gpl-v3
-
-USE_LANGUAGES=	# none
-
-post-install:
-	${MV} ${DESTDIR}${PREFIX}/bin/html2text \
-		${DESTDIR}${PREFIX}/bin/html2text${PYVERSSUFFIX}
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/converters/py-html2text/PLIST b/converters/py-html2text/PLIST
deleted file mode 100644
index 3495a70c485..00000000000
--- a/converters/py-html2text/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/12/04 21:12:59 rodent Exp $
-bin/html2text${PYVERSSUFFIX}
-${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/__init__.py
-${PYSITELIB}/html2text/__init__.pyc
-${PYSITELIB}/html2text/__init__.pyo
-${PYSITELIB}/html2text/cli.py
-${PYSITELIB}/html2text/cli.pyc
-${PYSITELIB}/html2text/cli.pyo
-${PYSITELIB}/html2text/compat.py
-${PYSITELIB}/html2text/compat.pyc
-${PYSITELIB}/html2text/compat.pyo
-${PYSITELIB}/html2text/config.py
-${PYSITELIB}/html2text/config.pyc
-${PYSITELIB}/html2text/config.pyo
-${PYSITELIB}/html2text/utils.py
-${PYSITELIB}/html2text/utils.pyc
-${PYSITELIB}/html2text/utils.pyo
diff --git a/converters/py-html2text/distinfo b/converters/py-html2text/distinfo
deleted file mode 100644
index ad652ecceb6..00000000000
--- a/converters/py-html2text/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1 2016/12/04 21:12:59 rodent Exp $
-
-SHA1 (html2text-2016.9.19.tar.gz) = d0ad27c5d7e27472339c357669b56fd846c5e85e
-RMD160 (html2text-2016.9.19.tar.gz) = dac3afaeb4213a2fd34fc129e235d2c6c98ca8b9
-SHA512 (html2text-2016.9.19.tar.gz) = cbc67f2815c20bfed84bfdff1c44ac3f4d6cbeb5e5b62adaf08b485fb2c886605b7f8a9f85f420e1158117194e7aa3de064aaef5ca018f5c81d15ebf5065b061
-Size (html2text-2016.9.19.tar.gz) = 47899 bytes