gentoo resync : 16.02.1018

16 files changed, 17 insertions, 116 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f0d623b1daeb..1eeaac8392a5 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs2cl/Manifest b/dev-vcs/cvs2cl/Manifest
index 5be9a72442ed..8ae2e07c1c8b 100644
--- a/dev-vcs/cvs2cl/Manifest
+++ b/dev-vcs/cvs2cl/Manifest
@@ -1,4 +1,3 @@
 DIST cvs2cl-2.71.pl.bz2 25347 BLAKE2B 423a5d0faeb09f4ea730c9ba18c87b962acfc5808995bbb550675f34ac51670d2493408b9ea15341ca1dbc7465c401af47b8981117407c5bb669c9f932f07de2 SHA512 de9e8465da56bec5b541a588e0d2a73f49e060fcadbde33ca63a7c4f93edf37cc50aa3271c4ad466430d3315b95c27d642325bd885ec7afdd6a75586d15d9dbe
-EBUILD cvs2cl-2.71-r1.ebuild 435 BLAKE2B 46e643f6b03a5379b019099feb05effcf5e0de33193a7c3c65bcde911cbcc16654ea3ee594c977c464e1f102088e740fc06d51f6ff38b6673539e966f91a8aa7 SHA512 4e6a956fee6facf082b06f080d4d970739cb7cf35dae2354cce7a0bb00ab12b9bb17a174d0a719ee3cfed310a0af331d83f5039c187c5dea315e255fbd2ea12e
-EBUILD cvs2cl-2.71.ebuild 633 BLAKE2B bfd744611d69d7226dddf5a288a4fb335564ca19a33e82c5049142949c6ebe40f5c81f90793e49ce66d936ded490ad7b9325063f5ab085dda10d9a8f64956daa SHA512 1fe43c4718c4ec0926345b5721dd5a409e71477eb8e7d2678595a1068697fff3f66752424031690ac1a571c3547e00685035d3e72e5e8f1dbb5a14a676b2dd6f
+EBUILD cvs2cl-2.71-r1.ebuild 433 BLAKE2B ba3286c9ca78b9027e51f9cd9241733e2b126217d090028afb06e5598de564c410af71e17f21331bdebdfea0798b8a493ea1141dcb4368351ae4c9f393907c8e SHA512 2f37dd7276bba66a24b26102643283298bcab0e9c90b98bfbc19ba5ddbebd7d357eb6cc4978f44658d6993b4035fd8f62d6cd189a78e0e4486b170291cd37de0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild b/dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
index fd781ae20b5a..737d83067a25 100644
--- a/dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
+++ b/dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.pl.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="dev-lang/perl"
 
diff --git a/dev-vcs/cvs2cl/cvs2cl-2.71.ebuild b/dev-vcs/cvs2cl/cvs2cl-2.71.ebuild
deleted file mode 100644
index 814e135a7883..000000000000
--- a/dev-vcs/cvs2cl/cvs2cl-2.71.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="produces a GNU-style ChangeLog for CVS-controlled sources"
-HOMEPAGE="https://www.red-bean.com/cvs2cl/"
-SRC_URI="mirror://gentoo/${P}.pl.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-S=${WORKDIR}
-
-maint_pkg_create() {
-	set -x
-	wget http://www.red-bean.com/cvs2cl/${PN}.pl
-	mv ${PN}.pl ${P}.pl
-	bzip2 ${P}.pl
-	ls -l ${PWD}/${P}.pl.bz2
-	set +x
-}
-#pkg_setup() { maint_pkg_create; }
-
-src_install() {
-	newbin ${P}.pl ${PN} || die
-}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 7b00e1e5d73d..1592364d9bec 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -11,17 +11,17 @@ AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fe
 AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
 DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96
