diff --git a/app-backup/borgbackup/borgbackup-1.2.4.recipe b/app-backup/borgbackup/borgbackup-1.2.6.recipe similarity index 71% rename from app-backup/borgbackup/borgbackup-1.2.4.recipe rename to app-backup/borgbackup/borgbackup-1.2.6.recipe index 07f5bdaf9..5d91b4257 100644 --- a/app-backup/borgbackup/borgbackup-1.2.4.recipe +++ b/app-backup/borgbackup/borgbackup-1.2.6.recipe @@ -11,18 +11,18 @@ HOMEPAGE="https://www.borgbackup.org/" COPYRIGHT="2015-2023 The Borg Collective 2010-2014 Jonas Borgström" LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/borgbackup/borg/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="fd9732b7c71e4f3d12b67e54d2fcda18e1c205c55a93df21ff80d006ab047214" +CHECKSUM_SHA256="a5af10fab99a135638cf08ab58d14b4ed998cd93c68b76e94d8183ef2c529499" SOURCE_FILENAME="borgbackup-$portVersion.tar.gz" SOURCE_DIR="borg-$portVersion" -SOURCE_URI_2="https://github.com/hynek/argon2-cffi/archive/refs/tags/21.3.0.tar.gz" -CHECKSUM_SHA256_2="1f5cdc94200eccdf8c63c1cc5c0c72e38076d8e81968218b0ec0573fd72b2ba4" -SOURCE_FILENAME_2="argon2-cffi-21.3.0.tar.gz" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +pythonVersion="3.10" +pythonPackage="python310" + PROVIDES=" $portName = $portVersion cmd:borg @@ -30,10 +30,10 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - argon2_cffi_bindings${secondaryArchSuffix}_python39 - cffi${secondaryArchSuffix}_python39 - msgpack_python39 - packaging_python39 + argon2_cffi_bindings_$pythonPackage + cffi_$pythonPackage + msgpack_$pythonPackage + packaging_$pythonPackage lib:libargon2$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libdeflate$secondaryArchSuffix @@ -52,15 +52,15 @@ BUILD_REQUIRES=" devel:libzstd$secondaryArchSuffix " BUILD_PREREQUIRES=" - python_pkgconfig_python39 - setuptools_scm_python39 - wheel_python39 + python_pkgconfig_$pythonPackage + setuptools_scm_$pythonPackage + wheel_$pythonPackage + cmd:cython$pythonVersion cmd:gcc$secondaryArchSuffix - cmd:cython3.9 cmd:git - cmd:pip3.9 + cmd:pip$pythonVersion cmd:pkg_config$secondaryArchSuffix - cmd:python3.9 + cmd:python$pythonVersion " SETUPTOOLS_SCM_PRETEND_VERSION=$portVersion @@ -68,11 +68,9 @@ export SETUPTOOLS_SCM_PRETEND_VERSION INSTALL() { - cp -rf $sourceDir2/argon2-cffi-21.3.0/src/argon2 src/ - - installLocation=$prefix/lib/python3.9/vendor-packages/ + installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$PYTHONPATH mkdir -p $installLocation - python3.9 setup.py build install \ + python$pythonVersion setup.py build install \ --root=/ --prefix=$prefix }