gentoo resync : 17.02.2020

52 files changed, 58 insertions, 162 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 11cff41eb393..84dedb1913a3 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr-rewrite/Manifest b/dev-vcs/bzr-rewrite/Manifest
index 675bc40d4f91..b5f30377fc61 100644
--- a/dev-vcs/bzr-rewrite/Manifest
+++ b/dev-vcs/bzr-rewrite/Manifest
@@ -1,3 +1,3 @@
 DIST bzr-rewrite-0.6.3.tar.gz 33045 BLAKE2B 93a884ad225bf6953be8b052500a5a98b36b98b434c1afb1f73548e898f60b6716e974bbe0bb2bae54ca57713889169bdad11365759ca34bad96e4b2c97e0891 SHA512 f1a55307e80090dcc3739e4b111e08b02e4c4ec07ed479a5ac28d2d40535a699492eba785c142d8f6396032ed9db143d86dc68dac5280c071b79a9818ac69250
-EBUILD bzr-rewrite-0.6.3.ebuild 529 BLAKE2B 5b7dc2afda81ca0656da761b9aae786f786068271900c2149f49a7554d6e162357fa9bf4f77ffce024dbcd52266a8211f68daffbd7f13f9f16c8fcf1e988dd92 SHA512 e24f1f1bbec7071ef6bc890795454bc1d161972fcb185002034b753f4870e16fa389a6a6072ec52cbe01e73d41fdac724c43f1433c73fce972b6e93975c55474
+EBUILD bzr-rewrite-0.6.3.ebuild 526 BLAKE2B f39be67421ab720c7a3d6473b4654f73b91b25853582ec7d81db89b132d509e6d60a53de2f9c7a30032b97df0466ec1206b49f5084ceb50f37397503d4cd543e SHA512 68851b9f7276e905a6357a06d2585793e3949e8b858f90c782685a3706e0dcd93a9a25eaa3793463bf65a4888481590b8dbd21c96fd8bf7a3af3b0e2550e0864
 MISC metadata.xml 251 BLAKE2B 08c15ece32d9da3db50c1eec9624e2befc3f75886f704caec02d6b14a24648491c10c9cdaa25d7f69bce2531d73258dc54b28c92ef6d29d1742e4b5e516b788d SHA512 f05104f73a09c8e5501ef51ebb48acab3419ee56dbe8ba3a5a49be40ab77e952149f7e78f289773870ea5fd41c1ec82e72dd4ce4dd2a8e4264b7272cdd134488
diff --git a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
index 9acba8bc2b5a..1790ef8f80ef 100644
--- a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
+++ b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index df925431ac47..4be76b4328a5 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 2572 BLAKE2B 02abd0690ee69b988180cdd697c0e736a03c76788fb7c9a8e3bd1fe174e696048d6eb903cea98abdcf3d992f4e4a391dbba053db14c0682c4497c59ca7b1fdff SHA512 a549317dedb1d0a68f143fcaec6881c1c961191754c574931712e52a32573822dd0f64e8519eacd58c13fcadbd6e682a9eb77144ac5ec350e90808efe1e2e168
+EBUILD bzr-2.7.0.ebuild 2572 BLAKE2B ceee68283742adfd7186d38e464d796d50fe3eabbfb69a335895500f6ca86e61a981b3a15e752673e93a16f735acd6cb4aa10d479b41e2928fe1637a7e6103a0 SHA512 f0988c207f874e74bdf0d37f752575c89aed2c9d864ab98286ec2559076a6222f05406219432d1438f40a7432383dd027030bc131436b02e70895dce18395bed
 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 5945657f23b7..38d45d5c3c0c 100644
--- a/dev-vcs/bzr/bzr-2.7.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/bzrtools/Manifest b/dev-vcs/bzrtools/Manifest
index ff660c6f96c4..af731b43771d 100644
--- a/dev-vcs/bzrtools/Manifest
+++ b/dev-vcs/bzrtools/Manifest
@@ -1,3 +1,3 @@
 DIST bzrtools-2.5.tar.gz 74508 BLAKE2B 8e864cc0bd1fa05325502fe6772d57aba29613d56160cf356a8a38417a4c8516f98d2f32798c2511baf06a5222a1a7ac3b58fb30b5f09088c1ef19356c4e15c4 SHA512 5bc07715a3ed525a9bed5b789ea7a4079c9a56a8ce798b2eff56b27e6eae574fac23b8cc96529a5ea44b8d4ce02c512a7e22d21f046801461ba38a8d2050aa16
-EBUILD bzrtools-2.5.ebuild 711 BLAKE2B 001abde572ef22ff24489c734be5acfc3c15823849417625f8d8fc26437ac8eb8a7dcb57d27c47e6ef1d912689f2850677ebf3b6054f00fb0f27499e9b75d14e SHA512 152319b6c5a6ec418750a7a851a0581d315d624b350719d7df1f3fb023699b72d2386606d9a5a41f2e096ae78a047ed4bf62c3e0d1bc9d98a42e3bc0a7b1860a
+EBUILD bzrtools-2.5.ebuild 708 BLAKE2B 3f1589c46dcda0a4f6d1cf646703d5bf08736c7747a1b235e9119c25514828501e1fd2e9108eb37d06d4fd24658a51c717065d8344091ab52a52a26e1ef7dbc6 SHA512 eec63775b69e2f4a88cfbdee3a22cc76a47f6ec688e7838e0d072e2ce225cec9a0fc06189cc752e0f92e1eedde73f39523ea6425b859caada798705d8f2669b0
 MISC metadata.xml 248 BLAKE2B 5ffacbef7eddd0193eb5d83d6d8e21f810abbb55db04c158d017f304fc0a1f92de4e6c7bcf23d0631c3b6116de8c037c0d3b0764989c2448d2eb223a0023de74 SHA512 88b165b7a532426ca6539c3ed0ca45b50387eeee1a37f677257bae71f4ac5c0d4e5565efa78166bfb55ba8fcf04cdf02327d976b386bc38a2335a81d455a5fca
diff --git a/dev-vcs/bzrtools/bzrtools-2.5.ebuild b/dev-vcs/bzrtools/bzrtools-2.5.ebuild
index 2edbba6dd3e6..c1ed2ced9c6e 100644
--- a/dev-vcs/bzrtools/bzrtools-2.5.ebuild
+++ b/dev-vcs/bzrtools/bzrtools-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/dev-vcs/colorsvn/Manifest b/dev-vcs/colorsvn/Manifest
index 76c12c51998f..81b80ee6d30e 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 1080 BLAKE2B e15531fb9e82ca62399f3fab1e41cec9020433a26089e78ac92f2c9852f7b962b656aa86746efbecfa33f21f291ac6713c160d5c13792f56f5ebea86c7e3fdb8 SHA512 f5a511f027a86b47bca88b8c13cd818a715db0f12571e542b8e9277c0c4bcf30e7a627a3d98406655823094fc8324711ba50755d7482264864f38295d8b88940
+EBUILD colorsvn-0.3.3.ebuild 1077 BLAKE2B 836f157f3a9231b600efa31d8a1ff27c1bf37b1905533193282f493bb95558fe72a38011dcd227353f254b63bcaa685cffbf8bdef1b4d2cee00e96dc0e912e15 SHA512 599439625fd74b163a45a6a93f75fa4becf6b499f7c2830a618ba6b63401cff58de24c7716b0781f50f43d9557ed664e62eaf1106184ad393f3c9ecb799a1a5e
 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 3d448b77be1d..79a6b6dbff58 100644
