gentoo resync : 24.07.2021

20 files changed, 150 insertions, 70 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c60518e31845..f8cb37390b78 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 1c252fe99b1c..c352d35de90f 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -3,6 +3,6 @@ AUX cvsps-2.2_beta1-solaris.patch 3398 BLAKE2B 116d7988d71fd55dc4e7fa0e707f0909d
 AUX cvsps-3.13-make.patch 1126 BLAKE2B bc5c7aa08816a8cad99a05e0b20cad5de55026c056b97962a11e4aa4f56f48695fac5dbcc77b8a44cfea3f4ace27fc24a894b7968c7b843476ea78a4560ce648 SHA512 eca9b73848d4d219de2f29021f6b5376ce507ea4b4cbf17b7007c96f75b8598feebf9d18750dbd617b903cfbdfd9ed0ec2d83c6f05462e1dfc4b100bc3745ca1
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.2_beta1-r1.ebuild 897 BLAKE2B 3311f1046316e3a44c2356a53dadc1731bd709d3b1d633749f8d00519bc0c8eb29e2922853896a47f9b1eea5d8b304b432c3abdb88e478fdc3100fb903969d15 SHA512 84ac2273640bd0885f49298c185ef548ac7aeeb2c6a147a6d0c4706ce511f45b2d7011ec9d3847f22ca059c08fe4fcbdd3398a8aae7a808b18fc33a4571c1f11
-EBUILD cvsps-3.13-r2.ebuild 987 BLAKE2B 77283271a66311dc892d5f8c6d8a8f36cae17478628024be9c95322e5e14bcdb3c847124a7fed60836c8c37301da404491dfedd08aa38f439fc50f0ce9f26f33 SHA512 ff5f42b2c6af241543ce23e26bc069b80c69c76d61560501135f00cdfc097e041355b0359125e7f040d45e3cafac880cc8aa40e6f0ff2729ec9f244e11f85fc5
+EBUILD cvsps-2.2_beta1-r1.ebuild 904 BLAKE2B 96c62507b55ef9f1f506c76b7d2a66746e390dc9736c9915f8b2c8bd2f96b769dd4c119c0c872f3912962882a0cd9b1fde1b3f6b6b39b9abf42f2e76db6ea733 SHA512 4fb361e3183f1274d67cc4cc4b317e1ca35b9baa0b35bb04d1e00b1893a6ba76404ae468257a07b47a6184449c6a6990fec90474d0b64c9a5cd64ab2bf500065
+EBUILD cvsps-3.13-r2.ebuild 994 BLAKE2B 4f1bbaa9121d7ba23b7456c599955808f6f4ccd2caea692528aa7fbf6eedf7456a8c9265422754be8c68befb16fbb0cbd3419b766016866e8565dbcf6018741b SHA512 2f73e96bb7e3c3f12a259dfba05096d846ee06cb4269c89afcc7e8716058864bd4930122ceb9a787716f6ac58033eba5c9d84bfb20ae4ea883735206e129f09e
 MISC metadata.xml 239 BLAKE2B 6b66b8a8b38252d9a4aaed04e58757e67b48376a587e96dc4e08f4eb3a0df2e2e04c1f2a0bd287e3495685fb56826f36b0a96cfd8f49d210a6765ca8f056eeed SHA512 4f448ef290908204e9729332c120d18dbd7811e5fabd5807f009e37ebbf5c60b5319e9a8c576ebb0dc2ecb36bdca239b4d51e123e8005a8a255b3723bb3d119c
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
index 1510bc252bab..41a453738252 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index 30d01e388c45..1cfad7729221 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 332d8415f249..c0967f934666 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -4,7 +4,7 @@ AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395
-EBUILD git-cola-3.5-r1.ebuild 2706 BLAKE2B ae347bfb42eef709c9620900f8dae3e215fcffdf2e6a2bd6eadb9eb9054cbfbef814b08be395a1dcb8bdfa77ce9fa17510b65219a0e728a523730271b9d30dd3 SHA512 83765a40e7217641dd6a6819f1dfe72d829ee2652398e249a6b40c5c7d874567d5d49027340aef999e3ef9935ba797eae2e1b9eab178583a072a1197949f9bb3
-EBUILD git-cola-3.8.ebuild 2525 BLAKE2B 141b9770a44592c08ca6da7ffa26e96fc078b7510a21a14e4a2a573ccd483c916e0b725f5e2aafdf43d05f0ede948afe328be4b61dbbdc747c336c8ae06e15bb SHA512 2e60b40364b5b336bbf349937eec3cce2e521c5ce8631b70520bfc6dab52b7bccb4afc1a2c9f5535bd6f7185f8d9f11fb89da499d195fb1c86ce341738755a17
-EBUILD git-cola-3.9.ebuild 2485 BLAKE2B d38134cc923f23c0f83a0d93688d5216f56ad9948318e709e1f6a6bfd70d1dd274c0855e3f3e95816c177150b50ae781eea47508ff498216922bb851d2114582 SHA512 d5a6fedca17d935ab671358fbbac0b8ccd27fba133af3011c4ce3b74f45f4e7768079d6bd985d609b22487709658c8b380288eaca5fcf880035b069924fb4548
+EBUILD git-cola-3.5-r1.ebuild 2660 BLAKE2B a050b4ab593d2e50044162069c3fc993839490417c525aee6883b3ea8e39ca8803ce952610a53dc7aae43c9698ed2b2c9707a17ad667e6a3d975bf32ea548463 SHA512 1ca2ffb28b7bd31459e4ab26683cf12601723a562b8296fedc1568d556e9ad0b4387ec15ddf215e1c66cde798a3b365fa0ebca9fa6b55dec1cc0c48561e9a939
+EBUILD git-cola-3.8.ebuild 2477 BLAKE2B 6cc1a0d6f61526d6f145adfbce03ce98d117ebef4de0153e18220c2dc216f3fc046ce36f11751bba07d5a6e0e86298ddfa7203c22a7f94fe8721dc9d0aedc4ca SHA512 ce381d9f2dc31ccbf09930ad1dea21ab20cbe83080a1f86add25be93f38d117cfeed36d878693d20fb9d7e71f398e16caab2a4cf458add1312dddb49003c9012
+EBUILD git-cola-3.9.ebuild 2437 BLAKE2B d645c01f2291a0e0edaa25fd42f3e40e58ca7a0e366ae69cf229abee74d72c936f21377590e4090eaf33cdee46bb0f27f32be883b05d77fd78250a5283225721 SHA512 751c5e2aea3ebe73614a07d30bdf42ff395329ab5c63697df4659244e114f269ac43c526bb9a981e55111f3df43f1535cfe1aa76653019bfff6c3f31ae2a805c
 MISC metadata.xml 594 BLAKE2B 13b00c0c9e670e5144d90689403127d05c55306213d7aa8fcc04c84a4006ee507542ff89a29c0f969ce97f930fc511e1e8d8f453ad0e6d39340449c530d8f3f3 SHA512 a6eeb13098e2e39aeaa150afd71e8b52405238021943c45335e1bd5cc70eafa79d2bdcb4564db32b9e1b96ef78c5740abac358d72ea64dbe90f279e72c8fe4f8
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 986d6b90c280..4dae0de9e541 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -21,20 +21,20 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git"
 BDEPEND="sys-devel/gettext
 	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
 		test? (
 			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/nose[\${PYTHON_USEDEP}]
 		)
 	")"
 
diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
index f8f01dccb51e..d467fc38d90b 100644
--- a/dev-vcs/git-cola/git-cola-3.8.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -21,22 +21,22 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git
 "
 BDEPEND="sys-devel/gettext
 	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
 		test? (
 			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[\${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/nose[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
 		)
 	")
 "
diff --git a/dev-vcs/git-cola/git-cola-3.9.ebuild b/dev-vcs/git-cola/git-cola-3.9.ebuild
index 11cb88f55b7f..ef74afe09e0a 100644
--- a/dev-vcs/git-cola/git-cola-3.9.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -21,22 +21,22 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git
 "
 BDEPEND="sys-devel/gettext
 	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
 		test? (
 			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[\${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/nose[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
 		)
 	")
 "
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index a93a9008da6a..03b0cecc0296 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -119,7 +119,7 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zstd-0.5.3+zstd.1.4.5.crate 26013 BLAKE2B 033e839622b8403268a1a98c2f525b4f6dc624378e64fd644e09cd1b11a8751c1097f134a5f40793a8a6b57635ad28ba3534dfc48e7ec818873dd4819311c80b SHA512 cb6d2adbb3d400ffec19ce7c942b47a0e5826ed62bb8de195b0e8817b4a1e00c1569a080457452180cf869b7bd99fdb150e4a981a992f977b2dbd03eb5a073ff
 DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c67dd4c6aff52a402e0ec4f675cb40dad1f9e5ab675b45d4f326bfd0f75a22673ad8538b2924c4bb6220cb1fe23fce2262fe SHA512 cb4b33059da628e103a0fc9a83217fe96f5201cc9db0572b3c2d102b181dc29c346aea12ddec902ecf36886fcb6a2177155791d00ee2fbb267ddf84a48d3c2c6
 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30
-EBUILD mercurial-5.8.1.ebuild 6539 BLAKE2B ef357b3e9436bd096323853c7006c0c07e1173c91b80519cc89e2f9046eb3760c0124f6406c8c5c8b5a5f032c5a1f202c3213bd3d79d28cbb9c96b1988874c42 SHA512 c960787e85e1788c7626b12763688ce420898c6fd8942dbd0efa9be3f40b9d742c47f51d29f729c38775bef4f7e888f84fb18704c7c4ccecdda74c90f5761bd0
+EBUILD mercurial-5.8.1.ebuild 6567 BLAKE2B 2dcce7d10b14de07c75121905e7a350f3e634efa8c4ece5864bb062635045930f9b1aea928c38dd3fd280a600b3274e865370a92ebb10abcc9346ffa97f8b34a SHA512 8875884de5a50eaceb45ad82bed02275eae4ae0fff6c348e13885580dea9d03446c5101e436c072943a76a9f0c65f23f1fef652c947646e90b25d4a53a591025
 EBUILD mercurial-5.8.ebuild 6725 BLAKE2B 58728901788b4055ca9283ecdad0bb1225baa98ae814c5807ed3bd2fb77100f2ba2e6678630bbc4736e9522254bd3098bcce5f0aa764d35f7187ed65fd958171 SHA512 570f8c6b535bc7d8d68da878f179388c15a75a6edb37ef4e0de0e78ef7ceaf32452ea603624ad980fb0f9bbbb32cc610f0e84897927ccc3351345ecc0961a67d
-EBUILD mercurial-9999.ebuild 4433 BLAKE2B 0fdd9ea821d61deb3e7edc2c14f5406f9d407220c20b40199d4fc82f6a02bbefda3b90427d1e1bd4e2a7143a73ce95162b63f5b4bb0a9730f34316f4688b27e7 SHA512 690cca0e6d2da5e453c5d4507e0861eaff27b2abb995f332dd3f5dff8e11d7be07c6e1ec2fdfef0425de6259a4262f5e650486498a73c1d619a9ff573ee7dfe2
+EBUILD mercurial-9999.ebuild 4246 BLAKE2B 0e975acf5ad01cf1ff7fcba3e7ddf8a21752d72a35faf7cdee242f3dd579b48b7ecb8c745bb5da4fc713f4222ea2bb9c59134477723c2a4960a33148fea8ddb0 SHA512 0347db61939c870577c2beb0a67e6451d359cc7ba43c4a7217e0904680b90148a5d0093137c683333e6abce95623e13d8b9cc21c4112ef77c0e7de2600c4a079
 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08
diff --git a/dev-vcs/mercurial/mercurial-5.8.1.ebuild b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
index ec426005148e..f189a3abc49a 100644
--- a/dev-vcs/mercurial/mercurial-5.8.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
@@ -158,6 +158,8 @@ PATCHES=(
 
 SITEFILE="70${PN}-gentoo.el"
 
+RESTRICT="!test? ( test )"
+
 src_unpack() {
 	default_src_unpack
 	if use rust; then
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 516f17871e10..1fa18749e4a6 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 CARGO_OPTIONAL=1
 
-inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic
+inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic multiprocessing
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="https://www.mercurial-scm.org/"
@@ -25,18 +25,18 @@ BDEPEND="
 
 RDEPEND="
 	app-misc/ca-certificates
-	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-"
+	tk? ( dev-lang/tk )"
+
 DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
+	test? (
+		app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}]
+		)"
 
 SITEFILE="70${PN}-gentoo.el"
 
-# Too many tests fail #608720
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 src_unpack() {
 	mercurial_src_unpack
@@ -50,11 +50,7 @@ python_prepare_all() {
 	# fix up logic that won't work in Gentoo Prefix (also won't outside in
 	# certain cases), bug #362891
 	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-	sed -i -e '/    hgenv =/a\' -e '    hgenv.pop("PYTHONPATH", None)' setup.py || die
-	# Use absolute import for zstd
-	sed -i -e 's/from \.* import zstd/import zstandard as zstd/' \
-		mercurial/utils/compression.py \
-		mercurial/wireprotoframing.py || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
 
 	distutils-r1_python_prepare_all
 }
@@ -62,7 +58,7 @@ python_prepare_all() {
 src_compile() {
 	if use rust; then
 		pushd rust/hg-cpython || die
-		cargo_src_compile
+		cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs)
 		popd
 	fi
 	distutils-r1_src_compile
@@ -74,7 +70,7 @@ python_compile() {
 	if use rust; then
 		local -x HGWITHRUSTEXT="cpython"
 	fi
-	distutils-r1_python_compile build_ext --no-zstd
+	distutils-r1_python_compile build_ext
 }
 
 python_compile_all() {
@@ -97,7 +93,7 @@ python_install() {
 	if use rust; then
 		local -x HGWITHRUSTEXT="cpython"
 	fi
-	distutils-r1_python_install build_ext --no-zstd
+	distutils-r1_python_install build_ext
 }
 
 python_install_all() {
@@ -151,6 +147,7 @@ src_test() {
 	rm -f test-convert-mtn*		# monotone
 	rm -f test-convert-tla*		# GNU Arch tla
 	rm -f test-largefiles*		# tends to time out
+	rm -f test-https*			# requires to support tls1.0
 	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
 		rm -f test-convert*
@@ -168,12 +165,11 @@ src_test() {
 python_test() {
 	local TEST_DIR
 
-	rm -rf "${TMPDIR}"/test
 	distutils_install_for_testing
 	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
+	"${PYTHON}" run-tests.py \
+		--jobs $(makeopts_jobs) \
+		--timeout 0 \
 		|| die "Tests fail with ${EPYTHON}"
 }
 
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index fc72a1240459..bbf60a7d4ec5 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,8 +1,8 @@
 DIST tig-2.5.1.tar.gz 1144666 BLAKE2B f8e96b1e27286ebebd3e3f374b28ed31a69b10bab1e831068341a430c36418d6a412b29caa3a44e3fafb3131d93b6d8d62ade4c92dc06fe753f040957b9e64e6 SHA512 e7c27a1e6357ce3cb4c02ff409d40c0ca67d10875eedbf467b9a280d8433cca15d16860256637041003384e7c536aca743ce971e623d3000dceeda598d6d3ae0
 DIST tig-2.5.3.tar.gz 1165632 BLAKE2B 398174578b9723d7825c7162b59d2a1a92da161b3f3b8896c1d121ed36c8a0a1c52f676325b3a3fdd0cea9961c7f4234bd1ac594d9057cf6707cad22a3eda35b SHA512 2339c6c93808b6fbcda4ae29e014e7f4edda5f16df46e466d1d14a9f65dba10bff9df6363f37c369418336f362d5e38dbaf7fc4d99761997cc39722ba6132aec
 DIST tig-2.5.4.tar.gz 1167930 BLAKE2B 620dea0d5c4cd670b11e143195145dd268ba4762ce5b3e56a393bc6af6e508349c5f3581dff9f118d047ab8e7b431b64c85431f5af5719cbb9c63117394b265b SHA512 8c2c1d3aa980d3a6619501a770bb5210db445200e46939e2c122db1fd684ae9857eee4a06a8b6622d5d683457f11629522b121e0b429eec6d11dce4f4020dfb3
-EBUILD tig-2.5.1.ebuild 1290 BLAKE2B 55ac7685c1797ab2de86865e5c19f4d011ab498b23fb3f91375b7017395cf60ec66e67addf8d96ebdf09926aa0d3d94cce2d4a2513ff8fc9c93e5069699a1a76 SHA512 a6f9bb48b4b7bffaad5a8475f3f75c611c91d8d50cc9f67e8cdbf307f3c293fb4e760a36dff3c7a6919b7f4eb4c90223a64c19cf9ac698f815e4ef867d971904
-EBUILD tig-2.5.3-r1.ebuild 1281 BLAKE2B 6dc537909f6956de8fa2c6e5eea75b78ab58c391e8c8357f8eefd1ff0acec784b043d161bc0727261a22c3a8e3fb0220b21b5aa1b06070d897fdcd0c4a8c5daa SHA512 ea6c2a7c9f17feeefc1d7ecb710b05ce9836e0aef0f355a2563b911f5421a370360e9c8a48f9bff396492a835ad3f8fd4ab5a2344bf2f0ce95972f30ce4d39cf
-EBUILD tig-2.5.4.ebuild 1281 BLAKE2B 6dc537909f6956de8fa2c6e5eea75b78ab58c391e8c8357f8eefd1ff0acec784b043d161bc0727261a22c3a8e3fb0220b21b5aa1b06070d897fdcd0c4a8c5daa SHA512 ea6c2a7c9f17feeefc1d7ecb710b05ce9836e0aef0f355a2563b911f5421a370360e9c8a48f9bff396492a835ad3f8fd4ab5a2344bf2f0ce95972f30ce4d39cf
-EBUILD tig-9999.ebuild 1295 BLAKE2B 1cc93adc21d1da03403dc196674871555a68f2e5ddf59d94a320dddbb5d03f4b49c6d9255cc64b6721e1bee791b86dd42f980ae5eb116c66e93345eff2d946d8 SHA512 54f2ce9cac3858d74ca03255654eaa9310de703311a7d10cb3aa9f1df66d5e89d051a810ff47648bbd6a2cd1b0b4aa8c9f00318d64b6f83dc83da31fa4e30f41
+EBUILD tig-2.5.1-r1.ebuild 1292 BLAKE2B 4d3e05ff64db4eb174d646ae2e560bf3d4b1f3042c0684ead2d4476dd0aace2795b6f028e208e17f70ba02498ecb3ee05e9c92437d9df31ffbd110ab32895925 SHA512 12171f912ba5c1a6defd8d6a5abea086ff7bbed7672d6bb9b11a260eadb8709284c7abdb046c2e29bfca7492dc703a6962c4fae4cf0e0900849094cecc905139
+EBUILD tig-2.5.3-r2.ebuild 1283 BLAKE2B 6ffab61b7f4f4187a7f0b0a1559fe32789dac14caa545055703d8faec6d7ec5f9a8e405aed34f3da28caf902c13f9fca90fff733ae0842f59b4c04cf37d1bad3 SHA512 4ba1422e5e1f2ebabd9bdc8297aacba7910c298fdf2fe91ee3f8bd53fb5fef109574c0f84642a4cdd659864dc79feb009105feba24ed4aa01dd2cfbc9b24f4dc
+EBUILD tig-2.5.4-r1.ebuild 1290 BLAKE2B 8812b950ece1bcf3923758eb5ec6303163f731ec6401736b319eb875c6d9aec6bc052fb93ee7beb6cfe0f5e93eb572fa2849bd647d25c1e0114e930aac373173 SHA512 20baf997a446ceb658474166d6acf4072f7068463040b3b8abbb39a920d628dcf14615db42da21521b943b3699e7b867e64ae48f5c960ae769e3631fdfac9f31
+EBUILD tig-9999.ebuild 1304 BLAKE2B 66644d8a2804c5f2156563a90a68361624e3b9743de11452337824d588385ca3f44fcd5412fcf363e09a59ee2692bc1b445362686456c69bdbff381a272b198c SHA512 e042d94027f1101204ecf32f12d0a6328395c2dce5ee7713e9855213b8089e7bb62b42334bc7786e461cd6b91d71e54750d4e9f930aa9fde2d091139f4cd23a5
 MISC metadata.xml 716 BLAKE2B 646f183cc6cc5110a69304f5343a0f1dcc9f42c82d8e16d0a06102b8052589d92bfffee948c78d2d4ce0ae6f29f1df38ae034c6fa160471823bb4457bcfa6603 SHA512 ae1521940d81aa080326f070b79a8a0a01b2ec1406088695e1e8462cdd78ce046131f9542c878ab5f919fa75e3c91aff0739a12511d18693ae050183db10343d
diff --git a/dev-vcs/tig/tig-2.5.1.ebuild b/dev-vcs/tig/tig-2.5.1-r1.ebuild
index b754dd3aa733..ec9bc85c8658 100644
--- a/dev-vcs/tig/tig-2.5.1.ebuild
+++ b/dev-vcs/tig/tig-2.5.1-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="test unicode"
 REQUIRED_USE="test? ( unicode )"
 
 DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	sys-libs/readline:0="
 RDEPEND="${DEPEND}
 	dev-vcs/git"
diff --git a/dev-vcs/tig/tig-2.5.3-r1.ebuild b/dev-vcs/tig/tig-2.5.3-r2.ebuild
index 9164067a481e..5b0369afb915 100644
--- a/dev-vcs/tig/tig-2.5.3-r1.ebuild
+++ b/dev-vcs/tig/tig-2.5.3-r2.ebuild
@@ -22,7 +22,7 @@ IUSE="test unicode"
 REQUIRED_USE="test? ( unicode )"
 
 DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	sys-libs/readline:0=
 "
 RDEPEND="
diff --git a/dev-vcs/tig/tig-2.5.4.ebuild b/dev-vcs/tig/tig-2.5.4-r1.ebuild
index 9164067a481e..873645fe5017 100644
--- a/dev-vcs/tig/tig-2.5.4.ebuild
+++ b/dev-vcs/tig/tig-2.5.4-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 DESCRIPTION="text mode interface for git"
@@ -22,7 +22,7 @@ IUSE="test unicode"
 REQUIRED_USE="test? ( unicode )"
 
 DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	sys-libs/readline:0=
 "
 RDEPEND="
diff --git a/dev-vcs/tig/tig-9999.ebuild b/dev-vcs/tig/tig-9999.ebuild
index 855228f38d1c..3ea9666006a2 100644
--- a/dev-vcs/tig/tig-9999.ebuild
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 DESCRIPTION="text mode interface for git"
@@ -22,7 +22,7 @@ IUSE="test unicode"
 REQUIRED_USE="test? ( unicode )"
 
 DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	sys-libs/readline:0="
 RDEPEND="${DEPEND}
 	dev-vcs/git"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index bb6eabd4d62e..b401a6e2a622 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,4 +1,6 @@
+DIST tortoisehg-5.8.1.tar.gz 8636858 BLAKE2B 66473695e1364ff676ab314ce8b5a5e59cbe6ece68795d92278e450f70386a9e047dfd8975e7312bda10c183879d9634767f64a9c916f889f3edcf4847bf2468 SHA512 29903240c5522841e0ddc0f78741d20d589b6b48e82bf38023b87184e987721111a6a9675ccb85a31d9781cf1b8fa3d28801fef5bae187ae467d7da8f1ef982f
 DIST tortoisehg-5.8.tar.gz 8636455 BLAKE2B 1f4171ca4eb465aabacaf53b97785c5f05fc501a11329af008695f706d8d2cb9c5eee5e64bb5a60fdf7234f33ed6a937dfacce49cb36ac9e9b8505be271b4f35 SHA512 b9fe80a98cfafe0dbc90be5fe6f83b466fe596b4ec135d0eacc5618e39c0249a3a352bed640a7cecb99d53eaf60908d60d7748009492cbd8202fc191ef428278
-EBUILD tortoisehg-5.8.ebuild 2130 BLAKE2B d839112c2667f8d9c2a1f77e6a39f03bab7e00ffccd7155d0f237aaa02cdad43ee0f765e5abdde2aa0b3f502683a0073594e74242c77872e6183ad17b84d617e SHA512 f2a901430c69089581175679d3af8ddc636d29dc71fbb5c594a6878b6433240d4c067c3e13375f6f9894daaf44cd8b8942c785e7e98efaccc0e77d7246b225bb
-EBUILD tortoisehg-9999.ebuild 2130 BLAKE2B d839112c2667f8d9c2a1f77e6a39f03bab7e00ffccd7155d0f237aaa02cdad43ee0f765e5abdde2aa0b3f502683a0073594e74242c77872e6183ad17b84d617e SHA512 f2a901430c69089581175679d3af8ddc636d29dc71fbb5c594a6878b6433240d4c067c3e13375f6f9894daaf44cd8b8942c785e7e98efaccc0e77d7246b225bb
+EBUILD tortoisehg-5.8.1.ebuild 2130 BLAKE2B b0f89f298951d001f963f03c19d8c7a468d8704b322d844e543ce2212a01a4de5e4507249cd4254a9dee028356d7ea6a69381bca029e693c93ac5323c9c074a7 SHA512 7e15dfe356dd5bc92bd1c97a182726b177a858a7e0d342a45cc8b52451e1bd673bf084feaa982b4a3b978b3e7d31b1d25a9b82d7b811ef39f59db34189a1f707
+EBUILD tortoisehg-5.8.ebuild 2130 BLAKE2B b0f89f298951d001f963f03c19d8c7a468d8704b322d844e543ce2212a01a4de5e4507249cd4254a9dee028356d7ea6a69381bca029e693c93ac5323c9c074a7 SHA512 7e15dfe356dd5bc92bd1c97a182726b177a858a7e0d342a45cc8b52451e1bd673bf084feaa982b4a3b978b3e7d31b1d25a9b82d7b811ef39f59db34189a1f707
+EBUILD tortoisehg-9999.ebuild 2130 BLAKE2B b0f89f298951d001f963f03c19d8c7a468d8704b322d844e543ce2212a01a4de5e4507249cd4254a9dee028356d7ea6a69381bca029e693c93ac5323c9c074a7 SHA512 7e15dfe356dd5bc92bd1c97a182726b177a858a7e0d342a45cc8b52451e1bd673bf084feaa982b4a3b978b3e7d31b1d25a9b82d7b811ef39f59db34189a1f707
 MISC metadata.xml 804 BLAKE2B 23d41703f9bdd446ac385fae5919c21684a73c4bfd468f7a0a18c9dc728964e71ee9724dfa4eacb544da54e79c2b9a5f4009ba8318d1e97f2314826cbe4429a9 SHA512 14fcda893984839424b6bcc6d6b0b966edb862fdd3b483f909c552da2775dba413b2155915480526780afec05a5ad7e3652391ccdbe5e76f7daa265fdfd6ef75
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.8.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.8.1.ebuild
new file mode 100644
index 000000000000..702819ea4b0b
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-5.8.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]"
+	S="${WORKDIR}/thg-${PV}"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock
+		dev-python/pytest
+	)
+"
+
+distutils_enable_sphinx doc/source
+
+python_prepare_all() {
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
+
+	sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} tests/run-tests.py -m 'not largefiles' --doctest-modules tests || die
+	${EPYTHON} tests/run-tests.py -m largefiles tests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+
+	optfeature "the core git extension support" dev-python/pygit2
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
index f54b981fe3da..702819ea4b0b 100644
--- a/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index f54b981fe3da..702819ea4b0b 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 DISTUTILS_USE_SETUPTOOLS=no