gentoo auto-resync : 12:03:2025 - 01:49:51edge

6 files changed, 80 insertions, 67 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index af0410aa3d59..ce2819c348b9 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 0e6628d171eb..e923a33a1b17 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -3,9 +3,11 @@ AUX borgmatic-1.9.3-no_test_coverage.patch 456 BLAKE2B 57964d3d23cd298181619aff5
 DIST borgmatic-1.9.10.tar.gz 646658 BLAKE2B 8eec2cea8e1001c7d55aef6e267aa18a4db67e33c61a28fe072bbbe99df305672e0e6b4187f5ace470add162298f9facbd805924d486358bca41bfa02538f3c0 SHA512 0d15ce4a3b71ceebfb3185130a9dcdfb80a23111396a9d2f39cae2c69f3eaba54e4005ad13fcce6c728aaf1179fc44a85ab2db1efb3824c7a33743ebaed3a954
 DIST borgmatic-1.9.12.tar.gz 653984 BLAKE2B 62445bd2fa4a9ab93a4ef9035617dc57fd191e7df9a5709dc760424fe5fe8d9a6798b98563442739ddd3ce4c73947fadc0a259c21f56fe0ec214a2fd0e179e9b SHA512 26449ff7eae3d104ffee578f1211afc545141b4224c8c0888bad14e2251a9bbe2d8ec8b9e3c652a5a5881d49eca5df275e6ac6ad07661e0b64c2713147e71c30
 DIST borgmatic-1.9.13.tar.gz 655690 BLAKE2B b51706ffb56e3905298498fa71e7f949be43b968e2c62565657fde6a6e470253f4d50022b54327a9fd832288443491581a278f310219787041c2644bf8b721d6 SHA512 fe2cab08b1ba750349be6cb79e89dd3b99a964b21b6d91ee7adb955ff0c4b386e45d97c01a86232943e448053faaf88aa2dbeec654bed6ea9279639f8a3d79f3
+DIST borgmatic-1.9.14.tar.gz 656877 BLAKE2B 36f8dce1251b74d67f33aaed5f6ebe41ff1003bd261070724422842143eb84be8b38a884f19da9e2f74a784e4ce4adca6c8ddfb8600f833fea6777585feb0cd8 SHA512 f2d789fab2e7f017c22458a6df3408a4883444aaeac9a4bf258de3eb46b802451d964d39ed441fb01314ff5c9acfd29676e1aab1ba341afb908e458527253705
 DIST borgmatic-1.9.8.tar.gz 642464 BLAKE2B 0473e440d8beb99adac1fcf6c3628f12ca1b9b4337190eaac5aa6cb4726a2be9ada56f1a25be9369cf5a36e5bd53bf2070c2f1579c96bc7375cf5f184a7129af SHA512 a4c524ddddae99d4a244e6d6d7c8d91ea980b29267b2bca8c8dcf45087fa70039088c225a5144e072e5453a76dfbdca61f7718eba4c558d94226222574e9e09a
 EBUILD borgmatic-1.9.10.ebuild 2066 BLAKE2B 8b9919cb20159e14340fc2c28c6b6a762dbaf1067d2a2c679c0888d7198b0caa283a95c1460c7e02c8dbc79d31d85b243bef2d320f1c9cc462e0219c6ebb0d74 SHA512 e59cae6a65f42c5db111da9376a793c40f5d4d7b9323f06bda5e5f95f604b1e94201c6fa20dd33349e403451b1388bc35c657c7111fe765cb0bff305db443d40
 EBUILD borgmatic-1.9.12.ebuild 2066 BLAKE2B 8b9919cb20159e14340fc2c28c6b6a762dbaf1067d2a2c679c0888d7198b0caa283a95c1460c7e02c8dbc79d31d85b243bef2d320f1c9cc462e0219c6ebb0d74 SHA512 e59cae6a65f42c5db111da9376a793c40f5d4d7b9323f06bda5e5f95f604b1e94201c6fa20dd33349e403451b1388bc35c657c7111fe765cb0bff305db443d40
 EBUILD borgmatic-1.9.13.ebuild 2066 BLAKE2B 8b9919cb20159e14340fc2c28c6b6a762dbaf1067d2a2c679c0888d7198b0caa283a95c1460c7e02c8dbc79d31d85b243bef2d320f1c9cc462e0219c6ebb0d74 SHA512 e59cae6a65f42c5db111da9376a793c40f5d4d7b9323f06bda5e5f95f604b1e94201c6fa20dd33349e403451b1388bc35c657c7111fe765cb0bff305db443d40