--- a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
+++ b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index be263a09a43e..d4d1eb943d80 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,8 +1,4 @@
 AUX cvs-fast-export-1.49-man-prefix.patch 201 BLAKE2B adf4cda892bd23628c032cc78390e9fc1e16128c1ed7f9520ad44771d48629d68b4438f824e0c062652b87eaf3ca8a85a80360987d2ac02b4f4c291e373262bb SHA512 e6c814b089ee352306651b26a4490dcfc7727c989f7fde02120bb6423d2862a362f57c31e7d4e359fdca382d76f66dbed57e49b7642349bc2248867d7f9fa997
-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
 DIST cvs-fast-export-1.50.tar.gz 440789 BLAKE2B 86c9f582090601fe97c98eaadf927902dbc8b0351a02bed3b1eca77c75641495bf2e457db3d75f058ccfc7f36c8800d59d53c3bd4abccf46fffbe324626273c5 SHA512 29c0e3e87917e5f11a7be318240bf80327a5f46b796d9fcbb6a6fd4fadc91fac924d60a74de80559d4c2713021b8a8a518e2dcae7594928e1d040f2c8614065b
-EBUILD cvs-fast-export-1.48.ebuild 941 BLAKE2B 101ad9f84224bc464cef4bb25598a00ab1151dc8ac6d2988717ae3d88def8cf544dc77e921702eba018873bc439bb26b799e96d3aebc596e382d944fd6ef6f12 SHA512 f03bda83aa58c75dc14a5138faf3eff4b29e85a4fa426394b8e3f9c8ab4e5d3229b18b964e09d60f89c7ab13759a4975caf9df2953e8cd0020fd4cec13cf10c7
-EBUILD cvs-fast-export-1.49.ebuild 991 BLAKE2B 7f81a3863ed59ec5eb0c9eddae2d16c3d16bb488521b077f53ced3495ba947d08bdcb6eee3729755699d8714b26225e33c041b707f15bfa499411c863aaf05f1 SHA512 be11df352379f6765d84021936c446db6de76b48c8d4d3b8b25960fe7e8d6cb5542e4006db68f7b1c1b7c6e01c23f30d7d2685e3b9970b98980d8fd58fe9b7b9
 EBUILD cvs-fast-export-1.50.ebuild 941 BLAKE2B 7846d1876e2f4de3a485e05ce5ba8aa428fb01f3bb12f864708e7f16d7a3d60f4259ae2cff50cd9c9dfcb38f2fa1e62f3276950939517d7139fdda46ec818449 SHA512 26074bc3d5969211f61b0089913b257f62522a6c37e99d4d1559f8bc84d9010a7536ffdb36dc0704f814ba2cb8e5f89a04571f1df2072be0786524dc28d44403
 MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.48.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.48.ebuild
deleted file mode 100644
index 50babdf251fa..000000000000
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.48.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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"
-
-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/cvs-fast-export-1.49.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.49.ebuild
deleted file mode 100644
index da8067316880..000000000000
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.49.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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/Manifest b/dev-vcs/cvs/Manifest
index 1247647f7bfe..ae4495da209c 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,5 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r12.ebuild 2965 BLAKE2B 90aeaa68ff3266954287b81a8eecabc0614bb7a0f17b4036688e3fa400d309fd3c5c28e59029d209e96a0d0e287125bfab70277d7569a62a8d06b643aae3fd26 SHA512 f356680d2ae8ceb0b257021846bc2d9a4e08f67e0c13d6ffc7bb6779078b69f97cc9c5c8ee11c996f0ed7f455a43b3628cef407104716f39b7cdba591f6e1997
+EBUILD cvs-1.12.12-r12.ebuild 2965 BLAKE2B 8b99b2b5745cd94f2ed0da1fa93506ab3bb77f95ed7a89121a238f81967914e795cd12148d4799f9b4b5613cd86356a90520d0a7b8cf857fda706d091af74bd8 SHA512 ca699a2b6671a3156f63a431e16e0542a4121f41f50ea3e807fa6de0962652f770c69d135d460de174e7fc7c885fea91e0e927a03c4a02635b1980fab42da07e
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index 4b4172400eb9..94360c45f7b0 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/cvs2svn/Manifest b/dev-vcs/cvs2svn/Manifest
index 5f09fab88ec5..c30d32e61f11 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 1226 BLAKE2B bffaff00afc4e03208300fac0bcbd34681a87cfd2b6a631e93358332c3f3b04873f9aebf3c9011931fbf19be297133417a4c39b212ffe0b5ef69f01a96c697c0 SHA512 a7713cb07f69b5a7a4c0a875610a55efe1fda466051bfc66efd0c3942112590ed82b8efd437c6e2382588aec17f8591ce89ce38c0c61a341e2bb020d37a38e71
+EBUILD cvs2svn-2.4.0-r1.ebuild 1226 BLAKE2B 3a5d9ce58394672ba4ed627eec66dc2ab11c146a8561edcaa7568695478156806d1813b30e3f749dc56dab1607a1642cb731edad9f2ca47b5af322635c1ec664 SHA512 ea0ae26044ea199d06c8ac0dfae878c942e3d68dcb8d852de78291e86a454a669ea43d47d556c4a2932504bdbd2a981cc49b3b69a85e7b28e7267d9cfddd2bb5
 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 5e1c14dbfce0..42d4352728df 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index c02773a690b7..1aee2f8a1ef1 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 907 BLAKE2B d6b48f04387b04db687c0a89e05cb8348df8da9f6ac98f7e4c0c953628ab85cdfe36fb2c9946106009ed4ac038cd9884dcf7649bdf84104deb2e4fecdce507d1 SHA512 6a44090250709ebd3ed9a615cb5918409b35bdcb8bd5994a49d15f9e9314685a166e5a7d369e743cd69be14559bb4c77aa0b5106b68e09797519a6605adb0510
-EBUILD cvsps-3.13-r2.ebuild 1015 BLAKE2B 71f3abbc174302c619f8bf26bbd6a236a16fdcccece1774031c85b221d7005c7faf477570e217aeffa489876bb9315e63446478d5ff73164960c4e085056db44 SHA512 095ce3efffa6ba3bade54d99546e5f6eb0ec487708ed9e538109d8593a3aa68ff0debd9fff43cc9bbf8522d4d515c13ed2e0ae0ec3b35db8991765bf29a9b779
+EBUILD cvsps-2.2_beta1.ebuild 907 BLAKE2B c85a8d89df055f6471621b0c21fc4a0c5b7fd98145e49caadfb16b7dc0a74913efb71a5d91793430e9b7030db2088759567a04beea07b5a312570a07b53886b4 SHA512 6b80ae75079b43b6ef870237e9c5eea2ea7671e8f957172ed6c4c91819a9b2bd15fa19e62533cfedb8d7d22c7d56413be953bc47031af80f33998f92ecce89d9
+EBUILD cvsps-3.13-r2.ebuild 1007 BLAKE2B dea5d851b95511f4c76da4bc30c8fbe3984eef2a9125b1004c392e7c870a8f9d38905bb864beb78989152f9deed6eaa69d77cd2795a9010979412a3ff4d0ff30 SHA512 94d9ad4ea161fa928b4fb2c799fc8efe9ef6a5741f44d09b0764dba859d960f1f4ec12f6c78b2488d3cce125571b81ae58138f595627c7324fab7ca21fbd59ee
 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 44d02edb71ab..32856e3e3523 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index 436cdd749942..2b627a3015bd 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index a8e2c2a26be0..067f9f326378 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -15,5 +15,5 @@ EBUILD darcs-2.10.3-r1.ebuild 4751 BLAKE2B a5e2fad1a29d43c82f7e3f6f38630c3201ca3
 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 4688 BLAKE2B 564e2205a2d516f0620eedbf9f39c4ae86dddc7bb375503b4a2935c207fc0eb9693563056e5f3efea3f0ffd0d2a205752a227fa2e2ab0623afdc5d723decceeb SHA512 ca981b4bec7013d6d269a237885e9aa2d926f580d90ef503a451e8b61219caac631c50d532f27c6f2a07ad9f7e8595774acf3de426151e8f03d5c4b645b21724
