gentoo auto-resync : 08:06:2023 - 03:44:17

3 files changed, 84 insertions, 0 deletions

diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index b7087705724c..50359954341a 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,10 +1,13 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.7.13-no_test_coverage.patch 248 BLAKE2B 624e21cc8971d9374b34dee002635d9090576ba785cf3b6da7c10a91f439fd8e11b335bb33dc9c3b7421b4a5a8982e2a5f67b723b06051969651d626f09bf972 SHA512 fc549c0a63a6182b1848d89a1c9aacd3057f07988d1e8ec3b6ae1defb0675e7b934b0c65c9b09edc431172bc550521058ab73cb64ae6e577072331d4d5269e78
+AUX borgmatic-1.7.14-systemd_service_bin_path.patch 604 BLAKE2B 534a545b5a8d65c6e46102a5e558c25444d82dd3679b81c0ba50c72dfec8ce8f935fdcb558ff61fec7bf30409b4b9809d76e7488554f4461c4b5eac035a60c07 SHA512 9b4c65b249a033f17b68c5209c0132bd94e310d46193a9a85090cb8520220705aacd91c19d713e11e6955c1e0b1e09823abcaf8164ab0f162ff9a62652bb7e56
 AUX borgmatic-1.7.3-systemd_service_bin_path.patch 604 BLAKE2B 9b1c613ce2667d2b8846e1bdf7e7bd838529fb9029af2ca572dcbafc5a8c9b64c79cab820be3b750c5fcb060da72cdf1c449cbe50efefe63ef1eb6a884e26e14 SHA512 6ca6c351697db1ae26de2b00ad543fc8f1cea1b0f4ef84f82f9578d9e56da58b4437ed48839c5aaf7d5ea66fcb79620d0cc12b8a2b30862b488fae07ad182638
 DIST borgmatic-1.7.11.tar.gz 365247 BLAKE2B a06737c48722fdf24efca76d40f6b413f39635b4137685d6279bf7a7dd002fadef28dab35a503fabf872c732a0f32fbff8c791fa9b4602299937aeae568d6137 SHA512 cedca889cd409e92484c15240fd8da91c655f81e38c6672d25e44feedc4adf6594281d92f7072fd11edc5c9f8589098226a3520e71e3441ee7a7acf97e1b2daa
 DIST borgmatic-1.7.13.tar.gz 378163 BLAKE2B c20b384853c0ddf52a095250a05d9ebe813a23ee6ef00bd5748dacf05adcff9e4d324eb2e785ebbf139d34cadab3e58d3b8305d50ec5ff20681630040433e5ae SHA512 5109c093ad3096269e27abe761e6e87ebc31b78a56bfe16e540c686ea1cd935249d063aa7c350b60a3c509990065f3a50f9e4516d40d4a1bde68c43617de18b4
+DIST borgmatic-1.7.14.tar.gz 380875 BLAKE2B c30939392df03ce03feed4c5132ef99eaf9c676f51f7ad6b8bd536f45a7e76eff1871fc5bf0d7fd0025835b51325e961f538a661f2f6a78e0ce026550a9ecd84 SHA512 15f774b994d13ab224bcbcb0335145b5cf9a2fca04b098c15bf790c20fc5033073fe341a76d4e9dc8ad85e5fb898a0447c73fc5bc74d0ac9ec6900c333e6660b
 DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
 EBUILD borgmatic-1.7.11.ebuild 2046 BLAKE2B c7f49967f3783c437566bfc3819ee42c953ede06df4996efb565d1f39b133f8f0e388f95c91d9637a17f00344b10a151aaeeaeab7b3e31cb953c9542b23f20d4 SHA512 bc18e9feaa4aa68ac4cee4e99e576f79f5b7b2c520810ecd798ed416739fa254c59c7e4fd40adb44d04421088dfab9776acba9c653d8b42d0ce91b9e765465c0
 EBUILD borgmatic-1.7.13.ebuild 2047 BLAKE2B ac75a7aa37070e15819b02da978ecb319a18277733880b355b397b3f9196501f3c4d9cd54f556422d334e45378908a6a1e32ec1153a6422764af66b84fde32c0 SHA512 9f05bb948ea55cd006bb67d6ebf9286adc027096e9fca4b6fd00e5b84b2c8bf7760d846d5fed5336adc2b85bb11dcb575790d12819ad977c4e36561e46c2942c
+EBUILD borgmatic-1.7.14.ebuild 2048 BLAKE2B 8b06498b565462070010efca152439b4de2f0be91c87569679c4a243c0a3f8e03249c382b2defd5e81e75138b43dc656c6fbbf81a1d119f4f569080052408a68 SHA512 227adf4c2f02cf6b9bdf8a491a758d5f4c1f34cfed677b3f58ca920cf9e477de7fe1978df03c14f4ea1a544787c06f051fc6dec79e533000b9109b1960c0cde9
 EBUILD borgmatic-1.7.8.ebuild 1643 BLAKE2B 9e05c2bfc9894d3e3636d17254cbd6d386d44fdb3305d16278be5a42d6bd56f3d1e0b81c53245b264d91118b10c03fc9515573146ad47b15b5b8148f77c849e5 SHA512 0c3788e897ab3a838548f456a6b3ccbc644d877f7ce83bbbbea59f9f586c3e69af44222016cfb0fe803e639baeebe61d7e77b5160b4ed7ea223add48c3dbca6b
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.7.14.ebuild b/app-backup/borgmatic/borgmatic-1.7.14.ebuild
new file mode 100644
index 000000000000..4cd57ed17ff4
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.7.14.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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 ~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.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 "    generate-borgmatic-config"
+	else
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 1.7.11; then
+				ewarn "Since version 1.7.11 ${PN} defaults to a different way of selecting archives for multi-archive actions."
+				ewarn "For details, please see"
+				ewarn
+				ewarn "	https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#archive-naming"
+				ewarn
+				break
+			fi
+		done
+	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.7.14-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.7.14-systemd_service_bin_path.patch
new file mode 100644
index 000000000000..5e6f8b7482b5
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.7.14-systemd_service_bin_path.patch
@@ -0,0 +1,8 @@
+--- a/sample/systemd/borgmatic.service
++++ b/sample/systemd/borgmatic.service
+@@ -61,4 +61,4 @@
+ # Delay start to prevent backups running during boot. Note that systemd-inhibit requires dbus and
+ # dbus-user-session to be installed.
+ ExecStartPre=sleep 1m
+-ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --verbosity -2 --syslog-verbosity 1
++ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --verbosity -2 --syslog-verbosity 1