CVS commit: pkgsrc

["Blue Rats" <rodent%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rodent
Date:           Sun Dec  4 22:02:00 UTC 2016

Modified Files:
        pkgsrc/converters: Makefile
        pkgsrc/doc: CHANGES-2016
        pkgsrc/textproc/py-html2text: Makefile
        pkgsrc/www/py-trytond-web-user: Makefile
Removed Files:
        pkgsrc/converters/py-html2text: ALTERNATIVES DESCR Makefile PLIST
            distinfo

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 pkgsrc/converters/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/converters/py-html2text/ALTERNATIVES \
    pkgsrc/converters/py-html2text/DESCR \
    pkgsrc/converters/py-html2text/Makefile \
    pkgsrc/converters/py-html2text/PLIST \
    pkgsrc/converters/py-html2text/distinfo
cvs rdiff -u -r1.4907 -r1.4908 pkgsrc/doc/CHANGES-2016
cvs rdiff -u -r1.48 -r1.49 pkgsrc/textproc/py-html2text/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-trytond-web-user/Makefile

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

Modified files:

Index: pkgsrc/converters/Makefile
diff -u pkgsrc/converters/Makefile:1.146 pkgsrc/converters/Makefile:1.147
--- pkgsrc/converters/Makefile:1.146    Sun Dec  4 21:12:58 2016
+++ pkgsrc/converters/Makefile  Sun Dec  4 22:02:00 2016
@@ -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

Index: pkgsrc/doc/CHANGES-2016
diff -u pkgsrc/doc/CHANGES-2016:1.4907 pkgsrc/doc/CHANGES-2016:1.4908
--- pkgsrc/doc/CHANGES-2016:1.4907      Sun Dec  4 21:25:42 2016
+++ pkgsrc/doc/CHANGES-2016     Sun Dec  4 22:02:00 2016
@@ -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 @@ Changes to the packages collection and i
        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]

Index: pkgsrc/textproc/py-html2text/Makefile
diff -u pkgsrc/textproc/py-html2text/Makefile:1.48 pkgsrc/textproc/py-html2text/Makefile:1.49
--- pkgsrc/textproc/py-html2text/Makefile:1.48  Wed Oct  5 09:18:35 2016
+++ pkgsrc/textproc/py-html2text/Makefile       Sun Dec  4 22:02:00 2016
@@ -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
 

Index: pkgsrc/www/py-trytond-web-user/Makefile
diff -u pkgsrc/www/py-trytond-web-user/Makefile:1.1 pkgsrc/www/py-trytond-web-user/Makefile:1.2
--- pkgsrc/www/py-trytond-web-user/Makefile:1.1 Sun Dec  4 21:13:09 2016
+++ pkgsrc/www/py-trytond-web-user/Makefile     Sun Dec  4 22:02:00 2016
@@ -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 @@ LICENSE=      gnu-gpl-v3
 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