+EBUILD darcs-2.8.4-r6.ebuild 4688 BLAKE2B 37f94ee7db12ddfbfc420e50392f8c74ff03f318493408af2f89fc816c17c272d330df151762fd85ab5fb3e13b347b9ef8512530a90f5d2005a397d9991dc60d SHA512 e936acb00979b02fd28b4491de067becd68074704efac625220c7032b3ec9773f1c99b5cc4d7320ef534ca80e6f0d61a8838c808ebb0234cf1f256346060a54d
 MISC metadata.xml 593 BLAKE2B c4ab655306f001cc3fe3007152e25d32d97fd3a87db76051c6c75b1d53c2c6ebd2105b2674bea5872e678b577c3cca737a3bbf6fe89923bc4f780ea2dc8642fc SHA512 cab7d36edce3f7da1742ebf086f69468f2745cb58fae83e74fa3e6016f4a7285aaa57100fed17df47940a51029ea78892147b7fe86ef2e456b7e34cc34a421bd
diff --git a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
index 060d5f33281f..58fe2fb10812 100644
--- a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-vcs/git-imerge/Manifest b/dev-vcs/git-imerge/Manifest
index 0b0dc6af3bc6..39fbcdae1fe2 100644
--- a/dev-vcs/git-imerge/Manifest
+++ b/dev-vcs/git-imerge/Manifest
@@ -1,4 +1,4 @@
 AUX git-imerge.bashcomplete 4714 BLAKE2B 5e994a45e4d243611078a8f9d08019d24ce9ab80d4f59502e47bca94baadf122e8ae9a6218b58c4268a783cc5d7e03bee7bf26d8a39d853a9bd3ac3edb189133 SHA512 a1399072ca9a775acc4ceebbb2c13c1608687df68f01b407e1b3ff8f9ce01e748025ac02d88bf210af609206ffd0f6e578495b3c2a66bdddf9793210714c1b42
 DIST git-imerge-1.0.0.tar.gz 58736 BLAKE2B 16665436d10d07058eeadab5d53a2325d68174f6fcf1748948d0fc4fbe11ab4fca87853bb557e167b0f485351aedd72889fcedaa70f09439d7e66b75a61d318b SHA512 919b80f157d635e3a3eb2b05cfaf8f6a7034fe6f43529c829fef0152007bce3bf5b296cc00f6db0c0a711bfb9e118c4adb0f5a2641ff841c973ff12610473e9b
-EBUILD git-imerge-1.0.0.ebuild 1086 BLAKE2B 9f1e653ddbff0afeea15187deb4ca323db017f1ed50ecb92005a402aeb0f97ae56f6c4914aa7952614d291958d80bb954ce6d7147fb9d69c7c874867b861c0ce SHA512 2f20db7c1d87c4d9ffd0e4dfb786ba12530456d2d80e4d265d74b26d10b170c368894660013929a65149e2831f21acd4d2e69d8fcaaf5cb1110bea340ebd5da1
+EBUILD git-imerge-1.0.0.ebuild 1080 BLAKE2B 7faa2cc60c3ddf4dfca2d74edbf7e8b5499e6578a4355bd6e4a2c9e12f2f4fa1093f4878cb348faca9b1d7c66418ce21b724883ceb4ff7ed7266c6648c2049e8 SHA512 6f955d6a495b38b30c2b9b7d761c644451f7f64d990605c1ad400eb276007b9df4dddcefd92ae74ea5fd92c2f547bb70a0e2addd9eaf001b11e601cf4bec914d
 MISC metadata.xml 250 BLAKE2B f77aee69210d3e363a8b53c018b9e998e521b273b6e10451a467bcefd917fa2f6c3443000b603ab6355bfbd091b4b366f869ca5e8e695f9846634683309aef48 SHA512 c5b2424b4f6fdfbe8267055899a39cd14d992aaea9fc8dc6d007ee495e97a2d4125a9abad94c17a4c646521759fa998a3468dae0ac4d8b12c09926fc24e7403f
diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
index 3604eecc79b3..424d661ab002 100644
--- a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
+++ b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 python-r1
 
diff --git a/dev-vcs/git-sh/Manifest b/dev-vcs/git-sh/Manifest
index 43868ba72f6e..c010e81e3aaf 100644
--- a/dev-vcs/git-sh/Manifest
+++ b/dev-vcs/git-sh/Manifest
@@ -1,3 +1,3 @@
 DIST git-sh-1.3.tar.gz 26757 BLAKE2B 096ae57f6482c915b13d58370291062c5b01637e1ef2743e21024888c0a485f32dc95c97d344ff91d51617f20aa602b4af7a58206abff548c6383374fdda93ec SHA512 8ab742d0ff86e8387d03e2e190eec8ffd4725b1bfa58940f6673f5eac8c749931e3b3f8f20b898d933db36f56b323f800dba47a35294f865f456512f19a7846c
-EBUILD git-sh-1.3-r1.ebuild 523 BLAKE2B 417ba4207c9b35839ca7d399c9545056589a8679338565b658709fd2f0c354aae1bd9b310a9bddba193b50fe0a92baf31327865e25acce87dc49253ee9a47175 SHA512 1e7be206c504fa4bb3ebc42af12b2f2dd25b8646561407d06a88be0e4eeba0f0fc0bc0b7bb89304dda9dabd77c212b313255549e12fa9f1ce98ad6ba9ebc7057
+EBUILD git-sh-1.3-r1.ebuild 520 BLAKE2B 848eed0686a144baaa11658d33349fd769a7b63062f85da9f26b0baed39268bf08795034b204ed29945c3054308a584d4300af05b2385cc65aa163117ca5c9ee SHA512 5d271abefe4e33962c80c9a14513103f54682b55fb0831c3bedde24137afd4c471ea932d1eb2612c2e325d9faace6be400efb5ad6329491a2e88773401de43ab
 MISC metadata.xml 252 BLAKE2B 0c1cd3b36e632a55a5792e1721f07c6872f53f370381ea33b58a5aa13a8fc7682734089c367f1e256f85d253c31bae48731a7cb9dec8f97381a581da47a5e557 SHA512 372af9cae870023c050be3aaf92200a8f503f2715c062849e970b79a6bd289001577a718d6720988f28f7bd675feaa347d39346983cf46836ccac27f72462aea
