From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 5 Dec 2021 02:47:11 +0000
Subject: gentoo resync : 05.12.2021

---
 app-backup/borgmatic/Manifest                      |  9 ++-
 app-backup/borgmatic/borgmatic-1.5.18.ebuild       | 69 ----------------------
 app-backup/borgmatic/borgmatic-1.5.20.ebuild       |  2 +-
 app-backup/borgmatic/borgmatic-1.5.21.ebuild       | 64 ++++++++++++++++++++
 .../borgmatic-1.5.16-flexmock_write_args.patch     | 19 ------
 app-backup/borgmatic/metadata.xml                  |  2 +-
 6 files changed, 70 insertions(+), 95 deletions(-)
 delete mode 100644 app-backup/borgmatic/borgmatic-1.5.18.ebuild
 create mode 100644 app-backup/borgmatic/borgmatic-1.5.21.ebuild
 delete mode 100644 app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch

(limited to 'app-backup/borgmatic')

diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 3503c3beb507..2706f731a6e1 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,8 +1,7 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
-AUX borgmatic-1.5.16-flexmock_write_args.patch 738 BLAKE2B aef28c6cc9f3e4c6294cf34cb6e3a1291fce90e0696f54d8f3975d7823faf64d73f2f625f1ccc7d1473e74f81342e6243d283950c505ed7cfc2279afe8eb5df9 SHA512 a9e1645dad137a9a20e71967d4578b3bbedca5556ce8e7b588215eb240c5581e6e0d5b657941eedb637ff94ac6e09ed06d3d9ef941cc1d4365daef0ae536659d
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
-DIST borgmatic-1.5.18.tar.gz 277064 BLAKE2B 43f5f8d2fb7f13ed6bcfd5b00f99a797f214f5220b27f8c173f636d37b4c0b5c8d1915a73684597d71fb436717a84de542be51a9b23f735e304e15427d40ace1 SHA512 2e008ef01922851a3fd5c7b5d1ad30d5b0e007e5f76af4849159ff2f730add591ffb30ba3d867b0e7221b98e949e4cf3e11b8853a3412395a63c135248761264
 DIST borgmatic-1.5.20.tar.gz 277495 BLAKE2B 6714b132549633b1d24e3c0bd7cd16ee9ff5510c4915d4115d62f4a260dc3cc505a02d8a14220184d53c934384d9ca092a38d6deebcefb843e7ba4492043819a SHA512 ea370ea1e57f56c8c4b7636695ae40473b9d58696948f55afde55b31b3bcbd68923952e80b0ef0bc40f68bb265ccd47bd5e0b2735ee9b4b6f3418a5ff13eaaf4
-EBUILD borgmatic-1.5.18.ebuild 2096 BLAKE2B df79e8f214b7d8fc55fd6c21710b27ce9817695a7fc65ca4a9e1208ed9605cfb55f7064588c8c5b5897d790bd0e43283f673aeeedafd2bf1343396b140997321 SHA512 59123c827902346f4aca8841d93b8028817b17badf1cabbf1ece2aa7913d52cf00741d2ec54e11ee4485baf1843f4e9d8495df40c1fcb4f0784b3b16fa24beda
-EBUILD borgmatic-1.5.20.ebuild 2053 BLAKE2B c2ed86a406951acf3341d1808fd4976606026b37f010fa90a01eb1d65d4075c29177f7a14fcd5b2cccf3ff9c1851f0fe691a18170baa9baf0d942c37a1354823 SHA512 21b38e68e00a391c85b569f5fe5cae50dbae549931f81a53d338cae13328cc41a98ec45af917f0907893fe41c4f0721729aa25d4533bbfae43bc3a5563e33720
-MISC metadata.xml 366 BLAKE2B e4c95292ab3040a6e29337f620ee8b808b1da11733b300fe7d53f1bf1c9511c2835d122d1c4c8da36f99a98f35eb1f3f505357c9d5796c6b9dd187f7171098a4 SHA512 c23574795068b1a77b4c2c8efc7a171e9a6160b1f05f528c589589eb56d607ad03168c894f4c4f358e03a33c04b7e84a3b464be347b4cfbd7eea92d5f5b5f411
+DIST borgmatic-1.5.21.tar.gz 278933 BLAKE2B b098334fa476304a8e63ceed37b3c2b9c67d0549bea6d06d8f0fd0f41f9812e79cea52f88fc15d2be29e491355f9544b6ccbe7c31936dfbd78eefd42e9ff2832 SHA512 e183269a0ac3ae049031832414d597ced8f75dd1f82d16379faec6d53566a1c19f51d613745e61077621381ee819d2f5dfc5cabaf9928a629f5cf3e13398503c
+EBUILD borgmatic-1.5.20.ebuild 2052 BLAKE2B 6e6c3af54067c997a57f4b2ccfeacddb96a12b6d235cef8d755f0e70fc3fa57c4c38d00e8bfec6e4452baef29e91dc3f2aa3b573fa189316cd87f2c7b4191c46 SHA512 bf23ee7cb43b107b02e2ee6398db01de8ef7dccaf8b89d164c624fc155f2ee90b1d21d78226a2af975849dd81236bddc4cb791bfc27e9c89e96bd13f98832f2e
+EBUILD borgmatic-1.5.21.ebuild 1866 BLAKE2B fa208da0d348c16c6a567757f15185f2690474e994b0d5bd55d860c69d0fbbe3892cfa3bd2abc0e09f3bad9407a2f42e61c52baeb773b71d435bd89d10c4d41f SHA512 983baa873909a3fccdb6fcc0111f9d5258dd13a9f1d2ea0a5e5fbb3b9062999112926bbcdc4be0d2bcfee002cda26b5d0d771154e1313efd184dc9bcf16efaed
+MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
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/borgmatic-1.5.20.ebuild b/app-backup/borgmatic/borgmatic-1.5.20.ebuild
index 74ed90e2da6c..2b90f26d7470 100644
--- a/app-backup/borgmatic/borgmatic-1.5.20.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/borgmatic/borgmatic-1.5.21.ebuild b/app-backup/borgmatic/borgmatic-1.5.21.ebuild
new file mode 100644
index 000000000000..40b004fb3ea1
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.21.ebuild
@@ -0,0 +1,64 @@
+# 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-0.5[${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-0.10.10[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
+)
+
+# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
+# executable so making it work would require passing --install
+# to distutils_enable_tests. Given that this is the only test requiring
+# this and that all it does is make sure the NEWS file has been updated
+# for the current version, just skip it.
+EPYTEST_DESELECT=(
+	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
+
+distutils_enable_tests pytest
+
+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 = {}
- 
diff --git a/app-backup/borgmatic/metadata.xml b/app-backup/borgmatic/metadata.xml
index 8e23892e0771..8891ce86c8d5 100644
--- a/app-backup/borgmatic/metadata.xml
+++ b/app-backup/borgmatic/metadata.xml
@@ -6,7 +6,7 @@
 	<name>Marek Szuba</name>
 </maintainer>
 <upstream>
-	<remote-id type="github">witten/borgmatic</remote-id>
+	<remote-id type="github">borgmatic-collective/borgmatic</remote-id>
 	<remote-id type="pypi">borgmatic</remote-id>
 </upstream>
 </pkgmetadata>
-- 
cgit v1.2.3