gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-vcs
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
95 files changed, 153 insertions, 2490 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 66665b6c235a..0183c61e15bf 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/colorsvn/Manifest b/dev-vcs/colorsvn/Manifest
index e71211b934e3..76c12c51998f 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 1065 BLAKE2B 4a65e49ddc4fe751eff46652a47fe57f7e407b8bbc134bf6a99c655af706d8c73c6592f4535c46bbbc7a411fb4ebc606aff4cca66437c6034349175738b2cd6d SHA512 d136d85fb0bbe104910d1bcc11fdee06bc10a54b3973fcb93494128121a5625f0904feec5f0666859ea52829e0e1d1e49d4559da6f28ea544f9efb2ef909a58a
+EBUILD colorsvn-0.3.3.ebuild 1080 BLAKE2B e15531fb9e82ca62399f3fab1e41cec9020433a26089e78ac92f2c9852f7b962b656aa86746efbecfa33f21f291ac6713c160d5c13792f56f5ebea86c7e3fdb8 SHA512 f5a511f027a86b47bca88b8c13cd818a715db0f12571e542b8e9277c0c4bcf30e7a627a3d98406655823094fc8324711ba50755d7482264864f38295d8b88940
 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 18675f876ded..3d448b77be1d 100644
--- a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
+++ b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Subversion output colorizer"
 HOMEPAGE="http://colorsvn.tigris.org"
-SRC_URI="${HOMEPAGE}/files/documents/4414/49311/${P}.tar.gz"
+SRC_URI="http://colorsvn.tigris.org/files/documents/4414/49311/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 7f7856c040d0..be263a09a43e 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,8 +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
+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.47.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.50.ebuild
index 50babdf251fa..91e884f274bd 100644
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.47.ebuild
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.50.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/git-bz/Manifest b/dev-vcs/git-bz/Manifest
index 8e91f2d50687..de6f9431832f 100644
--- a/dev-vcs/git-bz/Manifest
+++ b/dev-vcs/git-bz/Manifest
@@ -1,4 +1,3 @@
 DIST git-bz-0.2015.09.08.tar.bz2 46980 BLAKE2B c5aae20c4c3946b01620f0cdd33248a67ffc3a3e8fb84bab6bb6ccda778ac82e7fb7fb6bbe463fb13733e5b8bf5ba95d0e316b0dbcee3ef30c5003c353521ce5 SHA512 8a468183f23d182ea566ceb524b05028c483e5eecc0c8babec42d67e99b8779af430d18373e130dcc13c8c58135ac62faf0a700c2731320617b47b00f5678133
-EBUILD git-bz-0.2015.09.08.ebuild 811 BLAKE2B 43ba5f07c93baacec1f9d037ce96058db16f5be01eabd74a0eb6144c981b5bfcd048310caf796fe44bcee42cb26632099cdbfdc0658555ab65635ffa90b4fc15 SHA512 c931c0150d646365849c9c94eef7a9a2bd3baf94716968e7323bfdc46b49be1d3d92c3b96ff702e790a1e6237201e3abf9a7b9a0a3b7c907e426a62e0d29975f
-EBUILD git-bz-9999.ebuild 917 BLAKE2B 1f04d51d95c47964ea4b4cbae0a7460b548dc8a055f1ec87a39b25bce40514aae98402d9a132a3b36507d1120a057e65812c749e5c618cf64a805cc8a93b8ee9 SHA512 00cbd04377fb76e55fdf5414b612f767923e3cff339617a43e33ca5cd30069a1b23d588c76d90c3948b0dec3074586f3e01cb0b411d7311f23df340c85a972c7
+EBUILD git-bz-0.2015.09.08.ebuild 803 BLAKE2B c0794bd2321c2709fa7206efab999d379b440d3c9bf37eef734f2ed41247a71469b6c6673f955aaf9500874532986e9a9449a3f95718c73c5eea34050df8dfe6 SHA512 45d41ebd5cd1383b1268aceecfc7091f9f2cdfafac447a7a16ce64b869075e5512c10dcb76bac27d0f6c5e3cea043b3da0333aa8ac1e4b0c12ece433372a5ac1
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild b/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
index 44eacb2a7a3e..b2b53fc0f807 100644
--- a/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
+++ b/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='sqlite'
 
 inherit python-single-r1
diff --git a/dev-vcs/git-bz/git-bz-9999.ebuild b/dev-vcs/git-bz/git-bz-9999.ebuild
deleted file mode 100644
index c8f2c69685ef..000000000000
--- a/dev-vcs/git-bz/git-bz-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE='sqlite'
-
-EGIT_REPO_URI="git://git.fishsoup.net/${PN}
-	http://git.fishsoup.net/cgit/${PN}"
-inherit git-r3 python-single-r1
-
-DESCRIPTION="Bugzilla subcommand for git"
-HOMEPAGE="http://www.fishsoup.net/software/git-bz/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-vcs/git
-	${PYTHON_DEPS}"
-DEPEND="app-text/asciidoc
-	app-text/xmlto"
-
-src_configure() {
-	# custom script
-	./configure --prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
-	emake ${PN}.1
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED%/}"/usr/bin/${PN}
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/pycrypto; then
-		elog "For Chrome/-ium cookie decryption support, please install:"
-		elog "  dev-python/pycrypto"
-	fi
-}
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index c40a7e50aacd..230af3f56489 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 2468 BLAKE2B 86d12e6535367a08fb5c99aa18279f9cf75ed520427a34b429cb9783d2d5bac9844aeada90c90de7a01a91d65a46e532b074b130b71e59f8fda54e6a8d3cf521 SHA512 44945c9580d6612da8e60405f08756b27225b23647bd16473c44af42850139a1b5362c039080ac6f7b86054847761535b7adf3f1e60e866115ce1c3fc8972a9b
-EBUILD git-cola-3.2.ebuild 2353 BLAKE2B f654356300d1706c0da682ed947f08e5da12529c339a16d6c6112ab9cc7a4478a562d26f51c466b8525fae09f46f414c3a149298b11227b37340df916b598017 SHA512 872381eab125bc296d3732e5f99ad5515eb61cbf39543e2bf5c430dc949f55e3bf0d7c11b30465af0a09b9f93a75d97ce0a6612e5c65c886a2c5f1f87f8d891c
+EBUILD git-cola-2.11.ebuild 2464 BLAKE2B e88294bccdf53f252e5ac895b5f2f79952fc0ddf4841895316864ef0e9adf60ec7a9b774f28f0efecd858c61822b3b2b8142222b2499eac32eab8dcabdf278fa SHA512 91426a1a3512b30b7ba6510df06f22636cd72c28c7211947005d1cea2d75c252b805784bc56545aabc0492a76e5df4909d9b73e1652486fb28d30a4f5b8f573d
+EBUILD git-cola-3.2.ebuild 2349 BLAKE2B 52b4617847196ea1cc518abd1d12674a19974216c6f7e77b56b28c157f0ef1010e0e6848a85373443191738fa7f8ac49ef47568066e24c12a19e38f2edfeeeda SHA512 d2b1c61af3d4588c623ca8f0a0d5e03519991aa30fdd3a1a453cd06588279ea380478883d604da6b06582f1d567f87ca204bbd92f969037cfa51c3b3d274357d
 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 098941ec4099..65a5d6cbed6d 100644
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo-r1 virtualx
diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
index 42482ec26a6e..1bb68c4eb5e2 100644
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo-r1 virtualx
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index b4cbe455d87f..47ea9b794aa7 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,6 +1,4 @@
-DIST git-flow-1.11.0.tar.gz 64077 BLAKE2B 7761ed8020039b2fe9fad23664c5e8d0ad754033e80b3cf402fae5e72331a79ac548f8676f9e8c5d6fe5d7032a5c25770563300d7be81834c3d47869a374ee6b SHA512 3659f876febbec10457ba7ba1ecbaeb7f29b11cc8caf94042f54b8f8e2265d2bb31cbcdf7dfafae9c5d04e0ca57adddfa67f9e67df4a5dcf0bc412f1216a3c07
 DIST git-flow-1.12.3.tar.gz 66173 BLAKE2B c6045fda9df8e305ccde8fac844614c840c5361f41848af6bf3394f64ffbbc5b03c20ed966960667d9aba76b0ed105f4caa2a5c0d5eab02a24720bff7b0aea48 SHA512 807cd36de7f5c9b4a7b28101de5ea8cfcbf528ff76578e4914c788b8098c7d3d91f8c19a3274e124ee7f7b4bdb6efdc5de2b74e09f374b71ae685beaa86e3e5a
 DIST git-flow-completion-0.6.0.tar.gz 7823 BLAKE2B 24dedfc0cddb5acfa57333895533f5c882a0c85db6e08539ff5c33f984eec40cb06da6d5f0ba812348c9cbf226080875de0269b295791ee5d4c8b2732a1ea1b2 SHA512 1082ad47938ec78045f4cbd12340a82960ba3de204c21a95e1166cb0b86e96dbbc3e5fc8af1945c951d5edd43b4026021761e8377795acbb87af3c1e391cb256
-EBUILD git-flow-1.11.0.ebuild 875 BLAKE2B 3445769bbef1aead384faa88885d548a0d2e6d8ca0b44961ec4fe4083a3b45269e239578f89faadfaece212dfe2ee7323e1556671448de9c4a16e4b79d14c165 SHA512 80bf365af3b108224722bba8b1459c9adc34178d8b4ac0b46c7ac353b5548e3f7bcfeee9ff40d3219fba665664a25f06dd9307d31e7251d50e2f559c7d1952b7
-EBUILD git-flow-1.12.3.ebuild 949 BLAKE2B 9602c9c054c3ddae1aab2fff490b50a6cbc204df013384d6afd84fdd93d48d411cc895515f88b56cce75cef40fbd36376a7595bbcc29f1085cca88305f173f01 SHA512 bcae622ef13b242e971668b7c116a28aa78c91352ee4dcd04c9fcd4cdedbaa603007854f1aaadbc9e19a9ed9db2520de807196d1c39cc281cdef3c29b5407ff7
+EBUILD git-flow-1.12.3.ebuild 947 BLAKE2B b6f1f2798e625f6d71c6096e6da68bad4520d0f1893655d2822ac3249e549cb673995d11fa184a16c5599425ba5f31a6d38f34872548eddb9e8e29765d89630a SHA512 50b73fc71b89e87b302913ed49f303212dc69746940bf7c5729b9b39650f6e2da1f7771a2f407f5598ebfde59bdd0dcf83d7dc0cdd600478461e7875c47bd7ef
 MISC metadata.xml 479 BLAKE2B bc1220bb065da9d65d28929adbe6cd94672f6cc92c9dea3a0468048da5a46ab8402cee64b6b63b7ebba7c9efa3acb061fe65e0bac37cc7a346b246049dabbee9 SHA512 12507dc676fc74a491390f9d15733c2a4ceb8f67d7a447aa2068e10f8f7f6020bb031d00a3c1192a01eb89e8d356fe8f200baa35d06c1182432b5aa12fedce9f
