gentoo resync : 15.12.2019

80 files changed, 2567 insertions, 116 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 09df8915ed9c..66665b6c235a 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 7cac04333a92..eba3f2beb840 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,5 +1,5 @@
 DIST bzr-2.7.0.tar.gz 11586410 BLAKE2B 9d61d5efa1c02667fdb93d66fc4290f279c74bff2fd0174149243563bc5013085438410221fb6565f986ef17e957b680a1bdd3142e23843b4cbc39c7855dbd98 SHA512 c39ad3715d865788da74d8de8b469e1dc93d18b6cbcbc569464cdeb9bb2173bf8d7f4f8ee8f7599fbcbbe322817a4c72e785d544e622753699c425c32597d9aa
 DIST bzr-2.7.1_pre.tar.gz 10964137 BLAKE2B d126730d782f232d6c486e31ab465a1a295de456eb59fc1db4d215529ec38e78826da1bedbe6a80af0e874188635c83742c5ae5b07c42dd968f1d0d88596a35e SHA512 b65c63dff33f1646e6db84d9307b870140c2c7b3b16cef69eb4bfb5a5a94cb1721ed74c26e6ad78232fffb4b5055cb4096d9835197db9b97f91c16e8a79658b3
-EBUILD bzr-2.7.0.ebuild 2585 BLAKE2B 458d1e391d6a9bf94f66faf2619ebac5a913a125d7979a18ef694eb5d53986dd48c0ab19bf37349c23ea9f7e4716c76393ad8cbe620a11ccb07a5fc7c09bd6b6 SHA512 edc31bb98053e0f317c3ccb313a4d012475a18dc9c0afe5be0c48e55c14857dc1edd63c9c7891a2e96e24af4a62fb9c6b3c2b2c82055c4b621f2290bcbe6c5d8
+EBUILD bzr-2.7.0.ebuild 2571 BLAKE2B e01a294debdd54baa09d08dd7eff162280c2441b8bab10b9d6d0a7017ed23398ed0976b9dd48978c69c8b4f2bf4f9e0d9674f6f7ca358d8701ff4751e1c252c9 SHA512 e4f08f690317733d6dc0c96c858c6aa492ca0c2a20a1eca49847ab9deebd628ebd7ad729b90cc4d32d369dbb41b75b1666078135f061bedf44721afbe7ff0052
 EBUILD bzr-2.7.1_pre.ebuild 2574 BLAKE2B ebec55cfe81f9127dbf8a04a7763abaaa1483308a4d02d890ec0812a7bc8602d9ca13741069352d08a9c35cbb09fd7361615e324ee0aacea0693ccfad09443bc SHA512 f332f496ff7f74f413cd5ae86556f8ac61bf13436cdbca627dc1df18ee6561e52a0444cfdad989a3e45d8f4d399fde26aee397fc25cb093f0773bea57f42b83f
 MISC metadata.xml 772 BLAKE2B 8f1d371a225b5b6702748efc93dde757d88a39c0a8124abc898eff891a4867c92dbc19a356b4c0726682e5304b80be333e12a981d04b0ae89e480cb2f6b6c3a3 SHA512 cc63dba9888058f60521da2fdc43697f1fc8bde194782346279560b50ceaa555b464599d28641350cd25f67aebe2f449cbe306dd651620bc891271acf8aaddac
