sysutils/borgmatic currently defaults to sysutils/borgbackup/1.1 as RDEP, which is probably not the best choice as the 1.1 branch is "pretty much out of maintenance" [0]. With the diff below new installs of borgmatic will pull in borgbackup-1.2, unless borgbackup-1.1 is already installed.
While here, make a slight change to sysutils/vorta, which should work with borgbackup-1.1 as well. Comments / OK? [0] https://github.com/borgbackup/borg/pull/6149#issuecomment-1335690848 diff --git borgmatic/Makefile borgmatic/Makefile index f5d2560820b..ab371f18b94 100644 --- borgmatic/Makefile +++ borgmatic/Makefile @@ -1,7 +1,7 @@ COMMENT = wrapper for Borg to create and prune backups MODPY_EGG_VERSION = 1.7.5 -REVISION = 0 +REVISION = 1 DISTNAME = borgmatic-${MODPY_EGG_VERSION} MAINTAINER = Stuart Henderson <stu.po...@spacehopper.org> @@ -18,7 +18,7 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools RUN_DEPENDS = devel/py-colorama${MODPY_FLAVOR}-<0.5 \ - borgbackup-*:sysutils/borgbackup/1.1 \ + borgbackup-*:sysutils/borgbackup/1.2 \ devel/py-jsonschema${MODPY_FLAVOR} \ devel/py-setuptools${MODPY_FLAVOR} \ textproc/py-ruamel.yaml${MODPY_FLAVOR}>=0.15.0,<0.18.0 \ diff --git vorta/Makefile vorta/Makefile index 87c31f02bcd..6ddd0e36765 100644 --- vorta/Makefile +++ vorta/Makefile @@ -1,6 +1,7 @@ COMMENT= GUI for Borg Backup MODPY_EGG_VERSION= 0.8.9 +REVISION= 0 DISTNAME= vorta-${MODPY_EGG_VERSION} CATEGORIES= sysutils @@ -22,7 +23,7 @@ RUN_DEPENDS= databases/py-peewee${MODPY_FLAVOR} \ devel/py-appdirs${MODPY_FLAVOR} \ security/py-paramiko${MODPY_FLAVOR} \ security/py-secretstorage${MODPY_FLAVOR} \ - sysutils/borgbackup/1.2 \ + borgbackup-*:sysutils/borgbackup/1.2 \ sysutils/py-psutil${MODPY_FLAVOR} \ x11/py-qt5${MODPY_FLAVOR}
