gentoo auto-resync : 19:05:2023 - 16:15:42

5 files changed, 15 insertions, 28 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 3400eb61eb6b..c49f41a70578 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 4ddd1c6ff847..b7087705724c 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,10 +1,10 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
-AUX borgmatic-1.7.12-tests_flexmock.patch 744 BLAKE2B 91b09690867568f3158f7a9f01b157c483fc77a975348ce99ec71c2773941a247a5ce8b89bf9a965a37e39166e775d450e2b718156a0bbd81869f074e76816b0 SHA512 d90f633b914efd95d282630a07fea9ad93770588b439d4aee00e6866fa10ffd1b4797c200b5b0566e1d9b028fdc265ac0b701b049220a88a7397ba50d090ca0b
+AUX borgmatic-1.7.13-no_test_coverage.patch 248 BLAKE2B 624e21cc8971d9374b34dee002635d9090576ba785cf3b6da7c10a91f439fd8e11b335bb33dc9c3b7421b4a5a8982e2a5f67b723b06051969651d626f09bf972 SHA512 fc549c0a63a6182b1848d89a1c9aacd3057f07988d1e8ec3b6ae1defb0675e7b934b0c65c9b09edc431172bc550521058ab73cb64ae6e577072331d4d5269e78
 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.12.tar.gz 371090 BLAKE2B eb06d88320f2c49721938c756d637b6ce463192260ac734303079095c693cadde68805356249fdad86738bed8ea0afa2e7a5c5de3c68bbedba2162e1cb445cdd SHA512 6688eb48d9ac82e9c43816aebab36b6dc011132e9f90591b7add423743a7305f55ca60f3f02f983c2d5d2e86e2429da62aec2508fac472b05334a025a308c325
+DIST borgmatic-1.7.13.tar.gz 378163 BLAKE2B c20b384853c0ddf52a095250a05d9ebe813a23ee6ef00bd5748dacf05adcff9e4d324eb2e785ebbf139d34cadab3e58d3b8305d50ec5ff20681630040433e5ae SHA512 5109c093ad3096269e27abe761e6e87ebc31b78a56bfe16e540c686ea1cd935249d063aa7c350b60a3c509990065f3a50f9e4516d40d4a1bde68c43617de18b4
 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.12.ebuild 2095 BLAKE2B 5fc7dfef5212ad538e5a2649f1b4227452abf5c0b0583e843e74cb7481d887952ce29bd0a5b4cdb3b69cc0614bcb3e04ab2982edae21b189d7291b3270274fdd SHA512 0c8466dd7cd8a19a08714f5ec466b48d19c5cad74dc37f6be62eb643863d917e620e5fc24e4ee0c96fcae486cf1574e709e296e81d66a0acdd13b73fa0544b65
+EBUILD borgmatic-1.7.13.ebuild 2047 BLAKE2B ac75a7aa37070e15819b02da978ecb319a18277733880b355b397b3f9196501f3c4d9cd54f556422d334e45378908a6a1e32ec1153a6422764af66b84fde32c0 SHA512 9f05bb948ea55cd006bb67d6ebf9286adc027096e9fca4b6fd00e5b84b2c8bf7760d846d5fed5336adc2b85bb11dcb575790d12819ad977c4e36561e46c2942c
 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.12.ebuild b/app-backup/borgmatic/borgmatic-1.7.13.ebuild
index 128d6c2e7a7c..89d5cb17e987 100644
--- a/app-backup/borgmatic/borgmatic-1.7.12.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.7.13.ebuild
@@ -33,9 +33,8 @@ BDEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
 	"${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.7.12-tests_flexmock.patch
+	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
 )
 
 # A fragile test whose only purpose is to make sure the NEWS file
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch b/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch
deleted file mode 100644
index 5c41f9a7e701..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ebe5c5e83903685742a39ae63b779d7a64527cff Mon Sep 17 00:00:00 2001
-From: polyzen <polyzen@noreply.torsion.org>
-Date: Fri, 14 Apr 2023 01:01:31 +0000
-Subject: [PATCH] Fix "TypeError: 'module' object is not callable" in
- test_commands.py
-
---- a/tests/integration/borg/test_commands.py
-+++ b/tests/integration/borg/test_commands.py
-@@ -1,6 +1,6 @@
- import copy
- 
--import flexmock
-+from flexmock import flexmock
- 
- import borgmatic.borg.info
- import borgmatic.borg.list
-@@ -105,4 +105,4 @@ def test_display_archives_info_command_does_not_duplicate_flags_or_raise():
- 
-         borgmatic.borg.info.display_archives_info(
-             'repo', {}, '2.3.4', fuzz_argument(arguments, argument_name)
--        )
-+        )
-\ No newline at end of file
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch
new file mode 100644
index 000000000000..a3c02598b724
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch
@@ -0,0 +1,11 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -3,7 +3,7 @@
+ 
+ [tool:pytest]
+ testpaths = tests
+-addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end
++addopts = --ignore=tests/end-to-end
+ 
+ [flake8]
+ max-line-length = 100