gentoo resync : 11.02.2018

23 files changed, 201 insertions, 25 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 89cc2383da00..198452942eca 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 1a0e6143aa00..03de0a7d4d89 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -6,6 +6,6 @@ DIST bzr-2.7.0.tar.gz 11586410 BLAKE2B 9d61d5efa1c02667fdb93d66fc4290f279c74bff2
 DIST bzr-2.7.1_pre.tar.gz 10964137 BLAKE2B d126730d782f232d6c486e31ab465a1a295de456eb59fc1db4d215529ec38e78826da1bedbe6a80af0e874188635c83742c5ae5b07c42dd968f1d0d88596a35e SHA512 b65c63dff33f1646e6db84d9307b870140c2c7b3b16cef69eb4bfb5a5a94cb1721ed74c26e6ad78232fffb4b5055cb4096d9835197db9b97f91c16e8a79658b3
 EBUILD bzr-2.5.1-r1.ebuild 2470 BLAKE2B b3754ea550a6c170983d6b06a4dda66996e20c1a7608b950d3b41a697990a2ad7ff36da43aa34abf4f5f1e9d4116a83ce92c767bab5eae4838eb7c3b9b7eb4c9 SHA512 5e7cca64bd3a9db51c0ed5356512dff59e42826bca40c0dac474d18f70297d68acee3b418ba645d500b68e7ecf5188d60b4b67d91d4f6ffb55d8cdef9598f578
 EBUILD bzr-2.6.0.ebuild 2631 BLAKE2B 807b7646d46612b14b25daa1a69ed9028c2951c1e5571b09877e52e86a029786ba615421af2f03b325ee9f4e7e5d7dfc6652662f60052c453a7934877a8f3699 SHA512 14f83b1bea6fe57900da6477f4b424868175a87fd52d821e59b92bd51fd8254b7afac26f8777a943592433d7249d98c7f44d20c733ba6bc6dfb58d1ff7b16deb
-EBUILD bzr-2.7.0.ebuild 2631 BLAKE2B c74617bd143091b84b01cfd7462530959711c3b361d1881a8aa461933fa817cfeeb6655fb2499d03d4f2fe34e6883458a618810269b24a0b7477764e4f535902 SHA512 37d0a44283a0af986d85dc061c19bf09e7c079a19873ca6b47861ccace1977310791d03b4706354eb00de48f3cad1c3360970ca933716227f73e4e2065fcdcf7
+EBUILD bzr-2.7.0.ebuild 2627 BLAKE2B 27bf19eba447bf2a6a0247928e8bca64f759bcf4fd3527a0292070966e4160627e2e912d2a8a12e2b2a2dd1ffd2c505bc2bad83ee7fc89339d46a021e14f46b9 SHA512 d2d8d5d4a831d88596ef75ad6b332628086a11a5282e43c19673a448e9e2f8a349e8785a5958c6b3e900784c1da971630a78c586c397f3fd642dee489e3a03cb
 EBUILD bzr-2.7.1_pre.ebuild 2607 BLAKE2B a42a111d51b1dddda9bf2a40c8f618efe08c9696ed342684d4434719ae6c7a75047c45ea94292cdbccb9ea776fb6305ed6a61fe670f2903fe55a5e1b42e2bcb1 SHA512 e9a62929e213075dd564dee6a399b480da1f422998cfee2ef37057575b8014f5ec0839728c37f97f604aa693040584713d09981f376148855c33131cfd791e1a
 MISC metadata.xml 772 BLAKE2B 8f1d371a225b5b6702748efc93dde757d88a39c0a8124abc898eff891a4867c92dbc19a356b4c0726682e5304b80be333e12a981d04b0ae89e480cb2f6b6c3a3 SHA512 cc63dba9888058f60521da2fdc43697f1fc8bde194782346279560b50ceaa555b464599d28641350cd25f67aebe2f449cbe306dd651620bc891271acf8aaddac