diff --git a/dev-vcs/git-flow/git-flow-1.11.0.ebuild b/dev-vcs/git-flow/git-flow-1.11.0.ebuild
deleted file mode 100644
index d42ac93ef3cc..000000000000
--- a/dev-vcs/git-flow/git-flow-1.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-/}-avh"
-COMP_PN="${PN}-completion"
-COMP_PV="0.6.0"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit bash-completion-r1
-
-DESCRIPTION="Git extensions to provide high-level repository operations"
-HOMEPAGE="https://github.com/petervanderdoes/gitflow-avh"
-SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-vcs/git
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	true
-}
-
-src_install() {
-	emake prefix="${D}/usr" install
-	einstalldocs
-	newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}
diff --git a/dev-vcs/git-flow/git-flow-1.12.3.ebuild b/dev-vcs/git-flow/git-flow-1.12.3.ebuild
index 0e539df2e29c..ca2e613a0b71 100644
--- a/dev-vcs/git-flow/git-flow-1.12.3.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.12.3.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
@@ -16,7 +16,7 @@ https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-vcs/git"
 
diff --git a/dev-vcs/git-imerge/Manifest b/dev-vcs/git-imerge/Manifest
index eb56d9c88f8a..0b0dc6af3bc6 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 1064 BLAKE2B b778fcbfee97e92c6121ae7ef1c5932fb2104aa70dc29f75ca02381c17c232430cdad016fd3937f516501b7b6052241cee2510734fb45fac51c8607db8341261 SHA512 76c45ebb226fc97bc7e8b416d29029d93050cd36cb7662c2fd02e48e48daa766bec66055d8a6025722f08c92893ba9e6bfefb1ca1a8d7130ec236b7c2b9fd1af
+EBUILD git-imerge-1.0.0.ebuild 1086 BLAKE2B 9f1e653ddbff0afeea15187deb4ca323db017f1ed50ecb92005a402aeb0f97ae56f6c4914aa7952614d291958d80bb954ce6d7147fb9d69c7c874867b861c0ce SHA512 2f20db7c1d87c4d9ffd0e4dfb786ba12530456d2d80e4d265d74b26d10b170c368894660013929a65149e2831f21acd4d2e69d8fcaaf5cb1110bea340ebd5da1
 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 4a1d2432a3af..3604eecc79b3 100644
--- a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
+++ b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit bash-completion-r1 python-r1
 
 DESCRIPTION="Incremental merge for git"
 HOMEPAGE="https://github.com/mhagger/git-imerge"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mhagger/git-imerge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-vcs/git-sh/Manifest b/dev-vcs/git-sh/Manifest
index 94efdab7925f..43868ba72f6e 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 500 BLAKE2B a8bd9edab0405e0ce7ccf486517fc4e763b0b587715133df1af44722ae90a1c18375a88911d6f1a3c4a8810ec46042102eca56d6e047574b3125ed4b9dc7d032 SHA512 35397d49dac9def6e64925545bc3607d56b82f5744e040ca29bc9c2373454238833097fccac460d40d0e12055e2b65a4682f9c52512843c4e2a36e25351a9db0
+EBUILD git-sh-1.3-r1.ebuild 523 BLAKE2B 417ba4207c9b35839ca7d399c9545056589a8679338565b658709fd2f0c354aae1bd9b310a9bddba193b50fe0a92baf31327865e25acce87dc49253ee9a47175 SHA512 1e7be206c504fa4bb3ebc42af12b2f2dd25b8646561407d06a88be0e4eeba0f0fc0bc0b7bb89304dda9dabd77c212b313255549e12fa9f1ce98ad6ba9ebc7057
 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 54b92f1a878c..492ad3b6dd08 100644
--- a/dev-vcs/git-sh/git-sh-1.3-r1.ebuild
+++ b/dev-vcs/git-sh/git-sh-1.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="A customized bash environment suitable for git work"
 HOMEPAGE="https://github.com/rtomayko/git-sh"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rtomayko/git-sh/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-vcs/git-spindle/Manifest b/dev-vcs/git-spindle/Manifest
index 100af8a34000..8f6a45a15b42 100644
--- a/dev-vcs/git-spindle/Manifest
+++ b/dev-vcs/git-spindle/Manifest
@@ -1,4 +1,4 @@
 DIST git-spindle-3.3.tar.gz 1854895 BLAKE2B b1330ba728a7f124024ad755ead350fc3e8b2a3065afe70f56b4053bc2a308920c5e2ec4d4bfee566ad199d58ec0cc3d25ac69be1e5999a2527a9711b79f4164 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8
-EBUILD git-spindle-3.3-r1.ebuild 679 BLAKE2B 2806c2efc11704095d4e72d1210c468c3062519cc38b934fc84125289442fa0ec158cb0271c63c7161514e3cbe6fed4ce3c78096a505932e8202f5a851bc37e4 SHA512 6c5545bbda501b89b1d0c13fa71fcd7296a221404694d0b4e8ecf4933de699743cb24f8ff2dc283519462b891c245594f6526b455ed5a00525ec697fe621d9f9
+EBUILD git-spindle-3.3-r1.ebuild 675 BLAKE2B a9ef20a0a7730320dec99f7adf181a491efc42d4999039bd4eee917cf20df359a92ea54b65078e75362f62c4a541faee2ef3336c9adb4c8b45ff07a92d608b11 SHA512 247053f55f4697ce592e1c7e3845396676763ce6a17d9e0f3e13868c7016733203315b39653b9d933a2d0b2efbad082a95e8d22dbe4d4019b047e24f59aa4791
 EBUILD git-spindle-3.3.ebuild 558 BLAKE2B 4b26b9e249dff4a544e270371797210e4a5dc38d574b252a6c0b926760cc5a37e9a5631130d3746e49d45f55d3fe6d5d01a3568554476a76cf79443a2a7383cb SHA512 b271c3bef677459ebb1a31b9c44db218608675fd7c891c92c17c74fc9b040c9b6f8ff448ec2ad9af15acd9cfd24341fcf0a07534dcf019367f782c7990b1206b
 MISC metadata.xml 626 BLAKE2B f24c2dedc0f5d576e138ca4eb7a77d892c16ac5b7a96bc41161b49d39e97920ea11eea3bb3c67a72086a756ec40fae9fb8b866eb38c6fd86ba885b41f01d8cdb SHA512 7f2be03b228a372aeb1a17913d790ec69c2d02d684c9495c460fff28b00b4a36e14b66e25e0ed31f0c9c0913ff5292cff02ca690308fe3feee84b66e9b3678b6
diff --git a/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild b/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
index fa0d29ddcc1b..3e47f7f45c32 100644
--- a/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
+++ b/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
index 69036776a098..126bf90f62ce 100644
--- a/dev-vcs/git-tools/Manifest
+++ b/dev-vcs/git-tools/Manifest
@@ -1,10 +1,3 @@
-AUX git-tools-2015_p20151225-py3.patch 533 BLAKE2B c58361f5096a2c7df56d37cd67f8eeef7f8cac63aeeef96275b57a886eabde55b700b86df49397d3aee300c0ede33be6cfe978275f935052d05931ef0efba3ea SHA512 20aed632a90dbe0b84c745a0239124f613982e21a39a23392d698bc795269c7f30673426f4e696846c309b469ace4334fa55e21ced03d89862d762219ff72c4e
-AUX git-tools-2015_p20160201-pr21.patch 1453 BLAKE2B 57b2c705eff20eee8cf6b68fec8b1f31d27b9260f445dfbc45ac2261cdf39c23fca0d26745b5bab590edccf371c47b2f2ebce9091f9030fb5806eee52a5b8a91 SHA512 7007c83d3d013c8df49eeab5bb88d8f02373b42d977562d735a92f3db81fdec33251ff684eb6c3a6e2553c73f81dc6fa186cdbcedf77bd1f1771682345f50429
-DIST git-tools-2015_p20151225.tar.gz 12635 BLAKE2B c5414307d0db6975034f6a04b007fc5872e4af9a46cd398b3a0675470cf3f4fc328539f2907faf5e75a36570e3d2131ef7a8023a981e05df8ff671b68f07480c SHA512 c995f814a78a3afb967e435b9559e4601fd9c7ed10b30950d6d8f20db2cc8077c814fb6164351f20f3c118e0b8b139c84485d5849057654a70d81847f77dd3d0
-DIST git-tools-2015_p20160201.tar.gz 12702 BLAKE2B 14c77495f66190c18362e889d3f7a0254c3c09da2524ee8cb9717db3437e834418f0c92bee5fdcad11bb65a40524163e651af5dcdc454ce06b1f7d7e9ab33fc1 SHA512 55804d7cc67a0c41f460f4a648fd589c8b72c9de8f45d4683edc8d4c47b87bbb70dbb040a8cbd3c7fcc09a3faba17f145479b7000d93d178e32454c0b6a1a995
 DIST git-tools-2017.10.tar.gz 28049 BLAKE2B 64b5f90468226dbeb4222f0f7be77846deffa836d6743e970c9bffced699c563712c24851e112a922faf3ae4b56ecc8daf0f5f772936c43a95c3907a244a6efa SHA512 60b3006de64a4c26f00241b60d45ef8258999dabfc0a8ad1c7d6d6b386dc56caf8c3b6cd0edbce5e27277c8f900b736fe1e26c6a68ee2179f563d00d65fd7cfe
-EBUILD git-tools-2015_p20151225-r2.ebuild 1384 BLAKE2B 091cde4ee8e9ad7b7eebb748fc0024ac002c810738319b8218ef8a21baecd90abb27b20300cd3919aa920d3ca9d9a5d96306f62726cae233af252fdc9c60d5b5 SHA512 2a793b412d277775f5c7efda1a203230874b95448ed7ae97eb606a6951e288b926cbb8a9e1f7ad7d4bf8b9260ce8abe3b68d565eaa924822e5bd0bd56148ad5e
-EBUILD git-tools-2015_p20160201-r1.ebuild 1442 BLAKE2B c32f797e06519d8eb21c0d1c493ed7b3369d1f6ac23e1244c786271163e43f5723fff89cdea8c54025ffb6de980dab0a20af4f6ffcb6d340821a4bc9c940f60d SHA512 3aba416b320e23c037c03c78aefc4e9f84e250266b2c0fa66ee8e58849dc385ad02108fac30b5349778480473eabcb9d1aeba6f66327a87405f6e92eee2a14ea
-EBUILD git-tools-2015_p20160201.ebuild 1385 BLAKE2B 63979ee2d474bf8a8596b9c7ad960ac16255ae0a811acd5fd9cdc305fcee683223d5e1452f6456f2fe81ad30a5e0852c6789b04325e6b27a3db287beb64ee89a SHA512 e7076ef1d84870145f2698afcf2f047b1a2b8e43df262960ce941b349128318c342603cb2dc107c176c864876ae42b3cc39eda668d72b74fa23653a97a51d450
-EBUILD git-tools-2017.10.ebuild 950 BLAKE2B 87cd3d9b1df6555f4e318c7f5ac7421eced26e7bf3eb9bf1ee2621e8270b20e80c5e8f87918acdd83bd3822e4d0cb8043fc8ddf242fe19507a7074551dacfe43 SHA512 38531c7a2bebbc917dc36cc51b5cb84b52a3400e46c80ec91fc6d59b0d7d6c0ff1f19538c8d4a93bef6baaccd7fbef8f70c2925b591fcb2a7bfa6323956cdf50
+EBUILD git-tools-2017.10.ebuild 946 BLAKE2B 83bae1059ba37ebd9c3821670df31b1012aba53d950a3e4acca0f96c6c7b3a54eb168b54ad378cef984dc5e3c0331638e06aa2e700439df47f1751b0f89b68fe SHA512 fafe3de661ced560ff17443555b27ce77c838c9a05c6aec2a7ab4f19d3c231453de3a3f773d8c5c6146731749fc409c1a80e6788bebf41985e9ca3baf7ca1c3f
 MISC metadata.xml 303 BLAKE2B 1186af6cb426673a5bc636e1b9aa02377c0cff46fe7bd3313ce8499ec3d53faba66ed52834cd98ecd3a097d20e770adfd0222df5750709861bdea30f2f8816c8 SHA512 1d21c90c1bc801085cf2bba4e75f1413fd232853d651f6db511270eb5ed7d9c2648d1b4e94808ff7ab87299fbebed167793e0563fdcce5bedcc6ae8c8c945a19
