gentoo auto-resync : 25:12:2023 - 01:35:27

3 files changed, 87 insertions, 1 deletions

diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 6954761f111d..4f298b0b9426 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,6 +2,8 @@ AUX borgmatic-1.7.13-no_test_coverage.patch 248 BLAKE2B 624e21cc8971d9374b34dee0
 AUX borgmatic-1.7.14-systemd_service_bin_path.patch 604 BLAKE2B 534a545b5a8d65c6e46102a5e558c25444d82dd3679b81c0ba50c72dfec8ce8f935fdcb558ff61fec7bf30409b4b9809d76e7488554f4461c4b5eac035a60c07 SHA512 9b4c65b249a033f17b68c5209c0132bd94e310d46193a9a85090cb8520220705aacd91c19d713e11e6955c1e0b1e09823abcaf8164ab0f162ff9a62652bb7e56
 DIST borgmatic-1.8.2.tar.gz 396972 BLAKE2B d9444ec49c3d325d865d553fa1cb28de9416aa36e999ef6452c62a9a6519e58afbc922398c52f3a1de441fd8da02e5618bc03a67baae161677a15a1780209788 SHA512 8de49c071c54516d0fb3f0d918f05226ac00519cc0605eacf204795a239554764fd1f3b0f44f3110fc551d6a89e92a59ca34ddebbfb02bf3deabc326f81ccf9c
 DIST borgmatic-1.8.3.tar.gz 399031 BLAKE2B d560ccf69f86f35951521e44fba03a4704161abfe1208a8ef23067ba09b0060be84605761a2fa0b0878d466df10391a9314e85480c15af22faaf326c84211dd9 SHA512 3f798fddadb12742928e1542d1c71838b58870ecea18c62b260829880ae7ba0ec26303548a60ff7c8071b49eb630320bb055a9a1d67e4952c8952140f09100d2
+DIST borgmatic-1.8.5.tar.gz 580628 BLAKE2B ca4ae3fcda05ed4a7b11e98f767853920d1ed3053dedaedeaf16124c43ae32a4d89bc2a1ed594d88cb1e8da9da79ad75459dd3a8034b70c1a2d8b57776b1a725 SHA512 96681ee9d4aa55edeee1ab2ab2929022a3c49c60a20313c129d53736b40b0c46a3a6a5537ba3355d7cef74988655ed5af4ab689df9130de1373bcf6a8a665a9e
 EBUILD borgmatic-1.8.2.ebuild 1991 BLAKE2B c81061d1394caa8b6c262f966f3517f64cddc5f127a90b3268054117969ad7f5780c908f87ca04a2846326e2de9bfc84a26e8cc4dd82f08d8a54d90ceb3b8ab1 SHA512 1f13689944960516ff9906ff5006a6c83cc8ca822c996461998800003b149a31ab62dd0b9cc5223fed1e9866d1fd5eb85bbea10ae923b623f67a01067c907401
 EBUILD borgmatic-1.8.3.ebuild 2033 BLAKE2B 52d195cebb9984138268dc46da264cf72b5e67f9a8199974d68d795c439638516c925faaf6ba2ec6f3a63118347f59c6f1372bf4d96ccb27c3bbdddc8261aa56 SHA512 3da0753e46ce7bedbf78d1ab5a6ab10d1601eb6cad75eb4629445cccbcfe4e866a62b6f2e23fecd5551fa5fc5aa90f3d5ce36c8a6c72919b1604c28e4804cee2
-MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
+EBUILD borgmatic-1.8.5.ebuild 2144 BLAKE2B 119c1599ac1f8a4700091db3e1fc5b18171c38674334be02831ff30a8c616fd2108edc493e50b4b14ac8b78851f825f6aee28f85381a567543643e4248568feb SHA512 171de12f4c71f7c73df82bdc616184252b9583fc86cf1c624ec99343942579493f2c2c22f0d686a3104d3aa42329bd9a4cde002e02409ffe2cd3860e06c7ce09
+MISC metadata.xml 536 BLAKE2B 5e80422f7eefe88fca9b77830cdbf2a63beb4249afe374d39e961620bea17405e723bc942f2d6f99a5745b3ec3b9580b5e5045e9d533d5374f9fb02dc422faa3 SHA512 ccd19188ccba5f80dd6d12e43a84bcf5db3ca0ff3f7f7a6e42c4971d7a41931221677cfbe24e6f1b1f1f1fb77223e4ccb7dd44e1102beb431765fa9654a4a866
diff --git a/app-backup/borgmatic/borgmatic-1.8.5.ebuild b/app-backup/borgmatic/borgmatic-1.8.5.ebuild
new file mode 100644
index 000000000000..fcbf7c22109a
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.8.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd pypi
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="apprise"
+
+REQUIRED_USE="test? ( apprise )"
+
+# 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/packaging[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	apprise? ( $(python_gen_cond_dep '
+		dev-python/apprise[${PYTHON_USEDEP}]
+	') )"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
+	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
+)
+
+# A fragile test whose only purpose is to make sure the NEWS file
+# has been updated for the current version.
+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 "    ${PN} config generate"
+	else
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 1.8.0; then
+				ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes."
+				ewarn "For details, please see"
+				ewarn
+				ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0"
+				ewarn
+				break
+			fi
+		done
+	fi
+	elog
+	elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
+}
diff --git a/app-backup/borgmatic/metadata.xml b/app-backup/borgmatic/metadata.xml
index 8891ce86c8d5..4365e7fa2b90 100644
--- a/app-backup/borgmatic/metadata.xml
+++ b/app-backup/borgmatic/metadata.xml
@@ -9,4 +9,8 @@
 	<remote-id type="github">borgmatic-collective/borgmatic</remote-id>
 	<remote-id type="pypi">borgmatic</remote-id>
 </upstream>
+<use>
+	<flag name="apprise">Allow backup monitoring to send notification to a wide variety
+		of services, using <pkg>dev-python/apprise</pkg></flag>
+</use>
 </pkgmetadata>