gentoo resync : 01.12.2017

24 files changed, 907 insertions, 92 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index fed2efbfbcfe..af8081b9ba61 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-remote-hg/Manifest b/dev-vcs/git-remote-hg/Manifest
index 916b00d2ea0e..6f4f02c8b658 100644
--- a/dev-vcs/git-remote-hg/Manifest
+++ b/dev-vcs/git-remote-hg/Manifest
@@ -2,4 +2,4 @@ DIST git-remote-hg-0.2.tar.gz 30397 SHA256 1b122cb925e7ce90ddba6840624d8a26d309b
 DIST git-remote-hg-0.3.tar.gz 30995 SHA256 2dc889b641d72f5a73c4c7d5df3b8ea788e75a7ce80f5884a7a8d2e099287dce SHA512 33ff1874909c0ce4d8b44d1dfd6ae706df44b36ead566e09be0f4e94e3b2a5c8603bd2f2fd50e8faa99d6aeb44a7792d7118c4413f8c9a8b8c29108b534bb4f4 WHIRLPOOL 6a7a3e3e3a3a39bb131c07e95899b05c3841e7b4f385d9635d8773823f74ecae9d9301360aa9b0c1aa7f0aa147e0acc5eff38933c459a5aef0cba04fc843da78
 EBUILD git-remote-hg-0.2.ebuild 533 BLAKE2B 2bc0641461db8c97947e64d4990e6d1672327b149b1b653777881f8c251df7ef093e2aef901f790b46c0a237efd303c49edfb3686be9f4926de46e37bfc5419b SHA512 e0ae87af402526dac263d36c5b13faa7fbac95fe7b2d897502086f010ff2c14c146800de0d51392ac60ebe2dc4a3ba74033ce166b062bd9ba2d6b46dd4d34b9c
 EBUILD git-remote-hg-0.3.ebuild 576 BLAKE2B a82d541d1c4d58f8a67d9c7902876a964eaf0dde80bca5c9ba59770b31fe79dec635ba4379a749ed27323fcd03df3000b59c183978381b07b12e94ee19994846 SHA512 369c2d2be9efb854b1564b0268b8959563a32cd372150e0c6b430e1db5bf3124a0fa84e8dd97153bdf3e9d12fc977f1ca88f9b91c4b1e8a79a9f69a0ec8555d2
-MISC metadata.xml 579 BLAKE2B 99f3e31c6008b2cf892c972e7ec1050ae8b962f44a270c2c39807e2e307426ea6166500d329fefbaccde6703ffd2a411c510f944468b61ba88637fa8a85333da SHA512 ffe68287a4bdede2b2fa714754267aea2ab5ce47510158d0df89a49f15a38e6ecd2ed8c678bb387435952f74356f1b90ed0d2a38bde8fb9ce2fc4757a8143cee
+MISC metadata.xml 570 BLAKE2B de338749634d4141b4c73fe511c6b2097edd36ed633cb58ef1c9e6ddb237876d4a55f1423e2d6c04805de38b133f700a2784268dc3926cc731ccc5c8bb256a77 SHA512 07bfa78ad5d7558a6c3607e4b5dfcd2908d9227acedd4393c7a0002fed383dc85a68f6758b2013b83a6f810188c99952e7718d987f1cfddfd710f5a135ccf3d5
diff --git a/dev-vcs/git-remote-hg/metadata.xml b/dev-vcs/git-remote-hg/metadata.xml
index 5e9d5d52ba7a..0fe237632666 100644
--- a/dev-vcs/git-remote-hg/metadata.xml
+++ b/dev-vcs/git-remote-hg/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
-  </maintainer>
-  <longdescription>
-  'git-remote-hg' is the semi-official Mercurial bridge from Git project,
-  once installed, it allows you to clone, fetch and push to and from
-  Mercurial repositories as if they were Git ones.
-  </longdescription>
-  <upstream>
-	<remote-id type="github">felipec/git-remote-hg</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>wizardedit@gentoo.org</email>
+		<name>Austin English</name>
+	</maintainer>
+	<longdescription>
+		'git-remote-hg' is the semi-official Mercurial bridge from Git project,
+		once installed, it allows you to clone, fetch and push to and from
+		Mercurial repositories as if they were Git ones.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">felipec/git-remote-hg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
index b02de8b0170a..ff003a1e1f78 100644
--- a/dev-vcs/git-tools/Manifest
+++ b/dev-vcs/git-tools/Manifest
@@ -2,7 +2,9 @@ AUX git-tools-2015_p20151225-py3.patch 533 BLAKE2B c58361f5096a2c7df56d37cd67f8e
 AUX git-tools-2015_p20160201-pr21.patch 1453 BLAKE2B 57b2c705eff20eee8cf6b68fec8b1f31d27b9260f445dfbc45ac2261cdf39c23fca0d26745b5bab590edccf371c47b2f2ebce9091f9030fb5806eee52a5b8a91 SHA512 7007c83d3d013c8df49eeab5bb88d8f02373b42d977562d735a92f3db81fdec33251ff684eb6c3a6e2553c73f81dc6fa186cdbcedf77bd1f1771682345f50429
 DIST git-tools-2015_p20151225.tar.gz 12635 SHA256 ab98a8ac35d47d521c43e8b6f543e55757bb2ec4a3cbdeddf25348c5b0cdb36a SHA512 c995f814a78a3afb967e435b9559e4601fd9c7ed10b30950d6d8f20db2cc8077c814fb6164351f20f3c118e0b8b139c84485d5849057654a70d81847f77dd3d0 WHIRLPOOL 6f2810d8e81bbdcb8f99a4e9e3032e11a160df969e8c11a9f8ed8e053eaaf98f895c90eed726e91bcdc2a59493950375015c4922e758256a54874e2667e21a25
 DIST git-tools-2015_p20160201.tar.gz 12702 SHA256 56622b47edcfd2149e8d23b4d840a9c808160520f9c02f5b1842976a87362cbe SHA512 55804d7cc67a0c41f460f4a648fd589c8b72c9de8f45d4683edc8d4c47b87bbb70dbb040a8cbd3c7fcc09a3faba17f145479b7000d93d178e32454c0b6a1a995 WHIRLPOOL 00c3a8fd887d37ce516dc07ca1594cfe6dba19cf74d7eb1c608b6b44a89869bcd6c66832b15eb8c86b58805003f4cf2b7c9298cc0a95c0f6648534c1ace6cc79