diff --git a/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch b/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch
deleted file mode 100644
index a7f59e0b04dc..000000000000
--- a/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/git-restore-mtime	2016-01-27 14:05:09.000000000 -0800
-+++ b/git-restore-mtime	2016-01-27 21:51:17.000000000 -0800
-@@ -150,7 +150,7 @@
-                           ['--'] + args.pathspec,
-                           stdout=subprocess.PIPE)
- for line in gitobj.stdout:
--    lsfileslist.add(os.path.relpath(line.strip(), workdir))
-+    lsfileslist.add(os.path.relpath(line.strip().decode(), workdir))
- 
- # List files matching user pathspec, relative to current directory
- # git commands always print paths relative to work tree root
diff --git a/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch b/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch
deleted file mode 100644
index f921efd9be22..000000000000
--- a/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/git-restore-mtime b/git-restore-mtime
-index fbc05d9..7bbd375 100755
---- a/git-restore-mtime
-+++ b/git-restore-mtime
-@@ -74,6 +74,14 @@ parser.add_argument('--merge', '-m',
-                         'sometimes substantially. By default merge logs are only '
-                         'used for files missing from regular commit logs.')
- 
-+parser.add_argument('--first-parent',
-+                    action="store_true",
-+                    help='pass --first-parent to git whatchanged to hide the '
-+                        'second parent from the merge commit logs. Only has any '
-+                        'effect if --merge is also specified or --skip-missing '
-+                        'is not specified and there were files not found in regular '
-+                        'commit logs.')
-+
- parser.add_argument('--skip-missing', '-s',
-                     action="store_false", default=True, dest='missing',
-                     help='do not try to find missing files. If some files were '
-@@ -252,6 +260,7 @@ def parselog(merge=False, filterlist=[]):
- 
-     gitobj = subprocess.Popen(gitcmd + shlex.split('whatchanged --pretty={}'.format(args.timeformat)) +
-                               (['-m'] if merge else []) +
-+                              (['--first-parent'] if args.first_parent else []) +
-                               ['--'] + filterlist,
-                               stdout=subprocess.PIPE)
-     for line in gitobj.stdout:
-\ No newline at end of file
diff --git a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
deleted file mode 100644
index 423e2d059046..000000000000
--- a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit python-r1
-
-DESCRIPTION="Assorted git-related scripts"
-HOMEPAGE="https://github.com/MestreLion/git-tools/"
-MY_PV="ff7a07daa6898fd0993180f64bd232aa4def6018"
-SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-vcs/git-2.5
-	>=app-shells/bash-4.0"
-
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "$FILESDIR"/git-tools-2015_p20151225-py3.patch
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommited-repos git-rebase-theirs git-strip-merge"
-	SCRIPTS_PYTHON="git-restore-mtime"
-	dobin $SCRIPTS_BASH
-	dobin $SCRIPTS_PYTHON
-	for p in $SCRIPTS_PYTHON ; do
-		python_replicate_script "${ED}"/usr/bin/$p
-	done
-	# Make it possible to use the tools as 'git $TOOLNAME'
-	for i in $SCRIPTS_BASH $SCRIPTS_PYTHON ; do
-		dosym /usr/bin/$i /usr/libexec/git-core/$i
-	done
-	dodoc README.md
-}
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
deleted file mode 100644
index e3899fc74e8d..000000000000
--- a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit eutils python-r1
-
-DESCRIPTION="Assorted git-related scripts"
-HOMEPAGE="https://github.com/MestreLion/git-tools/"
-MY_PV="0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6"
-SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-vcs/git-2.5
-	>=app-shells/bash-4.0"
-
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "$FILESDIR"/git-tools-2015_p20151225-py3.patch
-	epatch "$FILESDIR"/${P}-pr21.patch
-
-	epatch_user
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommitted-repos git-rebase-theirs git-strip-merge"
-	SCRIPTS_PYTHON="git-restore-mtime"
-	dobin $SCRIPTS_BASH
-	dobin $SCRIPTS_PYTHON
-	for p in $SCRIPTS_PYTHON ; do
-		python_replicate_script "${ED}"/usr/bin/$p
-	done
-	# Make it possible to use the tools as 'git $TOOLNAME'
-	for i in $SCRIPTS_BASH $SCRIPTS_PYTHON ; do
-		dosym /usr/bin/$i /usr/libexec/git-core/$i
-	done
-	dodoc README.md
-}
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
deleted file mode 100644
index 83996058962e..000000000000
--- a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit python-r1
-
-DESCRIPTION="Assorted git-related scripts"
-HOMEPAGE="https://github.com/MestreLion/git-tools/"
-MY_PV="0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6"
-SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-vcs/git-2.5
-	>=app-shells/bash-4.0"
-
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "$FILESDIR"/git-tools-2015_p20151225-py3.patch
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommitted-repos git-rebase-theirs git-strip-merge"
-	SCRIPTS_PYTHON="git-restore-mtime"
-	dobin $SCRIPTS_BASH
-	dobin $SCRIPTS_PYTHON
-	for p in $SCRIPTS_PYTHON ; do
-		python_replicate_script "${ED}"/usr/bin/$p
-	done
-	# Make it possible to use the tools as 'git $TOOLNAME'
-	for i in $SCRIPTS_BASH $SCRIPTS_PYTHON ; do
-		dosym /usr/bin/$i /usr/libexec/git-core/$i
-	done
-	dodoc README.md
-}
diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild
index a59daf00e24d..555da1d3cb5d 100644
--- a/dev-vcs/git-tools/git-tools-2017.10.ebuild
+++ b/dev-vcs/git-tools/git-tools-2017.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit python-r1
 
 DESCRIPTION="Assorted git-related scripts"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index c9eab2c0fc82..1512fa20b1d0 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -12,32 +12,24 @@ AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101a
 AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fea3d79ebe010a4971b731ba1684852f3b926ecc7e23bcb9a386b2e612801701299c64d4c6390ed4befe SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701
 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-2.25.0.tar.xz 5873532 BLAKE2B 7e9e54677ac3c4d3295e9f92ba7e3f7f5b33620d6d0fb8105d5e57d609fe3ee499d1c1bc4a6d8832927a28f4948f4466a6ca4edf996b8a324279f91d25627660 SHA512 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191
 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-htmldocs-2.25.0.tar.xz 1293644 BLAKE2B 8966e7d57701543770a589aef4a4bb8e673c22987330095431da6cc6cff023f8e288ba13a43d388d9b6e4fb92bed5baaa983c72124f440ef9e6c966b03d920a4 SHA512 67e8c2cc458d81870c901b720800a49cf605b3815c63af91328419a1e543e296b348bd8f7126a4a3cefcb8e2e2c7b713bcfc38ee945c224bd34bbd1c3e4f45b2
 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
 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
+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.23.1-r1.ebuild 19573 BLAKE2B bf9661a3b4193dba3964bb35cf675ee68597d1cf34084691c34b9fcbab4aa362dcb2723ec1eff7129503ebda37cda3b4f2e4128820a885aee99266b62f1164b7 SHA512 0360bb64aff6dcb1205b8f8ee623f17ee0b833ec10507f65b37468b50555f7e5552c5f40695fd7bc40465979a8540197a74146562c6efefc3741d32837729ce4
+EBUILD git-2.24.1.ebuild 19524 BLAKE2B f0efa75a1b2ba691649d86f505d509a02c46bac0c1a8dbe7a8bc848fb50ade93fd823f2dfb3772c678133d332f76edc32dc7fd2a6bcf6d5f738f408233ace672 SHA512 494825f6024b9e8368bd17bbd971cc66fff5e5e86851b8ef9d28d3006107fbaa1e461b4a73c6256d5e99d0236ff9c965aa45fe3624e81ceb33d4f7371379d555
+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
+EBUILD git-9999-r3.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342
+EBUILD git-9999.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342
 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
deleted file mode 100644
index 8aec6723aade..000000000000
--- a/dev-vcs/git/git-2.21.0.ebuild
+++ /dev/null
@@ -1,715 +0,0 @@
-# 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.21.1.ebuild b/dev-vcs/git/git-2.21.1.ebuild
index b13c8ab27837..732aadbe89e7 100644
--- a/dev-vcs/git/git-2.21.1.ebuild
+++ b/dev-vcs/git/git-2.21.1.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
@@ -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"
@@ -68,7 +68,7 @@ CDEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
diff --git a/dev-vcs/git/git-2.23.0-r1.ebuild b/dev-vcs/git/git-2.23.0-r1.ebuild
deleted file mode 100644
index 58f3caea37c0..000000000000
--- a/dev-vcs/git/git-2.23.0-r1.ebuild
+++ /dev/null
@@ -1,725 +0,0 @@
-# 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}"/${P}-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.23.1-r1.ebuild b/dev-vcs/git/git-2.23.1-r1.ebuild
index 17f6fa2fc78b..f37cc8e36d2c 100644
--- a/dev-vcs/git/git-2.23.1-r1.ebuild
+++ b/dev-vcs/git/git-2.23.1-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
@@ -6,7 +6,7 @@ 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}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -69,7 +69,7 @@ CDEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
diff --git a/dev-vcs/git/git-2.24.1.ebuild b/dev-vcs/git/git-2.24.1.ebuild
index dd61b7e07511..a1583d7647a9 100644
--- a/dev-vcs/git/git-2.24.1.ebuild
+++ b/dev-vcs/git/git-2.24.1.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
@@ -6,7 +6,7 @@ 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}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -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"
@@ -69,7 +69,7 @@ DEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
diff --git a/dev-vcs/git/git-2.24.0.ebuild b/dev-vcs/git/git-2.25.0.ebuild
index c29b92ceda8a..d256228c484b 100644
--- a/dev-vcs/git/git-2.24.0.ebuild
+++ b/dev-vcs/git/git-2.25.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=7
@@ -6,7 +6,7 @@ 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}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -69,7 +69,7 @@ DEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index c29b92ceda8a..d256228c484b 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-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
@@ -6,7 +6,7 @@ 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}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -69,7 +69,7 @@ DEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index c29b92ceda8a..d256228c484b 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-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
@@ -6,7 +6,7 @@ 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}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -69,7 +69,7 @@ DEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index c29b92ceda8a..d256228c484b 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.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
@@ -6,7 +6,7 @@ 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}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -69,7 +69,7 @@ DEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index c29b92ceda8a..d256228c484b 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.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
@@ -6,7 +6,7 @@ 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}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -69,7 +69,7 @@ DEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index e79f68f49b7e..a347adaddd64 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,3 +1,3 @@
 DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4
