gentoo resync : 21.06.2020

16 files changed, 129 insertions, 99 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 090bdc4b0fff..d77aacf33ffb 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 1b8064438627..6f6187007992 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -4,6 +4,5 @@ AUX cvsps-3.13-make.patch 1126 BLAKE2B bc5c7aa08816a8cad99a05e0b20cad5de55026c05
 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 913 BLAKE2B 0770e272abceeaeac6f12a1fabd8650f739ac5f4221184ee26ae5f2289dd716219ef076a11d5cf68ff186d0f23f55c5b05451b995321a06c70bacc7890a50b23 SHA512 292a2f7c589ab5e476c2d4ed29d24da3ec8f55cbe54a1ab52d11c29d1562ceafb4d5b734fac8636376db0de70eeca4086b9c08fb985461b9826c01e2995f6a3c
-EBUILD cvsps-2.2_beta1.ebuild 904 BLAKE2B 0c21448304a5e37302aed50fe363f43fe01d758e2ef84fdb325445684f3df625640d6417d80875f6144d869b0ea443c401894953ee508142e24ea529cea03dad SHA512 119a76fd719852359f9a4047ea35133d24100114dc5760c25ccff890ef0419edbcb050ffc392091291aeff930ed10606e259f8c32fbface631d668eab7a2de14
 EBUILD cvsps-3.13-r2.ebuild 1003 BLAKE2B 99e8d145aa28f98cbceef9f0ad427fb9845ce177e2a463b0d8e6de2282a28aa8034285ce4537e4ac2244d182dae832cf5cc8a6b845effbfc6811fcdaba830b17 SHA512 486dcc6e74494504b528b92eb6d2d890e38879b14ffc7a729a7806e1bad8625622c3c6379bb225bed1d6b28c172c184857eee917e783b39dbdd4a0509533009f
 MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
deleted file mode 100644
index a00d4cde594f..000000000000
--- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/_beta/b}"
-DESCRIPTION="Generates patchset information from a CVS repository"
-HOMEPAGE="http://www.catb.org/~esr/cvsps/"
-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 ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-build.patch
-	epatch "${FILESDIR}"/${P}-solaris.patch
-	# no configure around
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e '/^LDLIBS+=/s/$/ -lsocket/' Makefile || die
-	fi
-	tc-export CC
-}
-
-src_install() {
-	dobin cvsps
-	doman cvsps.1
-	dodoc README CHANGELOG
-}
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index f63789a7fd77..f7e55d37b13a 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -88,6 +88,6 @@ DIST gopkg.in%2Fjcmturner%2Frpc.v0%2F@v%2Fv0.0.2.zip 10299 BLAKE2B 6c10b7e229e21
 DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489
 DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip 42124 BLAKE2B 172da6e6ccc58989dc4827d113bc8b93dfefef6321344bc9f569786ca152dd50369e98e7fdf718096d42eec90c1cd14d05cf908afbcc12dce8de6e2248d8463d SHA512 056ad239cc4831d56ef60f0e36c7cfe78a3a4d67160ee81619f63f27ff975247eb53e2b3461b8ee461f8aeee2fe8c37131832304e3eafadbc5ed5a4fb90a994a
 EBUILD git-lfs-2.10.0.ebuild 5709 BLAKE2B b9628b26354006865d385233395d467b715cdee931496e1ed37437d383693a5314d338d05dc0551f3d96ad2c25e4b6391909a1669f8ab2c9c58175f69e573b59 SHA512 c1b09d100a0a8f6be01f9e3ff21ac28fe51b5bc0c9a6eb9d256654ec19ccf2a97e571bf80c4328605233c360e34971b4918be5fbf79f7beed7bc357813447b78
