gentoo xmass resync : 25.12.2021

8 files changed, 7 insertions, 38 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index d77cf86a7784..85a695381c38 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-pw/Manifest b/dev-vcs/git-pw/Manifest
index 43b2c57c0dcc..9dedef7ce17d 100644
--- a/dev-vcs/git-pw/Manifest
+++ b/dev-vcs/git-pw/Manifest
@@ -1,4 +1,3 @@
-AUX git-pw-2.1.1-test.patch 1048 BLAKE2B e44d85ed1b0073a0c4b3e9f044e5f6d79612f9acc2a3b65dab9d4bf653c3364935203741346ca56cf6d3b0b75550954616289ed6a86f49cab7ab5fbc84cdf3a7 SHA512 6b5741a95c35cc19afac0d5f1485fb85290d2a9eb9938f65eed83b0bf016101e0321262685687d57c52abe4cdd18a1d33ab632df5c37b59a26386161ecc17956
-DIST git-pw-2.1.1.tar.gz 32489 BLAKE2B 516eb3b81c3798a455b7122a3b0ad9bf0d9722eb6f301ea58ed766cca94137f4da4eaf34a40ec7c5e108368aa6099f9401aba6d71d463913cd2b7fd9dc7aef09 SHA512 3cbf0670bf811d6b6ef0d4c5c7ad4321380d442c62fd15869758b26b4fc375c2d4bd2bdbf693a41d0cbe862bdef15fc02d04124a089f7786bd1b2e56f818e0c2
-EBUILD git-pw-2.1.1.ebuild 1080 BLAKE2B 82442c41df4c20dadbb231d982367eadc0372ab9b3e275344dad5ccf4e1b92731c69cd3d16df200272415abcffd2717239840f9ccf48fa33b739c4a8a70c57c6 SHA512 62efae093f24d7c0ffeba0a3bd9503e92185c3d7596c2c6e98cdbe2051379a74b8044e519d673e2fd57e68b6fae6c6bd4e71d191f9de1bdebfc56c9c91e74b06
+DIST git-pw-2.2.3.tar.gz 33605 BLAKE2B 6f8b72b1ef8cda3f5dea568ad0e872d3c8f1795bf9889b76cd281bc19b303a903baa38a89036511b2d1496b258b37e843fcbc333f5a86735bcae6f3d22f3a320 SHA512 06a34e1cc3a7b32b44a6042abf17d00f5b648039ce091885bf19638457f3800f2daecbcd03ae9da2f48166bac53a2219735e251145302bcc98a9cd29fab7450f
+EBUILD git-pw-2.2.3.ebuild 1081 BLAKE2B 604bb491fb2de2b9d8286744a78f27c45c0948c6f5557386851e235d166fb5a388eb3479b30974b9cf679791fec33851eb0f309a24346999f724c3003c768eaa SHA512 2b3f4e26686531002ac1b7e8a4203d2394e16dca72a73be67973295fc30025168e9dc20d9765aff2c34069bf72b28218ed0e19814834970c0ac6fe312c7b7829
 MISC metadata.xml 573 BLAKE2B ea8a1646462b2ff59f05531d1964c160216b7c19b17e261a75940e591106195050ad9ba65f3b5ea594d4a4ad53cfda7cf7dbb1894c6ac850a6b5c9e189093432 SHA512 cc0a718a6d9bd29c5a77dc3f23a4f4b691ab0c954c6c2a7266126c2cbc312aab73e5484120bad031e77abcf0c1cbff2c7af998700e45eebc51fd73facc988f8c
