gentoo auto-resync : 26:11:2024 - 02:00:48

6 files changed, 108 insertions, 2 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 3169fd9e3748..d114840b73b1 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index f7b14fadb2e2..800a93dec1a5 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,12 +2,15 @@ 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
 AUX borgmatic-1.9.0-build-backend.patch 454 BLAKE2B d2256eb2a3f74e5a6c176b9e1a14ee20f06e1e98d0ed8874be9203af62c4d6e0f8e550ec41ee7298dff700bf35a0026a80f0e167e85af9c1571a2162f2f774b8 SHA512 9d90f959c49a45801257416388e1afe853a61b8f3c4396a62c299277ffebd1806c6e220e18e689fde0fef6fb289261dcbca4d9a6a4ab12fd879d89f68275e259
 AUX borgmatic-1.9.0-no_test_coverage.patch 418 BLAKE2B 07e5bdb4b9091c4b3d1cb07da3c8fbd9189e6b84e0578b36f51cfca17f368dd366e5083b3ebe81fc37d4712de879a0f710e9c69647f5a90728fb6b8cf6eb0411 SHA512 0b7c5cb0e955dbb6df25ffce77fc462f8d0fdd1aa70059d95b570594ae637c5d0793afbe7242d30dabefe99be8a1792aef1b8e1a8005408040b2821d1d971986
+AUX borgmatic-1.9.3-no_test_coverage.patch 456 BLAKE2B 57964d3d23cd298181619aff5529d0574d70fe9ce002fedd7c9618ff36f89227acc9ba8719eedd0eff5b72f61a56d2de119f7c03d40164b7c01d93f95d6a0509 SHA512 9db6c1c51bfc44ad45891bbf65512fd243ceb8869f103f316f4817b4fae226863e0a02fdaa7ae7cb6ccffd187007b833c0ae671a881e4881b3dec29063cc6e8a
 DIST borgmatic-1.8.14.tar.gz 623966 BLAKE2B fd52bc5be4f63e1207a0bedcf654af075082d31af76ddc65ea30a3259f1ec093c826612e114fd9f9fa46668f80eed3b2b6a88262fbb9e4db49c36ba31efa70c5 SHA512 74daecbf02f957b21121dff073c2e114c87b1afdf6b3408b8fc2bf465102425cca60e4bdc8bc8d0e2d0a9c20b1f514eb7c9a2e136e71cb61969e07a38841235a
 DIST borgmatic-1.9.0.tar.gz 636235 BLAKE2B ff71f8c811ca185926369402de5f2b1bd750135fcc66d54744056292994b781fba501945cf5dc39cc727d2c8f2ef360e79b4f2ba7a868f29bf0304722cae9649 SHA512 767b11451377d9ab046fe36272d523f1ec7c72fe162cc3eef09583f4e9a6e0d4bae09bb446b746a47e73fb4afdac1d0206b75b93a9fb2859987909f17aa87c43
 DIST borgmatic-1.9.1.tar.gz 636657 BLAKE2B 6061b49d501be28afe7a3a6ac928ec77233bb354e494e14584c1cdeb76e5c06cb9fe06e97f0eb0be4a5aa03c7f0359ce47a7b45044e95358b80ab0986ed5d9b8 SHA512 c86fd5a0d1db065df8e0f4366e2742be798e225cd3af2baea86e27f165cd9956f059f5d51f85f49715c40db51e7aca93a64f5a8fcefceec316a588560875ce69
 DIST borgmatic-1.9.2.tar.gz 641879 BLAKE2B 0c1678c905235ee435fdeb7fc57eabb44054344fab596ecb17f5cbeb0a2afa944b3105b08c61547de853de561c58971a6d32ac677434475b38cc90af4600b88d SHA512 8226155f049141b80bed32f955faa37cd8d2c01489092510440c1f53247d1aabf7d8730aa8c22b20f16ffb5686b158966a544e2bea4558178ec52da187b18c13