-EBUILD gitg-3.32.1.ebuild 1956 BLAKE2B 5b2e6dbe5794956e98b08a3e44717b79c2713dbb598978fec46f29eb234107699525d904da0e45d6d08d6eee7bab99fd85be7fc5667025bc114211b89e6e64cd SHA512 f0fcda0136c7c940edc9ae5e787aa3c56243217cfb4b57ac94441cf1d929a217317fbe215d136b586bf0a22693eadf947b28a1e62971193f8513e5dae66fdcb1
+EBUILD gitg-3.32.1.ebuild 1954 BLAKE2B 427141193d45b543ff5217e8e2bf4835656c752db9d7e88fa204906819462ca619d92a1803db31f29b258b693c20584b74429f819e0554847d9450366735fb37 SHA512 2af3c222979d7a40d6ccf84d6a6ed9aad73b68516456f27ff74e8c9802290be81ae0146edef2c4fe00c746ac073dd90a635aa9ac094bee6b529e0ac9c2ab5988
 MISC metadata.xml 927 BLAKE2B f967c30f2442bbbef782e69c044900db8bd733c5463b2aeff35496225be549827e8e8f9b7d072ae9396500cdcaecc9f7b4902524b5a3768848736d0bab8adc35 SHA512 889733c311b2ab0e35aadc3fff1bcb50c3dad59186293e2f46e81ba4a0041137938e38f12bcfa40d793a04462bbce25aa476bc9241fb5c7a5c4a25611e371d30
diff --git a/dev-vcs/gitg/gitg-3.32.1.ebuild b/dev-vcs/gitg/gitg-3.32.1.ebuild
index 5fee531ed8b8..de0af18668d8 100644
--- a/dev-vcs/gitg/gitg-3.32.1.ebuild
+++ b/dev-vcs/gitg/gitg-3.32.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 # vala-0.36 fails to build, https://bugs.gentoo.org/692538
 VALA_MIN_API_VERSION="0.40"
 
diff --git a/dev-vcs/gitinspector/Manifest b/dev-vcs/gitinspector/Manifest
index 61b8c784ed08..2f4c640f52b0 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 1103 BLAKE2B 22d83675624bf01169c7d4583f763d5846f51964a7ecc61c70ee34e56855bb4758d315b5215c56365e58ede7b2397bade814f17e9c77da04237bd414474ebdec SHA512 039e2f35a88907d210456e0e345894b6f2d093acc5474efc4d0a9c18fc703319cabd69d4e53a02055ca72adbae07ade1e54d67b2be5ffee862aadf1ab4496e35
+EBUILD gitinspector-0.4.4.ebuild 1128 BLAKE2B 29653fb2047ac5e7c178e87ab0745135ad0cb0880b094510c9b16fccfc1dd08f24b2bed35ff29a211ba41a187783dfaf4b5631bf2c7909305794098090466e3d SHA512 7b159734dc648b38abc82df70a32c429c4460db20ce3481b4bffbafcea1afb4f7e69a8452404e0f26c6f1499d81789be6faf407252aea09d3f20a3eb3ba1e03b
 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 2dec61aeaf4e..aff4e2902546 100644
--- a/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild
+++ b/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Statistical analysis tool for git repositories"
 HOMEPAGE="https://github.com/ejwa/gitinspector"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ejwa/gitinspector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-3+"
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 0eb50a7a4e98..e36564061953 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -31,5 +31,4 @@ EBUILD gitolite-gentoo-3.6.5.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd
 EBUILD gitolite-gentoo-3.6.6.1-r1.ebuild 2822 BLAKE2B 54201f3e814df8458ee90ec9524593e6450da69f2a1fd963a75f3273fe20afc737f8302dc8d1cf46a2f1fcb50a9e09695a26465d3d7d49daa40b528f95db388e SHA512 044bc927329b9ce7735783309051b28d1a97e9126c1e6e753bbe646408aeaccc80187188a761eff4c28951a64811c6ba88405404b525669ff55b34d1258bda34
 EBUILD gitolite-gentoo-3.6.6.1.ebuild 2796 BLAKE2B fc76471fd3d786d481fd98bb552818dd17177738fe73cec64e8b7391b6a1405641c04bd95f0409accb1633ce30bc72b68343e47086549b4f624e4bf5bcb9d67f SHA512 8f2800d6c8a11fd1d7ef43f754c17642db284c93e63a0028153dc33da647c59fe272eb09a2c8c0569915b7f57a5d29737a7be200b4ae8da88939e2bdecce4338
 EBUILD gitolite-gentoo-3.6.6.ebuild 2796 BLAKE2B fc76471fd3d786d481fd98bb552818dd17177738fe73cec64e8b7391b6a1405641c04bd95f0409accb1633ce30bc72b68343e47086549b4f624e4bf5bcb9d67f SHA512 8f2800d6c8a11fd1d7ef43f754c17642db284c93e63a0028153dc33da647c59fe272eb09a2c8c0569915b7f57a5d29737a7be200b4ae8da88939e2bdecce4338
-EBUILD gitolite-gentoo-9999.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd04bd4482584f9780af9a98633c8b6723f0220f8f55c98335f3243d79d7afe5342be0ce972781027d1a0d36b56fdf2cc6e SHA512 3bd502a5cb7279968993e0070065b27e707c53e065ca143db5bb38e6f2a6d3b6a6282567a80522aa1a15509150218185bd1de5a2be40176acef03d30b395909c
 MISC metadata.xml 478 BLAKE2B c178da3340159b14dc13fed855672892da98d2bd1ded28759120d60c93823b48e3887f59991776b1b68ab3941124e98b1b224f64544bbae9ea363e4c91266a2e SHA512 c014b88113a5769aa13b2d898afef78df07a642c4ccc964ae62bb64f07d3dac3c6e81df0defd873bc85be4434714abfeac160be0b4b1e9b77510f6cb5ad54810
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
deleted file mode 100644
index 7120a4c7c21d..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers,hooks}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 48fd63c81348..7d135be9351c 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -2,5 +2,4 @@ DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9c
 DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212
 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-9999.ebuild b/dev-vcs/gitolite/gitolite-9999.ebuild
deleted file mode 100644
index 928bbe83926c..000000000000
--- a/dev-vcs/gitolite/gitolite-9999.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="https://github.com/sitaramc/gitolite"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	selinux? ( sec-policy/selinux-gitosis )
-	vim-syntax? ( app-vim/gitolite-syntax )
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers,hooks}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/guilt/Manifest b/dev-vcs/guilt/Manifest
index a29facfba8ff..4e94566aa458 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 1266 BLAKE2B 9d92612b1dd25f6f6e1b79e38459c9a84643266873ec06342cbf6c22d782c05456c6a183e01f0469ea36ef595fb7da86379ffb85d5eddf7089ad5d03caa556c0 SHA512 d31e5afc89ef5c4213055235697a671d7548c8e7adfa4bc27a8c72df47dc8aa13239d259f070fcffc9b49366b013a4490820e1abaf7bed58773dd8d5e47924b1
+EBUILD guilt-0.36-r1.ebuild 1315 BLAKE2B a8c01120d6aef8dc454e023ea5b6a96fd7942a056d69105897b5cea6742ff64badab94b0bf15bdb70d3f8d7f30263f0271913baf184a557462c68968a649960c SHA512 434b5febab840c1e1351539ee88d3111d152ccdf76b371067174e3732a17c021925622104d9c8de93e77f2c30c3558c0e94ea85c2a04d341b94cea8ed474fcdc
 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 52a9c49c0e4b..1ab2f14f1ef0 100644
--- a/dev-vcs/guilt/guilt-0.36-r1.ebuild
+++ b/dev-vcs/guilt/guilt-0.36-r1.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=7
 
+EGIT_COMMIT="22d785dd24329170f66e7696da38b3e90e033d61"
+
 DESCRIPTION="A series of bash scripts which add a quilt-like interface to git"
 HOMEPAGE="https://repo.or.cz/w/guilt.git"