diff --git a/dev-vcs/git-sh/git-sh-1.3-r1.ebuild b/dev-vcs/git-sh/git-sh-1.3-r1.ebuild
index 492ad3b6dd08..63ae07a37178 100644
--- a/dev-vcs/git-sh/git-sh-1.3-r1.ebuild
+++ b/dev-vcs/git-sh/git-sh-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
index 126bf90f62ce..f65ad99c787c 100644
--- a/dev-vcs/git-tools/Manifest
+++ b/dev-vcs/git-tools/Manifest
@@ -1,3 +1,3 @@
 DIST git-tools-2017.10.tar.gz 28049 BLAKE2B 64b5f90468226dbeb4222f0f7be77846deffa836d6743e970c9bffced699c563712c24851e112a922faf3ae4b56ecc8daf0f5f772936c43a95c3907a244a6efa SHA512 60b3006de64a4c26f00241b60d45ef8258999dabfc0a8ad1c7d6d6b386dc56caf8c3b6cd0edbce5e27277c8f900b736fe1e26c6a68ee2179f563d00d65fd7cfe
-EBUILD git-tools-2017.10.ebuild 946 BLAKE2B 83bae1059ba37ebd9c3821670df31b1012aba53d950a3e4acca0f96c6c7b3a54eb168b54ad378cef984dc5e3c0331638e06aa2e700439df47f1751b0f89b68fe SHA512 fafe3de661ced560ff17443555b27ce77c838c9a05c6aec2a7ab4f19d3c231453de3a3f773d8c5c6146731749fc409c1a80e6788bebf41985e9ca3baf7ca1c3f
+EBUILD git-tools-2017.10.ebuild 940 BLAKE2B cf6e3a69a6f61367f902c222b0b1ca7f0bf688b71fa31ab5444f6d7968a460c3fcc04c05dd522b68b6d4ed1760fdb50e07a0126184299e99a31f445f3302546a SHA512 02d6440710a003871a04ff1da498967d7957fb700af5ad54ee7e8580857942c736e1605cc913e4f50defed57c4dd84664fb976fda51a60dc348104e8e9e1aefc
 MISC metadata.xml 303 BLAKE2B 1186af6cb426673a5bc636e1b9aa02377c0cff46fe7bd3313ce8499ec3d53faba66ed52834cd98ecd3a097d20e770adfd0222df5750709861bdea30f2f8816c8 SHA512 1d21c90c1bc801085cf2bba4e75f1413fd232853d651f6db511270eb5ed7d9c2648d1b4e94808ff7ab87299fbebed167793e0563fdcce5bedcc6ae8c8c945a19
diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild
index 555da1d3cb5d..7445f4d682a3 100644
--- a/dev-vcs/git-tools/git-tools-2017.10.ebuild
+++ b/dev-vcs/git-tools/git-tools-2017.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit python-r1
 
 DESCRIPTION="Assorted git-related scripts"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index abcfd809de9a..7063bd623588 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -24,9 +24,9 @@ DIST git-manpages-2.21.1.tar.xz 440316 BLAKE2B 658232d29bbca3b55a6797d5008f2f6f8
 DIST git-manpages-2.23.1.tar.xz 448432 BLAKE2B 0de4b2c0dcc3a70188a66d8aa6e16aeaad84a9f16b764934b06f61773db2d5141cc0b1091780d126f29a1f50c767a54fbb7d01a36f86d387d8ccb4060f48156e SHA512 16145c0c2215ce6a3aa9045f35f670258f6823a765ed2feec680ed980420d1bb008fc39d8f379c81cd0b259fc582d15e42395d4f954171b20bcf214ab25e41d7
 DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90
 DIST git-manpages-2.25.0.tar.xz 456636 BLAKE2B 672557d167b7d2ff48089bc5be1fa446f25eed4412d6e48549d5907f7addab9f721a03a8bcb7ca3fb1804220021566ebac549d9878df9f1030f283ed5e44ddf3 SHA512 3ad1756b1f12898823a8981e3b650f588c6c1fb2d51371739c754108e67c2cd13e4d2bcb8291534523eac60e7a05253d4ddf2f3528e28d4e1b50eafa42168847
-EBUILD git-2.21.1.ebuild 19095 BLAKE2B f30353eb20be8e7c6dabf7649fd3903ddf41fa4e994294831d0c85881c20c246d396a71fbbbf23416b01fae0b58a68779feff0a379cb11a8a9f9660bc901be72 SHA512 e62383957ff0e73dcb35c628c180154d29138d6998d0ecb6beb0411db6b731c3d699c08df1dd43279de97ad2e9f8b68177d5289c89304949684f20115b10d205
+EBUILD git-2.21.1.ebuild 19094 BLAKE2B b8cae80c578a1706d6630b0de4507b03849aca4fd52736919aaba4484953d504afbf9824d033030ca8299de90985c11c6dae3cf6b06d0c6ea8bfeb30bd885fee SHA512 acdb6312f1190cd01c898f6e112b7238e9de23e4ee0d738068ba287f4471d1987720380dfdceb492d02ebacd051728bec4165c6d12a008d3c8b949091b656539
 EBUILD git-2.23.1-r1.ebuild 19574 BLAKE2B 7a0d11136a9affa4b8f778ca030bc29a4f209a89bc07bbf2290ae5887eef0b8bee7caffed97e14315a1ffc414f9d8b0bb511b12879709afa36599530ece65072 SHA512 2af3a45ea705d11b9925f1b74c0b465e84ceb5d82d95c1fc45fc4f301185ef77de18fe59b4c84488abbc780098aba910b27bc9ec95b726af26634b32f1e31e33
-EBUILD git-2.24.1.ebuild 19524 BLAKE2B f0efa75a1b2ba691649d86f505d509a02c46bac0c1a8dbe7a8bc848fb50ade93fd823f2dfb3772c678133d332f76edc32dc7fd2a6bcf6d5f738f408233ace672 SHA512 494825f6024b9e8368bd17bbd971cc66fff5e5e86851b8ef9d28d3006107fbaa1e461b4a73c6256d5e99d0236ff9c965aa45fe3624e81ceb33d4f7371379d555
+EBUILD git-2.24.1.ebuild 19523 BLAKE2B 7c7fb815ec6e0b7bcbe080825336c56a3c99c912b636ce198046989e1462b0b8daafa28ee74c8351d6d717f2220d944da62ff65698f2eae905bb91ea0cc8984d SHA512 82036fa080e5bdf5afb7629f7ee83f76a0c37b0793efafca8996dbf1053ae73307823117eebee91a990615737c0de37cd0a3892542f9519ded3b5096a26849ff
 EBUILD git-2.25.0.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342
 EBUILD git-9999-r1.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342
 EBUILD git-9999-r2.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342
