CVS commit: pkgsrc/filesystems/tahoe-lafs

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Mar 18 19:41:14 UTC 2021

Modified Files:
        pkgsrc/filesystems/tahoe-lafs: Makefile

Log Message:
tahoe-lafs: Rototill list of dependencies

Catch up with several years of changes.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/filesystems/tahoe-lafs/Makefile

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

Modified files:

Index: pkgsrc/filesystems/tahoe-lafs/Makefile
diff -u pkgsrc/filesystems/tahoe-lafs/Makefile:1.45 pkgsrc/filesystems/tahoe-lafs/Makefile:1.46
--- pkgsrc/filesystems/tahoe-lafs/Makefile:1.45 Thu Mar 18 18:09:18 2021
+++ pkgsrc/filesystems/tahoe-lafs/Makefile      Thu Mar 18 19:41:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2021/03/18 18:09:18 gdt Exp $
+# $NetBSD: Makefile,v 1.46 2021/03/18 19:41:14 gdt Exp $
 
 DISTNAME=      tahoe-lafs-1.15.0
 CATEGORIES=    filesystems
@@ -12,34 +12,45 @@ LICENSE=    gnu-gpl-v2
 
 USE_TOOLS=     gmake
 
-# TODO
-# fix nevow: doc location
+# \todo: fix nevow doc location
 
-# Included egg darcsver, but depend anyway.
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-darcsver-[0-9]*:../../devel/py-darcsver
+PYTHON_VERSIONS_ACCEPTED=      27 # py-xml via py-nevow, py-zbase32, py-cryptopp
+DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
-DEPENDS+=      ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
+# from tahoe's setup.py
 DEPENDS+=      ${PYPKGPREFIX}-zfec>=1.1.0:../../converters/py-zfec
-DEPENDS+=      ${PYPKGPREFIX}-zbase32-[0-9]*:../../converters/py-zbase32
-DEPENDS+=      ${PYPKGPREFIX}-simplejson>=1.4:../../converters/py-simplejson
-DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
-DEPENDS+=      ${PYPKGPREFIX}-pyutil-[0-9]*:../../devel/py-pyutil
-# Included egg setuptools_trial, not used.
-# Included egg setuptools_darcs, used (no package yet).
+# \todo zope.interface
 DEPENDS+=      ${PYPKGPREFIX}-foolscap>=0.12.6:../../net/py-foolscap
+DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-twisted>=16.1.0:../../net/py-twisted
-DEPENDS+=      ${PYPKGPREFIX}-asn1>=0.1.8:../../security/py-asn1
-DEPENDS+=      ${PYPKGPREFIX}-asn1-modules>=0.0.5:../../security/py-asn1-modules
-DEPENDS+=      ${PYPKGPREFIX}-characteristic>=14.0.0:../../devel/py-characteristic
-DEPENDS+=      ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
-DEPENDS+=      ${PYPKGPREFIX}-cryptopp>=0.6.0:../../security/py-cryptopp
-DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=0.14:../../security/py-OpenSSL
+# bcrypt and appdirs required as twisted deps at runtime
+DEPENDS+=      ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
+DEPENDS+=      ${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
 DEPENDS+=      ${PYPKGPREFIX}-nevow>=0.11.1:../../www/py-nevow
-DEPENDS+=      ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
 DEPENDS+=      ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
+DEPENDS+=      ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
+DEPENDS+=      ${PYPKGPREFIX}-magic-wormhole-[0-9]*:../../net/py-magic-wormhole
+DEPENDS+=      ${PYPKGPREFIX}-eliot-[0-9]*:../../sysutils/py-eliot17
+DEPENDS+=      ${PYPKGPREFIX}-pyrsistent-[0-9]*:../../devel/py-pyrsistent
+# \todo pyrsistent
+# \todo attrs
+# autobahn D2019.09.20.04.00.00
+DEPENDS+=      ${PYPKGPREFIX}-autobahn-[0-9]*:../../www/py-autobahn
+DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
+DEPENDS+=      ${PYPKGPREFIX}-pyutil-[0-9]*:../../devel/py-pyutil
+DEPENDS+=      ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro
 
-PYTHON_VERSIONS_ACCEPTED=      27 # py-xml via py-nevow, py-zbase32, py-cryptopp, py-darcsver
+# 19.0.0 from 2020-01-01 works with 27
+# \todo import/version an older one
+DEPENDS+=       ${PYPKGPREFIX}-txtorcon-[0-9]*:../../net/py-txtorcon
+
+# todo txi2p
+
+# Not in setup.py, but seems to exist elsewhere.
+#DEPENDS+=     ${PYPKGPREFIX}-asn1>=0.1.8:../../security/py-asn1
+#DEPENDS+=     ${PYPKGPREFIX}-asn1-modules>=0.0.5:../../security/py-asn1-modules
+#DEPENDS+=     ${PYPKGPREFIX}-OpenSSL>=0.14:../../security/py-OpenSSL
+#DEPENDS+=     ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
 
 # Note that there is an upstream (inherited from setuptools) bug
 #   https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that
@@ -47,13 +58,11 @@ PYTHON_VERSIONS_ACCEPTED=   27 # py-xml vi
 # installed.  If you get mysterious failures, pkg_delete the installed
 # version.
 
-REPLACE_PYTHON+=       src/allmydata/storage/shares.py
-
 PKG_GROUPS=            tahoes
 PKG_USERS=             tahoes:tahoes
 PKG_GECOS.tahoes=      tahoe server
 
-# now tox
+# \todo Convert do-test to use tox
 #do-test:
 #      cd ${WRKSRC} && py.test-2.7