gentoo auto-resync : 04:07:2024 - 08:06:07

6 files changed, 68 insertions, 17 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 223d8c351826..1e0845f4d364 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index dac16bb59b45..e6a2592d73b2 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,3 +1,3 @@
 DIST borgbackup-1.2.8.tar.gz 4369117 BLAKE2B f230274189716e6ecb8f73d10caa13e683e63c9d9f50c5b6235fc666a0f64f3048421e76e5b57626144c37d37d28c4371b368f780f5e32055f62d5ff10954c19 SHA512 9a62e5eec894ebffe928a08c9a0cceebde084f16524d363a3c3be01d908a7eceaea8fa11eac422acc0fdb2534d79d1ee5ec5d9167e1086f334af6a28887616d5
-EBUILD borgbackup-1.2.8.ebuild 1403 BLAKE2B 824e8c84db510b6188e2de6db8aad486b28689d8951b85218f42048e9946e5c43293b184c1b9203bc1389cbf9acfcd4d1aa1eea55df05a2d082c71993fa7ee23 SHA512 8bcb7ed20e1ba1c788736b5488f61a428dec1eaf8a34877ffa4d6d971938b5310e1c25c24ebc55b03085529d0411df32d67410e144bd28913444d094d91eed08
+EBUILD borgbackup-1.2.8.ebuild 2228 BLAKE2B d033f9b9d16e0770122cced4d774ce537c9325c2f1688755f307ab7990a2ada754e9235bb8be05fee023b3e42783e22453bc2db153948971220cf0649d758784 SHA512 3ffc7cc88abb0f0219d35b52a34e21b066d4628cecc2562aad8f599a48bdddb2f9906f1418e1f26b95b3475f052d21ef22ac70c3bf39ca5055d8082472cd497e
 MISC metadata.xml 296 BLAKE2B 3f0aba58d462b6e50677f94dbef5b44bd3aa2dd92a44bb10777f0a19aff17d02792384b49e44915611c962cf6775b4dab33230e1d6b0ae4ef3f359e30ecfd2b3 SHA512 f223dd74fb089d81f0d8cab8efc2a1edad6dba0b8b37dd72ef4758cda02b3be229a0809783fdb563aa4e8e71ef41962d892be4925d77e110fc7453d4b41cedfc
diff --git a/app-backup/borgbackup/borgbackup-1.2.8.ebuild b/app-backup/borgbackup/borgbackup-1.2.8.ebuild
index ac351d5e5724..6c69b04d764c 100644
--- a/app-backup/borgbackup/borgbackup-1.2.8.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.8.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit bash-completion-r1 distutils-r1 pypi
 
@@ -16,29 +16,57 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
-# "import file mismatch" when in S, "attempted relative import with no
-# known parent package" when in BUILD_DIR/install/.../borg/testsuite.
-# Needs work.
-RESTRICT="test"
-
-DEPEND="app-arch/lz4
+DEPEND="
+	app-arch/lz4
 	app-arch/zstd
 	dev-libs/openssl:0=
 	>=dev-libs/xxhash-0.8.1