-DIST git-2.20.0.tar.xz 5359684 BLAKE2B 38faefbfd9cea60074214847ae0aaaf98b8fc5535dc5e6feeebbd9f3bbe482313d305e6aab4a4a170cdebc0c0c3e63466ce7793cb189734b088da9fd9981d1e3 SHA512 b1d9244545564651f6ed23b3227145bc637f6b62bdcd8f9ff354e67662170e5ca7f92ab9d7e2a0e5c3b0a2644c695e42f0fb1a727ba6aae000afa022be807065
 DIST git-2.20.1.tar.xz 5359872 BLAKE2B f7eb640f179837687b2b343d8a3a03d7d0fa60ca17e28dc5637a75800752d0e02be4c535dc4c3be6f25020aa419f22aa6855c641b06c61ebf45e0c51de069262 SHA512 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c
+DIST git-2.21.0.rc1.tar.xz 5399412 BLAKE2B 97f91b2b9613b76b79d8f75c112d57f6a4d6088156e59a5594827d3147c16c6a53f01ff46cf543d60ccf8fa13fb73ce43de46ace96cce27586944933f8a17bfb SHA512 4d8a4981e66b3d3f990b7901c037112ab25bd2a9b1eea8fc3b7b51cea9155edea8a73dedd3d15966239826a9b9162e4f58f87c41bc653ef1d8c5572913e9e49e
 DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634
-DIST git-htmldocs-2.20.0.tar.xz 1227512 BLAKE2B aa6cfdf4006efdb869cb054f3b3cc2325dec56d473d678ed4a2289afd92138f26aed736021cbc906274183150dac9035df6950495944fe8a70bc1654b1e041e8 SHA512 a23adf7ca804c77f4fdee25c80e47c66ee5cff00bfae747561144a68a94e4d02aa65223cc7770d0514c6a919054cd5d7419e6ee26712170c76d075ad156344c4
 DIST git-htmldocs-2.20.1.tar.xz 1227884 BLAKE2B 2e3b5e888d187cc7563a36d9b0c43118fbc50ddf9ca65a98319f563ff226e1f9829d578f578619e04d9576eae95631188973484aa758a9706a7a08261e0a16ad SHA512 aae04a8a42865a855d699d445d2fbed657aecce8d090a36e171c6cf260175102fe2314142f3b59d200460560b413698fb263e77cadae49171bff50b96edb6d63
+DIST git-htmldocs-2.21.0.rc1.tar.xz 1235140 BLAKE2B 910e42269e887ad40651d5d25b90f7c5cc0f7252cea0429daea18ed912268f315d40bb1b4662839e6b191f33dd08f2077b2a3d4b53478c0f9963b547ac649176 SHA512 b55d23cad0d83b372b79755cde03256096b59c0f21c0bd5b75bc660dfbc50cc6d56d17f1127ea9249b17a57f5cbc409f84686e371aa37e147980615211fc045b
 DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1
-DIST git-manpages-2.20.0.tar.xz 439220 BLAKE2B 6550113988e6a6c833aac6b19493d3692131a85a5aa499926e8afc89515cae5cef507609ff3a87a150a173d928a091c44abfa918a64b003fda9c23a393897ac5 SHA512 d49e1599f2d911843a33d1c6149ac7c8dfabcef0aebb15bd04988d692662eeac0dc918da58263a50621ecccc436f74056a47a583526e0a74b3ee4e685d4ce11b
 DIST git-manpages-2.20.1.tar.xz 439172 BLAKE2B c1c7a3031d600e53451ff2c35b00a541dfc09554b47567c4bfa8410d891dbd98c2ff28cbff5deff21e74c1c92eaa70777013e23bae6a484ba1690bbefc1740fa SHA512 43ab28063b896062727ced8aa64119daebef261c5b393cec112fe9872955a165abc3d91f75f6e273d60b15f3c49eba44dfc7591ede452cfee8362f7d5f39c5f7
