4 files changed, 7 insertions, 87 deletions

diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index adaa39095fd5..cf333c3f1fd7 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zfec
-DISTVERSION=	1.5.3
-PORTREVISION=	1
+PORTVERSION=	1.5.4
 CATEGORIES=	converters python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,16 +17,12 @@ LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.GPL
 LICENSE_FILE_TGGPL=	${WRKSRC}/COPYING.TGPPL.rst
 LICENSE_PERMS_TGGPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argparse>=0.8:devel/py-argparse@${PY_FLAVOR}
+
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/zfec/_fec.so
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>=0.8:devel/py-argparse@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/converters/py-zfec/distinfo b/converters/py-zfec/distinfo
index 213e83a07463..1ac75e654e13 100644
--- a/converters/py-zfec/distinfo
+++ b/converters/py-zfec/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534918559
-SHA256 (zfec-1.5.3.tar.gz) = b41bd4b0af9c6b3a78bd6734e1e4511475944164375e6241b53df518a366922b
-SIZE (zfec-1.5.3.tar.gz) = 79402
+TIMESTAMP = 1602877811
+SHA256 (zfec-1.5.4.tar.gz) = 222a2d84898db792b28f993cb663e940668bfbd844992a82351fd40dc1680883
+SIZE (zfec-1.5.4.tar.gz) = 80283
diff --git a/converters/py-zfec/files/patch-setup.py b/converters/py-zfec/files/patch-setup.py
deleted file mode 100644
index fb220172de98..000000000000
--- a/converters/py-zfec/files/patch-setup.py
+++ /dev/null
@@ -1,21 +0,0 @@
-Obtained from:  https://github.com/tahoe-lafs/zfec/commit/7d159d3b6ebb28417b333b89b11c0d88cc069568
-		https://github.com/tahoe-lafs/zfec/commit/819ca0443fc71e33e61226aef9b0b3fd1a93dd41
-
---- setup.py.orig	2018-04-08 04:36:59 UTC
-+++ setup.py
-@@ -60,11 +60,14 @@ setup(
-     long_description=open('README.rst', 'rU').read(),
-     url="https://github.com/tahoe-lafs/zfec",
-     install_requires=[
--        "pyutil >= 3.0.0",
-         "argparse >= 0.8 ; python_version <= '2.7'",
-         # note to self: single-quotes on the '2.7' are ok:
-         # https://github.com/pypa/packaging/blob/16.8/packaging/markers.py#L121
- ],
-+    extras_require={
-+        "bench": ["pyutil >= 3.0.0"],
-+        "test": ["twisted", "setuptools_trial", "pyutil >= 3.0.0"],
-+    },
-     ext_modules=extensions,
-     cmdclass=versioneer.get_cmdclass(),
- )
diff --git a/converters/py-zfec/files/patch-zfec-filefec.py b/converters/py-zfec/files/patch-zfec-filefec.py
deleted file mode 100644
index 5eb9bbc37438..000000000000
--- a/converters/py-zfec/files/patch-zfec-filefec.py
+++ /dev/null
@@ -1,54 +0,0 @@
-Obtained from:	https://github.com/tahoe-lafs/zfec/commit/0441f248ffec150c9c27191b0b7a69a7364a5e7c
-
---- zfec/filefec.py.orig	2018-02-06 21:53:51 UTC
-+++ zfec/filefec.py
-@@ -1,14 +1,35 @@
- from __future__ import print_function
- import array, os, struct
- from base64 import b32encode
--from pyutil import fileutil
--from pyutil.mathutil import pad_size, log_ceil
- 
- import zfec
- from zfec import easyfec
- 
- CHUNKSIZE = 4096
- 
-+def pad_size(n, k):
-+    """
-+    The smallest number that has to be added to n to equal a multiple of k.
-+    """
-+    if n%k:
-+        return k - n%k
-+    else:
-+        return 0
-+
-+def log_ceil(n, b):
-+    """
-+    The smallest integer k such that b^k >= n.
-+
-+    log_ceil(n, 2) is the number of bits needed to store any of n values, e.g.
-+    the number of bits needed to store any of 128 possible values is 7.
-+    """
-+    p = 1
-+    k = 0
-+    while p < n:
-+        p *= b
-+        k += 1
-+    return k
-+
- def ab(x): # debuggery
-     if len(x) >= 3:
-         return "%s:%s" % (len(x), b32encode(x[-3:]),)
-@@ -224,7 +245,10 @@ def encode_to_files(inf, fsize, dirname, prefix, k, m,
-             for fn in fns:
-                 if verbose:
-                     print("Cleaning up: trying to remove %r..." % (fn,))
--                fileutil.remove_if_possible(fn)
-+                try:
-+                    os.remove(fn)
-+                except EnvironmentError:
-+                    pass
-             return 1
-     if verbose:
-         print()