diff --git a/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch b/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
deleted file mode 100644
index 00df55f872d1..000000000000
--- a/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 08152c86d02c36c425047fa9220d6d5ac3fcda01 Mon Sep 17 00:00:00 2001
-From: Matt Smith <matt@offtopica.uk>
-Date: Sun, 26 Sep 2021 19:55:40 +0100
-Subject: [PATCH] tests: Unset PAGER env when testing fallback
-
-Prior to this commit, the test test_echo_via_pager_env_default will
-fail when $PAGER is set to /usr/bin/less (or anything other than
-"less").  Use unittest.mock to unset the environment variable during
-the test.
----
- tests/test_utils.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/test_utils.py b/tests/test_utils.py
-index cf75a55..a0974f1 100644
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -75,6 +75,7 @@ def test_echo_via_pager_env_PAGER(mock_inner, mock_tabulate, mock_config):
- @mock.patch.object(utils, 'git_config', return_value=None)
- @mock.patch.object(utils, '_tabulate')
- @mock.patch.object(utils, '_echo_via_pager')
-+@mock.patch.dict(os.environ, {'PAGER': ''})
- def test_echo_via_pager_env_default(mock_inner, mock_tabulate, mock_config):
-     utils.echo_via_pager('test', ('foo',), None)
- 
--- 
-2.33.0
-
diff --git a/dev-vcs/git-pw/git-pw-2.1.1.ebuild b/dev-vcs/git-pw/git-pw-2.2.3.ebuild
index dd63e27b733c..e7caa3775a7f 100644
--- a/dev-vcs/git-pw/git-pw-2.1.1.ebuild
+++ b/dev-vcs/git-pw/git-pw-2.2.3.ebuild
@@ -21,20 +21,19 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-PATCHES=( "${FILESDIR}/${P}-test.patch" )
-
 RDEPEND="
 	>=dev-python/arrow-0.10[${PYTHON_USEDEP}]
 	<dev-python/click-8.0[${PYTHON_USEDEP}]
 	dev-python/pbr[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0[${PYTHON_USEDEP}]
 	>=dev-python/tabulate-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-cov-2.5[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index aae9f4b89cca..8cdd87822470 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -23,7 +23,7 @@ DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
 DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
 EBUILD git-2.32.0-r1.ebuild 18215 BLAKE2B e4e5e4a4685cfc0c6b9879c1b900e5be5ab1acec26ed6a070901987e3c538303430429ef92a94c2746791ea88bf01d07557479e6cda8655608c00ec682767875 SHA512 bcac636fe83b1e84c20288f8c184b836df340eacdbc7e4edae661c3eac320d43131bdddbabe5d2e8552ed1a8a0025825d6e4fb26a4c8b7e4e3497d48530d80a5
-EBUILD git-2.33.1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
+EBUILD git-2.33.1.ebuild 18114 BLAKE2B be0b03e1ccd9b20e23aba02214fdd3b3805077d6422a9a16bf099f15d230d6d76c947e816e5cc4d38b5dd9a4d522efa56e078c3d6d53817da8cf5e26b88ae5fb SHA512 d0c395555164515e9f30176ff3e18fac16f918a8a78b2f47b3a020fd80b2ee39568151ba7d2d125ace5b4b24bc06b7cc14a45e8c598591634e5eec62172d3a84
 EBUILD git-2.34.1-r1.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
 EBUILD git-2.34.1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
 EBUILD git-9999-r1.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild
index 6fd30df80506..a11db72fc562 100644
--- a/dev-vcs/git/git-2.33.1.ebuild
+++ b/dev-vcs/git/git-2.33.1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 1a6adf8a441a..1ff3b80a6246 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,5 +1,5 @@
 DIST stgit-1.1.tar.gz 313862 BLAKE2B 2d15ba7c2f55ff1211f0d9a3002878102f5023e897d0830daa688a2af8c6a386ec0cf076c728b6f45650ee3382379a32fb4efb25d0da3b28302f158dfca6ef62 SHA512 917c645f219b2725d1e88186674a6184c96f1457d5c7722b4da17931d963f0fe0c675cdaaca435ba7405ba498d6db9a01c9f554d1aa3093cc3205d224d9d9759
 DIST stgit-1.4.tar.gz 390734 BLAKE2B a2c8b6848cacd743022318ebf9a0512c6bd02a2b8c864db2270e5075c82dfd9e6037a3a79978b2061487bf040864077b0f7836c66986d82ff3eb902331589d87 SHA512 5251dc26a7c64dcc83021399f95ea911d6b65cfb2ee5c016c886447740ed48b66d3f0bd92a45b4aed40ae2e77dfe6ba62336dbba6773a1879ab749c95bb99b4b
 EBUILD stgit-1.1.ebuild 1840 BLAKE2B 06b57cfc1df07ac5b62045f765c3d6e03083e1132c12e6d775d5d637a2d4e8fba5a8779e639e9adac07c11c166fa7378d8fe341f53039a4b58a9714d9ed2e9eb SHA512 e365bd59428eef6feb3c71b1282753127f48f49c51408878957a490bf27d426eb70b8d45eb10f92e39dddaeae31f5c3b5eda769d909540994b00631c626c7965
-EBUILD stgit-1.4.ebuild 1848 BLAKE2B daa16c4d0766dff8e8db67a9c4d18e59e907d5a0f38ff790141592ed10f06f1e3687e4054f2e68b07f82d30b1cb646b88992303c0b804a920495778b890dad9d SHA512 8fc12389ad0378c3514efec93bc0ac4ed7d71dc1ef86d0ce495e07c7322762959d7104cd51bbb33772b8b0fe3eece7a0ccb86f36cb5ab3e2a6ee9ab593eb7a18
+EBUILD stgit-1.4.ebuild 1820 BLAKE2B 60ea52d5a6c3ccc0c0b580da8901c03ce20ec64f37b5d515da7a408b1f57206635d5b28a95c1e668d3d24c04dc1b1ae3b6bb3e04b600efc6d13f8134ad2a73a9 SHA512 8878c4c2200592eff7384589a737fa79079aae5316d973d0e93128d6ae15470eb13d823bb0cd31df012183354b6269b31bd61a5f977a9f7021194ba9750153c9
 MISC metadata.xml 347 BLAKE2B 152f011c7facd06cc1c654f388b4a44bbd8486549c07f1329d228e252a411bfb565e4f5b9e37bf9eefc23fda47a774c347d2e82070ac21c0880806bca99a6685 SHA512 04b087c0e6c6ae99128dab9c29e49d55e1cbcac3890f6324d3ea66b14530e92ca9ed32e9a6dfa23f06e23f8b79b3e57ceff2c9cc2995af4e01c91914d50361d0
diff --git a/dev-vcs/stgit/stgit-1.4.ebuild b/dev-vcs/stgit/stgit-1.4.ebuild
index 06367525ebb8..fae3f3498df8 100644
--- a/dev-vcs/stgit/stgit-1.4.ebuild
+++ b/dev-vcs/stgit/stgit-1.4.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10}  )
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit bash-completion-r1 distutils-r1