gentoo resync : 18.12.2020

13 files changed, 801 insertions, 148 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 6b29c898a41b..ddfc6e508bda 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cssc/Manifest b/dev-vcs/cssc/Manifest
index 0832f76eefd6..3ba563f48364 100644
--- a/dev-vcs/cssc/Manifest
+++ b/dev-vcs/cssc/Manifest
@@ -3,8 +3,6 @@ AUX cssc-1.4.0-config.patch 317 BLAKE2B 05b55dca021fdc37ad9ade846c633c7f83935f46
 AUX cssc-1.4.0-m4.patch 356 BLAKE2B b1e79296c96a1fc281e3a481d6a0fbaff697db87317b185bd795740fed75bd755dc2af147d1335d57f2b58d82c56ef9f75875175700b72c543cdb6e7adc8d6ec SHA512 8dd984f1d98a943fbed14db43840b18f63a48bc71fb8e537031761bdd59639a4af554de9eda8d5aa0a5f1afe04169a752f3e281381a15fe91cc9f53e7195db9e
 AUX cssc-1.4.0-test-large.patch 455 BLAKE2B 98891f0f6ce149a7ca7d8ee8aa373bc28e05f8a4a397d1f4067e9c3589fac701b46585b629965125e140eabc02c9ad4a2d09976f8752909e8176018d85cc69e2 SHA512 8e28f6b6cb9c9e15f5000e89722aa9aa66cb578faa136aa229947eae66e185a07a2b528dea418e0cef43027cce705a269214a2b6f4ec2c355450f13417c2c3e1
 AUX cssc-1.4.1-m4.patch 351 BLAKE2B dde4c1f2876f8e84587ad531a094431d1854652f901a2875a7fdd758a6780570dfbf9e629e3c00f2f41644a063bba08b4d201e215c4945baaa2cbd2a5649e736 SHA512 57639a4ec54f9e2dfb594de179e7e8539385890ab6d58fc5bb39f44497f530e2a9182edbd51c5d815244c76fc80e401f002e60d9ba29c8dee0e229cea7174153
-DIST CSSC-1.4.0.tar.gz 2012122 BLAKE2B c38bf9f50e372559c87d318780973a28fd2fec384cffd0c077c556b321f9f3e68324f59f26900e63c9235f30c564a60783c5a48b515b9b878977fe10266cd0be SHA512 7abb38ecfb5120e807d1f09d16ce81306b3eb16746e44da5029f626feba67dfb46db20bd2b89daffb2e3cdc51ffadc51cd666eef7d1b94e56b4c7dc24f93ea76
 DIST CSSC-1.4.1.tar.gz 2269725 BLAKE2B 264e996280ff23818332dda62d80adc61fd6a2e924af26a044168bf136c22b22bb591d37157030dbe8e2360a2687b0dcbf843f3af8683b08593fded4ef982739 SHA512 b843bd636b15830b2751c423ff2f2e7292e0942d750ca57425d9674b74c7291fe34db33cbbc4b87d27f80d3b54b0074207ceda612faa651b6f01486e0b2485d5
-EBUILD cssc-1.4.0.ebuild 1031 BLAKE2B 83508c5b50db4bd923dba328a108ac29b1a7e14e73aa5eb06991c5ed8ced9390dda2ed44c7a693666003253153e052a94678409d8974432abf12f4da692af001 SHA512 9e83758ca2c372dbc65adfe69f8e9565462c89db5d7cf541d015642a0f8298676ff42f91a15d58f1f058087dbc3320aaf42e008c896975d248fb758037916464
-EBUILD cssc-1.4.1.ebuild 868 BLAKE2B aef4433a6e2261225cf05f3c01ee0e3ada945f5bdb0dfa654c119d76d57eb0c125e92fb3dad040d2a4a7f09500fbb3a5d4b1b1573e970d70a57068f4a43e7278 SHA512 5e6f66da6a476c098ef3a9189fd58c1037b5cab9bdc39b215724f67a3e769021f941797f60bb597cff30762d8c273fda02d55dd52ad6917e6c40e6a369cc0661
+EBUILD cssc-1.4.1.ebuild 867 BLAKE2B f3151986b589b19d45005bed7f1ac75de006a68e74e3a4711c18f951eaa3e4c15e67f0a3376c05fdf510c320cc78213f8d884bea69bfb11e2639464a93b67146 SHA512 3398414a256f48e9772492736f70ff675ad0b3b61ed26402ed182b4f641bea39a7c3b2b545fb0b047a9417fcc2d4d6b98fc0cd0364828d788045aac0dc8896d9
 MISC metadata.xml 262 BLAKE2B 10958c4700f56d8e765427a12ff0618d4ed03e63bf90adcaf326b5ecddb97825d5996d9f90d91120a6fef3b38828bdfa654184d22abead68a52a9eb382387def SHA512 a1dfa0890289178f9b0d6b0b9669718c428f7c73bbf07f8f420072c9638fdb19198ff9135d0d8853e9eb63536bd0384575f7f7b65ffc54edbf0d425863251959
