gentoo resync : 10.02.2020

27 files changed, 175 insertions, 97 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f97726ced9e3..11cff41eb393 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr-xmloutput/Manifest b/dev-vcs/bzr-xmloutput/Manifest
index 0a8305e521d1..6e40db88b0a8 100644
--- a/dev-vcs/bzr-xmloutput/Manifest
+++ b/dev-vcs/bzr-xmloutput/Manifest
@@ -1,4 +1,4 @@
 AUX bzr-xmloutput-0.8.8_remove-relative-imports.patch 5175 BLAKE2B 5ec184209d5da05c52685f7783d5e80115f29c1004c341b0fc6223efa3314bf7a7242f3513488f8ef2f20a2967e460904ec787ef9fb379fe591636718655d957 SHA512 209b3e4df0123a85a34d9b1f3cb2706fe61ab3bf779011cb16cabcc92245204c06d5be6ab16def6389fadb882b8ff8da5b0551baba988354ef95a777fff355b7
 DIST bzr-xmloutput-0.8.8.tar.gz 49969 BLAKE2B 728783e8d68063c639d153b334116c109f90493d80f7384f4e25deceb97e67843ad27676ac70403124163ebec745adf58fdda38515db3932ff87684e60537377 SHA512 9eb87ba86dd45b7132eca69ef6e52726d7ee2d9211cc3052655e40f5cee2b99e160336c347ddce7ad912c0027e8b6a05ca542f70733d2e3493922cfa311b38ef
-EBUILD bzr-xmloutput-0.8.8-r2.ebuild 611 BLAKE2B 746d20ac3a8035203dd3bf20bbb7618ea91301b3572c1c2b695295a04b7deec6cbe28ace76f471a9f46f21012b8d4d8b03d11387f078fa3696d2e762bb138653 SHA512 6235679d5ca3bf0dbed7f4f455f37bd11d117b3c2f1baf83db554cd2610681a4ab69dae51e8d9ea1cc5b344afb77a9bc5e19b0d1d9eae780a375afabbe9c28d6
+EBUILD bzr-xmloutput-0.8.8-r3.ebuild 646 BLAKE2B 906fdb8ca122c3d076411887990d5146f927c2cedb71ac354a037cfab09671cdd4f0aa8775719ffb8041a73e806254aa9261e85c9fe6c2c48fe95bbf192dc710 SHA512 4c84f30f19d907371bbd01dd2c78dcd9e414ef66b1ec1e2d526a1a1c1b6fb1270de0ef5bb2c9220a9e72df15be4b2ef5e7f05a80a5d1eeab96b8006dda2beab7
 MISC metadata.xml 253 BLAKE2B e68e5578eb3a3b0fecc4d9d53d9df965024851ea16c468ad728307064315ddf8547152e27f3c4a45e1b01f3763b0e7650dc6daa4f067d02dad00194379762bb0 SHA512 4fed0d9c18fc0528aaa734f5d16a7e1a36f582fb4b82365d8515301b04389b98431dfb61868c1e69a50b5cf8b5e19e73cd0facdb3ead5eef094eb24cda3ddbb3