+EBUILD borgmatic-1.9.14.ebuild 2066 BLAKE2B 8b9919cb20159e14340fc2c28c6b6a762dbaf1067d2a2c679c0888d7198b0caa283a95c1460c7e02c8dbc79d31d85b243bef2d320f1c9cc462e0219c6ebb0d74 SHA512 e59cae6a65f42c5db111da9376a793c40f5d4d7b9323f06bda5e5f95f604b1e94201c6fa20dd33349e403451b1388bc35c657c7111fe765cb0bff305db443d40
 EBUILD borgmatic-1.9.8.ebuild 2158 BLAKE2B 7e1f3e9a76faf19c91f32e2af5b815c13dc1cb3c1e4fd934cd0347778123175bbe02113dbb13d19481c2696fbe03ab02476aef5705906ceaebcd95bb3eb189cc SHA512 2ac661139a03a726e2a74db9884cdad4cf9da5bf235eedd61b852f2d3977f79e5bfe2c2585aac10e88eba4d8bcdbcb01204e9adeb512aefa77c250037c3aab1a
 MISC metadata.xml 461 BLAKE2B 700c5863d623abaa1a88f91ef5281c6d3d8c2ce8eeb5b15cadbbd93b1d50bfce5445cd2f133bbe998da36de9e2953ce154e1b8eb033d36f33bb88881e672aeb6 SHA512 e739f7ff60f69c3b4d5c72daeda65b9c042bf01d74ce6a60b2684e7e52eea5deaa946a2aa5f1dc84ae16f6eaf4bff8f46628f41ba55c394ff4fe70b5935663a2