diff --git a/dev-vcs/bzr/bzr-2.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild
index a961df2e088c..94b7bebea194 100644
--- a/dev-vcs/bzr/bzr-2.7.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://bazaar-vcs.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="curl doc +sftp test"
 PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
 
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 1cad6bff9ce9..bef3bd65e77c 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,3 +1,3 @@
 DIST fossil-src-2.4.tar.gz 4919205 BLAKE2B 35009cffc757b6ea153faf89525cae4463a2169dace090183b9dd6955a615a04363576295e4b24652ebec7f20772ef9d83c6b9af29f68bd5695c56b88cbf77cb SHA512 de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f
 EBUILD fossil-2.4.ebuild 1488 BLAKE2B 02539210e2eb47e7aecfd9aa0e46a9b9e6061501d3252e997f5ecef94a50fc54b9b8d2e4e96c33c464e92b419fec5bd07938329f044515cedcf4bfae5bc93d69 SHA512 fb5ec8634fc9e147d962840d8000871d42f93edc58a361253ec5e5d287ba2aa59e99d24cc1555f0eb090e02ee0626233a11b357b90c41ef2b8006d2038db88ef
-MISC metadata.xml 1208 BLAKE2B c1456c3215431a9e787c81a58aa07c60818be4ece4131effd64ee9321c9d6fff9489c29a60d9092a126f8cab37641125baf747befbf5bb0004c7425861eab78f SHA512 e7debd6c174169ff43fb94c5813c7b6713fd2417b25e435b2fa875d68a41bf1ae1e60033d3c026f817b70059b7975275563c43b94f3dde2ec844c7010c57c0ec
+MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
index 2b1ade696048..5f61527e696f 100644
--- a/dev-vcs/fossil/metadata.xml
+++ b/dev-vcs/fossil/metadata.xml
@@ -8,7 +8,6 @@
 	<maintainer type="person">
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
-		<description>Co-Maintainer</description>
 	</maintainer>
 	<use>
 		<flag name="fusefs">Enable the Fuse Filesystem</flag>
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 9dab928f40e4..238973d785db 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -26,13 +26,13 @@ DIST git-manpages-2.14.3.tar.xz 411324 BLAKE2B c896a54305276ff0bb1d860f02833f590
 DIST git-manpages-2.15.1.tar.xz 413124 BLAKE2B 61407bc2c87fddff7a992c25f71768e39bee56941a7291f8c03ee59d10f7db36259e80c6f85ca0303c5e79edb3e1ff02b4abc6c8577bb1f3072b8a469ca55f23 SHA512 de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18
 DIST git-manpages-2.16.0.tar.xz 417192 BLAKE2B 43369365cd9c25035d863057aff3909aada3ceac59599132aefc4d7e26933e747c568140fad957822f8a1ef1d3e370dfdaeadbdee12e0e254dbab02888714446 SHA512 00b08b1a3a33af2dd4550225ee03e6efe12eee554f78257cdfd20af7cded64ac11879032384f0ec987c1dc04d18b3007319de9a02fdba183c92cdc382e23e139
 DIST git-manpages-2.16.1.tar.xz 417188 BLAKE2B 239fb33967d17c8b10efb2e0d1963f7be3404b7f262b49f89b3f4a538135d80268fbe7fe0e561c9cb2d86840eb46b61653ed363d8da27d1169c435d8e1d5e851 SHA512 20c7646b5f1e3c633ce6aae5ee5fcbe4ca1e59fc9253ec9a9e45c7cd8a8ac7a5e71e36258eb747e3bd6d51b3b7971137315dcdbdff493e0f8774ecd3e309735a
