13 files changed, 79 insertions, 153 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 223d8c351826..e67931ca525d 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'],
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 5751c8f441b7..955ef58b0978 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,10 +1,10 @@
 DIST restic-0.15.2-deps.tar.xz 159164476 BLAKE2B 652c5f880dc88ab9b4fcfb0168cf5bce19587f7c0195e379ac01ff227fd453bb5fc6ab72b7803d7070f92ea608a077aa0f79005f000b5626d7ea8841c9ec9643 SHA512 e4ef9ebfc09998e912128d84790081d16c05dad23e680f642e204974fc1ddd3a1f92ad2035227f6448f7661e24ba69379b1dc8198115d2d3d780ad0b0c7a475c
 DIST restic-0.15.2.tar.gz 23924222 BLAKE2B d07f505a9d3a425c2fbad275f43a3a23e0b84b673e0ac77f52c45c2965266b483ae136fe99f0bc82903680ff0c5843edd1ed72e4864e5977c2ed2c85a703520c SHA512 8135f8a77c6f1264d962156f58fca4023da6581099cfd4a69379d8f1f137443c217c0207aeb7d41b603b341e78e9b3050c6bdad81323e0efd7b81805f33263bd
-DIST restic-0.16.2-deps.tar.xz 171734268 BLAKE2B 76ad6bcfeabeb39b31a413ebdac3a24181bd958502e2a4720343c23e078200b5c038c21acfbf3b23ae1d8302bf1af8b8a4a97467e2ffe5929b8d91250ca59fa3 SHA512 a0ebcb0ea0f0346d38bfa3b84f1fc9600a8d6fd4acad1819f8a292f3f00991d1f06f39f3e51884a4508329bfedc8f77ec63b6a3de0eae7dc7b15d54f14e93088
-DIST restic-0.16.2.tar.gz 23981852 BLAKE2B a4feeb44a33d0a3291be04222dfb8939f0a9dbc74e72e10f1334994326ea9154351bc13825664956f0c288916c9455da3eac9a42483b49eb761a85faec67bced SHA512 319b0165def0a874b80314b8ff124a2460895660c55ebe5da260bfc92caeed0f0d886e9556043cfb3d83c1ca6b5f339ff5f74034989982f12c152505e347917c
 DIST restic-0.16.4-deps.tar.xz 171826444 BLAKE2B 2b4adb002209bbdcd2884f0126b775762517e6f008e6d862f63a8b373cc52c71d6f197ba753d90277f6136b38e6243e776ef8d75ce7437d563ccfc7e20509003 SHA512 b0c82b861265c4a2d42fa8fd921ec8d07a3018ccd6a2363dcaaf2e7cb1d40eb0ebe7e77dd6a44a30bc28c4d958facf504d27d231d2ea73b14c1f9a1ef12b33d5
 DIST restic-0.16.4.tar.gz 23990246 BLAKE2B f8dff867ee5e0f9c16b3b22b7db7bfede6d38565558c99632e7239e9c6a19602cd7ea5c7761ac5d0103d6e07c68c0d20c64184317022799f19b9ac814c4b6ff4 SHA512 9f28f90466a30a3c1f32cd1951dddaa22d30ece8b1c18da1a907cc1dd0f98065c25529e855b56fc3d62801b052371d9fe117cd26f17e15276f6a9a309416e914