diff --git a/dev-vcs/git/git-2.21.1.ebuild b/dev-vcs/git/git-2.21.1.ebuild
index 732aadbe89e7..5302c78a7fa8 100644
--- a/dev-vcs/git/git-2.21.1.ebuild
+++ b/dev-vcs/git/git-2.21.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~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"
+	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"
diff --git a/dev-vcs/git/git-2.24.1.ebuild b/dev-vcs/git/git-2.24.1.ebuild
index a1583d7647a9..a221c8fdccac 100644
--- a/dev-vcs/git/git-2.24.1.ebuild
+++ b/dev-vcs/git/git-2.24.1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~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"
+	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"
diff --git a/dev-vcs/gitinspector/Manifest b/dev-vcs/gitinspector/Manifest
index 2f4c640f52b0..7d287064df17 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 1128 BLAKE2B 29653fb2047ac5e7c178e87ab0745135ad0cb0880b094510c9b16fccfc1dd08f24b2bed35ff29a211ba41a187783dfaf4b5631bf2c7909305794098090466e3d SHA512 7b159734dc648b38abc82df70a32c429c4460db20ce3481b4bffbafcea1afb4f7e69a8452404e0f26c6f1499d81789be6faf407252aea09d3f20a3eb3ba1e03b
+EBUILD gitinspector-0.4.4.ebuild 1128 BLAKE2B fd9d88d966b52003cfac23f62fa77eec7a0e48eb09eb8b8bd9f678fc8207dd9632b7a28bac636e20ddf3485f1ac909f2a102d4e0358776482af448cd096a4411 SHA512 d148d419a8e852816bc468a2a0058eaca99c2d85969e6d839b524c1e5ea87bc7d53171ff1ba62b34f4b30c1238df4db6a25f53ef5630e36502dcca68051963bf
 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 aff4e2902546..08058dc071fc 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/guilt/Manifest b/dev-vcs/guilt/Manifest
index 4e94566aa458..1b5c298e8b24 100644
--- a/dev-vcs/guilt/Manifest
+++ b/dev-vcs/guilt/Manifest
@@ -1,4 +1,4 @@
 AUX guilt-0.36-fix-help.patch 1192 BLAKE2B 1e2802baf7aad902f180a8b477cf163c383cd59033dbe6863f3d8dc83a34effdeb46f6e800fd377605bb4d6f295dcf63dac765eee0ec8315b5a7b8e497b5f447 SHA512 2dcb6db0ee356b1cf4366a25f82abf6c9170b424fe3884d7b3259b6363afb9966c0e33b6b8bf5707feb229dc75f0555b02506ff7b26a8ec3ead206e6fdc8bd6c
 DIST guilt-0.36.tar.gz 64624 BLAKE2B 8514f0fa6c7dd96e3a8c90939046b45b2e3115f2361a428ad58e1c67db0cc73cab1304a1493a45b1fda2928cc8a03b03e2986c845c826bcd7b491d264d3d1333 SHA512 882438d5b9ed4d16e3dfc95ddbef6ec1d76860d82aa6abc78010351577fb65578f919c6fe55f9d7593c82b0eae2d0dd80d577eee906fff84a426391936242652
-EBUILD guilt-0.36-r1.ebuild 1315 BLAKE2B a8c01120d6aef8dc454e023ea5b6a96fd7942a056d69105897b5cea6742ff64badab94b0bf15bdb70d3f8d7f30263f0271913baf184a557462c68968a649960c SHA512 434b5febab840c1e1351539ee88d3111d152ccdf76b371067174e3732a17c021925622104d9c8de93e77f2c30c3558c0e94ea85c2a04d341b94cea8ed474fcdc
+EBUILD guilt-0.36-r1.ebuild 1315 BLAKE2B cc942cfd90495c8be50b4c2a2a055a5226b1f3516b22d0f074ab1ef0bc8ff5638cc38ba386d1edf5885d0dc311e4ea5b05ce3ad990b2271e0f165210a4d2c04b SHA512 85bce6aea1a7ef1acc0b772a2e048a429b72f0a550525fb46c96b0f883abcc5111972eea64d7b6c346288a0c4c34a0444f14e73d48fba677b44df5d0d5ec990b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/guilt/guilt-0.36-r1.ebuild b/dev-vcs/guilt/guilt-0.36-r1.ebuild
index 1ab2f14f1ef0..3e6cbb7ac98b 100644
--- a/dev-vcs/guilt/guilt-0.36-r1.ebuild
+++ b/dev-vcs/guilt/guilt-0.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index be818b3590a1..a06d2ceab09f 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -8,8 +8,8 @@ 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
 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
-EBUILD mercurial-4.6.2.ebuild 3573 BLAKE2B 1d8b75759f9e14cbc847e6ac2a693b4dad67ed08044b0836537c2db0f1661fa1ae89d79aef29d5372868705d6b11059ef69e99757d4a96322e798d8ee8f82f38 SHA512 3251d338787121d15e900853efc0addc5d1ba5b8b928be8a1e91d8fc80ca3f1527431963ec6675dd470e7704e2632a787d26e5b2c1a078df9d06e665ba28ddfc
-EBUILD mercurial-4.9-r2.ebuild 3959 BLAKE2B a1a5b8c374be038543980591a7518b2c84c1a8ae08ed0b6f40ad4f1062c1db2a9260bda0c5951ad1078ea3e34bb59d8e378a9eb8045d178c9c1a0141ecf07c24 SHA512 c6bb1988e1ee6bd63d714b6d54c6da48358522e327666c4d43225c2eb43fb3d5e01cb46ea01d3dfad5bb42631d6f691bcf3b76f8841d9000cccb11efa2870fb5
+EBUILD mercurial-4.6.2.ebuild 3573 BLAKE2B 8146e9b23a2111f40be6db77d29d721afdceb1c9d4b041c4257d2ef41b8d50bb0b5aabda383c7aac47e0465b29d7772403264446cfac51e45ff432d45919d7ef SHA512 d58ac60e787e1e76e801a601f4b95b092dc0fa03cbda1f87ee3e15909fcf07027e8fcd89bd1cd4e7e212c615af97566857e4301729f5aafea3f0f140ce90ccdc
+EBUILD mercurial-4.9-r2.ebuild 3959 BLAKE2B d3dcf5e0460e3307108185ff99c2f47bc15d9887eb2268382aec1f8d7b57774e90578dcc641ec108337effc7afeb54c969d92954138dc014c99e290789c5dd36 SHA512 ec4087db8f1b7c60de1a5a661c6581214b3fceb463e6269badffc6899fd0d5becf0bcdaa28bd9a2b7f1ead7846d0c1b9adb41526d9722d12a57780035d515f75
 EBUILD mercurial-4.9.1.ebuild 3968 BLAKE2B f08b6484565bfb45caeb82104f6e4c947a6d11b36747b723ef51606139caae49f6e0d8e2c076e9f64eae9c122ba3c5645230d1b1847e6b3149d3b615eb9fd510 SHA512 2355751f9e2b52ca4ba54df7c7ddf7c44fff5092842a00341bb9c686abdd3967ca256cd607bfc862d3137b6abf97f99e706e97ffa7770dbe8dfb38872f00ee1b
 EBUILD mercurial-5.0.2.ebuild 3964 BLAKE2B a03add4df62dc635fca9671af74a4738f69ca9b3b230a2cffc7d41e36935c2ff00173707044430eed646ff220ae7f9c13e9d1b8cdf110462ce6053563276a409 SHA512 ca085e487b6589a4624ecb02e4ab059524a5d7ee46c2616d4abb59ee54bb1b280a0eaf599ea7b65b955cde3e60421cb97da11170f4d1c6510f1e74abe42e45ab
 EBUILD mercurial-5.1.2.ebuild 4057 BLAKE2B a6dbbdfbd7ef5edc1aaec295bc38f1fb2dc088750cf2a54c644c641ea945cc6d6952033350a3c4d9f3366aa084b1aceec7462c7add7870683ea438bd1676f666 SHA512 40a882d2b8ab49e4a2722b4424d667503e8b2f39686767f863560d1e194ad1999cbaccc2a8aa692af69645342b9ff4bfbf967e11d416eb4ecab2bacd496cc59b
diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
index 0f14591a2bd5..eb2b0fe3fdcd 100644
--- a/dev-vcs/mercurial/mercurial-4.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
index fec507f335c9..2bb6186ecadb 100644
--- a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-vcs/pwclient/Manifest b/dev-vcs/pwclient/Manifest
index 629831bd951e..53b8b63b69b2 100644
--- a/dev-vcs/pwclient/Manifest
+++ b/dev-vcs/pwclient/Manifest
@@ -2,5 +2,5 @@ AUX pwclient-20141110122616-0001-pwclient-handle-missing-.pwclientrc-better.patc
 AUX pwclient-20141110122616-0002-pwclient-use-print_function-for-better-py3-compatibi.patch 4005 BLAKE2B c591d837988f4d5f698ad9c723b77491ed547bb017f4382549b450856eaf570579ca3e1d8ac7506bac13282fd0527e177851171145104a3361a44664bc2c9ab8 SHA512 6bd87392b99a6339f71ab0ed47115a63a5ed43c0d3c1b8b56e2fdfd77ebb8f8692ae3074c6e858f44b1de5d9bd439042b9d50fa38c90712b62d524e4cfcb8ba3
 AUX pwclient-20141110122616-0003-pwclient-basic-python3-support.patch 4223 BLAKE2B d4709dd5a2f18647e646cc285a52bad1aaab7637f9b96dc528cac429b39253f0f7c9361cf81f851edfc68337f3805a80f8ceb4bc63098a037aa7a70bdaddf3c5 SHA512 be178e4f303ff777ed870a029561802e2294a53feed1e9bbf546b0947cc1ae0ca5ede44c6e73018c1a3370e3df388f5dc921459d9f0730f1152078ff439acaab
 DIST pwclient-20141110122616 23527 BLAKE2B 61a49c6104db0015d0cf9ea4fddefe3ccde6495d0a0caf918d858e535bbbd085ee5a80f856753ea547b1ac18fb22344036734a5814d06865bde2622368b88155 SHA512 4933b7c5b4129d5fa1e47fa09dd8a75e5e5aac3254d8ed4bb65f8e7363d082217deecf8fc99f53092b607c49eebf9144e335079472a790a0193d0c6cddcf433f
-EBUILD pwclient-20141110122616.ebuild 1042 BLAKE2B c15a84b5d5bc3bd69c8716c5c9c3e02ac0fe4e6ccd059b1305b4f74c655803ac68b75e6fa6a1032a348829388b06ec2065899c064ea002e34e875e5656994354 SHA512 1a6560d2e67d120f22583ba89a1a4aee36dbb89789be32977b597c37c86fc62e30c8e02480802639b8448277aa2ecac11f665bbb27d9a79920196b237d2a809f
+EBUILD pwclient-20141110122616.ebuild 1036 BLAKE2B 1c9cccdecc9dc729c7ab0f29450a97782e12d94dcda2aab86a4615057ae8871137441a72e6e2bcc292f015785c8e624383c4fd66bcd0aec17abc240871e831d3 SHA512 28d69eddfa087db27af643795213c4f479ce1940c93c8dad5aa13341c48287dde2fff85c00b019c82c19d107c8128a37e10f4b70f1fc1210e03b86db06a0b351
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/pwclient/pwclient-20141110122616.ebuild b/dev-vcs/pwclient/pwclient-20141110122616.ebuild
index bcf353082536..21bc9cbe3c0c 100644
--- a/dev-vcs/pwclient/pwclient-20141110122616.ebuild
+++ b/dev-vcs/pwclient/pwclient-20141110122616.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-r1
 
diff --git a/dev-vcs/rapidsvn/Manifest b/dev-vcs/rapidsvn/Manifest
index b2538377aaa1..18c52833b02c 100644
--- a/dev-vcs/rapidsvn/Manifest
+++ b/dev-vcs/rapidsvn/Manifest
@@ -4,5 +4,5 @@ AUX rapidsvn-0.12.1-svncpp_link.patch 336 BLAKE2B b3db001ce73052c733934298b6e043
 AUX rapidsvn-0.12.1-wx3.0.patch 5121 BLAKE2B 85dc9f1ca63d38660c4fe8106d642b818a1aeb4888e14daf3f572fa4e0d97389f18e96e6937474de68675de9592b04f62003074ddfcdf7a774be9a41722f40f4 SHA512 90719ee6f3b7cc9f3446afcca1f5ba27496cb3f1bd8311328b4bc01a02f81de769691825f5cba906183fd060a89a118c776a7cf549569505f0a18c12eb6fc6b9
 DIST rapidsvn-0.12.1.tar.gz 1087511 BLAKE2B c3e32766baab520d4de31387915b79b9199557f01269128853e366c2d75d28727bd220770c2683d78969cc1919c43089d4c2b1b81ca893a0028de4d0b9deb427 SHA512 892dab56e8ec19c5f26a0ddfab378187bc0325275f9fcf759c12beead70aab17876f7e5920bcf214fc86354faef58244ce25926ba010158f7354cd144e1c4c07
 DIST svncpp.dox.xz 1684 BLAKE2B 64725edae989b09b38fa3fff04aa0908356b67ffa8ab50abddf42f2562ccdaa80c9599f5c6790d8b1f2c17d707c227ee6dd8e114e8527362b628463690db17f9 SHA512 6314632b2f6a0f21bdd4644f856c8d60951c30135a82e509a7f929908dacb56462a2fa768c2e45cd7baf99face50fa5d4592a0691cfa1f16335bf64892933589
-EBUILD rapidsvn-0.12.1-r3.ebuild 2648 BLAKE2B 004dfbfe503d58751f5c6aa73810de34958f895a0ae442cf81551d143c958c7fce58d3f734b8d92d74241a461c47b81f1bcdfe5d9e9e60de705658ff60966ef1 SHA512 0d062ca454d71b7cb5c8c78dd9b76f41ba6d26760a64257704627ba86df9218b71f03e21b6607cc229d0f709ed693ea51dbd9c4060e95666046c9c07523139fb
+EBUILD rapidsvn-0.12.1-r3.ebuild 2653 BLAKE2B c4186e8252e77d9e90d4b67c6901d8a2dcaaeff37ddbd63f38b69b331ab5faae8865b699ffc3ea0d0d4a117c380ecb994124dcd0efd5fca94ce81889d976b892 SHA512 eeaf3ce18df6fc8d5006a2cec2bf686279be0647322d93aff7ffa13e6077ac63e117a3a9a06e8bb39c7e95f01629f3c5ecec416d9d5cf4884da279328ed72f2a
 MISC metadata.xml 389 BLAKE2B 1cb8d2d932e9fed848d341ff6b4f3a43d29ffb2f4465f3ce231344e8a62ab8d3b165bb849fc569d9936c0b8a4ffc0adc975cd3e1ab7eba27c3dfd73748945f5c SHA512 4f5598218e1d473e47a831b414cfe40edb305a903ff5a021b587ebf3687c5f2e2d775ccbbb4db04ff5d67c1533b59952c59652f9e783e6b16812e4afa0611042
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
index b9d42abac214..0bf26433bbc7 100644
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 WX_GTK_VER=3.0
 
