gentoo resync : 25.01.2018

32 files changed, 746 insertions, 456 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c2c9405e202b..fbd902c0072f 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index fc18897073b6..1e374d54b99b 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,6 +21,6 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r11.ebuild 3007 BLAKE2B 210cf09bd7e860c202ebfb1478f5373bfe65c7bf8cf3b44249e3caffe440e28508cd2e5adc00f32cdb28fe158924cd5234a1bd4d87c91c202683ae1b242c3042 SHA512 d7c9875e3990bea839ad68c5d3620dd4762841386554a52543c9cd36206e393f08ee277514cd48aaa6d1bd370b6abf77434d80364c6897029cfee6d6485bca00
-EBUILD cvs-1.12.12-r12.ebuild 3003 BLAKE2B 4dd68db1fa0149a28c983c116d69bc344bbe3f1dda3da5c0e59eb80b5a42672ea7d92705bbcb52028ff3f339fa3b18cf0afd132a5d6aeed9d2e42a1ef1a09767 SHA512 13379d493918e3ecb1788b73de23379e5e408597ebdd8657ef99c5181d54f69d1008012bffe9924095683ba200db128cb70fe24a294c31b38d7e98e09c362851
+EBUILD cvs-1.12.12-r11.ebuild 2995 BLAKE2B ad5bf94a3039b07f6c32a14e8ff99feb209c1e4ccaa6ad922cd8f93ec705594b1fdd7e18d697897ea994898acda877b63c38dea149d7f919f7a1416621d3257a SHA512 51ac321b9d9d1cbb4a7ee8fd46e36c1f5a13559e3f9fe0a42310748fc6c4f5c1348caef72a45d6ac1fafff468fcb9ff6aa13bb2283a6ac07afeac891b8e2d09f
+EBUILD cvs-1.12.12-r12.ebuild 2991 BLAKE2B 162a13b74e621a943a441a0d40de0453737c621251f7675210e0cb54815edb288e2d26b19e8b816dc280da307cd400ee4bab62d98727ab1d8fabfeafe5b01d91 SHA512 d183c00cd4ed5249a6190b6e176adf24abb5e6a34d0a8df04c233baa3c82e6dcd77a718061b2e7cc0371481a7ec910fc399e570ddeac5a89a6fc3c99c3d12306
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
index 415a2fa36d27..0688f5bfeeef 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r11.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 RESTRICT="test"
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index fedc3d363758..2683223b594b 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 RESTRICT="test"
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 7e21578a7250..6eb935e518d1 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -5,7 +5,7 @@ AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a82
 DIST cvsps-2.1.tar.gz 61634 BLAKE2B 32bf53c574ac8e7937ff14aee5a229e1bb2b4f0ddd4360d0b8d57a5d0fd5c6f683897140e235cdd6ab85e94f3977298fd38e8187db08529f8a8d814a4a8070a8 SHA512 8ba703fc4dd1c7a8201f4cefec533a6e228943f53f5380d8d17107718d8cb607c861a733d7ad1d6ed9288c4dbeae9fd59ceaf52172f16885a00d000a667e0e38
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.1-r1.ebuild 937 BLAKE2B 4ff859b37d9480b78a7e260679d30098e6d460482c2f53757b99d45e13dee698532485653e1064ec5400dffcf978ede03045fdac84552ddb0e442eb16d473c05 SHA512 70d4586291b8530c6c8e4f32938846fe9d2434cf8244a4fd335dde9effddb18b586c00f16017e2585651c004fa31ada33f2b4ac95587fe5efda0665be0df7cec
-EBUILD cvsps-2.2_beta1.ebuild 958 BLAKE2B 2706329d6c0e7f8d8333b252b28740f542acc9c4ec62a49fa4351043debc9357445b671ae7469f8efb3ac633501eed79b594283177a548e38e03933e00ad6f5f SHA512 f80b8948df6bbefe985734a2d25f4c6d53f9ea646f323bf3686f0e5ec27309e85c498b13020835076c6a26b4af6f30f031c52de078a076e84f53fe72958bd803
-EBUILD cvsps-3.13-r1.ebuild 1039 BLAKE2B d0333c9d15e9b070b0c1f66456b53418a99a8720be908b950be08ff1856571007e8278e58eba6136549a0fdaad1687d8c0a680552e4b61d4765b8aad40c895f8 SHA512 7ec4f75a65fa76e699edb9950f0102749cac5789c04f9a03da24a6cf72e2330ef563ecdad60c543ecf8509aa8f79eaafd639d7e2edd3d104bd0bed9a9c0f8c0e
+EBUILD cvsps-2.1-r1.ebuild 925 BLAKE2B c208fced3a73bd707b2075c2de9df9aa67e4ac2e1e17bfb8dc78d4b66d3d8f7a4fd1cbcda5683a3ac0c887eeb5dbd6734eed256b917ce96c70e44deedff32cdd SHA512 8d75302c2bfa37d3dbeac828f82894149c2624337c3b68e72b7bcbbb4291672784fdcc6e1e5b9f84ede76fe6b4dd217b6d804cace2d6f804e9809b37f826fea6
+EBUILD cvsps-2.2_beta1.ebuild 946 BLAKE2B 477bba801f33dba9727c712b9a85cfe9f0cdcf32f6d2b6f000d3383e3b45cf0e9750b94b462f9add42b493901174e417b9941dcd3c7e3030b0bf1dd332930049 SHA512 28354f7290690857d6fc7133d708072efa98ba9ec5991318bf3a5d5fcb31bcd1a474479efcd70f808360ce9faf123ece7eedc24462cd459c667b2e57fe532c87
+EBUILD cvsps-3.13-r1.ebuild 1027 BLAKE2B fb4b806cdddcc4ada6506c47ff5896ca9125e4650a3f62e059285bc576c2560485d686e7ddd78b67f1fbda5c67cc3a95419be81cba28c48ce149adbffb608604 SHA512 7a1388399b823b4582dd36fa178ca802042b13a955f1528e71e7521e6430b136b098f560c7af1b550f0f31fed735c8a2a3980507d66a8a05f3eefce90078279e
 MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf
diff --git a/dev-vcs/cvsps/cvsps-2.1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.1-r1.ebuild
index 1b0d6215d688..fd8222be9f86 100644
--- a/dev-vcs/cvsps/cvsps-2.1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.1-r1.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
 
 inherit eutils toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
index 4b5260759586..6a49d259752c 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.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="4"
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild b/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
index 986c1aeef865..dd9a9f993277 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r1.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=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 9f6fa1a9f74c..1cad6bff9ce9 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,7 +1,3 @@
-DIST fossil-src-1.35.tar.gz 4642421 BLAKE2B 475b8d59876b824f2c2987c584aa9851b1d36ef7681a23bda904e5fcfe12861ca0f410bd5ad363d640c71aa54e2aeacec1a17169262b9ed17ee9e12e6c1aca7e SHA512 2a31530d81a316b69daba446e91236fdb94ced17a7228c094fc6053f9d75e736b6a50a93d97b8e875a4750fa4ff868b0dc78b494131b8ed118d160fff8995905
-DIST fossil-src-2.3.tar.gz 4898441 BLAKE2B b4b49113a24e4ebcce1c0c191b6b867b479561764c720af678d8871ed2d74aea0e061f61edd2e730986342ae8267d2f66e49565c98828460c490123d383e9779 SHA512 41f87a9f79b87895b1972d2866b27205da34076eb35200b60fd38f1921162bf9099a71caac4063c04b919484208b39c7184dff661dc0b5ca7716d8edd11462cc
 DIST fossil-src-2.4.tar.gz 4919205 BLAKE2B 35009cffc757b6ea153faf89525cae4463a2169dace090183b9dd6955a615a04363576295e4b24652ebec7f20772ef9d83c6b9af29f68bd5695c56b88cbf77cb SHA512 de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f