+DIST git-tools-2017.10.tar.gz 28049 BLAKE2B 64b5f90468226dbeb4222f0f7be77846deffa836d6743e970c9bffced699c563712c24851e112a922faf3ae4b56ecc8daf0f5f772936c43a95c3907a244a6efa SHA512 60b3006de64a4c26f00241b60d45ef8258999dabfc0a8ad1c7d6d6b386dc56caf8c3b6cd0edbce5e27277c8f900b736fe1e26c6a68ee2179f563d00d65fd7cfe
 EBUILD git-tools-2015_p20151225-r2.ebuild 1437 BLAKE2B e7cc180a2ec3413a3feba3853f7b261b5bd20026d23db6aa41933118d2b904757cb721c7ddfb866b22e2762ed6c772c46284c4a13fd597f599bc24a724d83b06 SHA512 3068af4da8b476049f014221858cb2a7b7e6c7edf914804e48f82e4e84a1aa0db4afcdd50172cd5f98b9d377f3f920e0284bdc9010c6c64d326353a8f578382f
 EBUILD git-tools-2015_p20160201-r1.ebuild 1495 BLAKE2B a61d068904a3e61674ce306adceca29821381b68337337ee5be4c7c7367bbe61d9c45367c27a1ac894473c0924f74ff27fd4c5b69a26f211fa43dc8e8158c7d4 SHA512 377fed838758fd267e7f3071360359a89cda3a486c674a08e8b9573a5cc0c4042e4fb2efdfbf181b31d81c7deb6b81d5a2559984235f37a769642e09fb1754a0
 EBUILD git-tools-2015_p20160201.ebuild 1438 BLAKE2B 48c9b82d837e1dfb1c9a6eac246a8c83fc151174e01d743537667132a7af379c0dfdf12f60b99d0e318b2c9a3302485bbbd7f91967572f646ea00f5ddaa6ff8d SHA512 2c16dfd268a6efbc34ee9a99282348258600fcd0f717a3681b7d0137e702238060314a3206b7f63bf6ef12218a53a473b4a08ce18ca30e9d72352c63874be5ec