diff --git a/dev-vcs/bzr/bzr-2.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild
index b873780921b1..a8a4e4ad7a78 100644
--- a/dev-vcs/bzr/bzr-2.7.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.7.0.ebuild
@@ -82,10 +82,10 @@ python_install_all() {
 
 	if use doc; then
 		docinto developers
-		dodoc -r doc/developers/* || die
+		dodoc -r doc/developers/*
 		for doc in mini-tutorial tutorials user-{guide,reference}; do
 			docinto ${doc}
-			dodoc -r doc/en/${doc}/* || die
+			dodoc -r doc/en/${doc}/*
 		done
 	fi
 
diff --git a/dev-vcs/colorsvn/Manifest b/dev-vcs/colorsvn/Manifest
index 5b159a230961..e71211b934e3 100644
--- a/dev-vcs/colorsvn/Manifest
+++ b/dev-vcs/colorsvn/Manifest
@@ -1,4 +1,4 @@
 AUX use-open2-not-open3.patch 760 BLAKE2B 5e4649cea3124b01b7eefceb1a1e8a7635b323c16cce32f78b81352525d9d0122e180a9aab5188bce13fafa39375be5a77e22b5eb3fc3656493f310ce14835f8 SHA512 556511ce5cf34c7568352a7e18b3d4113cb6d3d52445db31eb2cddc599e3cbbb47c28e39151350e10e957a5a94651445484c9c9cb91af355f540103edeac774c
 DIST colorsvn-0.3.3.tar.gz 107961 BLAKE2B da46181d9eb54709ae2e62aee4e341f1403788b3a460b04bccf628fe0be767b4343f4295d4eeb1062fb9e580a3aa7f5731027d7f5578342b63414f2e03083a75 SHA512 c9aa6eb3a14f156d8f6139ad708782846c561385cb174339443014e83c80b62f5c8d7b9937830ebb5e5e8606517cb2f3f1866a3611c93512b302936b6fe55ffb
-EBUILD colorsvn-0.3.3.ebuild 1072 BLAKE2B 164daad80a2a77052d5c5506cd2d4a837e66e66b3525a3fcc8dcd2d06b0b21c2b4116df9f9a83b248c928c8a87e5768f19a596d5dac9b1e3eb2ced2a16364279 SHA512 c440a699f02dd8a6159da42237694ca5db2e32a9e461e76e02b044a9c8ac0e23f512c9a413d27c9057dd0994f2bdfffc8b263215c35332f32cff8a693f4ef848
+EBUILD colorsvn-0.3.3.ebuild 1065 BLAKE2B 4a65e49ddc4fe751eff46652a47fe57f7e407b8bbc134bf6a99c655af706d8c73c6592f4535c46bbbc7a411fb4ebc606aff4cca66437c6034349175738b2cd6d SHA512 d136d85fb0bbe104910d1bcc11fdee06bc10a54b3973fcb93494128121a5625f0904feec5f0666859ea52829e0e1d1e49d4559da6f28ea544f9efb2ef909a58a
 MISC metadata.xml 356 BLAKE2B e32df53e6e6ecc54fb557dd8d4b709e7260d2ec76ef534ae5786d429fde334f3f12a6dc0c79e8964bda85c388b34b709313c06e8698e7b315d39d2e236073be3 SHA512 7e7254ec3c760144a7f0415edd8aa2e31e1aafca19ad0087ddf51ac7ecc83b992edce3ae705b71ca70189aa9e3327ddee0610fb3766d79fb56f41ad90d13415e
diff --git a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
index 9ae642f733ff..18675f876ded 100644
--- a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
+++ b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 
 src_compile() {
 	# bug 335134
-	emake -j1 || die
+	emake -j1
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/cssc/Manifest b/dev-vcs/cssc/Manifest
index 830c4814a6e4..84be967a2b2f 100644
--- a/dev-vcs/cssc/Manifest
+++ b/dev-vcs/cssc/Manifest
@@ -5,6 +5,6 @@ AUX cssc-1.4.0-test-large.patch 455 BLAKE2B 98891f0f6ce149a7ca7d8ee8aa373bc28e05
 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 1007 BLAKE2B fb9de33fff08aeffb2b1579a54fa0b313cfa058a20872dffbed7dfcfc62ea533e1a56cad6d37cc0f814f88b99a3181f7f9781d447c65c0175ce8e2c71ce651c7 SHA512 2aacc1f9eeb0bc50d13e8790c1036143f1ed9187bb14ca91631daa34232c5c8664207d237d4d3359de813365ae1be5f3ddb1895318e6b93ec177b2392a1c8886
-EBUILD cssc-1.4.1.ebuild 842 BLAKE2B 2da2b65c37ae434e146ea1018dc65036857a2b6928f3a70ff4e95b9d17229f9275d5e1beb5ad98ecc911ae84d35345c7a6af3782786be1738e134d8e371b86d4 SHA512 0d8360dfeddd2c5a12acbcc43ae89aeb135d5f6c1fe5132ba5321dabb9f15b317812dcaad4acc23032898288d5321e2cb9db207223c51bd94c43d4a0c95663d1
+EBUILD cssc-1.4.0.ebuild 1031 BLAKE2B 83508c5b50db4bd923dba328a108ac29b1a7e14e73aa5eb06991c5ed8ced9390dda2ed44c7a693666003253153e052a94678409d8974432abf12f4da692af001 SHA512 9e83758ca2c372dbc65adfe69f8e9565462c89db5d7cf541d015642a0f8298676ff42f91a15d58f1f058087dbc3320aaf42e008c896975d248fb758037916464
+EBUILD cssc-1.4.1.ebuild 869 BLAKE2B d2430404b911b378706957c6bb852203f5abc362425b561546aa1802caf6e1f5c4978c8d1a98196be6b217ba606775f9d9b405fa3f0aaf17ae9e0b62a9ec92f7 SHA512 1204ab4cb70d538dcc4dd388842e14c6b45a3652371c9df8dec518cdc08549645053e9795125b468eafee179b7b9d17352cb39175145a7868212c6ae12dd6328
 MISC metadata.xml 306 BLAKE2B 220fde0f7458c161491c4a47f50c34b39a117bf8d0d2295611e9a66a628015345f71f71feef9d33567dcb9814004dbbcfc995b35c4712456e597a6d1a960d12b SHA512 cdd22fea0f9079aebfdcd542e0a5a11721c424a5b2d388c25399f22232c5536e126d1fd988e72de222da14684c2ed3a422e645fa99476470018e8cc009a41368
diff --git a/dev-vcs/cssc/cssc-1.4.0.ebuild b/dev-vcs/cssc/cssc-1.4.0.ebuild
index 2f891e4d3c0e..e1e1659be646 100644
--- a/dev-vcs/cssc/cssc-1.4.0.ebuild
+++ b/dev-vcs/cssc/cssc-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,7 @@ 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 ) )
diff --git a/dev-vcs/cssc/cssc-1.4.1.ebuild b/dev-vcs/cssc/cssc-1.4.1.ebuild
index c2b8b544df5e..39514fabd0b8 100644
--- a/dev-vcs/cssc/cssc-1.4.1.ebuild
+++ b/dev-vcs/cssc/cssc-1.4.1.ebuild
@@ -15,6 +15,7 @@ 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 ) )
 "
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 0210e253cc20..7f7856c040d0 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,5 +1,8 @@
+AUX cvs-fast-export-1.49-man-prefix.patch 201 BLAKE2B adf4cda892bd23628c032cc78390e9fc1e16128c1ed7f9520ad44771d48629d68b4438f824e0c062652b87eaf3ca8a85a80360987d2ac02b4f4c291e373262bb SHA512 e6c814b089ee352306651b26a4490dcfc7727c989f7fde02120bb6423d2862a362f57c31e7d4e359fdca382d76f66dbed57e49b7642349bc2248867d7f9fa997
 DIST cvs-fast-export-1.47.tar.gz 522489 BLAKE2B 5f83524137b38f863287feef9f95074dd40bc2189420abcf4d04cd02d686e21cc7fb26bf1e5fc3736efb04fe2e97202f1b4112483f420c7609fb208984c21095 SHA512 0da4b6d27e93c3bcf8ee0669acb0f15973f6eb3c566fd843755ac1176315220a23813d8ed72eba6f7429fa8ce5c00ed99d22fd9dd14e438473ff0a63c2d20cac
 DIST cvs-fast-export-1.48.tar.gz 524991 BLAKE2B d26cf7dfe07eacdf21f9a3627b12548acaf2d5fc3b1c871d4f91a8ddc1bdde621a6ed2eb93e57869a2cf5507e396fcc22d5ef800bb6966f4ad8488b6ebff5b4c SHA512 6a8398bed512abac1e8d5dffcb1fed14d5a0170f45a43f16dbde9fcfd068dc921cc22510a8d4d11ae9266a336da60a0dba33789aa447c013c5a800bf21055d7a
+DIST cvs-fast-export-1.49.tar.gz 446347 BLAKE2B 0b26ed771eec6320a6fc9def82e10dc82bb66f166b07d900cfbae89780bbdd783d0f7fb2d56c780d4ed788a2c07f41943f1b7f84394b5376dd10175f86384482 SHA512 24630c68af954b5f6051aca5d3af9e440189a2a062c8519892cc3a2d977f650a6ba340031f978555fbf9613cf7f9f5cea766f89d3f0ad34f188a4562a0d507f4
 EBUILD cvs-fast-export-1.47.ebuild 941 BLAKE2B 101ad9f84224bc464cef4bb25598a00ab1151dc8ac6d2988717ae3d88def8cf544dc77e921702eba018873bc439bb26b799e96d3aebc596e382d944fd6ef6f12 SHA512 f03bda83aa58c75dc14a5138faf3eff4b29e85a4fa426394b8e3f9c8ab4e5d3229b18b964e09d60f89c7ab13759a4975caf9df2953e8cd0020fd4cec13cf10c7
 EBUILD cvs-fast-export-1.48.ebuild 941 BLAKE2B 101ad9f84224bc464cef4bb25598a00ab1151dc8ac6d2988717ae3d88def8cf544dc77e921702eba018873bc439bb26b799e96d3aebc596e382d944fd6ef6f12 SHA512 f03bda83aa58c75dc14a5138faf3eff4b29e85a4fa426394b8e3f9c8ab4e5d3229b18b964e09d60f89c7ab13759a4975caf9df2953e8cd0020fd4cec13cf10c7
+EBUILD cvs-fast-export-1.49.ebuild 991 BLAKE2B 7f81a3863ed59ec5eb0c9eddae2d16c3d16bb488521b077f53ced3495ba947d08bdcb6eee3729755699d8714b26225e33c041b707f15bfa499411c863aaf05f1 SHA512 be11df352379f6765d84021936c446db6de76b48c8d4d3b8b25960fe7e8d6cb5542e4006db68f7b1c1b7c6e01c23f30d7d2685e3b9970b98980d8fd58fe9b7b9
 MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.49.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.49.ebuild
new file mode 100644
index 000000000000..da8067316880
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.49.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-text/asciidoc"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-man-prefix.patch
+)
+
+RESTRICT=test # upstream does not ship some tests in tarball
+
+src_prepare() {
+	default
+
+	tc-export CC
+	export prefix=/usr
+
+	# respect CC, CFLAGS and LDFLAGS
+	sed \
+		-e 's/cc /$(CC) $(LDFLAGS) /' \
+		-e 's/^CFLAGS += -O/#&/' \
+		-e 's/CFLAGS=/CFLAGS+=/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	# '.adoc.html' rules can't be executed in parallel
+	# as they reuse the same 'docbook-xsl.css' file name.
+	emake -j1 html
+	# Allow full parallelism for the rest
+	emake
+}
+
+src_install() {
+	default
+	dodoc README.adoc
+}
diff --git a/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.49-man-prefix.patch b/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.49-man-prefix.patch
new file mode 100644
index 000000000000..d65fb0683efd
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.49-man-prefix.patch
@@ -0,0 +1,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -27,3 +27,3 @@ srcdir=$(dir $(abspath $(firstword $(MAKEFILE_LIST))))$(parsedir)
+ VPATH=$(srcdir)
+-mandir?=$(prefix)/share/man
++mandir?=$(DESTDIR)$(prefix)/share/man
+ 
diff --git a/dev-vcs/cvs2svn/Manifest b/dev-vcs/cvs2svn/Manifest
index d947b7a407bb..c897417d6abd 100644
--- a/dev-vcs/cvs2svn/Manifest
+++ b/dev-vcs/cvs2svn/Manifest
@@ -1,5 +1,5 @@
 DIST cvs2svn-2.4.0.tar.gz 514891 BLAKE2B 0dd0d15ab28f96e56854295a789284a00ad8d172dbd849068fb05811a728f854d83b52856b6254ee0ac947425d972fb810b627aab95116040d4370bb98de6e0c SHA512 726fb8a3b3261eeb6d8097973f2741aa7a433f847bcef6701a6c0b7dc3d8fb5da1726e40f008d1dffac71791b953ddb9ade5db5809c98731d78e94da6465506a
 DIST cvs2svn-2.5.0.tar.gz 539332 BLAKE2B 54d70750c601c1d5c701f853686d958e9b8b92c4109d9294ec139d3cc8d4c9e102abed976fe9f845d0d0a1ccb65f504a08ef27f48bdf001254cf6e26087e50e2 SHA512 226972553c9d9cbae81c6e85079f4201944cf77ce68ebd6020ef2cd88bf457241739cef401c4bd3bf656b1992fbf84639b8df72d1921eee9d043fde94fba1c6a
-EBUILD cvs2svn-2.4.0-r1.ebuild 1198 BLAKE2B 084a2e07881aaf63cf31db9de21c61839d3d910ddc5cf01ad809a28f2b69310335e3332a893df3294dd5882ae58f132963fae8ed8c091025afb749e34730be50 SHA512 19dbd585956313efc291d68211473f51d684ee4d4e30cf60c28c7a6998b41ef5ec84111e76c6e4fcb09180e6f2ca32a1fe2a67bd0a0f908e07d1fb36724bd07d
-EBUILD cvs2svn-2.5.0.ebuild 1203 BLAKE2B 3add6ef5c4ee6b99eee887a06ea95bb723ea26140883a3a741abad0dab6e71b8bfc111d6aef6b59dc188ab886afb2a473aa41efb303adeffb652e6eb0f2350ba SHA512 00e1132732266fec24554822ceab04880e6606dfd3a7f9ad1692e36d161b5e1a6e063bd10c05a8fc5d0d5bb67c825ca91dcc7bb64c9a5cc31d8152d9e7c4312e
+EBUILD cvs2svn-2.4.0-r1.ebuild 1225 BLAKE2B c355f731e98fbc8b08bee4e0a20e08dc230b34ceb47f3cb70cafaa6157c1a6be8ea519ffa549657a044a60b2432bc6f67aa34613365c4c44869ad49956d510ad SHA512 50d2ac46473d593307e79ee6c8142f9072c3e48ea51a85ab5c23585a652d88c8b35008f892ffc3daa58b45537c4bf4fcc167aa74e7005cac19811970a8a179b0
+EBUILD cvs2svn-2.5.0.ebuild 1230 BLAKE2B 3f5cf3f21162a01e47d7126659ae491fe9d6b179454750321a5b9960c66c4c34e9b6e4849cfb5784e218e2658f246050d927e4d16d84c6b3e321fdffdb389eb8 SHA512 87e96e0cc7377b10aab333642941d1f23d90d2595a95e668a1d08a1afe634bbfd14bf474a471273a381482185d94f5b26bb1d8d35ca61807d1ebe1cdf712dddb
 MISC metadata.xml 282 BLAKE2B 19bc0e385352904411b33830410bfc0a9a9c2b67c37b253f7c336dd455d413d34fd89569430a4016e4bef1660b9b710e6c08fb192584915fcf911b15593cf694 SHA512 165091ed860bbc62f00932c46e6d4944fe7444ac8bdfd1014a9781b8769d1a9d234578937b63ac7b90bdd8f57b21de50f74e759a44fa2b2d1e8edd854aa17ae3
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
index 8f54c70877ef..f62aa0e9d40b 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bazaar git test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild
index 8d1c4ed57dcb..54254fc1f2ff 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bazaar git test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 8962cdc49866..e579c33cf6fa 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -3,6 +3,6 @@ AUX cvsps-2.2_beta1-solaris.patch 3648 BLAKE2B 0e4471b476485f0202c458cb5505636d0
 AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a8253024f7c5b14db3d3be7d169b2e1bd487652dea56dc5bc9a963689660b7b4a059786e46dec3e6b4f48897ca SHA512 0ddc7115a0a66f418f81468230c92b17f3b7c6a38a82505de79c27764ee46ee5805ebf1d0a12360df77718cccf9bf2ac61f45b21c1cfecb7700e648ea1187e9e
 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.ebuild 910 BLAKE2B dca2828b68f41be52836ab274808e60824fd33c52e3b3c4afab522206d02948855109bee646345500b370f7a786ebc1897a41c5e1c2ee06fac31c7e7d87ea203 SHA512 6905b434c4ada51daa52fb0208edd129a17e2170cfb5761548bdd815eeee9476e5eca5a5c10fac86f105ac5c36bb0c218496bd8da3ec0d89f5d557d5cb57633b
+EBUILD cvsps-2.2_beta1.ebuild 906 BLAKE2B fb872d47b3d89907a09c433bf769020685f87265b5c0a8f6707cbde29e934c8783f54de7d099848e296222bbb39b18d119e4b27ea1793d99f8884383ea39ee7c SHA512 5c64644d0baa832b737415b6d045048982711d2da539f9d8c033fac535cc0dea670faca774427bb2584909bc26275bd5a4dffab6449de4077cfd7410dbe033d9
 EBUILD cvsps-3.13-r2.ebuild 1016 BLAKE2B 4b8ad09f420f2cdd8c5deaca57114dfa7ecfb0870d8569f3e071638544a48496d7167e6564c7271de4bdbb0b0f835b4dbb223b2991178f2e06db4d2ff60c496c SHA512 f1163dc80ae8e46c7da93b1f507a4fa22ca2ec6f448a4b8f8fdb0cf89255b1cedd352e08b30ce5a4502fe6013449e8e01d2eca998350b23568c96d2a325e7ffe
 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
index f3faa6accfc2..d5f68f1b445b 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs
 
 MY_P="${P/_beta/b}"
 DESCRIPTION="Generates patchset information from a CVS repository"
-HOMEPAGE="http://www.cobite.com/cvsps/"
+HOMEPAGE="http://www.catb.org/~esr/cvsps/"
 SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 src_install() {
-	dobin cvsps || die
+	dobin cvsps
 	doman cvsps.1
 	dodoc README CHANGELOG
 }
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 82ca7efe5f71..13e5ededa53e 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -10,10 +10,10 @@ DIST darcs-2.12.0.tar.gz 1465730 BLAKE2B a021796aefc38aaf355a3156f26c8f313ffbe44
 DIST darcs-2.12.4.tar.gz 1462383 BLAKE2B 49827a07770da8253775649e9a72b33d4e715f7eae63c093c6d3a16f097cd9f3246e2aec4ee4782efd1629423a3d3a23d6d5350131ed4daa4fc47701fd6449ae SHA512 52a0b9b8a23b05dc29513c20c3c0fdc0b696da87156ea83a5736ea294618b993d1f3914f82a918e331db5de0746c147244f46d396ee7dbb02fee116825e1dd6a
 DIST darcs-2.12.5.tar.gz 1460698 BLAKE2B 9050b5863221d2c82e93d689b733b34a0b63fd0e7f29b0041ba3ff10e4359e4d32e1c8bca5ac4722a65fbebab66b25cba443efe23ee3e4a87d4117a7335db4de SHA512 9bda8149269dc23750321f3929e156e32c76de4f5bb8291bc248d0e326bf08b69c82ef7383f9d02dcc65ca199078f6e1ab575197fc2aee225486a8c1b9275542
 DIST darcs-2.8.4.tar.gz 1301464 BLAKE2B 748494ae1c34318c14e128a4d08667b839644dbcf2b2d8bbcc86263ee5332f859f91bc2a56f3c6ccf6a465f45a90d97d304c9c15ebdd3cdd709c251c61c15a6c SHA512 c60531bacea43bdd5a18ae461dd390fe64682cac56fa4e6b5153a5da3c003b59d8fb24827bd42b4b30f0d2c61877d36b58eb98317644f9f8a200ab7c5961c48e
-EBUILD darcs-2.10.1.ebuild 4710 BLAKE2B b348ad6617599555dab9098e70cecca55b80b2b5947fc2261624dbe06c8dbfdf580376ed5f194c05423b28ba7137613c15b0d415539c91c65f5a29d9ccb180cc SHA512 ef636f54dc3b5bb12b9eb5fe4a7cd0539e4e653ad62bdb4fba72575d1ec8b11ddfbfe57388951c0b1c9abd25caa0d895ca60a38019ffc576f18aff62c1d3e7e3
-EBUILD darcs-2.10.3-r1.ebuild 4800 BLAKE2B 321a292d50aa4d9ce2e64ba960a38035e9f9c6abc5730eb3ed27c9bf4d438f0fd5200f66b190cb74718504d3f93fa94442966531fab7a639c3bb16cc404b93c2 SHA512 ab6f1fd76adfb984e51ce05eb0ad37b9c26db59c3acea31fe6dc3c3c0d8eec561b91667856feec881e0a33c25563423d0ae96a73b3d05e30eeb34ddb8dd90a38
-EBUILD darcs-2.12.0.ebuild 4840 BLAKE2B 1921f86987c8ef949437bbcdd0f8682cb5dfe617cc0286268bced5dc9e80c7143d9ba936bb725dfb85635ee2373dc883cf903d228501e7ee42f2c6e3946ff8a5 SHA512 d29eb0436998ba953810fdccfbc306406d8b6c452093cf8a54ed2c0e2eb7d53877ad35b12b4c5b72a5043473c9f5a4b47b342df55a8dc3d8dd883f009bf5695a
+EBUILD darcs-2.10.1.ebuild 4661 BLAKE2B 6baeaff0f00e514365f325bb67d264c1eb2a793a324aa867a11bd3713a952f2e4cca38ee872ba4a588e5babe6b4f92b199fefd3fb8eda70b572f9009b48c3a20 SHA512 947f58a975cfada502261baf79ff494dc096ecc2a835ee987778216221ce690c1a0fb10f1f67aa902e47b18fe7476988a0e623348f2756e55eb468d31db93328
+EBUILD darcs-2.10.3-r1.ebuild 4751 BLAKE2B a5e2fad1a29d43c82f7e3f6f38630c3201ca374ff38436005a4c1d6338a7b05aa275f365d8acd3b77608802542fb7e2c0797f3f692e949e3995f3694c31f580e SHA512 b8ec1cba9be4ce72c654d874358d6373530e1cd4cbdab69af8c16e1f552c6d749d59fce393fc736afe11c4480a11d6ae04c439aea8bd513575ada01d1515698d
+EBUILD darcs-2.12.0.ebuild 4791 BLAKE2B b9e6085aacdfe01ad75de297bc07d92eaa44020582c32ab0205e6e611c3cc397e3d44ae54971be00f0912d704df6937e419205f75256724927a1925e679faaf6 SHA512 7acd3d2ec037f65df5b7e5b9e466c7c181c411b461ad9cef45ce1a32e9f8174420a7d42ac356a305e554b3ad6cef54a1a7f694349ca09c88e9e0649f5073b3d2
 EBUILD darcs-2.12.4.ebuild 4477 BLAKE2B b803195ef7164c026944e943954ed3fc2f712c98a49f2aad9d01dcc4a7a2a6151d03c41b5bd1771f8017dda7b3c753a4db85450de97b6be3a5de0608045a3014 SHA512 173e6683a317a5a79f0f20f656bc7eb9be0a870871e8d6979a2db2687ad7eff35b0bcd1eff4e74d7eb55c31f2924887ffe6a6e6460f0aa24ce66fb0e427298ad
 EBUILD darcs-2.12.5.ebuild 4555 BLAKE2B aa01eda188a3e57a9dfff277d74549531ef0f98f970df24da3af24c4f6ab44c5939eedea7bbc54412ed685904c60d43f7784d2a792a0a523060cba5bef37cf1a SHA512 16e7e10dd0e3806b2dafa09791822f31fe6e34e2aacfd57c9854a8a2ec2797e226c01e4cfea4cb720c19ac83336ccea970823c58716a0469637af156b012f87f
-EBUILD darcs-2.8.4-r6.ebuild 4709 BLAKE2B 1e2def808b9723779da7d55cbab71d399b9091e35e140b28491b03e51662768125a56b27f1541526a103322110fd0e81441b21e7702872561973b9f837468edf SHA512 3fdec68fb05334b3251c9e5a6d33bb8c2ff2860338c031823d881eec92a13ce07994a50e91e33db3811eebbc2d8f0f63e5d312802fcbe704018b8b0a6271874e
+EBUILD darcs-2.8.4-r6.ebuild 4687 BLAKE2B ac4991b7a79083f8a6407d1412898c247cbe7264601e3e93038a2df2cafe2228c82867175bf16efcbfd364ff01d2d753cea0c8904f38f995aca9c37e56d109a6 SHA512 07e976ab4039e33dbfe679b4baebbefeb24a31215131aff8dbd40849d52b2b8c7af2ef623646a81a312da2030ac7b320b30e2c9c23f5a9cc8900a7f9ec130a81
 MISC metadata.xml 593 BLAKE2B c4ab655306f001cc3fe3007152e25d32d97fd3a87db76051c6c75b1d53c2c6ebd2105b2674bea5872e678b577c3cca737a3bbf6fe89923bc4f780ea2dc8642fc SHA512 cab7d36edce3f7da1742ebf086f69468f2745cb58fae83e74fa3e6016f4a7285aaa57100fed17df47940a51029ea78892147b7fe86ef2e456b7e34cc34a421bd
diff --git a/dev-vcs/darcs/darcs-2.10.1.ebuild b/dev-vcs/darcs/darcs-2.10.1.ebuild
index da23ab5a4f93..40404e1b806d 100644
--- a/dev-vcs/darcs/darcs-2.10.1.ebuild
+++ b/dev-vcs/darcs/darcs-2.10.1.ebuild
@@ -94,5 +94,5 @@ src_install() {
 
 	# fixup perms in such an an awkward way
 	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+	doman "${S}/darcs.1"
 }
diff --git a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
index 4bbed55412c0..ecf1eda0544d 100644
--- a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
+++ b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
@@ -99,5 +99,5 @@ src_install() {
 
 	# fixup perms in such an an awkward way
 	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+	doman "${S}/darcs.1"
 }
diff --git a/dev-vcs/darcs/darcs-2.12.0.ebuild b/dev-vcs/darcs/darcs-2.12.0.ebuild
index 0d2bac89c4e3..160bcf620c14 100644
--- a/dev-vcs/darcs/darcs-2.12.0.ebuild
+++ b/dev-vcs/darcs/darcs-2.12.0.ebuild
@@ -93,5 +93,5 @@ src_install() {
 
 	# fixup perms in such an an awkward way
 	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+	doman "${S}/darcs.1"
 }
diff --git a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
index 24dfff4302fd..41b7649deacc 100644
--- a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="=dev-haskell/extensible-exceptions-0.1*:=[profile?]
 		>=dev-haskell/hashed-storage-0.5.6:=[profile?]
@@ -120,7 +121,7 @@ src_install() {
 
 	# fixup perms in such an an awkward way
 	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+	doman "${S}/darcs.1"
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index aedb4bf1ac2c..c40a7e50aacd 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -3,6 +3,6 @@ AUX git-cola-2.10-disable-live-tests.patch 827 BLAKE2B f7778c373b4e7b2c09daeeeab
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
 DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee
-EBUILD git-cola-2.11.ebuild 2441 BLAKE2B 1c3d96219105754188faf8734a9e781727c03402b29e601b8353a882d3ddba89b2e0f7e9ded2ee4825dc0a0b9bfc4c1dbdd9fe95725b3527d34c0a2a9e40323a SHA512 99be02673adf1c44fec91fedfb61ac54eabf62424e83681a52d1f7480335b026e63e3dae86608c3d4058485375a10f4167f4b1106f0327d0889da353a4ca2336
-EBUILD git-cola-3.2.ebuild 2326 BLAKE2B c765e3f1c4d9dc07bb2e10c6c001330718bf24b23542fa2acb5c75918d776a8a69deaa5749410b2409b9edbe299c5fa29ad3130f21a36546bd1efc9add5c8e0c SHA512 00c63f9819b0f76804f38268e907e9679139f347a4a7b536812747245ae4427c2537320e4fed6e94a9023a9dd09069612c2be60f80219ce114b16aa20a96045e
-MISC metadata.xml 342 BLAKE2B 3c25a34b0009e31ea7a125733b8105d40be8d818106b7051d6b4180a8f4c39e16ce46eada9acef2cb5424d3fdc36965bdddb3f048c07b6920593a57d6ffff001 SHA512 9ef75fe8465b602db4d9645535f9ce228af6afffac7309c5f3e7dbe266fe5c89a08e96bc53c2fb4a364a8c3ec6c3d87579eb076d6ba005499f0f4f07316caecb
+EBUILD git-cola-2.11.ebuild 2468 BLAKE2B 86d12e6535367a08fb5c99aa18279f9cf75ed520427a34b429cb9783d2d5bac9844aeada90c90de7a01a91d65a46e532b074b130b71e59f8fda54e6a8d3cf521 SHA512 44945c9580d6612da8e60405f08756b27225b23647bd16473c44af42850139a1b5362c039080ac6f7b86054847761535b7adf3f1e60e866115ce1c3fc8972a9b
+EBUILD git-cola-3.2.ebuild 2353 BLAKE2B f654356300d1706c0da682ed947f08e5da12529c339a16d6c6112ab9cc7a4478a562d26f51c466b8525fae09f46f414c3a149298b11227b37340df916b598017 SHA512 872381eab125bc296d3732e5f99ad5515eb61cbf39543e2bf5c430dc949f55e3bf0d7c11b30465af0a09b9f93a75d97ce0a6612e5c65c886a2c5f1f87f8d891c
+MISC metadata.xml 254 BLAKE2B 0ae656bc7a829c95367497cfe1198346a0586bc944809725fc83ff0b92d33ddadb0a82407300d1467cb4ea75073d2ab0a89b8d67d8efcff400a444b06330c77c SHA512 8a5fe25f733f77a4e70a64521dfffbeeb8539dc709f55dd9a941cc920f7a7e6a8918cb5f07d7b57ee5ad63abdaf31067a217afd081164e68562239b584416109
diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild
index aa749f760c10..098941ec4099 100644
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 # Since PyQt5 is preferred at runtime if installed, depend on that
 RDEPEND="
diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
index 02897b8b6a98..42482ec26a6e 100644
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/QtPy[gui,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index a9e87ceda54e..3ae0e4fb1473 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">git-cola/git-cola</remote-id>
   </upstream>
diff --git a/dev-vcs/git-deploy/Manifest b/dev-vcs/git-deploy/Manifest
index 06c0edf6fed3..0981a9e2a907 100644
--- a/dev-vcs/git-deploy/Manifest
+++ b/dev-vcs/git-deploy/Manifest
@@ -1,3 +1,3 @@
 DIST git-deploy-6.0.1_p20131024.tar.gz 55394 BLAKE2B 7d2f7578948033e182e271c44752be27bcddc4b2480a795d110675feea9408ac7b786b135f058f224f5edcbb184bcd022b19bb3d7614a366ec29b2ea4d5f6d2b SHA512 cf3504b8f40d86cd8322ed93f2fe43593bcbf2db37685d3337b89501f39b38298dfb6d6cd51dd3f518f6048b680446a1660b85887ef73647829608e77b497634
-EBUILD git-deploy-6.0.1_p20131024-r1.ebuild 1424 BLAKE2B 6271ae1774de999ee4a5e7800b8cb7bbff52c678eb755c290533ec9b5530a73a217fbe282c4e93d5582f516f59d69a2cf513ba0f4bcdd2be253e3cd08e185609 SHA512 b9a085b4d2378396e5c19b653ee45fa00987b8a298cdae21f804137e9e23528466726097e879c08d85a58ba6ad5d5be8bfe934d01906909854fc47c97e723185
+EBUILD git-deploy-6.0.1_p20131024-r1.ebuild 1451 BLAKE2B 2d9db22596ad7423dffc94c63c65f229da9d1ef15afc19e3397a098ef49aced14fd1a412d950ebe0c5b888273eba2fc90bc665ac64007ce5d45345ac52f3d192 SHA512 0f65a7dd21b1892f751a1c6c4bac233d6870af55efe480ae79ec11cfc4994ccb54008d245a258c1ca8a4d2f98b1c84a9bc680e32d37ee0d264bc33871cd67726
 MISC metadata.xml 253 BLAKE2B 418a1c1e806a98951e739e1e18cc2a0417643c0629c49cec5e7e51f8de4bebf072c046bf749e757d5723dd41064544f18514c12dfd3b9c9c47c6c74167fafbf5 SHA512 21be5cc9f7b4fc3af74661ab49aa067574a2028f25c5175aa4d137ab77d00c51fa705c44a94e13b784d91ecf9d4e43a4a4ccf0abf63aed814e9382448519ae82
diff --git a/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024-r1.ebuild b/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024-r1.ebuild
index 3e27f1ef8e6d..f7e78a6147c7 100644
--- a/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024-r1.ebuild
+++ b/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="dev-vcs/git
 	virtual/perl-File-Spec
diff --git a/dev-vcs/git-mantle/Manifest b/dev-vcs/git-mantle/Manifest
index 2e5a69b82e87..a99b5751bed2 100644
--- a/dev-vcs/git-mantle/Manifest
+++ b/dev-vcs/git-mantle/Manifest
@@ -1,3 +1,3 @@
 DIST git-mantle-0.6.tar.gz 9896 BLAKE2B 80a824462fe412e60479037361adcb01162854549d2c9d0ce4358efe1d64472b157b1ee33c7cf0713e13d5cc476b665342a363c3d81a57e2c7a6ef757b6b3b63 SHA512 2498ed29884a8ac48bfb413c39e5bc9f232d47736ea4c0045404bd5f7268c7009a770c5c58c5449f843d8962bea9f288248a61308c4a71eed1b39d0c4b3375c0
-EBUILD git-mantle-0.6.ebuild 517 BLAKE2B cd828d8b9e8045e7fdc7e29a81bf3f679c2c68a6cf8df28b0702a1e34c3933fb83176cd0050df48e1685bfbbe796a930b090c7387e0bd5be7f9d87beedabdce9 SHA512 2461897b75039921807dbd73dc31a8dc8a809eedf6d790cca63538af417c05af5c921ffbe20940bf7938c76db43c72f3a72a7b1e4fd4ea24e09487ae3063f1ee
+EBUILD git-mantle-0.6.ebuild 541 BLAKE2B 2318c540d9e7a51de4b4bf5ef27d9978e5947664aa34fcb9044d5ac40200c04bf285a3b4038f28f6fbe7956895744d4794fd70f1e631a23d6688fec85da84ca4 SHA512 0e594fbba3a54a2166d0e1dad4952bfd17f4daad4ee7a80b0538f1a879892f6f67c615c68e752f33539cabdc87b3d032b90cec58aa3be946c4976993833edc9d
 MISC metadata.xml 256 BLAKE2B 29c663bfff3bbc9b1ec98dcc73e3fa575cb7cc76c0633977d8dc3ad97681f8f4afc4bed81983525b335efb0405650c100c03c915b6c142f96a4de9260befb1ca SHA512 f25e9e790d073802e25aa68870a7c32ce891b43e3aed9098ed3e2cc5fad385655e2c407962c18b293394d7d5e506fe7094be8bb11d636431c5e58d56ed1898e6
diff --git a/dev-vcs/git-mantle/git-mantle-0.6.ebuild b/dev-vcs/git-mantle/git-mantle-0.6.ebuild
index 08268e572163..e65f66b598e6 100644
--- a/dev-vcs/git-mantle/git-mantle-0.6.ebuild
+++ b/dev-vcs/git-mantle/git-mantle-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,6 +11,7 @@ SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-vcs/git-pimp/Manifest b/dev-vcs/git-pimp/Manifest
index bad3dc200e10..45cb40a870f6 100644
--- a/dev-vcs/git-pimp/Manifest
+++ b/dev-vcs/git-pimp/Manifest
@@ -1,3 +1,3 @@
 DIST git-pimp-0.8.tar.gz 10555 BLAKE2B d6fa64b4cff6734661b22fe8b69d552dc405c702e36abd3b7fb309ad489602facd099828b021bc813dca88b8e29c258b5be56abceebcb9d5f85c035af6d93c86 SHA512 124b61001c088685d5d9d6f848d37ca170413fda08074a273a4c1bccd233fe606028d8de82c66ae7847f42008b82a6030fa47a493ddc47b65d02b69a1acbd7df
-EBUILD git-pimp-0.8.ebuild 563 BLAKE2B 80e3856f5c22c690186ff17fa1224650f857a9c535df4733b69e9a8a7278e23ca5099dcd5d56ff27aab3f2410b67c8b4a7637ce243b87fc4c311437449c4ae26 SHA512 c39d8305aaf04dbf85059a824574a69bc8b22400cf7951d0bb03ac34568430d06a10a5123c4f58aae7d5cd2dd25e7b27093361eeb19eb6f1e7d2e062baf4c7bb
+EBUILD git-pimp-0.8.ebuild 587 BLAKE2B a610a42288f8920f8ebc458d7da61ae8d48277c8fe5325bc6c148450056f19581b26ea5402f4d306efc9660988f56c4f1656a82024290c1c880c25b882cda131 SHA512 897cd552ecf6538a04e14138b18a5ab25fc651103cfde69b6bea368d5165080dccbbebae825b73f0ad297267618de1bd19af3388cf9597f414af7e5d9e1ea27a
 MISC metadata.xml 255 BLAKE2B f8c0e4254a2e06ac72445e5f911320f562b42f04def6bfcda25a04a5041332523032da6ea62d298b95142b92f67c3b4089916bff4e7276403d17485ed0b58c19 SHA512 d3ab8986894d0c5b99042ede02c5ac9101f976400a70a30b1735734825f856b34eb1060c6e23b16029db478a871e12b46550d0b4f4de6aa55e1fe8e096078a2f
diff --git a/dev-vcs/git-pimp/git-pimp-0.8.ebuild b/dev-vcs/git-pimp/git-pimp-0.8.ebuild
index 900a55ad38e0..9e46d70afc0b 100644
--- a/dev-vcs/git-pimp/git-pimp-0.8.ebuild
+++ b/dev-vcs/git-pimp/git-pimp-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f243eca68762..c9eab2c0fc82 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -13,19 +13,31 @@ AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fe
 AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
 DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973
+DIST git-2.21.1.tar.xz 5496840 BLAKE2B 8b61c5ca8940422238e48931b502f2a876e20181e66232fbd8a7311969c27c862524b384792d4a35a61c33ba3297c90e6df5febf3a820281eaab00233f48b02c SHA512 c4f1930effe4b7cddbdc3a5ea0f1503683089d5dfdae491dd7f752f35b655b31fbef569a993ef412962cf9c74a225eafe095f792d493f37b20789e5c643261a1
 DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
+DIST git-2.23.1.tar.xz 5713672 BLAKE2B 50db7bafbadcefbc5a56db478ea0464d289c45190a0454e0b8f3d99d48e6251071482df0240ee1ee8a1f733c91e9e46d34794bca8ca70d3c4ecc3b5da6d5d529 SHA512 708f8b9a7c65c1c9d3117b1b7ee9383044b66fe8a5c168a52ba561985670f659d514aa34988ea8ba85c127da6a23c39c511919a6d661bffc9cf782e30fd62373
 DIST git-2.24.0.tar.xz 5766056 BLAKE2B 85c7cdcae01a71cc6e5d3d5985f4c54439879273ba981b73b732d6db10e348c812d7817001242976b67f78537f7fdf9c9298173b7393ad7ab5237cd9e3d9b5a2 SHA512 31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3
+DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7
 DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4
+DIST git-htmldocs-2.21.1.tar.xz 1236408 BLAKE2B 173892327d27d918cc0a15e982145d5f0f638deeda56be1cbf16c953b7b3454555ecf3e708c6117b1d4e781ca332199457d9c5b619c91735e0c6e85449be528f SHA512 41819a75656afab0fd56407e7141c8176b708099546cdc7cdc5e765a35401e1148a7165c41bc12a68e124335532450748b27cc3f8c0e372d596f27a992e23e95
 DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc
+DIST git-htmldocs-2.23.1.tar.xz 1296144 BLAKE2B 5be4a8afdd79234d220c119b8a4239e640486dc52236d980d08e6b3cad1be61b683c0e3dff6bdd67035a1e23f1d07858d3344f9f2ae90b44188395f34c22fea4 SHA512 c005be3baf129c9320893270d1d3b69e01546a29d482d29e5bc7baefbaab33e45d877c5c09e47312bbdb8b3dfcff27735c2427dcae9eb21fd3500ec30e214ae1
 DIST git-htmldocs-2.24.0.tar.xz 1306680 BLAKE2B fe3c9f2f56e8e6073be449d19336873ee06d1101eff12d2c5690bbe38510e7f60c3805fca3a46ce85be79d78161aea669b0ee595599aea816f42093f7c6f1a49 SHA512 61b8fbbc55cd66561b76866933de4478a526dd9428e419b8a8c046c323b26c780421e771b1ed7aa890962c3b90f9f3832b4a880fe1f67b1edb764f6d58db00ad
+DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a
 DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30
+DIST git-manpages-2.21.1.tar.xz 440316 BLAKE2B 658232d29bbca3b55a6797d5008f2f6f82d0c04d22ae5af8c689d8cb00e35bfbbccf658d269b96dd868cf3e1cf8f3304eb97cfee428ff8c762f914d1cde4e4f4 SHA512 1a687e4cb2dc90854067b164d6142b88205ba40dbc283432296afafde4370afc900096c5aedc9a7a959b8aa910196d42c399c5c4eed7e2f1ce0f98d8005f3581
 DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
+DIST git-manpages-2.23.1.tar.xz 448432 BLAKE2B 0de4b2c0dcc3a70188a66d8aa6e16aeaad84a9f16b764934b06f61773db2d5141cc0b1091780d126f29a1f50c767a54fbb7d01a36f86d387d8ccb4060f48156e SHA512 16145c0c2215ce6a3aa9045f35f670258f6823a765ed2feec680ed980420d1bb008fc39d8f379c81cd0b259fc582d15e42395d4f954171b20bcf214ab25e41d7
 DIST git-manpages-2.24.0.tar.xz 453600 BLAKE2B 9ccbbe8e18689cac078ade0f55a1ca45a7c566ee5591df3442e3499fa1e4231f91e68922a54527fd2ce6102ac0148f9a360586a7c47922b39b383895f6742ba8 SHA512 18fff078b0ddf79aca216d9e2667e7a0b474eb8876739efd3928be2347bbb8db486e0367353b4e3d48f9d0e9c1dbd6f784e55ba535a009c1f3150405abdd02d2
-EBUILD git-2.21.0.ebuild 19086 BLAKE2B e811b477104e21925db97ba057900fabc6d077717e5c386fcdbc4fffc26328545d6abd779846a51a34871859042d6c7301c482fbc5bb488843e34bc46456e657 SHA512 a39951a450928f99f2e9799f3aa0ea3ada60c2ff6b666cb1a37db9e85d99728f4a0d91db4d373409bbb72ebf0670efe2c76613daf4cbfb2054a403875ebd8561
-EBUILD git-2.23.0-r1.ebuild 19563 BLAKE2B 8ae12fc2e91144236327ca049528d0adc3c0cd839a0e70496a5f21479dbb173d6b302a3bc745dae5705913fa5dbfe44426d2d6342c0ae93dfa0d55edaa155b92 SHA512 25cd1869df0fd30887aaeeca39415dd9f5f0f2845dabf7ab5844e4d404f2284c068dedd79c9ab602708d484516ba4b222feb273759306af51d97b438b3b9552f
-EBUILD git-2.24.0.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419
-EBUILD git-9999-r1.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419
-EBUILD git-9999-r2.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419
-EBUILD git-9999-r3.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419
-EBUILD git-9999.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419
+DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90
+EBUILD git-2.21.0.ebuild 19079 BLAKE2B 8afc209ee8693718c0cec02d128e1248731cc5fcc721655091642e04904ce687aed9e53cc2ec68bb4ad8b92aa383d522d53212591a39840c41ec2fdeb4e28204 SHA512 f20fa7adb874a8a21a60ba77fb9f6316f1bfb99fe11c562d98f899946fd71c57f9f3bd5fbd111dd24fd40b47cf6e47d17ed7ff926b70090609d58af31ed8603c
+EBUILD git-2.21.1.ebuild 19085 BLAKE2B 69b5371673fc4b1fb3a29f7ca61fe2fe4e2a155783583cc4ffaf9c14ed63f80440774e73791d7350daec7716e828d421a0119b48677a3febf0aecaaec6255655 SHA512 9373e6752821a72578381672a6f1d2c3831370d1d9065c31855ff0b39c566e94df43974a8346bacd6deff2c38c7c31b799491564adf797be195692c5a8e7020b
+EBUILD git-2.23.0-r1.ebuild 19556 BLAKE2B e4a377c51c79397bfc1bf4a5b8d68b21b51dcda4ba8a288682c8926057aeb2538981fee29b51f0900bc5b2fff559ecb9a3e09e5307f0d54b143285e556a204ff SHA512 7b2e06d0a7edd3fa94cadc03e872a1eaa09380280826f8f65b370e1b2a7bf85c6ba0277cb209df3595f952586aaf744975a374168ab934394d964be49a265dc5
+EBUILD git-2.23.1-r1.ebuild 19562 BLAKE2B c0c609e0a3d96d814da520c7041ba0c17b5b023f53424a68892b65a7112b35d8617ed03ae5b37565096df679e1a7a561edbb8e795dd0ddcbe6b7da47ffa6b1f5 SHA512 937eeb67e704f74b7cb9eca11d81c3ab5abee90936f8647ff9f911f797c05d91fd9df0c0daa3159e646043cfbd311a7f8ba15e75034266a0d8f782d78b66e0fe
+EBUILD git-2.24.0.ebuild 19522 BLAKE2B b212d260526b955e9630fc99783f53b114a15c3c78959d722b078149fda51ac4d669078832ae27a033de41a2bcb521c7d8cda8c268d54500b5e59fe07fc2bec1 SHA512 6e3a94a6af6d056d633b776cc45aba342bbb451058ba6ebc55aad4c11783d3291f5fc151048d059f196438c921d71c42169fe71342eade0168c450f1a8a235b5
+EBUILD git-2.24.1.ebuild 19516 BLAKE2B ea223c88153921a96af5614abb954d785054d2e0ca8176b62ad88230a2a56c94a434e5d79c4d4e36b7c7fc5e8c19078a9159e337a4e6a1494002900c0b44e1fb SHA512 8f1447affbf3cbf1293364c2c7c83208da2686af6bc97a3c90446f5effae3f2233dc94617985258378b109a8cc62e03bc58bfa3c019c77068f722ff862c1de8a
+EBUILD git-9999-r1.ebuild 19522 BLAKE2B b212d260526b955e9630fc99783f53b114a15c3c78959d722b078149fda51ac4d669078832ae27a033de41a2bcb521c7d8cda8c268d54500b5e59fe07fc2bec1 SHA512 6e3a94a6af6d056d633b776cc45aba342bbb451058ba6ebc55aad4c11783d3291f5fc151048d059f196438c921d71c42169fe71342eade0168c450f1a8a235b5
+EBUILD git-9999-r2.ebuild 19522 BLAKE2B b212d260526b955e9630fc99783f53b114a15c3c78959d722b078149fda51ac4d669078832ae27a033de41a2bcb521c7d8cda8c268d54500b5e59fe07fc2bec1 SHA512 6e3a94a6af6d056d633b776cc45aba342bbb451058ba6ebc55aad4c11783d3291f5fc151048d059f196438c921d71c42169fe71342eade0168c450f1a8a235b5
+EBUILD git-9999-r3.ebuild 19522 BLAKE2B b212d260526b955e9630fc99783f53b114a15c3c78959d722b078149fda51ac4d669078832ae27a033de41a2bcb521c7d8cda8c268d54500b5e59fe07fc2bec1 SHA512 6e3a94a6af6d056d633b776cc45aba342bbb451058ba6ebc55aad4c11783d3291f5fc151048d059f196438c921d71c42169fe71342eade0168c450f1a8a235b5
+EBUILD git-9999.ebuild 19522 BLAKE2B b212d260526b955e9630fc99783f53b114a15c3c78959d722b078149fda51ac4d669078832ae27a033de41a2bcb521c7d8cda8c268d54500b5e59fe07fc2bec1 SHA512 6e3a94a6af6d056d633b776cc45aba342bbb451058ba6ebc55aad4c11783d3291f5fc151048d059f196438c921d71c42169fe71342eade0168c450f1a8a235b5
 MISC metadata.xml 2197 BLAKE2B b48502c8c414bcbceb6a917291e79d8b33c3f5d4c0e3e25e5a8c77720bd96b6bee120b177034c76d5ee00692951e71c721df3b8b8219dea13644e3af318fbd3f SHA512 6b39bc6d79605bd0a5ffe03599e6fad7da4e3cf2a8f0896be4c47b9a12be8eccc97849d022b3863626c2606274b6b718e00ce6646394302cc3f2468863a3d274
diff --git a/dev-vcs/git/git-2.21.0.ebuild b/dev-vcs/git/git-2.21.0.ebuild
index 6e6639362845..8aec6723aade 100644
--- a/dev-vcs/git/git-2.21.0.ebuild
+++ b/dev-vcs/git/git-2.21.0.ebuild
@@ -50,7 +50,7 @@ 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 +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -535,7 +535,7 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+		dosym ../gitweb /usr/share/${PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/dev-vcs/git/git-2.21.1.ebuild b/dev-vcs/git/git-2.21.1.ebuild
new file mode 100644
index 000000000000..b13c8ab27837
--- /dev/null
+++ b/dev-vcs/git/git-2.21.1.ebuild
@@ -0,0 +1,715 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="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
+
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+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 ~s390 ~sh 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 +perl +python +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	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? ( virtual/emacs )
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		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
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.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 python ; 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 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 python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREAD=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=
+	)
+
+	# For svn-fe
+	extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
+
+	# 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
+		)
+		grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \
+			myopts+=( HAVE_GETDELIM=1 )
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=( ASCIIDOC8=YesPlease )
+
+	# 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 contrib/svn-fe/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 python && 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* ]]; 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 subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=()
+		use nls && use !elibc_glibc && nlsiconv+=( -lintl )
+		use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
+			|| die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} \
+				|| die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		popd &>/dev/null || die
+	fi
+
+	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
+	use doc && git_emake doc
+	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* ]]; 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 git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-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
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		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/git/git-2.23.0-r1.ebuild b/dev-vcs/git/git-2.23.0-r1.ebuild
index 0de7012dc24e..58f3caea37c0 100644
--- a/dev-vcs/git/git-2.23.0-r1.ebuild
+++ b/dev-vcs/git/git-2.23.0-r1.ebuild
@@ -51,7 +51,7 @@ 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 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -545,7 +545,7 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+		dosym ../gitweb /usr/share/${PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/dev-vcs/git/git-2.23.1-r1.ebuild b/dev-vcs/git/git-2.23.1-r1.ebuild
new file mode 100644
index 000000000000..17f6fa2fc78b
--- /dev/null
+++ b/dev-vcs/git/git-2.23.1-r1.ebuild
@@ -0,0 +1,725 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+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 sh 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 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	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? ( virtual/emacs )
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		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
+DEPEND="${CDEPEND}
+	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
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+"
+
+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
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+
+	"${FILESDIR}"/git-2.23.0-avoid_empty_remote_line.patch #698384
+)
+
+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 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_PTHREAD=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=
+	)
+
+	# For svn-fe
+	extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
+
+	# 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
+		)
+		grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \
+			myopts+=( HAVE_GETDELIM=1 )
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=( ASCIIDOC8=YesPlease )
+
+	# 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 contrib/svn-fe/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* ]]; 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 subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=()
+		use nls && use !elibc_glibc && nlsiconv+=( -lintl )
+		use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
+			|| die "emake svn-fe failed"
+		if use doc ; then
+			# svn-fe.1 requires the full USE=doc dependency stack
+			git_emake svn-fe.1 \
+				|| die "emake svn-fe.1 failed"
+			git_emake svn-fe.html \
+				|| die "svn-fe.html failed"
+		fi
+		popd &>/dev/null || die
+	fi
+
+	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* ]]; 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
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			# Do not move svn-fe.1 outside USE=doc!
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		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/git/git-2.24.0.ebuild b/dev-vcs/git/git-2.24.0.ebuild
index 4bee6fa6ca97..c29b92ceda8a 100644
--- a/dev-vcs/git/git-2.24.0.ebuild
+++ b/dev-vcs/git/git-2.24.0.ebuild
@@ -51,7 +51,7 @@ 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 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
diff --git a/dev-vcs/git/git-2.24.1.ebuild b/dev-vcs/git/git-2.24.1.ebuild
new file mode 100644
index 000000000000..dd61b7e07511
--- /dev/null
+++ b/dev-vcs/git/git-2.24.1.ebuild
@@ -0,0 +1,728 @@
+# Copyright 1999-2019 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=( python{2_7,3_{5,6,7}} )
+
+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 ~sh 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 tk +threads +webdav xinetd cvs subversion 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? ( virtual/emacs )
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		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 )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+"
+
+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
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.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_PTHREAD=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=
+	)
+
+	# For svn-fe
+	extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
+
+	# 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 contrib/svn-fe/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* ]]; 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 subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=()
+		use nls && use !elibc_glibc && nlsiconv+=( -lintl )
+		use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
+			|| die "emake svn-fe failed"
+		if use doc ; then
+			# svn-fe.1 requires the full USE=doc dependency stack
+			git_emake svn-fe.1 \
+				|| die "emake svn-fe.1 failed"
+			git_emake svn-fe.html \
+				|| die "svn-fe.html failed"
+		fi
+		popd &>/dev/null || die
+	fi
+
+	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* ]]; 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
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			# Do not move svn-fe.1 outside USE=doc!
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		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/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 4bee6fa6ca97..c29b92ceda8a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -51,7 +51,7 @@ 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 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 4bee6fa6ca97..c29b92ceda8a 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -51,7 +51,7 @@ 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 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 4bee6fa6ca97..c29b92ceda8a 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -51,7 +51,7 @@ 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 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 4bee6fa6ca97..c29b92ceda8a 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -51,7 +51,7 @@ 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 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
diff --git a/dev-vcs/gitinspector/Manifest b/dev-vcs/gitinspector/Manifest
index 6059cb93f6d8..61b8c784ed08 100644
--- a/dev-vcs/gitinspector/Manifest
+++ b/dev-vcs/gitinspector/Manifest
@@ -1,3 +1,3 @@
 DIST gitinspector-0.4.4.tar.gz 312201 BLAKE2B 870db21e9a3a3943e8315e88510d305f55e5074946456e0758f126e2d0b41e9b6e6c446417cf34339acaf5a84da02a5424195b66f7ef7d6ba2febd57ca6919dd SHA512 6e453a97f7b0bda73e376499268d9a46aa4ff1f8bb65092314a6d32031b0292056152b4e0e3781fbbe3aa6150373679bf78a8c83410882921ab40ce6d356fadb
-EBUILD gitinspector-0.4.4.ebuild 1079 BLAKE2B 1d1c07f1473b1018a853e5968ed332233c512e7c1fad97752a660ab4edddd173cb09faae1068e811b50ff5a6b3f7538975bc549adfb05069f661cb8a0f787caf SHA512 5488ab8568014db38b1517d6983542a82d6ad1db0ecda49dd24a1b878a6ec3718c8dfcdd8dcd1163be649a550a2eaec0beb227434c9bf19b6a4448f11c949bf7
+EBUILD gitinspector-0.4.4.ebuild 1103 BLAKE2B 22d83675624bf01169c7d4583f763d5846f51964a7ecc61c70ee34e56855bb4758d315b5215c56365e58ede7b2397bade814f17e9c77da04237bd414474ebdec SHA512 039e2f35a88907d210456e0e345894b6f2d093acc5474efc4d0a9c18fc703319cabd69d4e53a02055ca72adbae07ade1e54d67b2be5ffee862aadf1ab4496e35
 MISC metadata.xml 254 BLAKE2B d63f2f6971712f66322756a10d78cf425d449af8304573d723bf38691d29215a1b9f34ef0ee0648346e8be2c0a965092939a15d2538d67618c6e817be9515d26 SHA512 12393bb0a59ac43ececcee078244914186799f0b87706377147004ca6ddcea920a3aac8abac6905a1c68c0cb0652e7d95e62541172424730b9c01300f4e24be1
diff --git a/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild b/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild
index 8a2f93873ec8..2dec61aeaf4e 100644
--- a/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild
+++ b/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-vcs/git"
 DEPEND="test? ( ${RDEPEND} )"
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 7a43328f1df2..0eb50a7a4e98 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -13,8 +13,8 @@ DIST gitolite-gentoo-3.6.4.tar.bz2 151879 BLAKE2B 0b6224f8156c6a82b792a505eb66f5
 DIST gitolite-gentoo-3.6.5.tar.bz2 153234 BLAKE2B cb92a2008f80312288b925b9a22c45593203021f47d8f057bdf2597c09d515bc66b5d4947bcc5c5d7e88582c847049d6363139369571fa32f673a107391564d7 SHA512 c32f91dcb8ff790c2c59f0cb9ce1f906b17d5012922e0efdb2da1f7b1986f9f82b85b6e232f6b6e65e4d3daecb8f247a408b664b44624a64bf876b416a7b3ca4
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
 DIST gitolite-gentoo-3.6.6.tar.bz2 155267 BLAKE2B 28f09d01a550da9b56e7d2df0ee16c855dcfc66e6a7639734eee98d534d353f1ed8c3547e4a5f5d7b7cf2160b1be376e0e6c7d26b6a74635cf47626f6af3feef SHA512 cd3a34e714072b1b8792b98c023dfa141dff03cc2e225e0a006fafd3a112d98bf031a826ccfb667624b2455f1253def6c487ffba1134ad6cc8c981987437a9d6
-EBUILD gitolite-gentoo-2.3.1-r1.ebuild 1851 BLAKE2B 985751674364c3ace2e07f37832fe94f6341768d51dd247f2e1b6e2a48593ee216bcabb8e583b526ab1b11dbc21c22700c85a95617c96cc2534521ffe8dc0f18 SHA512 4d4814b3ff975bf19de0391a25125dd7133880365dfb90364bae99ea0830ffc292d90b6dbbdae603d48d751897c456af48f71e6019f961443aba897b0a48e2e8
-EBUILD gitolite-gentoo-2.3.3-r1.ebuild 1853 BLAKE2B d98b1f8655cb929e23dc51908b1d20517a5f8915369574ab228c7c255d1028b509316bd238225e708a1a94a916061e7d156db0550c0d47ded668ac3ef5191cc9 SHA512 48bd7b9c9fbd7f527d395d9c5988e1596f624325969742bc57f2f7700fd89a24d590ac3297a05c11212530dbf99a819ccc90cb6db6ffb657ec807f4961efe8f6
+EBUILD gitolite-gentoo-2.3.1-r1.ebuild 1830 BLAKE2B ef997b45ae24beec4360c63e3e8976fac1db57487cfa5e514b3df8ebea8d3864eda073b1e0191d9348aa48ceb754c89c03a56f89dfc0c582a7d4184ab027b776 SHA512 730b258a5d5f268bfc3158bec9dc85fb5758073b9c55976f3a45e127689da86ec5095f078f2904aca543f35161e4de4ef1c66ce0e1a7c710dbe736acaebfd18b
+EBUILD gitolite-gentoo-2.3.3-r1.ebuild 1832 BLAKE2B 53a60a8f89df65617c61d9146fb77295b5399158c17398e51379c1df9fcc76122b5f58367c36bb5c521bc0386ff9396e92cfc5b34bd3d95978bc2ed7c09e14a3 SHA512 cdc5676371cbb47189450835b4172e602ffc02a92e5a14f3336aaadcfeb29cb140fe1f89c1e34759fe47cd0dc0f4fba9f5def9762eee4e536870cf188b22f8a3
 EBUILD gitolite-gentoo-3.5.3.1.ebuild 2277 BLAKE2B 824e2f30de95eb40ee055ab8fa5a34959050b311e75134c638281c5e120f242e8615ff92db3a83a341f41bcf883f747a2f87fd8652bf949d11de9b29ab6ea2b3 SHA512 dfbb656030a91dcba1b9f6dba30f6b48daafef1484bc1cd5ec56183aeeaca01c2fb8579ba83be2366d01c28fdfa5dabf7f180696c781a7dc0247bf018ddc7484
 EBUILD gitolite-gentoo-3.6.1-r1.ebuild 2734 BLAKE2B fbcafc9d0fc1588fabaf0a0e595e8e9027ced364aff9e1f0b9b16cdceae745888d79454e8687844887fa65318355252327e5050410fb7c51fec17830b2896000 SHA512 d0563316516a999a09b5daa1bc0ab2c416dd52bc599f7b5eb00a5e00bb3bdd17c5fe02dd2594a5153dffd8955e10ef642e99046121ec254712992bbd6ae9c7d4
 EBUILD gitolite-gentoo-3.6.1.ebuild 2277 BLAKE2B 824e2f30de95eb40ee055ab8fa5a34959050b311e75134c638281c5e120f242e8615ff92db3a83a341f41bcf883f747a2f87fd8652bf949d11de9b29ab6ea2b3 SHA512 dfbb656030a91dcba1b9f6dba30f6b48daafef1484bc1cd5ec56183aeeaca01c2fb8579ba83be2366d01c28fdfa5dabf7f180696c781a7dc0247bf018ddc7484
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild
index 68d699eaea57..f4ed513d8334 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild
@@ -39,7 +39,7 @@ src_install() {
 	local gl_bin="${D}/usr/bin"
 	gl_bin=${gl_bin/\/\//\/}
 
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin
 
 	export PATH="${gl_bin}:${PATH}"
 	./src/gl-system-install ${gl_bin} \
@@ -49,13 +49,13 @@ src_install() {
 
 	rm "${D}"/usr/bin/*.pm
 	insinto "${VENDOR_LIB}"
-	doins src/*.pm || die
+	doins src/*.pm
 
 	dodoc README.mkd doc/*
 
 	if use contrib; then
 		insinto /usr/share/doc/${PF}
-		doins -r contrib/ || die
+		doins -r contrib/
 	fi
 
 	keepdir /var/lib/gitolite
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
index f03af212c5f8..7445c714339b 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
@@ -39,7 +39,7 @@ src_install() {
 	local gl_bin="${D}/usr/bin"
 	gl_bin=${gl_bin/\/\//\/}
 
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin
 
 	export PATH="${gl_bin}:${PATH}"
 	./src/gl-system-install ${gl_bin} \
@@ -49,13 +49,13 @@ src_install() {
 
 	rm "${D}"/usr/bin/*.pm
 	insinto "${VENDOR_LIB}"
-	doins src/*.pm || die
+	doins src/*.pm
 
 	dodoc README.mkd doc/*
 
 	if use contrib; then
 		insinto /usr/share/doc/${PF}
-		doins -r contrib/ || die
+		doins -r contrib/
 	fi
 
 	keepdir /var/lib/gitolite
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 1831a3569c65..48fd63c81348 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,6 +1,6 @@
 DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9cc908ed092b55272c59a4bd52145302e638612f1788d68b2445b8c665f025b24c47d50992dd3f6ef2fd6eb63ee7 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee
 DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212
-EBUILD gitolite-2.3.1-r1.ebuild 1647 BLAKE2B cf918594448f8cbb0d381118c5fdc6ba3bfcd3669a26b3ca5264f66deb2e4273c29554ba7edf0a04e350619fd45a8083e69017793eb48bf7facf2e4f4d3bb25f SHA512 77347b4575a9236a5e259e9c67eb29ecd023092c2713ca45d8871af2303222d827296405168126f7f88ff45c8bcb96427325391801baa5740a90b2548bb25da4
+EBUILD gitolite-2.3.1-r1.ebuild 1626 BLAKE2B a3dced25c4d0ffc9602fb47c59d5b1f67b44cdadcbb53c034a5fe1928c05ab1f3066e62fce3ad7f8d78f1d95aedffc1510d6dba14d3c4eb40ea5727c76825e7c SHA512 2552f1bcfb254cff06bacb65c30b279b87f3da1ce1548aad2ed05099f0dc20f0004498d81e0482f2f0c58294910464fb7c3b7d051b20670f1f3454ad19c60bd9
 EBUILD gitolite-3.6.11.ebuild 2426 BLAKE2B b9d0f23ab2d61a243a3b087f16659b0b129b60aa6aef5dd6a2adb730c53f7efced683909692e919879b94105b0f678a50259dbcc348aedb5c1a74ec4801da692 SHA512 3f021027fb3a92839f13d12c2890b5a2468e61e32f607783175486d13cab8a4adfc3e47fc518c4c02982997739504b0d011b2da82955daee6e9eb5f7a3c15f74
 EBUILD gitolite-9999.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111
 MISC metadata.xml 780 BLAKE2B e496a65ffe9f06db9f4ef1c74a16fafb434c9c8a7309f0effc02515270bcc0137b1bf7861ac11f6dd1a7c06fd4ef4eb7d72b27b60a73ed535ba4fad3e08a2066 SHA512 0a7c6ac8bc127892e5f6fe24774f095cb0bcf5971926c65b4d8a52748cfb7ae22d1ddc47365ece99612bc64853dfa224d42ded5093f0cd0976a2ae1b544eb5c8
diff --git a/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild b/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild
index ced390150277..8f8730181c0a 100644
--- a/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild
+++ b/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild
@@ -38,7 +38,7 @@ src_install() {
 	local gl_bin="${D}/usr/bin"
 	gl_bin=${gl_bin/\/\//\/}
 
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin
 
 	# install using upstream method
 	export PATH="${gl_bin}:${PATH}"
@@ -49,13 +49,13 @@ src_install() {
 
 	rm "${D}"/usr/bin/*.pm
 	insinto "${VENDOR_LIB}"
-	doins src/*.pm || die
+	doins src/*.pm
 
 	dodoc README.mkd doc/*
 
 	if use contrib; then
 		insinto /usr/share/doc/${PF}
-		doins -r contrib/ || die
+		doins -r contrib/
 	fi
 
 	keepdir /var/lib/gitolite
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index 4b3f5e5de667..ccf1fdb7e810 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -1,3 +1,3 @@
 DIST hgsubversion-1.9.2.tar.gz 203801 BLAKE2B dd8f53baf1d12263be1dde75b2a0a9367ea038bc4655322ac8e89c5fafe67cd42ab94f83b2eda2ff28f521b8ef7ecb5034dad0916bb2fdfadeee68e52f75e348 SHA512 e11e0db50702d0fa0c29ac75bde8f943551ff392218656f82672c25635b43ed17d26026af106723875165806577881c268ebb5fb82954add599dcb14b13e4744
-EBUILD hgsubversion-1.9.2.ebuild 935 BLAKE2B 553c70cad6f0191d6cb6bb4184f3a0c3158d8e4769347a438ee6cfc90abd7b4a7e05cfeb5be8fd849e4948b3640a7d02036fbe388c54d92295441c168b6fc4d5 SHA512 b78838cbeee31e06eef85fba34dd8e948d6fd36c86368f9d134f8424c2bb7aaa3546be419c17d2a42b2629fe4848d22c1c135197585b3e62b441e52ef3fc1afa
+EBUILD hgsubversion-1.9.2.ebuild 962 BLAKE2B 4833325dc5e01b08959554b99695efa01d916a3418b29c663f3d33ab84c61d0d089a75aa5c19ddc85ed1de76e497bba884234a059f18a40688ae0b50f88e1072 SHA512 fa49482f3e86fc449ddd54aa56e39ca04e91ec921e79f484159e2092eec7d1f7843f3040faa01d12559b3e721ff85afa0e6206558ec5c6bfa57646c2be9938e2
 MISC metadata.xml 305 BLAKE2B ae280ffce2435476e46877db066a5967861112aef4cbde989981b8d01919e32706a758691ba0f085015eb681c2a55b2a601313bd9d9d9319497037e689d55bb8 SHA512 a5d7eb8c02ff08bf50591a24a4b0b76a76e799fe5903a27c8a648e1ab839f28135f6f16eac2ba557006936dabadfb08543c203fe0fcb3ff8f89f62e63fdb300f
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
index 2abc37c6b0a5..d83432918135 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index 9fefe4e72594..0b81661dc68d 100644
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1,9 +1,11 @@
 DIST hub-2.10.0.tar.gz 1042511 BLAKE2B 8e95a6ce24ec9ed5c6d163346ab89a3a587d9f1700eed0773ae14473b06a1cbdba16ff5d75d3f64faa6b13382085a1cf8fb826e09cfd0ba3a0f0589f0abdc615 SHA512 6ded3a57f73fec226234e9b727d676a61a3312825c98cfb5d908ca45c163326352859a126e8b6c7f2e2302badc25a60c9c04c9184e4afab81c9f23d4555a045e
 DIST hub-2.11.1.tar.gz 1043499 BLAKE2B af3ac833c874f15ce183a41a4b6920ba77b9d882b343e12fddeba58453c2c03cd45fa1ec3e7a488dc2d916d0e12f2cf14d7e4d749848d3a10e44b039e7efae49 SHA512 ee5a42713e7810d0e825c6bc1ca2313c5679693197ca6845e189cc18fbbce04e32e1a5f0e9d2735e5a127b2aeadc33446011fb747b96b3eb6e906cb0e87f5f27
 DIST hub-2.12.3.tar.gz 1623944 BLAKE2B 16e857fbd62fa79ba10a61f214a2c2fa0d08b71330e522d617209699318d501681049eaf05bfff3d2a143f20226fe240f76733be3296b305ae8ff8a2256a7187 SHA512 8bb433d4a0079cb6f30014650bb5e2dafc1ba7b8c65340886f157ae9b6785f170b13c6db1b11f6334835fc312470f5b0f57b563d665af4bbe44f116fd7af75cf
+DIST hub-2.13.0.tar.gz 2074748 BLAKE2B e790c13cfab9070699b3995c91c3adfad89b438d70b4f0683dcf2f487349c785d97f1aa845620cf0ccabf93f6738a3a1d45410bd1155c861d55f3d2568312235 SHA512 77cc86948a4725a56b09eacdecb3227b46022de93f6ca8eb298441e32bda83cd8e6bb7874e029caae06852c6edcedfaa19382599d6f6ad9760663ff2573d2342
 DIST hub-linux-amd64-2.10.0.tgz 4295227 BLAKE2B 889dca0f5d750201d97d9eb1ab23cb781c2b12eb1cd7958c7816ee6c69dd344dc02b824754293071566b80ed7de24310d0ff78d690efb574de302910f16d6784 SHA512 5828977a14324a315a28dab1e25f7adf1671b14d24073cde550781eaaebee3f5f7c683a99329688dd86ac2e59252aa25f30c030d1a2f4bb8a7d135ec7bb88702
 DIST hub-linux-amd64-2.11.1.tgz 4294575 BLAKE2B b82c768100ba0959b9f7a8e61f0896cc1b0f516215f9c406cb2c2b1e19240a9bab7728129ad956ac1bc8380fc3395fc6430436bfc824be19443dbc2e270ba062 SHA512 e8f1053924eaec23784fb7a829e59d25fbb271165b576cc76060e66755a485b8cd91b48869bf2e4b87790907aa0c22857ca6981a798f19f55d638944b3275c6b
 EBUILD hub-2.10.0.ebuild 1147 BLAKE2B 878208535c658995bdf760fc48386dd24eb2ca3f5a6a7e4dc77846311f77919c94fed1a3a77a1bfaeebb63243d8621032a48c31723164672d6ada7584607f3c2 SHA512 e0eda94b80e52b63f5674dc7aab31f702776d8d714323b36b81e9ebd85a4549b5f945a8c2c0115af5524c2d0f9d87df296720c16eead22e936a91ead28caa9d6
 EBUILD hub-2.11.1.ebuild 1139 BLAKE2B 366d37f8de51f0c3a69385231e28fb7c7352f4fab6de919d09d441c0f1dc6bbb5264289705af5f10991cbeb611924da905fe748d44ca3e7be0dd168bd33cf978 SHA512 b4822a66dbe0e317ad44ebc762554fab82981e79f649ee34d62b936f28097a95b3fe8d1a90d34bb98ae63d3a3a31a7850f6868ec8def2aaf206b3c9eef0fac68
 EBUILD hub-2.12.3.ebuild 861 BLAKE2B 5a05adf2c19839d29c10b75bfbb5dd26fba2592252cba0a6d54b31f4909cab1626cd03a16df1d59ce1f4ac506d2cd965ba3d7a951a1f45defc394ab3141d200d SHA512 fc4ccdacf1d7b966aa05be79a4d2ed9642c7e935b4dbde630a8bb81fd8bcbc1de62a0385e6e84360f0a156ed570614e1abd86e394b811599e3c93e62b4bfd10c
+EBUILD hub-2.13.0.ebuild 787 BLAKE2B c026240918aad6dc9b418e8f70bd2237cd771d52032b1001ce7ae1e62be25e58d3af0e7577bf0ef88f5d5e241c397476b8996f226d6b4445fb554f37ab5c7908 SHA512 5f81216e6e0c8623f81178f0c45b774b4af97f870f0e8b327d1f69e68f69231148aa35ce7c5b9f9401e9df80506be798c21f0867a9b53729a0c25fb5825d61b1
 MISC metadata.xml 334 BLAKE2B c10c297b5f493184b2191daf7c8c8df963054d3bd682aec7c9768784171f2eacb267fec32b817ea93a85d57e1bc248f5454ab8984270b94c997287b4ab983cfd SHA512 448ebf7bab89832d682b7e99a2fde5e04f242c7cca13272f5827f680077a310d670ff1f201073d07d779b8fb1905e066cd0de7b4f82879233ea6f366b0992f7a
diff --git a/dev-vcs/hub/hub-2.13.0.ebuild b/dev-vcs/hub/hub-2.13.0.ebuild
new file mode 100644
index 000000000000..02a51219754b
--- /dev/null
+++ b/dev-vcs/hub/hub-2.13.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 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 ~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 75b9f9606874..4b43cab6547a 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -8,7 +8,7 @@ DIST mercurial-4.9.tar.gz 7075692 BLAKE2B ed11442e0cd5b27f47394ed1c15016930556d5
 DIST mercurial-5.0.2.tar.gz 7202797 BLAKE2B 7059efa2cf80c433ec25748c7c49ae0caa688363f5ef2983e0adf39a0a691ea99aaf4a090ebeda11b89e74263c548289cca3f82f40d77efbf925e12231b341cc SHA512 8b328e2e5a2896b690492d75c055bb13cd76df6efb087ef770f60ead86e30f7d952cb3ca82a696c0c5ce7039c319bd0fc9b448a52c079653622760317d5bb315
 DIST mercurial-5.1.2.tar.gz 7286238 BLAKE2B 0dcb2556e568e222da628bcfeceba56df8ab04f123f79add1953ce13bbf51e5cb0733fa72d5cff00250aaf0e3bfae5c52cc5cd72c1b6aa1fccb6820fce5a7018 SHA512 a8ce9d9220a5ddf452264801f06e81fe1e699ff700d085e3f82c6877910c6ef0e594203590f198b7b9e31c9a1ed627c8fa2a3a1513d0c5087cf775835a78c408
 EBUILD mercurial-4.6.2.ebuild 3559 BLAKE2B ef5fcf3cdc352fba54606fa2305d42cf044433405ac7a999be12543bd1040cde83976c20f41d8f7dab3c494987e6d05eb383dedfc591ba96744c195d1237510d SHA512 c4335f4c50c4684c79a28ea2b5647047767a24f5ccfc95c5b4c9248be978bd5b0dded0ba10477db0ef85a3b2d3152c001f7a585be1ff0c2cdba495cb750e3f44
-EBUILD mercurial-4.9-r2.ebuild 3946 BLAKE2B 014000f989c649a5734180a1a003bca859fe8b386e489e09328ceedcfca50aedd7eef4ce8f0b05301aba79796a16ba771a5e7c09a5ed4ac87eac5e71672948ea SHA512 6ac7f3e9b1daca5c5d5c0f00fd8fcb91429e5d4852b5350a38d7782f351e9370c6b52fc16c7679fd9cbe70023a5f27a8e50d187ccf412e1478cd1fbbaed98f8b
+EBUILD mercurial-4.9-r2.ebuild 3945 BLAKE2B 10159c88071c1de1624f9782c4f848e18ee3edbf530a85cd6ced8ce8a59e30912d11b38fceed4b7f3420fd3fd0b2714f8309233c118e02374274e093fba10ffb SHA512 bbcd5a521e02c491d0d55925cadfb958e5cd4b4036a82515ca15638959a581d9f69e575b2c98bf06539d2efb6f53afe6f78267e561da22c4ef10a779320bd9e9
 EBUILD mercurial-4.9.1.ebuild 3955 BLAKE2B 9497b2fd68c6cf22a39b04d38a022a1b869d8c397eb6ce3a53eb362af73a822ab7896be1dcb3368bd1dfb175ffcd5bed4274d17101a21b2a906081a8b9a16cc8 SHA512 9850aea1edbb8ce48620554196a15f5f9178babbcb9e6ff3e6adaae2279844bfa7f4af4e40e8b85ccfdfe08c3bc7089d1c499fec9d47a1bc89390b41d43566e9
 EBUILD mercurial-5.0.2.ebuild 3951 BLAKE2B 13106f1b8a76ea16526997ab36bce4f90261083e8f98be53135245f12b22f0fee9e8735146e02ba29fa47c6ce090f73a73ccf0c63e9549273b9d2d981380966b SHA512 9e0ffee80aeca3ad03d83452117c23b4f7bada66d6e8507f7be7f0b1f42a1adc856ecffdaf18d74703a9300e8ef13c234ad64a7ca220bc4eae2cc7d37f49f6c7
 EBUILD mercurial-5.1.2.ebuild 3951 BLAKE2B 13106f1b8a76ea16526997ab36bce4f90261083e8f98be53135245f12b22f0fee9e8735146e02ba29fa47c6ce090f73a73ccf0c63e9549273b9d2d981380966b SHA512 9e0ffee80aeca3ad03d83452117c23b4f7bada66d6e8507f7be7f0b1f42a1adc856ecffdaf18d74703a9300e8ef13c234ad64a7ca220bc4eae2cc7d37f49f6c7
diff --git a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
index 09a6085f50a3..7949885a9189 100644
--- a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg bugzilla emacs gpg test tk"
 
 RDEPEND="app-misc/ca-certificates
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index c72c4ca177f5..c5e83c384ba7 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,7 +1,9 @@
+DIST python-gitlab-1.13.0.tar.gz 121434 BLAKE2B f8a9af4f389b4759891e26de305c48a70b4255667d4bda869e4e9738f37a1d9a99777a3aa3d1617df343e6b10fe58ad42d2f1d309da931c92690233347a21f2d SHA512 483133d6bc3244c28a2cfa7382262692ed5eef5be5217c5f9786883667d777bac7f952946c50cb8ca6bbe07f63691ec19be4fbfeb7d9cd733fb049a0c3378721
 DIST python-gitlab-1.7.0.tar.gz 110657 BLAKE2B 1003d3373d3ef5474b1d5c10b1c6af57e7467cec432fc1eb75b4e1ba7766361641f25461ac2bf1b7692dab855d4e5cbc204240ede3568e71ed1af75682807fb0 SHA512 ad50d989e27948ff5188f4191ad3b7f1e1b45608627b2042bf02d635b2aa8da0a24f6b0383f483a01df54e4ab14576e7e4252576b9c2bdf67a187ae6aad69d53
 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
-EBUILD python-gitlab-1.7.0.ebuild 1033 BLAKE2B b2aa8e06cd851f080922700d542e31ef7a9fa7f032096d5bfb10eb6f5fee2dd57da20b17e0f36e2eac69b56c0afd0a90712bc99fcba8dc2529fdf53f5d20bc3e SHA512 8860df6dfb71ebca1f93aead4cd72f40f922775468a153124c8a757fa94d5da1d23612879aa8e012466801af7e26f1aec0eb07ca9026f35f3a92e104ecf1feea
-EBUILD python-gitlab-1.8.0.ebuild 1033 BLAKE2B b2aa8e06cd851f080922700d542e31ef7a9fa7f032096d5bfb10eb6f5fee2dd57da20b17e0f36e2eac69b56c0afd0a90712bc99fcba8dc2529fdf53f5d20bc3e SHA512 8860df6dfb71ebca1f93aead4cd72f40f922775468a153124c8a757fa94d5da1d23612879aa8e012466801af7e26f1aec0eb07ca9026f35f3a92e104ecf1feea
-EBUILD python-gitlab-1.9.0.ebuild 1033 BLAKE2B b2aa8e06cd851f080922700d542e31ef7a9fa7f032096d5bfb10eb6f5fee2dd57da20b17e0f36e2eac69b56c0afd0a90712bc99fcba8dc2529fdf53f5d20bc3e SHA512 8860df6dfb71ebca1f93aead4cd72f40f922775468a153124c8a757fa94d5da1d23612879aa8e012466801af7e26f1aec0eb07ca9026f35f3a92e104ecf1feea
+EBUILD python-gitlab-1.13.0.ebuild 1060 BLAKE2B 8ebf058a8c6a79fd395ae006a7d1fa20b6c62ccab5c45fa18d3c967c7207d41ae22543bde72fd3dfc29f04582f1bb002b03177415455fd37222102bf74c5436e SHA512 d8815aac145280657d23bc5b87dec4657284667f0cb91a0196d35f9cb3c6d9b2016fd276813e2e39889c0b2133712e77fc2bb191bdb87b6f491f68fb46226f31
+EBUILD python-gitlab-1.7.0.ebuild 1060 BLAKE2B 8ebf058a8c6a79fd395ae006a7d1fa20b6c62ccab5c45fa18d3c967c7207d41ae22543bde72fd3dfc29f04582f1bb002b03177415455fd37222102bf74c5436e SHA512 d8815aac145280657d23bc5b87dec4657284667f0cb91a0196d35f9cb3c6d9b2016fd276813e2e39889c0b2133712e77fc2bb191bdb87b6f491f68fb46226f31
+EBUILD python-gitlab-1.8.0.ebuild 1060 BLAKE2B 8ebf058a8c6a79fd395ae006a7d1fa20b6c62ccab5c45fa18d3c967c7207d41ae22543bde72fd3dfc29f04582f1bb002b03177415455fd37222102bf74c5436e SHA512 d8815aac145280657d23bc5b87dec4657284667f0cb91a0196d35f9cb3c6d9b2016fd276813e2e39889c0b2133712e77fc2bb191bdb87b6f491f68fb46226f31
+EBUILD python-gitlab-1.9.0.ebuild 1060 BLAKE2B 8ebf058a8c6a79fd395ae006a7d1fa20b6c62ccab5c45fa18d3c967c7207d41ae22543bde72fd3dfc29f04582f1bb002b03177415455fd37222102bf74c5436e SHA512 d8815aac145280657d23bc5b87dec4657284667f0cb91a0196d35f9cb3c6d9b2016fd276813e2e39889c0b2133712e77fc2bb191bdb87b6f491f68fb46226f31
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-vcs/python-gitlab/python-gitlab-1.13.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-1.13.0.ebuild
new file mode 100644
index 000000000000..5a890390ea5d
--- /dev/null
+++ b/dev-vcs/python-gitlab/python-gitlab-1.13.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+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
+
+inherit distutils-r1
+
+DESCRIPTION="Python command line interface to gitlab API"
+HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/testrepository[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		dev-python/httmock[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3
+		dev-python/sphinx_rtd_theme )"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r *.rst docs
+}
diff --git a/dev-vcs/python-gitlab/python-gitlab-1.7.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-1.7.0.ebuild
index 2ee27c73fd03..5a890390ea5d 100644
--- a/dev-vcs/python-gitlab/python-gitlab-1.7.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-1.7.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild
index 2ee27c73fd03..5a890390ea5d 100644
--- a/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-vcs/python-gitlab/python-gitlab-1.9.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-1.9.0.ebuild
index 2ee27c73fd03..5a890390ea5d 100644
--- a/dev-vcs/python-gitlab/python-gitlab-1.9.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-1.9.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index a72e1e56f1a0..fc955c4ec2b3 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -5,6 +5,6 @@ AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa60
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.12.2.tar.bz2 8506584 BLAKE2B 535e4c6c369537baa7f9fc9123d0314de1bb8d4b3c51e0216662047fd1084ceb6a1f349de54bf575f0eb8e1041fcd6525e6cf27dbd908e2148578cb9fb807bb3 SHA512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136
 DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
-EBUILD subversion-1.12.2.ebuild 15491 BLAKE2B 852c123c0817cd5b6ed337920fa32612db4e421ed11026c36e5dff88e178d696af47614d8365d757cccee8b88835bf9c7217331baeaef028b98bbf9b15cc032f SHA512 31102d7016ad7c8f719a7c236f6fe5043a3b9e791dbedaafc05c482fdb4c7463c140317caeded1981fdf2ce7d1e98f1fda40fd0d35a096b79d4abb0ebcde14d7
-EBUILD subversion-1.13.0.ebuild 15501 BLAKE2B 5539c85ba8351474c042aec3707728f7c767b06bb7f0a0b2069341400e7fa0f5c3697365a8413b97bbc707dff52ef0c56cd96ab18775dd36392f196f4b83bc60 SHA512 11e6c6c33e55abb2d9d5b64d8e6fb31f1bc9a05afb8db620167795a5f5b07b0c7a7681eef12427e24debdf6d2454f4b100a11473048523edbb2f966ffe490378
+EBUILD subversion-1.12.2.ebuild 15518 BLAKE2B 47fb6f92308731b10e6643fec230c9c73c688debf217bdd4fd7775146307b6a4dc5d38fdb0facbc4857596f50135fab7fcbf745c6b8498526f61d7d02c22096b SHA512 f37547e454afc030f04631f630e8a54c58600037b894a5671cd7d769580e2034cd8bf65164c31da5a04f7b2be3efd6772e9683872b41d2c7df280aaddb19bdae
+EBUILD subversion-1.13.0.ebuild 15528 BLAKE2B 8067d0dfbcc2f54a14d25587a2693dae96621c53ac895f53d1082dbcef001f222c7fe801ddc6d71aa0f58872d76976bb0dc64bf75490c70ecbd687df60989335 SHA512 9a0923f1db07834d0045d53c3dd6dcfec2bac77ce5fa1b60215e1ef3da516391471f3afdc362089497ec3253d7736a519522e4aaba739fa139c8748a9df4eaa5
 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild
index 4674e4e7880c..f487c2a61bd4 100644
--- a/dev-vcs/subversion/subversion-1.12.2.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.2.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 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 )"
 
 COMMON_DEPEND="
 	app-arch/bzip2
diff --git a/dev-vcs/subversion/subversion-1.13.0.ebuild b/dev-vcs/subversion/subversion-1.13.0.ebuild
index f8eddc1f4a1a..b309ede0baea 100644
--- a/dev-vcs/subversion/subversion-1.13.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 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 )"
 
 COMMON_DEPEND="
 	app-arch/bzip2
diff --git a/dev-vcs/svn2cl/Manifest b/dev-vcs/svn2cl/Manifest
index bb9d0058ac68..3b5cab65a59d 100644
--- a/dev-vcs/svn2cl/Manifest
+++ b/dev-vcs/svn2cl/Manifest
@@ -1,4 +1,6 @@
 AUX 0.9-wrapper.patch 533 BLAKE2B 66eca8a65f6ee984613b2af0ef6ef00bf7bbe6ebd66946883b769e71172db1795718fcde4235c38dfcdb75295a19d23e6f468c957a9adef6f3da44ed6fa132f6 SHA512 060d5631a7ec86aebab454f7d1cc7c3fd08d11db993bedc883d7c04b96a412359c6c2c7479e0bbfdb82ac5f8ea366695f845e3e9fc19653108a564376268a7c8
 DIST svn2cl-0.12.tar.gz 18171 BLAKE2B 88e66d4bcc3e05132462d1c9794846a644f121876d36dc1b42ef0cb7bf8481536d62a6d764e92edc670c149fbe5702a46b02d875ad1cd477a05b497780232296 SHA512 c84f0f67b34d615b1732cd03ecbdb6d3bb082677145acf2f32f74518306347eb984d65d4837f2463b369cd7a8a7443d2cfba589c531b46f423870c55b0b48aa2
+DIST svn2cl-0.14.tar.gz 19399 BLAKE2B 2a726a593521d40bd7a125607c2841bbca8d5915e420b2757da1a17a9bf65e784fdb8fbb5b377567e0c54ce7c8d8407c26a66dda677fb84807d07001032f87b4 SHA512 68d5ad00c5359d86979e2cdce349191bb1c64e132887e2a5222d5d9e24e901ff9e15627fd3de3884f8ad319172051c92ce18e337797ff2237096a6396b814b19
 EBUILD svn2cl-0.12.ebuild 779 BLAKE2B ff44f25a86e56ed04375e532b5ea368f78a0443f1c166f12975673ed49ed3ef058c5d0bbb354e7d576cb4b7aa70432cd050bb05e6e79b8a47f5227a5a6ec6f45 SHA512 4c6820c7feb49874deb2441376466e0c9ad7803ae3739074c1bcb703626ced7fdd4b81cc15548c26ed1c08e5ec2d2cb5f38c3f7543eb90fcf5d75c3a3715350c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD svn2cl-0.14.ebuild 770 BLAKE2B 3e0b4e5df979bd8dedd078d5af2a893ca3dd4566acbe7e039a6057fa6463117f1a97ff03f130d5b683e47fe140d029f96311ad6a90b5d99a00afc8151010ddc7 SHA512 017a952cde7a708f7b6da43c2304b4188ee811f004bc8da2bc18d43aa4a9115944b8079a07a6ca998eeabedc0f75d862de4b479d61fc9547fc76d1d426675c08
+MISC metadata.xml 366 BLAKE2B 2dfc36224a99a053e04ce8888b2fa2a03c3a7649fe62ac7f66f7a5ac8829a913457ed767d2fa4fc6503628a747594de5d89a028f41f09f6c4ede6cc109b8e922 SHA512 1bef34b0f7835d77fb56fe12149dc3f10a3695c8303118420065ccb48607d6a90da2ff999747778f251e4a0ee1525a30df49df1d60699cb32b00dd357e8a99c5
diff --git a/dev-vcs/svn2cl/metadata.xml b/dev-vcs/svn2cl/metadata.xml
index 6f49eba8f496..16853472f6b4 100644
--- a/dev-vcs/svn2cl/metadata.xml
+++ b/dev-vcs/svn2cl/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/svn2cl/svn2cl-0.14.ebuild b/dev-vcs/svn2cl/svn2cl-0.14.ebuild
new file mode 100644
index 000000000000..e9516274cee7
--- /dev/null
+++ b/dev-vcs/svn2cl/svn2cl-0.14.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Create a GNU-style ChangeLog from subversion's svn log --xml output"
+HOMEPAGE="https://arthurdejong.org/svn2cl/"
+SRC_URI="https://arthurdejong.org/svn2cl/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+RDEPEND="dev-libs/libxslt
+	dev-vcs/subversion"
+
+PATCHES=( "${FILESDIR}/0.9-wrapper.patch" )
+
+src_install() {
+	newbin svn2cl.sh svn2cl
+	insinto /usr/share/svn2cl
+	doins svn2cl.xsl svn2html.xsl
+	dodoc README NEWS TODO ChangeLog authors.xml svn2html.css
+	doman svn2cl.1
+}
+
+pkg_postinst() {
+	elog "You can find samples of svn2html.css and authors.xml in"
+	elog "/usr/share/doc/${PF}/"
+	elog "Read man page for details."
+}
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index b5d6f3599e3e..64138c6de4f1 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -5,10 +5,10 @@ DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6
 DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359
 DIST svn2git-1.0.13.tar.gz 43738 BLAKE2B 97e9b90402d3c7eedf0fafd3b68429c99d93522dcfe190f88e64b744cb86e5fec0bdd0fabfef39018e290a425a53a2089df88250ff03e447f2963e2ad99fa0e0 SHA512 7cc9a9d70da285533f7f34672fb8f6571cb031d2dd4fc9df904b9e3acf64d97f42027a19bed82478c75a237febf3c8e12ba27a1abcd98403fe24247e5a26a96a
 DIST svn2git-1.0.16.tar.gz 44489 BLAKE2B 0be673592a6032b0f46f7ab80e50862e6979a6540d17eadb2c0e4c3f40737283fb17cc51340810bbfc17dba7ee258537d5618de95da3843851e20ae843a47626 SHA512 11289c98fcae98ec2137b778c064e73f47957c987a8d413946a8cde44d679565eae878e69e3a60b5c48c0753dd4935d001eb6ba28253cea995ee4fd40379b583
-EBUILD svn2git-1.0.11-r1.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
-EBUILD svn2git-1.0.12.ebuild 1103 BLAKE2B 964d3ac156984cb4feac87159b5e9ef63bbdd2e7669fab10da459a69a9128f9c22e9ead763eed9b1fab88febaf68572be6fc231d1d79e489ad49ce4543467c5c SHA512 062419fe42725915a9c3fa5de76fe2dc9f709785ce6e909beea831a9b3db1f21eea3708a1918cffd5a59e35ca7119da7d0e276146be6d0be55969b6f4997b2e1
-EBUILD svn2git-1.0.13-r1.ebuild 1147 BLAKE2B 99b5dc61a997636dcd2cfb68d4da3e7a62bb7c12eeb89f0be08ee53fb25cc96b75954003a2f83bba7969168cc9f186a9d0af35bcb6eb7f04ff39561b1fec9617 SHA512 dfb512df2de53488b400244a0c8658acd3d05e043615b48ca310724b3017db018d2103c6ddc5fdd2ec5554a172d17eb8b12d8fda3cbc62495d4d5f4e00cf5239
-EBUILD svn2git-1.0.13.ebuild 1103 BLAKE2B 964d3ac156984cb4feac87159b5e9ef63bbdd2e7669fab10da459a69a9128f9c22e9ead763eed9b1fab88febaf68572be6fc231d1d79e489ad49ce4543467c5c SHA512 062419fe42725915a9c3fa5de76fe2dc9f709785ce6e909beea831a9b3db1f21eea3708a1918cffd5a59e35ca7119da7d0e276146be6d0be55969b6f4997b2e1
-EBUILD svn2git-1.0.16.ebuild 1100 BLAKE2B 1b09a9a598d22d4761dbddaf9b2e7affe96dfe753efa7842506acb69ee219d003a203aef2008c2889e78cbe03d8b7734d9dc644c9535915d8cc68849fd0756c2 SHA512 254ecf914245aa9bf1549c7e3307ec247f6466203070e0e66fafda1937349926e7e500252dc82c6bde3847e1b554beb722d3e5291a25425c905499e08d1a4bcd
-EBUILD svn2git-9999.ebuild 1087 BLAKE2B 8eab32efa9f4e0a54a6a071a26bdd3aface14ffb0d6b9d621545d23b7f81fc9db41f2c299238191b40401dd2eec0b7bc010d26867705c39df4df03834beb9ce2 SHA512 36acedf8fe41f50789da0ecad078d6335ba50c10cf14eea2220ab9afa6a3c170a41cdec83acd8d6281bcd8abb3ef497917037bf95e2fcff2a778e6fb29dea508
+EBUILD svn2git-1.0.11-r1.ebuild 1164 BLAKE2B c838d41cf17d0241e5b1e229263d26e4015b1d76c768c3feffd41521a28752064eab6e2abb47a563777d691e0bf49e3e50458f4a9fa9d23e95f92257924eb11f SHA512 8e81668615ab102e02391130f22696c8c3bbc1ab7f13103691a35440556f62f400019e0922e9230c97e35f9f9875ee7de42f757427d2f7997d2b1ec1dc1b73f4
+EBUILD svn2git-1.0.12.ebuild 1037 BLAKE2B d9796902d0aa1bd12ac44097ca10fb0c3ece022b193dc60f292fae59b8df1a5fa4d4df0742471dc5ba898b584e6b13757c336e740b99c9746fb756e5e66edb71 SHA512 e02aedb85806701cfebc8f28369bf27433b798c44ac9bafb3730cf4b914fc877fc4134a27e69e7ebbcaf047bde6f9bf14b5854613f1da340342009e46a87dd9d
+EBUILD svn2git-1.0.13-r1.ebuild 1081 BLAKE2B 04d13c0be9aecd14e3b2ea52af46e00de2792a140319545bea39bfdbc9515eb411c67fd9383a8674bea5a22611f1cb29a99ad44f28300ec27addfdd859d0317e SHA512 0745ce05c437203dbe4913dac9e238b741ee69a57459ed82265971e464c0eebbff16f635865b0d23d0ca303bc90b980122b8e3966011d5b250b21d1cc02ed756
+EBUILD svn2git-1.0.13.ebuild 1037 BLAKE2B d9796902d0aa1bd12ac44097ca10fb0c3ece022b193dc60f292fae59b8df1a5fa4d4df0742471dc5ba898b584e6b13757c336e740b99c9746fb756e5e66edb71 SHA512 e02aedb85806701cfebc8f28369bf27433b798c44ac9bafb3730cf4b914fc877fc4134a27e69e7ebbcaf047bde6f9bf14b5854613f1da340342009e46a87dd9d
+EBUILD svn2git-1.0.16.ebuild 1034 BLAKE2B ddbb36477b2dbd88f52598c46dfe6c357a3ee03f17ba668897a11cdf1da6b2d11bbaa160526b7ece14437883ba7583a596f3f9c66f5fdf65c693d76427a7b8b7 SHA512 61d9606dc51ba6efd15b615d6573a357a73b84c01303c6b561b6f3f09aed6db4e9698231b86622913a97118b8a85c36df71b238ee5a2bb0390475c13c7c68d1e
+EBUILD svn2git-9999.ebuild 1021 BLAKE2B a503c85adb6f2b39ac0483dd3f7032b45a181b6b8306c390c76857138630864a28da68f18f9075183ad098217a7a8c888fe60ad4dd1df86918dd5790fdd9b667 SHA512 9fd102538666531b4f689f9eac4ad4ca0dcc7abf4d20692b1ab0abd0b47ff941060c03afc733e09f994618ca5478cc6d662b7324c74e9be0662b6e9c1619f9ab
 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
diff --git a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
index 0fd35c4b742f..5df2948ca14b 100644
--- a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
@@ -47,7 +47,7 @@ src_configure() {
 src_install() {
 	einstalldocs
 	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
 }
diff --git a/dev-vcs/svn2git/svn2git-1.0.12.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
index ab7c62035ef9..f9d80383124c 100644
--- a/dev-vcs/svn2git/svn2git-1.0.12.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
@@ -41,7 +41,7 @@ src_configure() {
 src_install() {
 	einstalldocs
 	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
 }
diff --git a/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild
index dc22eca75dd5..7ff0f668cf45 100644
--- a/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild
@@ -45,7 +45,7 @@ src_configure() {
 src_install() {
 	einstalldocs
 	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
 }
diff --git a/dev-vcs/svn2git/svn2git-1.0.13.ebuild b/dev-vcs/svn2git/svn2git-1.0.13.ebuild
index ab7c62035ef9..f9d80383124c 100644
--- a/dev-vcs/svn2git/svn2git-1.0.13.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.13.ebuild
@@ -41,7 +41,7 @@ src_configure() {
 src_install() {
 	einstalldocs
 	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
 }
diff --git a/dev-vcs/svn2git/svn2git-1.0.16.ebuild b/dev-vcs/svn2git/svn2git-1.0.16.ebuild
index eaaa32f003ea..0db87be987a4 100644
--- a/dev-vcs/svn2git/svn2git-1.0.16.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.16.ebuild
@@ -41,7 +41,7 @@ src_configure() {
 src_install() {
 	einstalldocs
 	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
 }
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index 77393d1e3fbe..7f86d838d122 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -40,7 +40,7 @@ src_configure() {
 src_install() {
 	einstalldocs
 	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
 }
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index e80a2f323f7a..569e21bfba34 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,6 +1,8 @@
 DIST tig-2.3.3.tar.gz 1082818 BLAKE2B 0e9bcd02726b004c233a5efd7f58e4fda478dc1d2b738a7f8c086a3d71807d319ac8bd296b0f7c7569ed69a5b2b1db18e5c957cc5ce890a67b8f6ee7ead29551 SHA512 1d1cdf7184eeb3fea301c1959023f4aa97c4f8e25fc96cd61933ca39cf7549b6c7e1d9517f7ffd45d212ae9542ea4be07370b41c623cf6d0db8d025634b1d6d1
 DIST tig-2.4.1.tar.gz 1181900 BLAKE2B 85bb76008e5c10e94d97ac4cd88ac4eb2a0675ef5b45e9f21a9d2219cf0b6ed55ce52b579b831bc6c6fc530c89fb99f5dfd1f62dab3e1ab329e132707dccf908 SHA512 516114ed267a9459e356ca1af35c9eba521f9a11e9462cc5120cc7ea8fba4e54ea0a2e8e0ab96263754d6516354c296df541f8e3642392eaeb205cd88428077c
+DIST tig-2.5.0.tar.gz 1143004 BLAKE2B 77ccb2e754335f2ceaf26f1885cbca093d811ca479ef21fed532e43aab710fccfab85f1b5944273f53d9ed5ab0a5917392129c5d96f2c3c20d5da5029367b308 SHA512 26736fe241dd2dac25d5133ed847a7c1dab4bfeaad83af2effc8e523f8c6d8c179fe3ff05cd4343e4b1048c3c50309908aa32e81dd0789e35afe9bd8ff8772ee
 EBUILD tig-2.3.3.ebuild 1309 BLAKE2B c0ce1fc4074b0f10e4fc4320c9112dc83c7410fab9777d39b457658cd5465c06e3b33175b7321d88e33af34c8e4fbad9d2243cca51affcca009a670c5dff0b59 SHA512 d81ecd9f350604411e9e3eba6fe14c81ab0b3c90d19d2d8983f464eeec2d416ec5fc9e00784ff32ff37a601ab7a0e54f240c7a408eae190385d1f04ceb440a06
-EBUILD tig-2.4.1.ebuild 1312 BLAKE2B 70510a638ae9b2ae092fbc31fac8a8a1bbef8a00d9a88cf092514a5586e782527dac9dfcb72b47dbeb22da2b3514181202c03883cebad6ead38737363f49c616 SHA512 703d50ce120ea251b50a25dda0bc6a1c27e546bdda1053a0fb397145c637340c40f59016075b16c79d3316c308a306c944006bc6b6a8f224cb9d8530f2695331
-EBUILD tig-9999.ebuild 1312 BLAKE2B 70510a638ae9b2ae092fbc31fac8a8a1bbef8a00d9a88cf092514a5586e782527dac9dfcb72b47dbeb22da2b3514181202c03883cebad6ead38737363f49c616 SHA512 703d50ce120ea251b50a25dda0bc6a1c27e546bdda1053a0fb397145c637340c40f59016075b16c79d3316c308a306c944006bc6b6a8f224cb9d8530f2695331
-MISC metadata.xml 330 BLAKE2B b73d4c5a79937e78cff86c138950085a6c69ed2b28c8615d37065c7143df047237c014e8c3306b795a3b4fb64a4584fe06bf23d41caa75138f5d6ca07eb75b22 SHA512 bc921303a62d48f0b1b9792df22bf54c1555545c17a2c44a4f946b800c012067cc122011f7735b0f44d0275279450d6290970f127132dc6947ebe09fcba83e98
+EBUILD tig-2.4.1.ebuild 1306 BLAKE2B 0130514b0f3bfbd24c4fc6706fafb84c9c0952bc0f2550a8cd9f199cdb3ba94a4138ad291201b1727faa01a95e8642ef150ab76a7fdf3ee99c4ea0e2e11c4857 SHA512 450b990481cc6cad4ff908cfb9e00e2755a85b93ba0bc7a3e139c342de20873354225154caf83cda82dfd57dac6bb4a77782919860a9c2343d8b51a59b10f2e2
+EBUILD tig-2.5.0.ebuild 1310 BLAKE2B ccdee9a2425a67428edec2075c2dc55eb683557d87b680425589e37879ea740635715d61f40be567b94d53d58e729b43aa0b0b1cb370e0fca960dd82bd402544 SHA512 5ddc72ce517ca195e4d92a0f2440c5805cf871b27efaa968dbf2fcf0bbcf5b048c1211b3383dbf7092d33f4ab4d46f1d8ef605632c238d64994d76d1a837cb4a
+EBUILD tig-9999.ebuild 1310 BLAKE2B ccdee9a2425a67428edec2075c2dc55eb683557d87b680425589e37879ea740635715d61f40be567b94d53d58e729b43aa0b0b1cb370e0fca960dd82bd402544 SHA512 5ddc72ce517ca195e4d92a0f2440c5805cf871b27efaa968dbf2fcf0bbcf5b048c1211b3383dbf7092d33f4ab4d46f1d8ef605632c238d64994d76d1a837cb4a
+MISC metadata.xml 716 BLAKE2B 646f183cc6cc5110a69304f5343a0f1dcc9f42c82d8e16d0a06102b8052589d92bfffee948c78d2d4ce0ae6f29f1df38ae034c6fa160471823bb4457bcfa6603 SHA512 ae1521940d81aa080326f070b79a8a0a01b2ec1406088695e1e8462cdd78ce046131f9542c878ab5f919fa75e3c91aff0739a12511d18693ae050183db10343d
diff --git a/dev-vcs/tig/metadata.xml b/dev-vcs/tig/metadata.xml
index beb9c6e702ff..7f64b4433533 100644
--- a/dev-vcs/tig/metadata.xml
+++ b/dev-vcs/tig/metadata.xml
@@ -1,11 +1,21 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jonas/tig</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		Tig is an ncurses-based text-mode interface for git.
+		It functions mainly as a Git repository browser,
+		but can also assist in staging changes for commit at chunk level
+		and act as a pager for output from various Git commands.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jonas/tig</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/tig/tig-2.4.1.ebuild b/dev-vcs/tig/tig-2.4.1.ebuild
index aa1ad8245659..bf02b0fba850 100644
--- a/dev-vcs/tig/tig-2.4.1.ebuild
+++ b/dev-vcs/tig/tig-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
 
 DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-2.5.0.ebuild b/dev-vcs/tig/tig-2.5.0.ebuild
new file mode 100644
index 000000000000..149399f133e2
--- /dev/null
+++ b/dev-vcs/tig/tig-2.5.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	docinto examples
+	dodoc contrib/*.tigrc
+}
diff --git a/dev-vcs/tig/tig-9999.ebuild b/dev-vcs/tig/tig-9999.ebuild
index aa1ad8245659..149399f133e2 100644
--- a/dev-vcs/tig/tig-9999.ebuild
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit bash-completion-r1
 
@@ -26,7 +26,7 @@ DEPEND="
 	sys-libs/readline:0="
 RDEPEND="${DEPEND}
 	dev-vcs/git"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
 
 # encoding/env issues
 RESTRICT="test"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index ebb87bac58b3..73dde03e64d2 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -2,7 +2,7 @@ DIST tortoisehg-4.9.1.tar.gz 7960667 BLAKE2B f8a6ed65967c6389b65fd9388b3e898bf4c
 DIST tortoisehg-4.9.tar.gz 7960163 BLAKE2B bc13032ba1e36ed3e6aca978cb3917b2e5fdcf1b7dab2e66a34a0aca2e084960954f9ec135a1c2120e09931b876db7d1f3d0f3a8f69f950ff939eea9d7814523 SHA512 cc7b0360c6b362b0b9695a484b59eea879e1d4e28ed68e98ce6975342a22ddafc97976c5b0cdea289bfd78932dacf76c0b236e36bec48acd48ee361f2c09ff13
 DIST tortoisehg-5.0.2.tar.gz 8002109 BLAKE2B 3ac66a0b0f943bccc1e9d38f6fb1a788de0e5b538fdf42d59da26de641913802116a73039a2c3516245c1b6abe325b0dd9ca5b2f1c2b60e2dcc6a600e5f1fb97 SHA512 d33916cf3215360cada06de62db46e70c555b1f4cd509f0b863e2baa633e2c5df99f09f3a103444c30aa0a6e15e2acd7134f045cb3846cccc7b727482d94e650
 EBUILD tortoisehg-4.9.1.ebuild 1969 BLAKE2B ff541757572e30cdc72fb69da7d62b7dd78d28db6e92e48ecd7b6b04176c71d521c4e42aff55834e9fa1d677b5994a5fe0be95647870975050cb7ed8ca7aa327 SHA512 d487200fbcbe84396376ad775fe3461c0096bb0734649e3230c86dd0b0b628ee5f2286f6415431628811e5e695387238d53dcde369d0bfd25a52b66ceb7ae26a
-EBUILD tortoisehg-4.9.ebuild 1968 BLAKE2B 852d22638a9369c028d1a017c059ee8a6ff8ef7c864dd9d16aff2c46f1e405b1f9f99ecde84159b2546587ac2feaf1aa802dbf6ea0a348ea2ff541a147d79331 SHA512 d3c785146240b0572de0e7776a6cb93d56983a5692c699827a776be7a04add1f085ca165a08b00a1ae3d74de1dfe4b172f4d6fa7ca3ca3451e714fd0bbc62bef
+EBUILD tortoisehg-4.9.ebuild 1967 BLAKE2B d8a4af0e86d7d09603e53c07d6b6afa637132bd0ca42bacf206215cbd3f0f89719a0adb718a21e0a26ac9a0c5727c101f88c7fb556e180053e4479d598377800 SHA512 aeaed90010a9b8ebc579a742e763b2e6740a4974796443db7111a0e2d4a3e447002b0a2d1dd9c5602f7f3d59bb6460e02e8a3175be7ef6dbc54e74437210151e
 EBUILD tortoisehg-5.0.2.ebuild 1968 BLAKE2B e0c39b086c76f073d6d968e5158d0e764974614f10af902fdacfc8ccd811e809029009ee58c4b2d332540e58aaec341c741b6e7db1c1ad9cdf9eba91512599eb SHA512 1a65dafa51246db60e167aa5a758937ac19925b66970c31efc56dfe816d0b7a7e5b563139887ab6e27691978d00f622fb56d640ebe7c50642f39852beebb7ebb
 EBUILD tortoisehg-9999.ebuild 1968 BLAKE2B ecd39018aac1e90b9b1811d77f6f61c13c6497095913d78386d5df43c7f06775eec96cdb3173740f8ad03fbe65c2a8053472b34b6de381bf667ee1df6fee02c7 SHA512 55c5e57b0f72a2487395b60252b7722b15fc9d79f663d262bf91ebc5d20590b67f3a3242c6e4dcb0e8af99a3d510b1759a0b71dfdc6a744756eb50467fc12f84
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild
index 29130cae336a..6407cbc54664 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit desktop distutils-r1
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
 	HG_DEPEND=">=dev-vcs/mercurial-4.8 <dev-vcs/mercurial-4.10"
 else