+DIST git-manpages-2.21.0.rc1.tar.xz 440148 BLAKE2B 689c438b81b337b5c70c407e0069abea3b1c5d02c5ff203683ebe7825384450023de3dd780edcf763a09279587614c6ec3b4a9a9efd4f7cc482d770236d3a11c SHA512 bfc07ab4c2ec9565ab72174264c412a39ae91b2b159c0e77bbffcc7f2a04d29db69ec301e23dd728c6e7fcb0b0e401f0320cb6f31c48819c64fc507d1f919a39
 EBUILD git-2.19.2.ebuild 18976 BLAKE2B 0c5480271e7a580808a2e5f3497101f2a8ab748a33cfa75e02fc8d862cf08e6bf5897d1d852144bb29e5be15445cf95c0532de684112ecc4a321b1e81ffc6d18 SHA512 ea46175f6cf2d20814e93d16c70b4f39c4fff5cb7ec822ba2739d71821d72543cd8b6a55acdfef7f91d45b2475142c28c28bbce38581287c601e808ad9f7d3d0
-EBUILD git-2.20.0.ebuild 18988 BLAKE2B 44bc0ba60b219368b5e303ad2f5113d37bb6b27ecbb984030b8fced18da4a1502992a38f42f711bd8a1a330a3ddc97a8af0fa441a5e5fb351b896f8ba3c51c8f SHA512 e1431303196c92fc1324a05da218ef2180a902425ae7b041d9d280e8a0a4252ea767cbbf05392ee32b8328d30a42e081f324be329c45b4ec9fd46c18af60638c
 EBUILD git-2.20.1.ebuild 18988 BLAKE2B 44bc0ba60b219368b5e303ad2f5113d37bb6b27ecbb984030b8fced18da4a1502992a38f42f711bd8a1a330a3ddc97a8af0fa441a5e5fb351b896f8ba3c51c8f SHA512 e1431303196c92fc1324a05da218ef2180a902425ae7b041d9d280e8a0a4252ea767cbbf05392ee32b8328d30a42e081f324be329c45b4ec9fd46c18af60638c
+EBUILD git-2.21.0_rc1.ebuild 18988 BLAKE2B 7a53db408fef25bc3503cb44a8042a6533ad42a54d0804e501eeed78da1d4e619d536df79f1a25f2e7157e959d097e605bb6f06143a1ff03b1028fe7be29219f SHA512 e2583574f33fd41fcba20b0583b4ae929abdc0069cbc25e8514597721ea48d0e7be44fefc664d2131e902c19d4e0983f8b948d3f9623d6e2320530cec87e3704
 EBUILD git-9999-r1.ebuild 18988 BLAKE2B 44bc0ba60b219368b5e303ad2f5113d37bb6b27ecbb984030b8fced18da4a1502992a38f42f711bd8a1a330a3ddc97a8af0fa441a5e5fb351b896f8ba3c51c8f SHA512 e1431303196c92fc1324a05da218ef2180a902425ae7b041d9d280e8a0a4252ea767cbbf05392ee32b8328d30a42e081f324be329c45b4ec9fd46c18af60638c
 EBUILD git-9999-r2.ebuild 18988 BLAKE2B 44bc0ba60b219368b5e303ad2f5113d37bb6b27ecbb984030b8fced18da4a1502992a38f42f711bd8a1a330a3ddc97a8af0fa441a5e5fb351b896f8ba3c51c8f SHA512 e1431303196c92fc1324a05da218ef2180a902425ae7b041d9d280e8a0a4252ea767cbbf05392ee32b8328d30a42e081f324be329c45b4ec9fd46c18af60638c
 EBUILD git-9999-r3.ebuild 18990 BLAKE2B 8f503869909a0c58c9084ea8e157457425b73fe3f90a62c8c9d2b3725d066654a6b1def7ece98766ea2562a7f5b7d65bbf78acd9ce82138c5743a2ae5387422a SHA512 43d91868496acfc4c32be749efd005f788c2b59a0816ef1082b00d75d64b5d5356af5360cc723c93d97ccf20c4452986fdeba96ccdb2020784dc37ed846b8511
