tahoe-lafs: Semi-cope with missing dependencies

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Fri Mar 19 15:25:59 2021 -0400
Changeset:	e574b58d48d5a772ee6ee971e3ff4769a7f51645

Modified Files:
	tahoe-lafs/Makefile
	tahoe-lafs/distinfo
Added Files:
	tahoe-lafs/patches/patch-setup.py
	tahoe-lafs/patches/patch-src_allmydata___auto__deps.py
	tahoe-lafs/patches/patch-src_allmydata_scripts_create__node.py
	tahoe-lafs/patches/patch-src_allmydata_scripts_tahoe__invite.py

Log Message:
tahoe-lafs: Semi-cope with missing dependencies

Comment out dependencies that are missing for 2.7.  Patch out
requiring of magic-wormhole.

Now, this builds, and if one hand-builds an old autobahn seems to run.

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

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

diffstat:
 tahoe-lafs/Makefile                                         |  5 +++--
 tahoe-lafs/distinfo                                         |  4 ++++
 tahoe-lafs/patches/patch-setup.py                           | 13 +++++++++++++
 tahoe-lafs/patches/patch-src_allmydata___auto__deps.py      | 13 +++++++++++++
 .../patches/patch-src_allmydata_scripts_create__node.py     | 13 +++++++++++++
 .../patches/patch-src_allmydata_scripts_tahoe__invite.py    | 13 +++++++++++++
 6 files changed, 59 insertions(+), 2 deletions(-)

diffs:
diff --git a/tahoe-lafs/Makefile b/tahoe-lafs/Makefile
index 22bd252caf..cefbc14855 100644
--- a/tahoe-lafs/Makefile
+++ b/tahoe-lafs/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.47 2021/03/18 23:23:31 gdt Exp $
 
 DISTNAME=	tahoe-lafs-1.15.0
+PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	https://tahoe-lafs.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -36,14 +37,14 @@ 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}-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
 
 # 19.0.0 from 2020-01-01 works with 27
 # \todo import/version an older one
-DEPENDS+=	${PYPKGPREFIX}-txtorcon-[0-9]*:../../net/py-txtorcon
+#DEPENDS+=	${PYPKGPREFIX}-txtorcon-[0-9]*:../../net/py-txtorcon
 
 # todo txi2p
 
diff --git a/tahoe-lafs/distinfo b/tahoe-lafs/distinfo
index d4cd504a7b..fea9ad0152 100644
--- a/tahoe-lafs/distinfo
+++ b/tahoe-lafs/distinfo
@@ -4,3 +4,7 @@ SHA1 (tahoe-lafs-1.15.0.tar.bz2) = 153ee4f1b9cc64b3266870172a9f6f21cbd86e40
 RMD160 (tahoe-lafs-1.15.0.tar.bz2) = 8e860e96ac23f98c554c50e1bdd9620e22fbddba
 SHA512 (tahoe-lafs-1.15.0.tar.bz2) = 3a714568c29501d0d0ae32b07d11d78189e6dee6996d4816fac41e710d8081247611870eb6bc7ba393afbd368acf938dd6852bb34e2171dc0b76a3ac840142c4
 Size (tahoe-lafs-1.15.0.tar.bz2) = 2882965 bytes
+SHA1 (patch-setup.py) = 5a6079d18d3e6f0a49470abffc46dcdcdfe14e73
+SHA1 (patch-src_allmydata___auto__deps.py) = c1def9428e908061fea53db050e44c60aef93479
+SHA1 (patch-src_allmydata_scripts_create__node.py) = cbf0a66c829b829d2b730b8dee0c12d047b08d26
+SHA1 (patch-src_allmydata_scripts_tahoe__invite.py) = f9012966d464aad0cc226f56d4cbf485538fe203
diff --git a/tahoe-lafs/patches/patch-setup.py b/tahoe-lafs/patches/patch-setup.py
new file mode 100644
index 0000000000..e50d083d16
--- /dev/null
+++ b/tahoe-lafs/patches/patch-setup.py
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- setup.py.orig	2021-02-02 19:56:32.000000000 +0000
++++ setup.py
+@@ -110,7 +110,7 @@ install_requires = [
+     "six >= 1.10.0",
+ 
+     # for 'tahoe invite' and 'tahoe join'
+-    "magic-wormhole >= 0.10.2",
++#    "magic-wormhole >= 0.10.2",
+ 
+     # Eliot is contemplating dropping Python 2 support.  Stick to a version we
+     # know works on Python 2.7.
diff --git a/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py b/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py
new file mode 100644
index 0000000000..df52aec647
--- /dev/null
+++ b/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/allmydata/_auto_deps.py.orig	2021-02-02 19:56:32.000000000 +0000
++++ src/allmydata/_auto_deps.py
+@@ -26,7 +26,7 @@ package_imports = [
+     ('enum34',           'enum'),
+     ('pycparser',        'pycparser'),
+     ('PyYAML',           'yaml'),
+-    ('magic-wormhole',   'wormhole'),
++#    ('magic-wormhole',   'wormhole'),
+     ('setuptools',       'setuptools'),
+     ('eliot',            'eliot'),
+     ('attrs',            'attr'),
diff --git a/tahoe-lafs/patches/patch-src_allmydata_scripts_create__node.py b/tahoe-lafs/patches/patch-src_allmydata_scripts_create__node.py
new file mode 100644
index 0000000000..a44ae78950
--- /dev/null
+++ b/tahoe-lafs/patches/patch-src_allmydata_scripts_create__node.py
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/allmydata/scripts/create_node.py.orig	2021-02-02 19:56:32.000000000 +0000
++++ src/allmydata/scripts/create_node.py
+@@ -10,7 +10,7 @@ from allmydata.scripts.default_nodedir i
+ from allmydata.util.assertutil import precondition
+ from allmydata.util.encodingutil import listdir_unicode, argv_to_unicode, quote_local_unicode_path, get_io_encoding
+ from allmydata.util import fileutil, i2p_provider, iputil, tor_provider
+-from wormhole import wormhole
++#from wormhole import wormhole
+ 
+ 
+ dummy_tac = """
diff --git a/tahoe-lafs/patches/patch-src_allmydata_scripts_tahoe__invite.py b/tahoe-lafs/patches/patch-src_allmydata_scripts_tahoe__invite.py
new file mode 100644
index 0000000000..f342d988d8
--- /dev/null
+++ b/tahoe-lafs/patches/patch-src_allmydata_scripts_tahoe__invite.py
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/allmydata/scripts/tahoe_invite.py.orig	2021-02-02 19:56:32.000000000 +0000
++++ src/allmydata/scripts/tahoe_invite.py
+@@ -6,7 +6,7 @@ from os.path import join
+ from twisted.python import usage
+ from twisted.internet import defer, reactor
+ 
+-from wormhole import wormhole
++#from wormhole import wormhole
+ 
+ from allmydata.util import configutil
+ from allmydata.util.encodingutil import argv_to_abspath