-EBUILD git-lfs-2.11.0.ebuild 1162 BLAKE2B edc19dd9bb3591e62c08cbd6dfa2863e04a45a0616b07f9fa84ea9c79ad3fc8ca30600e65d998398e2a3ac9088663585d28368bd9bb863cb085ccd0e939d2f9b SHA512 5c6c8c0936b10a6e3067baa607fc3ef7f2ff43511038ad3064420affbc0c62931d1d9ec718569835f7fff8460ea198e6fa848c6ca3e50afddbd68687e762ecef
+EBUILD git-lfs-2.11.0.ebuild 1161 BLAKE2B 229b2f495bd19729ecf9694eefbf3a50f3fa3f8a48549e4da428fb15dee847936c9c17dd0b92496f4cdbbb1c377a1b3343d9199ac189dbb7c62bc9907b9eef6e SHA512 4ebcf2cf46a8c9d4612724a3e7a25f3374ecad24ad3c3e57050efe8599db6b8381ecf02f46133b9d3ce049192b8f8802a1253385f69bad504157ac2c2f8490e0
 EBUILD git-lfs-9999.ebuild 1162 BLAKE2B edc19dd9bb3591e62c08cbd6dfa2863e04a45a0616b07f9fa84ea9c79ad3fc8ca30600e65d998398e2a3ac9088663585d28368bd9bb863cb085ccd0e939d2f9b SHA512 5c6c8c0936b10a6e3067baa607fc3ef7f2ff43511038ad3064420affbc0c62931d1d9ec718569835f7fff8460ea198e6fa848c6ca3e50afddbd68687e762ecef
 MISC metadata.xml 558 BLAKE2B 307387b4326dd3982b949f3dc06f69efa31fcd70cbb03b1c68a5557965fdc14bb32f638a644c951ec06bf979baf8046228bf0820c9dac96a3d984c3cec3b32eb SHA512 8ae42faa56a37e9ebbd3c6fba90e4e87b44f8022ffb2bc3fb2eb7128c5bf7c34497c7a13c73252db5b5096135ed153a61c74382a54870c32c36eba7af23f7cbe
diff --git a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
index 001d987aa95f..0b54f1e63720 100644
--- a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index bc2f79927689..1aa030728dad 100644
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1,5 +1,7 @@
 DIST hub-2.13.0.tar.gz 2074748 BLAKE2B e790c13cfab9070699b3995c91c3adfad89b438d70b4f0683dcf2f487349c785d97f1aa845620cf0ccabf93f6738a3a1d45410bd1155c861d55f3d2568312235 SHA512 77cc86948a4725a56b09eacdecb3227b46022de93f6ca8eb298441e32bda83cd8e6bb7874e029caae06852c6edcedfaa19382599d6f6ad9760663ff2573d2342
 DIST hub-2.14.1.tar.gz 2077137 BLAKE2B 35e209766e73979c6629c4542d405d0a724b2ec77d89ef14c50b7630118e55b8d4afc96d1dd7daadf6d790b55dae45b33a855ec49ac9ff87d347849874078ef0 SHA512 dc4fc1ea27c4338ace1233089eea45fe4b636d6b000ef49b2ae44481d508b76c4c2035573acb0654efb2a3986ebdeb7b57dee9e77bbbdedc319c6dbba4ea6f8c
+DIST hub-2.14.2.tar.gz 2080107 BLAKE2B b0ff7bcebca7f4b515acf412b756da8512dad7c89f1976cc749c68d70303ff7172b6817e92c839c1864b55ac137e67cf1c99fa07e09b01fd76ad3d40be8d2163 SHA512 4809d12966cc983f42c8aef482e07bc4226e25fc4deba838e418664ce14ac9d2ac42842d0721a46466a80c0e492392542ecfaaccc2cea0efdd60df8b60a3ca02
 EBUILD hub-2.13.0.ebuild 787 BLAKE2B c026240918aad6dc9b418e8f70bd2237cd771d52032b1001ce7ae1e62be25e58d3af0e7577bf0ef88f5d5e241c397476b8996f226d6b4445fb554f37ab5c7908 SHA512 5f81216e6e0c8623f81178f0c45b774b4af97f870f0e8b327d1f69e68f69231148aa35ce7c5b9f9401e9df80506be798c21f0867a9b53729a0c25fb5825d61b1
 EBUILD hub-2.14.1.ebuild 795 BLAKE2B bf936f7a785cd3e32ed17de4515396cda3aaa8243ac76eb92077fdf6ee9184accc91bd222e2c0cc61e999537325f8ffec455f3e4431ca0ede9379e21e235e232 SHA512 a428dddac5ff71302476e6245e90e788fc2b38c5decb1484bc032728bb34e80f7fe9d15492db7aa1ff9dae98a23cd48b632c2041524b6be632d1b605d81dfbfa