diff --git a/app-backup/borgmatic/borgmatic-1.9.14.ebuild b/app-backup/borgmatic/borgmatic-1.9.14.ebuild
new file mode 100644
index 000000000000..7668c4167479
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.9.14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 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 eapi9-ver 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/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."
+	elif ver_replacing -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
+	fi
+}
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 6714b96006d8..fc79c0512eba 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,5 +1,3 @@
-AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
-AUX rdiff-backup-2.0.5-py311.patch 1649 BLAKE2B 89a4885cabb8a921522ee39f96187ac81dcd3d5b37a9c9ae3f0d3cd526eca432e1a007fc7add4dd436b03e09dcc57b016542437f0cd15fc5203e04f515c05124 SHA512 f085eab1cc1ec6de1f5c166752db0d1cfa07618e60537008c4d6edee0085a039a0f3d460c0d5ceefd2810d1aa3870a5b176567796577921c00359d9cb039c22e
 DIST rdiff-backup-2.2.6.tar.gz 944414 BLAKE2B f30bc570f8e20d950e87654d195f29848b6ca39953fc418b9ff391da649fdd308bebcd0379b047a1875eb1fa9b85c294df6a0528f06d4ba27627df4e12a771a4 SHA512 7370dcbb71f087252f8c599b0fbf58260ec7e026e023648bfab63c39b062120862ab8b60173e2bf2352e16d404bb561c72fe19aa9aed9d49cff56225b91f5c63
 EBUILD rdiff-backup-2.2.6.ebuild 887 BLAKE2B 810c2bba5ff893a8eac45f43396b7deb34baa44b8a49c36de0df6414bfe72b73108b9fd3aba9bec5601ad615844a29c6209c6ae009eddeb18ea13e4b734aa408 SHA512 741d1246efa4b0750094e573a1939cfec9b57c3b5e20e280da03176a23a853e74572cf795659dc7dea17cb16a71d09c7e18515e8002f5d2871a7b485174c136e
 MISC metadata.xml 393 BLAKE2B 345d8ca991657bcc7a84568942ff68f074568c247a6b68bd650967673e1ea126045ddcd4c16d8761bfd763b6daf86856fa5e4f7c503db2417e8a5eec47d6595b SHA512 c2ac0d3e6ff267541b42dc421ffefe57b4c8b34b57123a2fa2f9c9137deffe380202b97bacb989d0b11dfdc66daf76c3f3969d6bdfec2aaaa45bc57d7f5c6491
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.3-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.3-no-docs.patch
deleted file mode 100644
index 7ac2e4aea213..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-2.0.3-no-docs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur rdiff-backup-2.0.3.orig/setup.py rdiff-backup-2.0.3/setup.py
---- rdiff-backup-2.0.3.orig/setup.py	2020-05-17 11:28:17.000000000 +0200
-+++ rdiff-backup-2.0.3/setup.py	2020-05-31 00:36:19.404101919 +0200
-@@ -194,19 +194,6 @@
-     scripts=["src/rdiff-backup", "src/rdiff-backup-statistics", "src/rdiff-backup-delete"],
-     data_files=[
-         ("share/man/man1", ["build/rdiff-backup.1", "build/rdiff-backup-statistics.1"]),
--        (
--            "share/doc/rdiff-backup",
--            [
--                "CHANGELOG.md",
--                "COPYING",
--                "README.md",
--                "docs/FAQ.md",
--                "docs/examples.md",
--                "docs/DEVELOP.md",
--                "docs/Windows-README.md",
--                "docs/Windows-DEVELOP.md",
--            ],
--        ),
-         ("share/bash-completion/completions", ["tools/bash-completion/rdiff-backup"]),
-     ],
-     # options is a hash of hash with command -> option -> value
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch
deleted file mode 100644
index 87531ca7c4a6..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5e5cc54b5a633d3c6c0469283b2f26dbdde7908f Mon Sep 17 00:00:00 2001
-From: Frank Crawford <frank@crawford.emu.id.au>
-Date: Sun, 2 Jan 2022 18:44:57 +1100
-Subject: [PATCH] Added patch for Python3.11 as per bpo-39573.
-
----
- src/_librsyncmodule.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/src/_librsyncmodule.c b/src/_librsyncmodule.c
-index a46567fc4..158104d2e 100644
---- a/src/_librsyncmodule.c
-+++ b/src/_librsyncmodule.c
-@@ -25,6 +25,16 @@
- #include <librsync.h>
- #define RSM_JOB_BLOCKSIZE 65536
- 
-+/* ----------------------------------------------------------------------- *
-+ * Update for Python 3.11 - Contributed by Victor Stinner in bpo-39573.
-+ * Compatibility macro for older Python versions.
-+ * ----------------------------------------------------------------------- */
-+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE)
-+static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
-+{ ob->ob_type = type; }
-+#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type)
-+#endif
-+
- static PyObject *librsyncError;
- 
- /* Sets python error string from result */
-@@ -540,8 +550,9 @@ PyMODINIT_FUNC PyInit__librsync(void)
- {
-   PyObject *m, *d;
- 
--  Py_TYPE(&_librsync_SigMakerType) = &PyType_Type;
--  Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type;
-+  /* Update for Python 3.11 - bpo-39573. */
-+  Py_SET_TYPE(&_librsync_SigMakerType, &PyType_Type);
-+  Py_SET_TYPE(&_librsync_DeltaMakerType, &PyType_Type);
-   static struct PyModuleDef librsync_def = {
-             PyModuleDef_HEAD_INIT, "_librsync", "RSync Lib", -1, _librsyncMethods, };
-   m = PyModule_Create(&librsync_def);