diff --git a/dev-vcs/git/git-2.20.0.ebuild b/dev-vcs/git/git-2.21.0_rc1.ebuild
index ba5503361b6a..249c44e0e775 100644
--- a/dev-vcs/git/git-2.20.0.ebuild
+++ b/dev-vcs/git/git-2.21.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/guilt/Manifest b/dev-vcs/guilt/Manifest
index 0f85858b6521..0e0c9e606fba 100644
--- a/dev-vcs/guilt/Manifest
+++ b/dev-vcs/guilt/Manifest
@@ -1,5 +1,5 @@
 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 1267 BLAKE2B 40ad79025a8b2388fad6bbfac12b4739de4956409969a424b9b5b4b92753cc6052e4f8039c75a2a927d95862873d8a78cfd3f2c9bc48e31f1a295a76a5ed1d61 SHA512 7f23efe1e55b62d1cfc932e894e89dc4a2c9f10f43e4b365008609073dcfb26a784533077e40fea119dd6b73ff7b8745ab27162a6461d41cc1d96ee0ae890644
+EBUILD guilt-0.36-r1.ebuild 1266 BLAKE2B 1b18d86f40750c731de9dbd47e10f1b8217015f29d1aa04897fef890ba0c49f541720bebe7824aaed3fe0061dfd1bf2061d6996a17194d4f87408b9b3bb9082d SHA512 6befcc2353b57d736f7b15c50b896f36517e7272a91b7046426bbce34773bce093497876860483785c2e692e60002aac0454b012bee3f7dfe02a1ea2093342ee
 EBUILD guilt-0.36.ebuild 1224 BLAKE2B f00929b77ab0b0a48f2f965bc763bcef45ab60d703ea1e6f93204b3befb80f31c7b4b723ee1a564a5da028de405d74dfc899a055a3b2339f13c6dea681081576 SHA512 de51109ca240eed4c23d98fccc088faa4151b7e8064dafdffa9ddc528397c90b0692a02a090703b44ec8a0579d4eda13eedf39ccbeacc8f1c68058aa6f2a2aff
 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 1f572822a3c3..0ea4054384d5 100644
--- a/dev-vcs/guilt/guilt-0.36-r1.ebuild
+++ b/dev-vcs/guilt/guilt-0.36-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ppc ~sparc x86"
 IUSE=""
 
 # Since we need to build the man pages anyway, I don't think it makes
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index 336aa5a7a557..4b3f5e5de667 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -1,5 +1,3 @@
-DIST hgsubversion-1.8.6.tar.gz 180720 BLAKE2B fc3cb8b3b4298a11eab4e7374615b80c7653449efd39f7ac48663a211988654bf173dce7016d8c40efbb60d55ed8884680a2139461fea1537c459cdcd807c176 SHA512 8431e995a9f2c150936af004527fea6d562a34c653af6d51e69afdb10397528bbe7f230d92b18c3d04e2315c7b0078ecfc1bd619be4c2540bb564d50092566c4
 DIST hgsubversion-1.9.2.tar.gz 203801 BLAKE2B dd8f53baf1d12263be1dde75b2a0a9367ea038bc4655322ac8e89c5fafe67cd42ab94f83b2eda2ff28f521b8ef7ecb5034dad0916bb2fdfadeee68e52f75e348 SHA512 e11e0db50702d0fa0c29ac75bde8f943551ff392218656f82672c25635b43ed17d26026af106723875165806577881c268ebb5fb82954add599dcb14b13e4744