-EBUILD fossil-1.35.ebuild 1280 BLAKE2B 52aac85acf13a09ebbf293d6cddc4d1815850c41e61716f331cc7033e1809a203ec3c30a134b9a90d397658716ca423b2346c07cb9ab316fa7a0bfb0a73217c6 SHA512 676cb1621623705b4af679afa003814518a62b303d51f8ec8dcb01b9e13a8d4a9a98921ec4352e6190551d0826a0f2a839048e275bb2d3ffcd08a2345122170d
-EBUILD fossil-2.3.ebuild 1411 BLAKE2B c052fc11027519bcd30b94aabfe2011fdfd0cddf9f61b0ce85d2018d776475b62c42c44ceabd3675028e43f2c2885e917d83cf84216eaba0b125d5338a037ec5 SHA512 dfa53e88eab5f66b1a0ca804d4e5f01c1dded2df7f70168654e8610fc52516a2322d9e01aeec274ebb67080f99dd96705fe76b74ef85795052bb40ba8d51a7ad
-EBUILD fossil-2.4.ebuild 1489 BLAKE2B 91c07f327105685a81a97210135adf120bf4573e05be9e81d2f866ffd6585d761edaa2353570503a702ae453e547e12b57bc038aaac0689c6969a89ba6bff773 SHA512 f2788d37292adcf3d0a908742055fef863d64af50d616956c64dbacbf98e0e888963e665881bb5664109aaea50755cdfc0425ba8468a5a1173196212392b9ce5
+EBUILD fossil-2.4.ebuild 1488 BLAKE2B 02539210e2eb47e7aecfd9aa0e46a9b9e6061501d3252e997f5ecef94a50fc54b9b8d2e4e96c33c464e92b419fec5bd07938329f044515cedcf4bfae5bc93d69 SHA512 fb5ec8634fc9e147d962840d8000871d42f93edc58a361253ec5e5d287ba2aa59e99d24cc1555f0eb090e02ee0626233a11b357b90c41ef2b8006d2038db88ef
 MISC metadata.xml 1208 BLAKE2B c1456c3215431a9e787c81a58aa07c60818be4ece4131effd64ee9321c9d6fff9489c29a60d9092a126f8cab37641125baf747befbf5bb0004c7425861eab78f SHA512 e7debd6c174169ff43fb94c5813c7b6713fd2417b25e435b2fa875d68a41bf1ae1e60033d3c026f817b70059b7975275563c43b94f3dde2ec844c7010c57c0ec
