Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
Date: Tue, 12 Oct 2021 23:03:35
Message-Id: 1634079254.4ac7b44fdc0b86680c0b473f9ca8b75e4cc81971.marecki@gentoo
1 commit: 4ac7b44fdc0b86680c0b473f9ca8b75e4cc81971
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 12 22:54:14 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 12 22:54:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac7b44f
7
8 app-backup/borgmatic: drop 1.5.15
9
10 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
11
12 app-backup/borgmatic/Manifest | 1 -
13 app-backup/borgmatic/borgmatic-1.5.15.ebuild | 71 ----------------------
14 .../borgmatic-1.5.1-systemd_service_bin_path.patch | 8 ---
15 3 files changed, 80 deletions(-)
16
17 diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
18 index 82f553f1856..61e367b079c 100644
19 --- a/app-backup/borgmatic/Manifest
20 +++ b/app-backup/borgmatic/Manifest
21 @@ -1,2 +1 @@
22 -DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
23 DIST borgmatic-1.5.18.tar.gz 277064 BLAKE2B 43f5f8d2fb7f13ed6bcfd5b00f99a797f214f5220b27f8c173f636d37b4c0b5c8d1915a73684597d71fb436717a84de542be51a9b23f735e304e15427d40ace1 SHA512 2e008ef01922851a3fd5c7b5d1ad30d5b0e007e5f76af4849159ff2f730add591ffb30ba3d867b0e7221b98e949e4cf3e11b8853a3412395a63c135248761264
24
25 diff --git a/app-backup/borgmatic/borgmatic-1.5.15.ebuild b/app-backup/borgmatic/borgmatic-1.5.15.ebuild
26 deleted file mode 100644
27 index 55397ae435f..00000000000
28 --- a/app-backup/borgmatic/borgmatic-1.5.15.ebuild
29 +++ /dev/null
30 @@ -1,71 +0,0 @@
31 -# Copyright 1999-2021 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -PYTHON_COMPAT=( python3_{8..9} )
37 -DISTUTILS_SINGLE_IMPL=1
38 -DISTUTILS_USE_SETUPTOOLS="rdepend"
39 -
40 -inherit distutils-r1 systemd
41 -
42 -DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
43 -HOMEPAGE="https://torsion.org/borgmatic/"
44 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
45 -
46 -LICENSE="GPL-3"
47 -SLOT="0"
48 -KEYWORDS="amd64 ~arm ~arm64 ~riscv"
49 -
50 -# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
51 -RESTRICT="test"
52 -
53 -# borg is called as an external tool, hence no pythonic stuff
54 -RDEPEND="app-backup/borgbackup
55 - $(python_gen_cond_dep '
56 - dev-python/colorama[${PYTHON_USEDEP}]
57 - >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
58 - dev-python/requests[${PYTHON_USEDEP}]
59 - <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
60 - ')"
61 -#BDEPEND="
62 -# test? (
63 -# $(python_gen_cond_dep '
64 -# dev-python/flexmock[${PYTHON_USEDEP}]
65 -# ')
66 -# )"
67 -
68 -PATCHES=(
69 - "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
70 - "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
71 -)
72 -
73 -distutils_enable_tests pytest
74 -
75 -src_prepare() {
76 - distutils-r1_src_prepare
77 -
78 - # Unlike the other two test files in integration/commands, which use the
79 - # relevant modules' respective APIs, test_borgmatic.py tries to call the
80 - # 'borgmatic' executable - which by the time we execute src_test will
81 - # not have been created yet. Adding --install to distutils_enable_tests would
82 - # likely take care of this - but between the aforementioned behaviour
83 - # inconsistency and the fact the only test run from this file as of version
84 - # 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
85 - rm -f "${S}"/tests/integration/commands/test_borgmatic.py
86 -}
87 -
88 -src_install() {
89 - distutils-r1_src_install
90 - systemd_dounit sample/systemd/borgmatic.{service,timer}
91 - keepdir /etc/borgmatic
92 -}
93 -
94 -pkg_postinst() {
95 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
96 - elog "To generate a sample configuration file, run:"
97 - elog " generate-borgmatic-config"
98 - fi
99 - elog
100 - elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
101 -}
102
103 diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch
104 deleted file mode 100644
105 index 90e94ac1f55..00000000000
106 --- a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch
107 +++ /dev/null
108 @@ -1,8 +0,0 @@
109 ---- a/sample/systemd/borgmatic.service
110 -+++ b/sample/systemd/borgmatic.service
111 -@@ -21,4 +21,4 @@
112 -
113 - # Delay start to prevent backups running during boot.
114 - ExecStartPre=sleep 1m
115 --ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --syslog-verbosity 1
116 -+ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --syslog-verbosity 1