diff --git a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r3.ebuild
index 6006269067ab..3cafe5224888 100644
--- a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
+++ b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,10 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="dev-vcs/bzr[${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-vcs/bzr[${PYTHON_MULTI_USEDEP}]
+	')"
 
 PATCHES=( "${FILESDIR}"/${P}_remove-relative-imports.patch )
 
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index c8852dc2f7c9..1247647f7bfe 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,5 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r12.ebuild 2967 BLAKE2B 61c47efbc6dcdef5e63286a7665e39568c7273df3c25427564cde862d3d3f690c7229a8fc1b42baf0f1042eb5b9121123d657a729a3301476f7bbcadfba964ff SHA512 72a6e5f4f29b85b11247075bf23935e55c8eb806347cad2dd6d80e759e751f9e78cb7400e15c633132c6e0f7de7e94d6bdb149864c9548fb154a3accdf80aebe
+EBUILD cvs-1.12.12-r12.ebuild 2965 BLAKE2B 90aeaa68ff3266954287b81a8eecabc0614bb7a0f17b4036688e3fa400d309fd3c5c28e59029d209e96a0d0e287125bfab70277d7569a62a8d06b643aae3fd26 SHA512 f356680d2ae8ceb0b257021846bc2d9a4e08f67e0c13d6ffc7bb6779078b69f97cc9c5c8ee11c996f0ed7f455a43b3628cef407104716f39b7cdba591f6e1997
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index ff6dca4d2b97..4b4172400eb9 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
@@ -64,7 +64,7 @@ src_configure() {
 	fi
 	econf \
 		--with-external-zlib \
-		--with-tmpdir=${EPREFIX%/}/tmp \
+		--with-tmpdir=${EPREFIX}/tmp \
 		$(use_enable crypt encryption) \
 		$(use_with kerberos gssapi) \
 		$(use_enable nls) \
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index d68511f39f18..c02773a690b7 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -4,5 +4,5 @@ AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a82
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
 EBUILD cvsps-2.2_beta1.ebuild 907 BLAKE2B d6b48f04387b04db687c0a89e05cb8348df8da9f6ac98f7e4c0c953628ab85cdfe36fb2c9946106009ed4ac038cd9884dcf7649bdf84104deb2e4fecdce507d1 SHA512 6a44090250709ebd3ed9a615cb5918409b35bdcb8bd5994a49d15f9e9314685a166e5a7d369e743cd69be14559bb4c77aa0b5106b68e09797519a6605adb0510
-EBUILD cvsps-3.13-r2.ebuild 1016 BLAKE2B 4b8ad09f420f2cdd8c5deaca57114dfa7ecfb0870d8569f3e071638544a48496d7167e6564c7271de4bdbb0b0f835b4dbb223b2991178f2e06db4d2ff60c496c SHA512 f1163dc80ae8e46c7da93b1f507a4fa22ca2ec6f448a4b8f8fdb0cf89255b1cedd352e08b30ce5a4502fe6013449e8e01d2eca998350b23568c96d2a325e7ffe
+EBUILD cvsps-3.13-r2.ebuild 1015 BLAKE2B 71f3abbc174302c619f8bf26bbd6a236a16fdcccece1774031c85b221d7005c7faf477570e217aeffa489876bb9315e63446478d5ff73164960c4e085056db44 SHA512 095ce3efffa6ba3bade54d99546e5f6eb0ec487708ed9e538109d8593a3aa68ff0debd9fff43cc9bbf8522d4d515c13ed2e0ae0ec3b35db8991765bf29a9b779
 MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf
diff --git a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index 1d9ca2cea5f5..436cdd749942 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-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
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 4fcee1e6900a..9592f15d2e2f 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -4,7 +4,7 @@ AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6
 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
 DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
-EBUILD git-cola-2.11.ebuild 2363 BLAKE2B 01ab123c26e500b8643472fc2c7461bd1e5c9430dcd4cdeca87d894f1470c972997b4cecffb71fdfcc1dd5acdc924ec18adfb8952001998327c245cb669ab46c SHA512 e685d1a9e78c4e884ec07262a9135fb19971b2fcd5cae3c67f90360dd54dea001ba3fa7ac471930ca691b03051a3c767a825249eb2e34cb40d3bc2cd56b10fd2
-EBUILD git-cola-3.2.ebuild 2248 BLAKE2B 7e6fabffd82dc9410acda407dcea904ef7d1d790b124dde760dca6b1b236a374a13340e1efc16cf1c667063174d7ca85261a53f174c0456edac0c932bd32476f SHA512 f757277d68f3187481384ec4e95323e1553e46de38ba7a4ef196f4c5c93d66353d2b93e8ee82dcbf3019e02b74eb68b2fee34cc3e6e02ab7697448432304aec2
-EBUILD git-cola-3.5.ebuild 2344 BLAKE2B 7b060cfc0e0aecc104a261fcfa84faaf28ab508a466f710f540784f0866e1b2ffcb8f513e73080b77af3a7a4f008cb38fd7c4d0902860b037b4cde18401bc966 SHA512 0d12db48bf1d9a3ba3949eab203df2e22fea1f9dd1de53a1e36745203ba14565995b7753f876a87868edede8c6e5bd99c364b66604d03d548a4f117b5d83b86b
+EBUILD git-cola-2.11-r1.ebuild 2467 BLAKE2B 41c2c8d7b46bb38fd9c0e29aef1a78f2cc9fe572a66661cb8596cc1793516e03afa9033c3c1e82b1c7d894bf26d99ba422b46b07b0588fe0661a3240bd41aef5 SHA512 3186c8fcced9d3264bcd7ae6f1c1d91c024716aafce4533755d223249f4eb3083a43241e3b377fc748353b9802c5e52296b8c205d4372618bb09c4d9d63eac94
+EBUILD git-cola-3.2.ebuild 2365 BLAKE2B 68c608fbfcadd3e5b86eb5ecefbfc472acef065473d02311e72c1796463c853ae0ef99b94b9ce9419f21e8c62a640897bbd94744ae634acd5f0e140703743ee4 SHA512 de423a52b9db9e4eef1729fc1ffcac9ced5c7c9bdcfadc92380f5af83d5e204ffcef6c32c5fa42a8ffe7fe626cf73942bb0e99d7e2f30eac64c346d056883d09
+EBUILD git-cola-3.5-r1.ebuild 2457 BLAKE2B b4a74fe9749529edba8b0309b6e0368193c3b67b4ce0d3117aca4da1a32c60b8646cd7c77e79e13091a85ebea12092b23e8858f585ce1f090532ae9edf5f602b SHA512 6a7ed3a27d87ca61c4e362eb3b5c017e39233c300d1b04d309f2cf0aa26a7305547abe5ebce6a24349840a19699dbf42646b0e41d50f143b50ea02130f1202c4
 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-r1.ebuild
index d97f4818b85a..f0df3414753e 100644
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
@@ -20,17 +20,21 @@ RESTRICT="!test? ( test )"
 
 # Since PyQt5 is preferred at runtime if installed, depend on that
 RDEPEND="
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/QtPy[gui,${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,widgets,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-vcs/git"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] ${VIRTUALX_DEPEND} )
+	$(python_gen_cond_dep "
+		doc? (
+			dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
+			)
+		test? ( dev-python/nose[\${PYTHON_MULTI_USEDEP}] ${VIRTUALX_DEPEND} )
+	")
 "
 
 PATCHES=(
diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
index de021727cffa..1d8dcb00b087 100644
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.2.ebuild
@@ -18,21 +18,26 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/QtPy[gui,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-vcs/git"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)
-	test? (
-		${VIRTUALX_DEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		)"
+	$(python_gen_cond_dep "
+		doc? (
+			dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
+			)
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+			)
+	")"
 
 python_prepare_all() {
 	# make sure that tests also use the system provided QtPy
diff --git a/dev-vcs/git-cola/git-cola-3.5.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 9fb8610abf7d..9a1bb3679f78 100644
--- a/dev-vcs/git-cola/git-cola-3.5.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -19,18 +19,22 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/QtPy[gui,${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-vcs/git"
 BDEPEND="sys-devel/gettext
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${VIRTUALX_DEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+		)
+	")"
 
 python_prepare_all() {
 	# make sure that tests also use the system provided QtPy
diff --git a/dev-vcs/git-deps/Manifest b/dev-vcs/git-deps/Manifest
index 28ff61877288..93865dc20f86 100644
--- a/dev-vcs/git-deps/Manifest
+++ b/dev-vcs/git-deps/Manifest
@@ -1,2 +1,2 @@
-EBUILD git-deps-9999.ebuild 1028 BLAKE2B d8fdc91d0ce0fefe9314243f60b3dfe5965398094f4680893a3d1ed993987da80e880ba97bb2cc3c71963b650790dfb32b8dd9f04b8a0624b18d7e307f308daf SHA512 2e8826945a6840739f83a266e388fd79ced5394a501d322113e80260711cc1b493d1a060d30b21ca9f967a1651cdd1fcb239a6a390e48488b62c69db6f7e655c
+EBUILD git-deps-9999.ebuild 1068 BLAKE2B f391c0f288187163ef21d5cc75f8c9fd685048ca265674c9686642cd5538f77e7084ec72310b9f09fea136d2b5d9767c4d87a85142a824e7067dc9ed636f5d39 SHA512 3c9636eb7b478d9bc8f66a406c871ddad72d55b7e7e09ed72f3d6225d97a39a2c092b5308bd4302c747cc0193aaf81c581927ee70f7e1081609d75a747dd9180
 MISC metadata.xml 490 BLAKE2B 12b1fd6d7c20349fe5ed2f76cfec260442479834c1cba9ef26722719ff6ea8b0d760519d8f7a62220e10b90b4e328a93898a61c974ece364736d1ad4a9828e8b SHA512 005daa7d1c3abffad1bda794339947dabfdb097a2abe85a1ea5b85fd962332d788d2903301f2b3442a3f35f5b97eb25d3ddd1add00460108ffc857f57c3fa926
diff --git a/dev-vcs/git-deps/git-deps-9999.ebuild b/dev-vcs/git-deps/git-deps-9999.ebuild
index f66f91356572..57d46ddb9f56 100644
--- a/dev-vcs/git-deps/git-deps-9999.ebuild
+++ b/dev-vcs/git-deps/git-deps-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pygit2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/flask[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygit2[${PYTHON_MULTI_USEDEP}]
+	')
 	net-libs/nodejs
 	${PYTHON_DEPS}
 	"
diff --git a/dev-vcs/git-spindle/Manifest b/dev-vcs/git-spindle/Manifest
index 7b923b9e84fc..9fb8ee023989 100644
--- a/dev-vcs/git-spindle/Manifest
+++ b/dev-vcs/git-spindle/Manifest
@@ -1,4 +1,3 @@
 DIST git-spindle-3.3.tar.gz 1854895 BLAKE2B b1330ba728a7f124024ad755ead350fc3e8b2a3065afe70f56b4053bc2a308920c5e2ec4d4bfee566ad199d58ec0cc3d25ac69be1e5999a2527a9711b79f4164 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8
 EBUILD git-spindle-3.3-r1.ebuild 669 BLAKE2B 030221392aa61557a5a353c4c3bb77b4d32934caf70b196521d12de1e2c012b022eab2c36437c7c44e53c4e0dead5b73a4eb2d9eac99611ca73a1ff4db28737a SHA512 3ae89f482e44a299bae1d1059ab5567c1d2943086206b2eccf10f0650b7a9f22084837b7db28fba46f5ee831896d9445807aaca2eec361cd03f0779edc6a2cbb
-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.ebuild b/dev-vcs/git-spindle/git-spindle-3.3.ebuild
deleted file mode 100644
index 3c2c96e2b97a..000000000000
--- a/dev-vcs/git-spindle/git-spindle-3.3.ebuild
+++ /dev/null
@@ -1,26 +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 distutils-r1
-
-DESCRIPTION="Git subcommands for interacting with central services"
-HOMEPAGE="http://seveas.github.io/git-spindle/"
-SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-vcs/git
-	${PYTHON_DEPS}"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/hgsvn/Manifest b/dev-vcs/hgsvn/Manifest
index 7e6637055e1f..1ea222c4494d 100644
--- a/dev-vcs/hgsvn/Manifest
+++ b/dev-vcs/hgsvn/Manifest
@@ -1,3 +1,3 @@
 DIST hgsvn-0.2.3.zip 199696 BLAKE2B 1947d69a5f9a01d7802a3f0a1fd7f38b15df4f653ca9aaf836646eb03be30e4a4f09c24469a9b118e4eba769a94636fe04d2f7399fb3d835d54c8d0225af6f1e SHA512 d88d683730430b825411b4267c78e82e492f45d55c49c8a19ed159a95390e58507b07217c4e5082a223c3217042fdc1ae2c96648b1880bd441117ca173ca4c09
-EBUILD hgsvn-0.2.3-r1.ebuild 878 BLAKE2B 0a6fca76683472f0215cac5bde3f25ed5553402c8a5d70c7812cd2aaefbb1ff8caf07b6f473dbf934d3fd0ee479eaaaabb02809cb995719c2e52f7ed4ae9bf83 SHA512 42e3aced8630f8c25e2fe5abb9fc8fba696bf3e95a6e70ab214ebc7ddec95a788ae0ec610f2d5196bb2d4daa4163995843a4e18c98bfcbe47af6572b957b089a
+EBUILD hgsvn-0.2.3-r2.ebuild 889 BLAKE2B 7e9003d55c2eaef93c98f3738d9e67abf2e85192fae55b8cd7d0cd14e4efa09a094c7d430afd329b55d7f8f86245beca3492036567a12952da9fc03d0c36e5d1 SHA512 0782e8818fd7d179a613516d02d2caff32ad8f6f30d7e6afb891ea3c0badf12d82f60f696f3c4a8791013ed0b503174deaf26f5ed7c7607cda0d78621f58d0bb
 MISC metadata.xml 344 BLAKE2B 7f7a9ed296fdf435cef6b24832bc3d83d59d795942197655c8c69c75162f0e66832a5c2982201029d7fc1008296f1523c6b6e4b6e34024876ef95a7cafe73a13 SHA512 9d31dde261ac9899cc9b5aa6f503b1d46db57b973ba9d26191f0d6d12424d63a1fce55dfe8d2bc198653c0ea8af1585f3a6b6969dd8b943fbc1d4a19592d819f
diff --git a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild b/dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild
index 016859b30c33..91a1d656c061 100644
--- a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
+++ b/dev-vcs/hgsvn/hgsvn-0.2.3-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=5
@@ -19,11 +19,13 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip
 	dev-vcs/mercurial
 "
 RDEPEND="${DEPEND}
-	dev-vcs/subversion[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-vcs/subversion[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 pkg_setup() {
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 250963c13400..c467039d4d55 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,3 +1,5 @@
 DIST repo-1.26 29829 BLAKE2B c5dc74214d404e6c11189a3d34c9a771ed5689da14e64588b5db144b6ea3ec38a727238d7dc6e609a22edb5b84d350210564615016f6b36599cf9e3fc3b34ef9 SHA512 1398fab95b4fb4a24fda93d4054384a801b5b70e3dca3a794f458d8e19582ef833ef5a3a0f3a571121d2d9172ce0e70f8b3c6719f6c2f47643ffe6de181e34b4
-EBUILD repo-1.26.ebuild 847 BLAKE2B a86153526d1ecec7490c7a58eef44754d089dda05e9e3840d15a4747da659221f58d5b1d9fe5dbd9f2276c2e35d1022f05132324028d02ae9d4bc5cbb05097cc SHA512 0d5ecc7a9004fedb6d91693234d56d222cf0190cc4ee8c44e8a3ba3592d658f1dd54850af314db22d3a372fe69eb6e2b07651b4700aca76d365c274b33142d2a
+DIST repo-2.0 30067 BLAKE2B 23aaae97c8512e329a4293d82c4e65583861d515dc079fdddbb73473ea0aeb3951315fa7595c70695cf94f030ed2bc97b134ff2aafe774b552132ac8cf4f4045 SHA512 a83525fa87a3fba8d78af1305dd92f5e51f58430bff20f63b8b743ad94d382ecf3edc1888c78f9da4be4d379bfa3ccde79aae5c1d8c173f928d3593ea42156bb
+EBUILD repo-1.26.ebuild 841 BLAKE2B b0c6dd45b5752a9b0d0af84f1d7c2e22a3556cfbec3cbe9aecaf22faadf34fb986c8ee520a8e18a979eb6d8058238a80195577aab3edccf584ae2d3c7f031250 SHA512 e844150bfcfac200304383c0b0f3ea9f77295ebc709b131546637fef96b1af3639cba783208cf0130311c53b2394153b894f2e7f34843f7c89cddecfe080e1f1
+EBUILD repo-2.0.ebuild 868 BLAKE2B 979642b6415c18093ad405a459dcc4431c3758e9d16e1c5e0fe12e88106680f57957975a5ffd8eae5f681d5f0e4c85ffd478c0f3df68cdd0d90f712102e2d01a SHA512 11fe9e4b77479d136d0b0f85751da243fa0bbc419a9ea3caacfb4e8eb55d8503b6019b822504c034debf715c64f9701297500d8415eb42f54ef9d1c886cebbd9
 MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4
diff --git a/dev-vcs/repo/repo-1.26.ebuild b/dev-vcs/repo/repo-1.26.ebuild
index d1563fd6addb..9d2c58695f06 100644
--- a/dev-vcs/repo/repo-1.26.ebuild
+++ b/dev-vcs/repo/repo-1.26.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/repo/repo-2.0.ebuild b/dev-vcs/repo/repo-2.0.ebuild
new file mode 100644
index 000000000000..1632716eecc8
--- /dev/null
+++ b/dev-vcs/repo/repo-2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The $PV tracks the *repo launcher version*, not the last signed release
+# of the repo project.  The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo"
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-admin/radmind
+	!dev-util/repo"
+
+S=${WORKDIR}
+
+src_install() {
+	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index a5d2ffce84a1..9f900de540c4 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 15506 BLAKE2B 496cfb7edc67cc127d1513cb83614132257774ed18a45779ff194bb044f723b4897e63b6f7398083620df6bf02cd0f4398f04fc3e3b4fddf915543a4b434fd71 SHA512 52894ce6cadec57392fa895f7fdff3eb4c10208816cded6c5a88db8356a5ab13f17fa3373d7c91d21a514c33404ac6947549798f0ed14c7d48c4690c351c8be8
-EBUILD subversion-1.13.0.ebuild 15515 BLAKE2B e2b4820662dcb8e12362fd2d6cb143ce5b1f884cb2b8526bf6ff69f6375e824bf74cf529080ec9ae7c2a706c45f08c4bbd9ea63982fcfd21c0d9660d59244bff SHA512 b0820e3d8e0a8722534e5803bcb99499899d42f93ce24208052dbf48d129ffeea253b71d76ec4b7b084d292bf9286435e3674fda50c2aa281637d043c4a178b4
+EBUILD subversion-1.12.2.ebuild 15492 BLAKE2B 29e4631386a60d57357be19612136d322485aef4ddde339e749a232b1286a0dce3eb38517bae19bfb4355f5cb6ddef856194e04afdb5096c5e03f81eaff54bb8 SHA512 5c1b9da2237539eb45367d0d09f476675feace3d239af7567a4ce5c4ea606e95214834ba640f9baaba5264a87d52b97c3ec3bfd5ff4b27b06b1ac11f0f8454cb
+EBUILD subversion-1.13.0.ebuild 15501 BLAKE2B 7100a4ec379f8b26c4194e9c59f158ef2fbbf55b395142f7426ab0c20c81075278cc9038b6a321068deefd9ac6b5f6369e6079b5d68d3e62082d642ff3ec28f2 SHA512 2d85d7a9766207ef535f664e87b0f4c351355063914c4756d48caeef940ba6a40479f2d9979de70ffdf6858f7b2fae8ece98780a3a66db3dbd61b5cc38b96394
 MISC metadata.xml 575 BLAKE2B 10cda26a50a50e6ac6b16d578d1a3856f88ac12b56ac6ff1768c4a0e0240b2e6abea6b1f66a6ea7d3f817e75eb9e2d5e14999ad2ba330b55784ec5028781b994 SHA512 f2a6ff822a11d452c133aca4abeb1ffb214d946c7e706d1caa269564c4dc55374c17449a4912df54b12ce562d66058baf2e710f3e9e46ca3602e9d8483555584
diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild
index 133e7dedbf40..3f53e0cbd391 100644
--- a/dev-vcs/subversion/subversion-1.12.2.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.2.ebuild
@@ -184,11 +184,11 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
 		$(use_with apache2 apache-libexecdir)
 		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX}/usr")
 		$(use_enable dso runtime-module-search)
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
@@ -197,8 +197,8 @@ src_configure() {
 		$(use_enable nls)
 		$(use_with sasl)
 		$(use_with http serf)
-		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
 		--disable-experimental-libtool
 		--without-jikes
 		--disable-mod-activation
@@ -261,8 +261,8 @@ src_configure() {
 	fi
 
 	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
 	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf "${myconf[@]}"
 }
diff --git a/dev-vcs/subversion/subversion-1.13.0.ebuild b/dev-vcs/subversion/subversion-1.13.0.ebuild
index 030f59949571..e1cb5bd947d9 100644
--- a/dev-vcs/subversion/subversion-1.13.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0.ebuild
@@ -184,11 +184,11 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
 		$(use_with apache2 apache-libexecdir)
 		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX}/usr")
 		$(use_enable dso runtime-module-search)
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
@@ -197,8 +197,8 @@ src_configure() {
 		$(use_enable nls)
 		$(use_with sasl)
 		$(use_with http serf)
-		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
 		--disable-experimental-libtool
 		--without-jikes
 		--disable-mod-activation
@@ -261,8 +261,8 @@ src_configure() {
 	fi
 
 	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
 	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf "${myconf[@]}"
 }
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 64138c6de4f1..7b965cd93ab9 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -5,10 +5,12 @@ DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6
 DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359
 DIST svn2git-1.0.13.tar.gz 43738 BLAKE2B 97e9b90402d3c7eedf0fafd3b68429c99d93522dcfe190f88e64b744cb86e5fec0bdd0fabfef39018e290a425a53a2089df88250ff03e447f2963e2ad99fa0e0 SHA512 7cc9a9d70da285533f7f34672fb8f6571cb031d2dd4fc9df904b9e3acf64d97f42027a19bed82478c75a237febf3c8e12ba27a1abcd98403fe24247e5a26a96a
 DIST svn2git-1.0.16.tar.gz 44489 BLAKE2B 0be673592a6032b0f46f7ab80e50862e6979a6540d17eadb2c0e4c3f40737283fb17cc51340810bbfc17dba7ee258537d5618de95da3843851e20ae843a47626 SHA512 11289c98fcae98ec2137b778c064e73f47957c987a8d413946a8cde44d679565eae878e69e3a60b5c48c0753dd4935d001eb6ba28253cea995ee4fd40379b583
+DIST svn2git-1.0.17.tar.gz 46473 BLAKE2B ab862a310f8d21b33d49f5152df458fb1524abe2e353e6395d7b20d80ee3967338ca04ff5e282623937ca13b38e9018ba81d4c3e89f3c69e1002bff7ddd8621a SHA512 6d02ffa0923bcc80878c08e5a4f2f00476485e34d1c7361ddfa8bdfd521c0d36a22b46e7cd872e617ecd604f2d724166ea95008338bba41ee7e1200dc919baf4
 EBUILD svn2git-1.0.11-r1.ebuild 1164 BLAKE2B c838d41cf17d0241e5b1e229263d26e4015b1d76c768c3feffd41521a28752064eab6e2abb47a563777d691e0bf49e3e50458f4a9fa9d23e95f92257924eb11f SHA512 8e81668615ab102e02391130f22696c8c3bbc1ab7f13103691a35440556f62f400019e0922e9230c97e35f9f9875ee7de42f757427d2f7997d2b1ec1dc1b73f4
 EBUILD svn2git-1.0.12.ebuild 1037 BLAKE2B d9796902d0aa1bd12ac44097ca10fb0c3ece022b193dc60f292fae59b8df1a5fa4d4df0742471dc5ba898b584e6b13757c336e740b99c9746fb756e5e66edb71 SHA512 e02aedb85806701cfebc8f28369bf27433b798c44ac9bafb3730cf4b914fc877fc4134a27e69e7ebbcaf047bde6f9bf14b5854613f1da340342009e46a87dd9d
 EBUILD svn2git-1.0.13-r1.ebuild 1081 BLAKE2B 04d13c0be9aecd14e3b2ea52af46e00de2792a140319545bea39bfdbc9515eb411c67fd9383a8674bea5a22611f1cb29a99ad44f28300ec27addfdd859d0317e SHA512 0745ce05c437203dbe4913dac9e238b741ee69a57459ed82265971e464c0eebbff16f635865b0d23d0ca303bc90b980122b8e3966011d5b250b21d1cc02ed756
 EBUILD svn2git-1.0.13.ebuild 1037 BLAKE2B d9796902d0aa1bd12ac44097ca10fb0c3ece022b193dc60f292fae59b8df1a5fa4d4df0742471dc5ba898b584e6b13757c336e740b99c9746fb756e5e66edb71 SHA512 e02aedb85806701cfebc8f28369bf27433b798c44ac9bafb3730cf4b914fc877fc4134a27e69e7ebbcaf047bde6f9bf14b5854613f1da340342009e46a87dd9d
 EBUILD svn2git-1.0.16.ebuild 1034 BLAKE2B ddbb36477b2dbd88f52598c46dfe6c357a3ee03f17ba668897a11cdf1da6b2d11bbaa160526b7ece14437883ba7583a596f3f9c66f5fdf65c693d76427a7b8b7 SHA512 61d9606dc51ba6efd15b615d6573a357a73b84c01303c6b561b6f3f09aed6db4e9698231b86622913a97118b8a85c36df71b238ee5a2bb0390475c13c7c68d1e
+EBUILD svn2git-1.0.17.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
 EBUILD svn2git-9999.ebuild 1021 BLAKE2B a503c85adb6f2b39ac0483dd3f7032b45a181b6b8306c390c76857138630864a28da68f18f9075183ad098217a7a8c888fe60ad4dd1df86918dd5790fdd9b667 SHA512 9fd102538666531b4f689f9eac4ad4ca0dcc7abf4d20692b1ab0abd0b47ff941060c03afc733e09f994618ca5478cc6d662b7324c74e9be0662b6e9c1619f9ab
 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
diff --git a/dev-vcs/svn2git/svn2git-1.0.17.ebuild b/dev-vcs/svn2git/svn2git-1.0.17.ebuild
new file mode 100644
index 000000000000..7b8fb13d3724
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.17.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Tool for one-time conversion from svn to git"
+HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
+else
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=( README.md )
+
+src_configure() {
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+		VERSION=${PV}
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/${PN}/samples
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
+}
diff --git a/dev-vcs/svnmailer/Manifest b/dev-vcs/svnmailer/Manifest
index b74cd8af7232..d71ce45cf2df 100644
--- a/dev-vcs/svnmailer/Manifest
+++ b/dev-vcs/svnmailer/Manifest
@@ -1,3 +1,3 @@
 DIST svnmailer-1.0.9.tar.bz2 354935 BLAKE2B 72a46c39f11295cb789fdc5b1f01162b9cd150828cde15cefef826b0eb44f580abd7a0ce5a56c4e3eb8741b03a7b45a6b5faeb0b58e60baace91949f40cd5ff8 SHA512 2dae9b123e3f511f022cf4d0db75b30b7fad33719382a7ab57897726ababc73bf24bb838cd92258ee5573996e1fef9805f8afbe958694e7cb4682433dba9a6e0
-EBUILD svnmailer-1.0.9-r1.ebuild 760 BLAKE2B 83de962b83e0e9acdc27bbf668dbac5f070b7b76b05fd702f273a5787f9a854d5d5bda9eee4c9542128da8ff62ab59319807527eae4e1ff84d67e340406fc02e SHA512 d7bcc686bb9dfedee4e7992215e69df72f53a83552fbda0efa5e02963b25be22fb2f32898c66460119378128985668a286183a47b7065d8c7326b336779af25d
+EBUILD svnmailer-1.0.9-r2.ebuild 793 BLAKE2B a284571e2ce587d2f1925be7cae187401b4faeb7a6b569f938fa04f806e700272511075c9f871542157f1a6c5c6880859089fa519a9f453394659260a3a23bb9 SHA512 c576d46556c119ef8e77b914ea9456c0ea6ae093f18bce138b31812bc5192c1c26ce70aeb1f6bf29c322cdd4d5772e0cc5f2e6dd1a6bba2ed6c39db5ac093b2b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild b/dev-vcs/svnmailer/svnmailer-1.0.9-r2.ebuild
index 27d43db65303..0d5e77c6f358 100644
--- a/dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild
+++ b/dev-vcs/svnmailer/svnmailer-1.0.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="${DEPEND}
-	dev-vcs/subversion[python,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}]
+	')
 	virtual/mta"
 RDEPEND="${DEPEND}"