-	virtual/acl"
+	virtual/acl
+"
 # borgbackup is *very* picky about which msgpack it work with,
 # check setup.py on bumps.
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	~dev-python/msgpack-1.0.8[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyfuse3[${PYTHON_USEDEP}]"
+	dev-python/pyfuse3[${PYTHON_USEDEP}]
+"
 
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]"
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Needs pytest-benchmark fixture
+		benchmark.py::test_
+
+		# TODO:
+		# Following tests fail because of additional warning in the output:
+		#   ResourceWarning: unclosed file <_io.BufferedReader name=14>
+		# which is not expected in asserts
+		archiver.py::ArchiverTestCase::test_create_content_from_command_with_failed_command
+		archiver.py::ArchiverTestCase::test_create_paths_from_command_with_failed_command
+		archiver.py::RemoteArchiverTestCase::test_create_content_from_command_with_failed_command
+		archiver.py::RemoteArchiverTestCase::test_create_paths_from_command_with_failed_command
+		# similar issues since py3.13
+		archiver.py::RemoteArchiverTestCase::test_recreate_rechunkify
+		archiver.py::RemoteArchiverTestCase::test_recreate_skips_nothing_to_do
+	)
+
+	# This disables fuse releated tests
+	local -x BORG_FUSE_IMPL="none"
+	epytest --pyargs borg.testsuite
+}
+
 src_install() {
 	distutils-r1_src_install
 	doman docs/man/*
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 9496e0a9d500..eff8a5a27a9b 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,11 +1,12 @@
 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.8.12-datetime-utc.patch 920 BLAKE2B d4cd88e05aeaac5167f288747035d9b74c32baa9303c97bf9a9c4c24581f9d58f7fc99251b9c0c6b263b1ddddbf675dbad3c2edff73a79ae29a526b87fa416ed SHA512 72d1ddd507f1aa4f22009971fe35d747f2dab7895d36b7c96c466ebe8d0bb8a0da48cb193c59cf7878986393a5116d30c422179646b9ee33629a60efd94ab1b6
 DIST borgmatic-1.8.10.tar.gz 599453 BLAKE2B 1ae994d452d29139d23940500d7c9f01e7fc1ddbd36254bf0c36d7f56064ccba7fb8434741dd0114d42271eb241098a12f8a07b83046447ae2225f7cd2ab12ae SHA512 10f5d962f6d25ef42ba4d076e238e1986dcfcd9832b3eea08560f367524824fdb0f80f42962ea6a471d711c6a0e293669b85abdc160475c20eed851ce7ad7f42
 DIST borgmatic-1.8.11.tar.gz 600265 BLAKE2B 04c5e419de892e636e644185681c3e9ce0ca2dd9b62a043dfdabd38a32ca2f101f6a845fd1ebc68a025625066ea9c53aff9ab1e831a2aeaa566bccb7ec4827c7 SHA512 da19a341713302378409c0e90395a0e5ac4759b1ef593fe53a50113a0c90f130af060d38f49dae80018b8d8605da87415b841fedfc2d2778eee4a690aa5cc311
-DIST borgmatic-1.8.8.tar.gz 589575 BLAKE2B 09a3ca616bd1cf5fcc6c773d8066357d764b44230d691b7afa90bb1fdbce3aa3bfaac509e921adaa9086ba60310b24d1f2ba186849853c8f04e2a85c4b0ec94f SHA512 3984f6e34f8aed5c57df22799e60724903bfcec833e5c3215ad731977b7d376f36129fabd489c166f945d7103f272bcc132a9ea49010552001794b57f27fb5d5
+DIST borgmatic-1.8.12.tar.gz 602369 BLAKE2B 79589e1510be9065d70b48ac5b8ce83a8d82776040cfe0ec833e7c9cbc33e4d285a2292870e2237902900ebb03204c6aafd702a2729b8860aec234429ec00921 SHA512 9cb91a4e7047da4effff69dfaea2358bd0d0897197d306775a3e9e260a2da6cc183c7675e02885fcd3d853c185171372371638b482b3e8b2f1bfcbcb2a14e4b7
 DIST borgmatic-1.8.9.tar.gz 592715 BLAKE2B 3586404985b8cc0d5575f570ba6679c406e95b83453a7c2414872049067b1736010b9f8498fa92e91d281b1cdf75882bc09e40d6d9e443bff33c399ee1392ff9 SHA512 05386f6321d78e304030ebb78c495aee53a1b6f17241f101e73a097aa4208ac641d6105b1e8161cf714b2eab7c34fe682e082e9e997dc4ac6a6a4207253e8421
 EBUILD borgmatic-1.8.10.ebuild 2114 BLAKE2B 211a365fbe7f4a0caca44b1118348d0ca0b5a63655e79fc2ce710fd203d6c3269505d3bbdb6475897b9faa0fcddfab8995b9b01977cebdfc86a035ff17fca4d7 SHA512 3237f5954d637154e739d3c5d8e39267511b8b3cc69bcf8d7a9ce3e0f49cab4603c41ed59917019532946f7ba659a05ba8a1504a0348fa6d14e11f0cf0d9c2f7
 EBUILD borgmatic-1.8.11.ebuild 2114 BLAKE2B 211a365fbe7f4a0caca44b1118348d0ca0b5a63655e79fc2ce710fd203d6c3269505d3bbdb6475897b9faa0fcddfab8995b9b01977cebdfc86a035ff17fca4d7 SHA512 3237f5954d637154e739d3c5d8e39267511b8b3cc69bcf8d7a9ce3e0f49cab4603c41ed59917019532946f7ba659a05ba8a1504a0348fa6d14e11f0cf0d9c2f7
-EBUILD borgmatic-1.8.8.ebuild 2113 BLAKE2B fd62e06d43871b3c0d1ed770e46b16ec709df12bda518d7bb9786825a6d0fc0964cf1745d1cf3ebf8da0047ae242374d49b34695e90a51ad8e2559029986143c SHA512 50148509d71cd0c0bc219d625642b6ae6f35306cb8ecdcc3f571049ccd0902b40c247c729aec10d9ff61b5fa6f999100149837675d1fd97c63d41c5fe261320c
+EBUILD borgmatic-1.8.12.ebuild 2179 BLAKE2B 7b51da55d819112cd8929129bdea99852946f13d1bd7ca8cb51015a4b5fa6739ea05447cd2cfe83a3eb7fa45a53aa8ab8f975a5050ca7b6b149190a39170ae66 SHA512 f7031663d15547c7af421b1c912d1cb0dff05eeebe700be0135234e4aac69c18f40f86de96f3b98a23d14a50cacde560e0ff5a812c91ea19ac9d6aa655defd21
 EBUILD borgmatic-1.8.9.ebuild 2113 BLAKE2B fd62e06d43871b3c0d1ed770e46b16ec709df12bda518d7bb9786825a6d0fc0964cf1745d1cf3ebf8da0047ae242374d49b34695e90a51ad8e2559029986143c SHA512 50148509d71cd0c0bc219d625642b6ae6f35306cb8ecdcc3f571049ccd0902b40c247c729aec10d9ff61b5fa6f999100149837675d1fd97c63d41c5fe261320c
 MISC metadata.xml 461 BLAKE2B 700c5863d623abaa1a88f91ef5281c6d3d8c2ce8eeb5b15cadbbd93b1d50bfce5445cd2f133bbe998da36de9e2953ce154e1b8eb033d36f33bb88881e672aeb6 SHA512 e739f7ff60f69c3b4d5c72daeda65b9c042bf01d74ce6a60b2684e7e52eea5deaa946a2aa5f1dc84ae16f6eaf4bff8f46628f41ba55c394ff4fe70b5935663a2
diff --git a/app-backup/borgmatic/borgmatic-1.8.8.ebuild b/app-backup/borgmatic/borgmatic-1.8.12.ebuild
index 0155eb3b0714..cac1b9a834e8 100644
--- a/app-backup/borgmatic/borgmatic-1.8.8.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.8.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://torsion.org/borgmatic/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 IUSE="apprise"
 
 REQUIRED_USE="test? ( apprise )"
@@ -41,6 +41,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
 	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
+	# fix for py3.10
+	"${FILESDIR}"/${PN}-1.8.12-datetime-utc.patch
 )
 
 # A fragile test whose only purpose is to make sure the NEWS file
diff --git a/app-backup/borgmatic/files/borgmatic-1.8.12-datetime-utc.patch b/app-backup/borgmatic/files/borgmatic-1.8.12-datetime-utc.patch
new file mode 100644
index 000000000000..4a3505976f90
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.8.12-datetime-utc.patch
@@ -0,0 +1,20 @@
+From f5a1dd31c8e5807e52196ecfd337c22e0f197bf5 Mon Sep 17 00:00:00 2001
+From: Dan Helfman <witten@torsion.org>
+Date: Sun, 23 Jun 2024 18:28:41 -0700
+Subject: [PATCH] Fix PagerDuty hook traceback with Python < 3.10 (#886).
+
+https://github.com/borgmatic-collective/borgmatic/commit/f5a1dd31c8e5807e52196ecfd337c22e0f197bf5
+
+diff --git a/borgmatic/hooks/pagerduty.py b/borgmatic/hooks/pagerduty.py
+index 6ec1a6ef..e9e34da0 100644
+--- a/borgmatic/hooks/pagerduty.py
++++ b/borgmatic/hooks/pagerduty.py
+@@ -40,7 +40,7 @@ def ping_monitor(hook_config, config, config_filename, state, monitoring_log_lev
+         return
+ 
+     hostname = platform.node()
+-    local_timestamp = datetime.datetime.now(datetime.UTC).astimezone().isoformat()
++    local_timestamp = datetime.datetime.now(datetime.timezone.utc).astimezone().isoformat()
+     payload = json.dumps(
+         {
+             'routing_key': hook_config['integration_key'],