diff --git a/dev-vcs/cssc/cssc-1.4.0.ebuild b/dev-vcs/cssc/cssc-1.4.0.ebuild
deleted file mode 100644
index e1e1659be646..000000000000
--- a/dev-vcs/cssc/cssc-1.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-# Switch to ^^ when we switch to EAPI=6.
-#MY_PN="${PN^^}"
-MY_PN="CSSC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The GNU Project's replacement for SCCS"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="https://www.gnu.org/software/cssc/"
-SLOT="0"
-LICENSE="GPL-3"
-
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test valgrind"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( valgrind? ( dev-util/valgrind ) )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.3.0-gcc47.patch \
-		"${FILESDIR}"/${P}-config.patch \
-		"${FILESDIR}"/${P}-m4.patch \
-		"${FILESDIR}"/${P}-test-large.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use test && use_with valgrind) \
-		--enable-binary
-}
-
-src_test() {
-	if [[ ${froobUID} = 0 ]]; then
-		einfo "The test suite can not be run as root"
-	else
-		emake check
-	fi
-}
diff --git a/dev-vcs/cssc/cssc-1.4.1.ebuild b/dev-vcs/cssc/cssc-1.4.1.ebuild
index 0a3f9485a090..be215e05db13 100644
--- a/dev-vcs/cssc/cssc-1.4.1.ebuild
+++ b/dev-vcs/cssc/cssc-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${CSSC_P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/cssc/"
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 IUSE="test valgrind"
 RESTRICT="!test? ( test )"
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 33fd33725092..0d39cede6427 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,5 +1,3 @@
-DIST darcs-2.14.5.tar.gz 1063677 BLAKE2B 7f38aa09d5af53e68829a9181f1981eccd173e2af5a044d100758164b668297303aed947ffc579ea1977e4a1f2820d1954b5c5428e429e5ff42ee238e0043611 SHA512 75f89dc920eb9a417e86bcbf185b0ba35e284a0a0c6bbd27c7dec46c4f143f5c37f0559a1ff1b3d3bd39ebdca98fa3a7420bee5e179c1bef0b0fc203e04e0484
 DIST darcs-2.16.3.tar.gz 1244848 BLAKE2B 59754a782a456b3c6bba2b382d485b5de00ae3fc7ac1107bcf89877aff9650eb823704eb23912a83643685612a0cfc84ccf2af2303b52249d9e7a3e55c08c7b7 SHA512 267787c5b3111a20158858b42a8b9c2698b80dc40f7d340175e26d74b955643cefffc2f4de9811fa26464eac2e79913150fb3cd73871275725d10a690b9d73c3
-EBUILD darcs-2.14.5.ebuild 4208 BLAKE2B ab83e211185599db01ee7e05f9fe35dadee0b292602fb79f5b933fcc82082d742647b402729c97968013e02f423f07fd7a4b651a1a31823e788e90a73be0b7e7 SHA512 d08c82089cd278b4683825df57062ed9cd661d76bd53f19e51839980f302ffb67abd244eb43b6aa625a68811b46a2597000b193ff1e54fd38df8812024d02ac6
 EBUILD darcs-2.16.3.ebuild 4835 BLAKE2B 0bda137c9f96c86958b8d70b71f449d14bd0a96d546e35f3179fbc89e21fad8ff62ebd7c1fc80c803a32e1eda3d503bd10d37688caa09043c40bf0cdc48e5260 SHA512 b7fd2dd9787a161ed6a56e42715bb96cbe6df49f0dd6023265834c1fadf8775e8fdf6bcc5f355021eae8c518c25877002f12aaebcdb6401a891c28e6a9fc7e20
 MISC metadata.xml 378 BLAKE2B 13e2f65cc6ea5e9757b7ef30aa946f38daddca9a592bcce78bda172936de89aee38d0e28ac70d7e886ab12c58c5c27cf49a7c1fe6426811b696bddb8cb9989b2 SHA512 fe6b44da867aebd58b302aa0bb3dc17bc815e300cd7ddf05851fe52f1fe2c4cacebb4624e6ca96c0d8f0a28a05e96075497e9fefc96459a73ff2aea6bc40a5aa
diff --git a/dev-vcs/darcs/darcs-2.14.5.ebuild b/dev-vcs/darcs/darcs-2.14.5.ebuild
deleted file mode 100644
index 16ea2a78fd89..000000000000
--- a/dev-vcs/darcs/darcs-2.14.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl +terminfo +threaded"
-
-RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
-	>=dev-haskell/attoparsec-0.13.0.1:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
-	>=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
-	>=dev-haskell/graphviz-2999.18.1:=[profile?] <dev-haskell/graphviz-2999.20.1:=[profile?]
-	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
-	>=dev-haskell/http-4000.2.20:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-3.1.9:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
-	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
-	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.6:=[profile?]
-	>=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
-	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unix-compat-0.4.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
-	>=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
-	>=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	curl? ( net-misc/curl )
-	terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11
-		>=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1
-		>=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.8.2 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/shelly-1.6.8 <dev-haskell/shelly-1.10
-		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-	curl? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag curl curl) \
-		--flag=executable \
-		--flag=-hpc \
-		--flag=http \
-		--flag=library \
-		--flag=-optimize \
-		--flag=pkgconfig \
-		--flag=-rts \
-		--flag=-static \
-		$(cabal_flag terminfo terminfo) \
-		$(cabal_flag threaded threaded) \
-		--flag=-warn-as-error
-}
-
-src_install() {
-		haskell-cabal_src_install
-
-		doman "${S}/dist/build/${PN}/darcs.1" || die "darcs.1 not found"
-}
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index db8d1aa8503a..1b4b6d477a8e 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,7 +1,8 @@
 AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
