commit: d1211c01c1daabfe54514fa398d79acc5c9df291
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 15:01:23 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 15:01:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1211c01
app-backup/borgmatic: drop 1.5.18
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 -
app-backup/borgmatic/borgmatic-1.5.18.ebuild | 69 ----------------------
.../borgmatic-1.5.16-flexmock_write_args.patch | 19 ------
3 files changed, 89 deletions(-)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 461f6c83eb55..1ed252683d44 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1 @@
-DIST borgmatic-1.5.18.tar.gz 277064 BLAKE2B
43f5f8d2fb7f13ed6bcfd5b00f99a797f214f5220b27f8c173f636d37b4c0b5c8d1915a73684597d71fb436717a84de542be51a9b23f735e304e15427d40ace1
SHA512
2e008ef01922851a3fd5c7b5d1ad30d5b0e007e5f76af4849159ff2f730add591ffb30ba3d867b0e7221b98e949e4cf3e11b8853a3412395a63c135248761264
DIST borgmatic-1.5.20.tar.gz 277495 BLAKE2B
6714b132549633b1d24e3c0bd7cd16ee9ff5510c4915d4115d62f4a260dc3cc505a02d8a14220184d53c934384d9ca092a38d6deebcefb843e7ba4492043819a
SHA512
ea370ea1e57f56c8c4b7636695ae40473b9d58696948f55afde55b31b3bcbd68923952e80b0ef0bc40f68bb265ccd47bd5e0b2735ee9b4b6f3418a5ff13eaaf4
diff --git a/app-backup/borgmatic/borgmatic-1.5.18.ebuild
b/app-backup/borgmatic/borgmatic-1.5.18.ebuild
deleted file mode 100644
index 4b739e7cd033..000000000000
--- a/app-backup/borgmatic/borgmatic-1.5.18.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~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/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}]
- ')
- )"
-
-PATCHES=(
- "${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
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # Unlike the other two test files in integration/commands, which use the
- # relevant modules' respective APIs, test_borgmatic.py tries to call the
- # 'borgmatic' executable - which by the time we execute src_test will
- # not have been created yet. Adding --install to distutils_enable_tests
would
- # likely take care of this - but between the aforementioned behaviour
- # inconsistency and the fact the only test run from this file as of
version
- # 1.5.13 is the parsing of contents of 'borgmatic --version', just skip
it.
- rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
-
-src_install() {
- distutils-r1_src_install
- systemd_dounit sample/systemd/borgmatic.{service,timer}
- keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "To generate a sample configuration file, run:"
- elog " generate-borgmatic-config"
- fi
- elog
- elog "Systemd users wishing to periodically run borgmatic can use the
provided timer and service units."
-}
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
deleted file mode 100644
index 32937adadba0..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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 = {}
-
