commit: b2558a7f3e48600636fd84a573a1f08c8eea7b04
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 27 11:30:56 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jul 27 11:36:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2558a7f
app-backup/borgmatic: add 1.5.16, drop 1.5.13
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 2 +-
...matic-1.5.13.ebuild => borgmatic-1.5.16.ebuild} | 26 ++++++++++------------
.../borgmatic-1.5.16-flexmock_write_args.patch | 19 ++++++++++++++++
...borgmatic-1.5.16-systemd_service_bin_path.patch | 8 +++++++
4 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index febf60c24c5..2d98e4ae0f7 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1,2 @@
-DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B
3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5
SHA512
60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433
DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B
c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9
SHA512
5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
+DIST borgmatic-1.5.16.tar.gz 276802 BLAKE2B
14eb511202b30b570cdf1097a68f732af09a6412e72dddaad0d01982f3375e1f0acf77546222b0166066d27ed6ac450db4e9cc9347eb7af972aa1df023ef0168
SHA512
c28a5e272309370620cc53275f44b5bbe8b0f43180c3bd3333009217a71e35b6ae02d88d9da95629c5a6b7457aec13059024da9e594ed2fbac65d0a41dd24444
diff --git a/app-backup/borgmatic/borgmatic-1.5.13.ebuild
b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
similarity index 82%
rename from app-backup/borgmatic/borgmatic-1.5.13.ebuild
rename to app-backup/borgmatic/borgmatic-1.5.16.ebuild
index 5fd3f3e7264..a9f759659cf 100644
--- a/app-backup/borgmatic/borgmatic-1.5.13.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS="rdepend"
@@ -15,29 +15,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
-RESTRICT="test"
+KEYWORDS="~amd64 ~riscv"
# borg is called as an external tool, hence no pythonic stuff
RDEPEND="app-backup/borgbackup
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
- >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
')"
-#BDEPEND="
-# test? (
-# $(python_gen_cond_dep '
-# dev-python/flexmock[${PYTHON_USEDEP}]
-# ')
-# )"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/flexmock[${PYTHON_USEDEP}]
+ ')
+ )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+ "${FILESDIR}"/${PN}-1.5.16-flexmock_write_args.patch
+ "${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
)
distutils_enable_tests pytest
diff --git
a/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
b/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
new file mode 100644
index 00000000000..32937adadba
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
@@ -0,0 +1,19 @@
+Apparently in the flexmock universe, sys.stdout.write() takes two
+arguments rather than one. As of late July 2021, upstream hasn't said
+a word of comment on this; see
+https://github.com/flexmock/flexmock/issues/37
+
+--- a/tests/unit/commands/test_borgmatic.py
++++ b/tests/unit/commands/test_borgmatic.py
+@@ -448,7 +448,10 @@
+ ['baz']
+ )
+ stdout = flexmock()
+- stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once()
++ try:
++ stdout.should_receive('write').with_args('["foo", "bar",
"baz"]').once()
++ except flexmock.MethodSignatureError:
++ stdout.should_receive('write').with_args('["foo", "bar", "baz"]',
None).once()
+ flexmock(module.sys).stdout = stdout
+ arguments = {}
+
diff --git
a/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch
b/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch
new file mode 100644
index 00000000000..26298625fc1
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch
@@ -0,0 +1,8 @@
+--- a/sample/systemd/borgmatic.service
++++ b/sample/systemd/borgmatic.service
+@@ -57,4 +57,4 @@
+ # Delay start to prevent backups running during boot. Note that
systemd-inhibit requires dbus and
+ # dbus-user-session to be installed.
+ ExecStartPre=sleep 1m
+-ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting
scheduled backup" /root/.local/bin/borgmatic --verbosity -1 --syslog-verbosity 1
++ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting
scheduled backup" /usr/bin/borgmatic --verbosity -1 --syslog-verbosity 1