diff --git a/dev-vcs/fossil/fossil-1.35.ebuild b/dev-vcs/fossil/fossil-1.35.ebuild
deleted file mode 100644
index 9e81c0a7483e..000000000000
--- a/dev-vcs/fossil/fossil-1.35.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-src-${PV}
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug fusefs json legacy-mv-rm miniz sqlite +ssl static tcl th1-docs th1-hooks"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug && myconf+=' --fossil-debug'
-	use json   && myconf+=' --json'
-	use sqlite && myconf+=' --disable-internal-sqlite'
-	use static && myconf+=' --static'
-	use tcl    && myconf+=' --with-tcl --with-tcl-stubs'
-
-	local u
-	for u in legacy-mv-rm miniz th1-docs th1-hooks; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	use fusefs || myconf+=' --disable-fusefs'
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.3.ebuild b/dev-vcs/fossil/fossil-2.3.ebuild
deleted file mode 100644
index ff869df46b88..000000000000
--- a/dev-vcs/fossil/fossil-2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug fusefs json legacy-mv-rm -miniz system-sqlite +ssl static tcl th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	system-sqlite? ( >=dev-db/sqlite-3.20.0:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug && myconf+=' --fossil-debug'
-	use json   && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static && myconf+=' --static'
-	use tcl    && myconf+=' --with-tcl --with-tcl-stubs'
-
-	local u
-	for u in legacy-mv-rm miniz th1-docs th1-hooks; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	use fusefs || myconf+=' --disable-fusefs'
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.4.ebuild b/dev-vcs/fossil/fossil-2.4.ebuild
index e1925ab383a7..cd6f4caf4918 100644
--- a/dev-vcs/fossil/fossil-2.4.ebuild
+++ b/dev-vcs/fossil/fossil-2.4.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
 	  tcl tcl-stubs -tcl-private-stubs th1-docs th1-hooks"
 
diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
index 57feaa4f117b..079803b070a0 100644
--- a/dev-vcs/git-tools/Manifest
+++ b/dev-vcs/git-tools/Manifest
@@ -3,8 +3,8 @@ AUX git-tools-2015_p20160201-pr21.patch 1453 BLAKE2B 57b2c705eff20eee8cf6b68fec8
 DIST git-tools-2015_p20151225.tar.gz 12635 BLAKE2B c5414307d0db6975034f6a04b007fc5872e4af9a46cd398b3a0675470cf3f4fc328539f2907faf5e75a36570e3d2131ef7a8023a981e05df8ff671b68f07480c SHA512 c995f814a78a3afb967e435b9559e4601fd9c7ed10b30950d6d8f20db2cc8077c814fb6164351f20f3c118e0b8b139c84485d5849057654a70d81847f77dd3d0
 DIST git-tools-2015_p20160201.tar.gz 12702 BLAKE2B 14c77495f66190c18362e889d3f7a0254c3c09da2524ee8cb9717db3437e834418f0c92bee5fdcad11bb65a40524163e651af5dcdc454ce06b1f7d7e9ab33fc1 SHA512 55804d7cc67a0c41f460f4a648fd589c8b72c9de8f45d4683edc8d4c47b87bbb70dbb040a8cbd3c7fcc09a3faba17f145479b7000d93d178e32454c0b6a1a995
 DIST git-tools-2017.10.tar.gz 28049 BLAKE2B 64b5f90468226dbeb4222f0f7be77846deffa836d6743e970c9bffced699c563712c24851e112a922faf3ae4b56ecc8daf0f5f772936c43a95c3907a244a6efa SHA512 60b3006de64a4c26f00241b60d45ef8258999dabfc0a8ad1c7d6d6b386dc56caf8c3b6cd0edbce5e27277c8f900b736fe1e26c6a68ee2179f563d00d65fd7cfe
-EBUILD git-tools-2015_p20151225-r2.ebuild 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
-EBUILD git-tools-2017.10.ebuild 1002 BLAKE2B cdbdf22b6c9317f4a18d8b73e0e10a7663230cf18025d0712c5ebbbcb363a3a5f8942825adc2f0575d0fc66efd56864c4d2d4c8c1602328bea616db0d88b6d5d SHA512 e8ac21dce882f0b6d778241f6b6fce9e2bb7e25c9b67e249dafb65cb81ca8874f49123b91343abe053c3888dc30dba4cfd11e7c095f57dfed1b5ece61392ca69
+EBUILD git-tools-2015_p20151225-r2.ebuild 1425 BLAKE2B 7d7f36d88a6197b8a7bbd122ee48fab05d8bf19a96b8c6218567ebf61ff4858683d3a6d6a63501f92b5b8691b6ab9d0557121bc923ab2d19349b7537472d7f2c SHA512 cfecf4797c7cef63909a73d0d9882f77093841146b43d3dc8562ff13ceae1a307deb421452ea6cb2de16dcba4aee9af738bea62e64e9ae58f5daaa4ddecaec69
+EBUILD git-tools-2015_p20160201-r1.ebuild 1483 BLAKE2B 0880c63cb63d1cb998078664f6e429564489a5e4e8e955d5b184a4691caf792dd4a2f5877dd8bdfe4af52a44a06d45ea8cee1938abd49a940cefb89e2c327d17 SHA512 9a82bd81eabd0b321a7e6f9e50d7d4c118c2ae3d4f0889ae47d28799c9eac6268ccc958047609c89f36190040c163511d1145255ac99cd9e52ce65f8f36bdfa9
+EBUILD git-tools-2015_p20160201.ebuild 1426 BLAKE2B 6a61da4cd5cd83b632d48544f6c1a73a1e9a3ea159ef66cad1b5c0e00694d7152300d9cb1b91e186f2b5d61631904ba9ea0432026e2c77bfb430e28bdeb7a316 SHA512 e2c5983254f9c4b25924fc57c7b5de44acb51d787fb913fd2b97ec7c9c42857a67ab3b5fe79da26697cc990e9c311b59c8121b83ae97895d750bbc887a28f2a4
+EBUILD git-tools-2017.10.ebuild 990 BLAKE2B 5a79acf90c49ced38457e3da6cc6fa02176121e92570865276484f2016823511eee32f32d5df9d4e4b4ec538ade31041291c9e026b8ff97b63f55b7e5f81372d SHA512 da803ca684574a8c4ed7897b8cc848fc3ea521d97a5074dc48644d79dfb20da52d9d923f7ce5ce312d58a6300be3c7c76354b53950ff8da37b259a7b4195186a
 MISC metadata.xml 303 BLAKE2B 1186af6cb426673a5bc636e1b9aa02377c0cff46fe7bd3313ce8499ec3d53faba66ed52834cd98ecd3a097d20e770adfd0222df5750709861bdea30f2f8816c8 SHA512 1d21c90c1bc801085cf2bba4e75f1413fd232853d651f6db511270eb5ed7d9c2648d1b4e94808ff7ab87299fbebed167793e0563fdcce5bedcc6ae8c8c945a19
diff --git a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
index 89fae4dd6d1a..f99994408b46 100644
--- a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
+++ b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.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=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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}"
 
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
index 3111a50cea5d..9eab3cbf380e 100644
--- a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.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=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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}"
 
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
index 41ab4ece6c17..da7ffa5eede6 100644
--- a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201.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=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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}"
 
diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild
index a5ac828c614e..22bb3d5f5880 100644
--- a/dev-vcs/git-tools/git-tools-2017.10.ebuild
+++ b/dev-vcs/git-tools/git-tools-2017.10.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/MestreLion/git-tools/archive/v${PV}.tar.gz -> ${P}.t
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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}"
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f65d58ebbf02..9dab928f40e4 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -15,20 +15,24 @@ DIST git-2.13.6.tar.xz 4756820 BLAKE2B 5fdb7aae5ceb1e1d0bd9be2541e8d39f28503ebed
 DIST git-2.14.3.tar.xz 4802252 BLAKE2B 9b5a13e337ba1f4609875897a3ee92dd5a433fa5e7f8bbac1436dcd8275514378fe99dd8cfcf6212e27825e43f000100850ad6f3a0b3fd53bbf9ee820a3973d8 SHA512 e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643
 DIST git-2.15.1.tar.xz 4894768 BLAKE2B 89258e58ff06b50759364c79bebc9a70a267eca7bd25c1feb73ca49cb2b9cf5f6b890729aee4c9bda9025cbacfd8ed29d1a251ee0add9cd84c277e2bb29dbad5 SHA512 dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
 DIST git-2.16.0.tar.xz 4961856 BLAKE2B 5e7e3476de93f718c85750a39ab0923b41ca573708c4bd82af37577c2cb6067c4a989b50262f04c34d2594ec51a47b3c80394ab7910b9a47bb1aa1ca09cdd1d3 SHA512 11f8f3b5e015cbf7aa768ae66c8a4a81417d78736c10e6e24a2b83b7c3ade3afaa6934ca156c5bb9c3da80cf445549601d494bab86611d7eec7865dbfdcbd812
+DIST git-2.16.1.tar.xz 4961656 BLAKE2B d94328da5d027cb82f1f23804a12dfc5df1577bf2c28cc376d4bb5c9e34d317886437f7eee2ac4503b8e2639d2e24c35660ab82a50207f500b7ed6fb104d3624 SHA512 09e30ada7bcf41f78f15784908062c10162d58d2fd7a68ad27e42fd49dc37eb0e82c19ad21db31034a189a8cdd009013a29f943e1ae5d5ab5688c913d2a4d42a
 DIST git-htmldocs-2.13.6.tar.xz 1110668 BLAKE2B 7cfbd453c72c3e300244f9a8c4d13efd60d22219dee48f6a06e6f23fb3a0bd5bc66e624829d685b3ae8b47b81bba39e605f0dd6fd3459364c83b2d922be94a64 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc
 DIST git-htmldocs-2.14.3.tar.xz 1116824 BLAKE2B ca7068a4983e2f7c3694222f6a932d8db132b0a20a50a10415f58a77100a95d8e0fd2e8cf980ece8ef55be0f0ca652cc1a75af62a22b9d60ff19ad4801383416 SHA512 a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4
 DIST git-htmldocs-2.15.1.tar.xz 1134848 BLAKE2B 1efb6d4ca16779c39be69fed57fccb023ddac6bb9c9727ebd7050eb40035c1d56dbce0191224e8d3370d433d8e1cf210df9bc9bde2effb6fbb2d62bfd5e9e440 SHA512 50e53b506c17b046c42a8d9f888741b1f408fb7bb566d981ad6dcda3383f1d310008732a849b4755e7233dc83477f354e9c6d5d4e1fcf0e81af54d49153e8c34
 DIST git-htmldocs-2.16.0.tar.xz 1159956 BLAKE2B eb38d27ce2de42b18971afbabfef8f6527e3c330cbe841dd0c6f35e821974cc6c6c432e8a55cec19413224b597cd3e37e56ddd039161811cb90809d72a170c99 SHA512 bfc501adb325b8111e327359fe1b7f788f6c6fa459ec2895c2bfc7ab9d794c59eac314504b2336da9d69b6ae6121764e693e8417a26ab5f12cdd485770f88707
