gentoo resync : 25.11.2020

3 files changed, 19 insertions, 13 deletions

diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 4ca8c465a8e6..5fcbf676cc29 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,7 +1,7 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 DIST borgmatic-1.5.10.tar.gz 71743 BLAKE2B b2b5f9135a15730ca7ddddeaa7f621f82207f1dcf383c3be7459eb39dbffc85a310184a4ddce3fb0bd47aa213cb588eb3f3e2f73418659330a421b7da5b87698 SHA512 52436535810ce42f5ab30ae8a4705005e8c7a5d91d52520aab4160320215196cdc088dfae1a21a0d65d0161fb2bb3c9b984cfe2cb5204f7b9bd0ed27c3a38c5b
-DIST borgmatic-1.5.9.tar.gz 71857 BLAKE2B c30c2629e327168ee81e9ecc26c811c5bab7369063f5711cd79567922f21d4e5c0980fe34021340d94923cea85ab0c307f9f348268c3f2063d084d0360e5fdfa SHA512 a1ea62ffdc1457fc1e7b964a474bc25d2b2d3d153ba2026018d5081011acf8d6d1329a440c2616e201ebf0351bf2f12a1e37ec2477a6f5da44de315ec3bb0c3a
-EBUILD borgmatic-1.5.10.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
-EBUILD borgmatic-1.5.9.ebuild 2022 BLAKE2B d79f694143826cf4c1c07ca74971be509bade99a12c1d05262af2ae02a04099e862faa7848ca85b4699aa42ca813e241f3846a8a2de11fdddbe4b593d73f3a4e SHA512 bf8b9e12e656911398dd1cdd50164c1cc49cfa6ca9631a0f489b848cfe209774106d798b577388d8e2d44ec6e67e973f70f78ce7c989717b3c53c8bb7694ba24
+DIST borgmatic-1.5.11.tar.gz 72985 BLAKE2B fac7e403a4338fc46955d3b82e12e0fc983a11edbb51dc74dcfb6c28818a655b50f7445b28033a966e7e27e2998b062967df97a51f4c362f0d7eac83a19386de SHA512 a945d19bf2fbd617e7de5827d75c8a69f5902c6dfa5d33344b61e680e97636c4a5337d759a372a70b6d2c792a1e7fbc168eedef5e1ae64cac702d313329bca9e
+EBUILD borgmatic-1.5.10.ebuild 2112 BLAKE2B baae6eecdd310dd08ae1a9f500d4b4d5b189081412457518aa94d9f713d849b15cd208abfa08b9b491c590e8dc43fb2290f033a7722cfee143e14bcf114e6178 SHA512 51bfe378cff6de7ee0075b2a52ac458f7a61012b29f06860ee982adb987822a5443658278532294fd76c2d732588ae46b8947dca76929d9a167b545d05f6fd3b
+EBUILD borgmatic-1.5.11.ebuild 2120 BLAKE2B b38140579fa98a8027642cb355f3897ca5249c20014b6e424d1e9f615e0dbe17b57cca34e2adb55d0c332b4ff008aab6161ecf69bd7415a7e7e0e8383db1316f SHA512 23c33625765234945251ccc025051a2c41ea77623b012e56afbc95aabea27e7be4df5c4ef920e25c94ea2b20065c951f5d12871a31f786c6e77934e27d505c22
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.10.ebuild b/app-backup/borgmatic/borgmatic-1.5.10.ebuild
index 80e8098f34d2..e1682b5e20da 100644
--- a/app-backup/borgmatic/borgmatic-1.5.10.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.10.ebuild
@@ -15,7 +15,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
+
+# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
+RESTRICT="test"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/borgmatic/borgmatic-1.5.9.ebuild b/app-backup/borgmatic/borgmatic-1.5.11.ebuild
index 157355afb07e..7ded25f08aac 100644
--- a/app-backup/borgmatic/borgmatic-1.5.9.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
@@ -15,7 +15,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
+
+# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
+RESTRICT="test"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
@@ -25,12 +28,12 @@ RDEPEND="app-backup/borgbackup
 		dev-python/requests[${PYTHON_USEDEP}]
 		<dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
 	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flexmock[${PYTHON_USEDEP}]
-		')
-	)"
+#BDEPEND="
+#	test? (
+#		$(python_gen_cond_dep '
+#			dev-python/flexmock[${PYTHON_USEDEP}]
+#		')
+#	)"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
@@ -47,7 +50,7 @@ src_prepare() {
 	# 'borgmatic' executable - which by the time we execute src_test will
 	# not have been created yet. distutils_install_for_testing would likely
 	# take care of this - but between the aforementioned behaviour inconsistency
-	# and the fact the only test run from this file as of version 1.5.1 is the
+	# and the fact the only test run from this file as of version 1.5.11 is the
 	# parsing of contents of 'borgmatic --version', just skip it for now.
 	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
 }