+AUX git-cola-3.5-py3.8-line-buffering.patch 1342 BLAKE2B e13e576a8e4d88975b59e3f9b58f3a0b1f7cb903a0469729005e04f8dc43b5d4459d4dc85436713519cce72a408cedf9784b6fa69bd9a0cbb0fdc1e49b66588e SHA512 445106e675df96386e1b995c9bd8ea496bf029f7bde6c81390b657034769580a7ef448bcb2f5c9c79ade19f2d490f4bef19b7a0e0d51e43c01cdc6e2594e7535
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
-EBUILD git-cola-3.5-r1.ebuild 2528 BLAKE2B 6b1054847474f44db0a2c794c5e8abc795677b6bccb30aff2413f774df7d9889a5134fa4502ac5daf02cb34c35c4c177f6a653a4df906aa0987af0d805143d53 SHA512 099c6027561d80beeca7cffc09fc3196d4561ea0953bce82d953cf37cd0a227069dcc147540325f478c1e00da3012818d1c5b2758aa4a209d3314b683292ef98
+EBUILD git-cola-3.5-r1.ebuild 2732 BLAKE2B 4f3cafb29992e2787a24521efafacd018f747591f3db95a188f25497dac2d28c5b346b6a428c61214e8d8a4c4d955458d78e4b704363d0285a5cebe2d25c48bf SHA512 bef97f174d223b0fb220c22fcf36b9f42a5958e3064671397fd2ea36d2181fb668d8dc3e0201b5e349ba6b5ccaf89d7d8d3aa2caff12b1377ae1a0041af1ef00
 EBUILD git-cola-3.8.ebuild 2527 BLAKE2B cdc2bfb801db6cdca9a47fb9d62fa6aa2b6facfa92b6a6eb2dab2866b852ea8d36e1c976e9f1b1106550024d092cca31a6c08ffd3e4e442d887c5e2be508007f SHA512 1ee2043174cc1bf055de8c160e3b9665deac31553512ba2410e7cb616604e852a9a4ccbab4d5f7cca9bc1ce3ca4f2740a5ff51a7a08c832f3c00f2a4765493e0
 MISC metadata.xml 550 BLAKE2B 65feeb544a556d9202adda4f760b622c21bc03e04ae40428a49f3c53f253065cb923bbdf70c10187935895d5afc47ed9e49d8789d616503963689fdac06e860c SHA512 92a636e729d3d000e04773b2debb015b399f0b87f32a14c259c915975864e1d40114e68c7434fbe055913fbdc9f73c3f1d400807c25e83cf0b49f354b302e657