-inherit autotools eutils fdo-mime flag-o-matic python-single-r1 versionator wxwidgets
+inherit autotools eutils fdo-mime flag-o-matic ltprune python-single-r1 versionator wxwidgets
 
 MY_PV=$(get_version_component_range 1-2)
 MY_REL="1"
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index a4e10cc57b72..70a1c6aa4192 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,5 +1,5 @@
 DIST rcs-5.9.3.tar.xz 800736 BLAKE2B aa3f17555e5b65a9d65dfa781f2e12496e282128d9412529f67a831b5d6035302a6f70c4fe0b9d9519a2bf02fc5a98d03f4aa3b86696fd27874bfa7549e8c8a3 SHA512 99b124a94f285d8c675a2a51397ca4a97468f053d42aecf543e9266f16aea6b2667613f565c3462ffd2350c28e22baa4d01d598e2cc7e1e940625086f6de0ba6
 DIST rcs-5.9.4.tar.xz 801360 BLAKE2B 18cb97aae7a70f9f12b1018d6b6b42fbc06dd96b491caa7ee5ae2a4a746339e22ffc93ead5756add62f8a08d5cd1ec589c242f0a75e9d78aff29b95114869b25 SHA512 c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
-EBUILD rcs-5.9.3.ebuild 894 BLAKE2B ca548841fe28e82713943fd517c6d1c5ab8960db76d16cd5e7e949ae2c8a0b4f35f1c144193a0eb8b095f76f8a98fa225e21b6c83e54b2119e671829d934000e SHA512 8dc2b588dc417f57295e2cd8200d04b806648559379a8b2b82dcd258906192f4ce44073716275b8c0fba0096472df1bfc23ae3c656b7f5e64fa68ba862ae550d
+EBUILD rcs-5.9.3.ebuild 891 BLAKE2B db1ad1cfb9d83d702935cea53e0ac1c24a4796986df337ef921300c8da9110f0796c4d5f8e3f5a20ece6afc2f588e78bda136ab18ad8e9a99407adf34469ba3e SHA512 666f4ba2606ad04a4439ccac2a80ce2099e5aab6dcc61707c38ea0dca67c2e4d8977de767e337c9fa0cad721fff3e462aefcd6b2c41f3c69c6282f1ab0e703b2
 EBUILD rcs-5.9.4.ebuild 903 BLAKE2B e46c2bde28bc2a318e63eddb1df11622500957f4014584ff3579f061e0fdc6c66378a98b74a174c5321dd176c08db0ed0917d6076abbfecf5149e29f543b3541 SHA512 fce7bba759326aa79690d510d5dbf3dd83a710d6f022eba8ab674a2c5a5ff6122d7dcf51bd706429d6dc65470237490ea7c9e3bf745bf92354f6e9f4c122ded3
 MISC metadata.xml 614 BLAKE2B 053b53062b14bba99cb48bc2c19af60ae78c8e0bebb378f6c7c8e6a3d5b9b5b8950d165c7c582d7c8df34c98c12a86e1666f2a7ab38c4fe1fa915cbe4fba00ed SHA512 db77e48d0c4775308f57044e38b8e41c4cd110b42c4a2c305b8d7d719d1885418c1fd534383fec0ed9c38d4be1bf731dd6d00c064afdd3ea0fae9c432bdd4c3b
diff --git a/dev-vcs/rcs/rcs-5.9.3.ebuild b/dev-vcs/rcs/rcs-5.9.3.ebuild
index 47bdf514955b..b94ad2867a24 100644
--- a/dev-vcs/rcs/rcs-5.9.3.ebuild
+++ b/dev-vcs/rcs/rcs-5.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index c467039d4d55..c6e7925f1377 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,5 +1,5 @@
 DIST repo-1.26 29829 BLAKE2B c5dc74214d404e6c11189a3d34c9a771ed5689da14e64588b5db144b6ea3ec38a727238d7dc6e609a22edb5b84d350210564615016f6b36599cf9e3fc3b34ef9 SHA512 1398fab95b4fb4a24fda93d4054384a801b5b70e3dca3a794f458d8e19582ef833ef5a3a0f3a571121d2d9172ce0e70f8b3c6719f6c2f47643ffe6de181e34b4
-DIST repo-2.0 30067 BLAKE2B 23aaae97c8512e329a4293d82c4e65583861d515dc079fdddbb73473ea0aeb3951315fa7595c70695cf94f030ed2bc97b134ff2aafe774b552132ac8cf4f4045 SHA512 a83525fa87a3fba8d78af1305dd92f5e51f58430bff20f63b8b743ad94d382ecf3edc1888c78f9da4be4d379bfa3ccde79aae5c1d8c173f928d3593ea42156bb
-EBUILD repo-1.26.ebuild 841 BLAKE2B b0c6dd45b5752a9b0d0af84f1d7c2e22a3556cfbec3cbe9aecaf22faadf34fb986c8ee520a8e18a979eb6d8058238a80195577aab3edccf584ae2d3c7f031250 SHA512 e844150bfcfac200304383c0b0f3ea9f77295ebc709b131546637fef96b1af3639cba783208cf0130311c53b2394153b894f2e7f34843f7c89cddecfe080e1f1
-EBUILD repo-2.0.ebuild 868 BLAKE2B 979642b6415c18093ad405a459dcc4431c3758e9d16e1c5e0fe12e88106680f57957975a5ffd8eae5f681d5f0e4c85ffd478c0f3df68cdd0d90f712102e2d01a SHA512 11fe9e4b77479d136d0b0f85751da243fa0bbc419a9ea3caacfb4e8eb55d8503b6019b822504c034debf715c64f9701297500d8415eb42f54ef9d1c886cebbd9
+DIST repo-2.3 31280 BLAKE2B b637a226c19bd04350f25c27924b8c4951be1ae09c3ee3f12643d5e2d983e51ee181b22c553ad7fbf6cc0457e0621fe083e21d8e577cd2b87c74d3cfd107ee69 SHA512 3c83799fbc1846730c085a43c603938b8daa8bb7792e130a55cd508cf416b67fa025e77f20770c6b65f9ee3fa1aa7240d47bfb8e9a3835ac5ea11e1fce9112e2
+EBUILD repo-1.26.ebuild 837 BLAKE2B ee0ba38586eab9a0b1975feae84bb7db0ac6998c096f1cdd7fb401ec0154afac92f5641a9cb39007f1cb0bfdf72c1a77a94b6e29a9ddd8e83e950ad669ea8de9 SHA512 d1123ba89621e87e6d65eec5120809890744a9073278d407d0f320cb1123c9897acac924de4dd2c2b0c7fc2a3263cceb276716c71af2db69f460e354115438ea
+EBUILD repo-2.3.ebuild 868 BLAKE2B 979642b6415c18093ad405a459dcc4431c3758e9d16e1c5e0fe12e88106680f57957975a5ffd8eae5f681d5f0e4c85ffd478c0f3df68cdd0d90f712102e2d01a SHA512 11fe9e4b77479d136d0b0f85751da243fa0bbc419a9ea3caacfb4e8eb55d8503b6019b822504c034debf715c64f9701297500d8415eb42f54ef9d1c886cebbd9
 MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4
diff --git a/dev-vcs/repo/repo-1.26.ebuild b/dev-vcs/repo/repo-1.26.ebuild
index 9d2c58695f06..f2e793147ad5 100644
--- a/dev-vcs/repo/repo-1.26.ebuild
+++ b/dev-vcs/repo/repo-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NB: The $PV tracks the *repo launcher version*, not the last signed release
@@ -6,7 +6,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit python-r1
 