+DIST borgmatic-1.9.3.tar.gz 645018 BLAKE2B ae069bece54d80eab080cb30d4fb4b523cc7f31ca5d434a7f2fdfc8447ab72e6687fc6775a7811e15f120a0ad57284c539813c07b5cb258a2acf92e02dd55999 SHA512 22624e1a4454660288a3019513509006b389aafd657a45fa9e24c0b13b6a1266450c5b4ed531be5d8574c5f5fa5b869cb6860273f5d3d9a53b4e41474fb1b90e
 EBUILD borgmatic-1.8.14.ebuild 2119 BLAKE2B 37315799c86d681ad2a4932a80f2b0f3fb81bdfcaf2bc2316ce9f03fdcaa9df0ae2a310be121392b5136a789874d3a44dddf4d4659c4a8ef13fb3c1ad8f66332 SHA512 8d7a80481d5a50367640308b91903d5a34d13dcc6069dcebdbeba6be1cbd21b5cd9a811d7dbec816ffbbfbf3f96252fac8ed59d0d8a1bb1f22dbc02b3570e537
 EBUILD borgmatic-1.9.0.ebuild 2218 BLAKE2B 003e1da8d686c9517f3c505a92bc4b4c6486c33bb11450b87ac0af9b0f56155eade234b291be50f534dc8bfe8fc349ccd95b1a2cd50f7beaf3edae9f7ed8e7d1 SHA512 09e53a63f0cbf7d8267d4b07d86ded910caf2852947273082a5fee4a3833de12d276b9df4ebf56fb5bbea0008069182b1fd58709064e1137216d7fd6ebe58bad
 EBUILD borgmatic-1.9.1.ebuild 2232 BLAKE2B c749a0e52589987206083566d2a9892827a2507e389c05ce1780d2566524099ba079c99d5931951a23132299f84fdbc51842903537e43e1f955ef44695391d3b SHA512 263e4b035bb281a1f88e228c404530e9cb40db4cb0df9813ba8ee6417de11ce65ef57af883a152cb50323358d00928ad21cdf5f73d6e8d9fddf2e4549dc09b1d
 EBUILD borgmatic-1.9.2.ebuild 2391 BLAKE2B 2eaeb99c5edef44c0b01b06a9def79458c26086c2645650b3b4669672341c83f07ca228713edc18576cc4dc6a8ca081cfdbbc1087e49599f6a35299c8e8dd5a3 SHA512 4d6ce261d2a176cfabd131d2bcf8d5f35390f55dd8038de50bc9e0ef96c1164a11aea363eab32e52c46549faca4321d5fd062a0943e2fed32978a44cb020067b
+EBUILD borgmatic-1.9.3.ebuild 2204 BLAKE2B f73e49e45330ec099148b0d0394179e32f8c2d2e61836b55f0aae351c1eaee669625a95bea2b22d3677a54a727a785a12df40671d5aec76ac29ecf6b7c7e5251 SHA512 30d4bc44da63bbe04375a5986131eb7fcfe133c0f9ee59c24f01a9ded0b89b5cc7b9fe9c0250039083d496dfc2be22faa4d191585998e0f6fdf4cd1203363c2f
 MISC metadata.xml 461 BLAKE2B 700c5863d623abaa1a88f91ef5281c6d3d8c2ce8eeb5b15cadbbd93b1d50bfce5445cd2f133bbe998da36de9e2953ce154e1b8eb033d36f33bb88881e672aeb6 SHA512 e739f7ff60f69c3b4d5c72daeda65b9c042bf01d74ce6a60b2684e7e52eea5deaa946a2aa5f1dc84ae16f6eaf4bff8f46628f41ba55c394ff4fe70b5935663a2