+DIST git-htmldocs-2.16.1.tar.xz 1160372 BLAKE2B d426fbc85772e5f04550071dea50a75e6d581fd040e8b37b3b342a8d6569d0dcf456445bab1dec3d84e254e82468c900afff7c6be1ebd6771e7fad5884b92515 SHA512 f2bb8b88ab5aa3d6204874aae583249d5137193c5fe3925df7ae1bcdaec0564b496df9a648c180bebb0c8ff4573f27e330802020d3c9207c2738ddd5c52d99c9
 DIST git-manpages-2.13.6.tar.xz 407660 BLAKE2B 76bae6c11cf21f39adf121b4580fe10021e354374e37de6ca5eee6e60e1c7ef3b2dafb086c6b8d88f35216204269945cf45fcd6868f9940d2f00b72a87bad8e2 SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f
 DIST git-manpages-2.14.3.tar.xz 411324 BLAKE2B c896a54305276ff0bb1d860f02833f5902bf869e746333c0598f8c494efb56c65c4a9d5d9eeb54a9a38a6b07776abddc4267b73c2ff020cedf65248ac89afca6 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50
 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
-EBUILD git-2.13.6.ebuild 18885 BLAKE2B 097dc3192b7f71372eb3c001bf8aaa9f86b5d3f0479087c7daeaa13fcb77acb987463a565bc394e0aaa3014c72726e6364fc138ede07abf77062561711db80a0 SHA512 931fe26d4f73ac6ffb7794f913581041768dd0db0ec142640c8b2470b92adfd6198919e148e9675151cc1d67b1753c4259089afb6ebda8ea26a8733d8c2631dd
-EBUILD git-2.14.3.ebuild 19363 BLAKE2B 7b06642fe92fa81859c400ba03c2c3ff97ea99d57451510e7597bfc9d94e0259aa465bd6165a0940534eb175cee49217d76b7869feb9065a4a900edc6244b67c SHA512 a315292faf871312cfcd89b702a1c1449461fbb02c63746c24344bfba1ce94b4bb078f133d09655b6298b0b41c9f9007675508d7db194b2b6f55fa90e789de84
-EBUILD git-2.15.1.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-2.16.0.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-9999-r1.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-9999-r2.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-9999-r3.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-9999.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+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
 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 3f4dab26bde8..2983583a5a36 100644
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -38,7 +38,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/dev-vcs/git/git-2.14.3.ebuild b/dev-vcs/git/git-2.14.3.ebuild
index fde79e887f8a..e5c4ab4671a6 100644
--- a/dev-vcs/git/git-2.14.3.ebuild
+++ b/dev-vcs/git/git-2.14.3.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/dev-vcs/git/git-2.15.1.ebuild b/dev-vcs/git/git-2.15.1.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-2.15.1.ebuild
+++ b/dev-vcs/git/git-2.15.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/dev-vcs/git/git-2.16.0.ebuild b/dev-vcs/git/git-2.16.0.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-2.16.0.ebuild
+++ b/dev-vcs/git/git-2.16.0.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
new file mode 100644
index 000000000000..38599e3b1c29
--- /dev/null
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -0,0 +1,696 @@
+# Copyright 1999-2018 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 es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs 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 ~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 #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_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+}
+
+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/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 0a3a09dbd82a..70f0f30d1653 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,7 +1,5 @@
 DIST hg-git-0.8.10.tar.gz 116019 BLAKE2B 425a066864051f03e3a3305e74a5920055a7f4c79826711c567a59fcb32171db3ca732ba3bb61edac4ac9847fff897cca4fe0d02e65f69e7b0f0440fa2f32cf4 SHA512 ea6de91114005d38568eae1fa5f38aafe73c472c480496ea05b4472c1d8fbc89e76c9bb34eef2641b89e6d0c3f2a9a187d844687214f5599d0b4d0f6b7928c32
