pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Removed converters/py-html2text, as it's a duplicate o...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ab8779990a9
branches:  trunk
changeset: 355545:2ab8779990a9
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Sun Dec 04 22:02:00 2016 +0000

description:
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.

diffstat:

 converters/Makefile                  |   3 +--
 converters/py-html2text/ALTERNATIVES |   1 -
 converters/py-html2text/DESCR        |   3 ---
 converters/py-html2text/Makefile     |  21 ---------------------
 converters/py-html2text/PLIST        |  23 -----------------------
 converters/py-html2text/distinfo     |   6 ------
 doc/CHANGES-2016                     |   3 +--
 textproc/py-html2text/Makefile       |  10 ++++++----
 www/py-trytond-web-user/Makefile     |   4 ++--
 9 files changed, 10 insertions(+), 64 deletions(-)

diffs (150 lines):

diff -r 7bb690ce67b5 -r 2ab8779990a9 converters/Makefile
--- a/converters/Makefile       Sun Dec 04 21:56:30 2016 +0000
+++ b/converters/Makefile       Sun Dec 04 22:02:00 2016 +0000
@@ -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+=       pstotext
 SUBDIR+=       py-cairosvg
 SUBDIR+=       py-chardet
-SUBDIR+=       py-html2text
 SUBDIR+=       py-jpCodecs
 SUBDIR+=       py-simplejson
 SUBDIR+=       py-yenc
diff -r 7bb690ce67b5 -r 2ab8779990a9 converters/py-html2text/ALTERNATIVES
--- a/converters/py-html2text/ALTERNATIVES      Sun Dec 04 21:56:30 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-bin/html2text @PREFIX@/bin/html2text@PYVERSSUFFIX@
diff -r 7bb690ce67b5 -r 2ab8779990a9 converters/py-html2text/DESCR
--- a/converters/py-html2text/DESCR     Sun Dec 04 21:56:30 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 7bb690ce67b5 -r 2ab8779990a9 converters/py-html2text/Makefile
--- a/converters/py-html2text/Makefile  Sun Dec 04 21:56:30 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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 -r 7bb690ce67b5 -r 2ab8779990a9 converters/py-html2text/PLIST
--- a/converters/py-html2text/PLIST     Sun Dec 04 21:56:30 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 7bb690ce67b5 -r 2ab8779990a9 converters/py-html2text/distinfo
--- a/converters/py-html2text/distinfo  Sun Dec 04 21:56:30 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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
diff -r 7bb690ce67b5 -r 2ab8779990a9 doc/CHANGES-2016
--- a/doc/CHANGES-2016  Sun Dec 04 21:56:30 2016 +0000
+++ b/doc/CHANGES-2016  Sun Dec 04 22:02:00 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2016,v 1.4907 2016/12/04 21:25:42 rodent Exp $
+$NetBSD: CHANGES-2016,v 1.4908 2016/12/04 22:02:00 rodent Exp $
 
 Changes to the packages collection and infrastructure in 2016:
 
@@ -6714,7 +6714,6 @@
        Updated archivers/zstd to 1.1.1 [wiz 2016-12-04]
        Updated security/fail2ban to 0.9.5 [nils 2016-12-04]
        Updated print/cups-filters to 1.12.0 [leot 2016-12-04]
-       Added converters/py-html2text version 2016.9.19 [rodent 2016-12-04]
        Added databases/py-ldap3 version 2.1.1 [rodent 2016-12-04]
        Added databases/py-trytond-ldap-authentication version 4.2.0 [rodent 2016-12-04]
        Added devel/py-appdirs version 1.4.0 [rodent 2016-12-04]
diff -r 7bb690ce67b5 -r 2ab8779990a9 textproc/py-html2text/Makefile
--- a/textproc/py-html2text/Makefile    Sun Dec 04 21:56:30 2016 +0000
+++ b/textproc/py-html2text/Makefile    Sun Dec 04 22:02:00 2016 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.48 2016/10/05 09:18:35 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2016/12/04 22:02:00 rodent Exp $
 
 DISTNAME=              html2text-2016.9.19
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=            textproc python
+CATEGORIES=            converters python textproc 
 MASTER_SITES=          ${MASTER_SITE_PYPI:=h/html2text/}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
-HOMEPAGE=              https://pypi.python.org/pypi/html2text/
+HOMEPAGE=              https://github.com/Alir3z4/html2text
 COMMENT=               Convert HTML into easy-to-read plain ASCII text
-LICENSE=               gnu-gpl-v2
+LICENSE=               gnu-gpl-v3
+
+USE_LANGUAGES=         # none
 
 REPLACE_PYTHON=        html2text/__init__.py
 
diff -r 7bb690ce67b5 -r 2ab8779990a9 www/py-trytond-web-user/Makefile
--- a/www/py-trytond-web-user/Makefile  Sun Dec 04 21:56:30 2016 +0000
+++ b/www/py-trytond-web-user/Makefile  Sun Dec 04 22:02:00 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/12/04 21:13:09 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/04 22:02:00 rodent Exp $
 TRYTON_MODULE_NAME=    trytond_web_user
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=    python www
@@ -11,7 +11,7 @@
 DEPENDS+=      ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party
 DEPENDS+=      ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 DEPENDS+=      ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
-DEPENDS+=      ${PYPKGPREFIX}-html2text-[0-9]*:../../converters/py-html2text
+DEPENDS+=      ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 
 USE_LANGUAGES= # none
 



Home | Main Index | Thread Index | Old Index