diff --git a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
new file mode 100644
index 000000000000..4938d6a30eca
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
@@ -0,0 +1,29 @@
+From ed00653d43b00b18e89c8c4d9e733ef156c02579 Mon Sep 17 00:00:00 2001
+From: Simon Peeters <peeters.simon@gmail.com>
+Date: Mon, 18 Nov 2019 21:15:32 +0100
+Subject: [PATCH] Only use line buffering in text mode when calling Popen
+
+Python3.8 started complaining loudly when trying to open a stream in binary mode but with line buffering enabled.
+So we should only try to set `bufsize` to `1` when we enable `text` or `universal_newlines` mode.
+
+see https://docs.python.org/3/library/subprocess.html#subprocess.Popen under bufsize
+---
+ cola/core.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cola/core.py b/cola/core.py
+index 0fabfcf3d..5ad719f05 100644
+--- a/cola/core.py
++++ b/cola/core.py
+@@ -208,7 +208,10 @@ def start_command(cmd, cwd=None, add_env=None,
+             CREATE_NO_WINDOW = 0x08000000
+             extra['creationflags'] = CREATE_NO_WINDOW
+ 
+-    return subprocess.Popen(cmd, bufsize=1, stdin=stdin, stdout=stdout,
++    # Use line buffering when in text/universal_newlines mode,
++    # otherwise use the system default buffer size.
++    bufsize = 1 if universal_newlines else -1
++    return subprocess.Popen(cmd, bufsize=bufsize, stdin=stdin, stdout=stdout,
+                             stderr=stderr, cwd=cwd, env=env,
+                             universal_newlines=universal_newlines, **extra)
+ 
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 0c0122bcd5b6..a977e0dd5d29 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
 
 DESCRIPTION="The highly caffeinated git GUI"
@@ -37,6 +38,8 @@ BDEPEND="sys-devel/gettext
 		)
 	")"
 
+PATCHES=( "${FILESDIR}/${P}-py3.8-line-buffering.patch" )
+
 python_prepare_all() {
 	# make sure that tests also use the system provided QtPy
 	rm -r qtpy || die
@@ -95,6 +98,9 @@ python_install_all() {
 	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
 	python_optimize "${ED}/usr/share/git-cola/lib/cola"
 
+	# fix appdata installation
+	mv "${D}"/usr/share/appdata "${D}"/usr/share/metainfo || die "moving appdata failed"
+
 	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
 
 	distutils-r1_python_install_all
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 5a6c99c2dcff..ed030678d083 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -18,6 +18,7 @@ DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d
 DIST git-2.27.0.tar.xz 6074636 BLAKE2B 72c992ee35a50cdeb2363f04edfab65358216b8415f31f217b6e837d1f7bc28b90e49850006596a8f5f1932fd3011c4253df287d445dca58e335d2f6e7bab8c2 SHA512 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33
 DIST git-2.28.0.tar.xz 6117608 BLAKE2B 81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a SHA512 a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a
 DIST git-2.29.2.tar.xz 6187988 BLAKE2B 15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa SHA512 34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62
+DIST git-2.30.0.rc0.tar.xz 6223120 BLAKE2B c0f376d114970c307742c2bb613dc38230db683b9d3eb34803527cb333b78ecf2f2f04d3829c0286b9fdeac477f8ebcf7fb80457215bcafa7d1382578fcc7511 SHA512 aecfa17571ec718e9f8892f6d5ba059451e44ac00f4e39f0d8fef51b9c27e885eff2711e3fc2ebfbb0bc0815370fa0a13b8e9243b60d6cf7cb1278e406cb743f
 DIST git-htmldocs-2.23.3.tar.xz 1295344 BLAKE2B 7a6d8198cf8285717f11731ea907ea06786c486701a729d071deedc5437a595dab355ae2d0ac2814b10503ab4161e76a1245663a9ce35ce48d03be9905315db3 SHA512 2c86c03f29f1a4fc2acb17a17a9e1a3df2ec95138895f5c8e776859772ebc7b95c24af0e328508ccf1ea85b7adaa86a9aedc4d0c353ffc91ad5810ecc9a48059
 DIST git-htmldocs-2.24.3.tar.xz 1307828 BLAKE2B 5d6dda03e2c51346326a1258a14a0ee16fab7fe83c80b4a1a0b307a6343db851d89b96afcf616e10ad5831352a90332ac602e5713444855327e11be8992a5274 SHA512 14289fb46cff48bece0cdafea9ef201facdb58eafce4b735ce50489356deb993c481ac1b6e96a2f98cfe30434280997c47f2cca0bdb2b6e85c31cb7cf17cc257
 DIST git-htmldocs-2.25.4.tar.xz 1296896 BLAKE2B 4f6469acdcd699698bd1f19bd0d911fd522c1890115f25c087a7870b855eb9354340fe17e9e6aaec7fb27cd951fe28cadbf26e1aeadc76f3c3a1cde4d23e42cd SHA512 e10c6fa52e213a2b18290fed375f6e176eef17b0a19f6906f09d6228d18bece88ff0ec97d871db0ba29fc0fbff73740312ab01eab809bd6a9a41c8b295cf8d67
@@ -25,6 +26,7 @@ DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c79
 DIST git-htmldocs-2.27.0.tar.xz 1325820 BLAKE2B a86cb62b6e42e451201a69e92c897566a78ed4965a98ef7b09f7c4674f60a334357ea8834ec5d97764f5f7e8fe580b8ac3af4da588b72a0e01f065adcd019aec SHA512 6af974ea6c8458f72c5fc7a372611e0153b705a85092a5fe37587a3165368712e077f582ce4085538f48df925d60898b96c32275182b7ef034711ab53e7ab811
 DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde SHA512 bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
 DIST git-htmldocs-2.29.2.tar.xz 1364856 BLAKE2B 76498ef5bfdc058ad1e7c3b2c0c5ba715fa2682c7429db837cfeb7abe64ae3561e8b3f2dc032dd193514778271a040b1b120071d12ae5082a415db5084c7b6aa SHA512 d7223160af9bc97201bff59b94c8c09d331cdb9f979c878698230bb579b3f4751b6a455d8413ce09a507799744d7e3c77a2ad4d265386de7ef3ba9e11fb20445
+DIST git-htmldocs-2.30.0.rc0.tar.xz 1340368 BLAKE2B 7db7f4ec396351c36ada8189e37dadb736015c8e4d3c327d6805a8ad812430093dfadf99c84c6cc64f85e130971e2eb2480e3926bb6ae6acc840b11c811cfae6 SHA512 5154ddbf8b744f035b2ac2eb0f19d982e04a45f95fe7f19cdc10cadaf1a989b33bc23af8e16459767474a7a2184397115b1a7bca500b5b6ff293bc20579c884b
 DIST git-manpages-2.23.3.tar.xz 449464 BLAKE2B bfc0153e43724df7210110e836d47f17258e45a876aa9bf4604c3f38e690e0e5379d4394df96c3dd84ea4d7371b7843729e6fb5d4b43fd7d4a9b4c3f4062a922 SHA512 a7b5fc48a5b840eb9b668b441ad3c30f65adc73c22cda461ffaca1cfddf154bf1974cab6c372b4534fd45a43a2e2ab96513364845a7db4285b88e31bf7619f8e
 DIST git-manpages-2.24.3.tar.xz 454796 BLAKE2B b340b33593e596a7a87385110fea53a96b68f0b0c5c02e046a1aff5ff7c7a6bf3d7a55c4d33796db8e84824df72451ad51db9fc44df4840ecd0183c0ef49eba0 SHA512 22709e159196da27befc26eef3ab40dab9700c95abf6892860a81c8e5df7d85ad423c877e6c88949cfc611c4dfebd956f02a78f0340c1cd4d58c48f80e3e1cce
 DIST git-manpages-2.25.4.tar.xz 459344 BLAKE2B b0ac88f691984f39f6cfbf41d2d61ab443573974277536641daddf0e9b7755ea9cb6bc96ecf3c14479809036171e461eff72cb498c63a56eea041341b8a65af5 SHA512 a67b881f289d5b3e2187ad55c5176258c30108c73fc7c18d50c1a6b42b241ce46dba28acf2f7bfc994b044444a6678096a35ad60936ea6cba07b52ddf647da17
@@ -32,6 +34,7 @@ DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f55965
 DIST git-manpages-2.27.0.tar.xz 470724 BLAKE2B 83db9c5aaf9ada63d4e6146ffa4f20f1d21797ba7c7b27ade9d6f4dedb1091591b8afe4f368a4433cf75d2b148d68cec725f5504504c703eb7c22916d17b8069 SHA512 a4ceb7b86d67d15a52fec22e9bac5c8b1a5447041c3278710c2e24f70d6d443853d6a6ec5eb5ab7633390c5fa2494dd495096c26a6467d9cb13d9da007a73d12
 DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f
 DIST git-manpages-2.29.2.tar.xz 478516 BLAKE2B d9a9840a8c869e2f7f9dade12c780032a7eeff59314b4d45c8c65e3f076e0335f0674c484fe7cebbc70d13b51a17b5fcf69b1bd51dca7ff226d76b1fed33d8bf SHA512 f2af31f8b2242961a0633258dd4668dbf21b26eff440e302608bc5bee2ed45a3e573528cdd0f11503d0ac4745e03cb457d99f5529fc96c105ce441ece07e4fe8
+DIST git-manpages-2.30.0.rc0.tar.xz 481784 BLAKE2B 990e597e6c9fb772c7e7a4b81230b7e5b737ecdba4759afbaf1ec9a3ec9963a05cab99f23a24d73c1412a9ff8d7ef4e6fb9d0b72c0d2450c8beac4834c998b59 SHA512 c53756f6c6bfd81ba72290516a8c9751fe946baa1937ff2f24784953c7a22e8e629c27093b45dc8219f77868b9f33fe90495ae8e5f6631c6a14c5ae7a2e018c7
 EBUILD git-2.23.3.ebuild 19572 BLAKE2B 5841475703086587bb399d8c7f7298b9a3da33184fe7a9f060a8d286a8392014bc6133aa4ed4d727f0d7c37915d900d7d760ad994909da32061152bfe5f9bf2f SHA512 5ef0dcfd745b800a27fbbe8186c3050fc11dfac243bdb54e590d45f50a24645204b9eb5747ef3e2a0ed8b760aa3a38c7bad66357e900b4ed151a100d0e8dca3d
 EBUILD git-2.24.3.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
 EBUILD git-2.25.4.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
@@ -39,6 +42,7 @@ EBUILD git-2.26.2.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea8841
 EBUILD git-2.27.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
 EBUILD git-2.28.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
 EBUILD git-2.29.2.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
+EBUILD git-2.30.0_rc0.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
 EBUILD git-9999-r1.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
 EBUILD git-9999-r2.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
 EBUILD git-9999-r3.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
diff --git a/dev-vcs/git/git-2.30.0_rc0.ebuild b/dev-vcs/git/git-2.30.0_rc0.ebuild
new file mode 100644
index 000000000000..ce04e5f8d0eb
--- /dev/null
+++ b/dev-vcs/git/git-2.30.0_rc0.ebuild
@@ -0,0 +1,693 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	pcre-jit? ( pcre )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=( -lpcre2-8 )
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=( -lpcre )
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			NO_MKSTEMPS=YesPlease
+#		)
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=( NO_NSEC=YesPlease )
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=( NO_FNMATCH_CASEFOLD=YesPlease )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	if [[ "${CHOST}" == *-uclibc* ]] ; then
+		myopts+=( NO_NSEC=YesPlease )
+		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if test -d "${d}" ; then find "${d}" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ ${cvs} -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 871fae3db620..691d4ac8d85c 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,8 +1,10 @@
 DIST tortoisehg-5.5.1.tar.gz 8918085 BLAKE2B 33aef61d97a34f45b10b291eb3a71bc46b70a1f24006fda0e651e88c61b0351701a3abdf6c1b0277fd81a0c5c9ff225b742215103c280eb11976a86e6bf2a47c SHA512 ca2d3833e379620b1a467b5a6016c8dbd54837d6ac5267063eb6768675dcb0c020a9b4ca2b2b8924a57c9e7d117668347e23762e8ff46c87825290071783aaa8
 DIST tortoisehg-5.5.2.tar.gz 8919653 BLAKE2B 33842e0df31efd4302e210119b098b9debcf1003d320f4b0d5d0c29796ae2149a4aca70871e5f5a82c635fb8e5a12eb56572b23f691152860a386ff8dde20ade SHA512 eaac888f1171d3e4bc1de49ccb5cff550ea859d702b65548040072e3805b54c93d38afdd1a132f6340275172cb456461d76bb4e53a477d0a6e180ac85783a1f4
+DIST tortoisehg-5.6.1.tar.gz 8904309 BLAKE2B 7faad055560560eeeb776349889b45ae8b1de72614f794de9a124b6293a549eeeed1276e9b8308e077f2d171efdfa695660ad7010edd2d8ab2804f28687715b2 SHA512 21a410277469803e1af45103bc5c7196bc7128e66ab297399b98731c32caa517da46bd06389f08ad740b78c22e58244757dbad4207b71d5643b9d1284ed9c936
 DIST tortoisehg-5.6.tar.gz 8920111 BLAKE2B 3779ea89f196bbf49c5efdc957983ff674d3c70c6ef04d758b2946851300bb115173a82d3ee9d0a51df6db51ed30acfa33abdfb2e6b3c08177d9dd5416741a10 SHA512 30013a776ea7e8b1167280350b64a993ebccbf82486f93164a1eaa42e98587719503c3dd939f9ea682d4302532216575ad7a20e9e2122315f63af7d002d08b03
 EBUILD tortoisehg-5.5.1.ebuild 1599 BLAKE2B 105f731aa25c4039994c6c165b4bdbe84558a6a8f91e4d2025a11fd068d39050a12a20c8e133b3cfe72aafa2be4edd8a1e47a10f77359fbf3704a3fe13b5e02a SHA512 0302ce34c000a686bb101e1d2f91a199baa4a744368740338bc60ba8b6cb49420237525db201ac1f78932d961622887b8e2560bda2f4c62b58b236f25590b9a0
 EBUILD tortoisehg-5.5.2.ebuild 1629 BLAKE2B f0eafc0cd3988992b564e3ba205eee8220606985c784230e2b7d74906cb403b52754d5991365f758bd0f45682fcb682f21aa0c6d1ece6d4077fa8b8c079f5be6 SHA512 75d32ef53a3b772026b82db17a403decd2af5a851e5967cbed5e94e0b8010fea85f17c2ae9cedfba85a464ddb9c9fe63369e4276e7e2acdf49b4eb12aa554582
+EBUILD tortoisehg-5.6.1.ebuild 1681 BLAKE2B be33d2db298c7de97da9ac2755f1af603b5cadc73215d2f6162eb7d33564a3360db6b9e334c249a69c57f73ee565d8dbb53b82ddb3e0f2724e8a143aeb0889ef SHA512 3f0e112ce2551fad78af3a5bb2cfb1bc960216a832c3eaf32108124d7aecc48ab5aa86b3fde77235cc0aab408b849fb5f879e155b37296a58dee72f213711828
 EBUILD tortoisehg-5.6.ebuild 1629 BLAKE2B 9db14ddd316e82560d4b0bd5a090b8879f69a4055bb6d1489fd3ad1cc3d928bb8890b083a2f176c9463b0e87eaad9a3e0649b146e09dfc9190e1fd6bd3d8c4fe SHA512 24bd77c5af5443f2b6e5563b2d03127dc5c93fd939b16f23e49291b84b2d1c40f1dde37f95acb8f155c8c74c521a21937d3bcad664ab4303b1f5347b972ada48
 EBUILD tortoisehg-9999.ebuild 1629 BLAKE2B 9db14ddd316e82560d4b0bd5a090b8879f69a4055bb6d1489fd3ad1cc3d928bb8890b083a2f176c9463b0e87eaad9a3e0649b146e09dfc9190e1fd6bd3d8c4fe SHA512 24bd77c5af5443f2b6e5563b2d03127dc5c93fd939b16f23e49291b84b2d1c40f1dde37f95acb8f155c8c74c521a21937d3bcad664ab4303b1f5347b972ada48
 MISC metadata.xml 774 BLAKE2B b03f2b762867838c9870f1ccc744ae17a866759efb26690e05e666f77635042d637c901905060c203f178beee3f44034d3af4813f8ec915f4af9cab928fa957b SHA512 1a4492a7f467cb8e2eadc760064768bd3bcd55deca269d643a0c07c9486b3a59c8be66ca8243efc76c65642e9b794ad334511c5ee9b6fdbbfd3b9dc7f5a64df1
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild
new file mode 100644
index 000000000000..7655deb4a47f
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit desktop distutils-r1 xdg-utils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND=">=dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+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}"
+
+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"
+	distutils-r1_python_prepare_all
+}
+
+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."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}