-SRC_URI="${HOMEPAGE}/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://repo.or.cz/w/guilt.git/snapshot/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-vcs/hg-fast-export/Manifest b/dev-vcs/hg-fast-export/Manifest
deleted file mode 100644
index 9574a13d4017..000000000000
--- a/dev-vcs/hg-fast-export/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hg-fast-export-160914.tar.gz 11379 BLAKE2B b751fd954af7a69430459c27dc1948d82aa7abd71db48fcdb98bb0d1b8151910b3417723d2acac1192d26b7f8dde98739b24fd90833fae5d123408293a4c274a SHA512 9e57e7835cc50e8db5d2ebf840d60b4ce25ec19e9722e705eba1178cc41fde57129664de3e1fc157ce8352632c8d0b8be33109afa50b53e159793a8a2ed21fea
-DIST hg-fast-export-190107.tar.gz 17774 BLAKE2B f490c59299d2e486b2b8854cba10630a7b6ebec60bb5f71d342c537e7fee9df3c2bda9264b9e3f865fb0d50bdd0fa1cf125611a2b890c5d79e947d905e4d14f9 SHA512 5449aeb717e1e550fb4c4908be994cb642d4ac2947bda3ae50a9f4024c48426f5b07438081800882000797aa181ccfcb304dfcf18c079ee91c9645bd20b583fd
-EBUILD hg-fast-export-160914.ebuild 920 BLAKE2B 3f7ab53844838196a6dfba6d94f0b19aa641647bb36864b3c268598d103b237c7d52ec1b211f0a3dd66086e5d3c07ecb33c1e85ae17a76de77350e428cc67f49 SHA512 ea94e0fec5cc405446ecb2fe591373007f1610f30555dba17849dc3d83c73b2820b4829e7e01716c7a90c7c3273ee3bbe1ba3bab33cdef8f39a88fd9ccd8cf33
-EBUILD hg-fast-export-190107.ebuild 970 BLAKE2B 43ca2d52ee7f46e1b701b459fbdea8283ab747a9f254ed718f603fcaa6e301aef3284ea89151000c83469481a865e44bc3f1e59641cc1c96c93a4cfd6639eb33 SHA512 17e4fffa0d2211a7fef5e44b1c3f6a603e445ab23916833cad3d7472ab9bebe6d1f11b0fe818202996f97746d3f8c8a9ff6df9304bd7435b042f90367c929409
-MISC metadata.xml 398 BLAKE2B 7a4b6ae1605b89afc842b2232ff12bf2863d1a2d6eb1fbcb995ec3b76257be86d30c18171ac2d98d056bbab4852f9673a404d892ced9345348f81bdba3f32b26 SHA512 e085ace0752eaf009dd9c86ffb5f1198d1feb44f3c46d219457e6871208b2ea96d3d58ab54d28c8ca02b5ca3b5b21ae0ae2c96aedb9926b747110740a296142c
diff --git a/dev-vcs/hg-fast-export/hg-fast-export-160914.ebuild b/dev-vcs/hg-fast-export/hg-fast-export-160914.ebuild
deleted file mode 100644
index 60a39b304cf5..000000000000
--- a/dev-vcs/hg-fast-export/hg-fast-export-160914.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 vcs-snapshot
-
-DESCRIPTION="mercurial to git converter using git-fast-import"
-HOMEPAGE="https://github.com/frej/fast-export"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-	dev-vcs/mercurial"
-
-src_prepare() {
-	default
-	sed -e '/^PYTHON/s/python/&2.7/' \
-		-e '/^PYTHON/s/PYTHON:/E&/g' \
-		-e "/^ROOT/s:=.*:='${EPREFIX}/usr/bin':" \
-		-i "${PN}".sh hg-reset.sh || die
-}
-
-src_install() {
-	default
-	newbin "${PN}".sh "${PN}"
-	newbin hg-reset.sh hg-reset
-	python_foreach_impl python_doexe "${PN}".py
-	python_foreach_impl python_doexe hg-reset.py
-	python_foreach_impl python_domodule hg2git.py
-}
diff --git a/dev-vcs/hg-fast-export/hg-fast-export-190107.ebuild b/dev-vcs/hg-fast-export/hg-fast-export-190107.ebuild
deleted file mode 100644
index df39ee8c1cb9..000000000000
--- a/dev-vcs/hg-fast-export/hg-fast-export-190107.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 vcs-snapshot
-
-DESCRIPTION="mercurial to git converter using git-fast-import"
-HOMEPAGE="https://github.com/frej/fast-export"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-	dev-vcs/mercurial
-	dev-python/python-pluginloader[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-	sed -e '/^PYTHON/s/python2\?/python2.7/' \
-		-e '/^PYTHON/s/PYTHON:/E&/g' \
-		-e "/^ROOT/s:=.*:='${EPREFIX}/usr/bin':" \
-		-i "${PN}".sh hg-reset.sh || die
-}
-
-src_install() {
-	default
-	newbin "${PN}".sh "${PN}"
-	newbin hg-reset.sh hg-reset
-	python_foreach_impl python_doexe "${PN}".py
-	python_foreach_impl python_doexe hg-reset.py
-	python_foreach_impl python_domodule hg2git.py
-}
diff --git a/dev-vcs/hg-fast-export/metadata.xml b/dev-vcs/hg-fast-export/metadata.xml
deleted file mode 100644
index 9886b5971a1e..000000000000
--- a/dev-vcs/hg-fast-export/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">frej/fast-export</remote-id>
-		<bugs-to>https://github.com/frej/fast-export/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index 0b81661dc68d..3d78ae09bb8d 100644
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1,11 +1,3 @@
-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.10.0.ebuild b/dev-vcs/hub/hub-2.10.0.ebuild
deleted file mode 100644
index 80f384323718..000000000000
--- a/dev-vcs/hub/hub-2.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN=github.com/github/hub
-inherit bash-completion-r1
-
-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
-	https://${EGO_PN}/releases/download/v${PV}/${PN}-linux-amd64-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.5.1:="
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-QA_FLAGS_IGNORED=".*"
-RESTRICT="strip"
-
-src_prepare() {
-	mkdir -p "${HOME}/go/src/${EGO_PN%/*}" || die "mkdir failed"
-	ln -snf "${S}" "${HOME}/go/src/${EGO_PN}" || die "ln failed"
-	default
-}
-
-src_compile() {
-	GOCACHE="${T}"/go-cache \
-	GOPATH= \
-	LDFLAGS= \
-	./script/build -o bin/${PN} || die
-}
-
-#src_test() {
-#	./script/test || die
-#}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-	doman ../${PN}-linux-amd64-${PV}/share/man/man1/*.1
-
-	newbashcomp etc/${PN}.bash_completion.sh ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/hub.zsh_completion _${PN}
-}
diff --git a/dev-vcs/hub/hub-2.11.1.ebuild b/dev-vcs/hub/hub-2.11.1.ebuild
deleted file mode 100644
index c7c9daaf3033..000000000000
--- a/dev-vcs/hub/hub-2.11.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN=github.com/github/hub
-inherit bash-completion-r1
-
-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
-	https://${EGO_PN}/releases/download/v${PV}/${PN}-linux-amd64-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.5.1:="
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-QA_FLAGS_IGNORED=".*"
-RESTRICT="strip"
-
-src_prepare() {
-	mkdir -p "${HOME}/go/src/${EGO_PN%/*}" || die "mkdir failed"
-	ln -snf "${S}" "${HOME}/go/src/${EGO_PN}" || die "ln failed"
-	default
-}
-
-src_compile() {
-	GOCACHE="${T}"/go-cache \
-	GOPATH= \
-	LDFLAGS= \
-	./script/build -o ${PN} || die
-}
-
-#src_test() {
-#	./script/test || die
-#}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.md
-	doman ../${PN}-linux-amd64-${PV}/share/man/man1/*.1
-
-	newbashcomp etc/${PN}.bash_completion.sh ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/hub.zsh_completion _${PN}
-}
diff --git a/dev-vcs/hub/hub-2.12.3.ebuild b/dev-vcs/hub/hub-2.12.3.ebuild
deleted file mode 100644
index 5191e3388ce9..000000000000
--- a/dev-vcs/hub/hub-2.12.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-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"
-
-DEPEND=">=dev-lang/go-1.5.1:="
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-QA_FLAGS_IGNORED=".*"
-RESTRICT="strip"
-
-src_compile() {
-	emake bin/hub man-pages
-}
-
-#src_test() {
-#	./script/test || die
-#}
-
-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-server/Manifest b/dev-vcs/mercurial-server/Manifest
index 1c51a42d0afc..168f34b8730e 100644
--- a/dev-vcs/mercurial-server/Manifest
+++ b/dev-vcs/mercurial-server/Manifest
@@ -1,4 +1,4 @@
 DIST mercurial-server_1.2.tar.gz 21560 BLAKE2B 60d7dd9d0fdb55fc82d8cd268ab7ec7a53b1ba425c28520bff2f4920c1e404fbe0c0bb11e4af34b1952a8cdb2f44cecba1b5f29c6c5d85f49e992bd31cd88c1d SHA512 3dec14309fc050fa49ffd5253a491b2d65507ed8da04741ba5247d420701a9f836a1c3ef6924a706671e28bafbe0200af03c817184e303179002419887400ce0
 EBUILD mercurial-server-1.2-r1.ebuild 1785 BLAKE2B b0de1d1d1d479b94a9e277ac8f29ae2c113e727e2e3b06ca00561d83460e7b7e8d61b94bab58c187d2cfe5534210c6a29aba37f05580b48ec14873dda3d12e0a SHA512 151e85d1fddcfea7b3d23d3619a3ae48417a01e21becfeeb293742d46a96197185c8eebfa7aa4d60a47ecf472d814a846a044c0e19a47ee9a656b4998dfe4020
 EBUILD mercurial-server-9999.ebuild 1780 BLAKE2B 32a3bcbac38dbf215f747af3cef0797a3b2d6192cb91919030bc3c8a13b1844364be6bee1635d97693719ef0af836089b31454caed14c8eda9a208bedb674cf3 SHA512 a857790b3f3d1261146302bfeaa22a4e17b503ef59d7b94b85cf6b58dc7df8ccd069e66e6002032b6078de8d83537c71232f633b3fe43f182f14b594e0bc4177
-MISC metadata.xml 526 BLAKE2B 52da18d729cb3361bd21fbf46cad7561ffa3ea624b1323e05523832ac9f7a6d83af2d9a4ae02658aeb28c7f9266bfddf640f5ab1623103f3365d4c32435ca5a4 SHA512 b10db22126af52b4d38754d846fffdbcf529ca2c86b6f5bb59d19343762e2df48324e4e2dc6d72c191b54f48a89fcf753253639c7f043cb6eb27e76d70391a29
+MISC metadata.xml 436 BLAKE2B c5a721ec5dea92c6e5e26fb29c8c6a064a1b946fc51ef4f4ede9648f287ceccc1f33c3b1e0b50c872c8f2f59f97b0486dc49bd6606b1dbe728e9f860ce39c53b SHA512 6902435e0811e8793cce55684007b8a3525be01576213a226a9d7328c636cc8ba303c632a29c939ead9cd163c2a181d2c113fad09635ee8893c4cb2501addd65
diff --git a/dev-vcs/mercurial-server/metadata.xml b/dev-vcs/mercurial-server/metadata.xml
index 16b6109563df..a59ea4d751d6 100644
--- a/dev-vcs/mercurial-server/metadata.xml
+++ b/dev-vcs/mercurial-server/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>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		mercurial-server gives your developers remote read/write access to
 		centralized Mercurial repositories using SSH public key authentication; it
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 4b43cab6547a..8150a1b8d50c 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -7,10 +7,10 @@ DIST mercurial-4.9.1.tar.gz 7076867 BLAKE2B 8cedc66a8ddffc543a8849bbc98ebfc9ed61
 DIST mercurial-4.9.tar.gz 7075692 BLAKE2B ed11442e0cd5b27f47394ed1c15016930556d5cdc59ab18f1e0d5371e434eb752b68d3d9f6dd34ed9c63df62a646223e86c6c5178775d9b856eed5df65677900 SHA512 59a5467cebb51f17cce7bcada37f8d85906493ab2e3d443ceeae2c6598fb69d2d59f1e99c73bd08345c5f90501a7bae0d70e04c770ea7653ec30648e591c97fb
 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 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
-EBUILD mercurial-9999.ebuild 4321 BLAKE2B ae7ccadf37710c8bb40a28f61a7f950de9a9f318c71f622334a61ddc5e4d3479ce6f11686cb040e64d06aa7ac91fa8e0d051d5932495a7103799c28b75020191 SHA512 4b3477cf3ab19655c403c713b409a676e63f3f1a555e189158b50f460747136b58257df5960fcc514a1e7abaa6a709f91ffd2f98277012d2be9a284e99f205bc
-MISC metadata.xml 524 BLAKE2B f7cbb22ba27d9d14c7ae81d6e5c3d2e415548b1902bb9f7229a08f5803855bffa22d5471b8c5ef7c3e59ea8e17c4a174bcadbc5553d4610ff55bf1852c69cb4e SHA512 8996da1193697d52d3eadcf27c77ef0195bd0982549e1578bdf3560df50d6bfdbb05a104cb416d516d2782a6df56a47e5e2731d01c1515f0a047c7848a63b7c5
+EBUILD mercurial-4.6.2.ebuild 3572 BLAKE2B a778503a0d44cabc9905fa1caad2eb3587431086752fec8b02dd23f8d8db3a7ccef63a8022f671d56cbe457775f45065b2cb19d6a4d63eb59f62fbe9eb644ce0 SHA512 68cf4d34c9bafe70191d86806173c85eaf57a92337644da72f06cbc37ad5265e09c354ecfd0998c47e439504faff422deaf4d5e3409cb5984629c1135b9bf7d4
+EBUILD mercurial-4.9-r2.ebuild 3958 BLAKE2B 4d794d785df0866fb1edefdf96b9eff6433c830d2b0df59a17346ec029aa218bac431a77b2231c99c833cecdb46d34f483162fa00a3aefeb97f7d2d3ecaf425e SHA512 4d962e6dbbf2f657070a185d4ab9140e0cd837321e33b4654b4a5a036d2760219a8cf2a60f39113e7dd94baa8fb2a5f9038ee78153716c28e098f8c008575f47
+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 3964 BLAKE2B a03add4df62dc635fca9671af74a4738f69ca9b3b230a2cffc7d41e36935c2ff00173707044430eed646ff220ae7f9c13e9d1b8cdf110462ce6053563276a409 SHA512 ca085e487b6589a4624ecb02e4ab059524a5d7ee46c2616d4abb59ee54bb1b280a0eaf599ea7b65b955cde3e60421cb97da11170f4d1c6510f1e74abe42e45ab
+EBUILD mercurial-9999.ebuild 4334 BLAKE2B 87bfebc02e9a47d384c71ee89ac4656cbfc70a50c720f82a1c18af36335f96f28fe2b03d0d357b0e5246b4e57e0a91c7972c9c2a8e9a67fe7464d38fe0044658 SHA512 4c2715f8d1fc12728fc6b96a3c61def70603f055ae9b933c546df1bb0ca331a7cc87eeafa8d9d1e1300c6a9b2f1b67e91f598edb01687d4b5c471035da4d7dee
+MISC metadata.xml 435 BLAKE2B 4a66c0cf836f306eca99c5a3f1144f76cce278100d8dbc817624b9a7fba203311aa39a8c46d3e2fd18646865ea9bf458d439084ddb0552b24083950480bfeeaa SHA512 a45d2794e3f041b0165244006952d164953b6638fa81e6899e1d4199c336b94490839a13b43b398bc4d5adad4faa47e8e8e79ea5b884d425db4c91fe3533c96c
diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
index 865f6842ab43..621ffb624f22 100644
--- a/dev-vcs/mercurial/mercurial-4.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
@@ -21,7 +21,7 @@ RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )
 	app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? ( app-arch/unzip
 		dev-python/pygments[${PYTHON_USEDEP}] )"
 
diff --git a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
index 7949885a9189..62fbdaf07e1a 100644
--- a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="app-misc/ca-certificates
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )"
 
-DEPEND="emacs? ( virtual/emacs )
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? ( app-arch/unzip
 		dev-python/pygments[${PYTHON_USEDEP}] )"
 
diff --git a/dev-vcs/mercurial/mercurial-4.9.1.ebuild b/dev-vcs/mercurial/mercurial-4.9.1.ebuild
index 7f426bb5f2be..6d3bef63979d 100644
--- a/dev-vcs/mercurial/mercurial-4.9.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.9.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="app-misc/ca-certificates
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )"
 
-DEPEND="emacs? ( virtual/emacs )
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? ( app-arch/unzip
 		dev-python/pygments[${PYTHON_USEDEP}] )"
 
diff --git a/dev-vcs/mercurial/mercurial-5.0.2.ebuild b/dev-vcs/mercurial/mercurial-5.0.2.ebuild
index fc1f72cd7e62..c3f5137de8f6 100644
--- a/dev-vcs/mercurial/mercurial-5.0.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.0.2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="app-misc/ca-certificates
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )"
 
-DEPEND="emacs? ( virtual/emacs )
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? ( app-arch/unzip
 		dev-python/pygments[${PYTHON_USEDEP}] )"
 
diff --git a/dev-vcs/mercurial/mercurial-5.1.2.ebuild b/dev-vcs/mercurial/mercurial-5.1.2.ebuild
index fc1f72cd7e62..c3f5137de8f6 100644
--- a/dev-vcs/mercurial/mercurial-5.1.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.1.2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="app-misc/ca-certificates
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )"
 
-DEPEND="emacs? ( virtual/emacs )
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? ( app-arch/unzip
 		dev-python/pygments[${PYTHON_USEDEP}] )"
 
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 39b4c67502eb..4715bed5111f 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -23,7 +23,7 @@ RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 	tk? ( dev-lang/tk )
 	zsh-completion? ( app-shells/zsh )
 	app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? ( app-arch/unzip
 		dev-python/pygments[${PYTHON_USEDEP}] )
 	dev-python/docutils[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/mercurial/metadata.xml b/dev-vcs/mercurial/metadata.xml
index 8abebf1fdf19..37d1b32ccb33 100644
--- a/dev-vcs/mercurial/metadata.xml
+++ b/dev-vcs/mercurial/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>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="chg">Support Mercurial command server client</flag>
     <flag name="bugzilla">Support bugzilla integration.</flag>
diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest
index 873fecc5c796..913f2013e99b 100644
--- a/dev-vcs/notify-webhook/Manifest
+++ b/dev-vcs/notify-webhook/Manifest
@@ -1,3 +1,3 @@
 DIST notify-webhook-0.1.0.tar.gz 17525 BLAKE2B 947027414bd30f96c9e27ca8b7f965a077792a6b8962180094df6bdeef8261140c063041f1b6598c518edfd3b6807da5020a4640aadbddb202887bac91d3b51d SHA512 1694f32b1263baecac473ffa49e6e7f9cbfdb73d1abaa88e228771e28a5ed915d9f5f21ab26b05934bdcd8694b4c4f1506763dd2f0c89c35ffa51e1d1b7d03b4
-EBUILD notify-webhook-0.1.0.ebuild 648 BLAKE2B 1c29cd51c8f9415add749586a4461fd62a1d3a03276772f27c81943115f1268615cbae16721e620a8315ff3f7f61f8dcd017022beee87fb852c044934d6ea3f8 SHA512 2fd52492fe6fb1f6afff68b34c5129e26840d7a23d33cd2ddba60c07b27421f1a8b394cc0232d85297ab7ed6149543ae593a8397ec28c9dfd610796bc86b5ac5
+EBUILD notify-webhook-0.1.0.ebuild 638 BLAKE2B 7e64a8d7578a554fa2fd51c3f64a70b324bb097d88527e40fca6eac02d5ab48cb58ed0c0da505c50cc41291c865fd27d7cb09fff35bf1f25cb470485aa6bc5af SHA512 2fcc42c55b7d57e35e27210d5683a1576e9b93c5668affb34884db06cb6ec0e2cd8bebf98bbc300e1ad5890a6871410d7cd878a4e5b1d79ff1f58de8d5286e3e
 MISC metadata.xml 598 BLAKE2B d3cb099dbdcb844e0158112eaa1748c9587f88241860f1a862d852a96b1ea6fd01fd0e3555442cb6fbe066da5c61722c443f482f26154679fbbd0ac29c9fff3e SHA512 c4c8fd71b9c15c14f397a6bf65dab33907ba702d021315605dcebdbe565671b5e0a2df38d5166ef6ace416fbd0e2a03334b9525c450c2d9e726b194ca63ebf5e
diff --git a/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
index 605285ee20d6..c687a232910a 100644
--- a/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
+++ b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_5 pypy3 )
+PYTHON_COMPAT=( pypy3 )
 
 DESCRIPTION="Git post-receive web hook notifier in Python."
 HOMEPAGE="https://github.com/metajack/notify-webhook"
diff --git a/dev-vcs/pwclient/Manifest b/dev-vcs/pwclient/Manifest
index 68e5c37ea6f8..629831bd951e 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 1046 BLAKE2B 39db6c0dc15f1a523e0ca911c59aeeafc36b05e4b4d786dc7c8a243836083e79dfa1ad3203507682779fe72a5aaaaaaee0621780b156b288224dc31c949044a4 SHA512 96ea5abbaf50eca479fb23c1e517f86a9c0a8fb80a95528370423b8bf69f2b1ec43b8d1308866fbc7725d3d3d2e4988a548d980ba5dd83b0fb20245fcc3d32a5
+EBUILD pwclient-20141110122616.ebuild 1042 BLAKE2B c15a84b5d5bc3bd69c8716c5c9c3e02ac0fe4e6ccd059b1305b4f74c655803ac68b75e6fa6a1032a348829388b06ec2065899c064ea002e34e875e5656994354 SHA512 1a6560d2e67d120f22583ba89a1a4aee36dbb89789be32977b597c37c86fc62e30c8e02480802639b8448277aa2ecac11f665bbb27d9a79920196b237d2a809f
 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 9a0ace1caf6d..bcf353082536 100644
--- a/dev-vcs/pwclient/pwclient-20141110122616.ebuild
+++ b/dev-vcs/pwclient/pwclient-20141110122616.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils python-r1
 
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index c5e83c384ba7..701a276d4383 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -2,8 +2,8 @@ DIST python-gitlab-1.13.0.tar.gz 121434 BLAKE2B f8a9af4f389b4759891e26de305c48a7
 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.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
+EBUILD python-gitlab-1.13.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
+EBUILD python-gitlab-1.7.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
+EBUILD python-gitlab-1.8.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
+EBUILD python-gitlab-1.9.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 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
index 5a890390ea5d..2be1c12294f1 100644
--- a/dev-vcs/python-gitlab/python-gitlab-1.13.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-1.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
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 5a890390ea5d..2be1c12294f1 100644
--- a/dev-vcs/python-gitlab/python-gitlab-1.7.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
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 5a890390ea5d..2be1c12294f1 100644
--- a/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
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 5a890390ea5d..2be1c12294f1 100644
--- a/dev-vcs/python-gitlab/python-gitlab-1.9.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-1.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
diff --git a/dev-vcs/rabbitvcs/Manifest b/dev-vcs/rabbitvcs/Manifest
deleted file mode 100644
index 4f88063657e9..000000000000
--- a/dev-vcs/rabbitvcs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rabbitvcs-0.16.tar.gz 1670167 BLAKE2B 44d60de0bf6beb659fe8c8d1dffdb35d1a767e47a6c9aa26515e70e46d888f4394512d2b407f9f0b28edc501392ea873dfbf44dd858169ef1943cf1e02f0eaf1 SHA512 dac3b98acb5b7ef1147105aa0f735bb964c098f764c62d0e2e601a2ce34b315a5c83b3bac8929cbac898f674c86266a200f28042aad0340c1c5273bec4a6279c
-EBUILD rabbitvcs-0.16-r1.ebuild 3116 BLAKE2B e0a939bda5471cc3fd44aa2e14fbd7d0d0059b76b83e1063dc7d5384ba84cd1f2948c8566117cafc1abd50b640072af9b2c6a5efd8db684e3fb77fce18f1a6c6 SHA512 ba042954748dc63ab64bae55241363d726126033f51e51a0c055c5a7c67a7b702d4831603d5c37613ad658c4d85708af78905fe9d2437645756f1b46027173f2
-MISC metadata.xml 930 BLAKE2B 4cfe3162f38af460914909ad621c12ed070182f47b1d138d97821aad5789d1462888f2cdb03f12c77e35199846546a9ed33b40dee417a624a682e9f4bb89f062 SHA512 f596389c48f3648769884cb938fee1cef0362f5a1ab9a323b301876e6c12ba94c792d68eb190e4bb72d5192f27e8eec9f835a7ae2ebcdd553b6ab2f2cb6d9c14
diff --git a/dev-vcs/rabbitvcs/metadata.xml b/dev-vcs/rabbitvcs/metadata.xml
deleted file mode 100644
index 0d4e4392dd12..000000000000
--- a/dev-vcs/rabbitvcs/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		RabbitVCS is a set of graphical tools written to provide
-		simple and straightforward access to the version control systems you use.
-		RabbitVCS is inspired by TortoiseSVN and others.
-	</longdescription>
-	<use>
-		<flag name="caja">Enable extension for <pkg>mate-base/caja</pkg></flag>
-		<flag name="cli">Eanble console based frontend</flag>
-		<flag name="diff">Use for diff command <pkg>dev-util/meld</pkg></flag>
-		<flag name="gedit">Enable plugin for <pkg>app-editors/gedit</pkg></flag>
-		<flag name="nautilus">Enable extension for <pkg>gnome-base/nautilus</pkg></flag>
-		<flag name="thunar">Enable extension for <pkg>xfce-base/thunar</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="github">rabbitvcs/rabbitvcs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-vcs/rabbitvcs/rabbitvcs-0.16-r1.ebuild b/dev-vcs/rabbitvcs/rabbitvcs-0.16-r1.ebuild
deleted file mode 100644
index f9e95ffff779..000000000000
--- a/dev-vcs/rabbitvcs/rabbitvcs-0.16-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2-utils distutils-r1 vcs-snapshot
-
-DESCRIPTION="Integrated version control support for your desktop"
-HOMEPAGE="http://rabbitvcs.org"
-SRC_URI="https://github.com/rabbitvcs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caja cli diff gedit git nautilus spell thunar"
-
-RDEPEND="dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pysvn[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	caja? ( dev-python/python-caja[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
-	diff? ( dev-util/meld )
-	gedit? ( app-editors/gedit[${PYTHON_USEDEP}] )
-	git? ( dev-python/dulwich[${PYTHON_USEDEP}] )
-	nautilus? ( >=dev-python/nautilus-python-0.7.0[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
-	spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )
-	thunar? ( dev-python/thunarx-python[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-#	python_convert_shebangs -r 2 .
-
-#	distutils_src_prepare
-
-	# we should not do gtk-update-icon-cache from setup script
-	# we prefer portage for that
-	sed -e 's/"install"/"fakeinstall"/' -i "${S}/setup.py" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use caja ; then
-		python_moduleinto /usr/share/caja-python/extensions
-		python_domodule clients/caja/RabbitVCS.py
-	fi
-	if use cli ; then
-		python_doscript clients/cli/rabbitvcs
-	fi
-	if use gedit ; then
-		python_moduleinto /usr/$(get_libdir)/gedit-2/plugins
-		python_domodule clients/gedit/rabbitvcs-plugin.py
-		insinto /usr/$(get_libdir)/gedit-2/plugins
-		doins clients/gedit/rabbitvcs-gedit2.gedit-plugin
-		python_moduleinto /usr/$(get_libdir)/gedit-2/plugins
-		python_domodule clients/gedit/rabbitvcs-plugin.py
-		insinto /usr/$(get_libdir)/gedit/plugins
-		doins clients/gedit/rabbitvcs-gedit3.plugin
-	fi
-	if use nautilus ; then
-		python_moduleinto /usr/$(get_libdir)/nautilus/extensions-2.0/python
-		python_domodule clients/nautilus/RabbitVCS.py
-		python_moduleinto /usr/share/nautilus-python/extensions
-		python_domodule clients/nautilus-3.0/RabbitVCS.py
-	fi
-	if use thunar ; then
-		python_moduleinto "/usr/$(get_libdir)/thunarx-2/python"
-		python_domodule clients/thunar/RabbitVCS.py
-		python_moduleinto "/usr/$(get_libdir)/thunarx-1/python"
-		python_domodule clients/thunar/RabbitVCS.py
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "You should restart file manager to changes take effect:"
-	use caja && elog "\$ caja -q"
-	use nautilus && elog "\$ nautilus -q"
-	use thunar && elog "\$ thunar -q && thunar &"
-	elog ""
-	elog "Also you should really look at known issues page:"
-	elog "http://wiki.rabbitvcs.org/wiki/support/known-issues"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 826aac3223c5..85d29f484416 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,7 +1,5 @@
-DIST rcs-5.8.2.tar.gz 1209822 BLAKE2B 48eb7f5dd0d1c1433acb85e7623c1a99a59d2e5fa8b6933b598cec5f20136dc8b370aaa3e3d5dac96e524a98b4380b85d7efd765049a8134d7b293980eeb7d74 SHA512 59bfdb57d1e361f01b6682aae99115e5b181ee429e4d49bf1eadd7c7d24abf8547f7368a608d5aac480ca2b8a095ca3d1b56723ba308c15aa5c612676088c374
 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.8.2.ebuild 767 BLAKE2B db1bc28dbbd3fa4c037203e6b0d0bcb9b31375eec7d47947190352b09a624097ee5f0041ae9d8579bff6f4e14888860d1a9537087a6343304925823e2a616e61 SHA512 1df4e0d9d2698f79d876e10315c6fa60210a7ba32bed4c99aecac95d68d6fcbf9dcd8d78f0d49f283666dd14f1e5f928e63f9478570dcdae5bfb530f44e931e0
 EBUILD rcs-5.9.3.ebuild 893 BLAKE2B 77b3f2344937441d88d313910533ffccfbb07e58dcb81ad2f78448c264c936c71eee0b57583d8ca148207c23127ff231584dd3e649a5f36f920783be7541b8fe SHA512 1c4b02ed8a8eb64a848ff5cb80a5f3190acb4af5f864233a21945fdf6a8f00ee94d6b2d9100603676bc8a2b57f325d85f9fc259ceee5919300bd0e61757e2518
 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.8.2.ebuild b/dev-vcs/rcs/rcs-5.8.2.ebuild
deleted file mode 100644
index 837fd9e7c9f4..000000000000
--- a/dev-vcs/rcs/rcs-5.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Revision Control System"
-HOMEPAGE="https://www.gnu.org/software/rcs/"
-SRC_URI="mirror://gnu/rcs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc"
-
-RDEPEND="sys-apps/diffutils"
-
-src_prepare() {
-	sed -i \
-		-e '/gets is a security hole/d' \
-		lib/stdio.in.h || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use doc; then
-		emake DESTDIR="${D}" install-html
-		rm -R "${ED}/usr/share/doc/rcs"
-		dohtml -r doc/rcs.html/
-	fi
-}
diff --git a/dev-vcs/rcsi/Manifest b/dev-vcs/rcsi/Manifest
index 26914810c44d..e7d96f8429af 100644
--- a/dev-vcs/rcsi/Manifest
+++ b/dev-vcs/rcsi/Manifest
@@ -1,3 +1,4 @@
+AUX rcsi-0.5-makefile.patch 248 BLAKE2B e344c466a4c20a9f2a94e7d856f646be8437a35124091fe3194e9a455c700178bd6ed6d979bece9d025a9c64bc4987891c5bda352b942cb6d05310de3561b581 SHA512 43c197d9d33c001c5810c1706020ce91004b751ed8b88e7256291836120a948539471408dfbbdf2a595daee6f5243f6129f196f00223bb2a1df5df9b5cbac951
 DIST rcsi-0.5.tar.gz 68705 BLAKE2B 7ed066463d65ad60056114f15b069667365c222c6389f7301916f609b557a3a36a198be8520dcf614481083988ee06d0bffc2a72df55196b00bb8cf1463363f5 SHA512 4b9cf2bc9232fdad45461de1f2eca06958a26f2cfd1bb823be465102a152f31405aa611da922be5ebd9c83ff6efa62784fe9954563dee980befe1acd9c032f72
-EBUILD rcsi-0.5.ebuild 658 BLAKE2B 6434ee29cfffe468d9d3a615273472b5ed4c0ffbd6954f295d5e1a5c56b907967d99a4d6cd6b876e3c35034e270877734be3be8b193864d874933c8d4cd0c6c5 SHA512 041bd1d29a1e40d436c80f2cf9b8faa463014e4937eb172f568972b7f70a1566605b25ea79d6c8455ea22371beeece64ccaba02ab7ce1a311ecd345c7026ec47
+EBUILD rcsi-0.5.ebuild 634 BLAKE2B 166ed3a8c0372d418ce500c3bffe15482f1b73df94af86710fe6b29e6d96ed2d15389d8f3ff633b1e637a978c8ac25d7b03b596ccb26455c814cf6126a60432c SHA512 fd87d31ece48a79be2f3d59b15de37172877096a5aa27a8b67441b4ae5820be8d26429cf2d5dc8b43cbfd48e7b2c6b67d1ad8e3265ab07b33fc9251357c09a05
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-vcs/rcsi/files/rcsi-0.5-makefile.patch b/dev-vcs/rcsi/files/rcsi-0.5-makefile.patch
new file mode 100644
index 000000000000..bf5a3d329ee2
--- /dev/null
+++ b/dev-vcs/rcsi/files/rcsi-0.5-makefile.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -38,9 +38,6 @@
+ #	Later ones are for the various architectures that I have
+ #	successfully tested 'rcsi' on.
+ 
+-rcsi	: rcsi.c
+-	gcc -Wall -O2 -Xlinker -s -o rcsi rcsi.c
+-
+ sunos	: rcsi
+ 
+ solaris	irix osf1	: rcsi.c
diff --git a/dev-vcs/rcsi/rcsi-0.5.ebuild b/dev-vcs/rcsi/rcsi-0.5.ebuild
index cd4a10ad87e1..72d00168b457 100644
--- a/dev-vcs/rcsi/rcsi-0.5.ebuild
+++ b/dev-vcs/rcsi/rcsi-0.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="A program to give information about RCS files"
@@ -11,20 +12,22 @@ SRC_URI="http://www.colinbrough.pwp.blueyonder.co.uk/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="sys-apps/sed"
 RDEPEND=">=dev-vcs/rcs-5.7-r2"
 
 S=${WORKDIR}/${PN}
 
-src_compile() {
-	$(tc-getCC) $CFLAGS $LDFLAGS rcsi.c -o rcsi || die "Compile failed"
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin rcsi
-	doman rcsi.1
+
 	dodoc README
-	dohtml README.html example{1,2}.png
+	docinto html
+	dodoc README.html example{1,2}.png
+	doman rcsi.1
 }
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 5cbddc3f1f94..de39bb6bb9cf 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 1894 BLAKE2B d902a77a05e307607d561424bfc414a93b45bd0068abcfc98cdf922fb5c53acba2efa80c7635fb7a3040c81b6ae7f50a2ca68aadbdf245de95c86ced0d64bcb9 SHA512 bb81b115afc9083bdc74b2ec8397766d15c31e9ab13ce91764f3acccd448c0e470b8cf4f0357446678ea1fcf579b34797a1311014900472ca2911e281ad8331c
-EBUILD stgit-0.20.ebuild 1899 BLAKE2B 59d2b542ca22397c97c4451e52cc552427c930d834484d17f235a99ce96ed0352a8ca5706d81f7beadeebe6668c969072667ff07c88a2cdf1a2f297eab131d48 SHA512 bcfccf034ba5fd8ad0e14fb73090c14a9fa16c2e8d2b66585410ec13a86a46ade50ad40682d0672ad189f4b32ad9136c79be13cd5643bbff162e260c1e953872
+EBUILD stgit-0.19.ebuild 1892 BLAKE2B 3eee0e730cdc540fcb7a968c888d4a41ee7383c078083a7fe16cad5b09baadabf0fc5835bf573997f1b2a868da8537cb287b7e07a1e46fa3d0dbc4570f2a2e9f SHA512 8f2915637982709dbf074d37c93a2d26b1e380846d27f243967fe713c2e7ce43e36869dd19d10e3f8fb025eb4ff98c2f86a4ae67e0b2221f9ea9ac00400fc708
+EBUILD stgit-0.20.ebuild 1897 BLAKE2B ef0799401e676b2e05e2be2ae16b0511f12e410ae1fe43472c75c988e56e00af7313c6e4e400b690b960942b9cbabf4ee00d77aeef5dc8297c2285e0fe0efef1 SHA512 d42b9e43b7c4e11abd5f0f1f5324e1a459617f19f053e7d4a81996615f1cf7d2b92c7b73f8726ad9290669ce05805e9197878d2f99da34549de5e5766e21cb2f
 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 62681c37655c..0fed9ba96d67 100644
--- a/dev-vcs/stgit/stgit-0.19.ebuild
+++ b/dev-vcs/stgit/stgit-0.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 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 f129d6f44356..f6bc5ae8ddfc 100644
--- a/dev-vcs/stgit/stgit-0.20.ebuild
+++ b/dev-vcs/stgit/stgit-0.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index fc955c4ec2b3..de1e97f25451 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 15518 BLAKE2B 47fb6f92308731b10e6643fec230c9c73c688debf217bdd4fd7775146307b6a4dc5d38fdb0facbc4857596f50135fab7fcbf745c6b8498526f61d7d02c22096b SHA512 f37547e454afc030f04631f630e8a54c58600037b894a5671cd7d769580e2034cd8bf65164c31da5a04f7b2be3efd6772e9683872b41d2c7df280aaddb19bdae
-EBUILD subversion-1.13.0.ebuild 15528 BLAKE2B 8067d0dfbcc2f54a14d25587a2693dae96621c53ac895f53d1082dbcef001f222c7fe801ddc6d71aa0f58872d76976bb0dc64bf75490c70ecbd687df60989335 SHA512 9a0923f1db07834d0045d53c3dd6dcfec2bac77ce5fa1b60215e1ef3da516391471f3afdc362089497ec3253d7736a519522e4aaba739fa139c8748a9df4eaa5
-MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
+EBUILD subversion-1.12.2.ebuild 15505 BLAKE2B 7a83d647ec119c24b75456607a6250d0baec29d0022df416f38a23cec1f06b13be44dba8e0d7352affd5a8ab9d8453b7f04dffe282f6675edf5e063506d3c094 SHA512 829637a9a23bdd80fe47a1fba7613c9d3aa0da98b40b05184b01d77d078737615959ce6b032b34570bb79a1ee911143b3d5f37ecd4282dfe6fa60e8803b36ae6
+EBUILD subversion-1.13.0.ebuild 15515 BLAKE2B e2b4820662dcb8e12362fd2d6cb143ce5b1f884cb2b8526bf6ff69f6375e824bf74cf529080ec9ae7c2a706c45f08c4bbd9ea63982fcfd21c0d9660d59244bff SHA512 b0820e3d8e0a8722534e5803bcb99499899d42f93ce24208052dbf48d129ffeea253b71d76ec4b7b084d292bf9286435e3674fda50c2aa281637d043c4a178b4
+MISC metadata.xml 575 BLAKE2B 10cda26a50a50e6ac6b16d578d1a3856f88ac12b56ac6ff1768c4a0e0240b2e6abea6b1f66a6ea7d3f817e75eb9e2d5e14999ad2ba330b55784ec5028781b994 SHA512 f2a6ff822a11d452c133aca4abeb1ffb214d946c7e706d1caa269564c4dc55374c17449a4912df54b12ce562d66058baf2e710f3e9e46ca3602e9d8483555584
diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index a8dc2a284ccc..1bf5eabc57bf 100644
--- a/dev-vcs/subversion/metadata.xml
+++ b/dev-vcs/subversion/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>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="ctypes-python">Build and install Ctypes Python bindings</flag>
 		<flag name="dso">Enable runtime module search</flag>
diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild
index f487c2a61bd4..361a65f81cba 100644
--- a/dev-vcs/subversion/subversion-1.12.2.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.2.ebuild
@@ -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 elisp-common 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 multilib perl-module ruby-single 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 b309ede0baea..030f59949571 100644
--- a/dev-vcs/subversion/subversion-1.13.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0.ebuild
@@ -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 elisp-common 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 multilib perl-module ruby-single xdg-utils
 
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest
index f6955b3b574d..74260865fd80 100644
--- a/dev-vcs/svneverever/Manifest
+++ b/dev-vcs/svneverever/Manifest
@@ -1,5 +1,5 @@
 DIST svneverever-1.3.2.tar.gz 7160 BLAKE2B 0791451740b1b08efe320488067929e856fb2cb20ee82c3dbf666e37bee1835a1e1532f12cef666668f6da1c91a42ce80080625ee0d3760c8a02786ec1995c92 SHA512 cd43f18220b6a7adde3c7f451d9177b76f1c5f42384a0bf21719bb6d2dd56c51c278b81d8275328ec0ea9c3835cebc5d79be20a72294c5e14b3c339cba60ec8b
 DIST svneverever-1.4.2.tar.gz 7741 BLAKE2B f43a2e1d63065bf1f453f67d4cd4e6bc6a6f990c66eef0fd510e7f118bd84f10756a3066e3b6bc82b98155cb39be86e9139eb918a53d015fd1c79645d85a9f51 SHA512 fdf799bab23aa19861013ed40c513aece12df22051013e7110b1508fc1f4055faf32406c0c942651a31a6bd5cfecf972b64652ce5f211c41a6a144311f64124f
-EBUILD svneverever-1.3.2.ebuild 486 BLAKE2B 420ed8cd6fa28a18415babb8cf6c58aeb0ca1ef818530ff90c03e889b85b9212ab40a581fd7ff5e678272be9ecafca6ea03a6dd429b18e04b01b105a84be4fe5 SHA512 f82c7daa6ed5f33779379b71ef1a8b21248647b11b7c6b79bedb342ce7d12cbb15b73861ffb8902d5cb345c5a7d3eb70d833651a91544570c888963657911c71
-EBUILD svneverever-1.4.2.ebuild 482 BLAKE2B ffea8bde37e9d33300abc0355e12fd053c19e49c4da9176c366ceb4d05b9fe7511f1c9dff4cd1a975e086d1726bc71c2bb869b59b0378006cf953349fb5bfb56 SHA512 838f7c6c580dffcd3d3c0049c0fdeb343b9fb6ae8b1095c451fc6dc5d30f9e2e4cf88fd138d47aa5e3bcb5cabc9e5e2c48f84979fc45080f3202a6694120b1a1
+EBUILD svneverever-1.3.2.ebuild 482 BLAKE2B 532a429e588c75c6e350227152d94004ac221a5157f8dd7ed7e25e1233d0dd90fa3e4108fe8fe0274d750379a404729fa56c5e1a9fc60684917bf8ecfade2b24 SHA512 ebd945e1f9bb039f27261fb8c459c6e5b18c72cfbc513917bbe1e37031478a91c54adf1cf825dbb3d863e720078bb5c27534c6049a82ef8d463886020d459d3d
+EBUILD svneverever-1.4.2.ebuild 476 BLAKE2B 5c5a88fffdc5e40e253a70eba285e68f05091b36e9684afa44a34ad11eaa9f50841aa552ccd73ae67bfcd9d64e6d532e1a07f583865ff69f7c591250f6410d51 SHA512 2562eee5fc47defa18b7a8c4a5c6ccb4f9e75fdc19c169df29dcecda01daf8cabc2200264526c9acd5a881fd64023a077ef8354903f77a5722d8d38d6f078146
 MISC metadata.xml 334 BLAKE2B 8d3ce38a8ae3289ed55ea0daa72adcbfa8ea7cfaea7bbae2f7afded9c79cf3d41658ccc0bdc324db4640e73f3fd902be86bec29927f73582d860f697564a9f6d SHA512 d50e4630b891664dd365e38a57ed146acdcca6d645994d010b58b46b70adb77c3bad5f0ab5088302dd8f21adb33e8b478ac31426dd8bfcf94b1f82fe2613b446
diff --git a/dev-vcs/svneverever/svneverever-1.3.2.ebuild b/dev-vcs/svneverever/svneverever-1.3.2.ebuild
index 3366239c35e0..935c80b8b97a 100644
--- a/dev-vcs/svneverever/svneverever-1.3.2.ebuild
+++ b/dev-vcs/svneverever/svneverever-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Tool collecting path entries across SVN history"
diff --git a/dev-vcs/svneverever/svneverever-1.4.2.ebuild b/dev-vcs/svneverever/svneverever-1.4.2.ebuild
index 28e46bda28f8..50dbc6439b2c 100644
--- a/dev-vcs/svneverever/svneverever-1.4.2.ebuild
+++ b/dev-vcs/svneverever/svneverever-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Tool collecting path entries across SVN history"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 73dde03e64d2..4edb82baf407 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -5,4 +5,4 @@ EBUILD tortoisehg-4.9.1.ebuild 1969 BLAKE2B ff541757572e30cdc72fb69da7d62b7dd78d
 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
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-vcs/tortoisehg/metadata.xml b/dev-vcs/tortoisehg/metadata.xml
index 95aa13f6c5ef..7a38bb900964 100644
--- a/dev-vcs/tortoisehg/metadata.xml
+++ b/dev-vcs/tortoisehg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-vcs
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)