-EBUILD git-2.13.6.ebuild 18873 BLAKE2B fcfadcf919089dcf671c4a24e5b54899a885324bfba40296b8092f4c65dd82b76f4b22928c281caf4cda79cd15bda0f5a955ef6d3332f7efaa38e1a8de42a495 SHA512 f766ef1934a15dbc3008af5b7c505c4b0f8baeaf34fe8f04a0512bb9f3f89ca86df090a66c08c4cddf59d014403f9a24b72e8df66770843fad77d791d460c8a4
-EBUILD git-2.14.3.ebuild 19351 BLAKE2B 2ec4929e180ddf213ae5deb0c5d17f75a79385a8e0538e42964c20ed8ed0bee03656caead8f208948323b9d4f36c1f33431738b704d0e7f42cf8c153aeae030c SHA512 48473d28e68c39280729782a349b8fb961a8a2884afdc1eed9e25cf6da175ab4fc4d5bd9ed9b23e191b314dd0edb52a973e98ac2e057f04577af454fb351c443
-EBUILD git-2.15.1.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
-EBUILD git-2.16.0.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
-EBUILD git-2.16.1.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
-EBUILD git-9999-r1.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
-EBUILD git-9999-r2.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
-EBUILD git-9999-r3.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
-EBUILD git-9999.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
+EBUILD git-2.13.6.ebuild 18874 BLAKE2B bcafbe72ca9e7b0d1f8c6c43461ef1d225ca2ee183df17bb63758c50cbefc9d86896562c779d1949cae842e72ba67cf0de3d3ce07a16964aff927def1004574d SHA512 0bac1969ce15392e1872de3e2f69bbe4ebb7605dea75bea8973bffd222d75987fb5b95dddb8772b233cd3c6f7b0cb5ed62d0f1095c6e847ac83ed6f761f4a2b9
+EBUILD git-2.14.3.ebuild 19352 BLAKE2B 375c5540c22cbe94fb89f81b099f3d29a92f4f6ef5757792ba80d2b839451988bb9bdec65720b8be7e47dc2ffcea47eeb92531da930705d1c4d40094c435fd56 SHA512 9fee218882dbccd73ea9f0014311630a50194dc090a7a4eddf5970c6c7e675a7a98e2849a9ff8867894f1d84d5ade79ac3edb6a9784005b5d1a6f5c6deebe4ac
+EBUILD git-2.15.1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
+EBUILD git-2.16.0.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
+EBUILD git-2.16.1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
+EBUILD git-9999-r1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
+EBUILD git-9999-r2.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
+EBUILD git-9999-r3.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
+EBUILD git-9999.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd
diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
index 2983583a5a36..12ba009e9ed7 100644
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -27,7 +27,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/git/git-2.14.3.ebuild b/dev-vcs/git/git-2.14.3.ebuild
index e5c4ab4671a6..70da7ddf2057 100644
--- a/dev-vcs/git/git-2.14.3.ebuild
+++ b/dev-vcs/git/git-2.14.3.ebuild
@@ -34,7 +34,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/git/git-2.15.1.ebuild b/dev-vcs/git/git-2.15.1.ebuild
index 38599e3b1c29..67a7f811554e 100644
--- a/dev-vcs/git/git-2.15.1.ebuild
+++ b/dev-vcs/git/git-2.15.1.ebuild
@@ -34,7 +34,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/git/git-2.16.0.ebuild b/dev-vcs/git/git-2.16.0.ebuild
index 38599e3b1c29..67a7f811554e 100644
--- a/dev-vcs/git/git-2.16.0.ebuild
+++ b/dev-vcs/git/git-2.16.0.ebuild
@@ -34,7 +34,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
index 38599e3b1c29..67a7f811554e 100644
--- a/dev-vcs/git/git-2.16.1.ebuild
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -34,7 +34,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 38599e3b1c29..67a7f811554e 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -34,7 +34,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 38599e3b1c29..67a7f811554e 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -34,7 +34,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 38599e3b1c29..67a7f811554e 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -34,7 +34,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 38599e3b1c29..67a7f811554e 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -34,7 +34,7 @@ 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/"
+HOMEPAGE="https://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 50f9fe40d8f7..1036ae6b5f9e 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -3,5 +3,5 @@ DIST gitg-3.24.0.tar.xz 1703132 BLAKE2B 98f57e80d8775c2c4b7c55bd5888daf7d0fdb79a
 DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d
 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 1928 BLAKE2B 0253ad287f4b1f9487cb57c2707e99fe83b64242ee04c53232dc58fd99fc4b214e716e56af1239f2ad01990d321231a7fbbd523a212cd48a980f99473a8660db SHA512 246c9a8430f47da6e617417eab32969c3b481a029f71e8b922cb91ab0319b49cc7e3bb8b88e14f4d42f084d44dd8799d792a1a8a0edffd3fc164520661346b56
+EBUILD gitg-3.26.0.ebuild 1927 BLAKE2B 2cb2e7496035be0e5453c38b4961b448a9565f81c6d4c283da13728e82b02ef17f78961eff9d85f525470cd01c05b6420ec5edf8e793a3dec1b97ed03c79b8c1 SHA512 4f01c28df25018e0ad632f4a1ae43037f4191bf2474540baa560ac691b9712a585aedb71727099dcf2230a8dd1f442c3f085b9061de801ca77e2550d08e1a497
 MISC metadata.xml 700 BLAKE2B f8330088988ad7eecd0dd8fa3f92fa9a22647e5c3a410051e0623124d2ab2bdc140b5330661124638bb2fe2d7c43b272004f07ce0bc344dd42a563b38ff1c15e SHA512 f5277e8ce7d17576ab50cbc5dd7694a9adcff03340029156915a085ada0bcc34e0366fbefdc9f4de0030694c8ce48d2d1baef62ead4650309c2af2def0309d3e