+EBUILD hub-2.14.2.ebuild 795 BLAKE2B bf936f7a785cd3e32ed17de4515396cda3aaa8243ac76eb92077fdf6ee9184accc91bd222e2c0cc61e999537325f8ffec455f3e4431ca0ede9379e21e235e232 SHA512 a428dddac5ff71302476e6245e90e788fc2b38c5decb1484bc032728bb34e80f7fe9d15492db7aa1ff9dae98a23cd48b632c2041524b6be632d1b605d81dfbfa
 MISC metadata.xml 334 BLAKE2B c10c297b5f493184b2191daf7c8c8df963054d3bd682aec7c9768784171f2eacb267fec32b817ea93a85d57e1bc248f5454ab8984270b94c997287b4ab983cfd SHA512 448ebf7bab89832d682b7e99a2fde5e04f242c7cca13272f5827f680077a310d670ff1f201073d07d779b8fb1905e066cd0de7b4f82879233ea6f366b0992f7a
diff --git a/dev-vcs/hub/hub-2.14.2.ebuild b/dev-vcs/hub/hub-2.14.2.ebuild
new file mode 100644
index 000000000000..6f8110005117
--- /dev/null
+++ b/dev-vcs/hub/hub-2.14.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="https://github.com/github/hub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+src_compile() {
+	emake bin/hub man-pages
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc README.md
+	doman share/man/man1/*.1
+
+	newbashcomp etc/${PN}.bash_completion.sh ${PN}
+
+	insinto /usr/share/vim/vimfiles
+	doins -r share/vim/vimfiles/*
+	insinto /usr/share/zsh/site-functions
+	newins etc/hub.zsh_completion _${PN}
+}
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 159d002a3e48..5dcebbccdb12 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,7 +1,5 @@
 AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb5a867cfcc2c2301dcadd01c54745fca3504460c13546f6947677764c87a2e3f30c1949baa4da4c4fe402c SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
-AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7
-AUX mercurial-4.8.1-unbundle_zstd.patch 393 BLAKE2B 8556147baa6e493ee81aef1a68b2b6372ba094c6d5c73e97faa3f2da48179085ad475fe8d646916d3fb3294a166abec4a8b2a5b5e00cfd8fdaf55290a745ef2a SHA512 003844caff3dd4df15db8a6a084ee71d456026dc9222bf469f9489a9946a9205a57db274a26dabdc2d73fdff24cfd291f70b99141f2c9aad6e58d0fe1a1e7254
 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
 DIST mercurial-5.4.tar.gz 7722447 BLAKE2B 9abd7b62ca6e44ede626331d080f7a0e8e7fb980c169fbfc2e847549c915b65789e317b674a8317bf58ced3cab4e2de790513e45c6556d32cac649fe23e04fdc SHA512 5f92d653ab74da4696ba7f1402e6cb219c0c514a5eeecb9d7282ab95aef2c6f16d5c8e3d0149525f3dc694a133c713b671ba92327e1b0dc3ad8701d522986d8d
diff --git a/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch b/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch
deleted file mode 100644
index a48932ee9fe5..000000000000
--- a/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- mercurial-3.0.1/i18n/el.po
-+++ mercurial-3.0.1/i18n/el.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2009-12-02 03:23+0200\n"
- "Last-Translator: <keramida@ceid.upatras.gr>\n"
- "Language-Team: Greek\n"
-+"Language: el\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- mercurial-3.0.1/i18n/fr.po
-+++ mercurial-3.0.1/i18n/fr.po
-@@ -90,6 +90,7 @@
- "PO-Revision-Date: 2009-10-25 12:43+0100\n"
- "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
- "Language-Team: French\n"
-+"Language: fr\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- mercurial-3.0.1/i18n/ro.po
-+++ mercurial-3.0.1/i18n/ro.po
-@@ -110,6 +110,7 @@
- "PO-Revision-Date: 2011-06-08 17:00+0200\n"
- "Last-Translator: Daniel Dumitriu <daniel.dumitriu@gmail.com>\n"
- "Language-Team: Romanian <>\n"
-+"Language: ro\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- mercurial-3.0.1/i18n/zh_CN.po
-+++ mercurial-3.0.1/i18n/zh_CN.po
-@@ -51,6 +51,7 @@
- "PO-Revision-Date: 2009-03-31 20:38+0200\n"
- "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
- "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n"
-+"Language: zh_CN\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/dev-vcs/mercurial/files/mercurial-4.8.1-unbundle_zstd.patch b/dev-vcs/mercurial/files/mercurial-4.8.1-unbundle_zstd.patch
deleted file mode 100644
index 075645b28457..000000000000
--- a/dev-vcs/mercurial/files/mercurial-4.8.1-unbundle_zstd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mercurial-4.8.1/setup.py
-+++ mercurial-4.8.1/setup.py
-@@ -983,12 +983,6 @@
-               ['hgext/fsmonitor/pywatchman/bser.c']),
-     ]
- 
--sys.path.insert(0, 'contrib/python-zstandard')
--import setup_zstd
--extmodules.append(setup_zstd.get_c_extension(
--    name='mercurial.zstd',
--    root=os.path.abspath(os.path.dirname(__file__))))
--
- try:
-     from distutils import cygwinccompiler
- 
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index fbf6e8a26d14..e0ab401e7799 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -3,9 +3,11 @@ DIST python-gitlab-1.7.0.tar.gz 110657 BLAKE2B 1003d3373d3ef5474b1d5c10b1c6af57e
 DIST python-gitlab-1.8.0.tar.gz 115603 BLAKE2B 8ebebc1735e5531b4f95d82122b6ecf78fd541bce503f0cdf8c47b2ec2edab89efcad6c0ab39d82b57ffb8c3e341cb2160916b7df6c4886465e90557db3141c3 SHA512 4843aefb7cd363520e9065cfc08b81ec2c5c2c9cbdb5d6adbd35ec0f615bafd40e66746739c910b5e7e041f06e2aa9dc8beb8a884a714e6837cd5fb6fefb53be
 DIST python-gitlab-1.9.0.tar.gz 116460 BLAKE2B f0a0d9679e4e742d966c678f8dcc6b2464e5ae8a013038221b3c484e6bb6ae23c166f82fec85c3560ebbce3cf80bc23657b1b906d8c6f284a64589545acdb035 SHA512 cb0d58896f55837f7088ab08551f2e9f9f82e8a04c19979a69bc042c95cdb2d04174dec49a236ddcf1344c50e9ffc6f929750b008bf6e619225c80bf9490afaa
 DIST python-gitlab-2.2.0.tar.gz 136178 BLAKE2B 23f04638ba34f63048143e834342ea81e8a8cacdbc0502490543bc5b6de9fea6a58c884bc4111aea0fb27a343d22b9dfc62d5000b873ab90105f6aa5a80b7ff5 SHA512 bdf34e4b9e45f5767faf81d52caf1b800d931a105940bb80b1e58cc8efc34a319196a6aa437d49215f0f4ff24359cc2497853486698a23413b2bb3dfe169e5e3
+DIST python-gitlab-2.3.1.tar.gz 142026 BLAKE2B 94bc2c65722fc83abb1793fc9b5eabcb3224ac9087af111c5865ffd0ee553f579187cf881b5dbc20536e6d7956a6c563b9e5ea4866dc4617639413a5e0075146 SHA512 2e48dfb025ca1645e78a3c5b4fa53085819dcffc916c43558a760a9471f08315249d0199d8db1740aba50e895762f48ffb19b1031e6204039229a48f5b93e447
 EBUILD python-gitlab-1.13.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 EBUILD python-gitlab-1.7.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 EBUILD python-gitlab-1.8.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 EBUILD python-gitlab-1.9.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 EBUILD python-gitlab-2.2.0.ebuild 806 BLAKE2B 068b38234ea175c04fde4d825837331436a29a4c140cb6eed8beea66e1bf548f8634ff903d026a6b6c4418a1fdfc66ae063d8fd9d9cb29141057c0571b0bd640 SHA512 89d2709fc88963d76996f033f9360bbd8a341ea8e6181334cef17ab8796e73efaac79c46e825e3fd1c6732270d96be3a273091571e97bdff0c8ad6a8ab9ffe10
+EBUILD python-gitlab-2.3.1.ebuild 806 BLAKE2B 068b38234ea175c04fde4d825837331436a29a4c140cb6eed8beea66e1bf548f8634ff903d026a6b6c4418a1fdfc66ae063d8fd9d9cb29141057c0571b0bd640 SHA512 89d2709fc88963d76996f033f9360bbd8a341ea8e6181334cef17ab8796e73efaac79c46e825e3fd1c6732270d96be3a273091571e97bdff0c8ad6a8ab9ffe10
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-vcs/python-gitlab/python-gitlab-2.3.1.ebuild b/dev-vcs/python-gitlab/python-gitlab-2.3.1.ebuild
new file mode 100644
index 000000000000..fb687ff4c2f1
--- /dev/null
+++ b/dev-vcs/python-gitlab/python-gitlab-2.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Python command line interface to gitlab API"
+HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="test"
+
+BDEPEND="test? (
+		dev-python/httmock[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r *.rst docs
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index fc682a40245b..72ad6243947a 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -7,6 +7,6 @@ DIST subversion-1.12.2.tar.bz2 8506584 BLAKE2B 535e4c6c369537baa7f9fc9123d0314de
 DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
 DIST subversion-1.14.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b
 EBUILD subversion-1.12.2.ebuild 15517 BLAKE2B 6a8573f750eb273d22f67a7857652305284e8b8fc7a32fda5a00f9f826854635ef7c708cae0196a10c41804881ec5f3fa68f35415eaf3073efe4a6dae79fd965 SHA512 051325815cbea5de0ecc001c5c7d30156dce016082a92ec038f0298de24d8fde4b07b506d82567c3ae932b98466fed13da1cf790c98956f73c37a277ab1ca5fe
-EBUILD subversion-1.13.0-r1.ebuild 15768 BLAKE2B e205315b5b89c3e153d0ab3edb222158b574e95cf071d0e272d5e90674de10a7252e7fbb55952a3a051661ef50c528547d6a7bae4029306e7727e2f8ae70719a SHA512 64b2556e29730aa613626a73f18246adc7deead0534fd3763e00bee87d0330cd0e5f315f061987656277f0da162d4ac6227fa612c794c15f9b5478886e0c28e5
+EBUILD subversion-1.13.0-r1.ebuild 15766 BLAKE2B 10c9688414713da03840f7ccee255156f50a1faad64c0513fbc39820bf21d42e1ff6c87cb8bd40270595cf795c0de0d41d3cdabd95b5eb40711826eb2dc2ec7a SHA512 e467b90ff4e7636cafcce5f60387c1a1446937b7fc6abf464bcfa2252c41e7117d9f0717f29c6d89c60c2185e9050c642667827fcb6a8805e13cda0bab02ea24
 EBUILD subversion-1.14.0.ebuild 15293 BLAKE2B 7d6d2377b26f6a17894f07335b1ef56f97f46595c4bfe1d4291ccfdd511d60428c8ba2a66c2b56a8da23e362bb34394756c63064df2087a5208a72caa5118095 SHA512 ae1781c78c6d17117f2c93af19f7308ae34d4e862e5f27d49c9aa3667a63d0ebc32f6ee3a0cf9ac05210555300e964b1b895335b835b682a99de678f5f733e68
 MISC metadata.xml 770 BLAKE2B 3fc171f38c8332b6ebf65452866062a0c1e9e0019f5b84e5a61da936396641fac71a96d2c06c3179fb9545df163a8888c8460034284089076e3c1f7c281ef0bb SHA512 0ad45cbda96545bf72ff456f1b7c4d295580bead15e37c8861a571769731623ecca00f4a18b565cdd3c370d3e2ded68854bdf0fca3229434584c8ab340be90ff
diff --git a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild b/dev-vcs/subversion/subversion-1.13.0-r1.ebuild
index d64fcb558153..a0276cada505 100644
--- a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 512b7f83db15..3c8c7ac69920 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,4 +1,6 @@
 DIST tortoisehg-5.3.2.tar.gz 8910859 BLAKE2B 4cc2253f0adbd79fe84507043491198ddd9fa559c3e9296c831b8e0fccd6cb2806a31ffd6d417591f5fcb3afce78e696f7052d70b760a566bf72c6602ca31ea8 SHA512 b15894158a0d5e628015d07b4f8c77c96f3e1d7543fe2984693b99b2acfa411922b06683e62de437cb50dd5817155d4e59045d7fb47c9be8ee27b9bccf77da7e
+DIST tortoisehg-5.4.1.tar.gz 8580608 BLAKE2B db66e114d046fdf2228779a2e224c6244afe4e6463d8f00b7f3b291f0dc9fd043ca3e938a6769e3c6a54ec4d2252dca44fedf790ca9683fa42a55d0cdfce0cb9 SHA512 f8d4bda4ac23b49f304e3561930b75f899ac09937b4da446ee3f38236fa0095e19228dc2e388d5608077096209ded161d194f6edef5d2d4a257b5bf57c0634cc
 EBUILD tortoisehg-5.3.2.ebuild 1506 BLAKE2B 7ee7236d6237e664131219cc5aadc3cab5d2085fc8d113a5139b28053d870d8dec3c193e7d308d71e1fc65f814811cbd4ea6277befa60bd1a097c663918bb1e7 SHA512 05df1967214d5f238efec09cbdd5dc36f20ccfee018b179a7ef3eb2b44aedd24f1813f3b1b62a53cd8a7efa1af0be6386f62d6bb4ba67d4b67f3b323fd2eba6d
+EBUILD tortoisehg-5.4.1.ebuild 1417 BLAKE2B 2d46a8ce8af3621445eb5911f4a62c1eba1572a0ed30f0729f0286c60727d6c8b22782612ffb85e5b6f82a0543113a22a687e2f5e4d7e121b78b3d572c2da069 SHA512 5db18fff1118902258468f8e34a394b4465b85e7f762dd08361dff2b581c583370abf9a71ced361cdaabb7835eac26f49cf8f27b7cee19030b729bee00b45fb3
 EBUILD tortoisehg-9999.ebuild 1544 BLAKE2B 2f31a2367a6b87d29c7830b9841a3af8db0b0278d11d13ec5dbf814f9baebb25b0eb35d42f79f54d2b2a755e2f2d20d54b3deb52472e388069d081eb12fd1074 SHA512 ab1dc02cbfa9b3eda70c7e5582e70f5ec864ee8c89f37c65ced12a2b79ae71881fec7142877c642fa52f428da8691a0e3de91a4a89123a2c9bcad3956339dfa8
 MISC metadata.xml 689 BLAKE2B 79a83a2f3450d6a5546baf729e3b99b9fb9083d2b3baeaad7cba52937c8d6fe313ed84030be682cd783b9ee7bfcd0ba220e17d2a0e7cfc033396b17f284d5aa8 SHA512 7ff6f7e188b9acdef943a8e35a7940fe5d97df15567ff7a76f7babfde51e8d1e480c1287097a5e0b547b7f372f920f402c86c63310e128679c11f4bacd29f0ee
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild
new file mode 100644
index 000000000000..22bb6864ee17
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop distutils-r1
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+SRC_URI="https://bitbucket.org/tortoisehg/thg/get/${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+S_MAGIC="290ae7c8fa05"
+S="${WORKDIR}/tortoisehg-thg-${S_MAGIC}"
+distutils_enable_sphinx html
+
+RDEPEND=">=dev-vcs/mercurial-5.4[${PYTHON_USEDEP}]
+	<dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]
+	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}"
+
+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() {
+	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."
+}