-MISC metadata.xml 310 BLAKE2B 7ce128e94699cf2827d83a8f193854525952ef35efbe7b6ccf297c6c16725de8a8e18cbe59f4a15bbc8dfe990ee4ed0ecbec553d0b6d7c30e50abf605d63ce93 SHA512 f6024ab818489e341d2bd68439028e7454a2457033d0db34bc116c08a77fe6345910a110b14f5a59d049eb7b29f623a9e4414b2c781742266646b6d4932a5eb8
+EBUILD git-tools-2017.10.ebuild 1002 BLAKE2B cdbdf22b6c9317f4a18d8b73e0e10a7663230cf18025d0712c5ebbbcb363a3a5f8942825adc2f0575d0fc66efd56864c4d2d4c8c1602328bea616db0d88b6d5d SHA512 e8ac21dce882f0b6d778241f6b6fce9e2bb7e25c9b67e249dafb65cb81ca8874f49123b91343abe053c3888dc30dba4cfd11e7c095f57dfed1b5ece61392ca69
+MISC metadata.xml 303 BLAKE2B 1186af6cb426673a5bc636e1b9aa02377c0cff46fe7bd3313ce8499ec3d53faba66ed52834cd98ecd3a097d20e770adfd0222df5750709861bdea30f2f8816c8 SHA512 1d21c90c1bc801085cf2bba4e75f1413fd232853d651f6db511270eb5ed7d9c2648d1b4e94808ff7ab87299fbebed167793e0563fdcce5bedcc6ae8c8c945a19
diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild
new file mode 100644
index 000000000000..a5ac828c614e
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2017.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit python-r1
+
+DESCRIPTION="Assorted git-related scripts"
+HOMEPAGE="https://github.com/MestreLion/git-tools"
+SRC_URI="https://github.com/MestreLion/git-tools/archive/v${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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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"
+
+src_install() {
+	dobin git-branches-rename git-clone-subset git-find-uncommitted-repos
+	dobin git-rebase-theirs git-strip-merge
+	python_foreach_impl python_doscript git-restore-mtime
+	doman man1/*.1
+	einstalldocs
+}
diff --git a/dev-vcs/git-tools/metadata.xml b/dev-vcs/git-tools/metadata.xml
index ac0f43b4f27f..c4d5177abb15 100644
--- a/dev-vcs/git-tools/metadata.xml
+++ b/dev-vcs/git-tools/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <upstream>
-	  <remote-id type="github">MestreLion/git-tools</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MestreLion/git-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index b76fa5a8865f..3bbb5ffd6837 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -11,18 +11,22 @@ 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.13.6.tar.xz 4756820 SHA256 bce97e403bea34f50378e90ade10c12666b2382cc247551b63dc5604e03b2523 SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada WHIRLPOOL aeadb595a3fc9b74b143478436f4511d15735e5e01bbaf84bc60ef6c3bb91d94aa29ea1bd700a08d3aea3341de4cee5c4d5ced0b550a223faaadd37774cd3492
+DIST git-2.13.6.tar.xz 4756820 BLAKE2B 5fdb7aae5ceb1e1d0bd9be2541e8d39f28503ebeda5ef30eee306348afb290171cba7f8d6e0002775288bfba699ca12e388a4007008509d91a9ac92e90fb5d5c SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada
 DIST git-2.14.3.tar.xz 4802252 SHA256 5330960dd52467f6e5bf1931b9fd42b76d3f8ce9bc75150b54ecfb57d407151d SHA512 e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643 WHIRLPOOL 2ea153e7e32653a86d166c151c2dde5b1e3e1220cfead1ad771ae183aa0f73f04c77f51811f8a0f005f4c3590a288dcd98be8211dfcb989ef7d29328185f1de9
-DIST git-2.15.0.tar.xz 4892056 SHA256 107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a SHA512 994704b440ebce104a99d815dd713af3173f29e70646d7135c3fcd1ac4694a26e499f0732843606c397cbf6108809eb397546c837623a4adbe1ccb2fc825cb64 WHIRLPOOL f03b8ba84c9e1e78680571af94b7b166774eab002ceb724c94c02b58d40b70fff7fc314ab5ee95cd2c8ae3dcf02355c8bb5f280f201efb8105c2015bda94cc71
-DIST git-htmldocs-2.13.6.tar.xz 1110668 SHA256 cdc39ecc8d1ce09f7b865832ebbc466441beb61d1aad4c7796514520220dabf0 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc WHIRLPOOL 126d8ae25c71dc4e6a6eb20ba611cd2eaf94ea8f4f89fde82b2d05044e93f425d9812559db5599b557a1a8f5832cc41d0651b421d265219c257351fe7fb41f2b
+DIST git-2.15.0.tar.xz 4892056 BLAKE2B 89a035e143f2146d9cb6be3c7468fc8815c1cbd94cd3755be0dc4b34666c3f2b5013a542eaa9b1d420fc54b74533893b018b1f9b5859c4287a05008834ef40c9 SHA512 994704b440ebce104a99d815dd713af3173f29e70646d7135c3fcd1ac4694a26e499f0732843606c397cbf6108809eb397546c837623a4adbe1ccb2fc825cb64
+DIST git-2.15.1.tar.xz 4894768 BLAKE2B 89258e58ff06b50759364c79bebc9a70a267eca7bd25c1feb73ca49cb2b9cf5f6b890729aee4c9bda9025cbacfd8ed29d1a251ee0add9cd84c277e2bb29dbad5 SHA512 dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
+DIST git-htmldocs-2.13.6.tar.xz 1110668 BLAKE2B 7cfbd453c72c3e300244f9a8c4d13efd60d22219dee48f6a06e6f23fb3a0bd5bc66e624829d685b3ae8b47b81bba39e605f0dd6fd3459364c83b2d922be94a64 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc
 DIST git-htmldocs-2.14.3.tar.xz 1116824 SHA256 9d28b922ad861bf747ca34a4f083efa3ce41ca39cccb0dfab8bdcf0b58694ccb SHA512 a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4 WHIRLPOOL 748cf71a16871cb91e84f7fdd4a2f6beeaf05d514a7e6ea34d02256a8196d0f9814db252c98d6178643ae183f31813cadf9b7056b61ab4478c157e2236cc71bd
-DIST git-htmldocs-2.15.0.tar.xz 1132908 SHA256 79b2029855eeab2a01f38baeeabf6fbd222ea6de02457f0d5b9f2325cf96c514 SHA512 a3ed8dd5ba7a35eb89b375a04bea2aee8ad08744ba4e0016842595491fd9ed95cebc969108865f4075271301fecc75e89393f83ac384abf8b74a0b3acee3b67e WHIRLPOOL 8857bb03b1ce7b958950daf171f5797c39711b868fd901f92c88682c9ce4aeabfd3013a49d74c922f23f09a04520534e45b4b3d498f945137b5f4b02a8f3e1a0
-DIST git-manpages-2.13.6.tar.xz 407660 SHA256 9c92ed09c3343c770a1afd9dbb1192b00ebb1b3d3e25e21a2dcb1a4e9a494d1d SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f WHIRLPOOL f25b4b20462806a722067aecb7aa0526f00536630c8f71bd7be1ecc0ff4fec07db2fa79d69d911f3e1a2eaca9fe73ad76e76e7ef7afbb83698db42a540e4cfef
+DIST git-htmldocs-2.15.0.tar.xz 1132908 BLAKE2B d90109c71b99e063c3494be44a35b19d4b445dccf7122563c38ee211bfd73b63b4c747048150ee89d3b92eb10b55e3856515a28280153bdcff640673b30a2a09 SHA512 a3ed8dd5ba7a35eb89b375a04bea2aee8ad08744ba4e0016842595491fd9ed95cebc969108865f4075271301fecc75e89393f83ac384abf8b74a0b3acee3b67e
+DIST git-htmldocs-2.15.1.tar.xz 1134848 BLAKE2B 1efb6d4ca16779c39be69fed57fccb023ddac6bb9c9727ebd7050eb40035c1d56dbce0191224e8d3370d433d8e1cf210df9bc9bde2effb6fbb2d62bfd5e9e440 SHA512 50e53b506c17b046c42a8d9f888741b1f408fb7bb566d981ad6dcda3383f1d310008732a849b4755e7233dc83477f354e9c6d5d4e1fcf0e81af54d49153e8c34
+DIST git-manpages-2.13.6.tar.xz 407660 BLAKE2B 76bae6c11cf21f39adf121b4580fe10021e354374e37de6ca5eee6e60e1c7ef3b2dafb086c6b8d88f35216204269945cf45fcd6868f9940d2f00b72a87bad8e2 SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f
 DIST git-manpages-2.14.3.tar.xz 411324 SHA256 5b0e3d93bafd539046b67778db0b5d627fe08ee5ef1be8b5b924517ed141b001 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50 WHIRLPOOL 8f7ef94204fc0658b65228af5bb96077f78e92e37054627d83f817690476a6983abdb551222f9400e55d35201c07d0993eaedb262d41db44839d5a2fa30b19a8
-DIST git-manpages-2.15.0.tar.xz 412688 SHA256 22ad09441490f77bca781168fc66fd6576f0175407c5a95c1cdc96dfd3731c77 SHA512 4101d11c0cc2bd91fa496f11546ec439bc136cb40c7146d53532ab4c525b299741be64a5c4061ff0d5ae5c049d798c7662c7f1500d856f78e8ed653d2ce28aa5 WHIRLPOOL 4d84f7cab9cb346e5c39a2c28c82c732f356de83ecfaaf93a6b01364e8b2a25a67322c72bb97c675392cda718144d07d279a23e0ca6ef72f309eaa801cd90ceb
+DIST git-manpages-2.15.0.tar.xz 412688 BLAKE2B 10b92b6fcc560a4a655124fde2591e496d6bf9d056058bb4729e03bf4d4c20caabd5eef73fab1adb8913070172b79adc9e4868649f3dd679099918e689597f45 SHA512 4101d11c0cc2bd91fa496f11546ec439bc136cb40c7146d53532ab4c525b299741be64a5c4061ff0d5ae5c049d798c7662c7f1500d856f78e8ed653d2ce28aa5
+DIST git-manpages-2.15.1.tar.xz 413124 BLAKE2B 61407bc2c87fddff7a992c25f71768e39bee56941a7291f8c03ee59d10f7db36259e80c6f85ca0303c5e79edb3e1ff02b4abc6c8577bb1f3072b8a469ca55f23 SHA512 de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18
 EBUILD git-2.13.6.ebuild 19016 BLAKE2B 2ce31b1ec5d0347045270fe767e2a665b7e0dfa3af355c526eb4544aa73891d27ec58e56a877a4ad2a4ca84ed798d0dc19e6fddac3e3e6fb9c6c89e6bed9a7b5 SHA512 4741a465efa6fbdc86775abc4088a9512971658988154a5da2f410e1e243b6f6a1e7c5bece23582f3a47e1ddd587685ebfc32c7b00c8ff325d2e92996e4d840d
 EBUILD git-2.14.3.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-2.15.0.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
+EBUILD git-2.15.1.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-9999-r1.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-9999-r2.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-9999-r3.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
diff --git a/dev-vcs/git/git-2.15.1.ebuild b/dev-vcs/git/git-2.15.1.ebuild
new file mode 100644
index 000000000000..d079a65a75eb
--- /dev/null
+++ b/dev-vcs/git/git-2.15.1.ebuild
@@ -0,0 +1,699 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 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 eutils 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="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			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 )
+			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} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.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
+
+	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"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" 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
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=" USE_LIBPCRE2=YesPlease"
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=" USE_LIBPCRE1=YesPlease"
+			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
+			extlibs+=" -lpcre"
+		fi
+	fi
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+	use elibc_musl \
+		&& myopts+=" NO_REGEX=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" 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"
+		myopts+=" 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"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-r3_src_unpack
+		cd "${S}"
+		#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 "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	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
+		cd "${S}"/contrib/credential/osxkeychain || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	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
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# 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
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		git_emake || die "emake git-credential-libsecret failed"
+	fi
+
+	cd "${S}"/contrib/subtree || die
+	git_emake
+	use doc && git_emake doc
+
+	cd "${S}"/contrib/diff-highlight || die
+	git_emake
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	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
+	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
+	cd "${S}"/contrib/subtree
+	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
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	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
+		cd "${S}"/contrib/credential/libsecret
+		dobin git-credential-libsecret
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		cd "${S}"
+	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
+	)
+	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 /usr/share/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
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	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="t9128-git-svn-cmd-branch.sh"
+	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="${disabled} t5000-tar-tree.sh"
+	fi
+
+	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="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${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="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	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 "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	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
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "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/gitg/Manifest b/dev-vcs/gitg/Manifest
index b67d53365134..50b07ade4289 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -4,4 +4,4 @@ DIST gitg-3.26.0.tar.xz 1551308 SHA256 26730d437d6a30d6e341b9e8da99d2134dce4b960
 EBUILD gitg-3.22.0.ebuild 1927 BLAKE2B 869538a8e5a2d880bda6140dda4fb74312939f534edebdcac73cf83a258da107e24f6eb2093f094521c3130b8c7abef38ce0f32ca0fbb755fe02b1fb4aa44404 SHA512 acdb0e281c3554fc82d5b7f85830fff6c733b515f748c6458ed047b3b0f1ff4de705337c8364269f09fe140f05d8839d0c013146c6a449f38b97a0b5cfce9cd9
 EBUILD gitg-3.24.0.ebuild 1929 BLAKE2B fbd3fee32abb5536cd427ca61ee597651d334013ab8ab922ff9644ab74b7681979bba5fd9bdff9077cf77524598068053f164a011dfd5f69c670971c84d2426f SHA512 9eb75f76ff51e575168f148bcc8067bf50df010d1915056362b6b63fa8ecafcff88b75f8018e3df10a734dd2c50ccf3d3e10f27edb371043744b871fdf50cffc
 EBUILD gitg-3.26.0.ebuild 1929 BLAKE2B 7809b1f5eb0fb7d6bb607ea7b30b76046be671ac858ef50d93854cf8716c6dec2cedf0f83697a1d57e72489cf8138a497335a347c4a092382e35e0b1fab0218c SHA512 c375ec93d31682ed043767704419198a3350c141942230cadf6322e5dde7f5bf9858053d037d63e1c18a065ec432bd7f8d925280fe5aa429d992a6c85f33fa26
-MISC metadata.xml 719 BLAKE2B d9c1bacc29f117feb548c176190041ffc121da1c14b73803807b4bfd299643c0b766f6d20fc341130d16597a9efe2d4d8e6701aac9cef6cd850d6660ecc693c1 SHA512 4c30b9747271b6d349ff2dc73eefd14be13ba3ea706eaf777779517ab650d1c98e24f2bb8fae1b5aec46565794d7886dd3442f34a6cfb5c685a10914987600f4
+MISC metadata.xml 700 BLAKE2B f8330088988ad7eecd0dd8fa3f92fa9a22647e5c3a410051e0623124d2ab2bdc140b5330661124638bb2fe2d7c43b272004f07ce0bc344dd42a563b38ff1c15e SHA512 f5277e8ce7d17576ab50cbc5dd7694a9adcff03340029156915a085ada0bcc34e0366fbefdc9f4de0030694c8ce48d2d1baef62ead4650309c2af2def0309d3e
diff --git a/dev-vcs/gitg/metadata.xml b/dev-vcs/gitg/metadata.xml
index 0c98618eff71..bebf2c542746 100644
--- a/dev-vcs/gitg/metadata.xml
+++ b/dev-vcs/gitg/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ikelos@gentoo.org</email>
-    <name>Mike Auty</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <maintainer type="person">
-	<email>mgorny@gentoo.org</email>
-	<name>Michał Górny</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription lang="en">
 		GTK+ based frontend for GIT
 	</longdescription>
-  <use>
-    <flag name="glade">Install a glade catalog file</flag>
-    <flag name="python">Install Python bindings for those plugins requiring it.</flag>
-  </use>
+	<use>
+		<flag name="glade">Install a glade catalog file</flag>
+		<flag name="python">Install Python bindings for those plugins requiring it.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index 9c2320804dd4..c9cc0c380ae6 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -3,4 +3,4 @@ DIST hgsubversion-1.8.6.tar.gz 180720 SHA256 23ad3d48a36639bc9bb9060b5bac8b12094
 EBUILD hgsubversion-1.8.5.ebuild 974 BLAKE2B e3ce72ba18cc66acfa91080c4a2850eb818ad2314fcba14545cb81df4546bcd102ac14655d0a680f643967fac68926909fec1b2e3b61bf8198fc5f849c5e92d6 SHA512 8bc1aa1304674d6ecaf89135fa477cece382104b2bd0acaf40419cc92560819ec640f8dfd62792a6c8317a6688f925e303859ab2d8af13f698d0f539d46604ed
 EBUILD hgsubversion-1.8.6.ebuild 976 BLAKE2B 1742c1bf4ef6b2891c387cada5d407643050c02f144e804f83287a83b150b5dbfa2755575bedf6f834ad42a4189688f1daa359bf022ae9bc2e0d4cf202765b8e SHA512 8cc34a33a0f4eb051e31daa452671f1fb4230501e145bc03537a34ee8a7e1ffd3310c0661195923c91b01f71d2d2e8368e9808621289efdffe3d253b7df97290
 EBUILD hgsubversion-9999.ebuild 750 BLAKE2B 36f2663986000673cc609f50b5e47a49057e1149cb6e304b83cc5890cc8b0df7e7323656f857ea9b401e9327d7e05c9310a0647cee9c2c52308f581100b4f1a0 SHA512 89ac61e1356b33884f79b97c9ccd5537287cc47e6529f0e3eab3d9b815a767dc07121a80bc94d91c6461cce573679baa363839739d3524c0b32eb25d253b661f
-MISC metadata.xml 308 BLAKE2B 491af67d03624b344052c572029e47173468870583a75726236994b98ed96cd4444036734a90d4749b953f3cc9b885a6c135723e5e2b17688219a12854ad0238 SHA512 eed994202393587e6800dc7b763d4615afd729fd18d44ca81aa1cb9ac21be116a3970ff07d1333b33abc9b12b1d010b66959029803cc1073ec1bb51e0e5046ca
+MISC metadata.xml 305 BLAKE2B ae280ffce2435476e46877db066a5967861112aef4cbde989981b8d01919e32706a758691ba0f085015eb681c2a55b2a601313bd9d9d9319497037e689d55bb8 SHA512 a5d7eb8c02ff08bf50591a24a4b0b76a76e799fe5903a27c8a648e1ab839f28135f6f16eac2ba557006936dabadfb08543c203fe0fcb3ff8f89f62e63fdb300f
diff --git a/dev-vcs/hgsubversion/metadata.xml b/dev-vcs/hgsubversion/metadata.xml
index 276970ec47c5..9ed0465431f5 100644
--- a/dev-vcs/hgsubversion/metadata.xml
+++ b/dev-vcs/hgsubversion/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">hgsubversion</remote-id>
 		<remote-id type="bitbucket">durin42/hgsubversion</remote-id>
diff --git a/dev-vcs/mercurial-server/Manifest b/dev-vcs/mercurial-server/Manifest
index 3958258c1a95..ac3336db58dc 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 SHA256 c6693bc19d1d8d44593e792af95a402ca112a7fa29efba6b9851bc696b258a91 SHA512 3dec14309fc050fa49ffd5253a491b2d65507ed8da04741ba5247d420701a9f836a1c3ef6924a706671e28bafbe0200af03c817184e303179002419887400ce0 WHIRLPOOL 8f475db3b86169c4eddad7364901e6027f9421c7883d826f122d91f65a2124ea8e875f6f0f35b3ddf339e43bcba304d20837b762966d07077bce5acb87e5a9fe
 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 534 BLAKE2B 012a2ebd9f2673a0933b5aadba0acd68936d5827e807a20b8e1918a0f5cb536e8f465db435b472d1c541799fee21e9231ccaae9c71c8d3c74f76f0cf6292db94 SHA512 46ba6ec27eb3403d3922e44a8104002c339b2e4a502ab99d712f27ba6bee3689843137ec170b900f6840c5de1f5cfa523496d5efec50c9f1a75b361fa18f76de
+MISC metadata.xml 526 BLAKE2B 52da18d729cb3361bd21fbf46cad7561ffa3ea624b1323e05523832ac9f7a6d83af2d9a4ae02658aeb28c7f9266bfddf640f5ab1623103f3365d4c32435ca5a4 SHA512 b10db22126af52b4d38754d846fffdbcf529ca2c86b6f5bb59d19343762e2df48324e4e2dc6d72c191b54f48a89fcf753253639c7f043cb6eb27e76d70391a29
diff --git a/dev-vcs/mercurial-server/metadata.xml b/dev-vcs/mercurial-server/metadata.xml
index 464002981e5f..16b6109563df 100644
--- a/dev-vcs/mercurial-server/metadata.xml
+++ b/dev-vcs/mercurial-server/metadata.xml
@@ -1,13 +1,13 @@
 <?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>
-  <longdescription lang="en">
-    mercurial-server gives your developers remote read/write access to
-	centralized Mercurial repositories using SSH public key authentication; it
-	provides convenient and fine-grained key management and access control.
-  </longdescription>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		mercurial-server gives your developers remote read/write access to
+		centralized Mercurial repositories using SSH public key authentication; it
+		provides convenient and fine-grained key management and access control.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-vcs/mr/Manifest b/dev-vcs/mr/Manifest
index 07a0a5d5bbba..ca7e789a1398 100644
--- a/dev-vcs/mr/Manifest
+++ b/dev-vcs/mr/Manifest
@@ -1,4 +1,4 @@
 DIST mr-1.20170129.tar.gz 56344 SHA256 1a00a2839240c73f0ad47fe434ff02a50fbfb63ce2d27d2ac1adc46709fb910f SHA512 bb0c79d6cf94b5bc0dfbddde599dc26610df12ed3178ba854a0695b06aad48bda6eb30e31f3a7e5f7d1706081bdc46dbe3f4d8f1bca933adf264f935dc2b3674 WHIRLPOOL e84f0a717e824d34dc8d16a1830a5d9b337888362d137d68e73534a7fae5b817c8300df6b762145236251475298e752fc8fd8e635232ffc6f61e09c742113837
 EBUILD mr-1.20170129.ebuild 582 BLAKE2B faf107fc26bb09f6e37b56041d35ba31241f0cc6e4ef35c97195d8a26dcaf5d7f3b6a7c25817aa8bca8fa920ed97a17c9685274f1707326204904001c610fc49 SHA512 4a1ceca4e4ed0c33e8b440101d827f0f4ff0edaaf2b51307b09032df3d4184711f1a4480200d9a99d41255086cc864082aae838de231eff2647dfd7e7559264e
 EBUILD mr-1.99999999.ebuild 583 BLAKE2B 635eb59e84c51b375ebb585d5803ef4489ee0fdb3abdc7b6c74d90c8cf6a22518c5e136c7a12af21a8a3e5c7395a7bff4933a431327c496d7e8aba62756edd80 SHA512 d823aaf42d687cbfe30f6e8f671d6f3f831c5678dba172de9687211ba88cd75ab41cc40c966fd3655667ce876a97148c16ceb08010766c5607c9995a45a53888
-MISC metadata.xml 1289 BLAKE2B 34600f254cdab77cb9f8e957d17d241e5d5476886ac9a9642b948a157c666c261ea06d0e86ece48d1705ce2521f52e166ed6f09a32003cbb3c66e74d32d1e2e8 SHA512 7596c462fad4ea6839fafd613cd3fcba078ab4de1ca114360414dbb82075fe4cc03e7ad4f7cbed49fedcd49e76d80c1bd13290746f988d7abb5c248cb6a5ad36
+MISC metadata.xml 1277 BLAKE2B db16bc955489887b1d8ce168c08171e061dd19ec8b32c4b00195c80d294b494d0a02c5b3862edfcc30a9dd08303ec35d94c366aa895f2b83ae5269d7cb83556f SHA512 43cc57009889ef7f81756c38284dbd2b49105d60979977f239c1ca3ba10d1b57769fd88bc839ba209e4a3835e9bf7293fd4b8a863170a908bd674c27d7e90b09
diff --git a/dev-vcs/mr/metadata.xml b/dev-vcs/mr/metadata.xml
index 816a43e4d8f0..8214b7ad9921 100644
--- a/dev-vcs/mr/metadata.xml
+++ b/dev-vcs/mr/metadata.xml
@@ -18,12 +18,9 @@
 
 		* Update a repository no more frequently than once every twelve hours.
 		* Run an arbitrary command before committing to a repository.
-		* When updating a git repository, pull from two different upstreams
-		  and merge the two together.
-		* Run several repository updates in parallel, greatly speeding up
-		  the update process.
-		* Remember actions that failed due to a laptop being offline,
-		  so they can be retried when it comes back online.
+		* When updating a git repository, pull from two different upstreams and merge the two together.
+		* Run several repository updates in parallel, greatly speeding up the update process.
+		* Remember actions that failed due to a laptop being offline, so they can be retried when it comes back online.
 
 		This package also includes the webcheckout command.
 	</longdescription>
diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest
index 40f62219dc3f..5930c6c53af0 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 SHA256 3782f588e75872e7dd25656279bab154102c476dd3b1fa24fb3af66475960d55 SHA512 1694f32b1263baecac473ffa49e6e7f9cbfdb73d1abaa88e228771e28a5ed915d9f5f21ab26b05934bdcd8694b4c4f1506763dd2f0c89c35ffa51e1d1b7d03b4 WHIRLPOOL 908e3b7e61ac8893c064d95566ee504bea1689f227ca900c27e3189e4e5be0fbe1409b24c3002feb1ee05aa85364cd2fcb620f0c4a7cdcbb1ce3c53d81bf412f
 EBUILD notify-webhook-0.1.0.ebuild 655 BLAKE2B 8102f5779b6d32c70c40d61af786d7a26be8dea3f76de42e81afd28f250aee524c573f75dfcf27e779d752ffc904af4e9202edef0403a94c8739aa8fc9321fa7 SHA512 16ba094c3d211d3551a6296fe9788ccb2f7d61b1d7e1dcd7efba8115da3082e734d75ec706f0801b6c3983b5854b7d2e8babbb58bec1ff4ffd5e00ae4441ea13
-MISC metadata.xml 604 BLAKE2B d262754d39e449367bfbc15e64787eaed833c9764791dad4e5fdcdb35690212ac700bc4f4a44e0c316ec17024f33ef6945720ebb563ed3f90f09ac2ba5b8d59b SHA512 6f7c5737772f1d4511d6809f91892b34b2c3153bf06a94ebac1fdc02d0a59623655624d5dd15a8b5b5919cec63bb100f8aa28e3cb75ee8550e9bb4f95269e0b0
+MISC metadata.xml 598 BLAKE2B d3cb099dbdcb844e0158112eaa1748c9587f88241860f1a862d852a96b1ea6fd01fd0e3555442cb6fbe066da5c61722c443f482f26154679fbbd0ac29c9fff3e SHA512 c4c8fd71b9c15c14f397a6bf65dab33907ba702d021315605dcebdbe565671b5e0a2df38d5166ef6ace416fbd0e2a03334b9525c450c2d9e726b194ca63ebf5e
diff --git a/dev-vcs/notify-webhook/metadata.xml b/dev-vcs/notify-webhook/metadata.xml
index 2ac5d4996908..92ad1c0ab0df 100644
--- a/dev-vcs/notify-webhook/metadata.xml
+++ b/dev-vcs/notify-webhook/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
-	notify-webhook is a git post-receive hook script that posts JSON data to a
-	webhook capable server.
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		notify-webhook is a git post-receive hook script that posts JSON data to a
+		webhook capable server.
 
-	This implements the GitHub Web hooks API as closely as possible. It allows
-	arbitrary git repositories to use webhook capable services.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">metajack/notify-webhook</remote-id>
-  </upstream>
+		This implements the GitHub Web hooks API as closely as possible. It allows
+		arbitrary git repositories to use webhook capable services.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">metajack/notify-webhook</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/rabbitvcs/Manifest b/dev-vcs/rabbitvcs/Manifest
index cd8852aeb384..af98eca76c46 100644
--- a/dev-vcs/rabbitvcs/Manifest
+++ b/dev-vcs/rabbitvcs/Manifest
@@ -1,3 +1,3 @@
 DIST rabbitvcs-0.16.tar.gz 1670167 SHA256 2227482e5a965917eb404455ef243443c670f610e9843b6481607da3020873da SHA512 dac3b98acb5b7ef1147105aa0f735bb964c098f764c62d0e2e601a2ce34b315a5c83b3bac8929cbac898f674c86266a200f28042aad0340c1c5273bec4a6279c WHIRLPOOL f5c89e38e66a2ea7b5a98ca9d55e839dcdde94c156d25b25949213bae9d9edca0b9c87f9a8d953695f4f7c5b7499311291ed14bf7702da5c765a1a4e778af2b5
 EBUILD rabbitvcs-0.16-r1.ebuild 3116 BLAKE2B e0a939bda5471cc3fd44aa2e14fbd7d0d0059b76b83e1063dc7d5384ba84cd1f2948c8566117cafc1abd50b640072af9b2c6a5efd8db684e3fb77fce18f1a6c6 SHA512 ba042954748dc63ab64bae55241363d726126033f51e51a0c055c5a7c67a7b702d4831603d5c37613ad658c4d85708af78905fe9d2437645756f1b46027173f2
-MISC metadata.xml 999 BLAKE2B 0a4376a1d5a83102fe5bad3a5d0b43c20d3c1bb10e2b213cb9b7305689bc99e4981aeab1016579a55b7ad15f5da468b729e85495c9bdd297c64e01a47b8b2479 SHA512 59d9aa5ba5faae6d0529dcc0ce1c89b9ab41b16b2ef2b03d74fecfeeb9a1b3a835d1124524b5791dcf37de3ea3245e131606755aa3db1940a2d801fe7a742f86
+MISC metadata.xml 1006 BLAKE2B 033fb349c1e1e5d9166014b8f241cd9dbdcc8483c25bc88d762b8e68f99acfdf7740d7cad7f404731f60dfee123c7f758079eba5ad61a74bed6c103682101489 SHA512 99879d14ad0c09948e11dc70c304798954e062c09b5679e3af86d6c92cda5f0be5b40012f0838285371bc1b6a5446c364d45c64fcf75a0cfe23f984d24188f1b
diff --git a/dev-vcs/rabbitvcs/metadata.xml b/dev-vcs/rabbitvcs/metadata.xml
index 27128113e29f..a2d833d6ca7d 100644
--- a/dev-vcs/rabbitvcs/metadata.xml
+++ b/dev-vcs/rabbitvcs/metadata.xml
@@ -5,9 +5,11 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
-	<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>
+	<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>
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 92a43667f78b..33fe54043641 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -4,4 +4,4 @@ DIST rcs-5.9.4.tar.xz 801360 SHA256 063d5a0d7da1821754b80c639cdae2c82b535c8ff413
 EBUILD rcs-5.8.2.ebuild 777 BLAKE2B 9d25571be91520b0ae1cb6ceae921a1d0e7c09c7bf80b965f97ef53fe52cc7b49e6ed7775663002702762dbeebfe0e40766e6b4a51a36a50d783d7fd3d9599a7 SHA512 510ce2c4dc570a4cefbb1a5caee03699c70caab09ee8c06da56fdf63a03867c6885d066378ccdd729542f1087a6f3ecc4426ed0a65a37d6fa6f482f1ed142763
 EBUILD rcs-5.9.3.ebuild 904 BLAKE2B 5080aa28472428ac14d4be6e769925362483ffa61a6241c005a0791cdd04cf11098f827de9100e38e8faabe75f9f54a4de503258090696d65a309759469fe7d2 SHA512 e1f17eb43ee1efcc6a7b674111ff5e3cee43354628ce819fd20f3f8feaf16cd3693666e9f99ec468066fb0e8b273b87f80a48711411562cf1dad141f58c4a11e
 EBUILD rcs-5.9.4.ebuild 913 BLAKE2B 43f2e4a5af99e1d942871a3c6922175d06349ea7a70d2fed3ce6230047885ba321c3d70306826c57eb94d52fa8eaa63a3527813f992e502906b6a9504f02eca4 SHA512 c4c4ff4041dc3fa30fc5866d308b1bc324415a891e159b91b3389e134f16652f3d4b9840b57b8f23d452ca83be73e43d05b41e4044e05517ea2b9c631fc6f0d0
-MISC metadata.xml 611 BLAKE2B 8d0557e77b7d3ad11c494f32c088eca2989ea317500adf1631be7d434c436902c115ef04149d2671042e89e3640cf4f419c54bf04366fe7acc71d25a69bafcec SHA512 b6c98f9d50b76f67606e410a63360862014e1ebfe7218ecde84acdfa7d3fb4507c5480b083095204535489c36396c58f31c2610a80f684b49ceff66ca949fd2e
+MISC metadata.xml 614 BLAKE2B 053b53062b14bba99cb48bc2c19af60ae78c8e0bebb378f6c7c8e6a3d5b9b5b8950d165c7c582d7c8df34c98c12a86e1666f2a7ab38c4fe1fa915cbe4fba00ed SHA512 db77e48d0c4775308f57044e38b8e41c4cd110b42c4a2c305b8d7d719d1885418c1fd534383fec0ed9c38d4be1bf731dd6d00c064afdd3ea0fae9c432bdd4c3b
diff --git a/dev-vcs/rcs/metadata.xml b/dev-vcs/rcs/metadata.xml
index 521535ab1877..2fb1872a15b3 100644
--- a/dev-vcs/rcs/metadata.xml
+++ b/dev-vcs/rcs/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	<email>titanofold@gentoo.org</email>
-	<name>Aaron W. Swenson</name>
-  </maintainer>
-  <longdescription>
-	The Revision Control System (RCS) is a system for managing
-	multiple versions of files. RCS automates the storage, retrieval,
-	logging, identification and merging of file revisions. RCS is useful
-	for text files that are revised frequently (for example, programs,
-	documentation, graphics, papers and form letters).
-  </longdescription>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<longdescription>
+		The Revision Control System (RCS) is a system for managing
+		multiple versions of files. RCS automates the storage, retrieval,
+		logging, identification and merging of file revisions. RCS is useful
+		for text files that are revised frequently (for example, programs,
+		documentation, graphics, papers and form letters).
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 182366bd78b9..7898192dfb02 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,4 +1,6 @@
 DIST tortoisehg-4.3.1.tar.gz 7930491 SHA256 5698db60320574769c73e4f910909e75a8e32ba84adcea902f9457899bbcb753 SHA512 dc43f2acd780a7868b642d6ce8a8dbf8f32be94134ddbb72178d7f1eab1e9f58c8e9bcfc75ad589ec9404cabefd9ccfc697af9ccd037c20bd933ee862e812f99 WHIRLPOOL 0275b5d2d76483559d829a6c32b8888af2134fc58367407ff670da21a8d0ae5d98815410520955f41e227af1eb55dd37052af19534756f49d9cb09a91b441de1
+DIST tortoisehg-4.4.1.tar.gz 7923557 BLAKE2B b2574bb87693a3fb824c3c02424b8f5828c1e3673b111ae82ff0692588083eec639a67b200ce6e3def58e5a0e021898c3df62a053fa61d477f92d4226d3a1b69 SHA512 b364e6d16845c03aacaf691e8528e0bd87151026f9f55bcaf61ba67d1eebfc3f9935457e5ca3391e29417682367b9b33803a9870817c22db31f1dd26850e9d53
 EBUILD tortoisehg-4.3.1.ebuild 1954 BLAKE2B cfc09db06a657561ea4be0554d5ccefc8b0e9bf743fcc0aac48234a18cea202d3eef204571765f61c0fa39b3645662cf7ab1bcdbd62724f3d2de880bbb7a975e SHA512 5032e7aee5f381edda81e4641bfb37c9a936a1761fc266f2a68d7eb6041076c0c5b5cc007ad60d0836eeb03c23af85870e9b50d4c192eac3f84dce6b6e47c6d2
+EBUILD tortoisehg-4.4.1.ebuild 1956 BLAKE2B 89f32d2806577680d4bd6c0d884c16114e6d9a024910aabc63f8a27ed49209c0340728bdc17f4066664d80d13382d3a769d2ac8a1f0d7570b0c77f4e5e49d4d5 SHA512 42f6e8b2dac0cdf29cc516fbeab65c4a423f3e71e73672f8fee0bb86ed1811dba118b7138423db6d749c60de5390849b9fc63b7440b4a5789723f066501f4523
 EBUILD tortoisehg-9999.ebuild 1799 BLAKE2B 1f3c92e5956c8b866377a5f47ceda69a899c399148bdbd45e007f7a89f0b7e5245675e77157714a15ded8f01300bb97f884ba17d3085283a12f307f5028091ef SHA512 b5f0abf784ca30471bab16c253e1a737da021a018de496f3be04917be715e96e1879395061f4c9e790d971f65f113a77bc8a4c8120f8c8036ef565c6ad27ce7a
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.4.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.4.1.ebuild
new file mode 100644
index 000000000000..809f95e78063
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.4.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.3 <dev-vcs/mercurial-4.5"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
+	dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${LINGUAS+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${LINGUAS}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt4 please rebuild"
+	elog "dev-python/qscintilla-python."
+}