diff --git a/dev-vcs/gitg/gitg-3.26.0.ebuild b/dev-vcs/gitg/gitg-3.26.0.ebuild
index 5c5196587a39..f438d41513fc 100644
--- a/dev-vcs/gitg/gitg-3.26.0.ebuild
+++ b/dev-vcs/gitg/gitg-3.26.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 70f0f30d1653..4a8fe8e37e05 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,5 +1,8 @@
+AUX hg-git-0.8.10-hg45-memctx.patch 1817 BLAKE2B 73e638b88698950e3f178c30c063ea269717738923c4f81a25795eb3ac90b14b5477a08c185a37931a174d18855709cf55089819e5c73859c8af7323959adc6f SHA512 63b24d3a5cf0f553521184049b9c8452e1d66af9a89bb20960ca5198c58af53b0e106dead0cbe2b61f1b6a786ef33547eb9215483eafb57191dd1c053ec124be
+AUX hg-git-0.8.10-hg45-memfilectx.patch 2586 BLAKE2B c40212ab0d201993d2f97b425e84e0f09cabe94e804078c680dd3084859e65d3beb4a570d717f57c1eb2bfeda10d3fdc1440d3d12fcf816d05cf2ea033bb8969 SHA512 3211680a1ebcd508f7a4794ac796bd25fda22087a98f51b7d06e8b9ba16314db061ac8a0085dd0ccecf834c316f27bca54acd87c2152b3bb72df7d6580d5dff9
 DIST hg-git-0.8.10.tar.gz 116019 BLAKE2B 425a066864051f03e3a3305e74a5920055a7f4c79826711c567a59fcb32171db3ca732ba3bb61edac4ac9847fff897cca4fe0d02e65f69e7b0f0440fa2f32cf4 SHA512 ea6de91114005d38568eae1fa5f38aafe73c472c480496ea05b4472c1d8fbc89e76c9bb34eef2641b89e6d0c3f2a9a187d844687214f5599d0b4d0f6b7928c32
 DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