-EBUILD hgsubversion-1.8.6.ebuild 971 BLAKE2B 6b2f602f4a6972fada4acadb04488edc2bfaa3951bb84d65a645a5dfcebfd3baf4931bcea716657b1c3c2691872832aed8827b8906d8c0b13dd525b1073503ef SHA512 1c3dcd2b6f6ea852a0b3ed4ff81f1968551a355270809c139522b90b16e9bd93877b9cd70fd4501399af90155f607f3403e3b44f76e4738b3148adc357416351
-EBUILD hgsubversion-1.9.2.ebuild 937 BLAKE2B 263e28b40a2f8527eeafcc11294122110e18e5d13cf0b5132e8007de2738b47f8e8a96195e476a594e49809fe07426e6cb2c874f74021190326f4271280ab03f SHA512 b8e27d3a61327e5770a667684fc9794fca5c060b1105e17f2d4d64c0ff058d47169f1cb588025eb5370d045e23dd85bf94575341c5ac85f330eb6be2ba9d3a04
+EBUILD hgsubversion-1.9.2.ebuild 935 BLAKE2B 553c70cad6f0191d6cb6bb4184f3a0c3158d8e4769347a438ee6cfc90abd7b4a7e05cfeb5be8fd849e4948b3640a7d02036fbe388c54d92295441c168b6fc4d5 SHA512 b78838cbeee31e06eef85fba34dd8e948d6fd36c86368f9d134f8424c2bb7aaa3546be419c17d2a42b2629fe4848d22c1c135197585b3e62b441e52ef3fc1afa
 MISC metadata.xml 305 BLAKE2B ae280ffce2435476e46877db066a5967861112aef4cbde989981b8d01919e32706a758691ba0f085015eb681c2a55b2a601313bd9d9d9319497037e689d55bb8 SHA512 a5d7eb8c02ff08bf50591a24a4b0b76a76e799fe5903a27c8a648e1ab839f28135f6f16eac2ba557006936dabadfb08543c203fe0fcb3ff8f89f62e63fdb300f
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
deleted file mode 100644
index e4bc74e2fc34..000000000000
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-
-# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
-RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
-	dev-vcs/mercurial[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
-		>=dev-vcs/subversion-1.5[python] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
-
-#python_test() {
-#	"${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
-#}
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
index fdad0a29f398..2abc37c6b0a5 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index fae50c839090..d339827e7a77 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -12,7 +12,7 @@ DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01
 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
 EBUILD subversion-1.10.3.ebuild 15403 BLAKE2B 3b64708ed206c09b91ba8c637c0a56f0b29f30992ab215fa4b496362bf86be83137165b1f86843ef06a76db0837e1a5472827714069f8fa9ec225f6b36f0eab7 SHA512 be239cab2cb71159d875c0d7a8e92d0a808b3f570c45586ec1c45e9f10c4f8ff90582d07e3385fee8442cb4562c05f6ae670a4dfb3a895b6f3f7d8bdd4355309
-EBUILD subversion-1.10.4.ebuild 15403 BLAKE2B b05a0bf5ad902c233544dc312ac7e9e9be3debbd7da266293e387298da02a84695721cdd0294cb6bd932881a650b394fd337822dcebddcca5bb90b6d7114d8a4 SHA512 f0f78698f3af812e790f420bdd5232119a36b96196e36bd81a5a1258de84833b0a327b8c3b0ee089933404a09ed7efdc2a076b520d8c37081498f6c510f3f84d
+EBUILD subversion-1.10.4.ebuild 15402 BLAKE2B 5c06379893294a0d9a5561f9e0439b9125aad45b5e197dfe1f474ce43ca48f061cb7dcba81c4b452e221adc9154fb216e3b2e7b50ae8771745dbfc1266345e8c SHA512 6a2170beec3561cec8d13bec40ed817b865b6641c6a693951ed17e7af0d8c346cb237f4b24867ad9aa2f0d340329e5f550476a2b7e10faae5a58227429f0d399
 EBUILD subversion-1.11.0.ebuild 15400 BLAKE2B 48a0c2c41995eb70c26bb875d0568bfa46987593afd6a0dc0a72c887e91cc668c8b176e1a2fe7dcb572ba51720510fcdbbb71be4fe59eb188b19adec24bffc57 SHA512 21b758cb2e8d5dd0288dd5e15c194991369423e38b4710290825faebdc9371e696a7ced51b702e19cfea70c9c6fd72ec0c321823ea6baf9f65fc0c3d4369e921
 EBUILD subversion-1.11.1.ebuild 15400 BLAKE2B 48a0c2c41995eb70c26bb875d0568bfa46987593afd6a0dc0a72c887e91cc668c8b176e1a2fe7dcb572ba51720510fcdbbb71be4fe59eb188b19adec24bffc57 SHA512 21b758cb2e8d5dd0288dd5e15c194991369423e38b4710290825faebdc9371e696a7ced51b702e19cfea70c9c6fd72ec0c321823ea6baf9f65fc0c3d4369e921
 EBUILD subversion-1.9.7-r1.ebuild 15859 BLAKE2B 0e057b982dc5c69823580408b77e3961aed8f57f262034fdbc5ca5df53de038f7cbb4a9a51bffd50406bc386887da3482ea542a614f997ddfd3b27bbea2a85cf SHA512 3de363cf9407f1525cfd30655740966a641f2252d4b0d65ba997252cf699cafa951327d886f181370ebb53cfcaf3cd7d3bbfbdd4e9a8248ea0a332f4b969fe26
diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild
index 1957a44408d7..29fd0fd97e8c 100644
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.4.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index 95745577aeb6..f23d318b4916 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,4 +1,3 @@
 DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c
-EBUILD topgit-0.9-r1.ebuild 697 BLAKE2B d2403274c59bea10d676003f7e307b7f2138264693fff979257ebdc7eb157a0e88d945bfea3fd0b1c5ef1cabbb3d5dc57ad196d782fad4b5b8d94feb7f4fabf6 SHA512 171f8e2c67a2ab9605385c8f6241c192f78bc571451a99994cd53e1817eb58e91e2fd4a5a15774286b60c9e761e4ec68ce42cfeb5bbea38244d1e9dd46b2c015
-EBUILD topgit-0.9.ebuild 695 BLAKE2B 0e0c9bc9bd63eb09a5809b82831d25cd577f580655823aacac354609cc270a833fcc9f6b8a4702c37fcb590cc7623a906cd059eb8a5c72ac90b5ed5df4c0923e SHA512 7fc7ce4938c1b881d4a8724901b93789c05e21c78b1729d5db68eccae6d06284ff79769fb0b4755b81154acc1f6410f256a4cf73d1be57029aa48db89e6760de
+EBUILD topgit-0.9-r1.ebuild 692 BLAKE2B d604f1d2800d5953d2d7f296b5596fee898b95d51eedb80dda8d121dbad3c3611f4ecb40a2e5f22e8143981961639f68d5086539fe08a9d0e8e67940fc5df08d SHA512 2984e19bb3c22e8d83b0c8ad85b8c9939c3dddec3844ffeffd5e5cb6b2d857c3da9e214a3e89fe16acaede8aecf20c820b68c5793080d87476bb3bf40d90f996
 MISC metadata.xml 246 BLAKE2B f9d665b30ee34751053156150dfc0251a79530710ce6db75be5f79bf681bbab29d630af66d390be6870a424eeff55679e2ad226f9d268d1ba4261381a5708262 SHA512 453ca444336afd5e9a05f704cb9228b1415a4440aeb43847b80bfbdfacc3a21bf4706efc408acbb692b5a9130051c802d23b04791cfa0d84f499a8b359c393ce
diff --git a/dev-vcs/topgit/topgit-0.9-r1.ebuild b/dev-vcs/topgit/topgit-0.9-r1.ebuild
index 85d51d45244a..47d2195cda74 100644
--- a/dev-vcs/topgit/topgit-0.9-r1.ebuild
+++ b/dev-vcs/topgit/topgit-0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/greenrd/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="sys-apps/sed
diff --git a/dev-vcs/topgit/topgit-0.9.ebuild b/dev-vcs/topgit/topgit-0.9.ebuild
deleted file mode 100644
index e7df0c5baa14..000000000000
--- a/dev-vcs/topgit/topgit-0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A different patch queue manager"
-HOMEPAGE="https://github.com/greenrd/topgit"
-SRC_URI="https://github.com/greenrd/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-apps/sed
-	virtual/awk"
-RDEPEND="dev-vcs/git"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_compile() {
-	# Needed because of "hardcoded" paths
-	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" sharedir="${D}/usr/share/doc/${PF}" install
-
-	newbashcomp contrib/tg-completion.bash tg
-	dodoc README
-}