-DIST hg-git-0.8.5.tar.gz 96675 BLAKE2B b40b031754a6e5e5c5f954b6f17904eb4456a709bc4e10dec47af8cbe0665f80e0b661f029873ba99b60e04e8831519840119be21aebcd728d97147929b8a009 SHA512 f03c118b58c1ba4cb34ba8c953c7b1d57207548cd613d1f9f716691cbd131008b802ef21baee484881c72318f46c78b946c2d3fa77ebf5efb3ab0b7e1b9d4ca2
 DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
 EBUILD hg-git-0.8.10.ebuild 710 BLAKE2B f25d6c95473260e35cbf9de15438bee4ddd3bfbe11cbdc7ad92107a37b422425dc2416fc4a1a0a98ad0d4c0c0a11a2cf5a0d5e259d89232a30920d8d29d1f50a SHA512 6c2dc7d32d9e2c1473cf139d663c864739c563918765006bf32e2b778aa3db1dcd317faf3053b95c7bb34542536dc90813eb4bbcfc83569e5dab1907e10f7e7d
-EBUILD hg-git-0.8.5.ebuild 746 BLAKE2B 6e1f58d9d19bdcef2145733a300d7f71943aa33ad33c84551eb0ed51822b2bb421172562c749c67c1817a46f54a8359e7501a36217239b177d3a59f0cc4cfe71 SHA512 84cd665f482d0e7cf2217f9822646cd532dce89053cbee562783c81bdb160c07950301e58c273744747ef0ea128e7eb4b6c92e44be076308237196e37a968166
 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/hg-git-0.8.5.ebuild b/dev-vcs/hg-git/hg-git-0.8.5.ebuild
