gentoo resync : 20.03.2022

3 files changed, 71 insertions, 3 deletions

diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 1da8552a7efb..1240e0a097af 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,7 +1,9 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
 DIST borgmatic-1.5.21.tar.gz 278933 BLAKE2B b098334fa476304a8e63ceed37b3c2b9c67d0549bea6d06d8f0fd0f41f9812e79cea52f88fc15d2be29e491355f9544b6ccbe7c31936dfbd78eefd42e9ff2832 SHA512 e183269a0ac3ae049031832414d597ced8f75dd1f82d16379faec6d53566a1c19f51d613745e61077621381ee819d2f5dfc5cabaf9928a629f5cf3e13398503c
-DIST borgmatic-1.5.22.tar.gz 286392 BLAKE2B 99105661935b58a6e772d694214590ad13c3ff284eeccdb075b36f6a4c55abeaf02c46a49d01ab3ca165b47320280ef0bb2b2c978f039e7a695b50a6cafb8d1d SHA512 a9006685ca707ceca199cfae9d52414b0edd295afcff7478bfac16fc05c12d31ee6578b58970ead8f702a7b9928d33db8a32617bfb8f6e9e8d5fa06bddd6a02c
+DIST borgmatic-1.5.23.tar.gz 290506 BLAKE2B 9924d9df1cae7e4f97ff70eb16f84a2ee8a0fe0cd3a08add7a7ec59d269fb693f74350cdb45633fc4d76816614216a69a205504cac9c7608a635fc364253add6 SHA512 1b811fec2e814854459d10e4c90e552d90e0450d908931dbca5a838dc091c40dc6075c6fa09653a5aac69073e5b7600aed4beda4bc765daf0c6d8d2a00983ad7
+DIST borgmatic-1.5.24.tar.gz 291853 BLAKE2B d8c695c8faf713cd75e994d8ae7633674d01981047ce79d35d392b9db5a2dfb47c2be4a91e0f183ab2ead5877ee68983d0fdfd88ae7d28355d8029d39cbfdc04 SHA512 cfa1bd1dc6119497fba99d02e4f53322aede907ba8b30068b6c1dadc67f5e30466d2f1f0d83f1f15f71dfac08ef5b0adb376d24d62f1cd44992e7a45f99fde34
 EBUILD borgmatic-1.5.21.ebuild 1865 BLAKE2B 641b95b1f94585bba6822f4cfad1ec487d5030ae795aff13d776ded939dc98ae1b7cfb4a8ecd59c81a8ed675c4af73cdbccee6a3b8fabc89099a7132144b4833 SHA512 48c64a3fbab381ded06c5b56e971d0895eaee5ede8b77d6bd25c2176e1f45673651531bf9fb901e7003ee51f1c554012f876a0562c9be5110668ccc1eaad90b2
-EBUILD borgmatic-1.5.22.ebuild 1866 BLAKE2B 748de8d2b7c0df946da8468425c93c9ba1a3382d299ff0cf2dbf5ff6f37be71a0d37136facdf431463c7aeeaf0494d7a7badaeaea16dd1f41edd2c2525938874 SHA512 396f4b93494e217cd794563dfec4c967985e05fb39375ba10b9c30704447619d89de895aff1aa03638e61a204a6a266c4d3c626a9fa055185267b8f26a6c8ce1
+EBUILD borgmatic-1.5.23.ebuild 1905 BLAKE2B 394591623f5c59b1b839dbcc06590585d5217505f3b9db9a4035b6b3a92a3ea2b2d8571e826fcad6a80369aac73b2ba0af26520f0c2e3fd05971e2e96b55191b SHA512 7bd673ad1b1f7ae9ea9f9a90c2f89305176c39a660bb2651840951c059b6e99d5682270cdfe5df4c401dd2b7c6c657b3d4a59dfcd8671616c6245f1a1417e595
+EBUILD borgmatic-1.5.24.ebuild 1905 BLAKE2B 394591623f5c59b1b839dbcc06590585d5217505f3b9db9a4035b6b3a92a3ea2b2d8571e826fcad6a80369aac73b2ba0af26520f0c2e3fd05971e2e96b55191b SHA512 7bd673ad1b1f7ae9ea9f9a90c2f89305176c39a660bb2651840951c059b6e99d5682270cdfe5df4c401dd2b7c6c657b3d4a59dfcd8671616c6245f1a1417e595
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.5.22.ebuild b/app-backup/borgmatic/borgmatic-1.5.23.ebuild
index 78dc5cd647d1..f48f145dc769 100644
--- a/app-backup/borgmatic/borgmatic-1.5.22.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.23.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 systemd
 
@@ -24,6 +24,7 @@ RDEPEND="app-backup/borgbackup
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	')"
 BDEPEND="
 	test? (
diff --git a/app-backup/borgmatic/borgmatic-1.5.24.ebuild b/app-backup/borgmatic/borgmatic-1.5.24.ebuild
new file mode 100644
index 000000000000..f48f145dc769
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.24.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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_PEP517=setuptools
+
+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}]
+		dev-python/setuptools[${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."
+}