+EBUILD hg-git-0.8.10-r1.ebuild 803 BLAKE2B 7694672e47f10d06aedae961061358d504bd795efa9ca8dfae7e0b9b6c82090b2650b10a0fb4fedef25d4d54433d5fb6e24cd09a1b0f4ec0c7dcc548a8f20658 SHA512 e967dfc35f7f78613ec036a43bb39b368475a80f452434a06b10054410377820437f518659478a1409cd492e3b83009f810d24006f8c459eb4f03b0932ac08a7
 EBUILD hg-git-0.8.10.ebuild 710 BLAKE2B f25d6c95473260e35cbf9de15438bee4ddd3bfbe11cbdc7ad92107a37b422425dc2416fc4a1a0a98ad0d4c0c0a11a2cf5a0d5e259d89232a30920d8d29d1f50a SHA512 6c2dc7d32d9e2c1473cf139d663c864739c563918765006bf32e2b778aa3db1dcd317faf3053b95c7bb34542536dc90813eb4bbcfc83569e5dab1907e10f7e7d
 EBUILD hg-git-0.8.8.ebuild 701 BLAKE2B f2e08830007b605d2a9f0e9eab8e3744445f8bb2d35759d5381a194f5a829cec4470e76bd4f87d86568d19ecf13c2d5dfdef46a20f3fb3ac52fa529e3de423e2 SHA512 021f0208a2ffbf06f32cb3fbbff682015d5c7a4ca56577eb87ced69eaec176b3bd9ac746f2c5c40bd1edbf84cd839127785c4769b0df2aa35e14266f7ac85ebf
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch
new file mode 100644
index 000000000000..ff9d4d66d15f
--- /dev/null
+++ b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch
@@ -0,0 +1,43 @@
+# HG changeset patch
+# User Tony Tung <tonytung@merly.org>
+# Date 1517901695 28800
+# Node ID 843f409526fbea3ffde674922b730075d5cfd4d3
+# Parent  6dc827703bfb995b89b0da5b2e9eaffe3479ea45
+compat: pass memctx to memfilectx constructor on hg 4.5+
+
+diff --git a/hggit/git_handler.py b/hggit/git_handler.py
+--- a/hggit/git_handler.py
++++ b/hggit/git_handler.py
+@@ -985,16 +985,22 @@
+                 if copied:
+                     copied_path = copied[0]
+ 
+-            try:
+-                return context.memfilectx(self.repo, f, data,
+-                                          islink='l' in e,
+-                                          isexec='x' in e,
+-                                          copied=copied_path)
+-            except TypeError:
+-                return context.memfilectx(f, data,
+-                                          islink='l' in e,
+-                                          isexec='x' in e,
+-                                          copied=copied_path)
++            # Different versions of mercurial have different parameters to
++            # memfilectx.  Try them from newest to oldest.
++            args_to_try = (
++                (self.repo, memctx, f, data),   # hg 4.5+
++                (self.repo, f, data),           # hg 3.1 - 4.5
++                (f, data),                      # hg < 3.1
++            )
++            for args in args_to_try:
++                try:
++                    return context.memfilectx(*args,
++                                              islink='l' in e,
++                                              isexec='x' in e,
++                                              copied=copied_path)
++                except TypeError as ex:
++                    last_ex = ex
++            raise last_ex
+ 
+         p1, p2 = (nullid, nullid)
+         octopus = False
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch
new file mode 100644
index 000000000000..5c94617f881b
--- /dev/null
+++ b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch
@@ -0,0 +1,73 @@
+# HG changeset patch
+# User Kevin Bullock <kbullock@ringworld.org>
+# Date 1517928348 21600
+# Node ID e326b349eba6b6ee57ac8df221727f79c313d04a
+# Parent  89303af1c4aa76b37e6d16f99f6279012eda7100
+compat: extract function for memfilectx signature variants
+
+diff --git a/hggit/compat.py b/hggit/compat.py
+--- a/hggit/compat.py
++++ b/hggit/compat.py
+@@ -1,4 +1,5 @@
+ from mercurial import (
++    context,
+     url,
+     util as hgutil,
+ )
+@@ -96,6 +97,26 @@
+         return refs, set(server_capabilities)
+ 
+ 
++def memfilectx(repo, changectx, path, data, islink=False,
++               isexec=False, copied=None):
++    # Different versions of mercurial have different parameters to
++    # memfilectx.  Try them from newest to oldest.
++    args_to_try = (
++        (repo, changectx, path, data),  # hg 4.5+
++        (repo, path, data),             # hg 3.1 - 4.5
++        (path, data),                   # hg < 3.1
++    )
++    for args in args_to_try:
++        try:
++            return context.memfilectx(*args,
++                                      islink=islink,
++                                      isexec=isexec,
++                                      copied=copied)
++        except TypeError as ex:
++            last_ex = ex
++    raise last_ex
++
++
+ CONFIG_DEFAULTS = {
+     'git': {
+         'authors': None,
+diff --git a/hggit/git_handler.py b/hggit/git_handler.py
+--- a/hggit/git_handler.py
++++ b/hggit/git_handler.py
+@@ -985,22 +985,10 @@
+                 if copied:
+                     copied_path = copied[0]
+ 
+-            # Different versions of mercurial have different parameters to
+-            # memfilectx.  Try them from newest to oldest.
+-            args_to_try = (
+-                (self.repo, memctx, f, data),   # hg 4.5+
+-                (self.repo, f, data),           # hg 3.1 - 4.5
+-                (f, data),                      # hg < 3.1
+-            )
+-            for args in args_to_try:
+-                try:
+-                    return context.memfilectx(*args,
+-                                              islink='l' in e,
+-                                              isexec='x' in e,
+-                                              copied=copied_path)
+-                except TypeError as ex:
+-                    last_ex = ex
+-            raise last_ex
++            return compat.memfilectx(self.repo, memctx, f, data,
++                                     islink='l' in e,
++                                     isexec='x' in e,
++                                     copied=copied_path)
+ 
+         p1, p2 = (nullid, nullid)
+         octopus = False
diff --git a/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild
new file mode 100644
index 000000000000..265c21099139
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="push to and pull from a Git repository using Mercurial"
+HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hg45-memctx.patch
+	"${FILESDIR}"/${P}-hg45-memfilectx.patch
+)
diff --git a/dev-vcs/mr/Manifest b/dev-vcs/mr/Manifest
index 9aa55c72258b..8d688229f4c5 100644
--- a/dev-vcs/mr/Manifest
+++ b/dev-vcs/mr/Manifest
@@ -1,4 +1,6 @@
 DIST mr-1.20170129.tar.gz 56344 BLAKE2B 68ba59ee26911704051c65bdda43f96ac267adccaf422b2fbfab8ffd045467080e74dc395db1d88e1e7cf90e0c44809bb25f559be3e0c806cfa48d5e263d53f2 SHA512 bb0c79d6cf94b5bc0dfbddde599dc26610df12ed3178ba854a0695b06aad48bda6eb30e31f3a7e5f7d1706081bdc46dbe3f4d8f1bca933adf264f935dc2b3674
+DIST mr-1.20171231.tar.xz 52876 BLAKE2B a0c79ce738240bec1864f68d3a1a0006130abbe08a2304f64c69f138aee2a85c4a16c9e446aaba9f1be62793796745af0181a32cdd7ad63bf67a30c310dfa7c1 SHA512 6d10f8d1ea92c534e40c8d3226b02ac042e7d836b557b92c4f2e3bbd6aa629b2a09072027dacfdc7de87ebd32f826d57f09d53c427ab2fae128633fdd91c56ea
 EBUILD mr-1.20170129.ebuild 582 BLAKE2B faf107fc26bb09f6e37b56041d35ba31241f0cc6e4ef35c97195d8a26dcaf5d7f3b6a7c25817aa8bca8fa920ed97a17c9685274f1707326204904001c610fc49 SHA512 4a1ceca4e4ed0c33e8b440101d827f0f4ff0edaaf2b51307b09032df3d4184711f1a4480200d9a99d41255086cc864082aae838de231eff2647dfd7e7559264e
+EBUILD mr-1.20171231.ebuild 584 BLAKE2B 0fcf0e91fb6184fd7594e05d215e61d93377f14b2919ebcf12742618e3fba13d98846cc2806e1a24a920a8edfcc605eefe9b11971ffd5d65419f83c129489611 SHA512 0844d68d91b75a89f9ca64bbb81c5707641f27f0b7ba2c6d46696792c6b8b4458ab7dabb82b7d7deb40d2a902044ad6a54ac124c2c2237a4426de1d1695c2da7
 EBUILD mr-1.99999999.ebuild 583 BLAKE2B 635eb59e84c51b375ebb585d5803ef4489ee0fdb3abdc7b6c74d90c8cf6a22518c5e136c7a12af21a8a3e5c7395a7bff4933a431327c496d7e8aba62756edd80 SHA512 d823aaf42d687cbfe30f6e8f671d6f3f831c5678dba172de9687211ba88cd75ab41cc40c966fd3655667ce876a97148c16ceb08010766c5607c9995a45a53888
 MISC metadata.xml 1277 BLAKE2B db16bc955489887b1d8ce168c08171e061dd19ec8b32c4b00195c80d294b494d0a02c5b3862edfcc30a9dd08303ec35d94c366aa895f2b83ae5269d7cb83556f SHA512 43cc57009889ef7f81756c38284dbd2b49105d60979977f239c1ca3ba10d1b57769fd88bc839ba209e4a3835e9bf7293fd4b8a863170a908bd674c27d7e90b09
diff --git a/dev-vcs/mr/mr-1.20171231.ebuild b/dev-vcs/mr/mr-1.20171231.ebuild
new file mode 100644
index 000000000000..b7e2e9ba0b2b
--- /dev/null
+++ b/dev-vcs/mr/mr-1.20171231.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Multiple Repository management tool"
+HOMEPAGE="https://myrepos.branchable.com/"
+SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/libwww-perl
+	dev-perl/HTML-Parser"
+
+src_install() {
+	dobin mr webcheckout
+	doman mr.1 webcheckout.1
+	dodoc README debian/changelog \
+		mrconfig mrconfig.complex
+	insinto /usr/share/${PN}
+	doins lib/*
+}