git: 0b4a732cb0ac - 2022Q3 - archivers/py-borgbackup: use fixed xxhash instead of avoiding it

The branch 2022Q3 has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b4a732cb0ac813fe1c4993e6375715dc1725e96

commit 0b4a732cb0ac813fe1c4993e6375715dc1725e96
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2022-08-13 17:20:29 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2022-08-13 18:54:30 +0000

    archivers/py-borgbackup: use fixed xxhash instead of avoiding it
    
    This reverts commit 9db903a89b3d1d7c0be2a56059542f3fdb412908 because
    it does not fix the situation for lack of a PORTREVISION bump.
    Let us use the opportunity to fix the real bug instead.
    
    Now with xxhash fixed as of 0.8.1_2, drop 9db903a89, and
    bump PORTREVISION so we flush out the old garbage packages.
    
    A simple web search would have brought up that static_assert() is
    a C11 convenience macro defined in <assert.h>, and a detailed
    search would have turned up that this had been fixed in xxhash
    before.
    
    While here, add a smoke test to post-install.
    
    Proper fix was
    Reported by:    Thierry Dussuet <thierry.dussuet@protonmail.com>
    PR:             265060
    MFH:            2022Q3
    
    (cherry picked from commit 714af13781970db3ec794eab4627d585b63df00a)
---
 archivers/py-borgbackup/Makefile             |  3 ++-
 archivers/py-borgbackup/files/patch-setup.py | 11 -----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
index 512b2292a8b6..3b80068b12bb 100644
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@@ -14,7 +14,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
-		libzstd.so:archivers/zstd
+		libzstd.so:archivers/zstd \
+		libxxhash.so:devel/xxhash
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python:3.5+ ssl
diff --git a/archivers/py-borgbackup/files/patch-setup.py b/archivers/py-borgbackup/files/patch-setup.py
deleted file mode 100644
index 399dc0b58daa..000000000000
--- a/archivers/py-borgbackup/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2022-07-16 16:20:52 UTC
-+++ setup.py
-@@ -23,7 +23,7 @@ prefer_system_libzstd = True
- prefer_system_libb2 = True
- 
- # True: use the shared libxxhash (>= 0.6.5 [>= 0.7.2 on ARM]) from the system, False: use the bundled xxhash code
--prefer_system_libxxhash = True
-+prefer_system_libxxhash = False
- 
- # prefer_system_msgpack is another option, but you need to set it in src/borg/helpers.py.
-