gentoo resync : 05.12.2021

10 files changed, 22 insertions, 47 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9b083610effa..c0b80e4f1638 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest
index e2548c6d94ab..bae1f10eb2e4 100644
--- a/app-backup/backupninja/Manifest
+++ b/app-backup/backupninja/Manifest
@@ -1,4 +1,4 @@
 DIST backupninja-backupninja_upstream-1.2.1.tar.gz 186791 BLAKE2B 2e761b5538c77f359b2cc8b8c593589303f36b5b4d4d9f65457a1786cc671bdc57ad067c5bc7678fbe1afdd17406c3dedd641f2553213ec28186defd4b9d1fd4 SHA512 974276697f908cbf2203fd0cd3ebfe4f44c350714616d3a74191df4f9e101ce6d5f90cd2887dc06c5ed937ea19f9b72db28f5735255fae9d6db4faeaacee808c
-EBUILD backupninja-1.2.1-r1.ebuild 540 BLAKE2B 0294d8998138600ca7267ff3c4c924545e1f64799adfe14d16320f6cd8cbb30fca5b4b2c0b786a0b9e986846ce016891acf3f930c67f407469975030a53b796b SHA512 013b51482c124539eb22d8ff161c688ae9f613706375ff950950abd1baadf39223ae5b3825f78584797ae6dfb8812826a57ce85e605a9e5a58fef8c018ec2dfc
+EBUILD backupninja-1.2.1-r1.ebuild 538 BLAKE2B 16796f7df82150562c7e34d69a81eaa47c8e9e4a02800e2747e2648a78afeccf2e8b539dc7cf915218e9c43904dc6f174f0f733e33c84196d9c1e4c1e03ffa26 SHA512 f80e86a4dddc3e6f22bdf40f8b4b9bc04da9476e74cf6a99a7675e526fa3e0e31e13b12c005c539f09b63599b8c2dbce59f87a352195f51146ca99ad07600ade
 EBUILD backupninja-1.2.1.ebuild 538 BLAKE2B b0579f86d7755c9cd29d0be3af672e78cf12b1ccf30f63654921b5c09cb4929a6617dbaaa1b14ef099cdefa26cd9a4309d05dfc73055e5f730dd5d6d8a1043d8 SHA512 2dfebffda7334cb8dcaf19f70ded5136fa14e0b50fad943316a007f369f5b6f4d9acca2825f982f03b1dcec3f7bbe291cba6e166cab96d572a3a8cfcca9fe800
 MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7
diff --git a/app-backup/backupninja/backupninja-1.2.1-r1.ebuild b/app-backup/backupninja/backupninja-1.2.1-r1.ebuild
index 09356e07f8ab..79269abef8b5 100644
--- a/app-backup/backupninja/backupninja-1.2.1-r1.ebuild
+++ b/app-backup/backupninja/backupninja-1.2.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-util/dialog"
 DEPEND=""
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 3503c3beb507..2706f731a6e1 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,8 +1,7 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
-AUX borgmatic-1.5.16-flexmock_write_args.patch 738 BLAKE2B aef28c6cc9f3e4c6294cf34cb6e3a1291fce90e0696f54d8f3975d7823faf64d73f2f625f1ccc7d1473e74f81342e6243d283950c505ed7cfc2279afe8eb5df9 SHA512 a9e1645dad137a9a20e71967d4578b3bbedca5556ce8e7b588215eb240c5581e6e0d5b657941eedb637ff94ac6e09ed06d3d9ef941cc1d4365daef0ae536659d
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
-DIST borgmatic-1.5.18.tar.gz 277064 BLAKE2B 43f5f8d2fb7f13ed6bcfd5b00f99a797f214f5220b27f8c173f636d37b4c0b5c8d1915a73684597d71fb436717a84de542be51a9b23f735e304e15427d40ace1 SHA512 2e008ef01922851a3fd5c7b5d1ad30d5b0e007e5f76af4849159ff2f730add591ffb30ba3d867b0e7221b98e949e4cf3e11b8853a3412395a63c135248761264
 DIST borgmatic-1.5.20.tar.gz 277495 BLAKE2B 6714b132549633b1d24e3c0bd7cd16ee9ff5510c4915d4115d62f4a260dc3cc505a02d8a14220184d53c934384d9ca092a38d6deebcefb843e7ba4492043819a SHA512 ea370ea1e57f56c8c4b7636695ae40473b9d58696948f55afde55b31b3bcbd68923952e80b0ef0bc40f68bb265ccd47bd5e0b2735ee9b4b6f3418a5ff13eaaf4