+DIST restic-0.16.5-deps.tar.xz 172231640 BLAKE2B 76dafbaf761a62c3830fbb44f2f64ed45d752081f034a49772366edaf9a6b6b60a964cf16e08b9cfb35a7791ddfd39e7447d4e41287e74c65322e31ef431e1da SHA512 af338dcb2805ec8c83afffb8d5a0179617a26547354cddbdff583d7c8837285e2faedd033d3786ade55d444b0e9319dbe780b8f73bb3492d67447a5eabc3a3d1
+DIST restic-0.16.5.tar.gz 23990221 BLAKE2B ffdbcbcd5cbd2c22009c7d9c58cbc943c542cdc8d11e2a41cd87df58e0319ec396d6d880396aaaca103012efdfbb68f4fa5d42bd7f3df9208f9b9d80b6dadf0d SHA512 57a1829e28c4317172c06e095d91d760466c589cc9d2f2a5f20491ffe60f7a7c60e4666377fa5ae275b3238c10c27ab9265ea4f9f98c34b288fbd1e70a0814c6
 EBUILD restic-0.15.2.ebuild 1123 BLAKE2B bad05f9623f42c02e02799d6cf8937b4a60633a3c6c5c80c1665c38924cbfa7e7e66695ba53b974afb331c0f6283efc65c33d62913c7ad58087bed60daf4d1e5 SHA512 f67d7375f460c521f7825000e0a0a37ca79051a82df30e9d741a83fd0e1cc52418ac956631c044fcdfeb20fafdbab771011f1c054c0dcc8aa57d1538d9dadf9b
-EBUILD restic-0.16.2.ebuild 1153 BLAKE2B 7000b26f56309b64f9992423681475c313fc2a3a718343e4c046ce58cd8288e45c1b9a42be6d087d5e46310761c9c8161143ecd4e366ff7047ebb328421e0fc1 SHA512 1f943530337419cc6708dbaf8c89a313812021dc6bd0102a5973b5ffdfc67ee2fb0571dd984cce9856e81bbe97e669c65b6dba33da634384de651cdcdbd50335
 EBUILD restic-0.16.4.ebuild 1150 BLAKE2B 7237f258e2582f96117347d1f55fd9af01c29c525287dbb09ad63bed7d14852e4e483091498b30be90c6ce4be696e13e4f63e489a950af53fc6802926e38026f SHA512 b997b64cd92075264cbddf4e2e107e2d5e4778746a21baf77f57013d5dd57608f3f25025b75117cf7c8ab63a184e323580845f34d2a128a92518ea78d050ed31
+EBUILD restic-0.16.5.ebuild 1154 BLAKE2B 59673198d2ffae0cbbfc2d3317c4bdd8aa9745ad2cacfbdbedd6909b17cc3c2819b40e70b8c3367304647b42eff0cba9d7c7eb5a7cc034fafb466e672a81984a SHA512 1ccf51b3073297c4a8808b3b67f7145cd1e5af30b58d9f028115266ed2de2a09250283d80161dab93ea2e0f263846ac9707a95f7892ce152bede4251348bff0f
 MISC metadata.xml 584 BLAKE2B 76c5cf916e847dd9e8cd3dd205c9c6e68198aed895c1067ddb7e73a6e8610d973313d6ffc553c89ea5ca1caecf1b19d02424ec3f693a191e85a1a9ecae1e4721 SHA512 676f7b108bae1af9ee9431f9a08b8870a8207a92ec3214cd2d5774112c1065453a5c8f56c1e0a49180ba2c32a02c990494cb85a15487be62e02d76580eabc611
diff --git a/app-backup/restic/restic-0.16.2.ebuild b/app-backup/restic/restic-0.16.5.ebuild
index ccaf56cf50b6..1f7370b91e27 100644
--- a/app-backup/restic/restic-0.16.2.ebuild
+++ b/app-backup/restic/restic-0.16.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit go-module shell-completion
 DESCRIPTION="A backup program that is fast, efficient and secure"
 HOMEPAGE="https://restic.github.io/"
 SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+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"
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 7405b7dfc7e7..4c70046922b3 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,10 +1,7 @@
-AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
 AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae1f9509e3b454459499fa457119c75a9e5fecb85d5530caaab340cea7f4deba0f155ac9e31706ab3899372c45e381cf77 SHA512 e0e1a4ed7c9ef069bc0bc5449f784c2deda1ce6851e98ca6d04c03988361f00e06b6a4f347671ee905f496dba19f8dffa64e5bdcba89f547292fc9c8d276ecd7
 AUX snapper-0.11.0-cron-confd.patch 424 BLAKE2B beb358e0405a680963fc5776dc2bdd6de36958c53579d4097dd43655a4e4abd1dba0eaeff789da435b7f6fd13993e2dca29f07dd0b29e9bfcb29fa31c3623848 SHA512 1ac7ed0de6be97219282bcff82ebb0c62a9ae1a8869fd8e1246dc06b20aac81e3f95d306198d29d69223226b4efd5b1f4555b3280935f09c1c374803236c1bee