diff --git a/dev-vcs/repo/repo-2.0.ebuild b/dev-vcs/repo/repo-2.3.ebuild
index 1632716eecc8..1632716eecc8 100644
--- a/dev-vcs/repo/repo-2.0.ebuild
+++ b/dev-vcs/repo/repo-2.3.ebuild
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index de39bb6bb9cf..b42f5599e5e7 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,6 +1,6 @@
 AUX stgit-0.16-man-linkfix.patch 429 BLAKE2B 11cd98b7a58a55fed445be700bc492a4fd926b9bac20a54e095b9c9470d6294a4c32800622b42e87ff10908a40a2bf71e8e139dc306ade3b4989c10609dcceaa SHA512 c71e32a6e6b007ebbbe738dae93bf2109d2be1ed3f3418c98c6ff6ebb602fb8523f974160276649bb66745340d752d69e87c9f0730ca3dd595a6b2b32a0104df
 DIST stgit-0.19.tar.gz 246256 BLAKE2B ece625a0f78f4a80a9a20b25d0638ee71475029ebd861b28dccc444a70d631e687372031c2dee03faebc8890b8742674d6fd7c2ee1794e8a2d7044721a254847 SHA512 0edad0c600145fc779262ddae4300d4718fd04316face62cb1fb5c01e39cb0824355091863aae8d5b14bee9ebb36ac591e5e0dc9fe343c12a7c781227cac6330
 DIST stgit-0.20.tar.gz 319696 BLAKE2B 85402c84148f5ec93c65be2899240ffa143049de63f734e56438fd17d59ba32cacd279dc3d2eb306ebd11f139f2b4183be814989443401f7d696eba93228a1b7 SHA512 45c4715f7b0c8d8e7f1104694feac7bff07428a6e532ba41bf30807b715990cc1b22a1e82757bb72eb886b987b7c9126d729f9fc161c03497c4d9fa719aae599
-EBUILD stgit-0.19.ebuild 1892 BLAKE2B 3eee0e730cdc540fcb7a968c888d4a41ee7383c078083a7fe16cad5b09baadabf0fc5835bf573997f1b2a868da8537cb287b7e07a1e46fa3d0dbc4570f2a2e9f SHA512 8f2915637982709dbf074d37c93a2d26b1e380846d27f243967fe713c2e7ce43e36869dd19d10e3f8fb025eb4ff98c2f86a4ae67e0b2221f9ea9ac00400fc708
-EBUILD stgit-0.20.ebuild 1897 BLAKE2B ef0799401e676b2e05e2be2ae16b0511f12e410ae1fe43472c75c988e56e00af7313c6e4e400b690b960942b9cbabf4ee00d77aeef5dc8297c2285e0fe0efef1 SHA512 d42b9e43b7c4e11abd5f0f1f5324e1a459617f19f053e7d4a81996615f1cf7d2b92c7b73f8726ad9290669ce05805e9197878d2f99da34549de5e5766e21cb2f
+EBUILD stgit-0.19.ebuild 1882 BLAKE2B dadb04a29107bfbf0c5c897a87832530fe54829dfda617ac890f957d5024f3ca92ac9d2cfe25d1726fdb45504752aa456f1664850a3367700f24d89f05caeb1b SHA512 a39ef9bfceac8f443a7edfe0997c579b6a3d97fbd3d1cbdc0d76d9fb82d15a3368930099442f66a4cf87dbae525cd09341a6e9872e7bc30ed32edd5fb39f99a0
+EBUILD stgit-0.20.ebuild 1887 BLAKE2B 093a1f795c94a8943913d61b292b0157260bebfd3d80c262cb858f8a81440778f92fe0a30af396665bfa1ff8dcfcb5f4f6517aac8305370dafe43354b9a5babb SHA512 7ca719e9e4ce7c0b51499e007df93243adcdd99fef0c24dec6ad9527c4052cc2241e5e31f2eb7fd9151575efdc928232c42c7a31c74e6015f711d73ff37f3c15
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-vcs/stgit/stgit-0.19.ebuild b/dev-vcs/stgit/stgit-0.19.ebuild
index 0fed9ba96d67..b3260fa330ca 100644
--- a/dev-vcs/stgit/stgit-0.19.ebuild
+++ b/dev-vcs/stgit/stgit-0.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-vcs/stgit/stgit-0.20.ebuild b/dev-vcs/stgit/stgit-0.20.ebuild
index f6bc5ae8ddfc..7bfcddb4aaee 100644
--- a/dev-vcs/stgit/stgit-0.20.ebuild
+++ b/dev-vcs/stgit/stgit-0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 9f900de540c4..8401e6c1ddff 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 15492 BLAKE2B 29e4631386a60d57357be19612136d322485aef4ddde339e749a232b1286a0dce3eb38517bae19bfb4355f5cb6ddef856194e04afdb5096c5e03f81eaff54bb8 SHA512 5c1b9da2237539eb45367d0d09f476675feace3d239af7567a4ce5c4ea606e95214834ba640f9baaba5264a87d52b97c3ec3bfd5ff4b27b06b1ac11f0f8454cb
-EBUILD subversion-1.13.0.ebuild 15501 BLAKE2B 7100a4ec379f8b26c4194e9c59f158ef2fbbf55b395142f7426ab0c20c81075278cc9038b6a321068deefd9ac6b5f6369e6079b5d68d3e62082d642ff3ec28f2 SHA512 2d85d7a9766207ef535f664e87b0f4c351355063914c4756d48caeef940ba6a40479f2d9979de70ffdf6858f7b2fae8ece98780a3a66db3dbd61b5cc38b96394
+EBUILD subversion-1.12.2.ebuild 15516 BLAKE2B 49638f5d1a4aa5409e9142e3930c44c3563b510a3c9d1ed902e560f6f16e305275b23f5650be23331409c869110a6ac52a3f0c5f42486b73d98e0181a275b77a SHA512 0391c60c18d3ba838b9e65ed04eab93b05ae40148e095c882705636063afc90b393267aec2268761ca858d457f5d7c32012cfb8175a9c5f46680dd259bc60942
+EBUILD subversion-1.13.0.ebuild 15525 BLAKE2B e8092c514bf9ef5220aae3c983dd11cb79a302b931490c960926b167cb148d21f5cc57cd6de4afe56391904871e213ad54eb8203ca1ede4a03b8a1cbd50582cf SHA512 9c18a30d131e3963689be81e92081a01016e5683635ea106102c2bae3633ee58bffe4dbf11429be0966b9ea7feb2619e459330716440333470a70651c1ebd20b
 MISC metadata.xml 575 BLAKE2B 10cda26a50a50e6ac6b16d578d1a3856f88ac12b56ac6ff1768c4a0e0240b2e6abea6b1f66a6ea7d3f817e75eb9e2d5e14999ad2ba330b55784ec5028781b994 SHA512 f2a6ff822a11d452c133aca4abeb1ffb214d946c7e706d1caa269564c4dc55374c17449a4912df54b12ce562d66058baf2e710f3e9e46ca3602e9d8483555584
diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild
index 3f53e0cbd391..5c6403fa33ac 100644
--- a/dev-vcs/subversion/subversion-1.12.2.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single toolchain-funcs xdg-utils
 
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
diff --git a/dev-vcs/subversion/subversion-1.13.0.ebuild b/dev-vcs/subversion/subversion-1.13.0.ebuild
index e1cb5bd947d9..a46d68203b07 100644
--- a/dev-vcs/subversion/subversion-1.13.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single toolchain-funcs xdg-utils
 
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"