-EBUILD borgmatic-1.5.18.ebuild 2096 BLAKE2B df79e8f214b7d8fc55fd6c21710b27ce9817695a7fc65ca4a9e1208ed9605cfb55f7064588c8c5b5897d790bd0e43283f673aeeedafd2bf1343396b140997321 SHA512 59123c827902346f4aca8841d93b8028817b17badf1cabbf1ece2aa7913d52cf00741d2ec54e11ee4485baf1843f4e9d8495df40c1fcb4f0784b3b16fa24beda
-EBUILD borgmatic-1.5.20.ebuild 2053 BLAKE2B c2ed86a406951acf3341d1808fd4976606026b37f010fa90a01eb1d65d4075c29177f7a14fcd5b2cccf3ff9c1851f0fe691a18170baa9baf0d942c37a1354823 SHA512 21b38e68e00a391c85b569f5fe5cae50dbae549931f81a53d338cae13328cc41a98ec45af917f0907893fe41c4f0721729aa25d4533bbfae43bc3a5563e33720
-MISC metadata.xml 366 BLAKE2B e4c95292ab3040a6e29337f620ee8b808b1da11733b300fe7d53f1bf1c9511c2835d122d1c4c8da36f99a98f35eb1f3f505357c9d5796c6b9dd187f7171098a4 SHA512 c23574795068b1a77b4c2c8efc7a171e9a6160b1f05f528c589589eb56d607ad03168c894f4c4f358e03a33c04b7e84a3b464be347b4cfbd7eea92d5f5b5f411
+DIST borgmatic-1.5.21.tar.gz 278933 BLAKE2B b098334fa476304a8e63ceed37b3c2b9c67d0549bea6d06d8f0fd0f41f9812e79cea52f88fc15d2be29e491355f9544b6ccbe7c31936dfbd78eefd42e9ff2832 SHA512 e183269a0ac3ae049031832414d597ced8f75dd1f82d16379faec6d53566a1c19f51d613745e61077621381ee819d2f5dfc5cabaf9928a629f5cf3e13398503c
+EBUILD borgmatic-1.5.20.ebuild 2052 BLAKE2B 6e6c3af54067c997a57f4b2ccfeacddb96a12b6d235cef8d755f0e70fc3fa57c4c38d00e8bfec6e4452baef29e91dc3f2aa3b573fa189316cd87f2c7b4191c46 SHA512 bf23ee7cb43b107b02e2ee6398db01de8ef7dccaf8b89d164c624fc155f2ee90b1d21d78226a2af975849dd81236bddc4cb791bfc27e9c89e96bd13f98832f2e
+EBUILD borgmatic-1.5.21.ebuild 1866 BLAKE2B fa208da0d348c16c6a567757f15185f2690474e994b0d5bd55d860c69d0fbbe3892cfa3bd2abc0e09f3bad9407a2f42e61c52baeb773b71d435bd89d10c4d41f SHA512 983baa873909a3fccdb6fcc0111f9d5258dd13a9f1d2ea0a5e5fbb3b9062999112926bbcdc4be0d2bcfee002cda26b5d0d771154e1313efd184dc9bcf16efaed
+MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.5.20.ebuild b/app-backup/borgmatic/borgmatic-1.5.20.ebuild
index 74ed90e2da6c..2b90f26d7470 100644
--- a/app-backup/borgmatic/borgmatic-1.5.20.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/borgmatic/borgmatic-1.5.18.ebuild b/app-backup/borgmatic/borgmatic-1.5.21.ebuild
index 4b739e7cd033..40b004fb3ea1 100644
--- a/app-backup/borgmatic/borgmatic-1.5.18.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.21.ebuild
@@ -15,12 +15,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
 	$(python_gen_cond_dep '
-		dev-python/colorama[${PYTHON_USEDEP}]
+		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
@@ -28,30 +28,25 @@ RDEPEND="app-backup/borgbackup
 BDEPEND="
 	test? (
 		$(python_gen_cond_dep '
-			dev-python/flexmock[${PYTHON_USEDEP}]
+			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
 		')
 	)"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.5.16-flexmock_write_args.patch
 	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
 )
 
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
+# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
+# executable so making it work would require passing --install
+# to distutils_enable_tests. Given that this is the only test requiring
+# this and that all it does is make sure the NEWS file has been updated
+# for the current version, just skip it.
+EPYTEST_DESELECT=(
+	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
 
-	# Unlike the other two test files in integration/commands, which use the
-	# relevant modules' respective APIs, test_borgmatic.py tries to call the
-	# 'borgmatic' executable - which by the time we execute src_test will
-	# not have been created yet. Adding --install to distutils_enable_tests 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.13 is the parsing of contents of 'borgmatic --version', just skip it.
-	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
+distutils_enable_tests pytest
 
 src_install() {
 	distutils-r1_src_install
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
deleted file mode 100644
index 32937adadba0..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Apparently in the flexmock universe, sys.stdout.write() takes two
-arguments rather than one. As of late July 2021, upstream hasn't said
-a word of comment on this; see
-https://github.com/flexmock/flexmock/issues/37
-
---- a/tests/unit/commands/test_borgmatic.py
-+++ b/tests/unit/commands/test_borgmatic.py
-@@ -448,7 +448,10 @@
-         ['baz']
-     )
-     stdout = flexmock()
--    stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once()
-+    try:
-+        stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once()
-+    except flexmock.MethodSignatureError:
-+        stdout.should_receive('write').with_args('["foo", "bar", "baz"]', None).once()
-     flexmock(module.sys).stdout = stdout
-     arguments = {}
- 
diff --git a/app-backup/borgmatic/metadata.xml b/app-backup/borgmatic/metadata.xml
index 8e23892e0771..8891ce86c8d5 100644
--- a/app-backup/borgmatic/metadata.xml
+++ b/app-backup/borgmatic/metadata.xml
@@ -6,7 +6,7 @@
 	<name>Marek Szuba</name>
 </maintainer>
 <upstream>
-	<remote-id type="github">witten/borgmatic</remote-id>
+	<remote-id type="github">borgmatic-collective/borgmatic</remote-id>
 	<remote-id type="pypi">borgmatic</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index 19ea333ca6e8..da56c0200d84 100644
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@@ -5,5 +5,5 @@ AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a1
 AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
 DIST 8.1.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984
-EBUILD tsm-8.1.6.0-r2.ebuild 7488 BLAKE2B 8ab07597c6cfed5782bf1cf96662cca63dde62ff42138b9ee9a41e2b570d7e484d46bf95b5338269a9b70338c6fa4995c7db77cb8fec1c9036d09b4dc4a9db88 SHA512 a9616ad6451d04be58ca2078f6ee81cb5bb4219bfe85c3807515fa4f14628868d7c6d15095d3aa5538a3b7ee1d7fdf8683cd8c307d9f809d0485dcfd0074a6ee
+EBUILD tsm-8.1.6.0-r2.ebuild 7488 BLAKE2B c56a90bf7f846539af2c46d9eaf128a7fe9331c37d48a4e735e3b3f2c8de628563446965be251bb9178ab43ac992b3582822432938b4eae8fa47275198c7e2c3 SHA512 e4cb688e96888bb1b066fb8d90f2751f96ae78c24a59a949b15dcec02d48b7c9c402d59d1c992645aacaf5fdf4b1c6651009b5a4c63265d9e68840fa42f0c7c7
 MISC metadata.xml 399 BLAKE2B 286d9d8e3c94ff45959b763044b769441b4cca5bfc85640f364da79726288578c270c0f52027465eb94f7358fb702b04a69f0996af90efe0e10bc4b90df9d2e5 SHA512 564b638560a6d38bb606b06731a6e5790daf5c91498015cc30000192d588fcec56c18c688955eaf09072108d31c28446c3c73c12165fb7cb8989592681cfbec5
diff --git a/app-backup/tsm/tsm-8.1.6.0-r2.ebuild b/app-backup/tsm/tsm-8.1.6.0-r2.ebuild
index c8bfb5d1b7e5..d26ac9529906 100644
--- a/app-backup/tsm/tsm-8.1.6.0-r2.ebuild
+++ b/app-backup/tsm/tsm-8.1.6.0-r2.ebuild
@@ -61,8 +61,8 @@ RDEPEND="
 	acl? ( sys-apps/acl )
 	java? ( >=virtual/jre-1.7 )
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)"
 
 S="${WORKDIR}/bacli"