deleted file mode 100644
index 639c573a4194..000000000000
--- a/dev-vcs/hg-git/hg-git-0.8.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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 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-vcs/mercurial-4.1.3[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index e15ce5a506be..a81e152d1481 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,14 +1,10 @@
 AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb5a867cfcc2c2301dcadd01c54745fca3504460c13546f6947677764c87a2e3f30c1949baa4da4c4fe402c SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7
-DIST mercurial-3.8.4.tar.gz 4775341 BLAKE2B ea43b2e6c630f5d6293c40b0cf28ce66293d26ed892a79de9e0e35c381c1c0094a912fac1c13c700655bdff3cb885da3bbc7348b7cc0775c2fc69211c5b38ea9 SHA512 2ee785f631f9ae346e10ca77251a9ce6d3dacd598588c39f1a69ce1f4b668866f6109d682428512c37c300b26741b74672195538d66845e85cfff5ead886cf4c
-DIST mercurial-4.1.3.tar.gz 5134965 BLAKE2B 93d4d72160e28f77ff8c2833ec0f5ea5adc47eb1cd2d8b2383f3eccbd2e4c65e595ed8dfa6f2133e50e3f39a3c14902628a98eb3bc81bfb1d981eb668a75bc23 SHA512 794c513b7e061bc56d270ef57adc0fadeffd5bcc988da0934b24db686b76bf573aef2bbaa3baa9220f31463795bc6e6a99fc1284ebcf8d7e49f42b8129347811
 DIST mercurial-4.3.3.tar.gz 5491634 BLAKE2B becfe01fb52af6047d570d2b8a674204f5e698bf42c2a3ff46298de40112ace3c367012eabdfc3ac4257e1618a513a75ff27b75050ecbd7f796e847715c95f70 SHA512 2d5249b6b2ec6b21c548702af2cf6b8e0858197a370514465aa7a880391f2e9efd6aecefb67fc547dfb8759c1c678009dc5a33fc48743bee30fcbdd853ee1cc6
 DIST mercurial-4.3.tar.gz 5469979 BLAKE2B 5a0df1bce4b3343a9101b634aed44c7ab3af5ed9a07883b20f87829bedd5abdae92b476a3d108a9ccf093dad18f7c82b36d5d6a6622346e156bca6dcbaeb3c9a SHA512 d74ae5f35d8c415c07737b59e6c5455963dfbf5d038c43d683fd34dd84423b9ccf9cd670667f458db20d8580fc7c7d9e5609d29d990e1e94683734694211c417
 DIST mercurial-4.4.1.tar.gz 5636532 BLAKE2B 07b91da192db30a925bd9798c5d6ab02336501c04f9d65bb9042786c2f5e6f8c16f6ebe6817f68ac746c21f79e39dbb8284b7590063d7a6ef615a8e2b6dbe821 SHA512 4c87adb6d3d30f7f9211eee64df727aefdac246be3ca9e3af412b76c32b76d701b19e00ca339168446ee5e20fad2ffc24f0c87438b6bda954560108235ab14a8
 DIST mercurial-4.4.2.tar.gz 5647013 BLAKE2B 3663517e5e53525e50852fd4941f7c71cc446fcc1255ed09d3e8375fcc14aea01f00e4c05a1cda2876d96b4f935b0d5e3d887567bc62c9c4629954b2cef8617f SHA512 3d1d103689eac4f50cc1005be44144b37d75ebfac3ff3b4fc90d6f41fbee46e107a168d04f2c366ce7cca2733ea4e5b5127df462af8e253f61a72f8938833993
-EBUILD mercurial-3.8.4.ebuild 3540 BLAKE2B 0aa5da4ba02db827a332ee78b0acc70bfc44ac8be4e69f353a6c5f5925a5531de454825474b886b26a6723748f15e7a810b0bfd57cc4db8e3cabcdbe1a24f5b1 SHA512 da16f58a42571c3c7f0bf754f3087431bdd1a357db7b38193982f0a25026a061e7d60cc191d87236584c2be9119fde60dcd20dc3a7834942b0ee22ccb816f12e
-EBUILD mercurial-4.1.3.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960
 EBUILD mercurial-4.3.3.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960
 EBUILD mercurial-4.3.ebuild 3547 BLAKE2B 21d755c364cb4a6f38c3b50742ab2c1266d559868fa6cd234de9f644f456ecfb3ec9e26ce198232e1bff3d0d828ed2520c5863f92ea8c3216d7fde05cca36763 SHA512 e12beef3deb63a9d375724bb2781467f7f8b3643ba50821d7501ee8e0b93f59b08d7f5428ff2537ca2725ac54246f53473aaa4e3e867fbd4c86c1bbab0d04d2b
 EBUILD mercurial-4.4.1.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960
diff --git a/dev-vcs/mercurial/mercurial-3.8.4.ebuild b/dev-vcs/mercurial/mercurial-3.8.4.ebuild
deleted file mode 100644
index 24f50bfae3ca..000000000000
--- a/dev-vcs/mercurial/mercurial-3.8.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
-	# Note: make it impl-conditional if py3 is supported
-	append-flags -fno-strict-aliasing
-
-	"${PYTHON}" setup.py build_mo || die
-}
-
-python_compile_all() {
-	rm -r contrib/{win32,macosx} || die
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor
-	dobin contrib/hgk
-	python_foreach_impl python_doscript contrib/hg-ssh
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-	                  *.el mercurial.spec)
-	for f in ${RM_CONTRIB[@]}; do
-		rm -r contrib/$f || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	#rm -f test-doctest*		# doctest always fails with python 2.5.x
-	rm -f test-largefiles*		# tends to time out
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local TEST_DIR
-
-	rm -rf "${TMPDIR}"/test
-	distutils_install_for_testing
-	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-4.1.3.ebuild b/dev-vcs/mercurial/mercurial-4.1.3.ebuild
deleted file mode 100644
index f29a2c796da8..000000000000
--- a/dev-vcs/mercurial/mercurial-4.1.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
-	# Note: make it impl-conditional if py3 is supported
-	append-flags -fno-strict-aliasing
-
-	"${PYTHON}" setup.py build_mo || die
-}
-
-python_compile_all() {
-	rm -r contrib/{win32,macosx} || die
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor
-	dobin contrib/hgk
-	python_foreach_impl python_doscript contrib/hg-ssh
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-	                  *.el mercurial.spec)
-	for f in ${RM_CONTRIB[@]}; do
-		rm -r contrib/$f || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	#rm -f test-doctest*		# doctest always fails with python 2.5.x
-	rm -f test-largefiles*		# tends to time out
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local TEST_DIR
-
-	rm -rf "${TMPDIR}"/test
-	distutils_install_for_testing
-	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}