py-matrix-synapse: Fix distinfo, PLIST, typos & linted.

[Angel M. Adames <angelmadames%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Angel M. Adames <angelmadames%gmail.com@localhost>
Pushed By:	angelmadames
Date:		Wed Oct 4 18:16:18 2017 -0400
Changeset:	180642e796771566d829de2970a593333e3c94ae

Modified Files:
	py-matrix-synapse/MESSAGE
	py-matrix-synapse/Makefile
	py-matrix-synapse/PLIST
	py-matrix-synapse/distinfo
	py-matrix-synapse/options.mk
	py-matrix-synapse/patches/patch-synapse_python__dependencies.py

Log Message:
py-matrix-synapse: Fix distinfo, PLIST, typos & linted.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=180642e796771566d829de2970a593333e3c94ae

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

diffstat:
 py-matrix-synapse/MESSAGE                                    |  4 ++++
 py-matrix-synapse/Makefile                                   |  4 ++--
 py-matrix-synapse/PLIST                                      | 12 ++++++------
 py-matrix-synapse/distinfo                                   | 10 +++++-----
 py-matrix-synapse/options.mk                                 |  2 ++
 .../patches/patch-synapse_python__dependencies.py            |  2 ++
 6 files changed, 21 insertions(+), 13 deletions(-)

diffs:
diff --git a/py-matrix-synapse/MESSAGE b/py-matrix-synapse/MESSAGE
index f10ec8ec18..c5f69ece76 100644
--- a/py-matrix-synapse/MESSAGE
+++ b/py-matrix-synapse/MESSAGE
@@ -1,3 +1,6 @@
+===========================================================================
+$NetBSD$
+
 Configuring Synapse:
 
 You may use the sample config located at @PREFIX@/etc to get started. It
@@ -21,3 +24,4 @@ directory, database, and media storage with this method.
 It is also important that you deploy a TLS certificate that your
 clients accept as valid or some functionality will fail to work
 correctly (eg, media file retrieval).
+===========================================================================
diff --git a/py-matrix-synapse/Makefile b/py-matrix-synapse/Makefile
index b206cf7591..c2ca6efd5e 100644
--- a/py-matrix-synapse/Makefile
+++ b/py-matrix-synapse/Makefile
@@ -30,8 +30,8 @@ DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+= ${PYPKGPREFIX}-frozendict-[0-9]*:../../wip/py-frozendict
 DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64-[0-9]*:../../wip/py-unpaddedbase64
 DEPENDS+= ${PYPKGPREFIX}-canonicaljson-[0-9]*:../../wip/py-canonicaljson
-DEPENDS+= ${PYPKGPREFIX}-macaroons-[0-9]*:../../wip/py-macaroons
-DEPENDS+= ${PYPKGPREFIX}-pycryptodomex-[0-9]*:../../wip/py-pycryptodomex
+DEPENDS+= ${PYPKGPREFIX}-pymacaroons-[0-9]*:../../wip/py-macaroons
+DEPENDS+= ${PYPKGPREFIX}-cryptodomex-[0-9]*:../../wip/py-pycryptodomex
 DEPENDS+= ${PYPKGPREFIX}-matrix-angular-sdk-[0-9]*:../../wip/py-matrix-angular-sdk
 DEPENDS+= ${PYPKGPREFIX}-pydenticon-[0-9]*:../../wip/py-pydenticon
 DEPENDS+= ${PYPKGPREFIX}-pysaml2-[0-9]*:../../wip/py-pysaml2
diff --git a/py-matrix-synapse/PLIST b/py-matrix-synapse/PLIST
index 5bf61e149d..3abb4da9c6 100644
--- a/py-matrix-synapse/PLIST
+++ b/py-matrix-synapse/PLIST
@@ -3,12 +3,12 @@ bin/hash_password
 bin/register_new_matrix_user
 bin/synapse_port_db
 bin/synctl
-${PYSITELIB}/matrix_synapse-${PKGVERSION}-py${PYVERSSUFFIX}.${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/matrix_synapse-${PKGVERSION}-py${PYVERSSUFFIX}.${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/matrix_synapse-${PKGVERSION}-py${PYVERSSUFFIX}.${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/matrix_synapse-${PKGVERSION}-py${PYVERSSUFFIX}.${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/matrix_synapse-${PKGVERSION}-py${PYVERSSUFFIX}.${EGG_INFODIR}/requires.txt
-${PYSITELIB}/matrix_synapse-${PKGVERSION}-py${PYVERSSUFFIX}.${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/matrix_${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/matrix_${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/matrix_${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/matrix_${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/matrix_${EGG_INFODIR}/requires.txt
+${PYSITELIB}/matrix_${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/synapse/__init__.py
 ${PYSITELIB}/synapse/__init__.pyc
 ${PYSITELIB}/synapse/__init__.pyo
diff --git a/py-matrix-synapse/distinfo b/py-matrix-synapse/distinfo
index 9413dc2c05..2491ea055a 100644
--- a/py-matrix-synapse/distinfo
+++ b/py-matrix-synapse/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (synapse-v0.22.1.zip) = b203acb6f921713a35649d6fe49b86b465bad781
-RMD160 (synapse-v0.22.1.zip) = f5c7dae3b3c4afe1cc59ea3fc45fa6499d846ef2
-SHA512 (synapse-v0.22.1.zip) = 313094b2b0cbd8b9e5f84fca90f514e1561902ee072f4a22395b28586b71d62a946d2edbb539c6838ad375666bced4fbb605c6524fac46e32e6b0e0c2f094af1
-Size (synapse-v0.22.1.zip) = 1282036 bytes
-SHA1 (patch-synapse_python__dependencies.py) = 9319dda78ff46c1c375c283307a0a82c93dc9dbd
+SHA1 (synapse-0.22.1.zip) = b203acb6f921713a35649d6fe49b86b465bad781
+RMD160 (synapse-0.22.1.zip) = f5c7dae3b3c4afe1cc59ea3fc45fa6499d846ef2
+SHA512 (synapse-0.22.1.zip) = 313094b2b0cbd8b9e5f84fca90f514e1561902ee072f4a22395b28586b71d62a946d2edbb539c6838ad375666bced4fbb605c6524fac46e32e6b0e0c2f094af1
+Size (synapse-0.22.1.zip) = 1282036 bytes
+SHA1 (patch-synapse_python__dependencies.py) = ce4c61b32aa9728c0258798e328aa373e9f7c402
diff --git a/py-matrix-synapse/options.mk b/py-matrix-synapse/options.mk
index 138503a6d8..1fda5b3bb2 100644
--- a/py-matrix-synapse/options.mk
+++ b/py-matrix-synapse/options.mk
@@ -1,3 +1,5 @@
+# $NetBSD$
+
 PKG_OPTIONS_VAR=		PKG_OPTIONS.synapse
 PKG_SUPPORTED_OPTIONS=		email ldap pgsql sqlite
 
diff --git a/py-matrix-synapse/patches/patch-synapse_python__dependencies.py b/py-matrix-synapse/patches/patch-synapse_python__dependencies.py
index 04edda9bf9..99e22af43d 100644
--- a/py-matrix-synapse/patches/patch-synapse_python__dependencies.py
+++ b/py-matrix-synapse/patches/patch-synapse_python__dependencies.py
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# Fix operand to get proper version.
+
 --- synapse/python_dependencies.py.orig	2017-07-06 17:11:49.000000000 +0000
 +++ synapse/python_dependencies.py
 @@ -24,7 +24,7 @@ REQUIREMENTS = {