-DIST snapper-0.10.6.tar.gz 423867 BLAKE2B a7d0f8c62c60c0d03bf108a8c0692dd209f170cf8227512cbc3b80eb9f58ecca845aa585859032bc6582d67e4c6ff15b75443a9ee9291d1b970efec15513571f SHA512 6eedfb9408260331f042f0a429a1104136cb88dac450f320641b0941cd06faf52f67cad2397cf4122f919876bb994455da0cfd3bb099f82217050e07b4c77d2e
-DIST snapper-0.10.7.tar.gz 428482 BLAKE2B 43c48d978296901f6584cef258ec3723de97b1d6b4b4a5b6bc39649f28b3300919616c65b8fcdb97b3ebcab08d04e4583713eef146721367de24513e80113b45 SHA512 bf098c941735b60554ff0711fa43b30ef3634e01178f5ee8ad44c65b757c3366bd5bf568cef3a787b2ddcc2fc63090056109250480e6bd360ebf27a8343373b8
 DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40
-EBUILD snapper-0.10.6.ebuild 2047 BLAKE2B 2edd21d85fbc8d3a750ae08a9961dcb8b6470d46095208dfd0b1c1b024b05db281118fd60697305b3f449ad4967e199acb8862faa8f84eb649cd196fd569c971 SHA512 c71f9432028a102fbfc5d0dc47194f3714e5834514bf3a7c0a2e2a9452824c5ae751de5b777bf6c6840edf73b63331f1f850b67f84283cf5241cef9abf16b45b
-EBUILD snapper-0.10.7.ebuild 2049 BLAKE2B 795e6947da7d2d2c68d24e612ce442fdec03c22584c1d4b85a8d36413b2e555ca4719c6223591cf92e441c15b6069cd29bd869519c99b2f23d54fd0fbb4225e0 SHA512 101ad55fd0be1fa87923bb57114280e626cf84ac22c0a7056f002276b71061e2ad0b3573e9d56dd500bff4b419a180a6c9c70b6be7d44340953f863249dfe93b
-EBUILD snapper-0.11.0.ebuild 2054 BLAKE2B c58e9c9ae9dc006221778c50c6d0727b384d32d4390e280e474e1496fb8155a3cd4448ed725b2dbd679ee7dd90d6bf42b4baa321a74f99290be036374b4d5eec SHA512 ce00a62a1848d756c5174ce4ac3b29ff042494ff5644f4618d2777dde9708b1a89018bbd4a78d4a6c203801e2775a7e4fdb98ec5a30ce6dc8bb375650827b500
+DIST snapper-0.11.1.tar.gz 450693 BLAKE2B 06c90cfdca71550e8dc8a246008a94bceb582f98dc4d56546592ae70ec69bd21f1f73ff1e41776f7eb5a02c42c382e05b771afa3fe583eb63486f640dc1d23d4 SHA512 0d7f6d9a012892c3ea0916cc92da5a6a435aa0a90067941f03b6e5a08adff54a7f3c52cc500cd28e7a7b496fb436c88db4399307cdd5518cfa54f2287e285993
+EBUILD snapper-0.11.0.ebuild 2052 BLAKE2B 13fdc4dfc90e5413b187cb3445b23b68fb271595553277861d5807ca2d7f93cc2719e1418ff8349d253f175d23b85a92a1e1fe73eca35ffd8ebc9fac4cdae51c SHA512 6fbb43ca53e9bf3e40be32bc0c2257b17128f2a8d61219465586de48be1404ed964a5fc6a156c5db3025da1c078a9ac04caf41b7d1f078204ff75678f2bdac57
+EBUILD snapper-0.11.1.ebuild 2062 BLAKE2B bfa3c6823b4d131caf04b10283cc4e91d957c9f8fe6608af4489370d23ff7801d31cc09dbd3d51d451228341921a6db29c04f35ec9228a0bcfbc346011b2d093 SHA512 6251093935e6c75abfc666711596ad52a15fcc78d0bf6aa5b70492ca6fa6246406d06632772b45a5dea05bf20be31b1ca379cc91581510b2231ee4d2078cc596
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/files/cron-confd.patch b/app-backup/snapper/files/cron-confd.patch
deleted file mode 100644
index 473e749d0bb2..000000000000
--- a/app-backup/snapper/files/cron-confd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u old/scripts/snapper-daily new/scripts/snapper-daily
---- old/scripts/snapper-daily   2014-01-29 17:48:30.000000000 +0200
-+++ new/scripts/snapper-daily   2014-02-19 13:32:22.702734875 +0200
-@@ -9,10 +9,10 @@
- 
- 
- #
--# get information from /etc/sysconfig/snapper
-+# get information from /etc/conf.d/snapper
- #
--if [ -f /etc/sysconfig/snapper ] ; then
--    . /etc/sysconfig/snapper
-+if [ -f /etc/conf.d/snapper ] ; then
-+    . /etc/conf.d/snapper
- fi
- 
- 
-diff -u old/scripts/snapper-hourly new/scripts/snapper-hourly
---- old/scripts/snapper-hourly  2014-01-29 17:48:30.000000000 +0200
-+++ new/scripts/snapper-hourly  2014-02-19 13:32:43.609166927 +0200
-@@ -9,10 +9,10 @@
- 
- 
- #
--# get information from /etc/sysconfig/snapper
-+# get information from /etc/conf.d/snapper
- #
--if [ -f /etc/sysconfig/snapper ] ; then
--    . /etc/sysconfig/snapper
-+if [ -f /etc/conf.d/snapper ] ; then
-+    . /etc/conf.d/snapper
- fi
diff --git a/app-backup/snapper/snapper-0.10.6.ebuild b/app-backup/snapper/snapper-0.10.6.ebuild
deleted file mode 100644
index 2adf8bcfcde5..000000000000
--- a/app-backup/snapper/snapper-0.10.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="lvm pam test systemd xattr"
-RESTRICT="test"
-
-BDEPEND="app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
-	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-	eautoreconf
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--disable-silent-rules
-		--with-conf="/etc/conf.d"
-		--enable-zypp
-		--enable-rollback
-		--enable-btrfs-quota
-		--disable-ext4
-		--enable-btrfs
-		--enable-doc
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable test tests)
-		$(use_enable systemd)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	keepdir /etc/snapper/configs
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html and"
-	elog "https://wiki.gentoo.org/wiki/Snapper"
-}
diff --git a/app-backup/snapper/snapper-0.11.0.ebuild b/app-backup/snapper/snapper-0.11.0.ebuild
index 0e9331554272..011eb5479f3e 100644
--- a/app-backup/snapper/snapper-0.11.0.ebuild
+++ b/app-backup/snapper/snapper-0.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-backup/snapper/snapper-0.10.7.ebuild b/app-backup/snapper/snapper-0.11.1.ebuild
index 9d04eeeb2e14..92c569f5b215 100644
--- a/app-backup/snapper/snapper-0.10.7.ebuild
+++ b/app-backup/snapper/snapper-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,7 @@ RDEPEND="dev-libs/boost:=
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${PN}-0.11.0-cron-confd.patch
 	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
 )