diff --git a/app-backup/borgmatic/borgmatic-1.9.3.ebuild b/app-backup/borgmatic/borgmatic-1.9.3.ebuild
new file mode 100644
index 000000000000..c8ac8622d33f
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.9.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+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/
+	https://projects.torsion.org/borgmatic-collective/borgmatic
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+IUSE="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}]
+	')
+	apprise? ( $(python_gen_cond_dep '
+		dev-python/apprise[${PYTHON_USEDEP}]
+	') )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/apprise[${PYTHON_USEDEP}]
+			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
+	"${FILESDIR}"/${PN}-1.9.3-no_test_coverage.patch
+)
+
+EPYTEST_DESELECT=(
+	# A fragile test whose only purpose is to make sure the NEWS file
+	# has been updated for the current version.
+	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"
+		elog
+		elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
+	else
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 1.9.0; then
+				ewarn "Please be warned that ${PN}-1.9.0 has introduced several breaking changes."
+				ewarn "For details, please see"
+				ewarn
+				ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.9.0"
+				ewarn
+				break
+			fi
+		done
+	fi
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.9.3-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.9.3-no_test_coverage.patch
new file mode 100644
index 000000000000..0c452651c455
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.9.3-no_test_coverage.patch
@@ -0,0 +1,18 @@
+no test coverage
+
+diff --git a/pyproject.toml b/pyproject.toml
+index d081573f..d209c27a 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -49,7 +49,7 @@ skip-string-normalization = true
+ 
+ [tool.pytest.ini_options]
+ testpaths = "tests"
+-addopts = "--cov-report term-missing:skip-covered --cov=borgmatic --no-cov-on-fail --cov-fail-under=100 --ignore=tests/end-to-end"
++addopts = "--ignore=tests/end-to-end"
+ 
+ [tool.isort]
+ profile = "black"
+-- 
+2.45.2
+
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index f27aa824b4c3..81a312a8942a 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -6,5 +6,5 @@ DIST restic-0.17.1-deps.tar.xz 173603816 BLAKE2B 45745446febd9bfcd9bbb69e1687be3
 DIST restic-0.17.1.tar.gz 24104588 BLAKE2B cdfb89f21afe31c0f7bd881e8fbdfdeef020d3cb00910533954ff29218e2ee2ff7966e60c7e44fafb756cf0f1f7707e236b522e01816385d5db1a36f42e104ff SHA512 668b41cff65a81c7458b58c622a35bbbc4f73561e78af399440050744d18d751cab3030163a4c192091f1e21755c6988b94fbb6dd2dc47c626582fea8711f574
 EBUILD restic-0.16.5.ebuild 1151 BLAKE2B d3d17f41ea7bdbde087829dac8bffcdd0e4babbd9708c00efc25b606e45c21444decf2388687bb6e4b1b09ac1942f275624a75e278378796cb0eb858f8b53859 SHA512 83ae1162772ba5fc19a5c6bfca8b2aa5786ee838fd930e80097471419356976c841c1938886cdfbc672e6065e9ec2a6977c86d235e9e5641f7a1faab3b72cbe2
 EBUILD restic-0.17.0.ebuild 1151 BLAKE2B d3d17f41ea7bdbde087829dac8bffcdd0e4babbd9708c00efc25b606e45c21444decf2388687bb6e4b1b09ac1942f275624a75e278378796cb0eb858f8b53859 SHA512 83ae1162772ba5fc19a5c6bfca8b2aa5786ee838fd930e80097471419356976c841c1938886cdfbc672e6065e9ec2a6977c86d235e9e5641f7a1faab3b72cbe2
-EBUILD restic-0.17.1.ebuild 1152 BLAKE2B 95a4ae34498b35fe65e22c7c15d6fa4684c057b2d188035776dd689b0fa50bde02d79b0d05cc04744ceadb23f01c48bb36c14a31208950d239404c663985c94c SHA512 b44b44dd825e0e1b48d7f156d764e16c10f431b138b81349c5c4f150ae0c224983d5336bd39ac587cf4230a7fc47e4dddd85d8025be645745ea8bf81f8ecf49b
+EBUILD restic-0.17.1.ebuild 1151 BLAKE2B d3d17f41ea7bdbde087829dac8bffcdd0e4babbd9708c00efc25b606e45c21444decf2388687bb6e4b1b09ac1942f275624a75e278378796cb0eb858f8b53859 SHA512 83ae1162772ba5fc19a5c6bfca8b2aa5786ee838fd930e80097471419356976c841c1938886cdfbc672e6065e9ec2a6977c86d235e9e5641f7a1faab3b72cbe2
 MISC metadata.xml 584 BLAKE2B 76c5cf916e847dd9e8cd3dd205c9c6e68198aed895c1067ddb7e73a6e8610d973313d6ffc553c89ea5ca1caecf1b19d02424ec3f693a191e85a1a9ecae1e4721 SHA512 676f7b108bae1af9ee9431f9a08b8870a8207a92ec3214cd2d5774112c1065453a5c8f56c1e0a49180ba2c32a02c990494cb85a15487be62e02d76580eabc611
diff --git a/app-backup/restic/restic-0.17.1.ebuild b/app-backup/restic/restic-0.17.1.ebuild
index 926089eed980..f8da04ab40e9 100644
--- a/app-backup/restic/restic-0.17.1.ebuild
+++ b/app-backup/restic/restic-0.17.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="sys-fs/fuse:0"
 DEPEND="${RDEPEND}"