gentoo resync : 14.07.2018

610 files changed, 22910 insertions, 2208 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e8b0e7d00437..9c8336a1ffb2 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bfg-1.12.15 b/dev-vcs/bfg-1.12.15
deleted file mode 100644
index 8b25ac53b8f6..000000000000
--- a/dev-vcs/bfg-1.12.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=a faster alternative to git-filter-branch for removing bad data from git repos
-EAPI=6
-HOMEPAGE=https://rtyley.github.io/bfg-repo-cleaner/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/com/madgag/bfg/1.12.15/bfg-1.12.15.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d963bf1e55b3b8beb9c2e2a26fede7a6
diff --git a/dev-vcs/bfg-1.13.0 b/dev-vcs/bfg-1.13.0
deleted file mode 100644
index 34e122e0a208..000000000000
--- a/dev-vcs/bfg-1.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=a faster alternative to git-filter-branch for removing bad data from git repos
-EAPI=6
-HOMEPAGE=https://rtyley.github.io/bfg-repo-cleaner/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/com/madgag/bfg/1.13.0/bfg-1.13.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=48f8edd61945a5647083d4ebb7bdba50
diff --git a/dev-vcs/bfg/Manifest b/dev-vcs/bfg/Manifest
new file mode 100644
index 000000000000..807872f5695f
--- /dev/null
+++ b/dev-vcs/bfg/Manifest
@@ -0,0 +1,5 @@
+DIST bfg-1.12.15.jar 14814817 BLAKE2B 8b7a27e3e00450ac92237dfafe2c7fe13ca61fa67b246112ad17858e89429d03517e0f08c037d9346fa570fa889a1cfe43e125c45f96b5b6da3621daa6d23cfa SHA512 79a74a534c1d7fcf0b1505b1e5286234cb5b33e7fe4f2ee1b72c1d6d591257f172a76ca56374d6eadd797a60316ae68da115929e7cb667a44a8c772f8cd8cff4
+DIST bfg-1.13.0.jar 13465496 BLAKE2B 1f9eaa44f032c182a8d50dfebaee668a2d7de2361ea48336932e5168a6a3b6970bbca742943917d4ecc392586f03d19add1d1cd9772e023389b9711874871c53 SHA512 e037be1dd52bd122a57fed18ebc4923238666e9985ad2d40174344a1ca45a05abd9a59f1c2ea743be49d094fd76a5794a0e3160a9d3be04a7986c3a444df4fa8
+EBUILD bfg-1.12.15.ebuild 628 BLAKE2B b9f278f51557e4054e3d6df1d9832bb186c9e3693e83489ddf49eddaa36f71599a42765bf056eb73402b82f1f0f5afe0cfc681ba9dc99b48239ca44966c315e6 SHA512 41dbb3be0e028e431600c6ef3c24f69ab86f6829bfa7c12d2acd40edab1d4d06a899f73b38e8ca90c2fc31b13e7f7caa6819c174672e24b586965d26001e63b5
+EBUILD bfg-1.13.0.ebuild 628 BLAKE2B aba22669959f35fc00ffdda2fbc67ddc0d37caa29c3d75d2140ea3516990433928df7fc095cd4162eef12cb77ac348ca3d5e0c7ced9a287a1a7c3bc6c8338d4f SHA512 55073f53418f4af37af6f2547f6548bee12ff5a4a2d3c30b09ea03673a1e18f28b775438bdc31f78689bc808b955702b2a6bd2588c17f9e1639052ae2e0a6410
+MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/dev-vcs/bfg/bfg-1.12.15.ebuild b/dev-vcs/bfg/bfg-1.12.15.ebuild
new file mode 100644
index 000000000000..126e1dab5497
--- /dev/null
+++ b/dev-vcs/bfg/bfg-1.12.15.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="a faster alternative to git-filter-branch for removing bad data from git repos"
+HOMEPAGE="https://rtyley.github.io/bfg-repo-cleaner/"
+SRC_URI="https://repo1.maven.org/maven2/com/madgag/${PN}/${PV}/${P}.jar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_unpack() { :; }
+src_compile() { :; }
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}"/${P}.jar
+	java-pkg_dolauncher ${PN}
+}
diff --git a/dev-vcs/bfg/bfg-1.13.0.ebuild b/dev-vcs/bfg/bfg-1.13.0.ebuild
new file mode 100644
index 000000000000..d321b3273889
--- /dev/null
+++ b/dev-vcs/bfg/bfg-1.13.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="a faster alternative to git-filter-branch for removing bad data from git repos"
+HOMEPAGE="https://rtyley.github.io/bfg-repo-cleaner/"
+SRC_URI="https://repo1.maven.org/maven2/com/madgag/${PN}/${PV}/${P}.jar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.7"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_unpack() { :; }
+src_compile() { :; }
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}"/${P}.jar
+	java-pkg_dolauncher ${PN}
+}
diff --git a/dev-vcs/bfg/metadata.xml b/dev-vcs/bfg/metadata.xml
new file mode 100644
index 000000000000..78e64a5cf1ad
--- /dev/null
+++ b/dev-vcs/bfg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/bzr-2.5.1-r1 b/dev-vcs/bzr-2.5.1-r1
deleted file mode 100644
index 663fd1736f39..000000000000
--- a/dev-vcs/bzr-2.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyftpdlib-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subunit >=dev-python/testtools-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Bazaar is a next generation distributed version control system
-EAPI=5
-HOMEPAGE=http://bazaar-vcs.org/
-IUSE=curl doc +sftp test python_targets_python2_7
-KEYWORDS=alpha amd64 arm 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
-LICENSE=GPL-2
-RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://launchpad.net/bzr/2.5/2.5.1/+download/bzr-2.5.1.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00d899295941b982ec68e9e19a1bb107
diff --git a/dev-vcs/bzr-2.6.0 b/dev-vcs/bzr-2.6.0
deleted file mode 100644
index fd375f60bfa4..000000000000
--- a/dev-vcs/bzr-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyftpdlib-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subunit >=dev-python/testtools-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Bazaar is a next generation distributed version control system
-EAPI=5
-HOMEPAGE=http://bazaar-vcs.org/
-IUSE=curl doc +sftp test python_targets_python2_7
-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
-LICENSE=GPL-2
-RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/bzr/2.6/2.6.0/+download/bzr-2.6.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ea7c1814d68190fcd82eadabc2fe3716
diff --git a/dev-vcs/bzr-2.7.0 b/dev-vcs/bzr-2.7.0
deleted file mode 100644
index 315218ca390f..000000000000
--- a/dev-vcs/bzr-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyftpdlib-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subunit >=dev-python/testtools-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Bazaar is a next generation distributed version control system
-EAPI=6
-HOMEPAGE=http://bazaar-vcs.org/
-IUSE=curl doc +sftp test python_targets_python2_7
-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
-LICENSE=GPL-2
-RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/bzr/2.7/2.7.0/+download/bzr-2.7.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=106431e3d73974cdf4b4a60fef35494a
diff --git a/dev-vcs/bzr-2.7.1_pre b/dev-vcs/bzr-2.7.1_pre
deleted file mode 100644
index 34d05b278c37..000000000000
--- a/dev-vcs/bzr-2.7.1_pre
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyrex[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyftpdlib-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subunit >=dev-python/testtools-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Bazaar is a next generation distributed version control system
-EAPI=6
-HOMEPAGE=http://bazaar-vcs.org/
-IUSE=curl doc +sftp test python_targets_python2_7
-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
-LICENSE=GPL-2
-RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/bzr-2.7.1_pre.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd9be989187387ce9c9ff020f30560df
diff --git a/dev-vcs/bzr-fastimport-0.13.0 b/dev-vcs/bzr-fastimport-0.13.0
deleted file mode 100644
index fb8db8fa0c87..000000000000
--- a/dev-vcs/bzr-fastimport-0.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Plugin providing fast loading of revision control data into Bazaar
-EAPI=5
-HOMEPAGE=https://launchpad.net/bzr-fastimport http://wiki.bazaar.canonical.com/BzrFastImport
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/bzr-1.18 >=dev-python/python-fastimport-0.9 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://launchpad.net/bzr-fastimport/trunk/0.13.0/+download/bzr-fastimport-0.13.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=727dd2380d5d6a2370c644b63e6eb917
diff --git a/dev-vcs/bzr-fastimport/Manifest b/dev-vcs/bzr-fastimport/Manifest
new file mode 100644
index 000000000000..fa0bd7403ee6
--- /dev/null
+++ b/dev-vcs/bzr-fastimport/Manifest
@@ -0,0 +1,3 @@
+DIST bzr-fastimport-0.13.0.tar.gz 80255 BLAKE2B 7de24a16af62822b2b4e44d3ea3855a392993b1f57a8722e015ce426bca83aa94650321e5f46ff9d7f2571a6f9cea81c010eeb9ce9005b24734383a84da0ecea SHA512 3677a6ebb9d5d36d7d29198f239289a9670ac4f1fcbf74a1f219f8a0a5a9cd4301dbdc969c4bce2da18e3c4f7f9a3752919b662473071a7b3f1d84c2de27d821
+EBUILD bzr-fastimport-0.13.0.ebuild 940 BLAKE2B 4e25806aab34f6cb5a353821fa3f60be0b637d635153d5277c02e5a1693c3d4696285f9ffd9d40894e49e6f99b813c46dfebf9fb0d69d7d4fd13fb0f08301c57 SHA512 9ab833f2674452aeae6dc23038fd840a144333ec161cc4cdb77ab5dff39c58e28648c168e5123323b06dfd4af936285e679604c18f6275f49c6fc3fc2bdeb47d
+MISC metadata.xml 338 BLAKE2B ce574cfdce80dc114ea67d8c506c7e98d87f645ab29600ebf9c9b4abbce5b84435b3d8c91986ec785e5bd914d20d1f7d378db81e1d984b71bbc5f15eb18740bb SHA512 cfed4479a1c41e44e23041249173e5df87844ce570ba3470582c8fffb2322d2162df4ccc18c704483e2e4782f1018bdf82b9ed2b22fd828752193d90cf24707a
diff --git a/dev-vcs/bzr-fastimport/bzr-fastimport-0.13.0.ebuild b/dev-vcs/bzr-fastimport/bzr-fastimport-0.13.0.ebuild
new file mode 100644
index 000000000000..586ab53eb4b1
--- /dev/null
+++ b/dev-vcs/bzr-fastimport/bzr-fastimport-0.13.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin providing fast loading of revision control data into Bazaar"
+HOMEPAGE="https://launchpad.net/bzr-fastimport http://wiki.bazaar.canonical.com/BzrFastImport"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-vcs/bzr-1.18
+	>=dev-python/python-fastimport-0.9"
+DEPEND=""
+
+DOCS=( NEWS README.txt doc/notes.txt )
+
+pkg_postinst() {
+	elog "These commands need additional dependencies:"
+	elog
+	elog "bzr fast-export-from-darcs:  dev-vcs/darcs"
+	elog "bzr fast-export-from-git:    dev-vcs/git"
+	elog "bzr fast-export-from-hg:     dev-vcs/mercurial"
+	elog "bzr fast-export-from-mtn:    dev-vcs/monotone"
+	elog "bzr fast-export-from-svn:    dev-vcs/subversion[python]"
+}
diff --git a/dev-vcs/bzr-fastimport/metadata.xml b/dev-vcs/bzr-fastimport/metadata.xml
new file mode 100644
index 000000000000..abfc836ea53c
--- /dev/null
+++ b/dev-vcs/bzr-fastimport/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">bzr-fastimport</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/bzr-rewrite-0.6.3 b/dev-vcs/bzr-rewrite-0.6.3
deleted file mode 100644
index f92dd9b45cd8..000000000000
--- a/dev-vcs/bzr-rewrite-0.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/bzr-2.5.0 !dev-vcs/bzr-rebase python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Bazaar plugin that adds support for rebasing, similar to git rebase
-EAPI=5
-HOMEPAGE=https://launchpad.net/bzr-rewrite
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-vcs/bzr-2.5.0 !dev-vcs/bzr-rebase !<dev-vcs/bzr-svn-0.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://launchpad.net/bzr-rewrite/trunk/0.6.3/+download/bzr-rewrite-0.6.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce412c995291e2c637c0f91ea9ba486b
diff --git a/dev-vcs/bzr-rewrite/Manifest b/dev-vcs/bzr-rewrite/Manifest
new file mode 100644
index 000000000000..22da179d810b
--- /dev/null
+++ b/dev-vcs/bzr-rewrite/Manifest
@@ -0,0 +1,3 @@
+DIST bzr-rewrite-0.6.3.tar.gz 33045 BLAKE2B 93a884ad225bf6953be8b052500a5a98b36b98b434c1afb1f73548e898f60b6716e974bbe0bb2bae54ca57713889169bdad11365759ca34bad96e4b2c97e0891 SHA512 f1a55307e80090dcc3739e4b111e08b02e4c4ec07ed479a5ac28d2d40535a699492eba785c142d8f6396032ed9db143d86dc68dac5280c071b79a9818ac69250
+EBUILD bzr-rewrite-0.6.3.ebuild 528 BLAKE2B 4110d4d415f8be4b30d3bd76bda56dfb7bf8b504028712eb4bfcec2a7945ba6dc76b67e667e31c7b345dc66bcf1b538cf60e2c4f341f2def4b006f96c11c9674 SHA512 685364254c80852b3e0100a68b8f55afe7aa94a245474431b7cfd9a1b363c5f1187f2514c6f0f2b973bf7b8e9a6329800ce95ce9891f5b44411bdea69ee15fd9
+MISC metadata.xml 251 BLAKE2B 08c15ece32d9da3db50c1eec9624e2befc3f75886f704caec02d6b14a24648491c10c9cdaa25d7f69bce2531d73258dc54b28c92ef6d29d1742e4b5e516b788d SHA512 f05104f73a09c8e5501ef51ebb48acab3419ee56dbe8ba3a5a49be40ab77e952149f7e78f289773870ea5fd41c1ec82e72dd4ce4dd2a8e4264b7272cdd134488
diff --git a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
new file mode 100644
index 000000000000..d90a497685ee
--- /dev/null
+++ b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bazaar plugin that adds support for rebasing, similar to git rebase"
+HOMEPAGE="https://launchpad.net/bzr-rewrite"
+SRC_URI="https://launchpad.net/bzr-rewrite/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+IUSE=""
+
+DEPEND=">=dev-vcs/bzr-2.5.0
+	!dev-vcs/bzr-rebase"
+RDEPEND="${DEPEND}
+	!<dev-vcs/bzr-svn-0.6"
diff --git a/dev-vcs/bzr-rewrite/metadata.xml b/dev-vcs/bzr-rewrite/metadata.xml
new file mode 100644
index 000000000000..eab9b5225d5f
--- /dev/null
+++ b/dev-vcs/bzr-rewrite/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="launchpad">bzr-rewrite</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/bzr-xmloutput-0.8.8-r2 b/dev-vcs/bzr-xmloutput-0.8.8-r2
deleted file mode 100644
index fa5765ca99ef..000000000000
--- a/dev-vcs/bzr-xmloutput-0.8.8-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Bazaar plugin providing an option to generate XML output for builtin commands
-EAPI=5
-HOMEPAGE=http://bazaar-vcs.org/XMLOutput
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://launchpad.net/bzr-xmloutput/trunk/0.8.8/+download/bzr-xmloutput-0.8.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca1bc678baf7e7a6dc959f3703778c85
diff --git a/dev-vcs/bzr-xmloutput/Manifest b/dev-vcs/bzr-xmloutput/Manifest
new file mode 100644
index 000000000000..0a8305e521d1
--- /dev/null
+++ b/dev-vcs/bzr-xmloutput/Manifest
@@ -0,0 +1,4 @@
+AUX bzr-xmloutput-0.8.8_remove-relative-imports.patch 5175 BLAKE2B 5ec184209d5da05c52685f7783d5e80115f29c1004c341b0fc6223efa3314bf7a7242f3513488f8ef2f20a2967e460904ec787ef9fb379fe591636718655d957 SHA512 209b3e4df0123a85a34d9b1f3cb2706fe61ab3bf779011cb16cabcc92245204c06d5be6ab16def6389fadb882b8ff8da5b0551baba988354ef95a777fff355b7
+DIST bzr-xmloutput-0.8.8.tar.gz 49969 BLAKE2B 728783e8d68063c639d153b334116c109f90493d80f7384f4e25deceb97e67843ad27676ac70403124163ebec745adf58fdda38515db3932ff87684e60537377 SHA512 9eb87ba86dd45b7132eca69ef6e52726d7ee2d9211cc3052655e40f5cee2b99e160336c347ddce7ad912c0027e8b6a05ca542f70733d2e3493922cfa311b38ef
+EBUILD bzr-xmloutput-0.8.8-r2.ebuild 611 BLAKE2B 746d20ac3a8035203dd3bf20bbb7618ea91301b3572c1c2b695295a04b7deec6cbe28ace76f471a9f46f21012b8d4d8b03d11387f078fa3696d2e762bb138653 SHA512 6235679d5ca3bf0dbed7f4f455f37bd11d117b3c2f1baf83db554cd2610681a4ab69dae51e8d9ea1cc5b344afb77a9bc5e19b0d1d9eae780a375afabbe9c28d6
+MISC metadata.xml 253 BLAKE2B e68e5578eb3a3b0fecc4d9d53d9df965024851ea16c468ad728307064315ddf8547152e27f3c4a45e1b01f3763b0e7650dc6daa4f067d02dad00194379762bb0 SHA512 4fed0d9c18fc0528aaa734f5d16a7e1a36f582fb4b82365d8515301b04389b98431dfb61868c1e69a50b5cf8b5e19e73cd0facdb3ead5eef094eb24cda3ddbb3
diff --git a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
new file mode 100644
index 000000000000..6006269067ab
--- /dev/null
+++ b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Bazaar plugin providing an option to generate XML output for builtin commands"
+HOMEPAGE="http://bazaar-vcs.org/XMLOutput"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-vcs/bzr[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${P}_remove-relative-imports.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
diff --git a/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch b/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch
new file mode 100644
index 000000000000..b21eef05d2ad
--- /dev/null
+++ b/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch
@@ -0,0 +1,220 @@
+revno: 160 [merge]
+author: Jelmer Vernooij <jelmer@samba.org>
+committer: Guillermo Gonzalez <guillo.gonzo@gmail.com>
+branch nick: trunk
+timestamp: Mon 2011-12-19 18:45:35 -0300
+message:
+  Removes the use of relative imports and avoids using lazy_import in a few places we're it doesn't make a difference.
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=418969
+Upstream bug: https://bugs.launchpad.net/bzr-xmloutput/+bug/955329
+Commit: http://bazaar.launchpad.net/~verterok/bzr-xmloutput/trunk/revision/160
+
+--- cmds.py	2011-03-09 23:19:41 +0000
++++ cmds.py	2011-12-12 15:11:38 +0000
+@@ -22,36 +22,39 @@
+ 
+ import info
+ import bzrlib
++from bzrlib.option import Option
++from bzrlib.commands import (
++    Command,
++    display_command,
++    )
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ import sys
+ from bzrlib import (
+     builtins,
+     bzrdir,
+-    commands,
+-    option,
+     log,
+     workingtree,
+     errors
+     )
+ 
+-from bzrlib.option import Option, custom_help
+-from bzrlib.commands import display_command
+-import logxml
+-import service
++from bzrlib.plugins.xmloutput import (
++    logxml,
++    service,
++    )
+ import socket
+-from xml_errors import handle_error_xml
+ """)
+ 
++from bzrlib.plugins.xmloutput.xml_errors import handle_error_xml
+ 
+ version_info = info.bzr_plugin_version
+ plugin_name = info.bzr_plugin_name
+ 
+-null_option = option.Option('null',
+-                            help='Write an ascii NUL (\\0) as the final char.')
+-
+-
+-class cmd_xmlstatus(commands.Command):
++null_option = Option('null',
++                     help='Write an ascii NUL (\\0) as the final char.')
++
++
++class cmd_xmlstatus(Command):
+     """Display status summary.
+ 
+     This reports on versioned and unknown files, reporting them
+@@ -118,7 +121,7 @@
+         self.outf.write('\n')
+ 
+ 
+-class cmd_xmlannotate(commands.Command):
++class cmd_xmlannotate(Command):
+     """Show the origin of each line in a file.
+ 
+     This prints out the given file with an annotation on the left side
+@@ -176,7 +179,7 @@
+                 branch.unlock()
+ 
+ 
+-class cmd_xmlmissing(commands.Command):
++class cmd_xmlmissing(Command):
+     """Show unmerged/unpulled revisions between two branches.
+ 
+     OTHER_BRANCH may be local or remote.
+@@ -212,7 +215,7 @@
+         self.outf.write('\n')
+ 
+ 
+-class cmd_xmlinfo(commands.Command):
++class cmd_xmlinfo(Command):
+     """Show information about a working tree, branch or repository.
+ 
+     This command will show all known locations and formats associated to the
+@@ -247,7 +250,7 @@
+         self.outf.write('\n')
+ 
+ 
+-class cmd_xmlplugins(commands.Command):
++class cmd_xmlplugins(Command):
+     """List the installed plugins.
+ 
+     This command displays the list of installed plugins including
+@@ -284,7 +287,7 @@
+         self.outf.write('\n')
+ 
+ 
+-class cmd_xmlversion(commands.Command):
++class cmd_xmlversion(Command):
+     """Show version of bzr."""
+     hidden = True
+     encoding_type = 'replace'
+@@ -383,7 +386,7 @@
+             self.outf.write('\0')
+         self.outf.write('\n')
+ 
+-class cmd_start_xmlrpc(commands.Command):
++class cmd_start_xmlrpc(Command):
+     """Start the xmlrpc service."""
+ 
+     hidden = True
+@@ -413,7 +416,7 @@
+             self.server.shutdown()
+ 
+ 
+-class cmd_stop_xmlrpc(commands.Command):
++class cmd_stop_xmlrpc(Command):
+     """Stops a xmlrpc service."""
+ 
+     hidden = True
+
+--- infoxml.py	2009-07-28 03:43:56 +0000
++++ infoxml.py	2011-12-12 15:11:38 +0000
+@@ -27,6 +27,7 @@
+ 
+ __all__ = ['show_bzrdir_info_xml']
+ 
++from bzrlib import info
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ import os, sys, time
+@@ -36,7 +37,6 @@
+     errors,
+     osutils,
+     urlutils,
+-    info,
+     missing,
+     )
+ """)
+
+--- logxml.py	2010-12-15 18:27:12 +0000
++++ logxml.py	2011-12-12 15:11:38 +0000
+@@ -1,14 +1,12 @@
+ # -*- encoding: utf-8 -*-
+ 
+-import os
+-
++from bzrlib import log
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ import bzrlib
+ from bzrlib import (
+     debug,
+     osutils,
+-    log,
+     )
+ """)
+ 
+
+--- lsxml.py	2011-03-09 23:41:22 +0000
++++ lsxml.py	2011-12-12 15:11:38 +0000
+@@ -19,8 +19,6 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ #
+ 
+-import os
+-
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ from bzrlib import bzrdir, errors, osutils
+
+--- service.py	2010-02-23 23:38:02 +0000
++++ service.py	2011-12-12 15:11:38 +0000
+@@ -20,6 +20,8 @@
+ #
+ """ xmlrpc service module """
+ 
++import os
++
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ import bzrlib
+@@ -30,14 +32,13 @@
+     osutils
+     )
+ import sys
+-import os
+ import codecs
+ import logging
+ import traceback
+ from cStringIO import StringIO
+ """)
+ 
+-from xml_errors import XMLError
++from bzrlib.plugins.xmloutput.xml_errors import XMLError
+ from xmlrpclib import Fault, Binary
+ from SimpleXMLRPCServer import SimpleXMLRPCServer
+ 
+
+--- statusxml.py	2010-12-15 18:27:12 +0000
++++ statusxml.py	2011-12-12 15:11:38 +0000
+@@ -33,7 +33,7 @@
+     trace,
+     )
+ 
+-import logxml
++from bzrlib.plugins.xmloutput import logxml
+ """)
+ 
+ from writer import _escape_cdata
+
diff --git a/dev-vcs/bzr-xmloutput/metadata.xml b/dev-vcs/bzr-xmloutput/metadata.xml
new file mode 100644
index 000000000000..1cdf0a3530fa
--- /dev/null
+++ b/dev-vcs/bzr-xmloutput/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="launchpad">bzr-xmloutput</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
new file mode 100644
index 000000000000..131226be6f2e
--- /dev/null
+++ b/dev-vcs/bzr/Manifest
@@ -0,0 +1,11 @@
+AUX bzr-2.4.2-no-pyrex-citon.patch 1203 BLAKE2B f76b90e609034169b7bb39948ab3a04a2c64244e4521f3cba182179a6e1c6e513981ac7a55eec7d5380d0e8199f5d08c610bdc2cd116e31e5e4c72dfb228b9bf SHA512 e71eacf2881260739c2104ca30db16ff51d30ce9971b9887a1d9730f8bf020a33300079acb1e644e5d092cdc1c890956551e581d447ff2493a92e9645899b08e
+AUX bzr-2.5.1-sphinx-test-failures.patch 1028 BLAKE2B b35dd061a9d5567fc3942df136676bd0e59eea6dc82914805c47d4a377449c6da98b4e20544dbe546b8b54ceb48182354a5514b30424c43fa32b2437f569f29a SHA512 2b5738b36c8b83c238fcb51f20d9a96589f848d4c2c56a4975e615e8cdc3dcbbe8457f426d67293ef0a45d22cc4172e69ca8155e114c83b00237eea2c5048749
+DIST bzr-2.5.1.tar.gz 10451513 BLAKE2B 00025c5db2d9ad94b39fb450c83c917b532c4804897a064b4fedb02ba7e9243027f105b8b5613e5f62e17e2209c6eef7b92fe3e7c24186edd35fab257ffa334d SHA512 40700d0f4f61bb1609d85772812249114c9e7af619143aafec97163617cb58828e63bda22abf576704848b479463bb85c0b2dc7e5bb49108f48fa397c7bfe85c
+DIST bzr-2.6.0.tar.gz 11301124 BLAKE2B 63a45634e3da53b06208c96726a399edd08c5a4c43ae3e431501aa15dc8060096fb13a390d5f1a6c7cc5cf5a9dbd5245760c21ba29a060a53f74c886fd69424c SHA512 f40d4380a837321c2ed168d15b0b5d31e9de6df93c0f8f2fd9b16c9351524b0afac5b8744740f587e9704efeb4cc004cae7f35aed47f73b5c796cbe2526af980
+DIST bzr-2.7.0.tar.gz 11586410 BLAKE2B 9d61d5efa1c02667fdb93d66fc4290f279c74bff2fd0174149243563bc5013085438410221fb6565f986ef17e957b680a1bdd3142e23843b4cbc39c7855dbd98 SHA512 c39ad3715d865788da74d8de8b469e1dc93d18b6cbcbc569464cdeb9bb2173bf8d7f4f8ee8f7599fbcbbe322817a4c72e785d544e622753699c425c32597d9aa
+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 2622 BLAKE2B 5befa88570b89bcdcef30d49fb91b5568f9eb1f83d9f88ea358e811bcd2a16bb956614c5a87f1c9542ac1789ec06df6f910e107ae05dfbc48d67b662e758b8de SHA512 f449346f2f2d04005385c274cf83c30b16cb6df27a9d020c91458f79d556811884036ca9888665808ca1b11e79c7045c0b359c848be1a1743592e0e0052fdc74
+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.5.1-r1.ebuild b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..301f430763ac
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl,xml"
+
+inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator
+
+MY_P=${PN}-${PV}
+SERIES=$(get_version_component_range 1-2)
+
+DESCRIPTION="Bazaar is a next generation distributed version control system"
+HOMEPAGE="http://bazaar-vcs.org/"
+#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
+SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm 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"
+
+RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
+	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
+
+DEPEND="test? (
+		${RDEPEND}
+		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
+		dev-python/subunit
+		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch"
+	"${FILESDIR}/${P}-sphinx-test-failures.patch"
+)
+
+python_configure_all() {
+	# Generate the locales first to avoid a race condition.
+	esetup.py build_mo
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Some tests expect the usual pyc compiling behaviour.
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# https://bugs.launchpad.net/bzr/+bug/850676
+	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
+	skip_tests+=")"
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+	fi
+
+	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
+		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Fixup manpages manually; passing --install-data causes locales to be
+	# installed in /usr/share/share/locale
+	dodir /usr/share
+	mv "${ED%/}"/usr/{man,share/man} || die
+
+	dodoc doc/*.txt
+
+	if use doc; then
+		docinto developers
+		dodoc -r doc/developers/* || die
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto ${doc}
+			dodoc -r doc/en/${doc}/* || die
+		done
+	fi
+
+	dobashcomp contrib/bash/bzr || die
+}
diff --git a/dev-vcs/bzr/bzr-2.6.0.ebuild b/dev-vcs/bzr/bzr-2.6.0.ebuild
new file mode 100644
index 000000000000..842b139b132e
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.6.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl,xml"
+
+MY_P=${PN}-${PV}
+
+DESCRIPTION="Bazaar is a next generation distributed version control system"
+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"
+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"
+
+inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator l10n
+SERIES=$(get_version_component_range 1-2)
+SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
+
+RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
+	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
+
+DEPEND="test? (
+		${RDEPEND}
+		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
+		dev-python/subunit
+		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# Fails tests bug#487216
+# Upstream is not exactly keen on fixing it
+RESTRICT="test"
+
+python_configure_all() {
+	rm_loc() {
+		rm "${S}"/po/$1.po || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+	# Generate the locales first to avoid a race condition.
+	esetup.py build_mo
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Some tests expect the usual pyc compiling behaviour.
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# https://bugs.launchpad.net/bzr/+bug/850676
+	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
+	skip_tests+=")"
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+	fi
+
+	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
+		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Fixup manpages manually; passing --install-data causes locales to be
+	# installed in /usr/share/share/locale
+	dodir /usr/share
+	mv "${ED%/}"/usr/{man,share/man} || die
+
+	dodoc doc/*.txt
+
+	if use doc; then
+		docinto developers
+		dodoc -r doc/developers/* || die
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto ${doc}
+			dodoc -r doc/en/${doc}/* || die
+		done
+	fi
+
+	dobashcomp contrib/bash/bzr || die
+}
diff --git a/dev-vcs/bzr/bzr-2.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild
new file mode 100644
index 000000000000..978345cd4861
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.7.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl,xml"
+
+MY_P="${PN}-${PV}"
+
+DESCRIPTION="Bazaar is a next generation distributed version control system"
+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"
+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"
+
+inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator l10n
+SERIES=$(get_version_component_range 1-2)
+SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
+
+RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
+	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
+
+DEPEND="test? (
+		${RDEPEND}
+		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
+		dev-python/subunit
+		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# Fails tests bug#487216
+# Upstream is not exactly keen on fixing it
+RESTRICT="test"
+
+python_configure_all() {
+	rm_loc() {
+		rm "${S}"/po/$1.po || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+	# Generate the locales first to avoid a race condition.
+	esetup.py build_mo
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Some tests expect the usual pyc compiling behaviour.
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# https://bugs.launchpad.net/bzr/+bug/850676
+	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
+	skip_tests+=")"
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+	fi
+
+	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
+		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Fixup manpages manually; passing --install-data causes locales to be
+	# installed in /usr/share/share/locale
+	dodir /usr/share
+	mv "${ED%/}"/usr/{man,share/man} || die
+
+	dodoc doc/*.txt
+
+	if use doc; then
+		docinto developers
+		dodoc -r doc/developers/* || die
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto ${doc}
+			dodoc -r doc/en/${doc}/* || die
+		done
+	fi
+
+	dobashcomp contrib/bash/bzr || die
+}
diff --git a/dev-vcs/bzr/bzr-2.7.1_pre.ebuild b/dev-vcs/bzr/bzr-2.7.1_pre.ebuild
new file mode 100644
index 000000000000..530fa338ff01
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.7.1_pre.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl,xml"
+
+DESCRIPTION="Bazaar is a next generation distributed version control system"
+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"
+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"
+
+inherit bash-completion-r1 distutils-r1 flag-o-matic l10n
+#SERIES=$(get_version_component_range 1-2)
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+
+RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
+	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
+
+DEPEND="|| ( dev-python/cython[${PYTHON_USEDEP}] dev-python/pyrex[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
+		dev-python/subunit
+		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}] )"
+
+# Fails tests bug#487216
+# Upstream is not exactly keen on fixing it
+RESTRICT="test"
+
+python_configure_all() {
+	rm_loc() {
+		rm "${S}"/po/$1.po || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+	# Generate the locales first to avoid a race condition.
+	esetup.py build_mo
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Some tests expect the usual pyc compiling behaviour.
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# https://bugs.launchpad.net/bzr/+bug/850676
+	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
+	skip_tests+=")"
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+	fi
+
+	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
+		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Fixup manpages manually; passing --install-data causes locales to be
+	# installed in /usr/share/share/locale
+	dodir /usr/share
+	mv "${ED%/}"/usr/{man,share/man} || die
+
+	dodoc doc/*.txt
+
+	if use doc; then
+		docinto developers
+		dodoc -r doc/developers/*
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto ${doc}
+			dodoc -r doc/en/${doc}/*
+		done
+	fi
+
+	dobashcomp contrib/bash/bzr || die
+}
diff --git a/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
new file mode 100644
index 000000000000..a5128a03d628
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
@@ -0,0 +1,33 @@
+--- setup.py.orig	2011-12-26 12:42:40.308882969 +0100
++++ setup.py	2011-12-26 12:43:38.861854988 +0100
+@@ -178,28 +178,8 @@
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+ from distutils.extension import Extension
+ ext_modules = []
+-try:
+-    try:
+-        from Cython.Distutils import build_ext
+-        from Cython.Compiler.Version import version as pyrex_version
+-    except ImportError:
+-        print("No Cython, trying Pyrex...")
+-        from Pyrex.Distutils import build_ext
+-        from Pyrex.Compiler.Version import version as pyrex_version
+-except ImportError:
+-    have_pyrex = False
+-    # try to build the extension from the prior generated source.
+-    print("")
+-    print("The python package 'Pyrex' is not available."
+-          " If the .c files are available,")
+-    print("they will be built,"
+-          " but modifying the .pyx files will not rebuild them.")
+-    print("")
+-    from distutils.command.build_ext import build_ext
+-else:
+-    have_pyrex = True
+-    pyrex_version_info = tuple(map(int, pyrex_version.rstrip("+").split('.')))
+-
++have_pyrex = False
++from distutils.command.build_ext import build_ext
+ 
+ class build_ext_if_possible(build_ext):
+ 
diff --git a/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch b/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch
new file mode 100644
index 000000000000..ac1fd0212d6b
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch
@@ -0,0 +1,24 @@
+Upstream revno 6523 ((vila) Avoid test sphinx-related failures now
+that we don't have direct sphinx anymore. (Vincent Ladeuil))
+
+=== modified file 'bzrlib/tests/test_utextwrap.py'
+--- bzrlib/tests/test_utextwrap.py	2011-05-28 06:44:01 +0000
++++ bzrlib/tests/test_utextwrap.py	2012-04-17 12:18:27 +0000
+@@ -171,16 +171,6 @@
+ 
+ 
+     def setup_both(testcase, base_class, reused_class):
+-
+-        if (features.sphinx.available()):
+-            # Until https://bitbucket.org/birkenfeld/sphinx/issue/706 is fixed,
+-            # we can't run these tests when sphinx <= 1.0.1 as it breaks
+-            # textwrap.TextWrapper.wordsep_re
+-            version = tuple(map(int,
+-                                features.sphinx.module.__version__.split('.')))
+-            if version <= (1, 0, 7):
+-                raise tests.TestSkipped(
+-                    'sphinx textwrap monkeypatch breaks utextwrap')
+         super(base_class, testcase).setUp()
+         override_textwrap_symbols(testcase)
+         reused_class.setUp(testcase)
+
diff --git a/dev-vcs/bzr/metadata.xml b/dev-vcs/bzr/metadata.xml
new file mode 100644
index 000000000000..f366de71c752
--- /dev/null
+++ b/dev-vcs/bzr/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription lang="en">
+    Bazaar (``bzr``) is a decentralized revision control system, designed to be
+    easy for developers and end users alike.  Bazaar is part of the GNU project
+    to develop a complete free operating system.
+    Bazaar was formerly known as Bazaar-NG.  It's the successor to ``baz``, a
+    fork of GNU arch, but shares no code.  (To upgrade from Baz, use the
+    ``baz-import`` command in the bzrtools plugin.)
+  </longdescription>
+  <use>
+    <flag name="sftp">Enable sftp support</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">bzr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/bzrtools-2.5 b/dev-vcs/bzrtools-2.5
deleted file mode 100644
index 2b4c3ccb351e..000000000000
--- a/dev-vcs/bzrtools-2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/bzr-2.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=bzrtools is a useful collection of utilities for bzr
-EAPI=5
-HOMEPAGE=http://bazaar-vcs.org/BzrTools
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/bzr-2.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/bzrtools/stable/2.5/+download/bzrtools-2.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c552eda1543e07d05954272811235dfb
diff --git a/dev-vcs/bzrtools/Manifest b/dev-vcs/bzrtools/Manifest
new file mode 100644
index 000000000000..3b75a94a84cf
--- /dev/null
+++ b/dev-vcs/bzrtools/Manifest
@@ -0,0 +1,3 @@
+DIST bzrtools-2.5.tar.gz 74508 BLAKE2B 8e864cc0bd1fa05325502fe6772d57aba29613d56160cf356a8a38417a4c8516f98d2f32798c2511baf06a5222a1a7ac3b58fb30b5f09088c1ef19356c4e15c4 SHA512 5bc07715a3ed525a9bed5b789ea7a4079c9a56a8ce798b2eff56b27e6eae574fac23b8cc96529a5ea44b8d4ce02c512a7e22d21f046801461ba38a8d2050aa16
+EBUILD bzrtools-2.5.ebuild 710 BLAKE2B 013ccfb0ef13691f5ec405f08d71aebbe62d2b97b35da46fba064369b5bf9c0993f42a6b8cf83bdb77f7e4553d53d253e3dbf85dabfa52c64deb0d0ca33da855 SHA512 cfeb4b24bea1c7049e7fde2539d7c565022685c77818ee664a205f28f36e419d64c90230783bc8d419b1ed53b432dcc76355151af3979a7497d1e388c2760bf4
+MISC metadata.xml 248 BLAKE2B 5ffacbef7eddd0193eb5d83d6d8e21f810abbb55db04c158d017f304fc0a1f92de4e6c7bcf23d0631c3b6116de8c037c0d3b0764989c2448d2eb223a0023de74 SHA512 88b165b7a532426ca6539c3ed0ca45b50387eeee1a37f677257bae71f4ac5c0d4e5565efa78166bfb55ba8fcf04cdf02327d976b386bc38a2335a81d455a5fca
diff --git a/dev-vcs/bzrtools/bzrtools-2.5.ebuild b/dev-vcs/bzrtools/bzrtools-2.5.ebuild
new file mode 100644
index 000000000000..6defe8183234
--- /dev/null
+++ b/dev-vcs/bzrtools/bzrtools-2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="bzrtools is a useful collection of utilities for bzr"
+HOMEPAGE="http://bazaar-vcs.org/BzrTools"
+SRC_URI="https://launchpad.net/${PN}/stable/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+#IUSE="test"
+
+RDEPEND=">=dev-vcs/bzr-2.4"
+DEPEND="${RDEPEND}"
+#	test? ( dev-python/testtools )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.heads TODO.Shelf )
diff --git a/dev-vcs/bzrtools/metadata.xml b/dev-vcs/bzrtools/metadata.xml
new file mode 100644
index 000000000000..1904d7e46063
--- /dev/null
+++ b/dev-vcs/bzrtools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="launchpad">bzrtools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/colorcvs-1.4-r2 b/dev-vcs/colorcvs-1.4-r2
deleted file mode 100644
index 4ab2ed8948ad..000000000000
--- a/dev-vcs/colorcvs-1.4-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=A tool based on colorgcc to beautify cvs output
-EAPI=6
-HOMEPAGE=https://packages.gentoo.org/package/dev-vcs/colorcvs
-KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-vcs/cvs
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/colorcvs-1.4.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=4b6e886bb0c901873c200669918a877b
diff --git a/dev-vcs/colorcvs/Manifest b/dev-vcs/colorcvs/Manifest
new file mode 100644
index 000000000000..b0646323a687
--- /dev/null
+++ b/dev-vcs/colorcvs/Manifest
@@ -0,0 +1,5 @@
+AUX colorcvs-1.4-prefix.patch 529 BLAKE2B 7a16954f603df824db1527f9079086d1722867888c4748b0a57f4e00561b5248e3f67de8067aefd3b3c77caf23d2af913b6a841e33962c10aed36ac4c21b26fb SHA512 a86d265c5d37647c89a8e53dd92d4a01bdf378ebe78d69757401c1a51e75ada912c00981781ddf0af3017936673b8f6c2b218a7f9da8100ee1e5a6f094d95512
+AUX colorcvs-profile.sh 47 BLAKE2B b8ed44839f0b4db3624134ade0ec1c053c003d6af3bbca78c6e8b5719f530704fafdb808de2562e7e2c4eda04b50a54165373fa9764720a018a964312bfc8114 SHA512 46e2692476317558cc3d4642e44aeab5b79d9bcacb0ca6b8f3470170cd351adfe156898b3c4f47ce80266eb70ad62bcfac0354b66cd315993d906ab3739acaca
+DIST colorcvs-1.4.tar.bz2 8376 BLAKE2B 329c255f3813ff8452091d15cdff898aa047a2ae84369faf659acd2939de80f0740abf7b52155b9676085bc8198eaa7b2a3039c684a12f1c6a5d3584590f9ba1 SHA512 b8c9f3241318599da40614392045a0bba3952314001f6b411207307e79e20b7dea1a9741d5a84dc91b652319ee434c2c14f03435ce4adbd22160d66181da6e44
+EBUILD colorcvs-1.4-r2.ebuild 939 BLAKE2B 07aa62dce13a5c13ec31ce7580a09ac6d7662fcf3938829a39141c2b94b0275e015cbbe544973cf60a77b0d71b909ac58f9c78c4d482042427ea420322990e13 SHA512 8ef10ba5ac01a8bb567e1182bf685d84fe87e0b712fe6ca02dc0cef84a723c45cc2505270b0523fc8de8fe000426df68f3dbbd086d20f97a4d9c7e6de4d846f3
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild b/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
new file mode 100644
index 000000000000..2f2076b0e8dc
--- /dev/null
+++ b/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="A tool based on colorgcc to beautify cvs output"
+HOMEPAGE="https://packages.gentoo.org/package/dev-vcs/colorcvs"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-lang/perl
+	dev-vcs/cvs
+"
+
+src_prepare() {
+	# fix typo
+	sed -i -e 's:compiler_pid:cvs_pid:' ${PN} || die "sed failed"
+	eapply "${FILESDIR}"/${P}-prefix.patch
+	eprefixify colorcvs
+	default
+}
+
+src_install() {
+	insinto /etc/profile.d
+	doins "${FILESDIR}/${PN}-profile.sh"
+
+	dobin colorcvs
+	dodoc colorcvsrc-sample
+}
+
+pkg_postinst() {
+	echo
+	einfo "An alias to colorcvs was installed for the cvs command."
+	einfo "In order to immediately activate it do:"
+	einfo "\tsource /etc/profile"
+	echo
+}
diff --git a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
new file mode 100644
index 000000000000..acc96c42bf65
--- /dev/null
+++ b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
@@ -0,0 +1,20 @@
+--- a/colorcvs	2008-01-26 20:04:54 +0100
++++ b/colorcvs	2008-01-26 20:05:56 +0100
+@@ -54,7 +54,7 @@
+ 
+ sub initDefaults
+ {
+-	$cvsPath = "/usr/bin/cvs";
++	$cvsPath = "@GENTOO_PORTAGE_EPREFIX@/usr/bin/cvs";
+ 
+ 	$nocolor{"dumb"} = "true";
+ 
+@@ -118,7 +118,7 @@
+ initDefaults();
+ 
+ # Read the configuration files.
+-for my $configFile ('/etc/colorcvsrc', "$ENV{HOME}/.colorcvsrc") {
++for my $configFile ('@GENTOO_PORTAGE_EPREFIX@/etc/colorcvsrc', "$ENV{HOME}/.colorcvsrc") {
+ 	if (-f $configFile)
+ 	{
+ 		loadPreferences($configFile);
diff --git a/dev-vcs/colorcvs/files/colorcvs-profile.sh b/dev-vcs/colorcvs/files/colorcvs-profile.sh
new file mode 100644
index 000000000000..07ca68c9d132
--- /dev/null
+++ b/dev-vcs/colorcvs/files/colorcvs-profile.sh
@@ -0,0 +1,3 @@
+# set alias for colorcvs
+
+alias cvs='colorcvs'
diff --git a/dev-vcs/colorcvs/metadata.xml b/dev-vcs/colorcvs/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/dev-vcs/colorcvs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/colorsvn-0.3.3 b/dev-vcs/colorsvn-0.3.3
deleted file mode 100644
index e4f7158d8c86..000000000000
--- a/dev-vcs/colorsvn-0.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile postinst prepare
-DEPEND=dev-lang/perl dev-vcs/subversion
-DESCRIPTION=Subversion output colorizer
-EAPI=6
-HOMEPAGE=http://colorsvn.tigris.org
-KEYWORDS=amd64 x86 ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-vcs/subversion
-SLOT=0
-SRC_URI=http://colorsvn.tigris.org/files/documents/4414/49311/colorsvn-0.3.3.tar.gz
-_md5_=bccf8ff1ac9b8554c9a3080f410a0e47
diff --git a/dev-vcs/colorsvn/Manifest b/dev-vcs/colorsvn/Manifest
new file mode 100644
index 000000000000..5b159a230961
--- /dev/null
+++ b/dev-vcs/colorsvn/Manifest
@@ -0,0 +1,4 @@
+AUX use-open2-not-open3.patch 760 BLAKE2B 5e4649cea3124b01b7eefceb1a1e8a7635b323c16cce32f78b81352525d9d0122e180a9aab5188bce13fafa39375be5a77e22b5eb3fc3656493f310ce14835f8 SHA512 556511ce5cf34c7568352a7e18b3d4113cb6d3d52445db31eb2cddc599e3cbbb47c28e39151350e10e957a5a94651445484c9c9cb91af355f540103edeac774c
+DIST colorsvn-0.3.3.tar.gz 107961 BLAKE2B da46181d9eb54709ae2e62aee4e341f1403788b3a460b04bccf628fe0be767b4343f4295d4eeb1062fb9e580a3aa7f5731027d7f5578342b63414f2e03083a75 SHA512 c9aa6eb3a14f156d8f6139ad708782846c561385cb174339443014e83c80b62f5c8d7b9937830ebb5e5e8606517cb2f3f1866a3611c93512b302936b6fe55ffb
+EBUILD colorsvn-0.3.3.ebuild 1072 BLAKE2B 164daad80a2a77052d5c5506cd2d4a837e66e66b3525a3fcc8dcd2d06b0b21c2b4116df9f9a83b248c928c8a87e5768f19a596d5dac9b1e3eb2ced2a16364279 SHA512 c440a699f02dd8a6159da42237694ca5db2e32a9e461e76e02b044a9c8ac0e23f512c9a413d27c9057dd0994f2bdfffc8b263215c35332f32cff8a693f4ef848
+MISC metadata.xml 356 BLAKE2B e32df53e6e6ecc54fb557dd8d4b709e7260d2ec76ef534ae5786d429fde334f3f12a6dc0c79e8964bda85c388b34b709313c06e8698e7b315d39d2e236073be3 SHA512 7e7254ec3c760144a7f0415edd8aa2e31e1aafca19ad0087ddf51ac7ecc83b992edce3ae705b71ca70189aa9e3327ddee0610fb3766d79fb56f41ad90d13415e
diff --git a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
new file mode 100644
index 000000000000..9ae642f733ff
--- /dev/null
+++ b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Subversion output colorizer"
+HOMEPAGE="http://colorsvn.tigris.org"
+SRC_URI="${HOMEPAGE}/files/documents/4414/49311/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-vcs/subversion"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/use-open2-not-open3.patch" )
+
+src_prepare() {
+	default
+	# Fix confdir location for Prefix, #435434
+	sed -i \
+		-e '/^confdir/d' \
+		-e 's/$(confdir)/$(sysconfdir)/g' \
+		Makefile.in || die
+}
+
+src_compile() {
+	# bug 335134
+	emake -j1 || die
+}
+
+pkg_postinst() {
+	elog
+	elog "The default settings are stored in /etc/colorsvnrc."
+	elog "They can be locally overridden by ~/.colorsvnrc."
+	elog "An alias to colorsvn was installed for the svn command."
+	elog "In order to immediately activate it do:"
+	elog "\tsource /etc/profile"
+	elog "NOTE: If you don't see colors,"
+	elog "append the output of 'echo \$TERM' to 'colortty' in your colorsvnrc."
+	elog
+}
diff --git a/dev-vcs/colorsvn/files/use-open2-not-open3.patch b/dev-vcs/colorsvn/files/use-open2-not-open3.patch
new file mode 100644
index 000000000000..cb295dc15878
--- /dev/null
+++ b/dev-vcs/colorsvn/files/use-open2-not-open3.patch
@@ -0,0 +1,24 @@
+This is idl0r's fix for bug 326279, rerolled for v0.3.3.
+
+diff --git a/colorsvn-original b/colorsvn-original
+index 4236121..4edf3c8 100644
+--- a/colorsvn-original
++++ b/colorsvn-original
+@@ -56,7 +56,7 @@
+ # Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ use Term::ANSIColor;
+-use IPC::Open3;
++use IPC::Open2;
+ 
+ use strict;
+ use warnings;
+@@ -332,7 +332,7 @@ if (! -t STDOUT || $commit == 1 || !$colortty{$terminal} || !$commresolved )
+ 
+ # Keep the pid of the svn process so we can get its return
+ # code and use that as our return code.
+-my $svn_pid = open3('<&STDIN', \*SVNOUT, \*SVNOUT, $svnPath, @ARGV);
++my $svn_pid = open2(\*SVNOUT, '<&STDIN', $svnPath, @ARGV);
+ my $svnName = $svnPath;
+ $svnName =~ s,.*/(.*)$,$1,;
+ 
diff --git a/dev-vcs/colorsvn/metadata.xml b/dev-vcs/colorsvn/metadata.xml
new file mode 100644
index 000000000000..e28e6ef2bc2d
--- /dev/null
+++ b/dev-vcs/colorsvn/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		colorsvn is the Subversion output colorizer. Colorsvn was extracted from
+		kde-sdk and was extended with build process and configuration.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/cssc-1.4.0 b/dev-vcs/cssc-1.4.0
deleted file mode 100644
index d43c8f7ce52d..000000000000
--- a/dev-vcs/cssc-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=test? ( valgrind? ( dev-util/valgrind ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The GNU Project's replacement for SCCS
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/cssc/
-IUSE=test valgrind
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/cssc/CSSC-1.4.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=657e8ff1816cb99ccc0ca9d3d3bb7be3
diff --git a/dev-vcs/cssc/Manifest b/dev-vcs/cssc/Manifest
new file mode 100644
index 000000000000..9afee0b9df3b
--- /dev/null
+++ b/dev-vcs/cssc/Manifest
@@ -0,0 +1,7 @@
+AUX cssc-1.3.0-gcc47.patch 187 BLAKE2B 4dd734c33914267c8f4441184316c33bea299c2ef09d6a6d98a7dfa2c57349885ac83df79362bc5b7f496f99da1aaa6801cb69d8409a3878869df6bdd418b4f2 SHA512 75706187dccd2cfbf0ef0f95eb6520bdf8134da0f6414e4e7e1ee92d54835f5d857320cfc81eb1f4ebf8584ea6da4e4a26e3a5990d60d7b7609b9bf19b6dec74
+AUX cssc-1.4.0-config.patch 317 BLAKE2B 05b55dca021fdc37ad9ade846c633c7f83935f46332cdebea9c7efff7bace6a175202239d240521bdb9cccbd725a077922c33494abac0d00792db7704b969b24 SHA512 c5bab5de20fa978100009f462434df586d9951850459b41aa70f290bebbcfbb2164b31eada89d6b55151bfd1e852b402ccd822d97cd0b898ce501f925e3c7e53
+AUX cssc-1.4.0-m4.patch 356 BLAKE2B b1e79296c96a1fc281e3a481d6a0fbaff697db87317b185bd795740fed75bd755dc2af147d1335d57f2b58d82c56ef9f75875175700b72c543cdb6e7adc8d6ec SHA512 8dd984f1d98a943fbed14db43840b18f63a48bc71fb8e537031761bdd59639a4af554de9eda8d5aa0a5f1afe04169a752f3e281381a15fe91cc9f53e7195db9e
+AUX cssc-1.4.0-test-large.patch 455 BLAKE2B 98891f0f6ce149a7ca7d8ee8aa373bc28e05f8a4a397d1f4067e9c3589fac701b46585b629965125e140eabc02c9ad4a2d09976f8752909e8176018d85cc69e2 SHA512 8e28f6b6cb9c9e15f5000e89722aa9aa66cb578faa136aa229947eae66e185a07a2b528dea418e0cef43027cce705a269214a2b6f4ec2c355450f13417c2c3e1
+DIST CSSC-1.4.0.tar.gz 2012122 BLAKE2B c38bf9f50e372559c87d318780973a28fd2fec384cffd0c077c556b321f9f3e68324f59f26900e63c9235f30c564a60783c5a48b515b9b878977fe10266cd0be SHA512 7abb38ecfb5120e807d1f09d16ce81306b3eb16746e44da5029f626feba67dfb46db20bd2b89daffb2e3cdc51ffadc51cd666eef7d1b94e56b4c7dc24f93ea76
+EBUILD cssc-1.4.0.ebuild 1007 BLAKE2B fb9de33fff08aeffb2b1579a54fa0b313cfa058a20872dffbed7dfcfc62ea533e1a56cad6d37cc0f814f88b99a3181f7f9781d447c65c0175ce8e2c71ce651c7 SHA512 2aacc1f9eeb0bc50d13e8790c1036143f1ed9187bb14ca91631daa34232c5c8664207d237d4d3359de813365ae1be5f3ddb1895318e6b93ec177b2392a1c8886
+MISC metadata.xml 306 BLAKE2B 220fde0f7458c161491c4a47f50c34b39a117bf8d0d2295611e9a66a628015345f71f71feef9d33567dcb9814004dbbcfc995b35c4712456e597a6d1a960d12b SHA512 cdd22fea0f9079aebfdcd542e0a5a11721c424a5b2d388c25399f22232c5536e126d1fd988e72de222da14684c2ed3a422e645fa99476470018e8cc009a41368
diff --git a/dev-vcs/cssc/cssc-1.4.0.ebuild b/dev-vcs/cssc/cssc-1.4.0.ebuild
new file mode 100644
index 000000000000..2f891e4d3c0e
--- /dev/null
+++ b/dev-vcs/cssc/cssc-1.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+# Switch to ^^ when we switch to EAPI=6.
+#MY_PN="${PN^^}"
+MY_PN="CSSC"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The GNU Project's replacement for SCCS"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/cssc/"
+SLOT="0"
+LICENSE="GPL-3"
+
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test valgrind"
+
+DEPEND="
+	test? ( valgrind? ( dev-util/valgrind ) )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.3.0-gcc47.patch \
+		"${FILESDIR}"/${P}-config.patch \
+		"${FILESDIR}"/${P}-m4.patch \
+		"${FILESDIR}"/${P}-test-large.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use test && use_with valgrind) \
+		--enable-binary
+}
+
+src_test() {
+	if [[ ${froobUID} = 0 ]]; then
+		einfo "The test suite can not be run as root"
+	else
+		emake check
+	fi
+}
diff --git a/dev-vcs/cssc/files/cssc-1.3.0-gcc47.patch b/dev-vcs/cssc/files/cssc-1.3.0-gcc47.patch
new file mode 100644
index 000000000000..4c319016eccd
--- /dev/null
+++ b/dev-vcs/cssc/files/cssc-1.3.0-gcc47.patch
@@ -0,0 +1,10 @@
+--- a/src/file.h
++++ b/src/file.h
+@@ -31,6 +31,7 @@
+ #define CSSC__FILE_H__
+ 
+ #include "filelock.h"
++#include <unistd.h> /* gid_t */
+ 
+ enum create_mode {
+ 	CREATE_EXCLUSIVE     =  001,
diff --git a/dev-vcs/cssc/files/cssc-1.4.0-config.patch b/dev-vcs/cssc/files/cssc-1.4.0-config.patch
new file mode 100644
index 000000000000..c5790489a9a7
--- /dev/null
+++ b/dev-vcs/cssc/files/cssc-1.4.0-config.patch
@@ -0,0 +1,15 @@
+In file included from file.h:36:0,
+	from delta.cc:36:
+	../gl/lib/unistd.h:135:3: error: #error "Please include config.h first."
+
+
+--- a/src/delta.h
++++ b/src/delta.h
+@@ -25,6 +25,7 @@
+ #ifndef CSSC_DELTA_H
+ #define CSSC_DELTA_H 1
+ 
++#include "config.h"
+ #include "sid.h"
+ #include "sccsdate.h"
+ #include "mystring.h"
diff --git a/dev-vcs/cssc/files/cssc-1.4.0-m4.patch b/dev-vcs/cssc/files/cssc-1.4.0-m4.patch
new file mode 100644
index 000000000000..91c163f14104
--- /dev/null
+++ b/dev-vcs/cssc/files/cssc-1.4.0-m4.patch
@@ -0,0 +1,13 @@
+libtoolize chokes on this line
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,6 @@
+ 
+ # Changes to AC_CONFIG_MACRO_DIR shoulld be reflected in ACLOCAL_AMFLAGS in Makefile.am.
+ AC_CONFIG_MACRO_DIR([m4])
+-AC_CONFIG_MACRO_DIR([unit-tests/googletest/m4])
+ 
+ AM_INIT_AUTOMAKE([gnits readme-alpha check-news tar-ustar 1.11.6])
+ AC_CONFIG_HEADERS(config.h)
diff --git a/dev-vcs/cssc/files/cssc-1.4.0-test-large.patch b/dev-vcs/cssc/files/cssc-1.4.0-test-large.patch
new file mode 100644
index 000000000000..c7c23fb6a074
--- /dev/null
+++ b/dev-vcs/cssc/files/cssc-1.4.0-test-large.patch
@@ -0,0 +1,14 @@
+Takes a very long time.
+
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -136,7 +136,7 @@
+                 test-rmdel \
+                 test-admin test-delta test-get test-prs test-prt test-unget \
+                 test-cdc  test-sact test-val \
+-                test-large test-sccsdiff test-binary test-bsd-sccs test-what \
++                test-sccsdiff test-binary test-bsd-sccs test-what \
+                 test-year-2000
+ 	echo Tests passed.
+ 
diff --git a/dev-vcs/cssc/metadata.xml b/dev-vcs/cssc/metadata.xml
new file mode 100644
index 000000000000..dd7b8493d1b5
--- /dev/null
+++ b/dev-vcs/cssc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+<use>
+<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in tests</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-vcs/cvs-1.12.12-r11 b/dev-vcs/cvs-1.12.12-r11
deleted file mode 100644
index 72c5d98903a2..000000000000
--- a/dev-vcs/cvs-1.12.12-r11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
-DESCRIPTION=Concurrent Versions System - source code revision control tools
-EAPI=6
-HOMEPAGE=http://cvs.nongnu.org/
-IUSE=crypt doc kerberos nls pam server
-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
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=edfd3a45363e108554381e2ad80930c6
diff --git a/dev-vcs/cvs-1.12.12-r12 b/dev-vcs/cvs-1.12.12-r12
deleted file mode 100644
index bee3d557b353..000000000000
--- a/dev-vcs/cvs-1.12.12-r12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
-DESCRIPTION=Concurrent Versions System - source code revision control tools
-EAPI=6
-HOMEPAGE=http://cvs.nongnu.org/
-IUSE=crypt doc kerberos nls pam server
-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
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d48f8d0ce15ea621fc2217953a4f9069
diff --git a/dev-vcs/cvs-fast-export-1.26 b/dev-vcs/cvs-fast-export-1.26
deleted file mode 100644
index 128b8898e642..000000000000
--- a/dev-vcs/cvs-fast-export-1.26
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-text/asciidoc
-DESCRIPTION=fast-export history from a CVS repository or RCS collection
-EAPI=5
-HOMEPAGE=http://www.catb.org/~esr/cvs-fast-export/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.26.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9d98f3570033e2bc5160694c1c4da990
diff --git a/dev-vcs/cvs-fast-export-1.38 b/dev-vcs/cvs-fast-export-1.38
deleted file mode 100644
index b84c5b045a82..000000000000
--- a/dev-vcs/cvs-fast-export-1.38
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-text/asciidoc
-DESCRIPTION=fast-export history from a CVS repository or RCS collection
-EAPI=5
-HOMEPAGE=http://www.catb.org/~esr/cvs-fast-export/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.38.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9d98f3570033e2bc5160694c1c4da990
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
new file mode 100644
index 000000000000..81b0406d2771
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -0,0 +1,5 @@
+DIST cvs-fast-export-1.26.tar.gz 668913 BLAKE2B ff2437eb55ae909666f94d79475e3ccf8db0b9491c439094090bc0eda3ef300b99becb7811aa824aced47039686df0d23c9307b3f35ac3d3cad88e78ce93c549 SHA512 81d240ae387b4231415335b4a0d294ae81f6ecbc97077d92a1738aca17642b9a7e7ee3f7806890ceafc5c65c50d4370c39c36ee21c927a4fcd30ebfa3bbe472e
+DIST cvs-fast-export-1.38.tar.gz 396524 BLAKE2B 41e7d5210671aae9063d3fa1da8a61ff581cdbe6745573d158576e495aeba0958d1cf20c9d8435e0c12747428b884eeab3b2d926a93d580589f17db8102ad27e SHA512 ed2aabc417b093c1742ea15bd21855c600a46a5ab72758d15bab24672b6e648531416a6b28c17e6faedd67b4c697b004ba3316cd65cb0ec638566c26878e9428
+EBUILD cvs-fast-export-1.26.ebuild 794 BLAKE2B 5aafa185f36adf6ab5547fc575bde8e55f061e672b4f228aae3fde73e659452350ee380c759b88b64b3acd74d5dad737a5824728d22d9d794e2fb2a40ba5b45c SHA512 e1e355dac05704aae672a3cbd250482583aad85fb6717c4a30ae65341300b2abb4b88377c7de0f35777058abf809f68c0abe7ee7631a5378a47344d020ad6df9
+EBUILD cvs-fast-export-1.38.ebuild 794 BLAKE2B 5aafa185f36adf6ab5547fc575bde8e55f061e672b4f228aae3fde73e659452350ee380c759b88b64b3acd74d5dad737a5824728d22d9d794e2fb2a40ba5b45c SHA512 e1e355dac05704aae672a3cbd250482583aad85fb6717c4a30ae65341300b2abb4b88377c7de0f35777058abf809f68c0abe7ee7631a5378a47344d020ad6df9
+MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.26.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.26.ebuild
new file mode 100644
index 000000000000..a66e4a649d37
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.26.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-text/asciidoc"
+
+RESTRICT=test # upstream does not ship them in tarball
+
+src_prepare() {
+	tc-export CC
+	export prefix=/usr
+
+	# respect CC, CFLAGS and LDFLAGS. don't install cvssync
+	sed \
+		-e 's/cc /$(CC) $(LDFLAGS) /' \
+		-e 's/^CFLAGS += -O/#&/' \
+		-e 's/CFLAGS=/CFLAGS+=/' \
+		-e 's/$(INSTALL).*cvssync/#&/g' \
+		-i Makefile || die
+}
+
+src_install() {
+	default
+	dodoc README
+}
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.38.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.38.ebuild
new file mode 100644
index 000000000000..a66e4a649d37
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.38.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-text/asciidoc"
+
+RESTRICT=test # upstream does not ship them in tarball
+
+src_prepare() {
+	tc-export CC
+	export prefix=/usr
+
+	# respect CC, CFLAGS and LDFLAGS. don't install cvssync
+	sed \
+		-e 's/cc /$(CC) $(LDFLAGS) /' \
+		-e 's/^CFLAGS += -O/#&/' \
+		-e 's/CFLAGS=/CFLAGS+=/' \
+		-e 's/$(INSTALL).*cvssync/#&/g' \
+		-i Makefile || die
+}
+
+src_install() {
+	default
+	dodoc README
+}
diff --git a/dev-vcs/cvs-fast-export/metadata.xml b/dev-vcs/cvs-fast-export/metadata.xml
new file mode 100644
index 000000000000..bb64b6867438
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freecode">cvs-fast-export</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
new file mode 100644
index 000000000000..c0eea13359d8
--- /dev/null
+++ b/dev-vcs/cvs/Manifest
@@ -0,0 +1,26 @@
+AUX 01-cvs-env.d 14 BLAKE2B 3112bb2e454c1c591b70f4c49e907c1b766a259e3132d5e206f8670b47b2c4daaa75035ba1534400f2ced73225cd074aa79f6b284a9292fbdb2b7989b42e72d5 SHA512 cbb7545ae34fcbfb6e64ad6bf91105a1950a483bb68637d164026e7df06da2dccbcfe0af568c3249ac0a8e7ff466a5e77614fe6fd76a3829136a854bfa7ceb5a
+AUX cvs-1.12.12-CVE-2012-0804.patch 1059 BLAKE2B 6ed9bec3d830340469bb5453a0e521586207a364d2b191a496f50c0f99d69c38a7f86e56064e2ccac9fb08a034b1c30680559bda40de38909489fa962fabea19 SHA512 4f86f75f59caf4ef7e83964ec2d9c93575ccdcb031b1a6a1774a2a80ab7d6f278b3d27c4ab9270b91edf457a0195d702e3bd20da17c167b3f204fd9d8980b720
+AUX cvs-1.12.12-CVE-2017-12836-commandinjection.patch 636 BLAKE2B caf5842e2cf0e09c5307cfe73ac25b53dd9980f7c681daa3a100fdc9a43b3539ac5b99da08c022de6219f471fdde643c0a85294bc55a6a19ad4df9714416da93 SHA512 af6fe60d9c87229d0e29c1243430bf8d6aeaad5f12f906e68cbdf14d4b301117967c8e3c8eb241952ab66b33642fcc2c6ef8e73916305121a1286e8a53ae87da
+AUX cvs-1.12.12-block-requests.patch 4006 BLAKE2B a2d3fa6d3533f20c3eb75687427efb110a7c503cb4ac157766a790698fd68c9317ce2849e003a237cb6e633cd7b8243a921bd74fe907f9d8aef7495966929462 SHA512 541545ffc64c4f2303b7e8f6cae2cdff0437452e4bcf94b2149d51e43710096e17f024c1a8ed32433560ea51ecef2aba2f3e6bfaef8fa9e4ad2f2436649884d1
+AUX cvs-1.12.12-cvs-custom.c 1735 BLAKE2B c0890e7f53c55aef5634753190aa3869e8e63411ef356ee574988eb0a0ee752fecd7cf9d06364e25b77bb608ff8465a7e2b3a063f29bd739556523b50f3eb123 SHA512 0a5589f225b45c41d5ae0b4b6bcba37002d6a1ef9a87a7e47ffa723c87ea6b1f4f29bc7551f1d17378d6f6b5545b0734607772c386851bde1fc51b8cac712a67
+AUX cvs-1.12.12-cvs-gnulib-vasnprintf.patch 1092 BLAKE2B c0ff4e812b1658dc6aa0be6422724c7a8c2e24afd8e88f50e7964a13deb1865681d847618b6c2dd525148a896884bb94c5a6cee62db0532e0205ee22cca5fcbf SHA512 6c0be276f6e86dbe3646ada02ea57194b8c7d1e4d76c5faeb06750435599aa4125253bdf7af6232f53807977acb34aba093bc8bfa2ce98389c5ee80b2fd6e05d
+AUX cvs-1.12.12-cvsbug-tmpfix.patch 624 BLAKE2B df3b82ec4365aa73c6064e420480f915b760e413b36c7e5bbda95ab5b059b77af993ea5156498019da34b277c1472c62c800d6d13a4d62c4c9cac70a50b7395e SHA512 29014631f5595dbf51a47032a19a23e545190dd8d40d77a71d363cee07a9ae38263b67db52a512436a9a7b37a7f5ff4daafa4a0a9f3c29bcfeb71ecff74408b7
+AUX cvs-1.12.12-fix-massive-leak.patch 1985 BLAKE2B 3619a9144ad91f0d648b9e16fa0e4257030d500f9eedf122ab29940b4d2dbe9924680840bcf3036f64e5b245a2c3d48aa289af6ef829136b493c29612abaf15d SHA512 c4c9026e971f3da49cefce102b57bc681427a708ec8caa185df1234fd2a95090c8dc8cbf84374a762fdef7002d658cd4b52450429664cb3a1bfbda63d31c78a7
+AUX cvs-1.12.12-format-security.patch 541 BLAKE2B 6fea8eed90db275659a4a87cbd0a9b68032fbef608e6afe81e63d9abe30528a3388b3ba8ac44e093bd543bf1807c8a28957462a8677e3f08e089a0d7daa45cd9 SHA512 34f16defa5ab03ca2efcdea27269a37e27510d235bc4efd7a91871c2ae32fe9b922a51f3b87bcfec988964f8ae50d4649d7876937e25352836d5274ce88eea13
+AUX cvs-1.12.12-getdelim.patch 564 BLAKE2B 10d8e2b991f812cfbabb4b9b11d43c6d2d317cb3d8cd0a2ad58db378754cce6b176683f0ef5e0f65529dad72a9ac4f8a94d37f828e82ed50dd6d78d1d1b32513 SHA512 181b5daa6e103218e3fc1629a0b5f74daad613cdbe530655eff32479e4b9f32d067e60a82107efdbb129f917ee0626d274fb65555c66d907c997bf01fa262bdb
+AUX cvs-1.12.12-hash-nameclash.patch 1019 BLAKE2B a48dbec6e85c66c4369239785d70c595ec6241bc66bb62f2c3b5ad01a35b0599b7b1a03e1e3fc8b012a1d16d202e1439d9349ef914e1e5663b61463863e53c04 SHA512 dcd612dcc4b008c0fbabd74bcc179e69ebaed31a9f6622127061194a8ed99549502fbc0bffc75cc87aed26f7fe46215da81438c3a797e2179ed3da8e0b5ebdbb
+AUX cvs-1.12.12-install-sh.patch 495 BLAKE2B f18331b296c55aba72da32e5ee7e52c467f37b5e218555144d78f2dd63d2cd1fbb8d76030fd9c2a1f0d8992e3764fef0909a6afdf7c1947092dc5787863dea71 SHA512 7e468d41c1eb23c0a62b605e6e48cffc004e8f386a87a9696dd73b36702c74aad529f5cba7280dee1100027b6e1e907adad257cc446ca3ad734fa40d47e4ff72
+AUX cvs-1.12.12-mktime-configure.patch 4791 BLAKE2B 68587d6604f32064aeca0b5043fdf6fbd3e06cb8eeccdd806463b7035d3598e7354e07e28ae233ab0a4889956d7ebb52bcdf968aaf4bb7aea738ee408bb7e2d2 SHA512 10b29450d5d0a6a02d92812b919edbba2b86f2217aa54896b44358edb2eb8d8d6111b5c5db39faa50ef1f9a86ed1ee190332629f33402ad8cd8082b77547f486
+AUX cvs-1.12.12-mktime-x32.patch 916 BLAKE2B cab0794b1feeb0a8a841732a25d5ba7a9b12721b286860229c8351714c34f01c2dceedc03fc0f16cde9a573027a7ecc56860eb53621c0bf7cbc7b4bec0fa0a99 SHA512 4a58c0f94de8e19c2de1930b7e5e04816e79a86885c89b792616a4c43f6e12aef271005ae59ae0d5788a910ba97735ccdf35f0ef5faafc2e3c50a9858b8f6216
+AUX cvs-1.12.12-musl.patch 421 BLAKE2B c8949755aa511dc21deb7dc3bab1d3641915d794b8d935961b7b7b8d38ee40cdcc2c154f45e057635e9c9af41c4906a046acb2affaf093e4d35d4234a34c845f SHA512 1c14b89dccee3130cc4ff881b7204f01dd8e14d1767e21d30b879df17a368a0f6bc7d3945872f8a6adcf47e34c3e48b9f2c0c0c90cccbf10fa935690a57f5e20
+AUX cvs-1.12.12-openat.patch 761 BLAKE2B ea0ea24adb27599ccd2f375ebeb008c3c2cbc246ad0dfd8fa88cf7b56c9313e97d3ad0a71e45dad1fa79dd1a3b50271def194aa9cea7eddb9748a6076f4e0ebc SHA512 b0a7abc785169705d2f0668a8af706f93ee3eba3d050d555689577962283e54f6bd186e662b64c65f926cf72dff76a37259181338707d641ee0f20591ba62805
+AUX cvs-1.12.12-rcs2log-coreutils.patch 557 BLAKE2B e47fc3072b5ba8728752a5312be67cb1579d2eb1b8a0c5b9e279c9ea3570adcf73f4b2643bcab48cb56e2067475cbe576e041e9dbde2604c4e209085f7c3ad16 SHA512 73c3506fa670b00ac52363efa2a2fa34203108d3dc112400e52f78eb7d83967cf49b11280d6c27a461f79a9c38317b41b26dd1f67d10229dbcb6c2ad9d43b521
+AUX cvs.pam-include-1.12.12 106 BLAKE2B d9daa13819af5eceb0fef5afd355139b23993bbd6be7eeb5a28ca96a9dba3e987b6ac7fda383ba8b8139abd56e4e7e4ffc725931019e6c7840f96dcc4403d854 SHA512 1e72da3f959433e59d0153ff09e53a79bb68793506456e38d7070ffe4fcf6d596fdc3740dd2325d626a8dbd356dd11d93fbd5f220515f2435a94b90bb5833fb9
+AUX cvspserver.xinetd.d 282 BLAKE2B e9d2196b5c3286579c3eb2dbdc8ee4f8be46d4af4c54df8e1aa02ee0d9226334c8688e82b9786387a76136d24b365a365cd5a4dab5e8d153f3d5a27a7e07caf5 SHA512 6845a5fc38ed9d8f9194f14137066c3f2640f09ebc1dce7e9fa7c49761534003e5b1c59593496ba9f88a6c9b1196980bc145a2e2fdcbf662360d1b1ca8821411
+DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8eabf6faff1fccc8c0f741b0d5c59882d60e91cae08aaf2449a9e5553293c564b37381d52b71110cd45c7599661dbb8427a96 SHA512 c4f6bdc294b719c1c9f6e8b7d1d4faa9e2aafccd37924e9d4772f8d802da3e7f5ae1778b295989db256b23bb1d0914023db7237adaf07833caaee499ae6b6fa3
+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 2995 BLAKE2B ad5bf94a3039b07f6c32a14e8ff99feb209c1e4ccaa6ad922cd8f93ec705594b1fdd7e18d697897ea994898acda877b63c38dea149d7f919f7a1416621d3257a SHA512 51ac321b9d9d1cbb4a7ee8fd46e36c1f5a13559e3f9fe0a42310748fc6c4f5c1348caef72a45d6ac1fafff468fcb9ff6aa13bb2283a6ac07afeac891b8e2d09f
+EBUILD cvs-1.12.12-r12.ebuild 2990 BLAKE2B 2faab14655d239f863e83edd22bf2d1d0c83954f6fdca7a0032edb89c0ee3c531e4623fc612f83f1e66ce71fbf9b3eb28cb27b4c9f213d8ad8ce2d938cff0ed1 SHA512 2dae2c584e5923334dffc3c7b7b4b101de1995e8c05ded5de4d627570d79f2b06b59bcae01e3a92dcbb9ea5426991d1e78bee536cb20c59a5e353c175836531d
+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
new file mode 100644
index 000000000000..0688f5bfeeef
--- /dev/null
+++ b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pam toolchain-funcs
+
+DESCRIPTION="Concurrent Versions System - source code revision control tools"
+HOMEPAGE="http://cvs.nongnu.org/"
+
+SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
+	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
+		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
+		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
+
+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 ~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"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack cederqvist-${PV}.html.tar.bz2
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	"${FILESDIR}"/${P}-openat.patch
+	"${FILESDIR}"/${P}-block-requests.patch
+	"${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+	"${FILESDIR}"/${P}-install-sh.patch
+	"${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+	"${FILESDIR}"/${P}-getdelim.patch # 314791
+	"${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
+	"${FILESDIR}"/${P}-mktime-x32.patch # 395641
+	"${FILESDIR}"/${P}-fix-massive-leak.patch
+	"${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
+	"${FILESDIR}"/${P}-CVE-2012-0804.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-musl.patch
+	)
+DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \
+	PROJECTS README TESTS TODO )
+
+src_prepare() {
+	default
+
+	sed -i "/^AR/s/ar/$(tc-getAR)/" diff/Makefile.in lib/Makefile.in || die
+}
+
+src_configure() {
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
+	econf \
+		--with-external-zlib \
+		--with-tmpdir=${EPREFIX%/}/tmp \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server)
+}
+
+src_install() {
+	# Not installed into emacs site-lisp because it clobbers the normal C
+	# indentations.
+	DOCS+=( cvs-format.el )
+
+	if use doc; then
+		DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} )
+		HTML_DOCS=( ../cederqvist-${PV}.html/. )
+	fi
+
+	default
+
+	use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html
+
+	if use server; then
+		newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver
+		newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
+	fi
+
+	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
+}
+
+pkg_postinst() {
+	use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
+}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
new file mode 100644
index 000000000000..4fd2e77144a9
--- /dev/null
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pam toolchain-funcs
+
+DESCRIPTION="Concurrent Versions System - source code revision control tools"
+HOMEPAGE="http://cvs.nongnu.org/"
+
+SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
+	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
+		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
+		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
+
+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 ~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"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack cederqvist-${PV}.html.tar.bz2
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	"${FILESDIR}"/${P}-openat.patch
+	"${FILESDIR}"/${P}-block-requests.patch
+	"${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+	"${FILESDIR}"/${P}-install-sh.patch
+	"${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+	"${FILESDIR}"/${P}-getdelim.patch # 314791
+	"${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
+	"${FILESDIR}"/${P}-mktime-x32.patch # 395641
+	"${FILESDIR}"/${P}-fix-massive-leak.patch
+	"${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
+	"${FILESDIR}"/${P}-CVE-2012-0804.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-musl.patch
+	"${FILESDIR}"/${P}-CVE-2017-12836-commandinjection.patch
+	)
+DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \
+	PROJECTS README TESTS TODO )
+
+src_prepare() {
+	export CONFIG_SHELL=${BASH}  # configure fails without
+	default
+	sed -i "/^AR/s:ar:$(tc-getAR):" diff/Makefile.in lib/Makefile.in || die
+}
+
+src_configure() {
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
+	econf \
+		--with-external-zlib \
+		--with-tmpdir=${EPREFIX%/}/tmp \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server)
+}
+
+src_install() {
+	# Not installed into emacs site-lisp because it clobbers the normal C
+	# indentations.
+	DOCS+=( cvs-format.el )
+
+	if use doc; then
+		DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} )
+		HTML_DOCS=( ../cederqvist-${PV}.html/. )
+	fi
+
+	default
+
+	use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html
+
+	if use server; then
+		newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver
+		newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
+	fi
+
+	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
+}
diff --git a/dev-vcs/cvs/files/01-cvs-env.d b/dev-vcs/cvs/files/01-cvs-env.d
new file mode 100644
index 000000000000..5c89358b9554
--- /dev/null
+++ b/dev-vcs/cvs/files/01-cvs-env.d
@@ -0,0 +1 @@
+CVS_RSH="ssh"
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch b/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch
new file mode 100644
index 000000000000..107c3ea12204
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch
@@ -0,0 +1,30 @@
+[CVE-2012-0804] Fix proxy response parser
+
+If proxy sends overlong HTTP vesion string, the string will be copied
+to unallocatd space (write_buf) causing heap overflow.
+
+This patch fixes it by ignoring the HTTP version string and checking
+the response line has been parsed correctly.
+
+See <https://bugzilla.redhat.com/show_bug.cgi?id=773699> for more
+details.
+
+Index: src/client.c
+===================================================================
+RCS file: /sources/cvs/ccvs/src/client.c,v
+retrieving revision 1.483
+diff -u -r1.483 client.c
+--- a/src/client.c	18 Nov 2008 22:59:02 -0000	1.483
++++ b/src/client.c	26 Jan 2012 16:32:25 -0000
+@@ -4339,9 +4339,9 @@
+          * code.
+          */
+ 	read_line_via (from_server, to_server, &read_buf);
+-	sscanf (read_buf, "%s %d", write_buf, &codenum);
++	count = sscanf (read_buf, "%*s %d", &codenum);
+ 
+-	if ((codenum / 100) != 2)
++	if (count != 1 || (codenum / 100) != 2)
+ 	    error (1, 0, "proxy server %s:%d does not support http tunnelling",
+ 		   root->proxy_hostname, proxy_port_number);
+ 	free (read_buf);
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-CVE-2017-12836-commandinjection.patch b/dev-vcs/cvs/files/cvs-1.12.12-CVE-2017-12836-commandinjection.patch
new file mode 100644
index 000000000000..87b1fdc9584c
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-CVE-2017-12836-commandinjection.patch
@@ -0,0 +1,22 @@
+diff -Naurp a/src/rsh-client.c b/src/rsh-client.c
+--- a/src/rsh-client.c	2005-03-15 18:45:10.000000000 +0100
++++ b/src/rsh-client.c	2017-08-26 17:43:23.228060155 +0200
+@@ -97,6 +97,9 @@ start_rsh_server (cvsroot_t *root, struc
+ 	rsh_argv[i++] = root->username;
+     }
+ 
++    /* Only non-option arguments from here. (CVE-2017-12836) */
++    rsh_argv[i++] = "--";
++
+     rsh_argv[i++] = root->hostname;
+     rsh_argv[i++] = cvs_server;
+     rsh_argv[i++] = "server";
+@@ -171,6 +174,8 @@ start_rsh_server (cvsroot_t *root, struc
+ 	    *p++ = root->username;
+ 	}
+ 
++	*p++ = "--";
++
+ 	*p++ = root->hostname;
+ 	*p++ = command;
+ 	*p++ = NULL;
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch b/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch
new file mode 100644
index 000000000000..9c9b49db8f62
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch
@@ -0,0 +1,140 @@
+Author: Robin H. Johnson <robbat2@gentoo.org>
+Date: 2006-08-09
+
+This patch allows a CVS server to deny usage of specific commands, based on
+input in the environment.
+
+Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want,
+seperated by spaces. Eg:
+CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents"
+would block ALL usage of compression.
+
+Please see the array 'struct request requests[]' in src/server.c for a full
+list of commands.
+
+Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients
+may fail! (This includes 'ci'!).
+
+See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*~' -U 10 cvs-1.12.12.orig/src/server.c cvs-1.12.12/src/server.c
+--- cvs-1.12.12.orig/src/server.c	2005-04-14 14:13:29.000000000 +0000
++++ cvs-1.12.12/src/server.c	2006-08-09 01:40:44.000000000 +0000
+@@ -5836,43 +5836,90 @@
+ #undef REQ_LINE
+ };
+ #endif /* SERVER_SUPPORT or CLIENT_SUPPORT */
+ 
+ 
+ 
+ #ifdef SERVER_SUPPORT
+ /*
+  * This server request is not ignored by the secondary.
+  */
++
++/* Hack by Robin H. Johnson <robbat2@gentoo.org>.
++ * Allow the server ENV to specify what request types are to be ignored.
++ */
++
++static char blocked_requests[BUFSIZ] = " ";
++
++static void build_blocked_requests() {
++	char *tmp = getenv("CVS_BLOCK_REQUESTS");
++
++	if (tmp != NULL && strlen(tmp) > 0) {
++		// move to our custom buffer
++		strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests));
++		//add a space on the end as well for searching
++		strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests));
++	}
++
++	// now blocked_requests contains the list of every request that we do not
++	// want to serve
++}
++
++// returns 0 if we should serve this request
++// use as if(checker(FOO)) continue;
++static int serve_valid_requests_checker(char *reqname) {
++	char needle[BUFSIZ] = " ";
++	char *tmp;
++
++	if(!blocked_requests || strlen(blocked_requests) < 2)
++		return 0;
++
++	// we want to look for ' 'reqname' '
++	snprintf(needle, sizeof(needle), " %s ", reqname);
++
++	// now do the search
++	tmp = strstr(blocked_requests, needle);
++
++	if (tmp != NULL)
++		return 1;
++
++	return 0;
++	
++}
++
+ static void
+ serve_valid_requests (char *arg)
+ {
+     struct request *rq;
+ 
+     /* Since this is processed in the first pass, don't reprocess it in the
+      * second.
+      *
+      * We still print errors since new errors could have been generated in the
+      * second pass.
+      */
+     if (print_pending_error ()
+ #ifdef PROXY_SUPPORT
+ 	|| reprocessing
+ #endif /* PROXY_SUPPORT */
+        )
+ 	return;
++	
++    build_blocked_requests();
+ 
+     buf_output0 (buf_to_net, "Valid-requests");
+     for (rq = requests; rq->name != NULL; rq++)
+     {
+ 	if (rq->func != NULL)
+ 	{
++		if(serve_valid_requests_checker(rq->name)) 
++			continue;
+ 	    buf_append_char (buf_to_net, ' ');
+ 	    buf_output0 (buf_to_net, rq->name);
+ 	}
+     }
+     buf_output0 (buf_to_net, "\nok\n");
+ 
+     /* The client is waiting for the list of valid requests, so we
+        must send the output now.  */
+     buf_flush (buf_to_net, 1);
+ }
+@@ -6353,20 +6400,24 @@
+ 		    cmd += len;
+ 		else if (cmd[len] == ' ')
+ 		    cmd += len + 1;
+ 		else
+ 		    /*
+ 		     * The first len characters match, but it's a different
+ 		     * command.  e.g. the command is "cooperate" but we matched
+ 		     * "co".
+ 		     */
+ 		    continue;
++		// Ignore commands that we are supposed to ignore.
++		if(serve_valid_requests_checker(rq->name))
++				continue;
++
+ 
+ 		if (!(rq->flags & RQ_ROOTLESS)
+ 		    && current_parsed_root == NULL)
+ 		{
+ 		    /* For commands which change the way in which data
+ 		       is sent and received, for example Gzip-stream,
+ 		       this does the wrong thing.  Since the client
+ 		       assumes that everything is being compressed,
+ 		       unconditionally, there is no way to give this
+ 		       error to the client without turning on
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvs-custom.c b/dev-vcs/cvs/files/cvs-1.12.12-cvs-custom.c
new file mode 100644
index 000000000000..597f6de8dbdb
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-cvs-custom.c
@@ -0,0 +1,58 @@
+/*
+Author: Robin H. Johnson <robbat2@gentoo.org>
+Date: 2006-08-09
+
+This patch allows a CVS server to deny usage of specific commands, based on
+input in the environment.
+
+Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want,
+seperated by spaces. Eg:
+CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents"
+would block ALL usage of compression.
+
+Please see the array 'struct request requests[]' in src/server.c for a full
+list of commands.
+
+Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients
+may fail! (This includes 'ci'!).
+
+See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+*/
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <malloc.h>
+
+
+#define REAL_CVS "/bin/cvs"
+#define CVS_TMPDIR "/tmp"
+#define CMDS_BLOCKED " Gzip-stream gzip-file-contents Kerberos-encrypt Gssapi-encrypt Gssapi-authenticate add remove admin import init history watch-on watch-off watch-add watch-remove watchers editors edit version tag rtag "
+
+int main(int argc, char* argv[]) {
+		char** newargv;
+		int newargc, offset;
+		int i;
+		// 0 for argv[0] we must copy
+		offset = 0+0;
+		// +1 for trailing NULL
+		newargc = argc+offset+1;
+		newargv = (char**) malloc(newargc*sizeof(char*));
+		newargv[0] = "cvs";
+		//newargv[1] = "-T";
+		//newargv[2] = CVS_TMPDIR;
+		//newargv[3] = "-R";
+		for(i=1;i<argc;i++) {
+				newargv[i+offset] = argv[i];
+		}
+		newargv[newargc-1] = NULL;
+		setenv("CVS_BLOCK_REQUESTS",CMDS_BLOCKED ,1);
+		//for(i =0;i<newargc;i++) {
+		//		printf("[%d]='%s'\n",i,newargv[i] != NULL ? newargv[i] : "NULL");
+		//}
+		execv(REAL_CVS,newargv);
+		free(newargv);
+		return 0;
+}
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch
new file mode 100644
index 000000000000..d7d6e6bb8a65
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/213833
+
+commit 913c09becd9df89dbd9b9f386e7f35c240d5efe8
+Author: Bruno Haible <bruno@clisp.org>
+Date:   Fri Oct 19 01:50:42 2007 +0200
+
+    Don't use %n on glibc >= 2.3 systems.
+
+diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
+index f563823..5d818aa 100644
+--- a/lib/vasnprintf.c
++++ b/lib/vasnprintf.c
+@@ -3385,9 +3385,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
+ #endif
+ 		  *p = dp->conversion;
+ #if USE_SNPRINTF
++# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
+ 		p[1] = '%';
+ 		p[2] = 'n';
+ 		p[3] = '\0';
++# else
++		/* On glibc2 systems from glibc >= 2.3 - probably also older
++		   ones - we know that snprintf's returns value conforms to
++		   ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
++		   Therefore we can avoid using %n in this situation.
++		   On glibc2 systems from 2004-10-18 or newer, the use of %n
++		   in format strings in writable memory may crash the program
++		   (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
++		   in this situation.  */
++		p[1] = '\0';
++# endif
+ #else
+ 		p[1] = '\0';
+ #endif
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch
new file mode 100644
index 000000000000..fcd4431e8775
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch
@@ -0,0 +1,22 @@
+Index: cvs-1.12.12/src/cvsbug.in
+===================================================================
+--- cvs-1.12.12.orig/src/cvsbug.in
++++ cvs-1.12.12/src/cvsbug.in
+@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then
+     /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
+       cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
+     ORIGINATOR="`cat $TEMP`"
+-    rm -f $TEMP
++    > $TEMP
+   fi
+ fi
+
+ if [ "$ORIGINATOR" = "" ]; then
+   grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
+   ORIGINATOR="`cat $TEMP`"
+-  rm -f $TEMP
++  > $TEMP
+ fi
+
+ if [ -n "$ORGANIZATION" ]; then
+
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch b/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch
new file mode 100644
index 000000000000..5366f50855f1
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch
@@ -0,0 +1,52 @@
+buf_free_data must free data independently
+of send or reseived bytes over network.
+
+Moreover, when buffer is usually freed
+buffer _is_ empty, but has one clean mapped page.
+
+I've observed massive 'cvs server' leaks
+when importing large gentoo-x86 repo with 'cvsps'.
+Leak ate all my 32GBs of RAM and killed process.
+(Leaked around 3 pages per client request).
+
+valgrind found the leak easily:
+
+$ valgrind \
+    cvsps \
+           --root :local:$HOME/portage/gentoo-x86.rsync \
+           --fast-export \
+           gentoo-x86/dev-vcs/git-annex 2>l |
+    git fast-import
+
+    ==13504== 1,248 bytes in 52 blocks are still reachable in loss record 41 of 47
+    ==13504==    at 0x4C2C19B: malloc (vg_replace_malloc.c:270)
+    ==13504==    by 0x48A556: xnmalloc_inline (xmalloc.c:40)
+    ==13504==    by 0x48A5B5: xmalloc (xmalloc.c:56)
+    ==13504==    by 0x4855F5: new_memnode (pagealign_alloc.c:91)
+    ==13504==    by 0x48571B: pagealign_alloc (pagealign_alloc.c:151)
+    ==13504==    by 0x485739: pagealign_xalloc (pagealign_alloc.c:182)
+    ==13504==    by 0x408DD7: get_buffer_data (buffer.c:98)
+    ==13504==    by 0x409C0C: buf_input_data (buffer.c:738)
+    ==13504==    by 0x45BB63: do_cvs_command (server.c:3847)
+    ==13504==    by 0x45D39E: serve_co (server.c:4809)
+    ==13504==    by 0x45F845: server (server.c:6438)
+    ==13504==    by 0x438784: main (main.c:1066)
+
+And now it takes constant space (less, than 18MB)
+for 'cvs server' process to convert all gentoo-x86
+by serving more, than 5 000 000 client requests.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+diff --git a/src/buffer.c b/src/buffer.c
+index 3f12513..9a7a559 100644
+--- a/src/buffer.c
++++ b/src/buffer.c
+@@ -526,7 +526,7 @@ buf_copy_data (struct buffer *buf, struct buffer_data *data,
+ void
+ buf_free_data (struct buffer *buffer)
+ {
+-    if (buf_empty_p (buffer)) return;
++    if (! buffer->data) return;
+     buf_free_datas (buffer->data, buffer->last);
+     buffer->data = buffer->last = NULL;
+ }
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch b/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch
new file mode 100644
index 000000000000..d710a9020735
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch
@@ -0,0 +1,22 @@
+--- a/diff/diff3.c
++++ b/diff/diff3.c
+@@ -1503,7 +1503,7 @@
+ 	      line = 0;
+ 	      do
+ 		{
+-		  printf_output (line_prefix);
++		  printf_output ("%s", line_prefix);
+ 		  cp = D_RELNUM (ptr, realfile, line);
+ 		  length = D_RELLEN (ptr, realfile, line);
+ 		  write_output (cp, length);
+--- a/src/main.c
++++ b/src/main.c
+@@ -1375,7 +1375,7 @@
+ {
+     (void) fprintf (stderr, *cpp++, program_name, cvs_cmd_name);
+     for (; *cpp; cpp++)
+-	(void) fprintf (stderr, *cpp);
++	(void) fprintf (stderr, "%s", *cpp);
+     exit (EXIT_FAILURE);
+ }
+ 
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch b/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch
new file mode 100644
index 000000000000..837d4408ab1f
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch
@@ -0,0 +1,21 @@
+The function getdelim() behaves slightly different on FreeBSD,
+only appending to the *line buffer if line_size is 0.
+
+See: 
+https://savannah.nongnu.org/bugs/?29466
+http://bugs.gentoo.org/314791
+
+Already comitted upstream:
+http://cvs.savannah.gnu.org/viewvc/ccvs/src/myndbm.c?root=cvs&r1=1.38&r2=1.39
+
+--- a/src/myndbm.c.orig
++++ b/src/myndbm.c
+@@ -213,7 +213,7 @@
+ mydbm_load_file (FILE *fp, List *list, char *filename)
+ {
+     char *line = NULL;
+-    size_t line_size;
++    size_t line_size = 0;
+     char *value;
+     size_t value_allocated;
+     char *cp, *vp;
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch b/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch
new file mode 100644
index 000000000000..95fd61e0a51a
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch
@@ -0,0 +1,42 @@
+http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
+fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
+
+--- a/src/hash.h.orig	2005-02-01 22:56:48 +0100
++++ b/src/hash.h	2010-03-10 19:00:11 +0100
+@@ -27,26 +27,26 @@
+ };
+ typedef enum ntype Ntype;
+ 
+-struct node
++struct hashnode
+ {
+     Ntype type;
+-    struct node *next;
+-    struct node *prev;
+-    struct node *hashnext;
+-    struct node *hashprev;
++    struct hashnode *next;
++    struct hashnode *prev;
++    struct hashnode *hashnext;
++    struct hashnode *hashprev;
+     char *key;
+     void *data;
+-    void (*delproc) (struct node *);
++    void (*delproc) (struct hashnode *);
+ };
+-typedef struct node Node;
++typedef struct hashnode Node;
+ 
+-struct list
++struct hashlist
+ {
+     Node *list;
+     Node *hasharray[HASHSIZE];
+-    struct list *next;
++    struct hashlist *next;
+ };
+-typedef struct list List;
++typedef struct hashlist List;
+ 
+ List *getlist (void);
+ Node *findnode (List * list, const char *key);
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch b/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch
new file mode 100644
index 000000000000..825c0ee6f1c3
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch
@@ -0,0 +1,12 @@
+diff -ur a/build-aux/install-sh b/build-aux/install-sh
+--- a/build-aux/install-sh	2006-03-25 20:04:46 +0000
++++ b/build-aux/install-sh	2007-09-14 10:53:29 +0100
+@@ -246,7 +246,7 @@
+   fi
+ 
+   if test -n "$dir_arg"; then
+-    $doit $mkdircmd "$dst" \
++    { test -d "$dst" || $doit $mkdircmd -p "$dst"; } \
+       && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+       && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
new file mode 100644
index 000000000000..03d7f35601e2
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
@@ -0,0 +1,201 @@
+https://bugs.gentoo.org/220040
+https://bugs.gentoo.org/570208
+
+update mktime check to latest autoconf version which is less buggy
+
+--- a/configure
++++ b/configure
+@@ -5299,26 +6059,25 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ /* Test program from Paul Eggert and Tony Leneis.  */
+-#if TIME_WITH_SYS_TIME
++#ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
+ #else
+-# if HAVE_SYS_TIME_H
++# ifdef HAVE_SYS_TIME_H
+ #  include <sys/time.h>
+ # else
+ #  include <time.h>
+ # endif
+ #endif
+ 
+-#if HAVE_STDLIB_H
+-# include <stdlib.h>
+-#endif
++#include <limits.h>
++#include <stdlib.h>
+ 
+-#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+ 
+-#if !HAVE_ALARM
++#ifndef HAVE_ALARM
+ # define alarm(X) /* empty */
+ #endif
+ 
+@@ -5335,9 +6094,9 @@
+ };
+ #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
+ 
+-/* Fail if mktime fails to convert a date in the spring-forward gap.
++/* Return 0 if mktime fails to convert a date in the spring-forward gap.
+    Based on a problem report from Andreas Jaeger.  */
+-static void
++static int
+ spring_forward_gap ()
+ {
+   /* glibc (up to about 1998-10-07) failed this test. */
+@@ -5356,29 +6115,27 @@
+   tm.tm_min = 0;
+   tm.tm_sec = 0;
+   tm.tm_isdst = -1;
+-  if (mktime (&tm) == (time_t)-1)
+-    exit (1);
++  return mktime (&tm) != (time_t) -1;
+ }
+ 
+-static void
++static int
+ mktime_test1 (now)
+      time_t now;
+ {
+   struct tm *lt;
+-  if ((lt = localtime (&now)) && mktime (lt) != now)
+-    exit (1);
++  return ! (lt = localtime (&now)) || mktime (lt) == now;
+ }
+ 
+-static void
++static int
+ mktime_test (now)
+      time_t now;
+ {
+-  mktime_test1 (now);
+-  mktime_test1 ((time_t) (time_t_max - now));
+-  mktime_test1 ((time_t) (time_t_min + now));
++  return (mktime_test1 (now)
++	  && mktime_test1 ((time_t) (time_t_max - now))
++	  && mktime_test1 ((time_t) (time_t_min + now)));
+ }
+ 
+-static void
++static int
+ irix_6_4_bug ()
+ {
+   /* Based on code from Ariel Faigon.  */
+@@ -5391,11 +6148,10 @@
+   tm.tm_sec = 0;
+   tm.tm_isdst = -1;
+   mktime (&tm);
+-  if (tm.tm_mon != 2 || tm.tm_mday != 31)
+-    exit (1);
++  return tm.tm_mon == 2 && tm.tm_mday == 31;
+ }
+ 
+-static void
++static int
+ bigtime_test (j)
+      int j;
+ {
+@@ -5417,8 +6173,39 @@
+ 	     && lt->tm_wday == tm.tm_wday
+ 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
+ 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
+-	exit (1);
++	return 0;
+     }
++  return 1;
++}
++
++static int
++year_2050_test ()
++{
++  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
++     ignoring leap seconds.  */
++  unsigned long int answer = 2527315200UL;
++
++  struct tm tm;
++  time_t t;
++  tm.tm_year = 2050 - 1900;
++  tm.tm_mon = 2 - 1;
++  tm.tm_mday = 1;
++  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
++  tm.tm_isdst = -1;
++
++  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
++     instead of "TZ=America/Vancouver" in order to detect the bug even
++     on systems that don't support the Olson extension, or don't have the
++     full zoneinfo tables installed.  */
++  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
++
++  t = mktime (&tm);
++
++  /* Check that the result is either a failure, or close enough
++     to the correct answer that we can assume the discrepancy is
++     due to leap seconds.  */
++  return (t == (time_t) -1
++	  || (0 < t && answer - 120 <= t && t <= answer + 120));
+ }
+ 
+ int
+@@ -5432,12 +6219,15 @@
+      isn't worth using anyway.  */
+   alarm (60);
+ 
+-  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
+-    continue;
+-  time_t_max--;
+-  if ((time_t) -1 < 0)
+-    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
+-      continue;
++  for (;;)
++    {
++      t = (time_t_max << 1) + 1;
++      if (t <= time_t_max)
++	break;
++      time_t_max = t;
++    }
++  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
++
+   delta = time_t_max / 997; /* a suitable prime number */
+   for (i = 0; i < N_STRINGS; i++)
+     {
+@@ -5445,18 +6235,22 @@
+ 	putenv (tz_strings[i]);
+ 
+       for (t = 0; t <= time_t_max - delta; t += delta)
+-	mktime_test (t);
+-      mktime_test ((time_t) 1);
+-      mktime_test ((time_t) (60 * 60));
+-      mktime_test ((time_t) (60 * 60 * 24));
+-
+-      for (j = 1; 0 < j; j *= 2)
+-	bigtime_test (j);
+-      bigtime_test (j - 1);
++	if (! mktime_test (t))
++	  return 1;
++      if (! (mktime_test ((time_t) 1)
++	     && mktime_test ((time_t) (60 * 60))
++	     && mktime_test ((time_t) (60 * 60 * 24))))
++	return 1;
++
++      for (j = 1; ; j <<= 1)
++	if (! bigtime_test (j))
++	  return 1;
++	else if (INT_MAX / 2 < j)
++	  break;
++      if (! bigtime_test (INT_MAX))
++	return 1;
+     }
+-  irix_6_4_bug ();
+-  spring_forward_gap ();
+-  exit (0);
++  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch b/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch
new file mode 100644
index 000000000000..948fa4d7144e
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch
@@ -0,0 +1,29 @@
+back port changes from upstream gnulib to make this work on x32
+
+https://bugs.gentoo.org/395641
+
+--- cvs-1.12.12/lib/mktime.c
++++ cvs-1.12.12/lib/mktime.c
+@@ -115,6 +115,13 @@
+ #define TM_YEAR_BASE 1900
+ verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0);
+ 
++#if INT_MAX <= LONG_MAX / 2
++typedef long int long_int;
++#else
++typedef long long int long_int;
++#endif
++verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2);
++
+ /* Return 1 if YEAR + TM_YEAR_BASE is a leap year.  */
+ static inline int
+ leapyear (long int year)
+@@ -167,8 +174,6 @@
+ 	    int year0, int yday0, int hour0, int min0, int sec0)
+ {
+   verify (C99_integer_division, -1 / 2 == 0);
+-  verify (long_int_year_and_yday_are_wide_enough,
+-	  INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
+ 
+   /* Compute intervening leap days correctly even if year is negative.
+      Take care to avoid integer overflow here.  */
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-musl.patch b/dev-vcs/cvs/files/cvs-1.12.12-musl.patch
new file mode 100644
index 000000000000..e426cf55fcc7
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-musl.patch
@@ -0,0 +1,13 @@
+http://gcc.gnu.org/ml/gcc/2003-04/msg00518.html
+
+--- a/lib/regex.c
++++ b/lib/regex.c
+@@ -8184,7 +8184,7 @@
+       if (msg_size > errbuf_size)
+         {
+ #if defined HAVE_MEMPCPY || defined _LIBC
+-	  *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
++	  *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+ #else
+           memcpy (errbuf, msg, errbuf_size - 1);
+           errbuf[errbuf_size - 1] = 0;
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-openat.patch b/dev-vcs/cvs/files/cvs-1.12.12-openat.patch
new file mode 100644
index 000000000000..fdb406a45e4f
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-openat.patch
@@ -0,0 +1,21 @@
+Index: cvs-1.12.12/lib/openat.c
+===================================================================
+--- cvs-1.12.12.orig/lib/openat.c
++++ cvs-1.12.12/lib/openat.c
+@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename
+       va_list arg;
+       va_start (arg, flags);
+ 
+-      /* Assume that mode_t is passed compatibly with mode_t's type
+-	 after argument promotion.  */
+-      mode = va_arg (arg, mode_t);
++      /* If mode_t is narrower than int, use the promoted type (int),
++         not mode_t.  Use sizeof to guess whether mode_t is nerrower;
++         we don't know of any practical counterexamples.  */
++      if (sizeof (mode_t) < sizeof (int))
++	mode = va_arg (arg, int);
++      else
++	mode = va_arg (arg, mode_t);
+ 
+       va_end (arg);
+     }
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
new file mode 100644
index 000000000000..7dda3f0f1724
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
@@ -0,0 +1,14 @@
+X-Gentoo-bug: 144114
+
+diff -Nuar cvs-1.12.12.orig/contrib/rcs2log.sh cvs-1.12.12/contrib/rcs2log.sh
+--- cvs-1.12.12.orig/contrib/rcs2log.sh	2003-02-25 21:32:51.000000000 +0000
++++ cvs-1.12.12/contrib/rcs2log.sh	2010-12-06 21:14:33.831532212 +0000
+@@ -620,7 +620,7 @@
+ # Sort the log entries, first by date+time (in reverse order),
+ # then by author, then by log entry, and finally by file name and revision
+ # (just in case).
+-sort -t"$SOH" +2 -4r +4 +0 |
++sort -t"$SOH" -k 3,4r -k 5 -k 1,2 |
+ 
+ # Finally, reformat the sorted log entries.
+ $AWK -F"$SOH" '
diff --git a/dev-vcs/cvs/files/cvs.pam-include-1.12.12 b/dev-vcs/cvs/files/cvs.pam-include-1.12.12
new file mode 100644
index 000000000000..f401ec082a11
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs.pam-include-1.12.12
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth        include	system-auth
+account     include	system-auth
+session     include	system-auth
diff --git a/dev-vcs/cvs/files/cvspserver.xinetd.d b/dev-vcs/cvs/files/cvspserver.xinetd.d
new file mode 100644
index 000000000000..0f2edb09cba0
--- /dev/null
+++ b/dev-vcs/cvs/files/cvspserver.xinetd.d
@@ -0,0 +1,14 @@
+service cvspserver
+{
+	disable		= yes
+	socket_type	= stream
+	wait		= no
+	user		= root
+	log_type	= FILE /var/log/cvspserver
+	protocol	= tcp
+	env		= HOME=/var/cvsroot
+	log_on_failure	+= USERID
+	port		= 2401
+	server		= /usr/bin/cvs
+	server_args	= -f --allow-root=/var/cvsroot pserver
+}
diff --git a/dev-vcs/cvs/metadata.xml b/dev-vcs/cvs/metadata.xml
new file mode 100644
index 000000000000..e74b19c857bc
--- /dev/null
+++ b/dev-vcs/cvs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="server">Enable server support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-vcs/cvs2cl-2.71 b/dev-vcs/cvs2cl-2.71
deleted file mode 100644
index 04c76d03e30f..000000000000
--- a/dev-vcs/cvs2cl-2.71
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl
-DESCRIPTION=produces a GNU-style ChangeLog for CVS-controlled sources
-EAPI=0
-HOMEPAGE=http://www.red-bean.com/cvs2cl/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://gentoo/cvs2cl-2.71.pl.bz2
-_md5_=759a2c4a2e41591e59bbcdac298a997f
diff --git a/dev-vcs/cvs2cl/Manifest b/dev-vcs/cvs2cl/Manifest
new file mode 100644
index 000000000000..848cb2931805
--- /dev/null
+++ b/dev-vcs/cvs2cl/Manifest
@@ -0,0 +1,3 @@
+DIST cvs2cl-2.71.pl.bz2 25347 BLAKE2B 423a5d0faeb09f4ea730c9ba18c87b962acfc5808995bbb550675f34ac51670d2493408b9ea15341ca1dbc7465c401af47b8981117407c5bb669c9f932f07de2 SHA512 de9e8465da56bec5b541a588e0d2a73f49e060fcadbde33ca63a7c4f93edf37cc50aa3271c4ad466430d3315b95c27d642325bd885ec7afdd6a75586d15d9dbe
+EBUILD cvs2cl-2.71.ebuild 632 BLAKE2B f6b519a5f20a2637a66ae4f75b742792b55057d989e3fadad799e2b4628483cb0f4f3ce3256bd3f15a30835bcfa3f24628811a1e68335a246a573b663da76da4 SHA512 9e5d56c3faa8f5ca7d7f909577cdadd0ad3bddf147aa722eaae7d9adec217a908cb04879f4f55684064b77f2dfb1d8bddca82fd80c60f400694c7348c410cd05
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-vcs/cvs2cl/cvs2cl-2.71.ebuild b/dev-vcs/cvs2cl/cvs2cl-2.71.ebuild
new file mode 100644
index 000000000000..671a926deecd
--- /dev/null
+++ b/dev-vcs/cvs2cl/cvs2cl-2.71.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="produces a GNU-style ChangeLog for CVS-controlled sources"
+HOMEPAGE="http://www.red-bean.com/cvs2cl/"
+SRC_URI="mirror://gentoo/${P}.pl.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+S=${WORKDIR}
+
+maint_pkg_create() {
+	set -x
+	wget http://www.red-bean.com/cvs2cl/${PN}.pl
+	mv ${PN}.pl ${P}.pl
+	bzip2 ${P}.pl
+	ls -l ${PWD}/${P}.pl.bz2
+	set +x
+}
+#pkg_setup() { maint_pkg_create; }
+
+src_install() {
+	newbin ${P}.pl ${PN} || die
+}
diff --git a/dev-vcs/cvs2cl/metadata.xml b/dev-vcs/cvs2cl/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/dev-vcs/cvs2cl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/cvs2svn-2.4.0-r1 b/dev-vcs/cvs2svn-2.4.0-r1
deleted file mode 100644
index d472a4a574b5..000000000000
--- a/dev-vcs/cvs2svn-2.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-vcs/subversion-1.0.9 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Convert a CVS repository to a Subversion repository
-EAPI=6
-HOMEPAGE=http://cvs2svn.tigris.org/
-IUSE=bazaar git test python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) git? ( >=dev-vcs/git-1.5.4.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-vcs/rcs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49237/cvs2svn-2.4.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=671ca4adbb4f0eddd87446b9f42f504d
diff --git a/dev-vcs/cvs2svn/Manifest b/dev-vcs/cvs2svn/Manifest
new file mode 100644
index 000000000000..8ff71e44630d
--- /dev/null
+++ b/dev-vcs/cvs2svn/Manifest
@@ -0,0 +1,3 @@
+DIST cvs2svn-2.4.0.tar.gz 514891 BLAKE2B 0dd0d15ab28f96e56854295a789284a00ad8d172dbd849068fb05811a728f854d83b52856b6254ee0ac947425d972fb810b627aab95116040d4370bb98de6e0c SHA512 726fb8a3b3261eeb6d8097973f2741aa7a433f847bcef6701a6c0b7dc3d8fb5da1726e40f008d1dffac71791b953ddb9ade5db5809c98731d78e94da6465506a
+EBUILD cvs2svn-2.4.0-r1.ebuild 1237 BLAKE2B 30cb1d0e16bd9387d7ef37a6cbc99d49f9baad810c9a974fd493dfbb7b4f17a31fe8b612342a977764aec37bd2dca1307ffff1be820e0e810ba0b13bb81f7e38 SHA512 a8878f95cd16ed0d28f52dd5f6c2709e5cf6f4f1d5a1c14b002f8dee0d6c6800328c53860a1e60fa05af60a6c2a18dc1da6866a217bba874eec417ac446b9fc6
+MISC metadata.xml 282 BLAKE2B 19bc0e385352904411b33830410bfc0a9a9c2b67c37b253f7c336dd455d413d34fd89569430a4016e4bef1660b9b710e6c08fb192584915fcf911b15593cf694 SHA512 165091ed860bbc62f00932c46e6d4944fe7444ac8bdfd1014a9781b8769d1a9d234578937b63ac7b90bdd8f57b21de50f74e759a44fa2b2d1e8edd854aa17ae3
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..bfdeb720bee4
--- /dev/null
+++ b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+FILEVER="49237"
+
+DESCRIPTION="Convert a CVS repository to a Subversion repository"
+HOMEPAGE="http://cvs2svn.tigris.org/"
+SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/${FILEVER}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="bazaar git test"
+
+DEPEND=">=dev-vcs/subversion-1.0.9"
+RDEPEND="${DEPEND}
+	bazaar? ( >=dev-vcs/bzr-1.13[${PYTHON_USEDEP}] )
+	git? ( >=dev-vcs/git-1.5.4.4[${PYTHON_USEDEP}] )
+	dev-vcs/rcs"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	python_fix_shebang .
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake man
+}
+
+src_install() {
+	distutils-r1_src_install
+	insinto "/usr/share/${PN}"
+	doins -r contrib cvs2{svn,git,bzr}-example.options
+	doman *.1
+}
+
+python_test() {
+	# Need this because subversion is localized, but the tests aren't
+	export LC_ALL=C
+	"${PYTHON}" -W ignore run-tests.py
+}
+
+pkg_postinst() {
+	elog "Additional scripts and examples have been installed to:"
+	elog "  /usr/share/${PN}/"
+}
diff --git a/dev-vcs/cvs2svn/metadata.xml b/dev-vcs/cvs2svn/metadata.xml
new file mode 100644
index 000000000000..3531d7d2985b
--- /dev/null
+++ b/dev-vcs/cvs2svn/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<use>
+  <flag name="bazaar">Support for dev-vcs/bzr</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-vcs/cvsd-1.0.17 b/dev-vcs/cvsd-1.0.17
deleted file mode 100644
index 280282bd699e..000000000000
--- a/dev-vcs/cvsd-1.0.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=>=dev-vcs/cvs-1.11.6 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-DESCRIPTION=CVS pserver daemon
-EAPI=0
-HOMEPAGE=http://ch.tudelft.nl/~arthur/cvsd/
-IUSE=tcpd
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/cvs-1.11.6 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-lang/perl-5.8.0
-SLOT=0
-SRC_URI=http://ch.tudelft.nl/~arthur/cvsd/cvsd-1.0.17.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c113daf924ed4aa406d834e79261ed03
diff --git a/dev-vcs/cvsd/Manifest b/dev-vcs/cvsd/Manifest
new file mode 100644
index 000000000000..9f666c4eb2a4
--- /dev/null
+++ b/dev-vcs/cvsd/Manifest
@@ -0,0 +1,4 @@
+AUX cvsd.rc6 373 BLAKE2B b46409472c76d0ff4374a5f47b051fdf270b1cf8b1bed582f04d75582a8c016047c5e63c4d78494c626d135a98b415c5fee565ed173442600dbd5bcf3105ddc1 SHA512 f71b01a2e5b7eb12cf0a9226015192e82253cec300a19f9841e7ad1b04210ee84532086bc8eb681ea1c4bd19fc0d38c17b365926a21fca4c2752f979759e8e5f
+DIST cvsd-1.0.17.tar.gz 247026 BLAKE2B 82162d74bf63f8eae2141c07f97bbe31a51ee8aeabcf097b2a6aa33a1dfd65aaf6c48017bc11bd6494dac8e9f4f12d9905d1f27fe11361e14910925455ee06d4 SHA512 beea48a288ff580e6cc7fdcd1997b7af01e7ea1b1c185006c92cd7758e7e557d2b1b4fc820bd03b787ebc74b5fa9ef661584d2c523480cf6418f452f5f929c9d
+EBUILD cvsd-1.0.17.ebuild 1021 BLAKE2B d84536eefd276babdd7dd9aa0520d8212008debb28239d29461ac57fc2d1321e26653f7cd00b418f1b2727b7ff75885f73fcff1fd914e4f5cb242ef6fc8ed0b6 SHA512 7261213d686acc64a5df60e00a3f4b86cfb0f8498ae488d65359fb05b740ea0181a5319423966cf0f4fa41f9efef0ccb3b1f668ef783353df3058ddee926b85c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-vcs/cvsd/cvsd-1.0.17.ebuild b/dev-vcs/cvsd/cvsd-1.0.17.ebuild
new file mode 100644
index 000000000000..aeedfa65eedc
--- /dev/null
+++ b/dev-vcs/cvsd/cvsd-1.0.17.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils user
+
+DESCRIPTION="CVS pserver daemon"
+HOMEPAGE="http://ch.tudelft.nl/~arthur/cvsd/"
+SRC_URI="http://ch.tudelft.nl/~arthur/cvsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tcpd"
+
+DEPEND=">=dev-vcs/cvs-1.11.6
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+RDEPEND="${DEPEND}
+	>=dev-lang/perl-5.8.0"
+
+pkg_setup() {
+	enewgroup cvsd
+	enewuser cvsd -1 -1 /var/lib/cvsd cvsd
+}
+
+src_compile() {
+	econf $(use_with tcpd libwrap) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dosed 's:^Repos:# Repos:g' /etc/cvsd/cvsd.conf
+	keepdir /var/lib/cvsd
+
+	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO
+
+	newinitd "${FILESDIR}/cvsd.rc6" ${PN}
+}
+
+pkg_postinst() {
+	elog "To configure cvsd please read the README in "
+	elog "/usr/share/doc/${PF}/"
+}
diff --git a/dev-vcs/cvsd/files/cvsd.rc6 b/dev-vcs/cvsd/files/cvsd.rc6
new file mode 100644
index 000000000000..63e0d2a085b0
--- /dev/null
+++ b/dev-vcs/cvsd/files/cvsd.rc6
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cvsd"
+	start-stop-daemon --start --quiet --background --exec /usr/sbin/cvsd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cvsd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/cvsd.pid
+	eend $?
+}
diff --git a/dev-vcs/cvsd/metadata.xml b/dev-vcs/cvsd/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/dev-vcs/cvsd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/cvsgraph-1.6.1 b/dev-vcs/cvsgraph-1.6.1
deleted file mode 100644
index ceec8cd9feea..000000000000
--- a/dev-vcs/cvsgraph-1.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/gd zlib? ( sys-libs/zlib ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) truetype? ( media-libs/freetype )
-DESCRIPTION=CVS/RCS repository grapher
-EAPI=0
-HOMEPAGE=http://www.akhphd.au.dk/~bertho/cvsgraph
-IUSE=gif jpeg nls png truetype zlib
-KEYWORDS=-alpha amd64 -ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/gd zlib? ( sys-libs/zlib ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) truetype? ( media-libs/freetype )
-SLOT=0
-SRC_URI=http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.6.1.tar.gz
-_md5_=7cfdeb9f3f5c3d8ed444b2de752e7c81
diff --git a/dev-vcs/cvsgraph-1.7.0 b/dev-vcs/cvsgraph-1.7.0
deleted file mode 100644
index ce5d3765f09d..000000000000
--- a/dev-vcs/cvsgraph-1.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/gd zlib? ( sys-libs/zlib ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) truetype? ( media-libs/freetype )
-DESCRIPTION=CVS/RCS repository grapher
-EAPI=0
-HOMEPAGE=http://www.akhphd.au.dk/~bertho/cvsgraph
-IUSE=gif jpeg nls png truetype zlib
-KEYWORDS=-alpha amd64 -ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/gd zlib? ( sys-libs/zlib ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) truetype? ( media-libs/freetype )
-SLOT=0
-SRC_URI=http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.7.0.tar.gz
-_md5_=0a10c4131ce9dfa2dc7d1874051b6e94
diff --git a/dev-vcs/cvsgraph/Manifest b/dev-vcs/cvsgraph/Manifest
new file mode 100644
index 000000000000..1e41f5f9d2a7
--- /dev/null
+++ b/dev-vcs/cvsgraph/Manifest
@@ -0,0 +1,5 @@
+DIST cvsgraph-1.6.1.tar.gz 114337 BLAKE2B 5cd68521e596ca610e9c9b87d6f1ad75b8e77519dcddc51a8e717a280831967021be62e8da3f872dee7911d3a5853ac328339eadeb0446262e0a8404d40a5625 SHA512 6548d43784cd6e2e85777e0158371c6332f96f72fc8d1827dcece8aa54d77139021586e468155ec003d371eaa7095cd57a5004a1ed76bc55db325c3899105e6b
+DIST cvsgraph-1.7.0.tar.gz 202678 BLAKE2B 589195f3642b0bc181a581a8f832eded3e6add44b2c9ee5c76a1a4f347384fbd59cd1f7f22c37d56810636dc13bad900bbe7973f9bfa061c37baa8becdaf35d5 SHA512 b2a5bec073e7fbba2a2b1975bb4583c8fa87d29a985b7bcedcaf556c744b822ea5ff65b5ca3c4bd6da6bb6697f5e023a7ce35cf5084f2d59fdd15297790e7aab
+EBUILD cvsgraph-1.6.1.ebuild 989 BLAKE2B 9f151ae777697e7dbff6a32b11c00369f8964cffbb4b0a588579ea053b136d0e5f2fd06ae2bcde4b5105538db87cc2d8835b60532e07175aeb8dbd308c65d9de SHA512 dc1f9f05fec2502bad47d6dc15a4095cbfeb70135f758243f11ab2ecb256d6e16ec21e0d4f9a9ead01780c2c572b685b1bd929076ea743be04b4b20e84e3b0cc
+EBUILD cvsgraph-1.7.0.ebuild 996 BLAKE2B b8b1296b3b212f429cdf8986d03aef3a44870103d816f9a341862c9d812581e399c97639ef7c6167e4769f8a4ee0acd95492393a81194877bb1424ef9fcf077a SHA512 99f8bad8da445143ac4e54e875b04357413fa3013fe8f5a510d5a2b9039d32d56ea34d428971bda2bac4ffa62ad44cc50152da986985bb78dda95e867a2bd889
+MISC metadata.xml 493 BLAKE2B 0e09276d91cc147bcb1b5eef8b13d9941cc1940a24e98413a9a5ba6d76bb98183fe55594bdfda4cb3787a73a32d893169a46924d61ea4b9030046005927d4a71 SHA512 8f12f7ce3e9039383476cb5802de8ab3e8ac01cb61ad25510e2c4e4ff3f075da0373197745365074c33fcafb33b680f121dc07a77499075e98896f8b4f5d26ba
diff --git a/dev-vcs/cvsgraph/cvsgraph-1.6.1.ebuild b/dev-vcs/cvsgraph/cvsgraph-1.6.1.ebuild
new file mode 100644
index 000000000000..564e2b19c8f7
--- /dev/null
+++ b/dev-vcs/cvsgraph/cvsgraph-1.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="CVS/RCS repository grapher"
+HOMEPAGE="http://www.akhphd.au.dk/~bertho/cvsgraph"
+SRC_URI="http://www.akhphd.au.dk/~bertho/cvsgraph/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-alpha amd64 -ia64 ppc sparc x86"
+IUSE="gif jpeg nls png truetype zlib"
+
+DEPEND="media-libs/gd
+	zlib? ( sys-libs/zlib )
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( virtual/jpeg )
+	truetype? ( media-libs/freetype )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable gif) \
+		$(use_enable png) \
+		$(use_enable jpeg) \
+		$(use_enable truetype) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	dobin cvsgraph
+	insinto /etc
+	doins cvsgraph.conf
+	doman cvsgraph.1 cvsgraph.conf.5
+	dodoc ChangeLog README contrib/*.php3
+	docinto automatic_documentation ; dodoc contrib/automatic_documentation/*
+}
diff --git a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild b/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild
new file mode 100644
index 000000000000..ada216280c8b
--- /dev/null
+++ b/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="CVS/RCS repository grapher"
+HOMEPAGE="http://www.akhphd.au.dk/~bertho/cvsgraph"
+SRC_URI="http://www.akhphd.au.dk/~bertho/cvsgraph/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-alpha amd64 -ia64 ppc sparc x86"
+IUSE="gif jpeg nls png truetype zlib"
+
+DEPEND="media-libs/gd
+	zlib? ( sys-libs/zlib )
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( virtual/jpeg )
+	truetype? ( media-libs/freetype )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable gif) \
+		$(use_enable png) \
+		$(use_enable jpeg) \
+		$(use_enable truetype) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	dobin cvsgraph
+	insinto /etc
+	doins cvsgraph.conf
+	doman cvsgraph.1 cvsgraph.conf.5
+	dodoc ChangeLog README AUTHORS contrib/*.php
+	docinto automatic_documentation ; dodoc contrib/automatic_documentation/*
+}
diff --git a/dev-vcs/cvsgraph/metadata.xml b/dev-vcs/cvsgraph/metadata.xml
new file mode 100644
index 000000000000..8c51f3e8f767
--- /dev/null
+++ b/dev-vcs/cvsgraph/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		CvsGraph is a utility to make a graphical representation of all
+		revisions and branches of a file in a CVS/RCS repository. It has been
+		inspired by the 'graph' option in WinCVS, but I could not find a
+		stand-alone version of this graph code. So, it was time to write one.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/cvsps-2.1-r1 b/dev-vcs/cvsps-2.1-r1
deleted file mode 100644
index fd9330e29ac4..000000000000
--- a/dev-vcs/cvsps-2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=sys-libs/zlib
-DESCRIPTION=Generates patchset information from a CVS repository
-EAPI=0
-HOMEPAGE=http://www.cobite.com/cvsps/
-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
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.cobite.com/cvsps/cvsps-2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79216b7c5f61c6ec18509074ae75387c
diff --git a/dev-vcs/cvsps-2.2_beta1 b/dev-vcs/cvsps-2.2_beta1
deleted file mode 100644
index 9cca57f01652..000000000000
--- a/dev-vcs/cvsps-2.2_beta1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib
-DESCRIPTION=Generates patchset information from a CVS repository
-EAPI=4
-HOMEPAGE=http://www.cobite.com/cvsps/
-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
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ea485a70d9d16157270ba83fe6326a5
diff --git a/dev-vcs/cvsps-3.13-r1 b/dev-vcs/cvsps-3.13-r1
deleted file mode 100644
index a29e472ee373..000000000000
--- a/dev-vcs/cvsps-3.13-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib app-text/asciidoc
-DESCRIPTION=Generates patchset information from a CVS repository (supports fast-import)
-EAPI=5
-HOMEPAGE=http://www.catb.org/~esr/cvsps/
-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
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-RESTRICT=test
-SLOT=3
-SRC_URI=http://www.catb.org/~esr/cvsps/cvsps-3.13.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=53043d5e2ebdafb0d6c7a8bb56c94ef4
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
new file mode 100644
index 000000000000..4efd7ec48ba9
--- /dev/null
+++ b/dev-vcs/cvsps/Manifest
@@ -0,0 +1,11 @@
+AUX cvsps-2.1-build.patch 396 BLAKE2B d75a8c98b5ecaafbc03e49b6b975d9c9c493b17ecc7205e56188d9a1b7e79b45cdf5a56bab22807ea4018eb54e27b50be13a8dd718722adc727826449c26243b SHA512 bd4e9ea02a89038e9b3d16aa075649659836d36d76145aa643008cf017fde032d66273bc4148340b1b75bfaa83830ab1381c9f9295c54915e19386538b232991
+AUX cvsps-2.1-solaris.patch 3064 BLAKE2B 0a2a9e5652953505e6a3d99412ff0472a318a442edf8624c1b961b1506b1315525d0145df80bc4cb9db92b02f9310ece10f0bab1aae3cf650dd439e32dfaa687 SHA512 b42581865d988166dd9bb6a1685feb9786c1f424f778afd795aec94f734cfd2b06955d87505c52e7d48d117c8652c7bc51730fcd4f2598acc58c810c32f6af2f
+AUX cvsps-2.2_beta1-solaris.patch 3648 BLAKE2B 0e4471b476485f0202c458cb5505636d0730689083a0be39b245856ac9f6f5e9916c4f654b1597b1a6e727e3d2e5d88f64b617e2383caba6730a7752138b5eeb SHA512 a876362b082b3a877a5ee4da7c23eab24d6f00362cd7ea33d93a71e93a185d0c30421f502d3029e493e99ef2e2ef34f0d6092f98134c3e54480e892ccaddf591
+AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a8253024f7c5b14db3d3be7d169b2e1bd487652dea56dc5bc9a963689660b7b4a059786e46dec3e6b4f48897ca SHA512 0ddc7115a0a66f418f81468230c92b17f3b7c6a38a82505de79c27764ee46ee5805ebf1d0a12360df77718cccf9bf2ac61f45b21c1cfecb7700e648ea1187e9e
+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 933 BLAKE2B 868dbeef68667a77499592c76cdf8001a4572fcfb06db4bab574df4ec6792ae2ff2f8032c76c1f110edefaba4438b688f7a76ea184f6157d786e538304ee92ec SHA512 2add6ccb4d9229b74e1a316ad03ddb68f0ab2884cadc21038ea8fcb5e60ccb2764385880bb1270e6602dfc2415af99864f48facd2b0b7670cfb750ad29dd5c4b
+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
new file mode 100644
index 000000000000..4964a62aaa1b
--- /dev/null
+++ b/dev-vcs/cvsps/cvsps-2.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils toolchain-funcs
+
+MY_P="${P/_/}"
+DESCRIPTION="Generates patchset information from a CVS repository"
+HOMEPAGE="http://www.cobite.com/cvsps/"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-solaris.patch
+	# no configure around
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e '/^LDLIBS+=/s/$/ -lsocket/' Makefile || die
+	fi
+	tc-export CC
+}
+
+src_install() {
+	dobin cvsps || die
+	doman cvsps.1
+	dodoc README CHANGELOG
+}
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
new file mode 100644
index 000000000000..6a49d259752c
--- /dev/null
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_P="${P/_beta/b}"
+DESCRIPTION="Generates patchset information from a CVS repository"
+HOMEPAGE="http://www.cobite.com/cvsps/"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1-build.patch
+	epatch "${FILESDIR}"/${P}-solaris.patch
+	# no configure around
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e '/^LDLIBS+=/s/$/ -lsocket/' Makefile || die
+	fi
+	tc-export CC
+}
+
+src_install() {
+	dobin cvsps || die
+	doman cvsps.1
+	dodoc README CHANGELOG
+}
diff --git a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild b/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
new file mode 100644
index 000000000000..dd9a9f993277
--- /dev/null
+++ b/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Generates patchset information from a CVS repository (supports fast-import)"
+HOMEPAGE="http://www.catb.org/~esr/cvsps/"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/asciidoc"
+
+RESTRICT=test # upstream does not ship tests
+
+src_prepare() {
+	local gentoo_name=${PN}-3
+
+	epatch "${FILESDIR}"/${P}-make.patch
+	mv ${PN}.asc ${gentoo_name}.asc || die
+	sed -i "s/${PN}/${gentoo_name}/g" ${gentoo_name}.asc || die
+	sed -i "s/PROG         = cvsps/PROG         = ${gentoo_name}/" Makefile || die
+
+	tc-export CC
+	export prefix="${EPREFIX}"/usr
+}
+
+src_install() {
+	default
+	dodoc README
+}
diff --git a/dev-vcs/cvsps/files/cvsps-2.1-build.patch b/dev-vcs/cvsps/files/cvsps-2.1-build.patch
new file mode 100644
index 000000000000..bcb394d5dd0b
--- /dev/null
+++ b/dev-vcs/cvsps/files/cvsps-2.1-build.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig	2008-03-24 07:16:47.000000000 -0400
++++ Makefile	2008-03-24 07:17:18.000000000 -0400
+@@ -3,6 +3,7 @@
+ CC?=gcc
+ CFLAGS?=-g -O2 -Wall 
+ CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
++LDLIBS+=-lz
+ prefix?=/usr/local
+ OBJS=\
+ 	cbtcommon/debug.o\
+@@ -21,7 +22,6 @@
+ all: cvsps
+ 
+ cvsps: $(OBJS)
+-	$(CC) -o cvsps $(OBJS) -lz
+ 
+ install:
+ 	[ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin
diff --git a/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch b/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch
new file mode 100644
index 000000000000..3e063fd9248b
--- /dev/null
+++ b/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch
@@ -0,0 +1,131 @@
+Modified version of 
+http://cvs.openpkg.org/fileview?f=openpkg-src/cvsps/cvsps.patch&v=1.13
+
+Index: cache.c
+--- cache.c.orig	2008-04-02 03:18:44 +0200
++++ cache.c	2008-04-02 09:10:25 +0200
+@@ -361,7 +361,7 @@
+ 
+     strcpy(buff, p_buff);
+ 
+-    while ((s = strsep(&p, ";")))
++    while ((s = my_strsep(&p, ";")))
+     {
+ 	char * c = strchr(s, ':');
+ 
+Index: cvs_direct.c
+--- cvs_direct.c.orig	2008-04-02 03:18:44 +0200
++++ cvs_direct.c	2008-04-02 09:10:25 +0200
+@@ -92,12 +92,12 @@
+ 
+     strcpy_a(root, p_root, PATH_MAX);
+ 
+-    tok = strsep(&p, ":");
++    tok = my_strsep(&p, ":");
+ 
+     /* if root string looks like :pserver:... then the first token will be empty */
+     if (strlen(tok) == 0)
+     {
+-	char * method = strsep(&p, ":");
++	char * method = my_strsep(&p, ":");
+ 	if (strcmp(method, "pserver") == 0)
+ 	{
+ 	    ctx = open_ctx_pserver(ctx, p);
+@@ -185,14 +185,14 @@
+ 
+     strcpy_a(root, p_root, PATH_MAX);
+ 
+-    tok = strsep(&p, ":");
++    tok = my_strsep(&p, ":");
+     if (strlen(tok) == 0 || !p)
+     {
+ 	debug(DEBUG_APPERROR, "parse error on third token");
+ 	goto out_free_err;
+     }
+ 
+-    tok2 = strsep(&tok, "@");
++    tok2 = my_strsep(&tok, "@");
+     if (!strlen(tok2) || (!tok || !strlen(tok)))
+     {
+ 	debug(DEBUG_APPERROR, "parse error on user@server in pserver");
+@@ -272,7 +272,7 @@
+     strcpy_a(root, p_root, PATH_MAX);
+ 
+     /* if there's a ':', it's remote */
+-    tok = strsep(&p, ":");
++    tok = my_strsep(&p, ":");
+ 
+     if (p)
+     {
+@@ -281,7 +281,7 @@
+ 	if (!cvs_rsh)
+ 	    cvs_rsh = "rsh";
+ 
+-	tok2 = strsep(&tok, "@");
++	tok2 = my_strsep(&tok, "@");
+ 
+ 	if (tok)
+ 	    snprintf(execcmd, PATH_MAX, "%s -l %s %s %s server", cvs_rsh, tok2, tok, cvs_server);
+@@ -776,7 +776,7 @@
+ static int parse_patch_arg(char * arg, char ** str)
+ {
+     char *tok, *tok2 = "";
+-    tok = strsep(str, " ");
++    tok = my_strsep(str, " ");
+     if (!tok)
+ 	return 0;
+ 
+@@ -796,7 +796,7 @@
+     /* see if command wants two args and they're separated by ' ' */
+     if (tok[2] == 0 && strchr("BdDFgiorVxYz", tok[1]))
+     {
+-	tok2 = strsep(str, " ");
++	tok2 = my_strsep(str, " ");
+ 	if (!tok2)
+ 	{
+ 	    debug(DEBUG_APPERROR, "diff_opts parse_error: argument %s requires two arguments", tok);
+Index: util.c
+--- util.c.orig	2008-04-02 03:18:44 +0200
++++ util.c	2008-04-02 09:10:25 +0200
+@@ -316,3 +316,31 @@
+ 	exit(1);
+     }
+ }
++
++char *my_strsep(char **stringp, const char *delim)
++{
++	char *s;
++	const char *spanp;
++	int c, sc;
++	char *tok;
++
++	if ((s = *stringp) == NULL)
++		return NULL;
++	for (tok = s;;) {
++		c = *s++;
++		spanp = delim;
++		do {
++			if ((sc = *spanp++) == c) {
++				if (c == 0)
++					s = NULL;
++				else
++					s[-1] = 0;
++				*stringp = s;
++				return tok;
++			}
++		} while (sc != 0);
++	}
++	/* NOTREACHED */
++    return NULL;
++}
++
+Index: util.h
+--- util.h.orig	2008-04-02 03:18:44 +0200
++++ util.h	2008-04-02 09:15:35 +0200
+@@ -24,5 +24,6 @@
+ void timing_stop(const char *);
+ int my_system(const char *);
+ int escape_filename(char *, int, const char *);
++char *my_strsep(char **, const char *);
+ 
+ #endif /* UTIL_H */
diff --git a/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch b/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch
new file mode 100644
index 000000000000..444ac1382a7b
--- /dev/null
+++ b/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch
@@ -0,0 +1,135 @@
+Modified version of.
+http://cvs.openpkg.org/fileview?f=openpkg-src/cvsps/cvsps.patch&v=1.13
+
+diff --git a/cache.c b/cache.c
+index 4c51cf7..2c3918d 100644
+--- a/cache.c
++++ b/cache.c
+@@ -361,7 +361,7 @@ static void parse_cache_revision(PatchSetMember * psm, const char * p_buff)
+ 
+     strcpy(buff, p_buff);
+ 
+-    while ((s = strsep(&p, ";")))
++    while ((s = my_strsep(&p, ";")))
+     {
+ 	char * c = strchr(s, ':');
+ 
+diff --git a/cvs_direct.c b/cvs_direct.c
+index e281848..5aa8f0f 100644
+--- a/cvs_direct.c
++++ b/cvs_direct.c
+@@ -92,12 +92,12 @@ CvsServerCtx * open_cvs_server(char * p_root, int compress)
+ 
+     strcpy_a(root, p_root, PATH_MAX);
+ 
+-    tok = strsep(&p, ":");
++    tok = my_strsep(&p, ":");
+ 
+     /* if root string looks like :pserver:... then the first token will be empty */
+     if (strlen(tok) == 0)
+     {
+-	char * method = strsep(&p, ":");
++	char * method = my_strsep(&p, ":");
+ 	if (strcmp(method, "pserver") == 0)
+ 	{
+ 	    ctx = open_ctx_pserver(ctx, p);
+@@ -185,14 +185,14 @@ static CvsServerCtx * open_ctx_pserver(CvsServerCtx * ctx, const char * p_root)
+ 
+     strcpy_a(root, p_root, PATH_MAX);
+ 
+-    tok = strsep(&p, ":");
++    tok = my_strsep(&p, ":");
+     if (strlen(tok) == 0 || !p)
+     {
+ 	debug(DEBUG_APPERROR, "parse error on third token");
+ 	goto out_free_err;
+     }
+ 
+-    tok2 = strsep(&tok, "@");
++    tok2 = my_strsep(&tok, "@");
+     if (!strlen(tok2) || (!tok || !strlen(tok)))
+     {
+ 	debug(DEBUG_APPERROR, "parse error on user@server in pserver");
+@@ -272,7 +272,7 @@ static CvsServerCtx * open_ctx_forked(CvsServerCtx * ctx, const char * p_root)
+     strcpy_a(root, p_root, PATH_MAX);
+ 
+     /* if there's a ':', it's remote */
+-    tok = strsep(&p, ":");
++    tok = my_strsep(&p, ":");
+ 
+     if (p)
+     {
+@@ -281,7 +281,7 @@ static CvsServerCtx * open_ctx_forked(CvsServerCtx * ctx, const char * p_root)
+ 	if (!cvs_rsh)
+ 	    cvs_rsh = "rsh";
+ 
+-	tok2 = strsep(&tok, "@");
++	tok2 = my_strsep(&tok, "@");
+ 
+ 	if (tok)
+ 	    snprintf(execcmd, PATH_MAX, "%s -l %s %s %s server", cvs_rsh, tok2, tok, cvs_server);
+@@ -776,7 +776,7 @@ void cvs_rupdate(CvsServerCtx * ctx, const char * rep, const char * file, const
+ static int parse_patch_arg(char * arg, char ** str)
+ {
+     char *tok, *tok2 = "";
+-    tok = strsep(str, " ");
++    tok = my_strsep(str, " ");
+     if (!tok)
+ 	return 0;
+ 
+@@ -796,7 +796,7 @@ static int parse_patch_arg(char * arg, char ** str)
+     /* see if command wants two args and they're separated by ' ' */
+     if (tok[2] == 0 && strchr("BdDFgiorVxYz", tok[1]))
+     {
+-	tok2 = strsep(str, " ");
++	tok2 = my_strsep(str, " ");
+ 	if (!tok2)
+ 	{
+ 	    debug(DEBUG_APPERROR, "diff_opts parse_error: argument %s requires two arguments", tok);
+diff --git a/util.c b/util.c
+index 7884c84..f3ab3a3 100644
+--- a/util.c
++++ b/util.c
+@@ -316,3 +316,31 @@ void strcpy_a(char * dst, const char * src, int n)
+ 	exit(1);
+     }
+ }
++
++char *my_strsep(char **stringp, const char *delim)
++{
++	char *s;
++	const char *spanp;
++	int c, sc;
++	char *tok;
++
++	if ((s = *stringp) == NULL)
++		return NULL;
++	for (tok = s;;) {
++		c = *s++;
++		spanp = delim;
++		do {
++			if ((sc = *spanp++) == c) {
++				if (c == 0)
++					s = NULL;
++				else
++					s[-1] = 0;
++				*stringp = s;
++				return tok;
++			}
++		} while (sc != 0);
++	}
++	/* NOTREACHED */
++    return NULL;
++}
++
+diff --git a/util.h b/util.h
+index ff2d3a0..336fd63 100644
+--- a/util.h
++++ b/util.h
+@@ -24,5 +24,6 @@ void timing_stop(const char *);
+ int my_system(const char *);
+ int escape_filename(char *, int, const char *);
+ void strcpy_a(char * dst, const char * src, int n);
++char *my_strsep(char **, const char *);
+ 
+ #endif /* UTIL_H */
diff --git a/dev-vcs/cvsps/files/cvsps-3.13-make.patch b/dev-vcs/cvsps/files/cvsps-3.13-make.patch
new file mode 100644
index 000000000000..7c96d60300a1
--- /dev/null
+++ b/dev-vcs/cvsps/files/cvsps-3.13-make.patch
@@ -0,0 +1,52 @@
+diff --git a/Makefile b/Makefile
+index 6266c9d..4f60d2f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,6 +8,9 @@ INSTALL = install
+ prefix?=/usr/local
+ target=$(DESTDIR)$(prefix)
+ 
++PROG         = cvsps
++MANPAGE      = $(PROG).1
++
+ OBJS= debug.o \
+ 	hash.o \
+ 	sio.o \
+@@ -19,12 +22,12 @@ OBJS= debug.o \
+ 	cvsclient.o \
+ 	list_sort.o
+ 
+-all: cvsps 
++all: $(PROG) $(MANPAGE)
+ 
+ deps:
+ 	makedepend -Y -I. *.c
+ 
+-cvsps: $(OBJS)
+-	$(CC) -o cvsps $(OBJS) $(LDFLAGS) $(LDLIBS)
++$(PROG): $(OBJS)
++	$(CC) -o $(PROG) $(OBJS) $(LDFLAGS) $(LDLIBS)
+ 
+ check:
+@@ -50,17 +53,17 @@ pylint:
+ .txt.html:
+ 	a2x --doctype manpage --format xhtml $*.txt
+ 
+-install: cvsps.1 all
++install: all
+ 	$(INSTALL) -d "$(target)/bin"
+ 	$(INSTALL) -d "$(target)/share/man/man1"
+-	$(INSTALL) cvsps "$(target)/bin"
+-	$(INSTALL) -m 644 cvsps.1 "$(target)/share/man/man1"
++	$(INSTALL) $(PROG) "$(target)/bin"
++	$(INSTALL) -m 644 $(MANPAGE) "$(target)/share/man/man1"
+ 
+ tags: *.c *.h
+ 	ctags *.c *.h
+ 
+ clean:
+-	rm -f cvsps *.o core tags cvsps.1 cvsps.html docbook-xsl.css
++	rm -f $(PROG) *.o core tags $(MANPAGE) cvsps.html docbook-xsl.css
+ 
+ SOURCES = Makefile *.[ch] merge_utils.sh
+ DOCS = README COPYING NEWS cvsps.asc TODO
diff --git a/dev-vcs/cvsps/metadata.xml b/dev-vcs/cvsps/metadata.xml
new file mode 100644
index 000000000000..e932cbedd7f4
--- /dev/null
+++ b/dev-vcs/cvsps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freecode">cvsps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/cvsq-0.4.4 b/dev-vcs/cvsq-0.4.4
deleted file mode 100644
index dd44b685e388..000000000000
--- a/dev-vcs/cvsq-0.4.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A tool to work offline with CVS by queuing the commits
-EAPI=0
-HOMEPAGE=http://metawire.org/~vslavik/sw/cvsq/
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=public-domain
-RDEPEND=dev-vcs/cvs app-shells/bash sys-apps/coreutils
-SLOT=0
-SRC_URI=http://metawire.org/~vslavik/sw/cvsq/download/cvsq-0.4.4.tar.gz
-_md5_=1a172c5869d5f34ed3a7f7dfd3ff851d
diff --git a/dev-vcs/cvsq/Manifest b/dev-vcs/cvsq/Manifest
new file mode 100644
index 000000000000..444a56931444
--- /dev/null
+++ b/dev-vcs/cvsq/Manifest
@@ -0,0 +1,3 @@
+DIST cvsq-0.4.4.tar.gz 3717 BLAKE2B d452c3435a839226ed148ba8ce3b3765b1174f19c3649cf69c02ffb9eaf7158c3e42382974f297ad7e8e567f2d280cd8cf6fd9414830a4ca474809b99e165d3c SHA512 137f09f42f5213853b327f23c3d23914116851b2d8d7f17752257f6ab0b2f62e4526f95b7d005fbf49746ea17591fbb38cfc58ccbe55a976b36339df13e44f8f
+EBUILD cvsq-0.4.4.ebuild 556 BLAKE2B 64c414ce4c288b8923aad27c631ddb3b1b199dd4e17c87f77b067d5b6744dbe80c77bd96bb1739ad1a9b35da88c98d638862ebf885fb9c8d453342fc8d76f2b4 SHA512 1b21b10b89de2195f38b9911a5dfed8397bef61048b526e4bc9b716e94c1463113019e02bc4a67d2cea40438de8f39bc4d4098d378e9778d82e6fc8a4fd90343
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-vcs/cvsq/cvsq-0.4.4.ebuild b/dev-vcs/cvsq/cvsq-0.4.4.ebuild
new file mode 100644
index 000000000000..ca20abaa3d63
--- /dev/null
+++ b/dev-vcs/cvsq/cvsq-0.4.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+IUSE=""
+
+DESCRIPTION="A tool to work offline with CVS by queuing the commits"
+SRC_URI="http://metawire.org/~vslavik/sw/cvsq/download/${P}.tar.gz"
+HOMEPAGE="http://metawire.org/~vslavik/sw/cvsq/"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc x86"
+
+DEPEND=""		# This is just a shell script.
+RDEPEND="dev-vcs/cvs
+		app-shells/bash
+		sys-apps/coreutils"
+
+src_install () {
+	dodir /usr/bin
+	dobin cvsq
+	dodoc README AUTHORS ChangeLog
+}
diff --git a/dev-vcs/cvsq/metadata.xml b/dev-vcs/cvsq/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/dev-vcs/cvsq/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/cvsspam-0.2.12 b/dev-vcs/cvsspam-0.2.12
deleted file mode 100644
index 80fd791f8f08..000000000000
--- a/dev-vcs/cvsspam-0.2.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Utility to send colored HTML CVS-mails
-EAPI=5
-HOMEPAGE=http://www.badgers-in-foil.co.uk/projects/cvsspam/
-IUSE=subversion
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/ruby subversion? ( dev-vcs/subversion )
-SLOT=0
-SRC_URI=http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/cvsspam-0.2.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a70a6632ab91e4eac6a86a0853a376a5
diff --git a/dev-vcs/cvsspam/Manifest b/dev-vcs/cvsspam/Manifest
new file mode 100644
index 000000000000..0476924f3cf6
--- /dev/null
+++ b/dev-vcs/cvsspam/Manifest
@@ -0,0 +1,4 @@
+AUX cvsspam-0.2.12-svn.patch 806 BLAKE2B 228b320f9e02d8d756d8b191be7f38d39be7ebe88f6da7f4956cd3ee6d5312bb750e4884b63535ba4f1a3e54fdc78ca55c23ee414d3e0f92022c77c77bed20cc SHA512 ee3092a73edae7f5ca85800206f520653dda8334ceeef745c6d0390bba747ad4a7fd8e03b39188ac2e0bf76315fa8178e9106a7ac8b68083a2a610733b5ae03c
+DIST cvsspam-0.2.12.tar.gz 83714 BLAKE2B 4c71f76a489da136fefaaf4c6735bd074f7439b709bb2b3872ccbf3dea80c366be3de3dfd3ff3c8a59162ad97a6d81a2b6b5fdc0f59562dcef78fb9cf45c146f SHA512 80786f980fe5070fff90de8e7a470cdf91ee8ddbd4c37fb1d98d0ddc042d157f2f74998962eaab1a24503b9147fae2129db35f1d505b557a8c75325d1e101bec
+EBUILD cvsspam-0.2.12.ebuild 726 BLAKE2B 846efd5036996f91c0583b2e19af9b22320b08d772661cebec6a6d1861450a385cdfdeadce9ee504de63058050fa891b0712f82a6bbc0693f0be08334ef6fc27 SHA512 820242b0488eec151d7b83b5d9adeee28c01adab12e39763df16c5f4e5ecb28418629878b2448308d89b19b68e175069f6e70fbc3c2c47bc5c77caf194ff9bb5
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/cvsspam/cvsspam-0.2.12.ebuild b/dev-vcs/cvsspam/cvsspam-0.2.12.ebuild
new file mode 100644
index 000000000000..dfded9ed2600
--- /dev/null
+++ b/dev-vcs/cvsspam/cvsspam-0.2.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Utility to send colored HTML CVS-mails"
+HOMEPAGE="http://www.badgers-in-foil.co.uk/projects/cvsspam/"
+SRC_URI="http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="subversion"
+
+RDEPEND="dev-lang/ruby
+	subversion? ( dev-vcs/subversion )
+"
+
+src_prepare() {
+	use subversion && epatch "${FILESDIR}/${P}-svn.patch"
+}
+
+src_install() {
+	dobin collect_diffs.rb
+	dobin cvsspam.rb
+	dobin record_lastdir.rb
+	insinto /etc/cvsspam
+	doins cvsspam.conf
+
+	dohtml cvsspam-doc.html
+	dodoc CREDITS TODO cvsspam-doc.pdf
+}
diff --git a/dev-vcs/cvsspam/files/cvsspam-0.2.12-svn.patch b/dev-vcs/cvsspam/files/cvsspam-0.2.12-svn.patch
new file mode 100644
index 000000000000..3278f94bc005
--- /dev/null
+++ b/dev-vcs/cvsspam/files/cvsspam-0.2.12-svn.patch
@@ -0,0 +1,30 @@
+--- cvsspam.rb.old	2006-12-02 13:36:48.000000000 -0500
++++ cvsspam.rb	2006-12-02 13:38:28.000000000 -0500
+@@ -1386,12 +1386,10 @@
+ $allTags = Hash.new
+ 
+ File.open("#{$logfile}.emailtmp", File::RDWR|File::CREAT|File::TRUNC) do |mail|
++  reader = LogReader.new($stdin)
+ 
+   $diff_output_limiter = OutputSizeLimiter.new(mail, $mail_size_limit)
+ 
+-  File.open($logfile) do |log|
+-    reader = LogReader.new(log)
+-
+     until reader.eof
+       handler = $handlers[reader.currentLineCode]
+       if handler == nil
+@@ -1399,12 +1397,11 @@
+       end
+       handler.handleLines(reader.getLines, $diff_output_limiter)
+     end
+-  end
+ 
+ end
+ 
+ if $subjectPrefix == nil
+-  $subjectPrefix = "[CVS #{Repository.array.join(',')}]"
++  $subjectPrefix = "[SVN #{Repository.array.join(',')}]"
+ end
+ 
+ if $files_in_subject
diff --git a/dev-vcs/cvsspam/metadata.xml b/dev-vcs/cvsspam/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/dev-vcs/cvsspam/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/cvsutils-0.2.5 b/dev-vcs/cvsutils-0.2.5
deleted file mode 100644
index 6a82c31934d8..000000000000
--- a/dev-vcs/cvsutils-0.2.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A small bundle of utilities to work with CVS repositories
-EAPI=0
-HOMEPAGE=http://www.red-bean.com/cvsutils/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.red-bean.com/cvsutils/releases/cvsutils-0.2.5.tar.gz
-_md5_=21d49d72fc34bbe51d274a56017137d3
diff --git a/dev-vcs/cvsutils/Manifest b/dev-vcs/cvsutils/Manifest
new file mode 100644
index 000000000000..387a4767f0c0
--- /dev/null
+++ b/dev-vcs/cvsutils/Manifest
@@ -0,0 +1,3 @@
+DIST cvsutils-0.2.5.tar.gz 79596 BLAKE2B db3a701e378892ac9986f981c5fc1f18cf1d75903741c74cbf0936682412b46c6292e00bd2962ef597c16f46fa256835b8ab5e272246ca142583ac90c6d1a459 SHA512 7ad840ebfdbc9e53bd7463bc523108381ad3d5d474e166e7dd0d8f1ffb5c6751d027d19b93743c412001ba63a60a6d4bb63a05a735d2f0b2246e14141ef638c1
+EBUILD cvsutils-0.2.5.ebuild 518 BLAKE2B 6d6f9b8741f9a1138cbc381b6985d0e5d2be4a26b247d8555c31168c5d245e7cdddc469c1b74b3eecd1774cc9e55dfc8486b47b5b42189e33fc40ef35a19a575 SHA512 d0302434d5f05931cfe8ed93a4898c1068275b817422d635cf0cef7213de53ce68eef9c59f73f171556c3d573d72102196b96399066fbda353c901c7b542a6de
+MISC metadata.xml 451 BLAKE2B 53f90d74a7d07779fa1ffce52e44d1b4b46ee65a0dd8dfd660c8693014064d770ca150dee11115ca717c3bb8a9001f4c6477cec19a83d5f188485379b6ba004f SHA512 226cedd069ebfeecf6258c413eb2315b103303fb767df8ff102b97d2ca5ff0eff838cb9c328ca96439bec2100eb3a07f59c02ef44edbf3d4d070556673d4ce59
diff --git a/dev-vcs/cvsutils/cvsutils-0.2.5.ebuild b/dev-vcs/cvsutils/cvsutils-0.2.5.ebuild
new file mode 100644
index 000000000000..d530436476eb
--- /dev/null
+++ b/dev-vcs/cvsutils/cvsutils-0.2.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="A small bundle of utilities to work with CVS repositories"
+HOMEPAGE="http://www.red-bean.com/cvsutils/"
+SRC_URI="http://www.red-bean.com/cvsutils/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README THANKS NEWS
+}
diff --git a/dev-vcs/cvsutils/metadata.xml b/dev-vcs/cvsutils/metadata.xml
new file mode 100644
index 000000000000..b29146cb7d8d
--- /dev/null
+++ b/dev-vcs/cvsutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		CVS Utilities are helpful scripts for working with CVS repositories
+		offline and online.  They include the ability to check file status,
+		"fake" include files in the repo, diff new files easily, change CVS
+		server of a repository and more.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/cvsync-2014.08.24.014706 b/dev-vcs/cvsync-2014.08.24.014706
deleted file mode 100644
index d94790b4b9ab..000000000000
--- a/dev-vcs/cvsync-2014.08.24.014706
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/zlib openssl? ( dev-libs/openssl:0= ) !openssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) mhash? ( app-crypt/mhash ) )
-DESCRIPTION=portable CVS repository synchronization utility
-EAPI=6
-HOMEPAGE=https://github.com/cvsync/cvsync
-IUSE=gcrypt mhash +openssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib openssl? ( dev-libs/openssl:0= ) !openssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) mhash? ( app-crypt/mhash ) )
-REQUIRED_USE=!openssl? ( ^^ ( gcrypt mhash ) )
-SLOT=0
-SRC_URI=mirror://gentoo/cvsync-2014.08.24.014706.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cd74f7e212df95a483e096717e169aa4
diff --git a/dev-vcs/cvsync-9999 b/dev-vcs/cvsync-9999
deleted file mode 100644
index fab00322fec2..000000000000
--- a/dev-vcs/cvsync-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/zlib openssl? ( dev-libs/openssl:0= ) !openssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) mhash? ( app-crypt/mhash ) ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=portable CVS repository synchronization utility
-EAPI=6
-HOMEPAGE=https://github.com/cvsync/cvsync
-IUSE=gcrypt mhash +openssl
-LICENSE=BSD
-RDEPEND=sys-libs/zlib openssl? ( dev-libs/openssl:0= ) !openssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) mhash? ( app-crypt/mhash ) )
-REQUIRED_USE=!openssl? ( ^^ ( gcrypt mhash ) )
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cd74f7e212df95a483e096717e169aa4
diff --git a/dev-vcs/cvsync/Manifest b/dev-vcs/cvsync/Manifest
new file mode 100644
index 000000000000..32e1102541a7
--- /dev/null
+++ b/dev-vcs/cvsync/Manifest
@@ -0,0 +1,4 @@
+DIST cvsync-2014.08.24.014706.tar.xz 94820 BLAKE2B 52453eb281571978d37aa9ef0e0e29c1b0ffdb54a7e140bfbbc0cb0ba62a1efd8464da952ab7f0bf95dcbda9ff85122c9dd852a0985e145437363c32c890ee8b SHA512 8aa05d3e2459a14e6abe48eb13b7130aa0bdba7bc9e3604b8406622541450349c233bf43f11804d3820567f882335e1079a9fb747e1d1b8a5d93325bf4e97158
+EBUILD cvsync-2014.08.24.014706.ebuild 1805 BLAKE2B 787b14910cec10309db4ccf396803479d251f98731a5c08d1a51f1f523dd0b5399b4178c274298a6c51729610f5035b18218b906c01bebdf70f7b9d9cba29352 SHA512 a8d3f143a6aa7ee3ca47c4c0f485335bee8289aefdab73a48180a9725e71f077312c4335825e961751de234a275807eb29f03924ca932a88a31c0c124d7bc3b7
+EBUILD cvsync-9999.ebuild 1805 BLAKE2B 787b14910cec10309db4ccf396803479d251f98731a5c08d1a51f1f523dd0b5399b4178c274298a6c51729610f5035b18218b906c01bebdf70f7b9d9cba29352 SHA512 a8d3f143a6aa7ee3ca47c4c0f485335bee8289aefdab73a48180a9725e71f077312c4335825e961751de234a275807eb29f03924ca932a88a31c0c124d7bc3b7
+MISC metadata.xml 495 BLAKE2B 55a80a666a24dedac76c767e48b20bbd17767ceb6d4d55df1c75a8be918febd12f412d9f61ff870825063b6c129565514189a85f1be46faef89ffe729faebb3e SHA512 1099d3e3284c73e56e4d86542f707aa58aa34620b61f0334996294b15c2a1cf772db4c4fce9b475aba7a423772dc4b2014bb22a84dd16cd0bb759fa14e60b7a3
diff --git a/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild b/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
new file mode 100644
index 000000000000..f638af4de214
--- /dev/null
+++ b/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/cvsync/cvsync.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+DESCRIPTION="portable CVS repository synchronization utility"
+HOMEPAGE="https://github.com/cvsync/cvsync"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="gcrypt mhash +openssl"
+REQUIRED_USE="!openssl? ( ^^ ( gcrypt mhash ) )"
+
+RDEPEND="sys-libs/zlib
+	openssl? ( dev-libs/openssl:0= )
+	!openssl? (
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		mhash? ( app-crypt/mhash )
+	)"
+DEPEND="${RDEPEND}"
+
+maint_pkg_create() {
+	cd "${S}"
+	local ver=$(date --date="$(git log -n1 --pretty=format:%ci HEAD)" -u "+%Y.%m.%d.%H%M%S")
+	local tar="${T}/${PN}-${ver}.tar.xz"
+	git archive --prefix "${PN}/" HEAD | xz > "${tar}" || die "creating tar failed"
+	einfo "Packaged tar now available:"
+	einfo "$(du -b "${tar}")"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		maint_pkg_create
+	else
+		default
+	fi
+}
+
+_emake() {
+	# USE flag settings are enforced by REQUIRED_USE.
+	local hash=$(usex openssl openssl $(usex gcrypt gcrypt mhash))
+
+	# Probably want to expand this at some point.
+	local host_os="Linux"
+
+	emake \
+		CC="$(tc-getCC)" \
+		ECHO="echo" \
+		TEST="test" \
+		INSTALL="install" \
+		HASH_TYPE="${hash}" \
+		HOST_OS="${host_os}" \
+		BINOWN="$(id -u)" \
+		BINGRP="$(id -g)" \
+		BINDIR="\$(PREFIX)/usr/bin" \
+		MANDIR="\$(PREFIX)/usr/share/man" \
+		"$@"
+}
+
+src_compile() {
+	_emake PREFIX="${EPREFIX}"
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	_emake PREFIX="${ED}" install
+	dodoc samples/*.conf
+}
diff --git a/dev-vcs/cvsync/cvsync-9999.ebuild b/dev-vcs/cvsync/cvsync-9999.ebuild
new file mode 100644
index 000000000000..f638af4de214
--- /dev/null
+++ b/dev-vcs/cvsync/cvsync-9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/cvsync/cvsync.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+DESCRIPTION="portable CVS repository synchronization utility"
+HOMEPAGE="https://github.com/cvsync/cvsync"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="gcrypt mhash +openssl"
+REQUIRED_USE="!openssl? ( ^^ ( gcrypt mhash ) )"
+
+RDEPEND="sys-libs/zlib
+	openssl? ( dev-libs/openssl:0= )
+	!openssl? (
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		mhash? ( app-crypt/mhash )
+	)"
+DEPEND="${RDEPEND}"
+
+maint_pkg_create() {
+	cd "${S}"
+	local ver=$(date --date="$(git log -n1 --pretty=format:%ci HEAD)" -u "+%Y.%m.%d.%H%M%S")
+	local tar="${T}/${PN}-${ver}.tar.xz"
+	git archive --prefix "${PN}/" HEAD | xz > "${tar}" || die "creating tar failed"
+	einfo "Packaged tar now available:"
+	einfo "$(du -b "${tar}")"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		maint_pkg_create
+	else
+		default
+	fi
+}
+
+_emake() {
+	# USE flag settings are enforced by REQUIRED_USE.
+	local hash=$(usex openssl openssl $(usex gcrypt gcrypt mhash))
+
+	# Probably want to expand this at some point.
+	local host_os="Linux"
+
+	emake \
+		CC="$(tc-getCC)" \
+		ECHO="echo" \
+		TEST="test" \
+		INSTALL="install" \
+		HASH_TYPE="${hash}" \
+		HOST_OS="${host_os}" \
+		BINOWN="$(id -u)" \
+		BINGRP="$(id -g)" \
+		BINDIR="\$(PREFIX)/usr/bin" \
+		MANDIR="\$(PREFIX)/usr/share/man" \
+		"$@"
+}
+
+src_compile() {
+	_emake PREFIX="${EPREFIX}"
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	_emake PREFIX="${ED}" install
+	dodoc samples/*.conf
+}
diff --git a/dev-vcs/cvsync/metadata.xml b/dev-vcs/cvsync/metadata.xml
new file mode 100644
index 000000000000..225b13769bab
--- /dev/null
+++ b/dev-vcs/cvsync/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for hash functions.</flag>
+	<flag name="mhash">Use <pkg>app-crypt/mhash</pkg> for hash functions.</flag>
+	<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hash functions.</flag>
+</use>
+<upstream>
+	<remote-id type="github">cvsync/cvsync</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/darcs-2.10.1 b/dev-vcs/darcs-2.10.1
deleted file mode 100644
index 68b4b96b6f57..000000000000
--- a/dev-vcs/darcs-2.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/dataenc-0.11:=[profile?] <dev-haskell/dataenc-0.15:=[profile?] >=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.5:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libiconv >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] curl? ( net-misc/curl ) diff? ( dev-haskell/lcs:=[profile?] ) http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.3:=[profile?] network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.10 dev-lang/ghc test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9 >=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7 >=dev-haskell/split-0.1.4.1 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=a distributed, interactive, smart revision control system
-EAPI=5
-HOMEPAGE=http://darcs.net/
-IUSE=+curl diff +http +network-uri +terminfo +threaded doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/dataenc-0.11:=[profile?] <dev-haskell/dataenc-0.15:=[profile?] >=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.5:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libiconv >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] curl? ( net-misc/curl ) diff? ( dev-haskell/lcs:=[profile?] ) http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.3:=[profile?] network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-RESTRICT=test
-SLOT=0/2.10.1
-SRC_URI=mirror://hackage/packages/archive/darcs/2.10.1/darcs-2.10.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=75939d8111cb99b00ef692e3751cafd7
diff --git a/dev-vcs/darcs-2.10.3-r1 b/dev-vcs/darcs-2.10.3-r1
deleted file mode 100644
index aedbbf584ce3..000000000000
--- a/dev-vcs/darcs-2.10.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] >=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libiconv >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] curl? ( net-misc/curl ) diff? ( dev-haskell/lcs:=[profile?] ) http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.4:=[profile?] network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9 >=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7 >=dev-haskell/split-0.1.4.1 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=a distributed, interactive, smart revision control system
-EAPI=5
-HOMEPAGE=http://darcs.net/
-IUSE=+curl diff +http +network-uri +terminfo +threaded doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] >=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libiconv >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] curl? ( net-misc/curl ) diff? ( dev-haskell/lcs:=[profile?] ) http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.4:=[profile?] network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-RESTRICT=test
-SLOT=0/2.10.3
-SRC_URI=mirror://hackage/packages/archive/darcs/2.10.3/darcs-2.10.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7a01821eb140c6927318921dcb59917b
diff --git a/dev-vcs/darcs-2.12.0 b/dev-vcs/darcs-2.12.0
deleted file mode 100644
index 26283aa2279b..000000000000
--- a/dev-vcs/darcs-2.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0.0.5:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.9 >=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7 >=dev-haskell/split-0.2.2 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=a distributed, interactive, smart revision control system
-EAPI=6
-HOMEPAGE=http://darcs.net/
-IUSE=+curl +network-uri +terminfo +threaded doc hscolour profile test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0.0.5:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-RESTRICT=test
-SLOT=0/2.12.0
-SRC_URI=mirror://hackage/packages/archive/darcs/2.12.0/darcs-2.12.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aff9df09fb7c27b2874447d779359a5d
diff --git a/dev-vcs/darcs-2.12.4 b/dev-vcs/darcs-2.12.4
deleted file mode 100644
index ede62b7bc74f..000000000000
--- a/dev-vcs/darcs-2.12.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.10.1:= curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.10 >=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7 >=dev-haskell/split-0.2.2 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=a distributed, interactive, smart revision control system
-EAPI=6
-HOMEPAGE=http://darcs.net/
-IUSE=+curl +network-uri +terminfo +threaded doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.10.1:= curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-SLOT=0/2.12.4
-SRC_URI=mirror://hackage/packages/archive/darcs/2.12.4/darcs-2.12.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ddbec702c43500309fc3a3a33cf48eb2
diff --git a/dev-vcs/darcs-2.12.5 b/dev-vcs/darcs-2.12.5
deleted file mode 100644
index 5381ffa5f90c..000000000000
--- a/dev-vcs/darcs-2.12.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.10.1:= curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6 >=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.10 >=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7 >=dev-haskell/split-0.2.2 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=a distributed, interactive, smart revision control system
-EAPI=6
-HOMEPAGE=http://darcs.net/
-IUSE=+curl +network-uri +terminfo +threaded doc hscolour profile test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.10.1:= curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-SLOT=0/2.12.5
-SRC_URI=mirror://hackage/packages/archive/darcs/2.12.5/darcs-2.12.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bd4c16284cc7f2419ed55b0729bb54df
diff --git a/dev-vcs/darcs-2.8.4-r6 b/dev-vcs/darcs-2.8.4-r6
deleted file mode 100644
index 6259a350b5ea..000000000000
--- a/dev-vcs/darcs-2.8.4-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND==dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/hashed-storage-0.5.6:=[profile?] <dev-haskell/hashed-storage-0.6:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] =dev-haskell/html-1.0*:=[profile?] =dev-haskell/mmap-0.5*:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] =dev-haskell/random-1.0*:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/tar-0.3:=[profile?] <dev-haskell/tar-0.5:=[profile?] >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-haskell/zlib-0.5.1.0:=[profile?] <dev-haskell/zlib-0.6.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= net-misc/curl >=dev-haskell/cabal-1.8 doc? ( virtual/latex-base || ( dev-tex/latex2html[png] dev-tex/latex2html[gif] ) ) test? ( >=dev-haskell/cmdlib-0.2.1[profile?] <dev-haskell/cmdlib-0.4[profile?] =dev-haskell/findbin-0.0*[profile?] >=dev-haskell/quickcheck-2.3 >=dev-haskell/shellish-0.1.3[profile?] <dev-haskell/shellish-0.2[profile?] >=dev-haskell/test-framework-0.4.0[profile?] >=dev-haskell/test-framework-hunit-0.2.2[profile?] >=dev-haskell/test-framework-quickcheck2-0.2.8[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=a distributed, interactive, smart revision control system
-EAPI=5
-HOMEPAGE=http://darcs.net/
-IUSE=doc test doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND==dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/hashed-storage-0.5.6:=[profile?] <dev-haskell/hashed-storage-0.6:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] =dev-haskell/html-1.0*:=[profile?] =dev-haskell/mmap-0.5*:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] =dev-haskell/random-1.0*:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/tar-0.3:=[profile?] <dev-haskell/tar-0.5:=[profile?] >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-haskell/zlib-0.5.1.0:=[profile?] <dev-haskell/zlib-0.6.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= net-misc/curl
-SLOT=0/2.8.4
-SRC_URI=mirror://hackage/packages/archive/darcs/2.8.4/darcs-2.8.4.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=883d7123a6063693de9143fb85d19332
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
new file mode 100644
index 000000000000..5ff30d5a2886
--- /dev/null
+++ b/dev-vcs/darcs/Manifest
@@ -0,0 +1,19 @@
+AUX darcs-2.12.4-ghc-8.0.2_rc1.patch 540 BLAKE2B 559776da5ac9852ffde22e5f8c890ab585aa1ec7a0a63731b08c89cb12c4c170d62c6e3270afd39dd1338a7f69f657d60234c462a8e8259f895252fce92dfe97 SHA512 455b8c3b70c78eb8f59d9792b299d5d610079fef2f72090e6eb1b26fc3b97a9e6800187e73f5be17fe0d8623b4ad6e946419ceca7971590d16d42ddcb673cab4
+AUX darcs-2.8.4-fix-nonatomic-global.patch 837 BLAKE2B ae57ecf0b9a7e5947615636ddd8139c439cced522faecc653bc140fb590c065fbf6ea52c9886fa5cce92badf9a8aac48051fe36f845de4a4b7c7f0049bb0a755 SHA512 98c05960d2c5d74df7c934fc6d94f1f8367e04b07ad6189004d09ce190e9bb1799cf7cd43387dad8bc15230dbebd06ccc874e81460119c3d7b959c761e359825
+AUX darcs-2.8.4-ghc-7.8-part-1.patch 5679 BLAKE2B cbb14af7f68b362744f873859cc95184211876eedf89d34e6f5183479b51a3467b5424cc7ba36fffeecb3c61ea7fb5b87f4eadcaba7d7c3839ac17930765b51c SHA512 9c6674e835227cae04074f82777a08e7b1cedc6b42deff7c271c53e2622b14217926a52ccba7651e3b7e0cfd40e0243e10529141ceae9044895d021af8ee1599
+AUX darcs-2.8.4-ghc-7.8-part-2.patch 449 BLAKE2B b88a4334d02dfb558b9284b6396555fed7df81cd0c6769172b3a4fea6d445bd462be1687184b0b4cc553ba75283a36f7b9ae9f2c486218c4fc189e9794eae9b3 SHA512 3dd469ea3f42f2b2c5388a9a47cdd4c901af2b663c8c1cb5ae75c595915e141652d3fe9f89b898483c06d3ee9b2d7df651b401e215b8aac0c1431b6e17639e41
+AUX darcs-2.8.4-issue2364-part-2.patch 1787 BLAKE2B 64949cae0931e55b06d3ec6923e390d6058166393e92dcd73b6452f7fc33623b85e96d1fc8223b38ca4d160a713c66e8ea20baf524e6a024e748e03385396e24 SHA512 54594052d5492d98472da7aee611314bd08e3dfd3bfbe55b082cf3071048b4a066ddcdbbf445be6774255f406c8f67a6c9a76e536817354b89902ee30eeed02b
+AUX darcs-2.8.4-issue2364.patch 2955 BLAKE2B 3d129b192ebf90688c4bf2501b7e90fdb86be23d6bd0bc5e807f167dc120e61791d5f25311421553135e676338e95af4cba5cbdee2a5a35fffb43abd804aa9d9 SHA512 01c70841c53bfdc8d047bd91609a30e37dee9def3c52930709a990ad4918461f01d5467ff9a0c0771def5151fdc5198c9a883c2f25ff2a16be756f60029f1e2e
+DIST darcs-2.10.1.tar.gz 1509208 BLAKE2B 54df9e87ab5b4d49146eeaad99c4718cc38b6fb032da2fb005c1ddc8a6d5ffa725b9c7caac30eb4da394bfb0926ba76040e24a69beeacd25e810cad8987d34f3 SHA512 b8c3971da3d635a7d90e35226c2ffa6d6ca8e78ba18793c632b7509bc4d52c1bda2490d147cdaea5842fbe5d8826b0025de61e2fb4f58c441875c5858d910e47
+DIST darcs-2.10.3.tar.gz 1513296 BLAKE2B 4a900a4307f1067cb078396f28358f75107821a67104ec91653cdc0ae1c5503fd18baa3d0ae95a0476fa5917345de932411053d35d8f0cfee3782cdd84a13c7e SHA512 cf8f34df331d8a47c6a25775c465824e5d71ed00ae6bc477989b4bb0e7fad606b213a4fb4e06b02dca096df2b6b1fe36f394672a112b48c6b56188a7eae8f90e
+DIST darcs-2.12.0.tar.gz 1465730 BLAKE2B a021796aefc38aaf355a3156f26c8f313ffbe44ad5e9172883217f609c73baed49301a26bbc818574175c0e7174ad6401407ae9492584e3aed56e8fb2bf10f7a SHA512 654f9054dfe8e23e17ae00cdf22153ddaf89d114c5ee0e1ca86f373c1abf62b7bd808965f4d4df695aaba44d1d334d725cc0d57dea5df7cd1992a0ef15e49135
+DIST darcs-2.12.4.tar.gz 1462383 BLAKE2B 49827a07770da8253775649e9a72b33d4e715f7eae63c093c6d3a16f097cd9f3246e2aec4ee4782efd1629423a3d3a23d6d5350131ed4daa4fc47701fd6449ae SHA512 52a0b9b8a23b05dc29513c20c3c0fdc0b696da87156ea83a5736ea294618b993d1f3914f82a918e331db5de0746c147244f46d396ee7dbb02fee116825e1dd6a
+DIST darcs-2.12.5.tar.gz 1460698 BLAKE2B 9050b5863221d2c82e93d689b733b34a0b63fd0e7f29b0041ba3ff10e4359e4d32e1c8bca5ac4722a65fbebab66b25cba443efe23ee3e4a87d4117a7335db4de SHA512 9bda8149269dc23750321f3929e156e32c76de4f5bb8291bc248d0e326bf08b69c82ef7383f9d02dcc65ca199078f6e1ab575197fc2aee225486a8c1b9275542
+DIST darcs-2.8.4.tar.gz 1301464 BLAKE2B 748494ae1c34318c14e128a4d08667b839644dbcf2b2d8bbcc86263ee5332f859f91bc2a56f3c6ccf6a465f45a90d97d304c9c15ebdd3cdd709c251c61c15a6c SHA512 c60531bacea43bdd5a18ae461dd390fe64682cac56fa4e6b5153a5da3c003b59d8fb24827bd42b4b30f0d2c61877d36b58eb98317644f9f8a200ab7c5961c48e
+EBUILD darcs-2.10.1.ebuild 4718 BLAKE2B 0f818eeaa81699cf527ea3d9178055eb6459af4185cf89520ee6f6241dcf995518fd11acc7473658d20e5453d629c680c82088a2d9a0d505db6b695705e6bd49 SHA512 def0e14e55a47d37ba3a930d31f89ce952094b06b0ff945c4d927e353684885142d2cca0df635c6b560a6d587e8c66637c2846eb6eb56e8587337425f8e00e8d
+EBUILD darcs-2.10.3-r1.ebuild 4808 BLAKE2B 18cde1ea42d8e9b5337a54cebc3c28f5db6268f6d6f7ad5c2502fd3eb43f446e65c0ebc42add5fee7f746a38015a6222839874afa824e56d853ea494b3ed5ba2 SHA512 7591fca5a971792ead68bcc5ed0e60e7bd5dab9c88910fa76d286c3b4db08117e1a288b2518621a4834522f6089307bed7628c709aafd1929e81d3f28b2cc3a0
+EBUILD darcs-2.12.0.ebuild 4848 BLAKE2B 0d383975d11f05a84f92c1d979c022dd4782d6580e3afa8ad8488c2df4a4baa27e0603981fcdd6a56b0862447aed13fa2e7bfa44eb9869b6ebf9e0ecfe5f200c SHA512 b33bd6342fc307ebbf7fe6ee4494afcf06cd6a13ae5355269728e0bda5cd2779c877cdf8795b308aa838d5095bfe406d098a86ffef217ad943601ef2d872fdaf
+EBUILD darcs-2.12.4.ebuild 4485 BLAKE2B 97b418af61478c458081a634448b4cd4457fbd29ebd52fc8d844924e3f095f598a85d7c7afeb3ff7c7e394b9969d2caafcf3d90d1e2208ad632b0796104af0b9 SHA512 01cf2fbbbc9d72093cd7e5dc00ed120e7a7c24e0e94746dc8a3daeaac7c699ba28c61d7b1459198e35789e37ec302dfd0378e9093857ed6eca6075159d977dd9
+EBUILD darcs-2.12.5.ebuild 4539 BLAKE2B 21e9618f2a46848d5613c430a8de8edbf10559d57003776dcda4fe444bf2782d80edfbeecd3b355b6fec2d1e767bb94a4662f6a0ef8b36cd9ffb96d90bbe3724 SHA512 14224e9130171d617552257bdaf0c6f0b6918bfcedc84047202726eb377e7bf92ac0e6468d63d7db3b1526af09d381dbf1d84a2b575bc08a379bc5f30cb6059d
+EBUILD darcs-2.8.4-r6.ebuild 4727 BLAKE2B a29e103c6a5bb7695f150516ec7259b88a63b68ad5eb48adeb0b606c409d68987c98522cecfd8bdf29f96dc1f82abc4298e3a86800c5b58167941de62ff725d9 SHA512 9f866150888280f6b12ccc6f714a04f6789cc84d34ed982e84d365abb5a3e6c97dfcc981141675ea7ed45bf1a8f5940fd9abc138c1dce6ecaaa8faf99a8606ec
+MISC metadata.xml 593 BLAKE2B c4ab655306f001cc3fe3007152e25d32d97fd3a87db76051c6c75b1d53c2c6ebd2105b2674bea5872e678b577c3cca737a3bbf6fe89923bc4f780ea2dc8642fc SHA512 cab7d36edce3f7da1742ebf086f69468f2745cb58fae83e74fa3e6016f4a7285aaa57100fed17df47940a51029ea78892147b7fe86ef2e456b7e34cc34a421bd
diff --git a/dev-vcs/darcs/darcs-2.10.1.ebuild b/dev-vcs/darcs/darcs-2.10.1.ebuild
new file mode 100644
index 000000000000..74d9bedab0db
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.10.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl diff +http +network-uri +terminfo +threaded"
+
+RESTRICT=test # missing file 'tests/bin/renameHelper.hs'
+
+RDEPEND=">=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/dataenc-0.11:=[profile?] <dev-haskell/dataenc-0.15:=[profile?]
+	>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
+	>=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.5:=[profile?]
+	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
+	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
+	>=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	virtual/libiconv
+	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	curl? ( net-misc/curl )
+	diff? ( dev-haskell/lcs:=[profile?] )
+	http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+		network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+				>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+		!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) )
+	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	dev-lang/ghc
+	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
+		>=dev-haskell/split-0.1.4.1 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		$(cabal_flag diff hashed-storage-diff) \
+		--flag=-hpc \
+		$(cabal_flag http http) \
+		--flag=library \
+		$(cabal_flag network-uri network-uri) \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	# fixup perms in such an an awkward way
+	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+	doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+}
diff --git a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
new file mode 100644
index 000000000000..1006022a8160
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl diff +http +network-uri +terminfo +threaded"
+
+RESTRICT=test # occasionally hangs on directory creation race conditions
+
+RDEPEND=">=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
+	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
+	>=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?]
+	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
+	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3:=[profile?]
+	>=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	virtual/libiconv
+	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	curl? ( net-misc/curl )
+	diff? ( dev-haskell/lcs:=[profile?] )
+	http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+		network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+				>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+		!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) )
+	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.4
+		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
+		>=dev-haskell/split-0.1.4.1 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'base >= 4.5 && < 4.9' 'base >= 4.5' \
+		'zip-archive  >= 0.2.3 && < 0.3' 'zip-archive  >= 0.2.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		$(cabal_flag diff hashed-storage-diff) \
+		--flag=-hpc \
+		$(cabal_flag http http) \
+		--flag=library \
+		$(cabal_flag network-uri network-uri) \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	# fixup perms in such an an awkward way
+	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+	doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+}
diff --git a/dev-vcs/darcs/darcs-2.12.0.ebuild b/dev-vcs/darcs/darcs-2.12.0.ebuild
new file mode 100644
index 000000000000..f7e328a92b90
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.12.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="+curl +network-uri +terminfo +threaded"
+
+RESTRICT=test # occasionally hangs on directory creation race conditions
+
+RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
+	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
+	>=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?]
+	>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
+	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.5:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?]
+	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
+	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-7.6.2:=
+	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	curl? ( net-misc/curl )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
+		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		--flag=-hpc \
+		--flag=http \
+		--flag=library \
+		$(cabal_flag network-uri network-uri) \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	# fixup perms in such an an awkward way
+	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+	doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+}
diff --git a/dev-vcs/darcs/darcs-2.12.4.ebuild b/dev-vcs/darcs/darcs-2.12.4.ebuild
new file mode 100644
index 000000000000..bd27cb3592a7
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.12.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl +network-uri +terminfo +threaded"
+
+RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
+	>=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?]
+	>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
+	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?]
+	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
+	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	curl? ( net-misc/curl )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.10
+		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
+		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		--flag=-hpc \
+		--flag=http \
+		--flag=library \
+		$(cabal_flag network-uri network-uri) \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	# fixup perms in such an an awkward way
+	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+	doman "${S}/darcs.1"
+}
diff --git a/dev-vcs/darcs/darcs-2.12.5.ebuild b/dev-vcs/darcs/darcs-2.12.5.ebuild
new file mode 100644
index 000000000000..df94ced13860
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.12.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="+curl +network-uri +terminfo +threaded"
+
+RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
+	>=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?]
+	>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
+	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?]
+	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
+	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	curl? ( net-misc/curl )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6
+		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.10
+		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
+		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+PATCHES=("${FILESDIR}"/${PN}-2.12.4-ghc-8.0.2_rc1.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		--flag=-hpc \
+		--flag=http \
+		--flag=library \
+		$(cabal_flag network-uri network-uri) \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	# fixup perms in such an an awkward way
+	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+	doman "${S}/darcs.1"
+}
diff --git a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
new file mode 100644
index 000000000000..d16e80cbb5f6
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit eutils haskell-cabal bash-completion-r1
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="=dev-haskell/extensible-exceptions-0.1*:=[profile?]
+		>=dev-haskell/hashed-storage-0.5.6:=[profile?]
+		<dev-haskell/hashed-storage-0.6:=[profile?]
+		>=dev-haskell/haskeline-0.6.3:=[profile?]
+		<dev-haskell/haskeline-0.8:=[profile?]
+		=dev-haskell/html-1.0*:=[profile?]
+		=dev-haskell/mmap-0.5*:=[profile?]
+		>=dev-haskell/mtl-1.0:=[profile?]
+		<dev-haskell/mtl-2.3:=[profile?]
+		>=dev-haskell/parsec-2.0:=[profile?]
+		<dev-haskell/parsec-3.2:=[profile?]
+		=dev-haskell/random-1.0*:=[profile?]
+		>=dev-haskell/regex-compat-0.95.1:=[profile?]
+		>=dev-haskell/tar-0.3:=[profile?]
+		<dev-haskell/tar-0.5:=[profile?]
+		>=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?]
+		>=dev-haskell/text-0.11.0.6:=[profile?]
+		>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
+		>=dev-haskell/vector-0.7:=[profile?]
+		>=dev-haskell/zlib-0.5.1.0:=[profile?]
+		<dev-haskell/zlib-0.6.0.0:=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		net-misc/curl"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		doc? ( virtual/latex-base
+			|| (	dev-tex/latex2html[png]
+				dev-tex/latex2html[gif]
+			)
+		)
+		test? ( >=dev-haskell/cmdlib-0.2.1[profile?]
+				<dev-haskell/cmdlib-0.4[profile?]
+				=dev-haskell/findbin-0.0*[profile?]
+				>=dev-haskell/quickcheck-2.3
+				>=dev-haskell/shellish-0.1.3[profile?]
+				<dev-haskell/shellish-0.2[profile?]
+				>=dev-haskell/test-framework-0.4.0[profile?]
+				>=dev-haskell/test-framework-hunit-0.2.2[profile?]
+				>=dev-haskell/test-framework-quickcheck2-0.2.8[profile?]
+		)
+		"
+
+src_prepare() {
+	rm "${S}/tests/add_permissions.sh" || die "Could not rm add_permissions.sh"
+	rm "${S}/tests/send-output-v1.sh" || die "Could not rm send-output-v1.sh"
+	rm "${S}/tests/send-output-v2.sh" || die "Could not rm send-output-v2.sh"
+	rm "${S}/tests/utf8.sh" || die "Could not rm utf8.sh"
+
+	epatch "${FILESDIR}"/${P}-ghc-7.8-part-1.patch
+	epatch "${FILESDIR}"/${P}-ghc-7.8-part-2.patch
+	epatch "${FILESDIR}"/${P}-fix-nonatomic-global.patch
+	epatch "${FILESDIR}"/${P}-issue2364.patch
+	epatch "${FILESDIR}"/${P}-issue2364-part-2.patch
+
+	cabal_chdeps \
+		'text       >= 0.11.0.6 && < 0.12.0.0' 'text       >= 0.11.0.6' \
+		'terminfo == 0.3.*' 'terminfo >= 0.3 && < 0.5' \
+		'array      >= 0.1 && < 0.5' 'array >= 0.1 && <0.6' \
+		'process    >= 1.0.0.0 && < 1.2.0.0' 'process    >= 1.0.0.0 && < 1.3' \
+		'unix >= 1.0 && < 2.7' 'unix >=1.0 && <2.8' \
+		'base >= 4.5 && < 4.7' 'base >= 4.5 && < 4.8' \
+		'ghc >= 6.10 && < 7.8' 'ghc >= 6.10' \
+		'mtl          >= 1.0 && < 2.2' 'mtl          >= 1.0 && < 2.3'
+}
+
+src_configure() {
+	# checking whether ghc supports -threaded flag
+	# Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker
+	# contains: 'The ability to make a foreign call that does not block all other Haskell threads.'
+	# It might have interactivity impact.
+
+	threaded_flag=""
+	if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then
+		threaded_flag="--flags=threaded"
+		einfo "$P will be built with threads support"
+	else
+		threaded_flag="--flags=-threaded"
+		einfo "$P will be built without threads support"
+	fi
+
+	# Use curl for net stuff to avoid strict version dep on HTTP and network
+	cabal_src_configure \
+		--flags=curl \
+		--flags=-http \
+		--flags=color \
+		--flags=terminfo \
+		--flags=mmap \
+		--flags=force-char8-encoding \
+		$threaded_flag \
+		$(cabal_flag test)
+}
+
+src_test() {
+	# run cabal test from haskell-cabal
+	haskell-cabal_src_test || die "cabal test failed"
+}
+
+src_install() {
+	cabal_src_install
+	newbashcomp "${S}/contrib/darcs_completion" "${PN}"
+
+	# fixup perms in such an an awkward way
+	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+	doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	ewarn "NOTE: in order for the darcs send command to work properly,"
+	ewarn "you must properly configure your mail transport agent to relay"
+	ewarn "outgoing mail.  For example, if you are using ssmtp, please edit"
+	ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site."
+}
diff --git a/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch b/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch
new file mode 100644
index 000000000000..9602d1d1ccdc
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch
@@ -0,0 +1,9 @@
+diff --git a/harness/Darcs/Test/Patch.hs b/harness/Darcs/Test/Patch.hs
+index f50f6b9..f0f4e2a 100644
+--- a/harness/Darcs/Test/Patch.hs
++++ b/harness/Darcs/Test/Patch.hs
+@@ -244,3 +244,3 @@ properties :: forall thing gen. (Show1 gen, Arbitrary (Sealed gen)) =>
+ properties gen prefix genname tests =
+-  [ cond name condition check | (name, condition, check) <- tests ]
++  [ cond name condition check | (name, condition :: TestCondition thing, check :: TestCheck thing testable) <- tests ]
+   where cond :: forall testable. Testable testable
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-fix-nonatomic-global.patch b/dev-vcs/darcs/files/darcs-2.8.4-fix-nonatomic-global.patch
new file mode 100644
index 000000000000..c3fce6fbc9e8
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.4-fix-nonatomic-global.patch
@@ -0,0 +1,20 @@
+There is a bug in speculateFileOrUrl.
+It puts downloaded file nonatomically.
+
+There is a window when copyFileOrUrl can (and does)
+copy partially downloaded file.
+
+Darcs-bug: http://bugs.darcs.net/issue2364
+diff --git a/src/Darcs/External.hs b/src/Darcs/External.hs
+index 2e0e791..d5a0b9f 100644
+--- a/src/Darcs/External.hs
++++ b/src/Darcs/External.hs
+@@ -184,7 +184,7 @@ copyFileOrUrl rd   fou out _     | isSshUrl  fou = copySSH rd (splitSshUrl fou)
+ copyFileOrUrl _    fou _   _     = fail $ "unknown transport protocol: " ++ fou
+ 
+ speculateFileOrUrl :: String -> FilePath -> IO ()
+-speculateFileOrUrl fou out | isHttpUrl fou = speculateRemote fou out
++speculateFileOrUrl fou out | isHttpUrl fou = speculateRemote fou out >> waitUrl fou
+                            | otherwise = return ()
+ 
+ copyLocal  :: String -> FilePath -> IO ()
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-1.patch b/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-1.patch
new file mode 100644
index 000000000000..3680c29b0440
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-1.patch
@@ -0,0 +1,128 @@
+diff --git a/src/Crypt/SHA256.hs b/src/Crypt/SHA256.hs
+index 69a8a4c..606f2ad 100644
+--- a/src/Crypt/SHA256.hs
++++ b/src/Crypt/SHA256.hs
+@@ -20,9 +20,10 @@ import Numeric (showHex)
+ import Foreign.C.String ( withCString )
+ import Data.ByteString.Unsafe (unsafeUseAsCStringLen)
+ import qualified Data.ByteString as B
++import qualified System.IO.Unsafe as U
+ 
+ sha256sum :: B.ByteString -> String
+-sha256sum p = unsafePerformIO $
++sha256sum p = U.unsafePerformIO $
+               withCString (take 64 $ repeat 'x') $ \digestCString ->
+               unsafeUseAsCStringLen p $ \(ptr,n) ->
+               do let digest = castPtr digestCString :: Ptr Word8
+diff --git a/src/Darcs/Commands/Get.hs b/src/Darcs/Commands/Get.hs
+index e450d28..6b51915 100644
+--- a/src/Darcs/Commands/Get.hs
++++ b/src/Darcs/Commands/Get.hs
+@@ -157,7 +157,8 @@ copyRepoAndGoToChosenVersion opts repodir rfsource = do
+   copyRepo
+   withRepository opts ((RepoJob $ \repository -> goToChosenVersion repository opts) :: RepoJob ())
+   putInfo opts $ text "Finished getting."
+-      where copyRepo =
++      where copyRepo :: IO ()
++            copyRepo =
+                 withRepository opts $ RepoJob $ \repository ->
+                   if formatHas HashedInventory rfsource
+                    then do
+diff --git a/src/Darcs/Global.hs b/src/Darcs/Global.hs
+index 9792bf0..e17f071 100644
+--- a/src/Darcs/Global.hs
++++ b/src/Darcs/Global.hs
+@@ -60,8 +60,9 @@ module Darcs.Global
+ import Control.Applicative ( (<$>), (<*>) )
+ import Control.Monad ( when )
+ import Control.Concurrent.MVar
+-import Control.Exception.Extensible ( bracket_, catch, catchJust, SomeException
+-                                    , block, unblock
++import Control.Exception.Extensible as E
++                                    ( bracket_, catch, catchJust, SomeException
++                                    , mask
+                                     )
+ import Data.IORef ( IORef, newIORef, readIORef, writeIORef )
+ import Data.IORef ( modifyIORef )
+@@ -106,12 +107,12 @@ withAtexit prog =
+         exit
+         prog
+   where
+-    exit = block $ do
++    exit = E.mask $ \restore -> do
+         Just actions <- swapMVar atexitActions Nothing
+         -- from now on atexit will not register new actions
+-        mapM_ runAction actions
+-    runAction action =
+-        catch (unblock action) $ \(exn :: SomeException) -> do
++        mapM_ (runAction restore) actions
++    runAction restore action =
++        catch (restore action) $ \(exn :: SomeException) -> do
+             hPutStrLn stderr $ "Exception thrown by an atexit registered action:"
+             hPutStrLn stderr $ show exn
+ 
+diff --git a/src/Darcs/SignalHandler.hs b/src/Darcs/SignalHandler.hs
+index ac0f526..d0ef162 100644
+--- a/src/Darcs/SignalHandler.hs
++++ b/src/Darcs/SignalHandler.hs
+@@ -26,8 +26,8 @@ import Prelude hiding ( catch )
+ import System.IO.Error ( isUserError, ioeGetErrorString, ioeGetFileName )
+ import System.Exit ( exitWith, ExitCode ( ExitFailure ) )
+ import Control.Concurrent ( ThreadId, myThreadId )
+-import Control.Exception.Extensible
+-            ( catch, throw, throwTo, block, unblock,
++import Control.Exception.Extensible as E
++            ( catch, throw, throwTo, mask,
+               Exception(..), SomeException(..), IOException )
+ import System.Posix.Files ( getFdStatus, isNamedPipe )
+ import System.Posix.IO ( stdOutput )
+@@ -128,8 +128,8 @@ catchUserErrors comp handler = catch comp handler'
+          | otherwise                             = throw ioe
+ 
+ withSignalsBlocked :: IO a -> IO a
+-withSignalsBlocked job = block (job >>= \r ->
+-                           unblock(return r) `catchSignal` couldnt_do r)
++withSignalsBlocked job = E.mask $ \restore -> (job >>= \r ->
++                           restore (return r) `catchSignal` couldnt_do r)
+     where couldnt_do r s | s == sigINT = oops "interrupt" r
+                          | s ==  sigHUP = oops "HUP" r
+                          | s ==  sigABRT = oops "ABRT" r
+diff --git a/src/Darcs/Test/Patch/Info.hs b/src/Darcs/Test/Patch/Info.hs
+index fd27fb3..b35cfef 100644
+--- a/src/Darcs/Test/Patch/Info.hs
++++ b/src/Darcs/Test/Patch/Info.hs
+@@ -28,7 +28,6 @@ import Data.Maybe ( isNothing )
+ import Data.Text as T ( find, any )
+ import Data.Text.Encoding ( decodeUtf8With )
+ import Data.Text.Encoding.Error ( lenientDecode )
+-import Foreign ( unsafePerformIO )
+ import Test.QuickCheck ( Arbitrary(arbitrary), oneof, listOf, choose, shrink
+                        , Gen )
+ import Test.Framework.Providers.QuickCheck2 ( testProperty )
+@@ -39,6 +38,8 @@ import Darcs.Patch.Info ( PatchInfo(..), patchinfo,
+                           piLog, piAuthor, piName )
+ import ByteStringUtils ( decodeLocale, packStringToUTF8, unpackPSFromUTF8 )
+ 
++import qualified System.IO.Unsafe as U
++
+ testSuite :: Test
+ testSuite = testGroup "Darcs.Patch.Info"
+   [ metadataDecodingTest
+@@ -86,7 +87,7 @@ instance Arbitrary UTF8PatchInfo where
+         sa <- shrink (piAuthor pi)
+         sl <- shrink (filter (not . isPrefixOf "Ignore-this:") (piLog pi))
+         return (UTF8PatchInfo
+-                   (unsafePerformIO $ patchinfo sn
++                   (U.unsafePerformIO $ patchinfo sn
+                                           (BC.unpack (_piDate pi)) sa sl))
+ 
+ instance Arbitrary UTF8OrNotPatchInfo where
+@@ -101,7 +102,7 @@ arbitraryUTF8Patch =
+        d <- arbitrary
+        a <- asString `fmap` arbitrary
+        l <- (lines . asString) `fmap` arbitrary
+-       return $ unsafePerformIO $ patchinfo n d a l
++       return $ U.unsafePerformIO $ patchinfo n d a l
+ 
+ -- | Generate arbitrary patch metadata that has totally arbitrary byte strings
+ --   as its name, date, author and log.
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-2.patch b/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-2.patch
new file mode 100644
index 000000000000..33786477b3fa
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-2.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Darcs/Test/Patch.hs b/src/Darcs/Test/Patch.hs
+index 0f7ed24..078fbc3 100644
+--- a/src/Darcs/Test/Patch.hs
++++ b/src/Darcs/Test/Patch.hs
+@@ -2,6 +2,9 @@
+ #if __GLASGOW_HASKELL__ >= 700
+ {-# LANGUAGE ImpredicativeTypes #-}
+ #endif
++#if __GLASGOW_HASKELL__ >= 708
++{-# LANGUAGE AllowAmbiguousTypes #-}
++#endif
+ --  Copyright (C) 2002-2005,2007 David Roundy
+ --
+ --  This program is free software; you can redistribute it and/or modify
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch b/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch
new file mode 100644
index 000000000000..6164a4a00074
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch
@@ -0,0 +1,52 @@
+Tue May 13 22:07:19 FET 2014  Sergei Trofimovich <slyfox@community.haskell.org>
+  * resolve issue2364: don't break list of 'bad sources'
+  
+  This time the bug manifested on a simple operation:
+  $ darcs record -a -m "something"
+  
+  Attempt to write a patch resulted in something like:
+    Failed to record patch 'hello'
+  
+    HINT: I could not reach the following repositories:
+          http://repetae.net/repos/jhc
+          /home/st/.darcs/cache
+          /home/st/.cache/darcs
+          /home/st/dev/darcs/jhc
+        If you're not using them, you should probably delete
+  
+  The sequence should be the following:
+      1. store patch to inventory/foo
+      2. try to store to a writable cache (say, ~/.darcs/cache/patches)
+      3. fail to write
+      4. filter out bad caches
+      5. try again
+      6. copy from cache to patches/
+  
+  Due to missing NOINLINE step 4. led to
+  all caches treated as writable, thus step 5
+  failed without a chance for patch to
+  go to 'patches/'.
+  
+  As a side-effect building darcs with -O0 produced seemingly working darcs.
+  Reported-by: Ivan Miljenovic
+diff -rN -u old-darcs.net/src/Darcs/Util/Global.hs new-darcs.net/src/Darcs/Util/Global.hs
+--- old-darcs.net/src/Darcs/Global.hs	2014-05-13 22:23:29.897329750 +0300
++++ new-darcs.net/src/Darcs/Global.hs	2014-05-13 22:23:29.979329754 +0300
+@@ -135,7 +135,7 @@
+ 
+ _badSourcesList :: IORef [String]
+ _badSourcesList = unsafePerformIO $ newIORef []
+-{- NOINLINE _badSourcesList -}
++{-# NOINLINE _badSourcesList #-}
+ 
+ 
+ addBadSource :: String -> IO ()
+@@ -154,7 +154,7 @@
+ 
+ _reachableSourcesList :: IORef [String]
+ _reachableSourcesList = unsafePerformIO $ newIORef []
+-{- NOINLINE _reachableSourcesList -}
++{-# NOINLINE _reachableSourcesList #-}
+ 
+ 
+ addReachableSource :: String -> IO ()
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-issue2364.patch b/dev-vcs/darcs/files/darcs-2.8.4-issue2364.patch
new file mode 100644
index 000000000000..97c4e0f1ad2b
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.4-issue2364.patch
@@ -0,0 +1,70 @@
+* resolve issue2364: fix file corruption on double fetch
+
+The bug is the result of attempt to fetch the same file
+(say F) by the same URL (U) multiple times concurrently.
+
+First time U gets fetched by speculative prefetch logic.
+Second time as an ordinary file (while first fetch is not finished).
+
+The function 'copyUrlWithPriority' sends download request
+to 'urlChan' both times (it's already not a nice situation,
+fixed by this patch).
+
+Later urlThread satisfies first request, notifies receiver,
+and starts downloading exactly the same U again.
+
+I don't know exact data corruption mechanics yet, but it has
+to do with non-random intermediate file names of downloaded
+files and 'truncate' call when temp file is opened for a new
+downlaod job.
+
+All temp names are completely non-random for a single darcs run:
+
+  urlThread :: Chan UrlRequest -> IO ()
+  urlThread ch = do
+    junk <- flip showHex "" `fmap` randomRIO rrange
+    evalStateT urlThread' (UrlState Map.empty emptyQ 0 junk)
+
+  createDownloadFileName :: FilePath -> UrlState -> FilePath
+  createDownloadFileName f st = f ++ "-new_" ++ randomJunk st
+
+My theory is next download manages to step on toes of previous job.
+
+I'll try to make file names truly random in other patch.
+That way such errors should manifest as read erros instead of data
+corruption.
+
+Thanks!
+diff --git a/src/URL.hs b/src/URL.hs
+index 4cb85ee..26de278 100644
+--- a/src/URL.hs
++++ b/src/URL.hs
+@@ -18,11 +18,12 @@ module URL ( copyUrl, copyUrlFirst, setDebugHTTP,
+ import Data.IORef ( newIORef, readIORef, writeIORef, IORef )
+ import Data.Map ( Map )
+ import qualified Data.Map as Map
++import Data.Tuple ( swap )
+ import System.Directory ( copyFile )
+ import System.IO.Unsafe ( unsafePerformIO )
+ import Control.Concurrent ( forkIO )
+ import Control.Concurrent.Chan ( isEmptyChan, newChan, readChan, writeChan, Chan )
+-import Control.Concurrent.MVar ( isEmptyMVar, modifyMVar_, newEmptyMVar, newMVar, putMVar, readMVar, withMVar, MVar )
++import Control.Concurrent.MVar ( isEmptyMVar, modifyMVar, modifyMVar_, newEmptyMVar, newMVar, putMVar, readMVar, withMVar, MVar )
+ import Control.Monad ( unless, when )
+ import Control.Monad.Trans ( liftIO )
+ import Control.Monad.State ( evalStateT, get, modify, put, StateT )
+@@ -196,10 +197,10 @@ copyUrlWithPriority p u f c = do
+   debugMessage ("URL.copyUrlWithPriority ("++u++"\n"++
+                 "                      -> "++f++")")
+   v <- newEmptyMVar
+-  let fn _ old_val = old_val
+-  modifyMVar_ urlNotifications (return . (Map.insertWith fn u v))
+-  let r = UrlRequest u f c p
+-  writeChan urlChan r
++  old_mv <- modifyMVar urlNotifications (return . swap . Map.insertLookupWithKey (\_k _n old -> old) u v)
++  case old_mv of
++    Nothing -> writeChan urlChan $ UrlRequest u f c p -- ok, new URL
++    Just _  -> debugMessage $ "URL.copyUrlWithPriority already in progress, skip (" ++ u ++ "\n" ++ "-> " ++ f ++ ")"
+ 
+ waitNextUrl :: StateT UrlState IO ()
+ waitNextUrl = do
diff --git a/dev-vcs/darcs/metadata.xml b/dev-vcs/darcs/metadata.xml
new file mode 100644
index 000000000000..f42758756fc4
--- /dev/null
+++ b/dev-vcs/darcs/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>haskell@gentoo.org</email>
+</maintainer>
+<use>
+  <flag name="diff">Use 'lcs' for diff building.</flag>
+  <flag name="http">Use the pure Haskell HTTP package for HTTP support.</flag>
+  <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+  <flag name="terminfo">Use the terminfo package for enhanced console support.</flag>
+  <flag name="threaded">Use threading and SMP support.</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-vcs/easygit-1.6.5.5 b/dev-vcs/easygit-1.6.5.5
deleted file mode 100644
index b52dcbff1d35..000000000000
--- a/dev-vcs/easygit-1.6.5.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Easy GIT is a wrapper for git, designed to make git easy to learn and use
-EAPI=2
-HOMEPAGE=https://www.gnome.org/~newren/eg/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.6.5.5 dev-lang/perl
-SLOT=0
-SRC_URI=https://www.gnome.org/~newren/eg/download/1.6.5.5/eg -> easygit-1.6.5.5
-_md5_=8fea7b2fbbf78e2f0c85ef0306b3fd1a
diff --git a/dev-vcs/easygit/Manifest b/dev-vcs/easygit/Manifest
new file mode 100644
index 000000000000..5a2ce38304b4
--- /dev/null
+++ b/dev-vcs/easygit/Manifest
@@ -0,0 +1,3 @@
+DIST easygit-1.6.5.5 283019 BLAKE2B 77d81b193a9dbb0d75df9aa66dd549418c9249a4b073528d72e770bc1857ee1165b33adbefcff94621cedf48edf8b551e065678b0a64166305467e2a01d2076c SHA512 2e639ffa40ac6ea8619abf5d8aced57a9fb203aaf96e259b2d3905b1d6d040d3d64adf14dad0552bd710808e3c23b63e859f1b5b02bd13aca1ad232fe05c2bbd
+EBUILD easygit-1.6.5.5.ebuild 517 BLAKE2B 36e84d7bbc2ac2263979b81226df52f0ca44bdd3eeb3aee6cdb55b7d7f440d7b4d15dcfe836658a875ec868e2203532072bdeadbb72e6e6e06c41ea1441f83f9 SHA512 bc29b551e3fc1dd6f2aa6c75483a96cb258815e9ff809fe9389455eda391ab51a069c9fb4148dfe9830912a33c9317fcffa17be6249ca26bd7c9e99086cdbab7
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/easygit/easygit-1.6.5.5.ebuild b/dev-vcs/easygit/easygit-1.6.5.5.ebuild
new file mode 100644
index 000000000000..0989d901a4ad
--- /dev/null
+++ b/dev-vcs/easygit/easygit-1.6.5.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_PN="eg"
+
+DESCRIPTION="Easy GIT is a wrapper for git, designed to make git easy to learn and use"
+HOMEPAGE="https://www.gnome.org/~newren/eg/"
+SRC_URI="https://www.gnome.org/~newren/${MY_PN}/download/${PV}/${MY_PN} -> ${PF}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-vcs/git-${PV}
+	dev-lang/perl"
+
+src_install() {
+	newbin "${DISTDIR}/${PF}" "${MY_PN}" || die
+}
diff --git a/dev-vcs/easygit/metadata.xml b/dev-vcs/easygit/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/dev-vcs/easygit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/fossil-2.4 b/dev-vcs/fossil-2.4
deleted file mode 100644
index 584af190e810..000000000000
--- a/dev-vcs/fossil-2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-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= )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=6
-HOMEPAGE=http://www.fossil-scm.org/
-IUSE=debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static tcl tcl-stubs -tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=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= )
-REQUIRED_USE=ssl? ( !miniz )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.fossil-scm.org/index.html/uv/fossil-src-2.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a1c76db9a7d50900bd07cddf8309a859
diff --git a/dev-vcs/fossil-2.5 b/dev-vcs/fossil-2.5
deleted file mode 100644
index 2b2b5786fe91..000000000000
--- a/dev-vcs/fossil-2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.22.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=6
-HOMEPAGE=http://www.fossil-scm.org/
-IUSE=debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.22.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=ssl? ( !miniz )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.fossil-scm.org/index.html/uv/fossil-src-2.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5f96f0a10049d077b6dfb23262443def
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
new file mode 100644
index 000000000000..24e9a44c3f64
--- /dev/null
+++ b/dev-vcs/fossil/Manifest
@@ -0,0 +1,5 @@
+DIST fossil-src-2.4.tar.gz 4919205 BLAKE2B 35009cffc757b6ea153faf89525cae4463a2169dace090183b9dd6955a615a04363576295e4b24652ebec7f20772ef9d83c6b9af29f68bd5695c56b88cbf77cb SHA512 de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f
+DIST fossil-src-2.5.tar.gz 5036719 BLAKE2B b25067ee79793343a017dee28d3ee2b5eb257118a1e334932c6413971f83517ea0cfe570008c35ac4318b52982cb1129ab91eb3380a7f491f09c29cac46a756e SHA512 ee5d8708c91457b7b4d4bada15504e27016a096f0527a81c983c493531d226beb8e4b7aa84b0d764a5404342b8fd2c4dc3196426c9fc8b9c612e1940dd8bde1f
+EBUILD fossil-2.4.ebuild 1488 BLAKE2B 02539210e2eb47e7aecfd9aa0e46a9b9e6061501d3252e997f5ecef94a50fc54b9b8d2e4e96c33c464e92b419fec5bd07938329f044515cedcf4bfae5bc93d69 SHA512 fb5ec8634fc9e147d962840d8000871d42f93edc58a361253ec5e5d287ba2aa59e99d24cc1555f0eb090e02ee0626233a11b357b90c41ef2b8006d2038db88ef
+EBUILD fossil-2.5.ebuild 1537 BLAKE2B 6f1f97c89e738ec97c41090c366f28eafed84459c6465ef80905e1fca8e4a0f62641d1e328a589ae768a02cda42158fe0be2936c1d3d5f0796cd26ef1417618f SHA512 77eace4a15a198040d85e7b2defdfb38f8cb1c4cc37c678911da6c5db0e425c4ad52ac558ac0923dab485ab126d3ea522032d851c52fda842ca29b752b05d8d9
+MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.4.ebuild b/dev-vcs/fossil/fossil-2.4.ebuild
new file mode 100644
index 000000000000..cd6f4caf4918
--- /dev/null
+++ b/dev-vcs/fossil/fossil-2.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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 tcl-stubs -tcl-private-stubs 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 fusefs || myconf+=' --disable-fusefs'
+
+	local u useflags
+	useflags=( legacy-mv-rm miniz tcl tcl-stubs tcl-private-stubs
+			   th1-docs th1-hooks )
+	for u in ${useflags[@]} ; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	tc-export CC
+	./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}
diff --git a/dev-vcs/fossil/fossil-2.5.ebuild b/dev-vcs/fossil/fossil-2.5.ebuild
new file mode 100644
index 000000000000..dbba71f4ebb5
--- /dev/null
+++ b/dev-vcs/fossil/fossil-2.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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 tcl-stubs tcl-private-stubs 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.22.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=1'
+	use fusefs        || myconf+=' --disable-fusefs'
+
+	local u useflags
+	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
+			   th1-docs th1-hooks )
+	for u in ${useflags[@]} ; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	tc-export CC
+	./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}
diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
new file mode 100644
index 000000000000..5f61527e696f
--- /dev/null
+++ b/dev-vcs/fossil/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<use>
+		<flag name="fusefs">Enable the Fuse Filesystem</flag>
+		<flag name="json">Enable the JSON API of Fossil's wiki</flag>
+		<flag name="legacy-mv-rm">
+			Enable legacy behavior for mv/rm (skip checkout files).
+		</flag>
+		<flag name="miniz">
+			Use the bundled miniz for compression instead of
+			zlib. Incompatible with ssl.
+		</flag>
+		<flag name="system-sqlite">
+			Use the system SQLite instead of the bundled one
+		</flag>
+		<flag name="tcl-stubs">
+			Enable Tcl integration via stubs library mechanism
+		</flag>
+		<flag name="tcl-private-stubs">
+			Enable Tcl integration via private stubs mechanism
+		</flag>
+		<flag name="th1-docs">
+			Enable TH1 for embedded documentation pages
+		</flag>
+		<flag name="th1-hooks">
+			Enable TH1 hooks for commands and web pages
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-vcs/giggle-0.7-r2 b/dev-vcs/giggle-0.7-r2
deleted file mode 100644
index 3ddf848b0d5e..000000000000
--- a/dev-vcs/giggle-0.7-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-vcs/git-1.5 >=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.3.12:3 >=x11-libs/gtksourceview-3.0:3.0 >=x11-libs/gdk-pixbuf-2.22.0 eds? ( gnome-extra/evolution-data-server:= ) >=x11-libs/vte-0.28:2.91 gnome-base/gnome-common sys-devel/gettext app-text/yelp-tools virtual/pkgconfig >=dev-util/intltool-0.35 >=sys-devel/autoconf-2.64 >=sys-devel/libtool-2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK+ Frontend for GIT
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/giggle
-IUSE=eds
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.5 >=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.3.12:3 >=x11-libs/gtksourceview-3.0:3.0 >=x11-libs/gdk-pixbuf-2.22.0 eds? ( gnome-extra/evolution-data-server:= ) >=x11-libs/vte-0.28:2.91
-SLOT=0
-SRC_URI=mirror://gnome/sources/giggle/0.7/giggle-0.7.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=670ce4be7bf390274ed3866b692aaad6
diff --git a/dev-vcs/giggle/Manifest b/dev-vcs/giggle/Manifest
new file mode 100644
index 000000000000..682c88920d47
--- /dev/null
+++ b/dev-vcs/giggle/Manifest
@@ -0,0 +1,5 @@
+AUX giggle-0.6.2-gtksourceview-3.8.0.patch 903 BLAKE2B 2ebe976476c120f1ad2729471615cc1a0b106a3cce0e267e1f6d31cac0b5d928f39eb91db62b733bbc15e5d867e73fb39b825cae39d215a68bdda89ef22a89fd SHA512 c60aaeab48ce95fb33dd7a93d51c3d7d17f449fdb0ae29b58cbe10f8e722c482d3793885c5d870b6ec8c03162aa37fef0b5e9dfeb9844494eddb318ecb703425
+AUX giggle-0.7-vte-2.91.patch 2331 BLAKE2B c1a393800fd8e8baaedb46c8f6bf7c7d0c0c09cd4868a47bd5ec9a74dce5fe9114000750183f12e10d9841dcc921a9b70b38fa973b66fca505c661fab882e3be SHA512 7ef6ea65c321e2b55e78ff0ffc8bf8b271516c009c54bebddd3f5e478e8483a911ca279af0f31c9bc7c81c8089c5bbe42f209d7fe55db91e0834baecd01a1fee
+DIST giggle-0.7.tar.xz 2042304 BLAKE2B 376b82e7550e1926109572656424918cdd4282e64f215344c519f0c5960f2aea5399fd9f779982c75f7fffdc41b3c7f4660d823ddcbb03d43506646299f34509 SHA512 01d3cc0adc610706a97b89487624fe3d09c1347c0b07920e71d2e33761fab4894ebb304113ac7df6cdd03ed6116d09dcce85b35d6169df5a3f3973faaa151cfb
+EBUILD giggle-0.7-r2.ebuild 972 BLAKE2B 3ac1ecde7d81a56b079c7798f76540da10ce5b20f02b58d831a27145ca4bc8abdcf07a151573f0e0420f8539c5182c7f0f0d029552f05cf935acb0f6c2266eba SHA512 7801a82d2bf848f2b2c1b10a5e1d92f099da1e3146370bed5af7ce29187452b3da629bc4a7ab6a4f4914367346698b2180e35d3847d29d0d78d80509672eb36e
+MISC metadata.xml 321 BLAKE2B 121b3f98d2d98848910ae89330e3330201de74751c55dafa2df80fe4cf8698819fd9808d2fff89f3bd34480d4393e2a1a6fe5e1d5e878c239bc10d8acea10949 SHA512 a7a7226c85410af2cc6caee355668474f22f784b80abceafdbe01e94c9a4e0e267fd56a6c839ae0279a511681b4ce9bcdd87555f460b2b8b51607422fcb05a7c
diff --git a/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch b/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch
new file mode 100644
index 000000000000..37648e171232
--- /dev/null
+++ b/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch
@@ -0,0 +1,24 @@
+diff --git a/src/giggle-diff-view.h b/src/giggle-diff-view.h
+index de5fe02..9ef33b5 100644
+--- a/src/giggle-diff-view.h
++++ b/src/giggle-diff-view.h
+@@ -23,6 +23,7 @@
+ 
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
++#include <gtksourceview/gtksourcebuffer.h>
+ #include <gtksourceview/gtksourceview.h>
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ 
+diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
+index 7746225..7b74c0a 100644
+--- a/src/giggle-view-file.c
++++ b/src/giggle-view-file.c
+@@ -42,6 +42,7 @@
+ 
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourceview.h>
++#include <gtksourceview/gtksourcebuffer.h>
+ 
+ #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT            (giggle_view_file_snapshot_get_type ())
+ #define GIGGLE_VIEW_FILE_SNAPSHOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot))
diff --git a/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch b/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch
new file mode 100644
index 000000000000..f800a9d157ca
--- /dev/null
+++ b/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch
@@ -0,0 +1,57 @@
+From b9e260840d03e33ac55142719f3d54129b54cc70 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 26 Jan 2015 15:38:24 +0100
+Subject: [PATCH] Port to vte-2.91 API
+
+https://bugzilla.gnome.org/show_bug.cgi?id=743537
+---
+ configure.ac                   |  2 +-
+ plugins/giggle-view-terminal.c | 19 ++++++++++---------
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6e27733..72e7bd1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -106,7 +106,7 @@ AC_ARG_ENABLE([terminal],
+ AS_IF([test "x$enable_terminal" = "xyes"],
+       [
+         PKG_CHECK_MODULES([VTE],
+-                          [vte-2.90 >= $VTE_REQUIRED_VERSION],
++                          [vte-2.91 >= $VTE_REQUIRED_VERSION],
+                           [have_vte=yes
+                            AC_DEFINE([HAVE_VTE], [1],
+                                      [Use features from vte])
+diff --git a/plugins/giggle-view-terminal.c b/plugins/giggle-view-terminal.c
+index 06a9a50..cd107f2 100644
+--- a/plugins/giggle-view-terminal.c
++++ b/plugins/giggle-view-terminal.c
+@@ -186,15 +186,16 @@ giggle_view_terminal_append_tab (GiggleViewTerminal *view,
+ 	real_argv[1] = NULL;
+ 	spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO;
+ 
+-	succes = vte_terminal_fork_command_full (VTE_TERMINAL (terminal),
+-	                                         pty_flags,
+-	                                         directory,
+-	                                         real_argv,
+-	                                         NULL,
+-	                                         spawn_flags,
+-	                                         NULL, NULL,
+-	                                         NULL,
+-	                                         &error);
++	succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal),
++	                                  pty_flags,
++	                                  directory,
++	                                  real_argv,
++	                                  NULL,
++	                                  spawn_flags,
++	                                  NULL, NULL,
++	                                  NULL,
++	                                  NULL,
++	                                  &error);
+ 	g_strfreev (real_argv);
+ 
+ 	if (succes == FALSE) {
+-- 
+2.1.0
+
diff --git a/dev-vcs/giggle/giggle-0.7-r2.ebuild b/dev-vcs/giggle/giggle-0.7-r2.ebuild
new file mode 100644
index 000000000000..b423d027f8fc
--- /dev/null
+++ b/dev-vcs/giggle/giggle-0.7-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2
+
+DESCRIPTION="GTK+ Frontend for GIT"
+HOMEPAGE="https://wiki.gnome.org/Apps/giggle"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="eds"
+
+RDEPEND="
+	>=dev-vcs/git-1.5
+	>=dev-libs/glib-2.30:2
+	>=x11-libs/gtk+-3.3.12:3
+	>=x11-libs/gtksourceview-3.0:3.0
+	>=x11-libs/gdk-pixbuf-2.22.0
+	eds? ( gnome-extra/evolution-data-server:= )
+	>=x11-libs/vte-0.28:2.91
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	app-text/yelp-tools
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35
+	>=sys-devel/autoconf-2.64
+	>=sys-devel/libtool-2
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-0.6.2-gtksourceview-3.8.0.patch"
+	eapply "${FILESDIR}/${PN}-0.7-vte-2.91.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable eds evolution-data-server)
+}
diff --git a/dev-vcs/giggle/metadata.xml b/dev-vcs/giggle/metadata.xml
new file mode 100644
index 000000000000..93f8632fd83c
--- /dev/null
+++ b/dev-vcs/giggle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<longdescription lang="en">
+		GTK+ based frontend for GIT
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/git-2.16.4 b/dev-vcs/git-2.16.4
deleted file mode 100644
index 4997352c04f8..000000000000
--- a/dev-vcs/git-2.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-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 python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~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
-LICENSE=GPL-2
-RDEPEND=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 ) 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_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.16.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.4.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10face2025ec6dc920a92ca12b623d6f
diff --git a/dev-vcs/git-2.17.1-r1 b/dev-vcs/git-2.17.1-r1
deleted file mode 100644
index 127ab6d58303..000000000000
--- a/dev-vcs/git-2.17.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-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 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=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 ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.17.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.17.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.17.1.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=43c63f6c4bc7d64c6a0a3ea94a98b01b
diff --git a/dev-vcs/git-2.18.0 b/dev-vcs/git-2.18.0
deleted file mode 100644
index 615e3c67fe0c..000000000000
--- a/dev-vcs/git-2.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-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 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=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 ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.18.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.18.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.18.0.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3cc41c178a94ac2a1faf6d1931326ca2
diff --git a/dev-vcs/git-9999 b/dev-vcs/git-9999
deleted file mode 100644
index 3df3e7778bf2..000000000000
--- a/dev-vcs/git-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-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 python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=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 ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25b85c15e61ac4e29c47297318e840cb
diff --git a/dev-vcs/git-9999-r1 b/dev-vcs/git-9999-r1
deleted file mode 100644
index fb484f071df6..000000000000
--- a/dev-vcs/git-9999-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-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 python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=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 ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97b8a4a153bd1b3a09f8c1c289aa2d95
diff --git a/dev-vcs/git-9999-r2 b/dev-vcs/git-9999-r2
deleted file mode 100644
index fb484f071df6..000000000000
--- a/dev-vcs/git-9999-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-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 python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=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 ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97b8a4a153bd1b3a09f8c1c289aa2d95
diff --git a/dev-vcs/git-9999-r3 b/dev-vcs/git-9999-r3
deleted file mode 100644
index 61b69fe9e672..000000000000
--- a/dev-vcs/git-9999-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-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 python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=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 ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f5654d99eddeb5ee8e75f6dd4bc95dca
diff --git a/dev-vcs/git-annex-6.20170818 b/dev-vcs/git-annex-6.20170818
deleted file mode 100644
index 0125e9a2be68..000000000000
--- a/dev-vcs/git-annex-6.20170818
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/bloomfilter:= dev-haskell/byteable:= dev-haskell/case-insensitive:= dev-haskell/crypto-api:= dev-haskell/cryptonite:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= dev-haskell/esqueleto:= >=dev-haskell/exceptions-0.6:= >=dev-haskell/feed-0.3.9:= dev-haskell/free:= dev-haskell/hslogger:= dev-haskell/http-client:= >=dev-haskell/http-conduit-2.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/monad-control:= dev-haskell/monad-logger:= >=dev-haskell/mtl-2:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.11.0:= dev-haskell/persistent:= dev-haskell/persistent-sqlite:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.1:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/text:= dev-haskell/unix-compat:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= >=dev-lang/ghc-7.8.2:= assistant? ( >=dev-haskell/dns-1.0.0:= dev-haskell/hinotify:= dev-haskell/mountpoints:= sys-process/lsof ) benchmark? ( dev-haskell/criterion:= ) concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) magicmime? ( dev-haskell/magic:= ) network-uri? ( >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= ) !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) s3? ( >=dev-haskell/aws-0.9.2:= dev-haskell/conduit:= dev-haskell/conduit-extra:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.1.4:= >=dev-haskell/shakespeare-2.0.0:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.0.0.5:= >=dev-haskell/warp-tls-1.4:= >=dev-haskell/yesod-1.2.6:= >=dev-haskell/yesod-core-1.2.19:= >=dev-haskell/yesod-default-1.2.0:= >=dev-haskell/yesod-form-1.3.15:= >=dev-haskell/yesod-static-1.2.4:= ) webdav? ( >=dev-haskell/dav-1.0:= ) dev-vcs/git >=dev-haskell/cabal-1.18.1.3 dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync )
-DESCRIPTION=manage files with git, without checking their contents into git
-EAPI=6
-HOMEPAGE=http://git-annex.branchable.com/
-IUSE=+assistant benchmark +concurrentoutput +dbus doc +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=GPL-3
-RDEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/bloomfilter:= dev-haskell/byteable:= dev-haskell/case-insensitive:= dev-haskell/crypto-api:= dev-haskell/cryptonite:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= dev-haskell/esqueleto:= >=dev-haskell/exceptions-0.6:= >=dev-haskell/feed-0.3.9:= dev-haskell/free:= dev-haskell/hslogger:= dev-haskell/http-client:= >=dev-haskell/http-conduit-2.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/monad-control:= dev-haskell/monad-logger:= >=dev-haskell/mtl-2:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.11.0:= dev-haskell/persistent:= dev-haskell/persistent-sqlite:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.1:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/text:= dev-haskell/unix-compat:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= >=dev-lang/ghc-7.8.2:= assistant? ( >=dev-haskell/dns-1.0.0:= dev-haskell/hinotify:= dev-haskell/mountpoints:= sys-process/lsof ) benchmark? ( dev-haskell/criterion:= ) concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) magicmime? ( dev-haskell/magic:= ) network-uri? ( >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= ) !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) s3? ( >=dev-haskell/aws-0.9.2:= dev-haskell/conduit:= dev-haskell/conduit-extra:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.1.4:= >=dev-haskell/shakespeare-2.0.0:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.0.0.5:= >=dev-haskell/warp-tls-1.4:= >=dev-haskell/yesod-1.2.6:= >=dev-haskell/yesod-core-1.2.19:= >=dev-haskell/yesod-default-1.2.0:= >=dev-haskell/yesod-form-1.3.15:= >=dev-haskell/yesod-static-1.2.4:= ) webdav? ( >=dev-haskell/dav-1.0:= ) dev-vcs/git
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/git-annex/6.20170818/git-annex-6.20170818.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e318207399a6596dfab8d496654ed1f9
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
new file mode 100644
index 000000000000..15b2fc1c4573
--- /dev/null
+++ b/dev-vcs/git-annex/Manifest
@@ -0,0 +1,8 @@
+AUX git-annex-6.20160114-QC-2.8.2.patch 509 BLAKE2B 2d84231d59a062bbe3e5a2c970f8c01e7da5cea0e42ff40bedffcfea079e3e131a395a033a3c1d012bda31af2c2326dc4d75c929e8e47b2e198a7ebcc2efadc6 SHA512 2df4f294bd8e39a067cdf7adf0f44d08a7910d7954529d053fd35d35b263dc891ecb1390427783c3448d660e918b6076c86e6c01145f272226c20c8d7688cd1c
+AUX git-annex-6.20161210-directory-1.3.patch 279 BLAKE2B 7d85392d72f146c4fb7545c19b362c6f1915925570f69697f612defdcf811596e2b339d2d9a6ed4038f5fc73bf887ecea464a768d40d4616a8fc1992836b279a SHA512 6247c9d8221ec3c1090d6cd66fbf525ea429e64ade0820a54d5116d69c36ba69f7f7ce1ec46d26afdacd24ffdad813ad540abbecd50fca318c7439bd347a6533
+AUX git-annex-6.20170101-crypto-api.patch 212 BLAKE2B 0e9e1fdda1a93ffd709955c472052aa507e364c94095b6acf94f94693c23681a145f808b17c98bb5d40ddc111bb2de43f594e4333e2f6322c93ff711268916f0 SHA512 c0b69ef8dffd9df06663513233f7848e3f8abfec5f6f93656cbfc466887ac5d2bbbbe65bb07088a488616593a44456fa9aa459a1404352afa66b2b7cdc937dfe
+AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b6b49095f5b7724ecbc1c4f13a6f351afe66f0d015c7355b6a56b77c06cb1e9e5cf155268312c619 SHA512 89b6520e4be14af9032638c1153df936a7e5707d6453b4251fe762712b8956ba1d39a4623b06910e5ac5724e33e157e654b724e070b6893f6f26578df730d326
+AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3
+DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0
+EBUILD git-annex-6.20170818.ebuild 4444 BLAKE2B d02fff7a8112f721b41a85cd4f57dcc35103e891bc494cec0130b449215cdc18b6b1cb529222561ad582deead7e9375a720862d13ecf740ce27ee1c0abaeaffa SHA512 219ceefb167332eff7c24aa3733b0ca05ca3b5eef843f65b9526df73de49d67cee243835ed9613beafeb5bbef4f698799b154fd1c9d5da57137fadd61731c56f
+MISC metadata.xml 1735 BLAKE2B 7722b62eae4ad8f3859262d67f6ed9223b6eb86962fa52a4d53ed9f9569dfd6045be8bd7c975fe8719a25fc13ae7c64d7be2fbd5993f77583f2b5d8a77d83c20 SHA512 33e68df57c88e73f1d1b88d051a0f9a22a84dea82e26b8b552a36f213c63680fd780bbc8c2cdf1f1c9e57b47d982218a4b096ac59e8137b019af7164fe72ea69
diff --git a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
new file mode 100644
index 000000000000..2f232782de02
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
@@ -0,0 +1,16 @@
+diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
+index cd408dd..9f60f23 100644
+--- a/Utility/QuickCheck.hs
++++ b/Utility/QuickCheck.hs
+@@ -9,2 +9,3 @@
+ {-# LANGUAGE TypeSynonymInstances #-}
++{-# LANGUAGE CPP #-}
+ 
+@@ -23,2 +24,3 @@ import Prelude
+ 
++#if ! MIN_VERSION_QuickCheck(2,8,2)
+ instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where
+@@ -28,2 +30,3 @@ instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where
+ 	arbitrary = S.fromList <$> arbitrary
++#endif
+ 
diff --git a/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch b/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
new file mode 100644
index 000000000000..1e9bb57f9eec
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
@@ -0,0 +1,9 @@
+diff --git a/Common.hs b/Common.hs
+index 5213863..74b054e 100644
+--- a/Common.hs
++++ b/Common.hs
+@@ -27,3 +27,3 @@ import Utility.Process as X
+ import Utility.Path as X
+-import Utility.Directory as X
++import Utility.Directory as X hiding (getFileSize)
+ import Utility.Monad as X
diff --git a/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch b/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
new file mode 100644
index 000000000000..c517c651ce47
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
@@ -0,0 +1,8 @@
+diff --git a/git-annex.cabal b/git-annex.cabal
+index 5b95a16..f03024d 100644
+--- a/git-annex.cabal
++++ b/git-annex.cabal
+@@ -326,2 +326,3 @@ Executable git-annex
+    case-insensitive,
++   crypto-api,
+    random,
diff --git a/dev-vcs/git-annex/files/git-annex.bash b/dev-vcs/git-annex/files/git-annex.bash
new file mode 100644
index 000000000000..309b221f0157
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex.bash
@@ -0,0 +1,19 @@
+_git_annex()
+{
+    local cmdline
+    local IFS=$'
+'
+    CMDLINE=(--bash-completion-index $COMP_CWORD)
+
+    if [[ "${COMP_WORDS[@]:0:2}" == "git annex" ]]; then
+        unset COMP_WORDS[0]
+        COMP_WORDS[1]="git-annex"
+    fi
+    for arg in ${COMP_WORDS[@]}; do
+        CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
+    done
+
+    COMPREPLY=( $(/usr/bin/git-annex "${CMDLINE[@]}") )
+}
+
+complete -o filenames -F _git_annex git-annex
diff --git a/dev-vcs/git-annex/files/git-annex.xpm b/dev-vcs/git-annex/files/git-annex.xpm
new file mode 100644
index 000000000000..781f21c5e9dc
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex.xpm
@@ -0,0 +1,47 @@
+/* XPM */
+static char * git_annex_42x42_xpm[] = {
+"42 40 4 1",
+" 	c None",
+".	c #40BF4C",
+"+	c #D8382D",
+"@	c #666666",
+"   .                                  .   ",
+"  ...                                ...  ",
+"  ...                                ...  ",
+" .....                              ..... ",
+".......                            .......",
+"  ...                                ...  ",
+"  .                                    .  ",
+"     .                              .     ",
+"   ..                                ..   ",
+"   .               ....               .   ",
+"     ..            ....            ..     ",
+"    ....           ....           ....    ",
+"     .....         ....         .....     ",
+"      .... . ................ . ....      ",
+"       ..  . ................ .  ..       ",
+"          .. ................ ..          ",
+"                   ....                   ",
+"                   ....                   ",
+"                   ....                   ",
+"                   ....                   ",
+"                                          ",
+"             ++++++++++++++++             ",
+"             ++++++++++++++++             ",
+"             ++++++++++++++++             ",
+"             ++++++++++++++++             ",
+"                                          ",
+"                 @@  @@@@@@@@             ",
+"               @@@@  @@@@@@@@             ",
+"               @@@@  @@@@@@               ",
+"              @@@@@  @@@@@@@              ",
+"              @@@    @@  @@@              ",
+"             @@@@    @@  @@@@             ",
+"             @@@     @@   @@@             ",
+"             @@@@         @@@             ",
+"              @@@        @@@@             ",
+"              @@@@       @@@              ",
+"              @@@@@@  @@@@@@              ",
+"               @@@@@@@@@@@@               ",
+"                @@@@@@@@@@                ",
+"                  @@@@@@                  "};
diff --git a/dev-vcs/git-annex/git-annex-6.20170818.ebuild b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
new file mode 100644
index 000000000000..29375595e8d4
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+CABAL_FEATURES=""
+inherit haskell-cabal bash-completion-r1
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant benchmark +concurrentoutput +dbus doc +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav"
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/byteable:=
+	dev-haskell/case-insensitive:=
+	dev-haskell/crypto-api:=
+	dev-haskell/cryptonite:=
+	dev-haskell/data-default:=
+	dev-haskell/disk-free-space:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	dev-haskell/esqueleto:=
+	>=dev-haskell/exceptions-0.6:=
+	>=dev-haskell/feed-0.3.9:=
+	dev-haskell/free:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	>=dev-haskell/http-conduit-2.0:=
+	>=dev-haskell/http-types-0.7:=
+	dev-haskell/ifelse:=
+	dev-haskell/memory:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.11.0:=
+	dev-haskell/persistent:=
+	dev-haskell/persistent-sqlite:=
+	dev-haskell/persistent-template:=
+	>=dev-haskell/quickcheck-2.1:2=
+	dev-haskell/random:=
+	dev-haskell/regex-tdfa:=
+	dev-haskell/resourcet:=
+	dev-haskell/safesemaphore:=
+	dev-haskell/sandi:=
+	dev-haskell/securemem:=
+	dev-haskell/socks:=
+	dev-haskell/split:=
+	>=dev-haskell/stm-2.3:=
+	dev-haskell/stm-chans:=
+	dev-haskell/text:=
+	dev-haskell/unix-compat:=
+	dev-haskell/unordered-containers:=
+	dev-haskell/utf8-string:=
+	>=dev-haskell/uuid-1.2.6:=
+	>=dev-lang/ghc-7.8.2:=
+	assistant? ( >=dev-haskell/dns-1.0.0:=
+			dev-haskell/hinotify:=
+			dev-haskell/mountpoints:=
+			sys-process/lsof )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		>=dev-haskell/fdo-notify-0.3:= )
+	magicmime? ( dev-haskell/magic:= )
+	network-uri? ( >=dev-haskell/network-2.6:=
+			>=dev-haskell/network-uri-2.6:= )
+	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+	pairing? ( dev-haskell/network-info:=
+			dev-haskell/network-multicast:= )
+	s3? ( >=dev-haskell/aws-0.9.2:=
+		dev-haskell/conduit:=
+		dev-haskell/conduit-extra:= )
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+	webapp? ( dev-haskell/blaze-builder:=
+			dev-haskell/clientsession:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			>=dev-haskell/shakespeare-2.0.0:=
+			dev-haskell/wai:=
+			dev-haskell/wai-extra:=
+			>=dev-haskell/warp-3.0.0.5:=
+			>=dev-haskell/warp-tls-1.4:=
+			>=dev-haskell/yesod-1.2.6:=
+			>=dev-haskell/yesod-core-1.2.19:=
+			>=dev-haskell/yesod-default-1.2.0:=
+			>=dev-haskell/yesod-form-1.3.15:=
+			>=dev-haskell/yesod-static-1.2.4:= )
+	webdav? ( >=dev-haskell/dav-1.0:= )
+"
+# not generated by hackport:
+RDEPEND="${RDEPEND}
+	dev-vcs/git
+"
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+# not generated by hackport:
+DEPEND="${DEPEND}
+	dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
+	"${FILESDIR}"/${PN}-6.20161210-directory-1.3.patch
+	"${FILESDIR}"/${PN}-6.20170101-crypto-api.patch
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag benchmark benchmark) \
+		$(cabal_flag concurrentoutput concurrentoutput) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag magicmime magicmime) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag pairing pairing) \
+		--flag=-production \
+		$(cabal_flag s3 s3) \
+		--flag=-testsuite \
+		$(cabal_flag torrentparser torrentparser) \
+		$(cabal_flag webapp webapp) \
+		$(cabal_flag webdav webdav)
+}
+
+src_test() {
+	if use webapp; then
+		export GIT_CONFIG=${T}/temp-git-config
+		git config user.email "git@src_test"
+		git config user.name "Mr. ${P} The Test"
+
+		emake test
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
+
+	dodoc CHANGELOG README
+	if use webapp ; then
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
+	fi
+}
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
new file mode 100644
index 000000000000..e35251395d35
--- /dev/null
+++ b/dev-vcs/git-annex/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		git-annex allows managing files with git, without checking the file
+		contents into git. While that may seem paradoxical, it is useful when
+		dealing with files larger than git can currently easily handle, whether due
+		to limitations in memory, checksumming time, or disk space.
+		
+		Even without file content tracking, being able to manage files with git,
+		move files around and delete files with versioned directory trees, and use
+		branches and distributed clones, are all very handy reasons to use git. And
+		annexed files can co-exist in the same git repository with regularly
+		versioned files, which is convenient for maintaining documents, Makefiles,
+		etc that are associated with annexed files but that benefit from full
+		revision control.
+	</longdescription>
+	<use>
+		<flag name="assistant">Enable git-annex assistant and watch command</flag>
+		<flag name="benchmark">Enable benchmarking</flag>
+		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
+		<flag name="magicmime">Use libmagic to determine file MIME types</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="pairing">Enable pairing of git annex repositories</flag>
+		<flag name="s3">Enable Amazon S3 remote</flag>
+		<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
+		<flag name="webapp">Enable git-annex webapp</flag>
+		<flag name="webdav">Enable webdav remote</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-vcs/git-bz-0.2015.09.08 b/dev-vcs/git-bz-0.2015.09.08
deleted file mode 100644
index 46cddb56a61b..000000000000
--- a/dev-vcs/git-bz-0.2015.09.08
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DESCRIPTION=Bugzilla subcommand for git
-EAPI=6
-HOMEPAGE=http://www.fishsoup.net/software/git-bz/
-IUSE=python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git python_single_target_pypy? ( >=virtual/pypy-5:0=[sqlite] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/git-bz-0.2015.09.08.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c905331c42b7b5b61e16992f2c466505
diff --git a/dev-vcs/git-bz-9999 b/dev-vcs/git-bz-9999
deleted file mode 100644
index 869e85b4f002..000000000000
--- a/dev-vcs/git-bz-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup unpack
-DEPEND=app-text/asciidoc app-text/xmlto >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Bugzilla subcommand for git
-EAPI=6
-HOMEPAGE=http://www.fishsoup.net/software/git-bz/
-IUSE=python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git python_single_target_pypy? ( >=virtual/pypy-5:0=[sqlite] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d6eea30098b0f72107820f8a53369933
diff --git a/dev-vcs/git-bz/Manifest b/dev-vcs/git-bz/Manifest
new file mode 100644
index 000000000000..8e91f2d50687
--- /dev/null
+++ b/dev-vcs/git-bz/Manifest
@@ -0,0 +1,4 @@
+DIST git-bz-0.2015.09.08.tar.bz2 46980 BLAKE2B c5aae20c4c3946b01620f0cdd33248a67ffc3a3e8fb84bab6bb6ccda778ac82e7fb7fb6bbe463fb13733e5b8bf5ba95d0e316b0dbcee3ef30c5003c353521ce5 SHA512 8a468183f23d182ea566ceb524b05028c483e5eecc0c8babec42d67e99b8779af430d18373e130dcc13c8c58135ac62faf0a700c2731320617b47b00f5678133
+EBUILD git-bz-0.2015.09.08.ebuild 811 BLAKE2B 43ba5f07c93baacec1f9d037ce96058db16f5be01eabd74a0eb6144c981b5bfcd048310caf796fe44bcee42cb26632099cdbfdc0658555ab65635ffa90b4fc15 SHA512 c931c0150d646365849c9c94eef7a9a2bd3baf94716968e7323bfdc46b49be1d3d92c3b96ff702e790a1e6237201e3abf9a7b9a0a3b7c907e426a62e0d29975f
+EBUILD git-bz-9999.ebuild 917 BLAKE2B 1f04d51d95c47964ea4b4cbae0a7460b548dc8a055f1ec87a39b25bce40514aae98402d9a132a3b36507d1120a057e65812c749e5c618cf64a805cc8a93b8ee9 SHA512 00cbd04377fb76e55fdf5414b612f767923e3cff339617a43e33ca5cd30069a1b23d588c76d90c3948b0dec3074586f3e01cb0b411d7311f23df340c85a972c7
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild b/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
new file mode 100644
index 000000000000..44eacb2a7a3e
--- /dev/null
+++ b/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE='sqlite'
+
+inherit python-single-r1
+
+DESCRIPTION="Bugzilla subcommand for git"
+HOMEPAGE="http://www.fishsoup.net/software/git-bz/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-vcs/git
+	${PYTHON_DEPS}"
+
+src_configure() {
+	# custom script
+	./configure --prefix="${EPREFIX}/usr" || die
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED%/}"/usr/bin/${PN}
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/pycrypto; then
+		elog "For Chrome/-ium cookie decryption support, please install:"
+		elog "  dev-python/pycrypto"
+	fi
+}
diff --git a/dev-vcs/git-bz/git-bz-9999.ebuild b/dev-vcs/git-bz/git-bz-9999.ebuild
new file mode 100644
index 000000000000..c8f2c69685ef
--- /dev/null
+++ b/dev-vcs/git-bz/git-bz-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE='sqlite'
+
+EGIT_REPO_URI="git://git.fishsoup.net/${PN}
+	http://git.fishsoup.net/cgit/${PN}"
+inherit git-r3 python-single-r1
+
+DESCRIPTION="Bugzilla subcommand for git"
+HOMEPAGE="http://www.fishsoup.net/software/git-bz/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-vcs/git
+	${PYTHON_DEPS}"
+DEPEND="app-text/asciidoc
+	app-text/xmlto"
+
+src_configure() {
+	# custom script
+	./configure --prefix="${EPREFIX}/usr" || die
+}
+
+src_compile() {
+	emake ${PN}.1
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED%/}"/usr/bin/${PN}
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/pycrypto; then
+		elog "For Chrome/-ium cookie decryption support, please install:"
+		elog "  dev-python/pycrypto"
+	fi
+}
diff --git a/dev-vcs/git-bz/metadata.xml b/dev-vcs/git-bz/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/dev-vcs/git-bz/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/git-bzr-ng-0_pre20120822-r2 b/dev-vcs/git-bzr-ng-0_pre20120822-r2
deleted file mode 100644
index eddae0d95545..000000000000
--- a/dev-vcs/git-bzr-ng-0_pre20120822-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Git subcommand providing a bidirectional bridge to Bazaar repositories
-EAPI=6
-HOMEPAGE=https://github.com/termie/git-bzr-ng
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-vcs/bzr-2.2 dev-vcs/git >=dev-vcs/bzr-fastimport-0.10 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/git-bzr-ng/git-bzr-ng-0_pre20120822.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=811539ef454d99fa1f7bcc5019f4f501
diff --git a/dev-vcs/git-bzr-ng/Manifest b/dev-vcs/git-bzr-ng/Manifest
new file mode 100644
index 000000000000..62e96004879b
--- /dev/null
+++ b/dev-vcs/git-bzr-ng/Manifest
@@ -0,0 +1,3 @@
+DIST git-bzr-ng-0_pre20120822.tar.xz 11592 BLAKE2B 1975e9b7e52d177736eb7f90ee35bf72f97b5cb0c682119160b59d09d9d16762a9981578c32475a1a378a6f98d3c9e6623772a8582ed1d5d9b5a4fdcc830d731 SHA512 2652b76a1fbdfac7f7387b53167d0c76a0579e232f66be05c28a156eef638e40bd7548154e6c1853872cf6978b474b948396db176976f2ac15e7311fc731ba9b
+EBUILD git-bzr-ng-0_pre20120822-r2.ebuild 724 BLAKE2B a258cb05827187c09bf94da273758c25f23c0d0f6266003994f8c374d8eb16d83c298c659d6d75897bec593973b62bdfd34ebe2c3993c27203f23258d8fafe30 SHA512 7d149599794c3788cfa6242d1407f7d5ff6e507f6767072847a51414847b36491564ad618d95fdfb4ebdc74b802ac6fad8b57dcb4abc513fbf9ee45e9060d107
+MISC metadata.xml 338 BLAKE2B 6c811ca41597c9985913a0af17b2a0b504f8816bd398833f92b65d782702bdec745c44bfca5f55cf9d543f1cd3c84863fabc03910c8a819cdce6b0fbbf1910a8 SHA512 076b3b7989dc7cf0e43ef116ebb469d6ebeb68c417d952e7c1b53a3c93c990f063b9728780a20ce6155242117e5f9825929b182e4170494023e2e1ef42914e96
diff --git a/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r2.ebuild b/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r2.ebuild
new file mode 100644
index 000000000000..f85416390252
--- /dev/null
+++ b/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Git subcommand providing a bidirectional bridge to Bazaar repositories"
+HOMEPAGE="https://github.com/termie/git-bzr-ng"
+SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-vcs/bzr-2.2
+	dev-vcs/git
+	>=dev-vcs/bzr-fastimport-0.10
+	${PYTHON_DEPS}"
+DEPEND="app-arch/xz-utils"
+
+src_prepare() {
+	default
+	python_fix_shebang git-bzr
+}
+
+src_install() {
+	exeinto /usr/libexec/git-core
+	doexe git-bzr
+	dodoc README.rst
+}
diff --git a/dev-vcs/git-bzr-ng/metadata.xml b/dev-vcs/git-bzr-ng/metadata.xml
new file mode 100644
index 000000000000..6fd468f2c231
--- /dev/null
+++ b/dev-vcs/git-bzr-ng/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">termie/git-bzr-ng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-cola-2.11 b/dev-vcs/git-cola-2.11
deleted file mode 100644
index f0b6919fa895..000000000000
--- a/dev-vcs/git-cola-2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/QtPy[gui,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[gui,network,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-vcs/git sys-devel/gettext doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_targets_python2_7? ( dev-python/sphinxtogithub[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The highly caffeinated git GUI
-EAPI=6
-HOMEPAGE=https://git-cola.github.io/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/QtPy[gui,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[gui,network,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-vcs/git python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/git-cola/git-cola/archive/v2.11.tar.gz -> git-cola-2.11.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e739904e01f6f356d1025eb7c25c5b8
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
new file mode 100644
index 000000000000..0d4967208572
--- /dev/null
+++ b/dev-vcs/git-cola/Manifest
@@ -0,0 +1,6 @@
+AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
+AUX git-cola-2.10-disable-live-tests.patch 827 BLAKE2B f7778c373b4e7b2c09daeeeab5c15c09870a70f8d490d2bd16d2e1b62f0c96c4bec6517cc99fa8d0a65daeb1551993d4e367f39f60099afdf31597847762ee39 SHA512 86f7410ce711db2dc19d4348047285dbd1a3c078512d13b589ef898dfd870a4f459371319965c697d8654dd4550a358e67e5d6b74c0317820422c3e98b7084a9
+AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
+DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
+EBUILD git-cola-2.11.ebuild 2446 BLAKE2B 47be464f83286b7f1c341b762abaf7fb05e787fb178dc2b0f565dbb77294a3c564adf1159e1276d05ee99ee0933ca386792828215b5531bb0e4144d053a770e0 SHA512 b73a4b57ec6e843ff2ea2e0cc5a86020653fbc097259fc3058f6c809f6c6986d4b4a77eb97e90de4206c9ae2c53c30b4c3a3198e99c87ab23ada5dfaadb7910a
+MISC metadata.xml 342 BLAKE2B 3c25a34b0009e31ea7a125733b8105d40be8d818106b7051d6b4180a8f4c39e16ce46eada9acef2cb5424d3fdc36965bdddb3f048c07b6920593a57d6ffff001 SHA512 9ef75fe8465b602db4d9645535f9ce228af6afffac7309c5f3e7dbe266fe5c89a08e96bc53c2fb4a364a8c3ec6c3d87579eb076d6ba005499f0f4f07316caecb
diff --git a/dev-vcs/git-cola/files/README.gentoo b/dev-vcs/git-cola/files/README.gentoo
new file mode 100644
index 000000000000..0f4af85d5ccc
--- /dev/null
+++ b/dev-vcs/git-cola/files/README.gentoo
@@ -0,0 +1,3 @@
+Please make sure you have either a SSH key management installed and activated or
+installed a SSH askpass app like net-misc/x11-ssh-askpass.
+Otherwise git-cola may hang when pushing/pulling from remote git repositories via SSH.
diff --git a/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch
new file mode 100644
index 000000000000..1f58ea0eddb6
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch
@@ -0,0 +1,24 @@
+diff --git a/test/git_test.py b/test/git_test.py
+index 9f812b2..ff7da24 100644
+--- a/test/git_test.py
++++ b/test/git_test.py
+@@ -53,19 +53,6 @@ class GitCommandTest(unittest.TestCase):
+         version = self.git.version()[STDOUT]
+         self.failUnless(version.startswith('git version'))
+ 
+-    def test_tag(self):
+-        """Test running 'git tag'"""
+-        tags = self.git.tag()[STDOUT].splitlines()
+-        if os.getenv('GIT_COLA_NO_HISTORY', False):
+-            return
+-        self.failUnless('v1.0.0' in tags)
+-
+-    def test_show(self):
+-        """Test running 'git show'"""
+-        oid = 'HEAD'
+-        content = self.git.show(oid)[STDOUT]
+-        self.failUnless(content.startswith('commit '))
+-
+     def test_stdout(self):
+         """Test overflowing the stdout buffer"""
+         # Write to stdout only
diff --git a/dev-vcs/git-cola/files/index.html b/dev-vcs/git-cola/files/index.html
new file mode 100644
index 000000000000..7f1e814a0b51
--- /dev/null
+++ b/dev-vcs/git-cola/files/index.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+	<title>Missing documentation</title>
+</head>
+<body>
+<div style="border: 4px double red; padding: 2em; margin: 4em; top: 4em; width: 20em;">
+	This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled.
+
+	<p style="text-align: right;">
+	Sincerely,<br/>
+	your package maintainer.
+	</p>
+</div>
+</body>
+</html>
diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild
new file mode 100644
index 000000000000..2eb369d1340a
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo-r1 virtualx
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# Since PyQt5 is preferred at runtime if installed, depend on that
+RDEPEND="
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/QtPy[gui,${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,widgets,${PYTHON_USEDEP}]
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] ${VIRTUALX_DEPEND} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10-disable-live-tests.patch
+)
+
+python_prepare_all() {
+	# Use system QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# remove broken tests
+	rm test/i18n_test.py || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --no-vendor-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
new file mode 100644
index 000000000000..a9e87ceda54e
--- /dev/null
+++ b/dev-vcs/git-cola/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">git-cola/git-cola</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-crypt-0.3 b/dev-vcs/git-crypt-0.3
deleted file mode 100644
index 53492b27c342..000000000000
--- a/dev-vcs/git-crypt-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-vcs/git
-DESCRIPTION=transparent file encryption in git
-EAPI=5
-HOMEPAGE=https://www.agwa.name/projects/git-crypt/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/AGWA/git-crypt/archive/0.3.tar.gz -> git-crypt-0.3.tar.gz
-_md5_=4231b2a7ee8c923a929a2d1be4d161fb
diff --git a/dev-vcs/git-crypt-0.4 b/dev-vcs/git-crypt-0.4
deleted file mode 100644
index 28035a2bba35..000000000000
--- a/dev-vcs/git-crypt-0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-vcs/git
-DESCRIPTION=transparent file encryption in git
-EAPI=5
-HOMEPAGE=https://www.agwa.name/projects/git-crypt/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/AGWA/git-crypt/archive/0.4.tar.gz -> git-crypt-0.4.tar.gz
-_md5_=4231b2a7ee8c923a929a2d1be4d161fb
diff --git a/dev-vcs/git-crypt-0.5.0 b/dev-vcs/git-crypt-0.5.0
deleted file mode 100644
index 8370b18f15ca..000000000000
--- a/dev-vcs/git-crypt-0.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-vcs/git
-DESCRIPTION=transparent file encryption in git
-EAPI=5
-HOMEPAGE=https://www.agwa.name/projects/git-crypt/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/AGWA/git-crypt/archive/0.5.0.tar.gz -> git-crypt-0.5.0.tar.gz
-_md5_=2b49e13163400df570678549518ef4bf
diff --git a/dev-vcs/git-crypt-0.6.0 b/dev-vcs/git-crypt-0.6.0
deleted file mode 100644
index 7b55738712e2..000000000000
--- a/dev-vcs/git-crypt-0.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-vcs/git
-DESCRIPTION=transparent file encryption in git
-EAPI=5
-HOMEPAGE=https://www.agwa.name/projects/git-crypt/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/AGWA/git-crypt/archive/0.6.0.tar.gz -> git-crypt-0.6.0.tar.gz
-_md5_=942ea9c7245b8be9afacd427e9e3fc7e
diff --git a/dev-vcs/git-crypt/Manifest b/dev-vcs/git-crypt/Manifest
new file mode 100644
index 000000000000..a8f8b9d008d9
--- /dev/null
+++ b/dev-vcs/git-crypt/Manifest
@@ -0,0 +1,9 @@
+DIST git-crypt-0.3.tar.gz 20660 BLAKE2B 7bc71c247faa773ec4866492ae5917a6b5c7a7a2f676cfcbb4ab3642d8433c15476049165c37bf8d1aaf5fdbb1db9ce7e5137865f126086a4b575da4b21b38d8 SHA512 526630e58a2e74bffe954bc2f489311fb2261337092a1c4462788d9412b7fa7b1aa744402558bba39fe776cfa6333700c4e0ad651d262a7ca14d920485192adc
+DIST git-crypt-0.4.tar.gz 44146 BLAKE2B 69e8c9a99f763c0b20c0d467ea8212a4688cb7e8f6d9b8241a20ae65680f7faea76a14794f2b01992b570a7adae518a79945b0e477cc539b7eb515c3729a853c SHA512 aa146d922258c4a68ad1a211b58e3b1e1b1135661ebecf3ede1b344fc93401eb9d0aa51cfa068f76fab3ab7c936ad6cf46e61e0e9505aaf4f338e54826ae88f6
+DIST git-crypt-0.5.0.tar.gz 56694 BLAKE2B c82af3313523615a3839ee68210134cca898c78009e9b6edcfbdf14146dff81eafc909f135992367181278c584733affad307bdd1e1f2d32f9b8298c6d862c54 SHA512 0ed75e6962d8e8260811e048c22d724bdd63d461615e8f99c1d65a07f931f9630c1b853112f202b612dc69746a9ad03995f2947ad6fa39af56a878d993d65d77
+DIST git-crypt-0.6.0.tar.gz 57584 BLAKE2B 6557121ef4a3f49b2294f7c6268a55323b7ec192b851fac548e76a9301c65655be72f67eecc248205cefcb0184d52a55f8a462ccec0082552fce3115a18b7267 SHA512 06fd9f6dbdc5c9fa9196f3e81a87cd3688089623b2658daf9c98809d5ca14df0b7ca69fdfe8279abf575957c366f2f93bd5a6885092eb533bd0d1ed9fe9dfac5
+EBUILD git-crypt-0.3.ebuild 463 BLAKE2B 26996a0471337b69a736c44ef8cc2c248c4eef5b36c732d6180799f44d9f403ae295071739a1a267cc2df21538cf7c7182f0f17f4a761a87e4d46ccfee443a3c SHA512 aa947fe288664f9d01ade481b0fe11d4553a6c0c9d9f3a296441a40e6a1e67f352c3c9785ec8d0bfca7773607c20acac56526dc2b3de9f8289e416deb30a6f7e
+EBUILD git-crypt-0.4.ebuild 463 BLAKE2B 26996a0471337b69a736c44ef8cc2c248c4eef5b36c732d6180799f44d9f403ae295071739a1a267cc2df21538cf7c7182f0f17f4a761a87e4d46ccfee443a3c SHA512 aa947fe288664f9d01ade481b0fe11d4553a6c0c9d9f3a296441a40e6a1e67f352c3c9785ec8d0bfca7773607c20acac56526dc2b3de9f8289e416deb30a6f7e
+EBUILD git-crypt-0.5.0.ebuild 463 BLAKE2B b21d074df802608dc67b866ed27c923009df38e42dbcb932a6bb66e0368c8e3191a6dfd805f9041a2f1984e47f9c5c2b4d36ae37c854014862c489a607d106d3 SHA512 3fb5f22814a1b8dfa6350cb476ce895723c245ed502952239ee001cfb368093d19234a4a5126c28423f1766e67d382ba41f775132eb1a374d3f58c0694b1f9b0
+EBUILD git-crypt-0.6.0.ebuild 463 BLAKE2B 3ba00302628888e104e0f05bbfc80481be9691a7b6a3f96abfd2ada758035387c84ad4c2398e434ecbb3faf453d983a2b73b25d88d482f45dca225c0d089b54d SHA512 0abbd6dda1fe03dfb67f9e481da37f1f4c5c97543dab66c8eb5c7abefa523935a96704ed7f7e7bbc1281bfdef18f7fbea6406a7303308164b04c6695f2cdc08f
+MISC metadata.xml 326 BLAKE2B 200218b3accdd8e5485e442fd23fb2eb914b4e33a5bb545573a65526740f3c48c9514cff5b34a75c39d364f94c8f19cc11522fbc168b9fed766925c65ca5e388 SHA512 b75574fb4627e4e52be50ab98bb207b8bc8f50fd67da8fa88dc00a5dbaedc36d1e955573e2abb7e27a94fa87d2a239b3e4f48900ccb7d27fc92d5009f20b6e29
diff --git a/dev-vcs/git-crypt/git-crypt-0.3.ebuild b/dev-vcs/git-crypt/git-crypt-0.3.ebuild
new file mode 100644
index 000000000000..f660d477da55
--- /dev/null
+++ b/dev-vcs/git-crypt/git-crypt-0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="transparent file encryption in git"
+HOMEPAGE="https://www.agwa.name/projects/git-crypt/"
+SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/git"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	mkdir -p "${D}"/usr/bin
+	emake PREFIX="${D}"/usr install
+}
diff --git a/dev-vcs/git-crypt/git-crypt-0.4.ebuild b/dev-vcs/git-crypt/git-crypt-0.4.ebuild
new file mode 100644
index 000000000000..f660d477da55
--- /dev/null
+++ b/dev-vcs/git-crypt/git-crypt-0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="transparent file encryption in git"
+HOMEPAGE="https://www.agwa.name/projects/git-crypt/"
+SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/git"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	mkdir -p "${D}"/usr/bin
+	emake PREFIX="${D}"/usr install
+}
diff --git a/dev-vcs/git-crypt/git-crypt-0.5.0.ebuild b/dev-vcs/git-crypt/git-crypt-0.5.0.ebuild
new file mode 100644
index 000000000000..4dfc91650e2f
--- /dev/null
+++ b/dev-vcs/git-crypt/git-crypt-0.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="transparent file encryption in git"
+HOMEPAGE="https://www.agwa.name/projects/git-crypt/"
+SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/git"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	mkdir -p "${D}"/usr/bin
+	emake PREFIX="${D}"/usr install
+}
diff --git a/dev-vcs/git-crypt/git-crypt-0.6.0.ebuild b/dev-vcs/git-crypt/git-crypt-0.6.0.ebuild
new file mode 100644
index 000000000000..f107562053ad
--- /dev/null
+++ b/dev-vcs/git-crypt/git-crypt-0.6.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="transparent file encryption in git"
+HOMEPAGE="https://www.agwa.name/projects/git-crypt/"
+SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/git"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	mkdir -p "${D}"/usr/bin
+	emake PREFIX="${D}"/usr install
+}
diff --git a/dev-vcs/git-crypt/metadata.xml b/dev-vcs/git-crypt/metadata.xml
new file mode 100644
index 000000000000..16fca555475a
--- /dev/null
+++ b/dev-vcs/git-crypt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">AGWA/git-crypt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-deploy-6.0.1_p20131024 b/dev-vcs/git-deploy-6.0.1_p20131024
deleted file mode 100644
index a559159ac908..000000000000
--- a/dev-vcs/git-deploy-6.0.1_p20131024
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl test? ( dev-vcs/git virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes virtual/perl-Memoize virtual/perl-Data-Dumper virtual/perl-File-Temp ) dev-lang/perl[-build(-)]
-DESCRIPTION=make deployments so easy that you'll let new hires do them on their first day
-EAPI=5
-HOMEPAGE=https://github.com/git-deploy/git-deploy
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl dev-vcs/git virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes virtual/perl-Memoize virtual/perl-Data-Dumper dev-lang/perl[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/git-deploy/git-deploy/archive/e9ef93debd12d85e70676dd79b4bd78ac2b05271.tar.gz -> git-deploy-6.0.1_p20131024.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2595ebf2113dcc247d9db84fb4dbb708
diff --git a/dev-vcs/git-deploy/Manifest b/dev-vcs/git-deploy/Manifest
new file mode 100644
index 000000000000..1cc9edb8813f
--- /dev/null
+++ b/dev-vcs/git-deploy/Manifest
@@ -0,0 +1,3 @@
+DIST git-deploy-6.0.1_p20131024.tar.gz 55394 BLAKE2B 7d2f7578948033e182e271c44752be27bcddc4b2480a795d110675feea9408ac7b786b135f058f224f5edcbb184bcd022b19bb3d7614a366ec29b2ea4d5f6d2b SHA512 cf3504b8f40d86cd8322ed93f2fe43593bcbf2db37685d3337b89501f39b38298dfb6d6cd51dd3f518f6048b680446a1660b85887ef73647829608e77b497634
+EBUILD git-deploy-6.0.1_p20131024.ebuild 1401 BLAKE2B a5d65369e12757b875b4e80cb0c7ad56c406f10dd498716fc16664c06a45b311641f7061b3437f814a95e744d2150b4e64abacdb7daf967b3c3039a99bf2bd32 SHA512 63b71fd006776eff4cc7a77311746446796fc3a230ca61756455861c76bef72a7cd4a0cbcc70c17e05456d76ab3425e37f8a6d7b5ea6712123837e99b78912ab
+MISC metadata.xml 253 BLAKE2B 418a1c1e806a98951e739e1e18cc2a0417643c0629c49cec5e7e51f8de4bebf072c046bf749e757d5723dd41064544f18514c12dfd3b9c9c47c6c74167fafbf5 SHA512 21be5cc9f7b4fc3af74661ab49aa067574a2028f25c5175aa4d137ab77d00c51fa705c44a94e13b784d91ecf9d4e43a4a4ccf0abf63aed814e9382448519ae82
diff --git a/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024.ebuild b/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024.ebuild
new file mode 100644
index 000000000000..da2005af964f
--- /dev/null
+++ b/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-app
+
+COMMIT="e9ef93debd12d85e70676dd79b4bd78ac2b05271"
+
+DESCRIPTION="make deployments so easy that you'll let new hires do them on their
+first day"
+HOMEPAGE="https://github.com/git-deploy/git-deploy"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+COMMON_DEPEND="dev-vcs/git
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Time-HiRes
+	virtual/perl-Memoize
+	virtual/perl-Data-Dumper"
+DEPEND="dev-lang/perl
+	test? (
+		${COMMON_DEPEND}
+		virtual/perl-File-Temp
+		)"
+RDEPEND="dev-lang/perl
+${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	pod2man -n git-deploy README.pod > git-deploy.1 || die
+}
+
+src_test() {
+	local testdir=${TMPDIR}/git-deploy-test
+
+	# Prepare for tests
+	cp -a "${S}/" $testdir || die
+	cd $testdir || die
+
+	git config --global user.name "git-deploy" || die
+	git config --global user.email "git-deploy@localhost" || die
+
+	git init . || die
+	git add . || die
+	git commit -a -m 'git-deploy testing' || die
+
+	USER="git-deploy" perl t/run.t || die
+}
+
+src_install() {
+	dobin git-deploy
+
+	insinto $VENDOR_LIB
+	doins -r lib/Git
+
+	doman git-deploy.1
+
+	newdoc Changes ChangeLog
+}
diff --git a/dev-vcs/git-deploy/metadata.xml b/dev-vcs/git-deploy/metadata.xml
new file mode 100644
index 000000000000..115e717d1b5e
--- /dev/null
+++ b/dev-vcs/git-deploy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">git-deploy/git-deploy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-deps-9999 b/dev-vcs/git-deps-9999
deleted file mode 100644
index 62b8d586dff7..000000000000
--- a/dev-vcs/git-deps-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygit2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/nodejs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=git commit dependency analysis tool
-EAPI=6
-HOMEPAGE=https://github.com/aspiers/git-deps
-IUSE=python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygit2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/nodejs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c962c90f6e10c4448feafdb5c70110b
diff --git a/dev-vcs/git-deps/Manifest b/dev-vcs/git-deps/Manifest
new file mode 100644
index 000000000000..28ff61877288
--- /dev/null
+++ b/dev-vcs/git-deps/Manifest
@@ -0,0 +1,2 @@
+EBUILD git-deps-9999.ebuild 1028 BLAKE2B d8fdc91d0ce0fefe9314243f60b3dfe5965398094f4680893a3d1ed993987da80e880ba97bb2cc3c71963b650790dfb32b8dd9f04b8a0624b18d7e307f308daf SHA512 2e8826945a6840739f83a266e388fd79ced5394a501d322113e80260711cc1b493d1a060d30b21ca9f967a1651cdd1fcb239a6a390e48488b62c69db6f7e655c
+MISC metadata.xml 490 BLAKE2B 12b1fd6d7c20349fe5ed2f76cfec260442479834c1cba9ef26722719ff6ea8b0d760519d8f7a62220e10b90b4e328a93898a61c974ece364736d1ad4a9828e8b SHA512 005daa7d1c3abffad1bda794339947dabfdb097a2abe85a1ea5b85fd962332d788d2903301f2b3442a3f35f5b97eb25d3ddd1add00460108ffc857f57c3fa926
diff --git a/dev-vcs/git-deps/git-deps-9999.ebuild b/dev-vcs/git-deps/git-deps-9999.ebuild
new file mode 100644
index 000000000000..f66f91356572
--- /dev/null
+++ b/dev-vcs/git-deps/git-deps-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/aspiers/git-deps"
+EGIT_BRANCH=master
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils git-r3 python-single-r1
+
+DESCRIPTION="git commit dependency analysis tool"
+HOMEPAGE="https://github.com/aspiers/git-deps"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/pygit2[${PYTHON_USEDEP}]
+	net-libs/nodejs
+	${PYTHON_DEPS}
+	"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+HTML_DOCS="html/."
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	python_newscript git-deps.py git-deps
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "Notes regarding the '--serve' option:"
+	elog "Please run 'npm install browserify' once"
+	elog "Copy the html sources:"
+	elog "rsync -av ${EROOT}/usr/share/${PN}/html ~/git-deps-html"
+	elog "cd ~/git-deps-html"
+	elog "npm install"
+	elog "browserify -t coffeeify -d js/git-deps-graph.coffee -o js/bundle.js"
+}
diff --git a/dev-vcs/git-deps/metadata.xml b/dev-vcs/git-deps/metadata.xml
new file mode 100644
index 000000000000..1a9f54bc290b
--- /dev/null
+++ b/dev-vcs/git-deps/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
+	</maintainer>
+	<longdescription lang="en">
+		git-deps is a tool for performing automatic analysis of dependencies
+		between commits in a git repository.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">aspiers/git-deps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-flow-1.11.0 b/dev-vcs/git-flow-1.11.0
deleted file mode 100644
index c37e35da8a0b..000000000000
--- a/dev-vcs/git-flow-1.11.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Git extensions to provide high-level repository operations
-EAPI=6
-HOMEPAGE=https://github.com/petervanderdoes/gitflow-avh
-KEYWORDS=amd64 x86
-LICENSE=BSD MIT
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/petervanderdoes/gitflow-avh/archive/1.11.0.tar.gz -> git-flow-1.11.0.tar.gz https://github.com/petervanderdoes/git-flow-completion/archive/0.6.0.tar.gz -> git-flow-completion-0.6.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8f9b4b3fcf4468c698278e92ecf54a5f
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
new file mode 100644
index 000000000000..86a9d8ec70dd
--- /dev/null
+++ b/dev-vcs/git-flow/Manifest
@@ -0,0 +1,4 @@
+DIST git-flow-1.11.0.tar.gz 64077 BLAKE2B 7761ed8020039b2fe9fad23664c5e8d0ad754033e80b3cf402fae5e72331a79ac548f8676f9e8c5d6fe5d7032a5c25770563300d7be81834c3d47869a374ee6b SHA512 3659f876febbec10457ba7ba1ecbaeb7f29b11cc8caf94042f54b8f8e2265d2bb31cbcdf7dfafae9c5d04e0ca57adddfa67f9e67df4a5dcf0bc412f1216a3c07
+DIST git-flow-completion-0.6.0.tar.gz 7823 BLAKE2B 24dedfc0cddb5acfa57333895533f5c882a0c85db6e08539ff5c33f984eec40cb06da6d5f0ba812348c9cbf226080875de0269b295791ee5d4c8b2732a1ea1b2 SHA512 1082ad47938ec78045f4cbd12340a82960ba3de204c21a95e1166cb0b86e96dbbc3e5fc8af1945c951d5edd43b4026021761e8377795acbb87af3c1e391cb256
+EBUILD git-flow-1.11.0.ebuild 875 BLAKE2B 3445769bbef1aead384faa88885d548a0d2e6d8ca0b44961ec4fe4083a3b45269e239578f89faadfaece212dfe2ee7323e1556671448de9c4a16e4b79d14c165 SHA512 80bf365af3b108224722bba8b1459c9adc34178d8b4ac0b46c7ac353b5548e3f7bcfeee9ff40d3219fba665664a25f06dd9307d31e7251d50e2f559c7d1952b7
+MISC metadata.xml 479 BLAKE2B bc1220bb065da9d65d28929adbe6cd94672f6cc92c9dea3a0468048da5a46ab8402cee64b6b63b7ebba7c9efa3acb061fe65e0bac37cc7a346b246049dabbee9 SHA512 12507dc676fc74a491390f9d15733c2a4ceb8f67d7a447aa2068e10f8f7f6020bb031d00a3c1192a01eb89e8d356fe8f200baa35d06c1182432b5aa12fedce9f
diff --git a/dev-vcs/git-flow/git-flow-1.11.0.ebuild b/dev-vcs/git-flow/git-flow-1.11.0.ebuild
new file mode 100644
index 000000000000..d42ac93ef3cc
--- /dev/null
+++ b/dev-vcs/git-flow/git-flow-1.11.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-/}-avh"
+COMP_PN="${PN}-completion"
+COMP_PV="0.6.0"
+COMP_P="${COMP_PN}-${COMP_PV}"
+inherit bash-completion-r1
+
+DESCRIPTION="Git extensions to provide high-level repository operations"
+HOMEPAGE="https://github.com/petervanderdoes/gitflow-avh"
+SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-vcs/git
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	true
+}
+
+src_install() {
+	emake prefix="${D}/usr" install
+	einstalldocs
+	newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
+}
diff --git a/dev-vcs/git-flow/metadata.xml b/dev-vcs/git-flow/metadata.xml
new file mode 100644
index 000000000000..2b1cda651a62
--- /dev/null
+++ b/dev-vcs/git-flow/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<longdescription>
+		Git extensions to provide high-level repository operations for Vincent
+		Driessen's branching model.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">petervanderdoes/gitflow-avh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-imerge-1.0.0 b/dev-vcs/git-imerge-1.0.0
deleted file mode 100644
index a502de4695b3..000000000000
--- a/dev-vcs/git-imerge-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-python/docutils
-DESCRIPTION=Incremental merge for git
-EAPI=6
-HOMEPAGE=https://github.com/mhagger/git-imerge
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/mhagger/git-imerge/archive/v1.0.0.tar.gz -> git-imerge-1.0.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3e89bceb7305e1c4de2f39f7ad85d2eb
diff --git a/dev-vcs/git-imerge/Manifest b/dev-vcs/git-imerge/Manifest
new file mode 100644
index 000000000000..15ade50fdb08
--- /dev/null
+++ b/dev-vcs/git-imerge/Manifest
@@ -0,0 +1,4 @@
+AUX git-imerge.bashcomplete 4714 BLAKE2B 5e994a45e4d243611078a8f9d08019d24ce9ab80d4f59502e47bca94baadf122e8ae9a6218b58c4268a783cc5d7e03bee7bf26d8a39d853a9bd3ac3edb189133 SHA512 a1399072ca9a775acc4ceebbb2c13c1608687df68f01b407e1b3ff8f9ce01e748025ac02d88bf210af609206ffd0f6e578495b3c2a66bdddf9793210714c1b42
+DIST git-imerge-1.0.0.tar.gz 58736 BLAKE2B 16665436d10d07058eeadab5d53a2325d68174f6fcf1748948d0fc4fbe11ab4fca87853bb557e167b0f485351aedd72889fcedaa70f09439d7e66b75a61d318b SHA512 919b80f157d635e3a3eb2b05cfaf8f6a7034fe6f43529c829fef0152007bce3bf5b296cc00f6db0c0a711bfb9e118c4adb0f5a2641ff841c973ff12610473e9b
+EBUILD git-imerge-1.0.0.ebuild 1071 BLAKE2B aeb219159159150dc184a8f11d701d6a5c9f1ce1c7ed07dacd1d40cffd358df986817f179ec1b898272d6f5de001a8ffad30ad4fd7050786afb7e8a5fb3001fa SHA512 58ad713ad457416256406264bbced5fca2264c43bd479f8ab2d9da0fe7ed0c3b42e3b6b8b62d8334f1a942f63d93a65a3714a03c5bbd576f1824863d005476e8
+MISC metadata.xml 250 BLAKE2B f77aee69210d3e363a8b53c018b9e998e521b273b6e10451a467bcefd917fa2f6c3443000b603ab6355bfbd091b4b366f869ca5e8e695f9846634683309aef48 SHA512 c5b2424b4f6fdfbe8267055899a39cd14d992aaea9fc8dc6d007ee495e97a2d4125a9abad94c17a4c646521759fa998a3468dae0ac4d8b12c09926fc24e7403f
diff --git a/dev-vcs/git-imerge/files/git-imerge.bashcomplete b/dev-vcs/git-imerge/files/git-imerge.bashcomplete
new file mode 100644
index 000000000000..0fe8e04f64de
--- /dev/null
+++ b/dev-vcs/git-imerge/files/git-imerge.bashcomplete
@@ -0,0 +1,267 @@
+__git_imerge_branches () {
+	git for-each-ref --format='%(refname)' refs/heads/ refs/remotes/ 2>/dev/null |
+	sed -e 's!^refs/heads/!!' -e 's!^refs/remotes/!!'
+}
+
+__git_imerge_names () {
+	git for-each-ref --format='%(refname)' refs/imerge/ 2>/dev/null |
+	sed -e 's/^refs\/imerge\/\(.*\)\/.*/\1/' -e '/manual/d' -e '/auto/d'
+}
+
+__git_imerge_goals="\
+merge
+rebase
+rebase-with-history
+full
+"
+
+__git_imerge_commands="\
+start
+merge
+rebase
+continue
+finish
+diagram
+list
+init
+record
+autofill
+simplify
+remove
+reparent
+"
+
+__git_imerge_start_options="\
+--help
+--manual
+--name
+--branch
+--goal
+--first-parent
+"
+
+__git_imerge_init_options=$__git_imerge_start_options
+
+__git_imerge_continue_options="\
+--help
+--name
+--edit
+--no-edit
+"
+
+__git_imerge_finish_options="\
+--help
+--name
+--goal
+--branch
+--force
+"
+
+__git_imerge_simplify_options=$__git_imerge_finish_options
+
+__git_imerge_merge_options="\
+--help
+--name
+--goal
+--branch
+--manual
+"
+
+__git_imerge_list_options="\
+--help
+"
+
+__git_imerge_reparent_options=$__git_imerge_list_options
+
+__git_imerge_record_options="\
+--help
+--name
+--edit
+--no-edit
+"
+
+__git_imerge_autofill_options="\
+--help
+--name
+"
+
+__git_imerge_diagram_options="\
+--help
+--name
+--commits
+--frontier
+--html
+--color
+--no-color
+"
+
+__git_imerge_remove_options=$__git_imerge_autofill_options
+
+__git_imerge_rebase_options=$__git_imerge_merge_options
+
+__git-imerge_start_completion() {
+	case "$1_$cur" in
+	--help_|--branch_|_--branch=|--name_|_--name=)
+		return
+		;;
+	--goal_*|*_--goal=*)
+		__gitcomp "$__git_imerge_goals"  "" "${cur##--goal=}"
+		return
+		;;
+	*-|*_-*?)
+		__gitcomp "$__git_imerge_start_options"
+		return
+		;;
+	esac
+	__gitcomp "$(__git_imerge_branches)"
+}
+
+__git-imerge_init_completion() {
+	__git-imerge_start_completion $1
+}
+
+__git-imerge_continue_completion() {
+	case "$1_$cur" in
+	--help_)
+		return
+		;;
+	--name_*|*_--name=*)
+                __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+                return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_continue_options"
+}
+
+__git-imerge_finish_completion() {
+	case "$1_$cur" in
+	--help_)
+		return
+		;;
+	--goal_*|*_--goal=*)
+		__gitcomp "$__git_imerge_goals" "" "${cur##--goal=}"
+		return
+		;;
+	--branch_*|*_--branch=*)
+		__gitcomp "$(__git_imerge_branches)" "" "${cur##--branch=}"
+		return
+		;;
+	--name_*|*_--name=*)
+                __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+                return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_finish_options"
+}
+
+__git-imerge_simplify_completion() {
+	__git-imerge_finish_completion $1
+}
+
+__git-imerge_merge_completion() {
+	case "$1_$cur" in
+	--help_|--branch_|_--branch=|--name_|_--name=)
+		return
+		;;
+	--goal_*|*_--goal=*)
+		__gitcomp "$__git_imerge_goals" "" "${cur##--goal=}"
+		return
+		;;
+	*-|*_-*?)
+		__gitcomp "$__git_imerge_merge_options"
+		return
+		;;
+	esac
+	__gitcomp "$(__git_imerge_branches)"
+}
+
+__git-imerge_rebase_completion() {
+	__git-imerge_merge_completion $1
+}
+
+__git-imerge_list_completion() {
+	case "$1" in
+	--help)
+		return
+		;;
+	esac
+	__gitcomp "$__git_imerge_list_options"
+}
+
+__git-imerge_reparent_completion() {
+	__git-imerge_list_completion $1
+}
+
+__git-imerge_record_completion() {
+	case "$1_$cur" in
+	--help_)
+		return
+		;;
+	--name_*|*_--name=*)
+		__gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+                return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_record_options"
+}
+
+__git-imerge_autofill_completion() {
+	case "$1_$cur" in
+	--help_)
+		return
+		;;
+	--name_*|*_--name=*)
+		__gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+                return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_autofill_options"
+}
+
+__git-imerge_remove_completion() {
+	__git-imerge_autofill_completion $1
+}
+
+__git-imerge_diagram_completion() {
+	case "$1_$cur" in
+	--help_|--html_|_--html=)
+		return
+		;;
+	--name_*|*_--name=*)
+		__gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+		return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_diagram_options"
+}
+
+_git_imerge () {
+	# Disable default filename completion.  Note that "compopt" is only
+	# available in Bash 4 and newer, so we check for existence before
+	# trying to use it.
+	type compopt >/dev/null 2>&1 && compopt +o default +o bashdefault
+
+	local i command cur_opt
+	for ((i=0; i <= ${cword}; i++)); do
+		if [ -n "$command" ] && [ "${words[i]}" != "$cur" ]; then
+			cur_opt="${words[i]}"
+		fi
+		if [ -z "$command" ] && \
+		   [ "$i" -lt "${cword}" ] && \
+		   [[ "${words[i-1]}" == *"imerge"* ]]
+		then
+			command="${words[i]}"
+		fi
+	done
+
+	if test -z "$command"; then
+		__gitcomp "$__git_imerge_commands"
+		return
+	fi
+
+	if [ -z `type -t __git-imerge_"$command"_completion "$cur_opt"` ]; then
+		return
+	fi
+
+	__git-imerge_"$command"_completion "$cur_opt"
+}
diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
new file mode 100644
index 000000000000..249da409f76c
--- /dev/null
+++ b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 python-r1
+
+DESCRIPTION="Incremental merge for git"
+HOMEPAGE="https://github.com/mhagger/git-imerge"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-vcs/git"
+DEPEND="dev-python/docutils"
+
+src_compile() {
+	for doc in *.rst; do
+		rst2html.py "${doc}" > "${T}/${doc/.rst/.html}" \
+			|| die "failed to convert ${doc} to ${T}/${doc/.rst/.html}"
+	done
+
+	rst2s5.py \
+		--theme=small-white \
+		--current-slide \
+		doc/presentations/GitMerge-2013/talk.rst \
+		"${T}/talk.html" \
+		|| die 'failed to convert talk.rst to ${T}/talk.html'
+}
+
+src_install() {
+	python_foreach_impl python_doscript "${PN}"
+	newbashcomp "${FILESDIR}/git-imerge.bashcomplete" git-imerge
+	dodoc *.rst "${T}"/*.html
+
+	# Don't forget the CSS for the presentation.
+	dodoc -r "${T}/ui"
+}
diff --git a/dev-vcs/git-imerge/metadata.xml b/dev-vcs/git-imerge/metadata.xml
new file mode 100644
index 000000000000..33aa1137112c
--- /dev/null
+++ b/dev-vcs/git-imerge/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">mhagger/git-imerge</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-lfs-2.4.2 b/dev-vcs/git-lfs-2.4.2
deleted file mode 100644
index 7849ada31f10..000000000000
--- a/dev-vcs/git-lfs-2.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=doc? ( app-text/ronn ) >=dev-lang/go-1.9
-DESCRIPTION=command line extension and specification for managing large files with Git
-EAPI=6
-HOMEPAGE=https://git-lfs.github.com/
-IUSE=+doc
-KEYWORDS=~amd64
-LICENSE=MIT BSD BSD-2 BSD-4 Apache-2.0
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/git-lfs/git-lfs/archive/v2.4.2.tar.gz -> git-lfs-2.4.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=87dd9a9cc156fb9060bcff4dfe10ac29
diff --git a/dev-vcs/git-lfs-9999 b/dev-vcs/git-lfs-9999
deleted file mode 100644
index 1de5ec2bcc3e..000000000000
--- a/dev-vcs/git-lfs-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.9
-DESCRIPTION=command line extension and specification for managing large files with Git
-EAPI=6
-HOMEPAGE=https://git-lfs.github.com/
-IUSE=+doc
-LICENSE=MIT BSD BSD-2 BSD-4 Apache-2.0
-RDEPEND=dev-vcs/git
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0fdc807d24750ec4f07387f105af0fe3
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
new file mode 100644
index 000000000000..f486e93c7ac1
--- /dev/null
+++ b/dev-vcs/git-lfs/Manifest
@@ -0,0 +1,4 @@
+DIST git-lfs-2.4.2.tar.gz 791443 BLAKE2B 6c613ad5b644f609b36a6a5c569c3512713d0f5fc925be759b20a01ca0e57573246557e887e086b52c5703db9db4d8a49fe91761efec48410738724256cac9e9 SHA512 c89a15c36b9d52091eb6e89f8e1db23b03f35333794467432ee49728ba83fc5d25d238f5df49bf736a4a3079778d70a527db01c2299ecd96a7b5f70059616967
+EBUILD git-lfs-2.4.2.ebuild 969 BLAKE2B 4e7349b225cdae63ab30312a30a8c58deec1d89cc238dfecf505986ce1f798607b3fb63dd1b5ad22dc74bc8428d51e0532580cdf6b37628afa730e7b104445f3 SHA512 73e9130ecf33dc94f5067353d183306643167897f5ff450185d057ca8b7089cec2bd173b08e97042df2483b500136654d1f62275d7242b25857bd4ad7f5f2584
+EBUILD git-lfs-9999.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
+MISC metadata.xml 331 BLAKE2B ec49bde06277ccbdacd3b6c50e0e32c5b14464ad015e1a7a57446e905d0ed9b3b0b71650a455a3b77c5e0ac2530874f37327b1fef3c924577b08c1e1c815c201 SHA512 51f68466f5396fe0326aab5f3a5fa70761647d722d02339fd6072d21976dfd27fdafa1ee44680be98dd0c1b80b29801eb7ed1508aa850104bed564c5f1a38011
diff --git a/dev-vcs/git-lfs/git-lfs-2.4.2.ebuild b/dev-vcs/git-lfs/git-lfs-2.4.2.ebuild
new file mode 100644
index 000000000000..a3aad04e586d
--- /dev/null
+++ b/dev-vcs/git-lfs/git-lfs-2.4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/git-lfs/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="command line extension and specification for managing large files with Git"
+HOMEPAGE="https://git-lfs.github.com/"
+
+LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0"
+SLOT="0"
+IUSE="+doc"
+
+DEPEND="doc? ( app-text/ronn )"
+
+RDEPEND="dev-vcs/git"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	# can't use golang-build_src_compile for go generate
+	# and others steps executed by build.go
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+	go run script/*.go -cmd build || die "build failed"
+
+	if use doc; then
+		ronn docs/man/*.ronn || die "man building failed"
+	fi
+}
+
+src_install() {
+	dobin bin/git-lfs
+
+	use doc && doman docs/man/*.1
+}
diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild
new file mode 100644
index 000000000000..7a32ca36cc92
--- /dev/null
+++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/git-lfs/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="command line extension and specification for managing large files with Git"
+HOMEPAGE="https://git-lfs.github.com/"
+
+LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0"
+SLOT="0"
+IUSE="+doc"
+
+# since version 2.0.2 git-lfs uses time.Until that was introduced in golang >=1.8
+# https://github.com/golang/go/commit/67ea710792eabdae1182e2bf4845f512136cccce
+DEPEND=">=dev-lang/go-1.8.1:=
+	doc? ( app-text/ronn )"
+
+RDEPEND="dev-vcs/git"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	# can't use golang-build_src_compile for go generate
+	# and others steps executed by build.go
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+	go run script/*.go -cmd build || die "build failed"
+
+	if use doc; then
+		ronn docs/man/*.ronn || die "man building failed"
+	fi
+}
+
+src_install() {
+	dobin bin/git-lfs
+
+	use doc && doman docs/man/*.1
+}
diff --git a/dev-vcs/git-lfs/metadata.xml b/dev-vcs/git-lfs/metadata.xml
new file mode 100644
index 000000000000..657593267204
--- /dev/null
+++ b/dev-vcs/git-lfs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mudler@gentoo.org</email>
+		<name>Ettore Di Giacinto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">git-lfs/git-lfs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-mailz-0.12 b/dev-vcs/git-mailz-0.12
deleted file mode 100644
index ec9ded729923..000000000000
--- a/dev-vcs/git-mailz-0.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Send a collection of patches as emails
-EAPI=5
-HOMEPAGE=https://github.com/roman-neuhauser/git-mailz/
-KEYWORDS=~x86 ~amd64
-LICENSE=MIT
-RDEPEND=virtual/mta dev-vcs/git app-shells/zsh
-SLOT=0
-SRC_URI=http://codex.sigpipe.cz/git-mailz/git-mailz-0.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50df76590216ef0e633e871b1c011c7c
diff --git a/dev-vcs/git-mailz-0.14 b/dev-vcs/git-mailz-0.14
deleted file mode 100644
index 711b81c1ddd5..000000000000
--- a/dev-vcs/git-mailz-0.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Send a collection of patches as emails
-EAPI=5
-HOMEPAGE=https://github.com/roman-neuhauser/git-mailz/
-KEYWORDS=~x86 ~amd64
-LICENSE=MIT
-RDEPEND=virtual/mta dev-vcs/git app-shells/zsh
-SLOT=0
-SRC_URI=http://codex.sigpipe.cz/git-mailz/git-mailz-0.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50df76590216ef0e633e871b1c011c7c
diff --git a/dev-vcs/git-mailz/Manifest b/dev-vcs/git-mailz/Manifest
new file mode 100644
index 000000000000..b09da20226f2
--- /dev/null
+++ b/dev-vcs/git-mailz/Manifest
@@ -0,0 +1,5 @@
+DIST git-mailz-0.12.tar.gz 7957 BLAKE2B 9969833c70f7d3f3d5c40a4d1c8a7a8ef0f70f4c598c2370837d2e406e4ed232f115cf812a73dc36c8b822111bb900103a85f3037727ebff5e1b2ba141e66acd SHA512 811f646e5d89fa3e870fbd59e79e350329097f5533b42e7830409f97bfc35248cf1965591df40300bd6ef5a44c71928504dc0b8aba1037126df3b5bd7a427b51
+DIST git-mailz-0.14.tar.gz 8204 BLAKE2B e008216319b2ec39eed132e4c2792afabc75066b390d04f3a9e645aab234391f9d07c0fea3d965a4fe67b39f87536c2f2b3ee0959ecfdfabc7fb2e1a3c10c2de SHA512 fd6c518de135113482f2f3a4e9d89b41b1797c8219e1ed9f424a5c4ae575400e7ccd9f835b40be5d74a5eb4e1bc7d3dfedd2412a317baea7e20494169399b70c
+EBUILD git-mailz-0.12.ebuild 461 BLAKE2B a274477dc5abd66986f690a7db8a6338397e3b202acbaa4a607c7dfc61a8f6578935eedc8d48c1490092886eb757da5c830ada849ca27e554550362c43439138 SHA512 6cefd784b8ae35ff75578f1fc43b48fcabfcfb72a34450220881a97e462678eafe78ffa8438e3a3a5da8cf46efe27da965ab298fdb82c9b27fc3d1412e475c6a
+EBUILD git-mailz-0.14.ebuild 461 BLAKE2B a274477dc5abd66986f690a7db8a6338397e3b202acbaa4a607c7dfc61a8f6578935eedc8d48c1490092886eb757da5c830ada849ca27e554550362c43439138 SHA512 6cefd784b8ae35ff75578f1fc43b48fcabfcfb72a34450220881a97e462678eafe78ffa8438e3a3a5da8cf46efe27da965ab298fdb82c9b27fc3d1412e475c6a
+MISC metadata.xml 229 BLAKE2B f2abfcaec1b469544c5094656d389fe3bb7a0cfe5fcc9371bf7481aaf93b547e15a245ada19376d1373191e954f0cb55b18cc884b66847e9222393f871f84880 SHA512 18a8ec97aa22f33e08ffff064432cc7df075a4b9d3e7683709585f4419147ca5e9baceb8125311ba335b4341d6235fbf775bae3d9e9ce98b6b5d20943035e15f
diff --git a/dev-vcs/git-mailz/git-mailz-0.12.ebuild b/dev-vcs/git-mailz/git-mailz-0.12.ebuild
new file mode 100644
index 000000000000..37c7bb801c62
--- /dev/null
+++ b/dev-vcs/git-mailz/git-mailz-0.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Send a collection of patches as emails"
+HOMEPAGE="https://github.com/roman-neuhauser/git-mailz/"
+
+SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=""
+
+RDEPEND="
+	virtual/mta
+	dev-vcs/git
+	app-shells/zsh
+"
+
+src_install(){
+	emake PREFIX="${ED}/usr" install
+}
diff --git a/dev-vcs/git-mailz/git-mailz-0.14.ebuild b/dev-vcs/git-mailz/git-mailz-0.14.ebuild
new file mode 100644
index 000000000000..37c7bb801c62
--- /dev/null
+++ b/dev-vcs/git-mailz/git-mailz-0.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Send a collection of patches as emails"
+HOMEPAGE="https://github.com/roman-neuhauser/git-mailz/"
+
+SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=""
+
+RDEPEND="
+	virtual/mta
+	dev-vcs/git
+	app-shells/zsh
+"
+
+src_install(){
+	emake PREFIX="${ED}/usr" install
+}
diff --git a/dev-vcs/git-mailz/metadata.xml b/dev-vcs/git-mailz/metadata.xml
new file mode 100644
index 000000000000..94169fb21b01
--- /dev/null
+++ b/dev-vcs/git-mailz/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">roman-neuhauser/git-mailz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-mantle-0.6 b/dev-vcs/git-mantle-0.6
deleted file mode 100644
index c7c9f87f11b3..000000000000
--- a/dev-vcs/git-mantle-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=test? ( dev-util/cram )
-DESCRIPTION=Generate an overview of changes on a branch
-EAPI=7
-HOMEPAGE=https://github.com/roman-neuhauser/git-mantle
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git app-shells/zsh
-SLOT=0
-SRC_URI=http://codex.sigpipe.cz/git-mantle/git-mantle-0.6.tar.gz
-_md5_=c12350d398daeec82d1c1dbc441152d4
diff --git a/dev-vcs/git-mantle/Manifest b/dev-vcs/git-mantle/Manifest
new file mode 100644
index 000000000000..fe8546e72ba2
--- /dev/null
+++ b/dev-vcs/git-mantle/Manifest
@@ -0,0 +1,3 @@
+DIST git-mantle-0.6.tar.gz 9896 BLAKE2B 80a824462fe412e60479037361adcb01162854549d2c9d0ce4358efe1d64472b157b1ee33c7cf0713e13d5cc476b665342a363c3d81a57e2c7a6ef757b6b3b63 SHA512 2498ed29884a8ac48bfb413c39e5bc9f232d47736ea4c0045404bd5f7268c7009a770c5c58c5449f843d8962bea9f288248a61308c4a71eed1b39d0c4b3375c0
+EBUILD git-mantle-0.6.ebuild 517 BLAKE2B cd828d8b9e8045e7fdc7e29a81bf3f679c2c68a6cf8df28b0702a1e34c3933fb83176cd0050df48e1685bfbbe796a930b090c7387e0bd5be7f9d87beedabdce9 SHA512 2461897b75039921807dbd73dc31a8dc8a809eedf6d790cca63538af417c05af5c921ffbe20940bf7938c76db43c72f3a72a7b1e4fd4ea24e09487ae3063f1ee
+MISC metadata.xml 230 BLAKE2B 7c95a74a5d9a847f109b0be84b769f7f9238ab3e84f015b595d901f5e858b7f4abc883a34c6996b92ea1b9cc8fd755b98e365d206bd094cf26c278a27c163085 SHA512 528359334624e6afee072dd28a99cfe5d50268578201932c66ddf88fa929d4ba3f5a68a191b5e398e70b0225f352a0a358081fb2caae77082a4fb66ef8028cfe
diff --git a/dev-vcs/git-mantle/git-mantle-0.6.ebuild b/dev-vcs/git-mantle/git-mantle-0.6.ebuild
new file mode 100644
index 000000000000..08268e572163
--- /dev/null
+++ b/dev-vcs/git-mantle/git-mantle-0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generate an overview of changes on a branch"
+HOMEPAGE="https://github.com/roman-neuhauser/git-mantle"
+
+SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="test? ( dev-util/cram )"
+RDEPEND="
+	dev-vcs/git
+	app-shells/zsh
+"
+
+src_install() {
+	# Don't install in /usr/local
+	emake PREFIX="${ED}/usr" install
+	einstalldocs
+}
diff --git a/dev-vcs/git-mantle/metadata.xml b/dev-vcs/git-mantle/metadata.xml
new file mode 100644
index 000000000000..78e1940123b5
--- /dev/null
+++ b/dev-vcs/git-mantle/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">roman-neuhauser/git-mantle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-merge-changelog-20140223 b/dev-vcs/git-merge-changelog-20140223
deleted file mode 100644
index f1fad315e853..000000000000
--- a/dev-vcs/git-merge-changelog-20140223
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Git merge driver for GNU style ChangeLog files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gnulib/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/git-merge-changelog-20140223.tar.xz
-_md5_=730609538ab3bd754c6134cce1ab3f79
diff --git a/dev-vcs/git-merge-changelog-20170131 b/dev-vcs/git-merge-changelog-20170131
deleted file mode 100644
index fd25a4d6de4a..000000000000
--- a/dev-vcs/git-merge-changelog-20170131
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Git merge driver for GNU style ChangeLog files
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gnulib/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/git-merge-changelog-20170131.tar.xz
-_md5_=afda5204f49c789a9ef14efad613a759
diff --git a/dev-vcs/git-merge-changelog/Manifest b/dev-vcs/git-merge-changelog/Manifest
new file mode 100644
index 000000000000..5a3be7c17d76
--- /dev/null
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -0,0 +1,5 @@
+DIST git-merge-changelog-20140223.tar.xz 298332 BLAKE2B 25a16f5b5b29c6a7eee0a53e37628968d528338870e270a1ad34ba4fbf358ef5ed3347f40c720b8d38c05042940ec48f0ee84877e75e67fdb480e44eba23c6df SHA512 ea5fcb0a0839e37976e333dc773d0bca43a1fce4821af08c5baba8e5783e129f8b4de4efd4b1b3399a7c1d3796e4094916843ac2d360d81396d67f571e020638
+DIST git-merge-changelog-20170131.tar.xz 315000 BLAKE2B a2a9e35d5973b43ebe1ae481cb59b0a8a43d517f82d5eb69f33c0a10ee1c32c1df3b25c93629dccc15f8d5bf28d9849dba1986f8443d6c4c0079314335d7de42 SHA512 4d7a5d9edf7bf52fcdd0934e842297364fc0ae0972b309d7221059856e0c87abd437edc1451a61ee4a6924f77d95c1c743b3a6a31b3bc039e2278fc38039c786
+EBUILD git-merge-changelog-20140223.ebuild 701 BLAKE2B 0974e0d2976be6a11b6494a4ea71be164d58d9be2591057fb6c6f0fbcce34eb86ddc257c73ee0ba5186553794365e66b96adc8fbf9733b67e2cb8a52ff527ce1 SHA512 ed81173c742da63942656f0edfa6c7c46186010ff6b18ecdf7f88f06aad345733c3f50414724222bfe79a729bc61899b87040e6c0b7138acb56680ab85c2420d
+EBUILD git-merge-changelog-20170131.ebuild 740 BLAKE2B 29c220fe2603b60685ec97ac7d36b3458af19e9a641d9797683fcb7c39ee021c6db7df5f52041a6fe8ddbd12e0dc4284f8b9eb4d2283e4639d53f8e2ab44562e SHA512 90c0de7803eaccf2fc1a394d3232d967dbf9a179114d9fb4dfc1383b8f7e1b42230743982137cfd3ccf1c9387e5297e891307eefb82350fe35b855d11177e8ca
+MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild b/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
new file mode 100644
index 000000000000..8567ded85f7b
--- /dev/null
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
+# ./gnulib-tool --create-testdir --without-tests --dir=${PN} ${PN};
+# cd ${PN}; ./configure; make maintainer-clean
+
+EAPI=5
+
+DESCRIPTION="Git merge driver for GNU style ChangeLog files"
+HOMEPAGE="https://www.gnu.org/software/gnulib/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -n "/README/{h;:x;n;/^#/!{H;bx};g;s/\n*$//;s:/usr/local:${EPREFIX}/usr:g;p;q}" \
+		gllib/git-merge-changelog.c >README || die
+}
diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild b/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
new file mode 100644
index 000000000000..1a583c9fb379
--- /dev/null
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
+# ./gnulib-tool --create-testdir --without-tests --dir=${PN} ${PN};
+# cd ${PN}; ./configure; make maintainer-clean
+
+EAPI=6
+
+DESCRIPTION="Git merge driver for GNU style ChangeLog files"
+HOMEPAGE="https://www.gnu.org/software/gnulib/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	sed -n "/README/{h;:x;n;/^#/!{H;bx;};g;s/\n*$//;\
+		s:/usr/local:${EPREFIX}/usr:g;p;q;}" gllib/git-merge-changelog.c \
+		| newdoc - README; assert
+}
diff --git a/dev-vcs/git-merge-changelog/metadata.xml b/dev-vcs/git-merge-changelog/metadata.xml
new file mode 100644
index 000000000000..c665e48637be
--- /dev/null
+++ b/dev-vcs/git-merge-changelog/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>ulm@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/git-num-2.0.1 b/dev-vcs/git-num-2.0.1
deleted file mode 100644
index 4b8dc0574654..000000000000
--- a/dev-vcs/git-num-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-vcs/git ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Quickly reference files in Git using numbers
-EAPI=5
-HOMEPAGE=https://github.com/schreifels/git-num
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-vcs/git ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/schreifels/git-num/archive/v2.0.1.tar.gz -> git-num-2.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9cb5ac927a9de6f59d78879e5f03754d
diff --git a/dev-vcs/git-num/Manifest b/dev-vcs/git-num/Manifest
new file mode 100644
index 000000000000..6948d3874872
--- /dev/null
+++ b/dev-vcs/git-num/Manifest
@@ -0,0 +1,3 @@
+DIST git-num-2.0.1.tar.gz 53833 BLAKE2B 4080bb19ad15441fff5f641576a33d7df89ece30f10c159dbc3f8a659c29568dc295f4b3f7d01aacbf13ddad3347dc705d4e9f83a07c6c3bf5e7d2ae9f07763b SHA512 f35599a74b91efb3ccb6e8509ca1c7eb7c2f67cb90b131efc6693f8f36ea97adcb01026ad307746bdf0613200646da289aa315095cbae2580c4443b03e9dd040
+EBUILD git-num-2.0.1.ebuild 944 BLAKE2B 403d12dd26269ea6b67b74558a84181059a8ac91a77ea28cc340f8c4076bb7e4fd615663a37fef13108709190c802172063f3bd8ad90f3da476586439fcbddc1 SHA512 4018ecad97900ef50864576bef709e53ce8253a859a2203e84f080665a2a307677c2a6b65e600b9fc3cf94428505609d84fa38f2224aa9e9d44797dad4caa6b4
+MISC metadata.xml 250 BLAKE2B c7535e9e453a300c160cc23db68c3c9044cf2b4badd2506a548f85b0613df59ca4af598bed1612f5a03f120a4c540aeab35f855dc780f81a8299d366d7a4fb69 SHA512 1ac35f3998bc50445dbaf10ca62a8831d129f514433d51ffe3a92da1f10ab35013eb9960869a79804216e9818c23bb70e8a9b25d131dc23a5eb4bb958792d5d0
diff --git a/dev-vcs/git-num/git-num-2.0.1.ebuild b/dev-vcs/git-num/git-num-2.0.1.ebuild
new file mode 100644
index 000000000000..d3551f87af70
--- /dev/null
+++ b/dev-vcs/git-num/git-num-2.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Quickly reference files in Git using numbers"
+HOMEPAGE="https://github.com/schreifels/git-num"
+SRC_URI="https://github.com/schreifels/git-num/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND+=" test? ( dev-vcs/git )"
+RDEPEND+=" dev-vcs/git"
+
+all_ruby_prepare() {
+	# cp git-num since specs depend on the default location
+	mkdir bin || die
+	cp git-num bin || die
+
+	sed -i -e '14i`git config user.email "test-git-num@gentoo.org"`' \
+		-e '15i`git config user.name "git-num tester"`' spec/lib/git_tools.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec spec/unit.rb spec/integration.rb
+}
diff --git a/dev-vcs/git-num/metadata.xml b/dev-vcs/git-num/metadata.xml
new file mode 100644
index 000000000000..27c27617bd7c
--- /dev/null
+++ b/dev-vcs/git-num/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">schreifels/git-num</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-pimp-0.8 b/dev-vcs/git-pimp-0.8
deleted file mode 100644
index 45ed4aabaf47..000000000000
--- a/dev-vcs/git-pimp-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=test? ( dev-util/cram )
-DESCRIPTION=Code review or pull requests as patch email series
-EAPI=6
-HOMEPAGE=https://github.com/roman-neuhauser/git-mailz/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git app-shells/zsh dev-vcs/git-mailz dev-vcs/git-mantle
-SLOT=0
-SRC_URI=http://codex.sigpipe.cz/git-pimp/git-pimp-0.8.tar.gz
-_md5_=2781165537f4ff54496251bbc17df26e
diff --git a/dev-vcs/git-pimp/Manifest b/dev-vcs/git-pimp/Manifest
new file mode 100644
index 000000000000..8ff9479746c6
--- /dev/null
+++ b/dev-vcs/git-pimp/Manifest
@@ -0,0 +1,3 @@
+DIST git-pimp-0.8.tar.gz 10555 BLAKE2B d6fa64b4cff6734661b22fe8b69d552dc405c702e36abd3b7fb309ad489602facd099828b021bc813dca88b8e29c258b5be56abceebcb9d5f85c035af6d93c86 SHA512 124b61001c088685d5d9d6f848d37ca170413fda08074a273a4c1bccd233fe606028d8de82c66ae7847f42008b82a6030fa47a493ddc47b65d02b69a1acbd7df
+EBUILD git-pimp-0.8.ebuild 563 BLAKE2B 80e3856f5c22c690186ff17fa1224650f857a9c535df4733b69e9a8a7278e23ca5099dcd5d56ff27aab3f2410b67c8b4a7637ce243b87fc4c311437449c4ae26 SHA512 c39d8305aaf04dbf85059a824574a69bc8b22400cf7951d0bb03ac34568430d06a10a5123c4f58aae7d5cd2dd25e7b27093361eeb19eb6f1e7d2e062baf4c7bb
+MISC metadata.xml 229 BLAKE2B f2abfcaec1b469544c5094656d389fe3bb7a0cfe5fcc9371bf7481aaf93b547e15a245ada19376d1373191e954f0cb55b18cc884b66847e9222393f871f84880 SHA512 18a8ec97aa22f33e08ffff064432cc7df075a4b9d3e7683709585f4419147ca5e9baceb8125311ba335b4341d6235fbf775bae3d9e9ce98b6b5d20943035e15f
diff --git a/dev-vcs/git-pimp/git-pimp-0.8.ebuild b/dev-vcs/git-pimp/git-pimp-0.8.ebuild
new file mode 100644
index 000000000000..900a55ad38e0
--- /dev/null
+++ b/dev-vcs/git-pimp/git-pimp-0.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Code review or pull requests as patch email series"
+HOMEPAGE="https://github.com/roman-neuhauser/git-mailz/"
+
+SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="test? ( dev-util/cram )"
+RDEPEND="
+	dev-vcs/git
+	app-shells/zsh
+	dev-vcs/git-mailz
+	dev-vcs/git-mantle
+"
+
+src_install(){
+	# Do not install in /usr/local
+	emake PREFIX="${ED}/usr" install
+	einstalldocs
+}
diff --git a/dev-vcs/git-pimp/metadata.xml b/dev-vcs/git-pimp/metadata.xml
new file mode 100644
index 000000000000..94169fb21b01
--- /dev/null
+++ b/dev-vcs/git-pimp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">roman-neuhauser/git-mailz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-remote-hg-0.2 b/dev-vcs/git-remote-hg-0.2
deleted file mode 100644
index 58d17489ef79..000000000000
--- a/dev-vcs/git-remote-hg-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-vcs/git dev-vcs/mercurial
-DESCRIPTION=Semi-official Mercurial bridge from Git project
-EAPI=6
-HOMEPAGE=https://github.com/felipec/git-remote-hg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git dev-vcs/mercurial
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/felipec/git-remote-hg/archive/v0.2.tar.gz -> git-remote-hg-0.2.tar.gz
-_md5_=f5034699ff703b8a40500539621541ef
diff --git a/dev-vcs/git-remote-hg-0.3 b/dev-vcs/git-remote-hg-0.3
deleted file mode 100644
index 97aa26b35e26..000000000000
--- a/dev-vcs/git-remote-hg-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-vcs/git dev-vcs/mercurial app-text/asciidoc
-DESCRIPTION=Semi-official Mercurial bridge from Git project
-EAPI=6
-HOMEPAGE=https://github.com/felipec/git-remote-hg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git dev-vcs/mercurial
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/felipec/git-remote-hg/archive/v0.3.tar.gz -> git-remote-hg-0.3.tar.gz
-_md5_=5d80bed5d723c811c8fa72421c8f46c2
diff --git a/dev-vcs/git-remote-hg/Manifest b/dev-vcs/git-remote-hg/Manifest
new file mode 100644
index 000000000000..2c2b43d8dd00
--- /dev/null
+++ b/dev-vcs/git-remote-hg/Manifest
@@ -0,0 +1,5 @@
+DIST git-remote-hg-0.2.tar.gz 30397 BLAKE2B 9c96c420a9e38fb3e0a223f12343834abdb742d15140330b1f5a12b68da924466106a279802a525c085c176d706cce427e73b1f86eeb99a6a413ab6de5954b18 SHA512 eb08a90b786593602510fef6210bb381a605d6c4cfda7e0c1051162d0a9929c077081f530dcdfb95f6fd8f0114ed44ea2c8f267e0e7ac110f9445941c9dd8546
+DIST git-remote-hg-0.3.tar.gz 30995 BLAKE2B c65918a985459149df85b1519f4d4b15be53c26d28a32cb660d85fa386a488668e2d042c7687fd4ea0928237d3098d5d3bcd77f8a0e78742b530b7cc2dff1195 SHA512 33ff1874909c0ce4d8b44d1dfd6ae706df44b36ead566e09be0f4e94e3b2a5c8603bd2f2fd50e8faa99d6aeb44a7792d7118c4413f8c9a8b8c29108b534bb4f4
+EBUILD git-remote-hg-0.2.ebuild 533 BLAKE2B 2bc0641461db8c97947e64d4990e6d1672327b149b1b653777881f8c251df7ef093e2aef901f790b46c0a237efd303c49edfb3686be9f4926de46e37bfc5419b SHA512 e0ae87af402526dac263d36c5b13faa7fbac95fe7b2d897502086f010ff2c14c146800de0d51392ac60ebe2dc4a3ba74033ce166b062bd9ba2d6b46dd4d34b9c
+EBUILD git-remote-hg-0.3.ebuild 576 BLAKE2B a82d541d1c4d58f8a67d9c7902876a964eaf0dde80bca5c9ba59770b31fe79dec635ba4379a749ed27323fcd03df3000b59c183978381b07b12e94ee19994846 SHA512 369c2d2be9efb854b1564b0268b8959563a32cd372150e0c6b430e1db5bf3124a0fa84e8dd97153bdf3e9d12fc977f1ca88f9b91c4b1e8a79a9f69a0ec8555d2
+MISC metadata.xml 570 BLAKE2B de338749634d4141b4c73fe511c6b2097edd36ed633cb58ef1c9e6ddb237876d4a55f1423e2d6c04805de38b133f700a2784268dc3926cc731ccc5c8bb256a77 SHA512 07bfa78ad5d7558a6c3607e4b5dfcd2908d9227acedd4393c7a0002fed383dc85a68f6758b2013b83a6f810188c99952e7718d987f1cfddfd710f5a135ccf3d5
diff --git a/dev-vcs/git-remote-hg/git-remote-hg-0.2.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-0.2.ebuild
new file mode 100644
index 000000000000..297bee0751bb
--- /dev/null
+++ b/dev-vcs/git-remote-hg/git-remote-hg-0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=(python2_7)
+
+DESCRIPTION="Semi-official Mercurial bridge from Git project"
+HOMEPAGE="https://github.com/felipec/git-remote-hg"
+SRC_URI="https://github.com/felipec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-vcs/git
+		dev-vcs/mercurial"
+RDEPEND="${DEPEND}"
+
+# Most (21/25) tests fail:
+RESTRICT="test"
+
+src_install() {
+	dobin git-remote-hg
+}
diff --git a/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild
new file mode 100644
index 000000000000..3d5b16b08b94
--- /dev/null
+++ b/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=(python2_7)
+
+DESCRIPTION="Semi-official Mercurial bridge from Git project"
+HOMEPAGE="https://github.com/felipec/git-remote-hg"
+SRC_URI="https://github.com/felipec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-vcs/git
+		dev-vcs/mercurial"
+
+DEPEND="${CDEPEND}
+		app-text/asciidoc"
+RDEPEND="${CDEPEND}"
+
+# Most (21/25) tests fail:
+RESTRICT="test"
+
+src_install() {
+	dobin git-remote-hg
+}
diff --git a/dev-vcs/git-remote-hg/metadata.xml b/dev-vcs/git-remote-hg/metadata.xml
new file mode 100644
index 000000000000..0fe237632666
--- /dev/null
+++ b/dev-vcs/git-remote-hg/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wizardedit@gentoo.org</email>
+		<name>Austin English</name>
+	</maintainer>
+	<longdescription>
+		'git-remote-hg' is the semi-official Mercurial bridge from Git project,
+		once installed, it allows you to clone, fetch and push to and from
+		Mercurial repositories as if they were Git ones.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">felipec/git-remote-hg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-sh-1.3-r1 b/dev-vcs/git-sh-1.3-r1
deleted file mode 100644
index 3fc4e2b01f35..000000000000
--- a/dev-vcs/git-sh-1.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=A customized bash environment suitable for git work
-EAPI=6
-HOMEPAGE=https://github.com/rtomayko/git-sh
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/rtomayko/git-sh/archive/1.3.tar.gz -> git-sh-1.3.tar.gz
-_md5_=5d434fa9f57145fcdd207fc908ce4849
diff --git a/dev-vcs/git-sh/Manifest b/dev-vcs/git-sh/Manifest
new file mode 100644
index 000000000000..94efdab7925f
--- /dev/null
+++ b/dev-vcs/git-sh/Manifest
@@ -0,0 +1,3 @@
+DIST git-sh-1.3.tar.gz 26757 BLAKE2B 096ae57f6482c915b13d58370291062c5b01637e1ef2743e21024888c0a485f32dc95c97d344ff91d51617f20aa602b4af7a58206abff548c6383374fdda93ec SHA512 8ab742d0ff86e8387d03e2e190eec8ffd4725b1bfa58940f6673f5eac8c749931e3b3f8f20b898d933db36f56b323f800dba47a35294f865f456512f19a7846c
+EBUILD git-sh-1.3-r1.ebuild 500 BLAKE2B a8bd9edab0405e0ce7ccf486517fc4e763b0b587715133df1af44722ae90a1c18375a88911d6f1a3c4a8810ec46042102eca56d6e047574b3125ed4b9dc7d032 SHA512 35397d49dac9def6e64925545bc3607d56b82f5744e040ca29bc9c2373454238833097fccac460d40d0e12055e2b65a4682f9c52512843c4e2a36e25351a9db0
+MISC metadata.xml 252 BLAKE2B 0c1cd3b36e632a55a5792e1721f07c6872f53f370381ea33b58a5aa13a8fc7682734089c367f1e256f85d253c31bae48731a7cb9dec8f97381a581da47a5e557 SHA512 372af9cae870023c050be3aaf92200a8f503f2715c062849e970b79a6bd289001577a718d6720988f28f7bd675feaa347d39346983cf46836ccac27f72462aea
diff --git a/dev-vcs/git-sh/git-sh-1.3-r1.ebuild b/dev-vcs/git-sh/git-sh-1.3-r1.ebuild
new file mode 100644
index 000000000000..54b92f1a878c
--- /dev/null
+++ b/dev-vcs/git-sh/git-sh-1.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A customized bash environment suitable for git work"
+HOMEPAGE="https://github.com/rtomayko/git-sh"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+	default
+	sed -e 's/git-completion\.bash //' \
+		-e 's:/local::' \
+		-i Makefile \
+		|| die "sed failed"
+}
diff --git a/dev-vcs/git-sh/metadata.xml b/dev-vcs/git-sh/metadata.xml
new file mode 100644
index 000000000000..a207b92c2639
--- /dev/null
+++ b/dev-vcs/git-sh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">rtomayko/git-sh</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-spindle-3.3 b/dev-vcs/git-spindle-3.3
deleted file mode 100644
index 0b2f4d8e5143..000000000000
--- a/dev-vcs/git-spindle-3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Git subcommands for interacting with central services
-EAPI=6
-HOMEPAGE=http://seveas.github.io/git-spindle/
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/seveas/git-spindle/archive/3.3.tar.gz -> git-spindle-3.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a83e572249f2ac4f5a8c90b624a961a
diff --git a/dev-vcs/git-spindle-3.3-r1 b/dev-vcs/git-spindle-3.3-r1
deleted file mode 100644
index adcc61dd3ede..000000000000
--- a/dev-vcs/git-spindle-3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-vcs/git dev-python/github3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whelk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Git subcommands for interacting with central services
-EAPI=6
-HOMEPAGE=http://seveas.github.io/git-spindle/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/git dev-python/github3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whelk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/seveas/git-spindle/archive/3.3.tar.gz -> git-spindle-3.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a5040d647bc7e83cefc22a54adfb6056
diff --git a/dev-vcs/git-spindle/Manifest b/dev-vcs/git-spindle/Manifest
new file mode 100644
index 000000000000..adaaf1890ddf
--- /dev/null
+++ b/dev-vcs/git-spindle/Manifest
@@ -0,0 +1,4 @@
+DIST git-spindle-3.3.tar.gz 1854895 BLAKE2B b1330ba728a7f124024ad755ead350fc3e8b2a3065afe70f56b4053bc2a308920c5e2ec4d4bfee566ad199d58ec0cc3d25ac69be1e5999a2527a9711b79f4164 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8
+EBUILD git-spindle-3.3-r1.ebuild 686 BLAKE2B e9c8dc04465ade49dc668436582e2a7ffa7df96940dbd2ca3740f8d181926c37d9ba74ca20072f75939bf67221b9921834be198f93160884e5ff51cacc9746e3 SHA512 0de494858b2e9aee4fdb66fa15badd9cf96801527afcfb98921bc8eb6d1385af8a4e787ba03a393c933fc5566608358efdb31937db6c168e7e7134ca340035e2
+EBUILD git-spindle-3.3.ebuild 567 BLAKE2B 67cf28749db61c22c89f8850d1efcc603f5fe5539ace76a31019f7dfb594759e48e0a0af46a00eadfda7fe9287a544eb1b6edb2ba33474b254420de0ae18b281 SHA512 1cf7e0fa874fd14e8dac447d1ec5a7cf58479476ea1b63d7ae379c4ea0ed80d9e972898a49e7a08508d5ef3359911e0d57a86feebbba65cec9299d4889198aa6
+MISC metadata.xml 626 BLAKE2B f24c2dedc0f5d576e138ca4eb7a77d892c16ac5b7a96bc41161b49d39e97920ea11eea3bb3c67a72086a756ec40fae9fb8b866eb38c6fd86ba885b41f01d8cdb SHA512 7f2be03b228a372aeb1a17913d790ec69c2d02d684c9495c460fff28b00b4a36e14b66e25e0ed31f0c9c0913ff5292cff02ca690308fe3feee84b66e9b3678b6
diff --git a/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild b/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
new file mode 100644
index 000000000000..7d970a8cd2ff
--- /dev/null
+++ b/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Git subcommands for interacting with central services"
+HOMEPAGE="http://seveas.github.io/git-spindle/"
+SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-vcs/git
+	dev-python/github3[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/whelk[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/git-spindle/git-spindle-3.3.ebuild b/dev-vcs/git-spindle/git-spindle-3.3.ebuild
new file mode 100644
index 000000000000..9ebebd0d3a0b
--- /dev/null
+++ b/dev-vcs/git-spindle/git-spindle-3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Git subcommands for interacting with central services"
+HOMEPAGE="http://seveas.github.io/git-spindle/"
+SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-vcs/git
+	${PYTHON_DEPS}"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/git-spindle/metadata.xml b/dev-vcs/git-spindle/metadata.xml
new file mode 100644
index 000000000000..baa38de52430
--- /dev/null
+++ b/dev-vcs/git-spindle/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Nicolas Bock</name>
+		<email>nicolasbock@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Many central git hosting services, such as GitHub and GitLab, provide
+		an API to perform actions such as creating repositories and filing
+		pull requests. git-spindle is a collection of git subcommands to make
+		using these services easier.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">seveas/git-spindle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-tools-2015_p20151225-r2 b/dev-vcs/git-tools-2015_p20151225-r2
deleted file mode 100644
index b35ce63c061c..000000000000
--- a/dev-vcs/git-tools-2015_p20151225-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Assorted git-related scripts
-EAPI=5
-HOMEPAGE=https://github.com/MestreLion/git-tools/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-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
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-2.5 >=app-shells/bash-4.0
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/MestreLion/git-tools/archive/ff7a07daa6898fd0993180f64bd232aa4def6018.tar.gz -> git-tools-2015_p20151225.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=507f94b6c87e64ca11259cfde41f397e
diff --git a/dev-vcs/git-tools-2015_p20160201 b/dev-vcs/git-tools-2015_p20160201
deleted file mode 100644
index 3941d621369f..000000000000
--- a/dev-vcs/git-tools-2015_p20160201
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Assorted git-related scripts
-EAPI=5
-HOMEPAGE=https://github.com/MestreLion/git-tools/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-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
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-2.5 >=app-shells/bash-4.0
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/MestreLion/git-tools/archive/0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6.tar.gz -> git-tools-2015_p20160201.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aced4562442632bfb567546b4181130a
diff --git a/dev-vcs/git-tools-2015_p20160201-r1 b/dev-vcs/git-tools-2015_p20160201-r1
deleted file mode 100644
index b81c6e8b053f..000000000000
--- a/dev-vcs/git-tools-2015_p20160201-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Assorted git-related scripts
-EAPI=5
-HOMEPAGE=https://github.com/MestreLion/git-tools/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-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
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-2.5 >=app-shells/bash-4.0
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/MestreLion/git-tools/archive/0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6.tar.gz -> git-tools-2015_p20160201.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad3de781ec847187532a755cfe4ba714
diff --git a/dev-vcs/git-tools-2017.10 b/dev-vcs/git-tools-2017.10
deleted file mode 100644
index cb9f570ae6ce..000000000000
--- a/dev-vcs/git-tools-2017.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Assorted git-related scripts
-EAPI=6
-HOMEPAGE=https://github.com/MestreLion/git-tools
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-2.5 >=app-shells/bash-4.0
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/MestreLion/git-tools/archive/v2017.10.tar.gz -> git-tools-2017.10.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dd5d3d62c8ee65351174df452c8bd19a
diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
new file mode 100644
index 000000000000..079803b070a0
--- /dev/null
+++ b/dev-vcs/git-tools/Manifest
@@ -0,0 +1,10 @@
+AUX git-tools-2015_p20151225-py3.patch 533 BLAKE2B c58361f5096a2c7df56d37cd67f8eeef7f8cac63aeeef96275b57a886eabde55b700b86df49397d3aee300c0ede33be6cfe978275f935052d05931ef0efba3ea SHA512 20aed632a90dbe0b84c745a0239124f613982e21a39a23392d698bc795269c7f30673426f4e696846c309b469ace4334fa55e21ced03d89862d762219ff72c4e
+AUX git-tools-2015_p20160201-pr21.patch 1453 BLAKE2B 57b2c705eff20eee8cf6b68fec8b1f31d27b9260f445dfbc45ac2261cdf39c23fca0d26745b5bab590edccf371c47b2f2ebce9091f9030fb5806eee52a5b8a91 SHA512 7007c83d3d013c8df49eeab5bb88d8f02373b42d977562d735a92f3db81fdec33251ff684eb6c3a6e2553c73f81dc6fa186cdbcedf77bd1f1771682345f50429
+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 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/files/git-tools-2015_p20151225-py3.patch b/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch
new file mode 100644
index 000000000000..a7f59e0b04dc
--- /dev/null
+++ b/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch
@@ -0,0 +1,11 @@
+--- a/git-restore-mtime	2016-01-27 14:05:09.000000000 -0800
++++ b/git-restore-mtime	2016-01-27 21:51:17.000000000 -0800
+@@ -150,7 +150,7 @@
+                           ['--'] + args.pathspec,
+                           stdout=subprocess.PIPE)
+ for line in gitobj.stdout:
+-    lsfileslist.add(os.path.relpath(line.strip(), workdir))
++    lsfileslist.add(os.path.relpath(line.strip().decode(), workdir))
+ 
+ # List files matching user pathspec, relative to current directory
+ # git commands always print paths relative to work tree root
diff --git a/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch b/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch
new file mode 100644
index 000000000000..f921efd9be22
--- /dev/null
+++ b/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch
@@ -0,0 +1,27 @@
+diff --git a/git-restore-mtime b/git-restore-mtime
+index fbc05d9..7bbd375 100755
+--- a/git-restore-mtime
++++ b/git-restore-mtime
+@@ -74,6 +74,14 @@ parser.add_argument('--merge', '-m',
+                         'sometimes substantially. By default merge logs are only '
+                         'used for files missing from regular commit logs.')
+ 
++parser.add_argument('--first-parent',
++                    action="store_true",
++                    help='pass --first-parent to git whatchanged to hide the '
++                        'second parent from the merge commit logs. Only has any '
++                        'effect if --merge is also specified or --skip-missing '
++                        'is not specified and there were files not found in regular '
++                        'commit logs.')
++
+ parser.add_argument('--skip-missing', '-s',
+                     action="store_false", default=True, dest='missing',
+                     help='do not try to find missing files. If some files were '
+@@ -252,6 +260,7 @@ def parselog(merge=False, filterlist=[]):
+ 
+     gitobj = subprocess.Popen(gitcmd + shlex.split('whatchanged --pretty={}'.format(args.timeformat)) +
+                               (['-m'] if merge else []) +
++                              (['--first-parent'] if args.first_parent else []) +
+                               ['--'] + filterlist,
+                               stdout=subprocess.PIPE)
+     for line in gitobj.stdout:
\ No newline at end of file
diff --git a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
new file mode 100644
index 000000000000..f99994408b46
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4..5} )
+inherit python-r1
+
+DESCRIPTION="Assorted git-related scripts"
+HOMEPAGE="https://github.com/MestreLion/git-tools/"
+MY_PV="ff7a07daa6898fd0993180f64bd232aa4def6018"
+SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-vcs/git-2.5
+	>=app-shells/bash-4.0"
+
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "$FILESDIR"/git-tools-2015_p20151225-py3.patch
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommited-repos git-rebase-theirs git-strip-merge"
+	SCRIPTS_PYTHON="git-restore-mtime"
+	dobin $SCRIPTS_BASH
+	dobin $SCRIPTS_PYTHON
+	for p in $SCRIPTS_PYTHON ; do
+		python_replicate_script "${ED}"/usr/bin/$p
+	done
+	# Make it possible to use the tools as 'git $TOOLNAME'
+	for i in $SCRIPTS_BASH $SCRIPTS_PYTHON ; do
+		dosym /usr/bin/$i /usr/libexec/git-core/$i
+	done
+	dodoc README.md
+}
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
new file mode 100644
index 000000000000..9eab3cbf380e
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4..5} )
+inherit eutils python-r1
+
+DESCRIPTION="Assorted git-related scripts"
+HOMEPAGE="https://github.com/MestreLion/git-tools/"
+MY_PV="0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6"
+SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-vcs/git-2.5
+	>=app-shells/bash-4.0"
+
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "$FILESDIR"/git-tools-2015_p20151225-py3.patch
+	epatch "$FILESDIR"/${P}-pr21.patch
+
+	epatch_user
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommitted-repos git-rebase-theirs git-strip-merge"
+	SCRIPTS_PYTHON="git-restore-mtime"
+	dobin $SCRIPTS_BASH
+	dobin $SCRIPTS_PYTHON
+	for p in $SCRIPTS_PYTHON ; do
+		python_replicate_script "${ED}"/usr/bin/$p
+	done
+	# Make it possible to use the tools as 'git $TOOLNAME'
+	for i in $SCRIPTS_BASH $SCRIPTS_PYTHON ; do
+		dosym /usr/bin/$i /usr/libexec/git-core/$i
+	done
+	dodoc README.md
+}
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
new file mode 100644
index 000000000000..da7ffa5eede6
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4..5} )
+inherit python-r1
+
+DESCRIPTION="Assorted git-related scripts"
+HOMEPAGE="https://github.com/MestreLion/git-tools/"
+MY_PV="0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6"
+SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-vcs/git-2.5
+	>=app-shells/bash-4.0"
+
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "$FILESDIR"/git-tools-2015_p20151225-py3.patch
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommitted-repos git-rebase-theirs git-strip-merge"
+	SCRIPTS_PYTHON="git-restore-mtime"
+	dobin $SCRIPTS_BASH
+	dobin $SCRIPTS_PYTHON
+	for p in $SCRIPTS_PYTHON ; do
+		python_replicate_script "${ED}"/usr/bin/$p
+	done
+	# Make it possible to use the tools as 'git $TOOLNAME'
+	for i in $SCRIPTS_BASH $SCRIPTS_PYTHON ; do
+		dosym /usr/bin/$i /usr/libexec/git-core/$i
+	done
+	dodoc README.md
+}
diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild
new file mode 100644
index 000000000000..22bb3d5f5880
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2017.10.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=( python{2_7,3_4,3_5,3_6} )
+inherit python-r1
+
+DESCRIPTION="Assorted git-related scripts"
+HOMEPAGE="https://github.com/MestreLion/git-tools"
+SRC_URI="https://github.com/MestreLion/git-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-vcs/git-2.5
+	>=app-shells/bash-4.0"
+
+src_install() {
+	dobin git-branches-rename git-clone-subset git-find-uncommitted-repos
+	dobin git-rebase-theirs git-strip-merge
+	python_foreach_impl python_doscript git-restore-mtime
+	doman man1/*.1
+	einstalldocs
+}
diff --git a/dev-vcs/git-tools/metadata.xml b/dev-vcs/git-tools/metadata.xml
new file mode 100644
index 000000000000..c4d5177abb15
--- /dev/null
+++ b/dev-vcs/git-tools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MestreLion/git-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
new file mode 100644
index 000000000000..97818aea9117
--- /dev/null
+++ b/dev-vcs/git/Manifest
@@ -0,0 +1,33 @@
+AUX 50git-gentoo.el 472 BLAKE2B b2b7c2c105d2ce3e066b3b617d095c402032549d92fff4a181ec9af6740033b0446f76b9620c97db582e85eff9aee0e3f88749981a135382c7a8d3187da921a5 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3
+AUX git-1.8.5-mw-vendor.patch 1160 BLAKE2B 37149c1ac222da71b38525ef6abeec21bc5926859725ec6c5282c5e5bee28e2f5c3e94f7bb9a0412e332c4f807ba8b4ed8544475524e857dc5b87be4128a3b44 SHA512 6513104f28eff36c18840f90e56fb21e8e04055e4e9a304ef15e5d7e1c13c8b45c4be0380b7781e776ce3b8ee9f7371ed2200e01174cc257125a613aef43ac9b
+AUX git-2.12.0-optional-cvs.patch 14388 BLAKE2B 146bb74bbf6abd2de767b6bf54f9e55fc1bd62fb52ea59800331c169b598853324b5bc3e168dbf344042c087d04436c9a71a2ba768ec21c730db5771067dba88 SHA512 fb44d17628e0c6d39053c8221296a8d81ccc84cf8cb49a0be13ecffcf79c69902f01c43c3b0ce45d2cb2c880116e2fb6d78d95e9c8d2fe5f19ff37bc4a6f8761
+AUX git-2.17.0-mw_install_path_fix.patch 1642 BLAKE2B 15a2b91abd9be5897d881d3fa09cdd5e7f54cf75846dc62301bf52f30e9de1367b13d00c7761372a5112b5db6719582afe4354468074223e9a0cc9c015ccf135 SHA512 082cbe10574c46c5658b731ca636d4d8663e3466819c423f62634576ebacfa0f4336947284e25e0e393a080016d20ccd9032def60cf251dda7341d9a24ff5ac1
+AUX git-2.17.0_rc1-optional-cvs.patch 14142 BLAKE2B 7ecff90fd346bca0eb40faa704a621f5a4d6de4e15bfcd9f43d34cd27f4844dc05771cd8ec16af7f43346900efbeb63e4611579a7eebe2923fab10c50d7e1bce SHA512 3dcf56252f0ea27f8d5fcdfa87e3637fedafcd08f92ae800b2de22276215904916c5f687f931ced74a678717a1199ea8de3ef1587720899bc51b0ced1fce3549
+AUX git-2.18.0_rc1-optional-cvs.patch 14471 BLAKE2B 0fcd6693bdcb7ef1fb843a19eb3802edb96e0f4820cc56338de6e0042a768d14a72eb4c02dd680bf4a9e536935529dcb5b1f25bd6f7980e46ca0ea0059f2d643 SHA512 d5cafb3c52b0cade0550492b4d52d96a912f9d721eb02677390b6edc7154f171c84b9b225baf42fa328b3ee0a7feaae75b4a4426b73db3deebe878ce62adf9d6
+AUX git-2.2.0-svn-fe-linking.patch 418 BLAKE2B 5030e0dfd7fef0157fd4532aa14bfdb4f2ed09a2e35ca960e0133d8e84ea07a472ddc111ea9c0033158be6e90283b76c9880c08cb7af7de53757dbf9b5d79a64 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd
+AUX git-2.5.1-freebsd-10.x-no-iconv.patch 568 BLAKE2B 5308052e21e28f07633a4503ee1b3703e49f76fc099703a6bdf9e474200fbb2c68b0dce5f0bc495d5f0118fbb75ee2113da309122cb0c445e93b5abc6ec6830c SHA512 9f7334b2c5b69c5a6a94e198a522b176470b0ae9d428694b9a404e4bcf33d269f43c8d2d9b5834e36f9a875d12a7b21f59caaaffad6d05cb6267ab2967e64567
+AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be
+AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f
+AUX git-2.7.0-mediawiki-subpages.patch 2091 BLAKE2B 01c6735edd80c3f264b8fe41edd5acb9fb375f0cd439ea4719932d0f0ebb8e00e3acea8e4de465bd75d35cce096dc720e3b4edabd13e80d1374af9806158e40f SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e
+AUX git-daemon-r1.initd 366 BLAKE2B b62642c38877e51259fea640193687c72b70b60f0956e225e1ea0087f86b44ed1483b293d94e8145db8da97d63d8e82c67ed67e80bd1759928b30c6460661e5e SHA512 9fbe7ff2c3ce0d22461e9d1401759d0f0a62039006f449b8b2beece85dbf37bffc6e23025f41527ff87cebb852710f01e021b30a659c4e1d71ddcbd536873412
+AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101ae96374145eb81076cc2018e73141aa9dc8c4e50b7f1087e8265f4bcd56d761c60375607268d470437 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec
+AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fea3d79ebe010a4971b731ba1684852f3b926ecc7e23bcb9a386b2e612801701299c64d4c6390ed4befe SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701
+AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c
+AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
+DIST git-2.16.4.tar.xz 4968252 BLAKE2B 77f76408bde02bfacdb99d22baca05893f63c96d1fb7508c7e92541f8f7ec9ced0dad650be788fd28a1e03b5d88b88708652d07a47bedaae60a9cbd4e2eec858 SHA512 f54e431e78289349dcb927ec34873dfb801c49a41cbb3d0138346d603af26bd7d86f9ac95e7a61a4831017f3503f33374510ccf68b0e62b0691fc5a43283f1ac
+DIST git-2.17.1.tar.xz 5015484 BLAKE2B d3a61023872a15e3176e4dae6df83d4c2369a377244d44dfd7a63a15ecc3a7b145093afd5d6fa72e4eca98ba4f81f7ccd89ac2400c9cf8107ac04fd35d8bf6e4 SHA512 77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960
+DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
+DIST git-htmldocs-2.16.4.tar.xz 1164256 BLAKE2B 88a7ab5b094f15bc2b6c0f4d4c3eae185f6e6c0f00f4aca75492f0cc964428d1bf53002e0e43468b60b62058af5f13b061231061247e19b32bc70c2c8adb04eb SHA512 8f4a8c51656559af81296fb064ecf0f88444952c7f8ee91b85e5a61b20d200267d7432f720ded12046bab986361cff48cf7a2f5d21e05c1ac7648cc3168a0049
+DIST git-htmldocs-2.17.1.tar.xz 1173296 BLAKE2B 5133a86fb73cd58d6a9d4ed05d32949f642c9a670a49ea67c7170dfb39c4ff3f63d5f220abebcc979f87a360ec2990ccf5a9e3c18e8fcb07082bac111ecb12c7 SHA512 69054b087ffd1c88532672c6edea3cd27e08421f25c09a1a304420ec6aa20806888f71e4ef21aac1bc2fed81a045a64ae164a9dc377eb48d61887bf8d787782c
+DIST git-htmldocs-2.18.0.tar.xz 1201076 BLAKE2B f5d592cadf1eb9a24b6d6fb3c68c1ead385a350e4bfc97eee775f1921c7bf47f8790d1eea803d69cde8e381d7aa0ae4c53aebeda464c32cdd7a6558a46a9c8e7 SHA512 e227673216b67cf0e5d0abacc305a3b2a30844a6fe31aab18e37643f27c0fce7d3628366732f1518784d095eb33c1bb60b4eb00024d9ccc662deca2962db5324
+DIST git-manpages-2.16.4.tar.xz 417136 BLAKE2B 9a75913dae62fa2eb31cf48e77e266aa8d91c67b8a753c1740283b1d626dea1e9aa8d7cea06d9b97887f801b4d1f1b927014851105cefd3241ca7ab7330bfc8b SHA512 8029e9fac1eca542e809da1247f4eec3a2c81c0eb12d03aa816dcf120677011d3e409b06c28c8e7dbf41cbbcca873ec93846dc317bc73e57f4d4701ce7abf73d
+DIST git-manpages-2.17.1.tar.xz 419400 BLAKE2B af8cef1ac43c6b5ee073c7e18c161ba3ebe0669e474833211c95e72b33524050c30ca133ada98e07c8b481ffc4a5cbce1e7d68427b7aeb9bb80534c2ef3623f0 SHA512 fbdd4ef99419d244bc7c03b10cf09e92d1f0894879fe159ee1f53262daebdc7fe72d6c2bbe9e21fe354f8afb26fa06b35788e54b0c078b686706b511bf7c33ee
+DIST git-manpages-2.18.0.tar.xz 425516 BLAKE2B ff979aa0c99716da279cd4001d5907cec95e93ac93f1f2dc5dd79d456a185e0d8610a121b08b07c3c886132e94334114932881d78c7307ff287c256f993938e5 SHA512 8ae353083288e58752e6e6ff505cde6f4fa0be20465443c0517a87af28867d748eb29fc9d3dcb805b29c4e422cf4eae124b7fec5c339888ab4ebaff6360ada15
+EBUILD git-2.16.4.ebuild 19322 BLAKE2B 3653976ab35cf76c4711257faa91d9fd7f475996b925ac3a5b4cabc665623b050dde9a7ea19dc3f2b6a2e29db8900142b567ebdc958d7eef8a6c4d481e131c51 SHA512 a0549569f377552c5c2882d0e2373ee0b471c6d7e7cde9092c500174b36dafe08ba2c1c896973c4bc2c997a26c7c2a45d15aea21e9bc58695a958acd64b69171
+EBUILD git-2.17.1-r1.ebuild 19370 BLAKE2B 0bd701b427978fa0bc187922c1af1075a3d29826dd4cb40d39cf40f4569a925ebbbaad2aa0cc2cf625ac4c5f36f6d7892d5d9b286149ab92cb0d63f22ef83323 SHA512 a046b7f21cf67dacbc561a28edd9fd4d519178bf1f3dc5835e955adabaa4b7abee6dea5be4617c57e41791f55e73e8fde082d766fd0aee8fa0ed9dd7dcac3e14
+EBUILD git-2.18.0.ebuild 19309 BLAKE2B f34eb5bcbc562199c9f1b512b4c81af3a1fda9b3ad755708543a3e7dec04f4b67dfed707815426961f6e1f60427c4ed201693da35e067d2a5fbbcca60f3f74d9 SHA512 21161ecb50fc0890e40e5d525f0cb9beccc156d14767072017ff5e1b4e16d224e5cebc804c6ca66b2efd5b099a73e7dcbca2c5f445b57ea55bb36ab63d0aa4b9
+EBUILD git-9999-r1.ebuild 19309 BLAKE2B 2b2c16a81e7c84a5768dd793131c90419884edf6a17bb29d41de92e355966f4f1b64ae14d13dcc27908297de2b089088632b0eebc7b8ddf40980567e6b62215e SHA512 2f88ad919815c137ef799d4116641ee2d8caac7435205c33342da0e7f6cc7dbf741b761efca8375b2ad783162d1d1fe7115c910ffaca002601f4cc37d9e80586
+EBUILD git-9999-r2.ebuild 19309 BLAKE2B 2b2c16a81e7c84a5768dd793131c90419884edf6a17bb29d41de92e355966f4f1b64ae14d13dcc27908297de2b089088632b0eebc7b8ddf40980567e6b62215e SHA512 2f88ad919815c137ef799d4116641ee2d8caac7435205c33342da0e7f6cc7dbf741b761efca8375b2ad783162d1d1fe7115c910ffaca002601f4cc37d9e80586
+EBUILD git-9999-r3.ebuild 19311 BLAKE2B 2cc3a3473836ba77a7440d71e51dcd0f5aa9cff22e84fd939db303e74910e8da3b33eabd93b36d95ba669203b9e7b94aaf11f194125b5ebf20574d9aa3b1440f SHA512 8eabe31ddd67d843071cf8bdb510a2a91ebac6f3b0c08456dd6e2e294c39f81ce432802b2cabd333babad42849ab15be484df09d0b50e22aedcefe59e07ca3d2
+EBUILD git-9999.ebuild 19309 BLAKE2B f38bc51a1e5f629336b88f1a4ca98bbe4d06219dcca0e5b0f86a4a4153c7457843108da243afd7d713a66b39af6bb541ba5dbbe40575fccea9729a7d7d33dc8f SHA512 dd5a983ab78ffc1426e784b8130f14a1ddefe4be08c02be1fb5dd43ff0454c0734bcd5f59a1502be9ee74e212454479962f873180e6eb8d973b683f22bd7bd0d
+MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el
new file mode 100644
index 000000000000..1646a391c53c
--- /dev/null
+++ b/dev-vcs/git/files/50git-gentoo.el
@@ -0,0 +1,13 @@
+
+;;; dev-vcs/git site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'git-status "git" "Entry point into git-status mode." t)
+;;(autoload 'git-blame-mode "git-blame"
+;;  "Minor mode for incremental blame for Git." t)
+
+;; GNU Emacs >=22.2 already includes vc-git.el.
+;; Enable the following only if Emacs has no GIT support.
+(unless (fboundp 'vc-git-registered)
+  (add-to-list 'load-path "@SITELISP@/compat")
+  (add-to-list 'vc-handled-backends 'GIT))
diff --git a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch
new file mode 100644
index 000000000000..54302ef26c91
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch
@@ -0,0 +1,39 @@
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
+index a4b6f7a..d83df2c 100644
+--- a/contrib/mw-to-git/Makefile
++++ b/contrib/mw-to-git/Makefile
+@@ -22,7 +22,7 @@ INSTALL = install
+ 
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
+-                -s --no-print-directory instlibdir)
++                -s --no-print-directory instvendorlibdir)
+ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+ INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
+ 
+diff --git a/perl/Makefile b/perl/Makefile
+index 15d96fc..91348c6 100644
+--- a/perl/Makefile
++++ b/perl/Makefile
+@@ -12,7 +12,7 @@ ifndef V
+ 	QUIET = @
+ endif
+ 
+-all install instlibdir: $(makfile)
++all install instlibdir instvendorlibdir: $(makfile)
+ 	$(QUIET)$(MAKE) -f $(makfile) $@
+ 
+ clean:
+diff --git a/perl/Makefile.PL b/perl/Makefile.PL
+index 3f29ba9..c0b3508 100644
+--- a/perl/Makefile.PL
++++ b/perl/Makefile.PL
+@@ -17,6 +17,8 @@ sub MY::postamble {
+ 	return <<'MAKE_FRAG';
+ instlibdir:
+ 	@echo '$(INSTALLSITELIB)'
++instvendorlibdir:
++	@echo '$(INSTALLVENDORLIB)'
+ 
+ ifneq (,$(DESTDIR))
+ ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10))
diff --git a/dev-vcs/git/files/git-2.12.0-optional-cvs.patch b/dev-vcs/git/files/git-2.12.0-optional-cvs.patch
new file mode 100644
index 000000000000..d158b65d30a4
--- /dev/null
+++ b/dev-vcs/git/files/git-2.12.0-optional-cvs.patch
@@ -0,0 +1,456 @@
+From 1e1bacf32568cc24dbd24444ed4025fc80a96ff3 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Sat, 25 Feb 2017 20:48:14 +0100
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.12 to current git.git v1.8.4
+Forward-ported from v1.8.4 to v1.8.5.1
+Forward-ported from v1.8.5.3 to v1.9.0_rc3
+Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
+Forward-ported from v2.0.0_rc0 to v2.0.0
+Forward-ported from v2.0.0 to v2.2.2
+Forward-ported from v2.2.2 to v2.8.4
+Forward-ported from v2.8.4 to v2.10.0
+Forward-ported from v2.10.0 to v2.12.0
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile                           | 51 ++++++++++++++++++++++++++++----------
+ t/t9200-git-cvsexportcommit.sh     |  5 ++++
+ t/t9400-git-cvsserver-server.sh    |  8 +++++-
+ t/t9401-git-cvsserver-crlf.sh      | 15 +++++++----
+ t/t9600-cvsimport.sh               | 41 +++++++++++++++++++-----------
+ t/t9601-cvsimport-vendor-branch.sh | 11 ++++++++
+ t/t9602-cvsimport-branches-tags.sh | 11 ++++++++
+ t/t9603-cvsimport-patchsets.sh     | 11 ++++++++
+ t/test-lib.sh                      |  1 +
+ 9 files changed, 120 insertions(+), 34 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8e4081e06..f14a4ad37 100644
+--- a/Makefile
++++ b/Makefile
+@@ -273,6 +273,8 @@ all::
+ # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
+ # and egrep that are pickier when their input contains non-ASCII data.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -496,6 +498,7 @@ LIB_OBJS =
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -532,12 +535,13 @@ SCRIPT_LIB += git-sh-i18n
+ 
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-p4.py
+ 
+ NO_INSTALL += git-remote-testgit
+@@ -545,24 +549,26 @@ NO_INSTALL += git-remote-testgit
+ # Generated files for scripts
+ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
+ SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
++SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS))
+ SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
+ 
+ SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
+ SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
++SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN))
+ SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
+ 
+ # Individual rules to allow e.g.
+ # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
+ # from subdirectories like contrib/*/
+ .PHONY: build-perl-script build-sh-script build-python-script
+-build-perl-script: $(SCRIPT_PERL_GEN)
++build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ build-sh-script: $(SCRIPT_SH_GEN)
+ build-python-script: $(SCRIPT_PYTHON_GEN)
+ 
+ .PHONY: install-perl-script install-sh-script install-python-script
+ install-sh-script: $(SCRIPT_SH_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+-install-perl-script: $(SCRIPT_PERL_INS)
++install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ install-python-script: $(SCRIPT_PYTHON_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+@@ -571,12 +577,13 @@ install-python-script: $(SCRIPT_PYTHON_INS)
+ clean-sh-script:
+ 	$(RM) $(SCRIPT_SH_GEN)
+ clean-perl-script:
+-	$(RM) $(SCRIPT_PERL_GEN)
++	$(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ clean-python-script:
+ 	$(RM) $(SCRIPT_PYTHON_GEN)
+ 
+ SCRIPTS = $(SCRIPT_SH_INS) \
+ 	  $(SCRIPT_PERL_INS) \
++	  $(SCRIPT_PERL_CVS_INS) \
+ 	  $(SCRIPT_PYTHON_INS) \
+ 	  git-instaweb
+ 
+@@ -1832,10 +1839,24 @@ git.res: git.rc GIT-VERSION-FILE
+ 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
+ 
+ # This makes sure we depend on the NO_PERL setting itself.
+-$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
++$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS
++
++_SCRIPT_PERL_GEN =
++_SCRIPT_PERL_NOGEN =
+ 
+ ifndef NO_PERL
+-$(SCRIPT_PERL_GEN): perl/perl.mak
++
++_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN)
++
++ifndef NO_CVS
++_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN)
++else
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN)
++_REASON = NO_CVS
++_REASON_CONTENT = $(NO_CVS)
++endif # NO_CVS
++
++$(_SCRIPT_PERL_GEN): perl/perl.mak
+ 
+ perl/perl.mak: perl/PM.stamp
+ 
+@@ -1848,7 +1869,7 @@ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
+ 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+ 
+ PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
+-$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
++$(_SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
+@@ -1882,14 +1903,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb
++_REASON = NO_PERL
++_REASON_CONTENT = $(NO_PERL)
++endif # NO_PERL
++
++$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+-	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
++	    -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ # This makes sure we depend on the NO_PYTHON setting itself.
+ $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
+@@ -2125,7 +2150,7 @@ LOCALIZED_SH = $(SCRIPT_SH)
+ LOCALIZED_SH += git-parse-remote.sh
+ LOCALIZED_SH += git-rebase--interactive.sh
+ LOCALIZED_SH += git-sh-setup.sh
+-LOCALIZED_PERL = $(SCRIPT_PERL)
++LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS)
+ 
+ ifdef XGETTEXT_INCLUDE_TESTS
+ LOCALIZED_C += t/t0200/test.c
+diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
+index bb879a527..17be19729 100755
+--- a/t/t9200-git-cvsexportcommit.sh
++++ b/t/t9200-git-cvsexportcommit.sh
+@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 432c61d24..6907b3f52 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
+index 84787eee9..eecba8852 100755
+--- a/t/t9401-git-cvsserver-crlf.sh
++++ b/t/t9401-git-cvsserver-crlf.sh
+@@ -57,15 +57,20 @@ check_status_options() {
+     return $stat
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
+index 4c384ff02..d601f32c5 100755
+--- a/t/t9600-cvsimport.sh
++++ b/t/t9600-cvsimport.sh
+@@ -3,14 +3,25 @@
+ test_description='git cvsimport basic tests'
+ . ./lib-cvs.sh
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -42,23 +53,23 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -86,7 +97,7 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' '
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' '
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' '
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' '
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
+index 827d39f5b..d730a41f6 100755
+--- a/t/t9601-cvsimport-vendor-branch.sh
++++ b/t/t9601-cvsimport-vendor-branch.sh
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
+index e1db323f5..68f097401 100755
+--- a/t/t9602-cvsimport-branches-tags.sh
++++ b/t/t9602-cvsimport-branches-tags.sh
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
+index c4c3c4954..9b2957d4f 100755
+--- a/t/t9603-cvsimport-patchsets.sh
++++ b/t/t9603-cvsimport-patchsets.sh
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure PERL 'import with criss cross times on revisions' '
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index 86d77c16d..1fb51f149 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -1007,6 +1007,7 @@ case $uname_s in
+ esac
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+ test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
+-- 
+2.11.1
+
diff --git a/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch b/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch
new file mode 100644
index 000000000000..5a66a4c89be0
--- /dev/null
+++ b/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch
@@ -0,0 +1,48 @@
+From cfb3a47cada99d1bdccd08426f122ded2a63834e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Tue, 10 Apr 2018 15:36:41 +0200
+Subject: [PATCH] perl: fix installing modules from contrib
+
+Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules)
+removed a target that allowed Makefiles from contrib/ to get the correct
+install path. This introduces a new target for main Makefile and fixes
+installation for Mediawiki module.
+
+v2: Pass prefix as that can have influence as well, add single quotes
+    for _SQ variant.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ Makefile                   | 2 ++
+ contrib/mw-to-git/Makefile | 5 +++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2091f5f892cc8..75b9ad3b480cb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1973,6 +1973,8 @@ GIT-PERL-DEFINES: FORCE
+ 		echo "$$FLAGS" >$@; \
+ 	    fi
+ 
++perllibdir:
++	@echo '$(perllibdir_SQ)'
+ 
+ .PHONY: gitweb
+ gitweb:
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
+index a4b6f7a2cd412..4e603512a39fe 100644
+--- a/contrib/mw-to-git/Makefile
++++ b/contrib/mw-to-git/Makefile
+@@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/
+ INSTALL = install
+ 
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+-INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
+-                -s --no-print-directory instlibdir)
++INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \
++                -s --no-print-directory prefix=$(prefix) \
++                perllibdir=$(perllibdir) perllibdir)
+ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+ INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
+ 
diff --git a/dev-vcs/git/files/git-2.17.0_rc1-optional-cvs.patch b/dev-vcs/git/files/git-2.17.0_rc1-optional-cvs.patch
new file mode 100644
index 000000000000..60cebcbb4d64
--- /dev/null
+++ b/dev-vcs/git/files/git-2.17.0_rc1-optional-cvs.patch
@@ -0,0 +1,451 @@
+From 3baea661143aaddb285f1ac7c50f6e4af76c8aed Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Fri, 23 Mar 2018 10:05:05 +0100
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.12 to current git.git v1.8.4
+Forward-ported from v1.8.4 to v1.8.5.1
+Forward-ported from v1.8.5.3 to v1.9.0_rc3
+Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
+Forward-ported from v2.0.0_rc0 to v2.0.0
+Forward-ported from v2.0.0 to v2.2.2
+Forward-ported from v2.2.2 to v2.8.4
+Forward-ported from v2.8.4 to v2.10.0
+Forward-ported from v2.10.0 to v2.12.0
+Forward-ported from v2.12.0 to v2.17.0-rc1
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile                           | 50 ++++++++++++++++++++++++++++----------
+ t/t9200-git-cvsexportcommit.sh     |  5 ++++
+ t/t9400-git-cvsserver-server.sh    |  8 +++++-
+ t/t9401-git-cvsserver-crlf.sh      | 15 ++++++++----
+ t/t9600-cvsimport.sh               | 41 +++++++++++++++++++------------
+ t/t9601-cvsimport-vendor-branch.sh | 11 +++++++++
+ t/t9602-cvsimport-branches-tags.sh | 11 +++++++++
+ t/t9603-cvsimport-patchsets.sh     | 11 +++++++++
+ t/test-lib.sh                      |  1 +
+ 9 files changed, 119 insertions(+), 34 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a1d8775adb..4264475ad1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -312,6 +312,8 @@ all::
+ # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
+ # and egrep that are pickier when their input contains non-ASCII data.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -543,6 +545,7 @@ LIB_OBJS =
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -579,12 +582,13 @@ SCRIPT_LIB += git-sh-i18n
+ 
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-p4.py
+ 
+ NO_INSTALL += git-remote-testgit
+@@ -592,24 +596,26 @@ NO_INSTALL += git-remote-testgit
+ # Generated files for scripts
+ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
+ SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
++SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS))
+ SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
+ 
+ SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
+ SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
++SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN))
+ SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
+ 
+ # Individual rules to allow e.g.
+ # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
+ # from subdirectories like contrib/*/
+ .PHONY: build-perl-script build-sh-script build-python-script
+-build-perl-script: $(SCRIPT_PERL_GEN)
++build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ build-sh-script: $(SCRIPT_SH_GEN)
+ build-python-script: $(SCRIPT_PYTHON_GEN)
+ 
+ .PHONY: install-perl-script install-sh-script install-python-script
+ install-sh-script: $(SCRIPT_SH_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+-install-perl-script: $(SCRIPT_PERL_INS)
++install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ install-python-script: $(SCRIPT_PYTHON_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+@@ -618,12 +624,13 @@ install-python-script: $(SCRIPT_PYTHON_INS)
+ clean-sh-script:
+ 	$(RM) $(SCRIPT_SH_GEN)
+ clean-perl-script:
+-	$(RM) $(SCRIPT_PERL_GEN)
++	$(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ clean-python-script:
+ 	$(RM) $(SCRIPT_PYTHON_GEN)
+ 
+ SCRIPTS = $(SCRIPT_SH_INS) \
+ 	  $(SCRIPT_PERL_INS) \
++	  $(SCRIPT_PERL_CVS_INS) \
+ 	  $(SCRIPT_PYTHON_INS) \
+ 	  git-instaweb
+ 
+@@ -1972,13 +1979,26 @@ git.res: git.rc GIT-VERSION-FILE
+ 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
+ 
+ # This makes sure we depend on the NO_PERL setting itself.
+-$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
++$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS
++
++_SCRIPT_PERL_GEN =
++_SCRIPT_PERL_NOGEN =
+ 
+ ifndef NO_PERL
+-$(SCRIPT_PERL_GEN):
++_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN)
++
++ifndef NO_CVS
++_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN)
++else
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN)
++_REASON = NO_CVS
++_REASON_CONTENT = $(NO_CVS)
++endif # NO_CVS
++
++$(_SCRIPT_PERL_GEN):
+ 
+ PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ)
+-$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-VERSION-FILE
++$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-VERSION-FILE
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	INSTLIBDIR='$(perllibdir_SQ)' && \
+ 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
+@@ -2012,14 +2032,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb
++_REASON = NO_PERL
++_REASON_CONTENT = $(NO_PERL)
++endif # NO_PERL
++
++$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+-	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
++	    -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ # This makes sure we depend on the NO_PYTHON setting itself.
+ $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
+@@ -2258,7 +2282,7 @@ LOCALIZED_SH = $(SCRIPT_SH)
+ LOCALIZED_SH += git-parse-remote.sh
+ LOCALIZED_SH += git-rebase--interactive.sh
+ LOCALIZED_SH += git-sh-setup.sh
+-LOCALIZED_PERL = $(SCRIPT_PERL)
++LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS)
+ 
+ ifdef XGETTEXT_INCLUDE_TESTS
+ LOCALIZED_C += t/t0200/test.c
+diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
+index 1319415ba8..34ac8e28e2 100755
+--- a/t/t9200-git-cvsexportcommit.sh
++++ b/t/t9200-git-cvsexportcommit.sh
+@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 06742748e9..51d474d94b 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
+index 84787eee9a..eecba88527 100755
+--- a/t/t9401-git-cvsserver-crlf.sh
++++ b/t/t9401-git-cvsserver-crlf.sh
+@@ -57,15 +57,20 @@ check_status_options() {
+     return $stat
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
+index 804ce3850f..c53c50e432 100755
+--- a/t/t9600-cvsimport.sh
++++ b/t/t9600-cvsimport.sh
+@@ -8,14 +8,25 @@ if ! test_have_prereq NOT_ROOT; then
+ 	test_done
+ fi
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -47,23 +58,23 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -91,7 +102,7 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -102,7 +113,7 @@ test_expect_success PERL 'update git module' '
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -110,7 +121,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -119,7 +130,7 @@ test_expect_success PERL 'update cvs module' '
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -131,7 +142,7 @@ test_expect_success PERL 'cvsimport.module config works' '
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -140,7 +151,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -153,12 +164,12 @@ test_expect_success PERL 'import from a CVS working tree' '
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
+index 827d39f5bf..d730a41f67 100755
+--- a/t/t9601-cvsimport-vendor-branch.sh
++++ b/t/t9601-cvsimport-vendor-branch.sh
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
+index e1db323f54..68f097401f 100755
+--- a/t/t9602-cvsimport-branches-tags.sh
++++ b/t/t9602-cvsimport-branches-tags.sh
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
+index c4c3c49546..9b2957d4f0 100755
+--- a/t/t9603-cvsimport-patchsets.sh
++++ b/t/t9603-cvsimport-patchsets.sh
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure PERL 'import with criss cross times on revisions' '
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index 7740d511d2..9b26b78359 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -1062,6 +1062,7 @@ case $uname_s in
+ esac
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+-- 
+2.16.3
+
diff --git a/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch b/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch
new file mode 100644
index 000000000000..2e213c00522a
--- /dev/null
+++ b/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch
@@ -0,0 +1,460 @@
+From 7b0d0d066a5f869f86f2be125d63ae98c1451feb Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Wed, 6 Jun 2018 16:25:13 +0200
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.12 to current git.git v1.8.4
+Forward-ported from v1.8.4 to v1.8.5.1
+Forward-ported from v1.8.5.3 to v1.9.0_rc3
+Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
+Forward-ported from v2.0.0_rc0 to v2.0.0
+Forward-ported from v2.0.0 to v2.2.2
+Forward-ported from v2.2.2 to v2.8.4
+Forward-ported from v2.8.4 to v2.10.0
+Forward-ported from v2.10.0 to v2.12.0
+Forward-ported from v2.12.0 to v2.17.0-rc1
+Forward-ported from v2.17.0-rc1 to v2.18.0-rc1
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile                           | 49 ++++++++++++++++++++++--------
+ t/t9200-git-cvsexportcommit.sh     |  5 +++
+ t/t9400-git-cvsserver-server.sh    |  8 ++++-
+ t/t9401-git-cvsserver-crlf.sh      | 15 ++++++---
+ t/t9600-cvsimport.sh               | 41 ++++++++++++++++---------
+ t/t9601-cvsimport-vendor-branch.sh | 11 +++++++
+ t/t9602-cvsimport-branches-tags.sh | 11 +++++++
+ t/t9603-cvsimport-patchsets.sh     | 11 +++++++
+ t/test-lib.sh                      |  1 +
+ 9 files changed, 119 insertions(+), 33 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1d27f36365..b30a14e263 100644
+--- a/Makefile
++++ b/Makefile
+@@ -312,6 +312,8 @@ all::
+ # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
+ # and egrep that are pickier when their input contains non-ASCII data.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -589,6 +591,7 @@ LIB_OBJS =
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -626,12 +629,13 @@ SCRIPT_LIB += git-sh-i18n
+ 
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-p4.py
+ 
+ NO_INSTALL += git-remote-testgit
+@@ -639,24 +643,26 @@ NO_INSTALL += git-remote-testgit
+ # Generated files for scripts
+ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
+ SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
++SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS))
+ SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
+ 
+ SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
+ SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
++SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN))
+ SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
+ 
+ # Individual rules to allow e.g.
+ # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
+ # from subdirectories like contrib/*/
+ .PHONY: build-perl-script build-sh-script build-python-script
+-build-perl-script: $(SCRIPT_PERL_GEN)
++build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ build-sh-script: $(SCRIPT_SH_GEN)
+ build-python-script: $(SCRIPT_PYTHON_GEN)
+ 
+ .PHONY: install-perl-script install-sh-script install-python-script
+ install-sh-script: $(SCRIPT_SH_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+-install-perl-script: $(SCRIPT_PERL_INS)
++install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ install-python-script: $(SCRIPT_PYTHON_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+@@ -665,12 +671,13 @@ install-python-script: $(SCRIPT_PYTHON_INS)
+ clean-sh-script:
+ 	$(RM) $(SCRIPT_SH_GEN)
+ clean-perl-script:
+-	$(RM) $(SCRIPT_PERL_GEN)
++	$(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ clean-python-script:
+ 	$(RM) $(SCRIPT_PYTHON_GEN)
+ 
+ SCRIPTS = $(SCRIPT_SH_INS) \
+ 	  $(SCRIPT_PERL_INS) \
++	  $(SCRIPT_PERL_CVS_INS) \
+ 	  $(SCRIPT_PYTHON_INS) \
+ 	  git-instaweb
+ 
+@@ -2076,13 +2083,27 @@ git.res: git.rc GIT-VERSION-FILE
+ 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
+ 
+ # This makes sure we depend on the NO_PERL setting itself.
+-$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
++$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS
++
++_SCRIPT_PERL_GEN =
++_SCRIPT_PERL_NOGEN =
+ 
+ # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX
+ # since the locale directory is injected.
+ perl_localedir_SQ = $(localedir_SQ)
+ 
+ ifndef NO_PERL
++_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN)
++
++ifndef NO_CVS
++_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN)
++else
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN)
++_REASON = NO_CVS
++_REASON_CONTENT = $(NO_CVS)
++endif # NO_CVS
++
++$(_SCRIPT_PERL_GEN):
+ PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
+ PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ)
+ 
+@@ -2103,7 +2124,7 @@ endif
+ 
+ PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
+ 
+-$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
++$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1{' \
+ 	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+@@ -2149,14 +2170,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb
++_REASON = NO_PERL
++_REASON_CONTENT = $(NO_PERL)
++endif # NO_PERL
++
++$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+-	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
++	    -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ # This makes sure we depend on the NO_PYTHON setting itself.
+ $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
+@@ -2396,7 +2421,7 @@ LOCALIZED_SH = $(SCRIPT_SH)
+ LOCALIZED_SH += git-parse-remote.sh
+ LOCALIZED_SH += git-rebase--interactive.sh
+ LOCALIZED_SH += git-sh-setup.sh
+-LOCALIZED_PERL = $(SCRIPT_PERL)
++LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS)
+ 
+ ifdef XGETTEXT_INCLUDE_TESTS
+ LOCALIZED_C += t/t0200/test.c
+diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
+index 1319415ba8..34ac8e28e2 100755
+--- a/t/t9200-git-cvsexportcommit.sh
++++ b/t/t9200-git-cvsexportcommit.sh
+@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 06742748e9..51d474d94b 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
+index 84787eee9a..eecba88527 100755
+--- a/t/t9401-git-cvsserver-crlf.sh
++++ b/t/t9401-git-cvsserver-crlf.sh
+@@ -57,15 +57,20 @@ check_status_options() {
+     return $stat
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
+index 804ce3850f..c53c50e432 100755
+--- a/t/t9600-cvsimport.sh
++++ b/t/t9600-cvsimport.sh
+@@ -8,14 +8,25 @@ if ! test_have_prereq NOT_ROOT; then
+ 	test_done
+ fi
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -47,23 +58,23 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -91,7 +102,7 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -102,7 +113,7 @@ test_expect_success PERL 'update git module' '
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -110,7 +121,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -119,7 +130,7 @@ test_expect_success PERL 'update cvs module' '
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -131,7 +142,7 @@ test_expect_success PERL 'cvsimport.module config works' '
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -140,7 +151,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -153,12 +164,12 @@ test_expect_success PERL 'import from a CVS working tree' '
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
+index 827d39f5bf..d730a41f67 100755
+--- a/t/t9601-cvsimport-vendor-branch.sh
++++ b/t/t9601-cvsimport-vendor-branch.sh
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
+index e1db323f54..68f097401f 100755
+--- a/t/t9602-cvsimport-branches-tags.sh
++++ b/t/t9602-cvsimport-branches-tags.sh
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
+index c4c3c49546..9b2957d4f0 100755
+--- a/t/t9603-cvsimport-patchsets.sh
++++ b/t/t9603-cvsimport-patchsets.sh
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure PERL 'import with criss cross times on revisions' '
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index 28315706be..6e2f99cdbb 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -1064,6 +1064,7 @@ case $uname_s in
+ esac
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+-- 
+2.17.1
+
diff --git a/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch b/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch
new file mode 100644
index 000000000000..b20b889110eb
--- /dev/null
+++ b/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch
@@ -0,0 +1,11 @@
+--- git-2.2.0/contrib/svn-fe/Makefile
++++ git-2.2.0/contrib/svn-fe/Makefile
+@@ -74,7 +74,7 @@
+ endif
+ 
+ svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(XDIFF_LIB) $(GIT_LIB)
+-	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(EXTLIBS) -o $@ svn-fe.o $(LIBS)
++	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ svn-fe.o $(LIBS) $(EXTLIBS)
+ 
+ svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h
+ 	$(QUIET_CC)$(CC) $(CFLAGS) -I../../vcs-svn -o $*.o -c $<
diff --git a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
new file mode 100644
index 000000000000..a874236dc65c
--- /dev/null
+++ b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
@@ -0,0 +1,14 @@
+diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname
+--- git-2.5.1.orig/config.mak.uname	2015-08-28 15:37:13.000000000 -0400
++++ git-2.5.1/config.mak.uname	2015-09-06 18:54:28.538437000 -0400
+@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin)
+ 	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
+ endif
+ ifeq ($(uname_S),FreeBSD)
+-	NEEDS_LIBICONV = YesPlease
++	ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2)
++		NEEDS_LIBICONV = YesPlease
++	endif
+ 	OLD_ICONV = YesPlease
+ 	NO_MEMMEM = YesPlease
+ 	BASIC_CFLAGS += -I/usr/local/include
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
new file mode 100644
index 000000000000..0ce706db99a6
--- /dev/null
+++ b/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
@@ -0,0 +1,46 @@
+Searching for pages using the MediaWiki API returns at most 500 results
+(hi Patrick). To get a list of all pages in a larger wiki, we need to run
+repeated searches...
+
+Source: https://github.com/moy/Git-Mediawiki/issues/32
+Author: anarcat https://github.com/anarcat
+
+diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
+index 8dd74a9..f2ce311 100755
+--- a/contrib/mw-to-git/git-remote-mediawiki.perl
++++ b/contrib/mw-to-git/git-remote-mediawiki.perl
+@@ -259,16 +259,29 @@ sub get_mw_tracked_categories {
+ sub get_mw_all_pages {
+ 	my $pages = shift;
+ 	# No user-provided list, get the list of pages from the API.
+-	my $mw_pages = $mediawiki->list({
++	my $query = {
+ 		action => 'query',
+ 		list => 'allpages',
+ 		aplimit => 'max'
+-	});
+-	if (!defined($mw_pages)) {
++	};
++	my $curpage;
++	my $oldpage = '';
++	while (1) {
++	if (defined($curpage)) {
++		if ($oldpage eq $curpage) {
++		    last;
++		}
++		$query->{apfrom} = $curpage;
++		$oldpage = $curpage;
++	    }
++	    my $mw_pages = $mediawiki->list($query);
++	    if (!defined($mw_pages)) {
+ 		fatal_mw_error("get the list of wiki pages");
+-	}
+-	foreach my $page (@{$mw_pages}) {
++	    }
++	    foreach my $page (@{$mw_pages}) {
+ 		$pages->{$page->{title}} = $page;
++		$curpage = $page->{title};
++	    }
+ 	}
+ 	return;
+ }
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
new file mode 100644
index 000000000000..72ab2126fa9c
--- /dev/null
+++ b/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
@@ -0,0 +1,97 @@
+source:
+https://gist.github.com/anarcat/f821fa285c6b8b6b16a5
+https://github.com/moy/Git-Mediawiki/issues/10
+
+
+From 147224cfe6143c44b16aec0bb6d6a506a6b96ced Mon Sep 17 00:00:00 2001
+From: Kevin <kevin@ki-ai.org>
+Date: Fri, 28 Aug 2015 15:53:37 -0500
+Subject: [PATCH] Add namespace support to git-mediawiki
+
+Signed-off-by: Kevin <kevin@ki-ai.org>
+---
+ contrib/mw-to-git/git-remote-mediawiki.perl | 34 +++++++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
+index 8dd74a9..662a5b5 100755
+--- a/contrib/mw-to-git/git-remote-mediawiki.perl
++++ b/contrib/mw-to-git/git-remote-mediawiki.perl
+@@ -17,6 +17,7 @@ use Git;
+ use Git::Mediawiki qw(clean_filename smudge_filename connect_maybe
+ 					EMPTY HTTP_CODE_OK);
+ use DateTime::Format::ISO8601;
++use Scalar::Util;
+ use warnings;
+ 
+ # By default, use UTF-8 to communicate with Git and the user
+@@ -63,6 +64,10 @@ chomp(@tracked_pages);
+ my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
+ chomp(@tracked_categories);
+ 
++# Just like @tracked_categories, but for MediaWiki namespaces.
++my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces"));
++chomp(@tracked_namespaces);
++
+ # Import media files on pull
+ my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
+ chomp($import_media);
+@@ -256,6 +261,23 @@ sub get_mw_tracked_categories {
+ 	return;
+ }
+ 
++sub get_mw_tracked_namespaces {
++    my $pages = shift;
++    foreach my $local_namespace (@tracked_namespaces) {
++        my $mw_pages = $mediawiki->list( {
++            action => 'query',
++            list => 'allpages',
++            apnamespace => get_mw_namespace_id($local_namespace),
++            aplimit => 'max' } )
++            || die $mediawiki->{error}->{code} . ': '
++                . $mediawiki->{error}->{details} . "\n";
++        foreach my $page (@{$mw_pages}) {
++            $pages->{$page->{title}} = $page;
++        }
++    }
++    return;
++}
++
+ sub get_mw_all_pages {
+ 	my $pages = shift;
+ 	# No user-provided list, get the list of pages from the API.
+@@ -319,6 +341,10 @@ sub get_mw_pages {
+ 		$user_defined = 1;
+ 		get_mw_tracked_categories(\%pages);
+ 	}
++    if (@tracked_namespaces) {
++        $user_defined = 1;
++        get_mw_tracked_namespaces(\%pages);
++    }
+ 	if (!$user_defined) {
+ 		get_mw_all_pages(\%pages);
+ 	}
+@@ -1263,7 +1289,6 @@ my %cached_mw_namespace_id;
+ sub get_mw_namespace_id {
+ 	$mediawiki = connect_maybe($mediawiki, $remotename, $url);
+ 	my $name = shift;
+-
+ 	if (!exists $namespace_id{$name}) {
+ 		# Look at configuration file, if the record for that namespace is
+ 		# already cached. Namespaces are stored in form:
+@@ -1331,7 +1356,12 @@ sub get_mw_namespace_id {
+ sub get_mw_namespace_id_for_page {
+ 	my $namespace = shift;
+ 	if ($namespace =~ /^([^:]*):/) {
+-		return get_mw_namespace_id($namespace);
++		my ($ns, $id) = split(/:/, $namespace);
++		if (Scalar::Util::looks_like_number($id)) {
++			return get_mw_namespace_id($ns);
++		} else{
++			return
++		}
+ 	} else {
+ 		return;
+ 	}
+-- 
+2.5.0
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
new file mode 100644
index 000000000000..c798a894d3f8
--- /dev/null
+++ b/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
@@ -0,0 +1,48 @@
+From 2593304723c6def159c10b9060dafa78a775a057 Mon Sep 17 00:00:00 2001
+From: Lyubomyr Shaydariv <lyubomyr-shaydariv@users.noreply.github.com>
+Date: Fri, 11 Sep 2015 00:41:17 +0300
+Subject: [PATCH] git-remote-mediawiki: support subpages as subdirectories
+
+This is a fix for https://github.com/moy/Git-Mediawiki/issues/22
+The subdirectories option is enabled using -c remote.origin.subpageDirs=true
+during the cloning and it is not recommended to be modified in or
+removed from .git/config after the cloning.
+---
+ contrib/mw-to-git/git-remote-mediawiki.perl | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
+index 8dd74a9..f3624be 100755
+--- a/contrib/mw-to-git/git-remote-mediawiki.perl
++++ b/contrib/mw-to-git/git-remote-mediawiki.perl
+@@ -63,6 +63,11 @@
+ my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
+ chomp(@tracked_categories);
+ 
++# Use subdirectories for subpages
++my $use_subpage_dirs = run_git("config --get --bool remote.${remotename}.subpageDirs");
++chomp($use_subpage_dirs);
++$use_subpage_dirs = ($use_subpage_dirs eq 'true');
++
+ # Import media files on pull
+ my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
+ chomp($import_media);
+@@ -689,6 +694,9 @@ sub fe_escape_path {
+     $path =~ s/\\/\\\\/g;
+     $path =~ s/"/\\"/g;
+     $path =~ s/\n/\\n/g;
++    if ($use_subpage_dirs) {
++        $path =~ s/%2F/\//g;
++    }
+     return qq("${path}");
+ }
+ 
+@@ -927,7 +935,7 @@ sub mw_import_revids {
+ 		# If this is a revision of the media page for new version
+ 		# of a file do one common commit for both file and media page.
+ 		# Else do commit only for that page.
+-		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of $commit{title}\n";
++		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of ", fe_escape_path($commit{title}), "\n";
+ 		import_file_revision(\%commit, ($fetch_from == 1), $n_actual, \%mediafile);
+ 	}
+ 
diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
new file mode 100644
index 000000000000..78e5444ed4db
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon-r1.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/git-daemon.pid"
+command="/usr/bin/git"
+command_args="daemon ${GITDAEMON_OPTS}"
+command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m"
+
+depend() {
+	use logger
+}
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd
new file mode 100644
index 000000000000..69b209ff18cc
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.confd
@@ -0,0 +1,19 @@
+# conf.d file for git-daemon
+#
+# Please check man 1 git-daemon for more information about the options
+# git-daemon accepts. You MUST edit this to include your repositories you wish
+# to serve.
+#
+# Some of the meaningful options are:
+#   --syslog      --- Enables syslog logging
+#   --verbose     --- Enables verbose logging
+#   --export-all  --- Exports all repositories
+#   --port=XXXX   --- Starts in port XXXX instead of 9418
+#
+GITDAEMON_OPTS="--syslog --base-path=/var/git"
+
+# To run an anonymous git safely, the following user should be able to only
+# read your Git repositories. It should not be able to write to anywhere on
+# your system, esp. not the repositories.
+GIT_USER="nobody"
+GIT_GROUP="nobody"
diff --git a/dev-vcs/git/files/git-daemon.socket b/dev-vcs/git/files/git-daemon.socket
new file mode 100644
index 000000000000..3dec01d21653
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Activation Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd
new file mode 100644
index 000000000000..02c938d4bd6c
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.xinetd
@@ -0,0 +1,13 @@
+service git-daemon
+{
+	disable		= yes
+	socket_type	= stream
+	wait		= no
+	user		= nobody
+	type		= UNLISTED
+	protocol	= tcp
+	log_on_failure	+= USERID
+	port		= 9418
+	server		= /usr/bin/git
+	server_args	= daemon --inetd --syslog --export-all --base-path=/var/git
+}
diff --git a/dev-vcs/git/files/git-daemon_at-r1.service b/dev-vcs/git/files/git-daemon_at-r1.service
new file mode 100644
index 000000000000..0a1bd14b16a3
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon_at-r1.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Git Repositories Server Daemon
+Documentation=man:git-daemon(1)
+
+[Service]
+User=nobody
+Group=nobody
+# Ignore non-zero exit status, access error makes git-daemon return them
+ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
diff --git a/dev-vcs/git/git-2.16.4.ebuild b/dev-vcs/git/git-2.16.4.ebuild
new file mode 100644
index 000000000000..3c560c003185
--- /dev/null
+++ b/dev-vcs/git/git-2.16.4.ebuild
@@ -0,0 +1,699 @@
+# 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="https://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 m68k ~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
+
+		for d in "${ED}"/usr/lib{64,}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	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=""
+	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+=" 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+=" ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		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+=" ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=" ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	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-2.17.1-r1.ebuild b/dev-vcs/git/git-2.17.1-r1.ebuild
new file mode 100644
index 000000000000..da380deae0b8
--- /dev/null
+++ b/dev-vcs/git/git-2.17.1-r1.ebuild
@@ -0,0 +1,717 @@
+# 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="https://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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+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 )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		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
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		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.17.0_rc1-optional-cvs.patch
+
+	"${FILESDIR}"/git-2.17.0-mw_install_path_fix.patch #655960
+
+	"${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=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	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
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		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 || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			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
+			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 )
+
+	# 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}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#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
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	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
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# 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
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	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
+	pushd contrib/subtree &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	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
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	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
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	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=()
+	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+=( t5000-tar-tree.sh )
+	fi
+
+	local 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+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		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+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	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 Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	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-2.18.0.ebuild b/dev-vcs/git/git-2.18.0.ebuild
new file mode 100644
index 000000000000..18794ba729d1
--- /dev/null
+++ b/dev-vcs/git/git-2.18.0.ebuild
@@ -0,0 +1,715 @@
+# 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="https://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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+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 )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		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
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		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.18.0_rc1-optional-cvs.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=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	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
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		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 || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			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
+			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 )
+
+	# 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}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#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
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	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
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# 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
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	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
+	pushd contrib/subtree &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	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
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	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
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	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=()
+	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+=( t5000-tar-tree.sh )
+	fi
+
+	local 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+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		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+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	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 Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	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
new file mode 100644
index 000000000000..7dfb5f64b1ac
--- /dev/null
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -0,0 +1,715 @@
+# 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="https://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 )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		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
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		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.18.0_rc1-optional-cvs.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=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	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
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		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 || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			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
+			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 )
+
+	# 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}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#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
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	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
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# 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
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	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
+	pushd contrib/subtree &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	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
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	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
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	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=()
+	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+=( t5000-tar-tree.sh )
+	fi
+
+	local 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+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		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+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	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 Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	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-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
new file mode 100644
index 000000000000..7dfb5f64b1ac
--- /dev/null
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -0,0 +1,715 @@
+# 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="https://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 )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		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
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		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.18.0_rc1-optional-cvs.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=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	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
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		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 || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			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
+			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 )
+
+	# 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}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#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
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	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
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# 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
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	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
+	pushd contrib/subtree &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	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
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	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
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	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=()
+	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+=( t5000-tar-tree.sh )
+	fi
+
+	local 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+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		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+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	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 Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	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-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
new file mode 100644
index 000000000000..c810b8798e3a
--- /dev/null
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -0,0 +1,715 @@
+# 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="https://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 )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		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
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		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.18.0_rc1-optional-cvs.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=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	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
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		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 || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			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
+			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 )
+
+	# 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}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#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
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	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
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# 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
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	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
+	pushd contrib/subtree &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	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
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	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
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "${d}" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	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=()
+	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+=( t5000-tar-tree.sh )
+	fi
+
+	local 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+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		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+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	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 Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	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.ebuild b/dev-vcs/git/git-9999.ebuild
new file mode 100644
index 000000000000..1fb66925cbfb
--- /dev/null
+++ b/dev-vcs/git/git-9999.ebuild
@@ -0,0 +1,715 @@
+# 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="https://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 )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		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
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		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.17.0_rc1-optional-cvs.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=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	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
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		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 || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			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
+			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 )
+
+	# 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}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#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
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	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
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# 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
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	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
+	pushd contrib/subtree &>/dev/null || die
+	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
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	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
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	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
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	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=()
+	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+=( t5000-tar-tree.sh )
+	fi
+
+	local 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+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		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+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	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 Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	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/metadata.xml b/dev-vcs/git/metadata.xml
new file mode 100644
index 000000000000..f76908835574
--- /dev/null
+++ b/dev-vcs/git/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <longdescription lang="en">
+    Git - Fast Version Control System. Official titled
+    "GIT - the stupid content tracker". 
+
+    Git is a popular version control system designed to handle very large
+    projects with speed and efficiency; it is used mainly for various open
+    source projects, most notably the Linux kernel.
+
+    Git falls in the category of distributed source code management tools,
+    similar to e.g. GNU Arch or Monotone (or BitKeeper in the proprietary
+    world). Every Git working directory is a full-fledged repository with full
+    revision tracking capabilities, not dependent on network access or a central
+    server.
+  </longdescription>
+  <use>
+    <flag name="blksha1">Use the new optimized SHA1 implementation</flag>
+    <flag name="cgi">Install gitweb too</flag>
+    <flag name="curl">Support fetching and pushing (requires webdav too) over http:// and https:// protocols</flag>
+    <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag>
+    <flag name="highlight">GitWeb support for app-text/highlight</flag>
+    <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
+    <flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>
+    <flag name="pcre-jit">Enable JIT for pcre</flag>
+    <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
+    <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
+    <flag name="tk">Include the 'gitk' and 'git gui' tools</flag>
+    <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-vcs/gitg-3.26.0 b/dev-vcs/gitg-3.26.0
deleted file mode 100644
index 18f5d854a4a6..000000000000
--- a/dev-vcs/gitg-3.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.25.0[ssh] <dev-libs/libgit2-glib-0.27.0 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 net-libs/libsoup:2.4 >=gnome-base/gsettings-desktop-schemas-0.1.1 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=dev-libs/libgit2-glib-0.24.4[vala] >=dev-util/intltool-0.40 gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=git repository viewer for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
-IUSE=glade +python python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.25.0[ssh] <dev-libs/libgit2-glib-0.27.0 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 net-libs/libsoup:2.4 >=gnome-base/gsettings-desktop-schemas-0.1.1 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=29fa463da29424e3bbedce5958ca5aa3
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
new file mode 100644
index 000000000000..cc2097113f7b
--- /dev/null
+++ b/dev-vcs/gitg/Manifest
@@ -0,0 +1,3 @@
+DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d
+EBUILD gitg-3.26.0.ebuild 1927 BLAKE2B 97bb1f4da59bcf28643516ca55e054fe6405765dee0ef2bd70cedf6fc29ec2d422767d4dce420afe5900e5759e4f1b82d0b88b971e4ca59cfee9cbfe1e7b53f2 SHA512 fd96b0f937e1beaba697bd5449f6cf916809d4e121594acf405cdb98a156dae4f640ac2972f768cfb213649455948f3d008218fe7a7e0c052686be43185db217
+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
new file mode 100644
index 000000000000..c9365256aab7
--- /dev/null
+++ b/dev-vcs/gitg/gitg-3.26.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
+
+inherit gnome2 pax-utils python-r1 vala
+
+DESCRIPTION="git repository viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="glade +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test if unbundling of libgd is possible
+# Currently it seems not to be (unstable API/ABI)
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/libgee:0.8[introspection]
+	>=app-text/gtkspell-3.0.3:3
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	dev-libs/libgit2:=[threads]
+
+	>=dev-libs/libgit2-glib-0.25.0[ssh]
+	<dev-libs/libgit2-glib-0.27.0
+
+	>=dev-libs/libpeas-1.5.0[gtk]
+	>=dev-libs/libxml2-2.9.0:2
+	net-libs/libsoup:2.4
+	>=gnome-base/gsettings-desktop-schemas-0.1.1
+	>=x11-libs/gtk+-3.20.0:3
+	>=x11-libs/gtksourceview-3.10:3.0
+	x11-themes/adwaita-icon-theme
+	glade? ( >=dev-util/glade-3.2:3.10 )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-libs/libgit2-glib-0.24.4[vala]
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-deprecations \
+		$(use_enable glade glade-catalog) \
+		$(use_enable python)
+}
+
+src_install() {
+	# -j1: bug #???
+	gnome2_src_install -j1
+
+	if use python ; then
+		install_gi_override() {
+			python_moduleinto "$(python_get_sitedir)/gi/overrides"
+			python_domodule "${S}"/libgitg-ext/GitgExt.py
+		}
+		python_foreach_impl install_gi_override
+	fi
+}
diff --git a/dev-vcs/gitg/metadata.xml b/dev-vcs/gitg/metadata.xml
new file mode 100644
index 000000000000..bebf2c542746
--- /dev/null
+++ b/dev-vcs/gitg/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription lang="en">
+		GTK+ based frontend for GIT
+	</longdescription>
+	<use>
+		<flag name="glade">Install a glade catalog file</flag>
+		<flag name="python">Install Python bindings for those plugins requiring it.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-vcs/github-pages-publish-0.1.2 b/dev-vcs/github-pages-publish-0.1.2
deleted file mode 100644
index 63b7ea6702d3..000000000000
--- a/dev-vcs/github-pages-publish-0.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools >=dev-python/pygit2-0.20.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A script that commits files from a directory to Github Pages
-EAPI=5
-HOMEPAGE=https://pypi.org/project/github-pages-publish/ https://github.com/rafaelmartins/github-pages-publish
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools >=dev-python/pygit2-0.20.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/github-pages-publish/github-pages-publish-0.1.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=50d77d4fe7141c974257275cd92861ad
diff --git a/dev-vcs/github-pages-publish/Manifest b/dev-vcs/github-pages-publish/Manifest
new file mode 100644
index 000000000000..90fb31a4fa90
--- /dev/null
+++ b/dev-vcs/github-pages-publish/Manifest
@@ -0,0 +1,3 @@
+DIST github-pages-publish-0.1.2.tar.gz 3295 BLAKE2B 6c891dde4fe450bb8708a5428fb1b205e111ebf876a7c8348e69dc89b95c43472a0ecc70ed75de7a3d137a8beead8ca00b12206dc8508371aa34c57ce53d6133 SHA512 3011a070c0798bc3f2853c32c6d97e20eb4711a23b4e2c2b188b4158d46d1434d89f8400bebed0806b9781cd8e13800f3e10d9e99ff2fc4e02059329fbee2658
+EBUILD github-pages-publish-0.1.2.ebuild 742 BLAKE2B 3b4052a909ad8f6bef1049c39a266e973e86f8614b376b29a1a1e4d59b35f06e619e6502921a2c3cb7c81f68d9b4c6e3ff709d4efde5858035e9ff70055b7a85 SHA512 194190921c7c8ce739e1e424a3d23089da3997b310653094549ec3628f65a02273e8541292db52cbc1135c41c37734c2a8fee54354e3fc68f2082a97c59cc3c3
+MISC metadata.xml 690 BLAKE2B 44cba5368226e6cc68ef5625a155c4aa41c243515e11ffea4886dc0a33d85f21c0b171910fa301429ebcb9f7fa93b41f5a565486f37d5391102ea38c93470d00 SHA512 e06cae5ac90a76620423fc720abee1165f4d0856fb083275e7d7f9c93c9c5689cd3d2b87489fe33bced9c3ad1d91f1eb681413abbb3ddd0079addf8a183fa025
diff --git a/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild b/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
new file mode 100644
index 000000000000..13890ea8da56
--- /dev/null
+++ b/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+GIT_ECLASS=
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
+fi
+
+inherit distutils-r1 ${GIT_ECLASS}
+
+DESCRIPTION="A script that commits files from a directory to Github Pages"
+HOMEPAGE="https://pypi.org/project/github-pages-publish/
+	https://github.com/rafaelmartins/github-pages-publish"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools
+	>=dev-python/pygit2-0.20.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-vcs/github-pages-publish/metadata.xml b/dev-vcs/github-pages-publish/metadata.xml
new file mode 100644
index 000000000000..aac060ab13fd
--- /dev/null
+++ b/dev-vcs/github-pages-publish/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		A script that commits files from a directory to the gh-pages branch
+		of the current Git repository.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>rafaelmartins@gentoo.org</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<remote-id type="pypi">github-pages-publish</remote-id>
+		<remote-id type="github">rafaelmartins/github-pages-publish</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/gitinspector-0.4.4 b/dev-vcs/gitinspector-0.4.4
deleted file mode 100644
index b966786bf245..000000000000
--- a/dev-vcs/gitinspector-0.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Statistical analysis tool for git repositories
-EAPI=6
-HOMEPAGE=https://github.com/ejwa/gitinspector
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ejwa/gitinspector/archive/v0.4.4.tar.gz -> gitinspector-0.4.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=742560481f0a4d29030dde9fe1a1e52e
diff --git a/dev-vcs/gitinspector/Manifest b/dev-vcs/gitinspector/Manifest
new file mode 100644
index 000000000000..6059cb93f6d8
--- /dev/null
+++ b/dev-vcs/gitinspector/Manifest
@@ -0,0 +1,3 @@
+DIST gitinspector-0.4.4.tar.gz 312201 BLAKE2B 870db21e9a3a3943e8315e88510d305f55e5074946456e0758f126e2d0b41e9b6e6c446417cf34339acaf5a84da02a5424195b66f7ef7d6ba2febd57ca6919dd SHA512 6e453a97f7b0bda73e376499268d9a46aa4ff1f8bb65092314a6d32031b0292056152b4e0e3781fbbe3aa6150373679bf78a8c83410882921ab40ce6d356fadb
+EBUILD gitinspector-0.4.4.ebuild 1079 BLAKE2B 1d1c07f1473b1018a853e5968ed332233c512e7c1fad97752a660ab4edddd173cb09faae1068e811b50ff5a6b3f7538975bc549adfb05069f661cb8a0f787caf SHA512 5488ab8568014db38b1517d6983542a82d6ad1db0ecda49dd24a1b878a6ec3718c8dfcdd8dcd1163be649a550a2eaec0beb227434c9bf19b6a4448f11c949bf7
+MISC metadata.xml 254 BLAKE2B d63f2f6971712f66322756a10d78cf425d449af8304573d723bf38691d29215a1b9f34ef0ee0648346e8be2c0a965092939a15d2538d67618c6e817be9515d26 SHA512 12393bb0a59ac43ececcee078244914186799f0b87706377147004ca6ddcea920a3aac8abac6905a1c68c0cb0652e7d95e62541172424730b9c01300f4e24be1
diff --git a/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild b/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild
new file mode 100644
index 000000000000..8a2f93873ec8
--- /dev/null
+++ b/dev-vcs/gitinspector/gitinspector-0.4.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Statistical analysis tool for git repositories"
+HOMEPAGE="https://github.com/ejwa/gitinspector"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-vcs/git"
+DEPEND="test? ( ${RDEPEND} )"
+
+python_prepare_all() {
+	[[ ${LC_ALL} == "C" ]] && export LC_ALL="en_US.utf8"
+
+	# Otherwise this gets installed with the *.txt glob.
+	rm LICENSE.txt || die 'failed to remove LICENSE.txt'
+
+	# Use /usr/share/doc/${PF} instead of /usr/share/doc/${PN}.
+	sed -i setup.py \
+		-e "s:share/doc/gitinspector:share/doc/${PF}:" \
+		|| die 'failed to fix the documentation path in setup.py'
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# The distutils install routine misses some important documentation.
+	doman docs/gitinspector.1
+	dodoc docs/*.{pdf,css,html,txt}
+}
diff --git a/dev-vcs/gitinspector/metadata.xml b/dev-vcs/gitinspector/metadata.xml
new file mode 100644
index 000000000000..0233271d1ea1
--- /dev/null
+++ b/dev-vcs/gitinspector/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">ejwa/gitinspector</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/gitolite-2.3.1-r1 b/dev-vcs/gitolite-2.3.1-r1
deleted file mode 100644
index 80c61b9d2ffc..000000000000
--- a/dev-vcs/gitolite-2.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=contrib vim-syntax
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://milki.github.com/gitolite/gitolite-2.3.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=632193f2683943d270c1ad331881a2a7
diff --git a/dev-vcs/gitolite-3.6 b/dev-vcs/gitolite-3.6
deleted file mode 100644
index 3653cca2eff8..000000000000
--- a/dev-vcs/gitolite-3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.tar.gz -> gitolite-3.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9d203161a9aabe9a7bb88f236b150f11
diff --git a/dev-vcs/gitolite-3.6.1 b/dev-vcs/gitolite-3.6.1
deleted file mode 100644
index 5d6b14ef38db..000000000000
--- a/dev-vcs/gitolite-3.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.1.tar.gz -> gitolite-3.6.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=25b0a22f041b1f51de52e0e0f1b27a4a
diff --git a/dev-vcs/gitolite-3.6.2 b/dev-vcs/gitolite-3.6.2
deleted file mode 100644
index 825d41496b0f..000000000000
--- a/dev-vcs/gitolite-3.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.2.tar.gz -> gitolite-3.6.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=96473d4802c419fa3b6b63a029df5f6d
diff --git a/dev-vcs/gitolite-3.6.2-r1 b/dev-vcs/gitolite-3.6.2-r1
deleted file mode 100644
index 1f31e4bd277d..000000000000
--- a/dev-vcs/gitolite-3.6.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.2.tar.gz -> gitolite-3.6.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5b1e4b4612fac5e5a5a4e4f3e0f7da9d
diff --git a/dev-vcs/gitolite-3.6.3 b/dev-vcs/gitolite-3.6.3
deleted file mode 100644
index a69ddd32b447..000000000000
--- a/dev-vcs/gitolite-3.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=selinux tools vim-syntax
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.3.tar.gz -> gitolite-3.6.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a0bd477e6c80d6736d9347122a3fb807
diff --git a/dev-vcs/gitolite-3.6.4 b/dev-vcs/gitolite-3.6.4
deleted file mode 100644
index c5adef7fb034..000000000000
--- a/dev-vcs/gitolite-3.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.4.tar.gz -> gitolite-3.6.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e4547292c713f1e1b92c02cd585de4cd
diff --git a/dev-vcs/gitolite-3.6.4-r1 b/dev-vcs/gitolite-3.6.4-r1
deleted file mode 100644
index 9ca5087b14eb..000000000000
--- a/dev-vcs/gitolite-3.6.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.4.tar.gz -> gitolite-3.6.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=883267c8fb9acfbe3e944412b315e854
diff --git a/dev-vcs/gitolite-3.6.5 b/dev-vcs/gitolite-3.6.5
deleted file mode 100644
index 8c78bf65f73d..000000000000
--- a/dev-vcs/gitolite-3.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.5.tar.gz -> gitolite-3.6.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=883267c8fb9acfbe3e944412b315e854
diff --git a/dev-vcs/gitolite-3.6.6 b/dev-vcs/gitolite-3.6.6
deleted file mode 100644
index 5a8c756d1d05..000000000000
--- a/dev-vcs/gitolite-3.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=6
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=selinux tools vim-syntax
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.6.tar.gz -> gitolite-3.6.6.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2769299c50bca73fcd7337eae93a10b5
diff --git a/dev-vcs/gitolite-3.6.7 b/dev-vcs/gitolite-3.6.7
deleted file mode 100644
index aecff79ba549..000000000000
--- a/dev-vcs/gitolite-3.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=6
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.7.tar.gz -> gitolite-3.6.7.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1ac53eb8c70cedd809b4a1205c739434
diff --git a/dev-vcs/gitolite-9999 b/dev-vcs/gitolite-9999
deleted file mode 100644
index 698a5a0bee29..000000000000
--- a/dev-vcs/gitolite-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)] dev-vcs/git
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=selinux tools vim-syntax
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=883267c8fb9acfbe3e944412b315e854
diff --git a/dev-vcs/gitolite-gentoo-2.3.1-r1 b/dev-vcs/gitolite-gentoo-2.3.1-r1
deleted file mode 100644
index 52170477f3c7..000000000000
--- a/dev-vcs/gitolite-gentoo-2.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=contrib vim-syntax
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cc21e49fa01d38e0a3d6123bf7c8970
diff --git a/dev-vcs/gitolite-gentoo-2.3.3-r1 b/dev-vcs/gitolite-gentoo-2.3.3-r1
deleted file mode 100644
index ecafd4e57c7a..000000000000
--- a/dev-vcs/gitolite-gentoo-2.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=contrib vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e9def179748d97c522f9c8b77bf364a
diff --git a/dev-vcs/gitolite-gentoo-3.5.3.1 b/dev-vcs/gitolite-gentoo-3.5.3.1
deleted file mode 100644
index 3a8b2320b7c5..000000000000
--- a/dev-vcs/gitolite-gentoo-3.5.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.5.3.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=77192b097e5c5611604709e8b9f8a211
diff --git a/dev-vcs/gitolite-gentoo-3.6.1 b/dev-vcs/gitolite-gentoo-3.6.1
deleted file mode 100644
index 17686841115b..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=77192b097e5c5611604709e8b9f8a211
diff --git a/dev-vcs/gitolite-gentoo-3.6.1-r1 b/dev-vcs/gitolite-gentoo-3.6.1-r1
deleted file mode 100644
index be2054fc9f55..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/dev-vcs/gitolite-gentoo-3.6.2.1 b/dev-vcs/gitolite-gentoo-3.6.2.1
deleted file mode 100644
index 1f47037e479a..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/dev-vcs/gitolite-gentoo-3.6.2.2 b/dev-vcs/gitolite-gentoo-3.6.2.2
deleted file mode 100644
index c286a3c49b2a..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/dev-vcs/gitolite-gentoo-3.6.2.3 b/dev-vcs/gitolite-gentoo-3.6.2.3
deleted file mode 100644
index c409b9bd701f..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/dev-vcs/gitolite-gentoo-3.6.2.4 b/dev-vcs/gitolite-gentoo-3.6.2.4
deleted file mode 100644
index f0c64988ed32..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/dev-vcs/gitolite-gentoo-3.6.3 b/dev-vcs/gitolite-gentoo-3.6.3
deleted file mode 100644
index b7c7ee7c4921..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/dev-vcs/gitolite-gentoo-3.6.3.2 b/dev-vcs/gitolite-gentoo-3.6.3.2
deleted file mode 100644
index 4db36e457229..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.3.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/dev-vcs/gitolite-gentoo-3.6.4 b/dev-vcs/gitolite-gentoo-3.6.4
deleted file mode 100644
index 5ff03d1cc22c..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/dev-vcs/gitolite-gentoo-3.6.4.1 b/dev-vcs/gitolite-gentoo-3.6.4.1
deleted file mode 100644
index 9125ace12c18..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/dev-vcs/gitolite-gentoo-3.6.4.1-r1 b/dev-vcs/gitolite-gentoo-3.6.4.1-r1
deleted file mode 100644
index f4b9cc7e1519..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/dev-vcs/gitolite-gentoo-3.6.5 b/dev-vcs/gitolite-gentoo-3.6.5
deleted file mode 100644
index 929eacd52f8f..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.5.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/dev-vcs/gitolite-gentoo-3.6.6 b/dev-vcs/gitolite-gentoo-3.6.6
deleted file mode 100644
index 7e1da1d8a6f0..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/dev-vcs/gitolite-gentoo-3.6.6.1 b/dev-vcs/gitolite-gentoo-3.6.6.1
deleted file mode 100644
index 49f243f15959..000000000000
--- a/dev-vcs/gitolite-gentoo-3.6.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/dev-vcs/gitolite-gentoo-9999 b/dev-vcs/gitolite-gentoo-9999
deleted file mode 100644
index ff36c54a4fa8..000000000000
--- a/dev-vcs/gitolite-gentoo-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)] dev-vcs/git
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
new file mode 100644
index 000000000000..b7a918953cc4
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -0,0 +1,34 @@
+DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
+DIST gitolite-gentoo-2.3.3.tar.bz2 199370 BLAKE2B c42e82e36f593046c35e7828de1d1ad99bf26564ec248eb24ab7bf7f83ffc7095d893e7a6813e609368221b04d5e38881d723cd8fe6286322c11b39bb4c64158 SHA512 f9720effa816400544bf5526d896b9db734828c46356d0188e2ddb8fa8f175efb0f60b30c9e9c80a0624f6cb6dc5c5a301d8dfa35f13ad08fcd0538a0b8f77c3
+DIST gitolite-gentoo-3.5.3.1.tar.bz2 127391 BLAKE2B f9fb28cbaca4c1e13100205fef2b6cdf84cebc61ae9726048e869eca847bc2c365cfc75fd6c2a82a2df01eee843db1719cd0da9b7dab27496b60079dbdfb2ca6 SHA512 f36a270f651b2b8d4ae02fd7b3841a599b7c66d36a6f92df8974897fdec863b4c09064c384ede9309150a4a487186ba3c3079cd0037d5fd39852b452115933bb
+DIST gitolite-gentoo-3.6.1.tar.bz2 140554 BLAKE2B aa811f4922dc530f9bfd78ebfa4d48473a484ca264db0120ac3cdf722bce009d615e257c4638e9c75d29116cb6882ca426fe07d040df3a60423824289a4d711a SHA512 563f2753f4d04d8a2c5d323fbf3d15f9f12975d4aa3ae3781011b521be7ca2b2ac755f9c4247f86ee303aa7f8c9795f3fdff4504a347b9b9cd08525666bb0187
+DIST gitolite-gentoo-3.6.2.1.tar.bz2 143357 BLAKE2B f6c2440116c7a50b780e8cb9e1ba0f799fee2664c3de6bd5960beff505edd150dbe1c37e53d957dfceba450d1335ed398108f17934c2faeec3777fb3f409c6ba SHA512 53ae6549a819437d2481249707156eb0f68cccd289bbb40affedd1f7cdda620b974f8e7ee6853c196728cdccf0eb9f8f340a132538dcbf0b653fb69e08d40b9d
+DIST gitolite-gentoo-3.6.2.2.tar.bz2 143601 BLAKE2B 7033ccf65cd7fbf70dad031d838b6917f82cd273828758222877985176e91f2eea82e08a957c740ba72a987e2b703c783c0e75cf3570da5fe6bf56e2b0f867d1 SHA512 431df7002d146d321199ff5ae324177f5b14b1a0ae8e87288ff15a8670eec9e55637d8a6d28d4eac2ff2a54f3f38e3aa700257c5321c73133fcb09037fb384f8
+DIST gitolite-gentoo-3.6.2.3.tar.bz2 143658 BLAKE2B c4de16f291b2ce343eca6056a774fd234136f847e3e2bf59842df77b4a2a8190de27e0f5b786ec248e219fa42fd991470e09752aa1dc63a79a38dea891b16482 SHA512 9b8ddaad043d9c7cdbcb027fcbfd36cd09ce2cfaf0b102deee037977461d54942fd7ac019373876f9f4ab04250f78c8565c73494b7b9fc0e42e140d878cc303f
+DIST gitolite-gentoo-3.6.2.4.tar.bz2 143564 BLAKE2B 5c998a523d875c79e80ed6f03cbb885573bdcce3da17e36b683110d2b05f307166c7bf11cba51d0b13db23999eb82e730e044cf0839c594d17eee8ddba87e0b3 SHA512 ec5e62822687b1293348107df003e3c3c4a3aad9b4f461e09410aef993bb464a176daee81223ae952159572db7158267fd90b90cbc877c4be2a9fdc2ecc87fb7
+DIST gitolite-gentoo-3.6.3.2.tar.bz2 148655 BLAKE2B b2f1163f34fa25de908bf702bfea8f1dcc97fc1fc8c306756d32b6331d67fe50b162da34dec1e8af08cd24714a8318c1a5ec69e008b7aba2f20976cfbf87eb75 SHA512 deed5379316e5fc3d33b7131eb64f7850004b34e034dd37417796dafbc9c038d92f4002f8d9c2066a0859bb1052669a378e8a66387f27eed10c6ca5a73e04623
+DIST gitolite-gentoo-3.6.3.tar.bz2 147531 BLAKE2B 9a9018bc54922800aa6fe68d40ed29a5add3987ddf18f1d2f9ebe10a0ab308b8e0a9c13a7d44e6ab268116f99fb082c49a9fa8a597b86d6da34cc4d6e1a70442 SHA512 4c4f40cf608ea78f76c39701880e53e2f6486fc37478818f5b4f0946fcd9ffe30ef122463b7b6b48a0a9931271fe7ef7aecf6bf23bbce45f36cd1e217e5ec45a
+DIST gitolite-gentoo-3.6.4.1.tar.bz2 151771 BLAKE2B 70d88a20954e662fcd021c9a8625db2124bbad1b61a1e91f82e60b69b79501e4f6ec235d62fbd7b6e215dcd802d3e33109794e6a5f98b74de269e54d9eca136f SHA512 5eec313199f9d757be2c357ae07d8e3a8f7b82dd684a40024a33ec3f3d8806fd0cac7f57fcc740be888285343d965fa2497fccb971d24b0082c772cf1cb1655f
+DIST gitolite-gentoo-3.6.4.tar.bz2 151879 BLAKE2B 0b6224f8156c6a82b792a505eb66f56622991606f15ca9d8da03763cd9771c7a78763e1da47f8ef8b4d9fa4ac80e53fd9fdb07445c760e405520d13068c95c8a SHA512 dcb926f747ce43942c5678390bf0649061d4f779d416fc09980ab8a9b169a9604596f6b7800432636f43707c83aac61472df26cfb1c66cc85d1ff8eaa4db2c19
+DIST gitolite-gentoo-3.6.5.tar.bz2 153234 BLAKE2B cb92a2008f80312288b925b9a22c45593203021f47d8f057bdf2597c09d515bc66b5d4947bcc5c5d7e88582c847049d6363139369571fa32f673a107391564d7 SHA512 c32f91dcb8ff790c2c59f0cb9ce1f906b17d5012922e0efdb2da1f7b1986f9f82b85b6e232f6b6e65e4d3daecb8f247a408b664b44624a64bf876b416a7b3ca4
+DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
+DIST gitolite-gentoo-3.6.6.tar.bz2 155267 BLAKE2B 28f09d01a550da9b56e7d2df0ee16c855dcfc66e6a7639734eee98d534d353f1ed8c3547e4a5f5d7b7cf2160b1be376e0e6c7d26b6a74635cf47626f6af3feef SHA512 cd3a34e714072b1b8792b98c023dfa141dff03cc2e225e0a006fafd3a112d98bf031a826ccfb667624b2455f1253def6c487ffba1134ad6cc8c981987437a9d6
+EBUILD gitolite-gentoo-2.3.1-r1.ebuild 1851 BLAKE2B 985751674364c3ace2e07f37832fe94f6341768d51dd247f2e1b6e2a48593ee216bcabb8e583b526ab1b11dbc21c22700c85a95617c96cc2534521ffe8dc0f18 SHA512 4d4814b3ff975bf19de0391a25125dd7133880365dfb90364bae99ea0830ffc292d90b6dbbdae603d48d751897c456af48f71e6019f961443aba897b0a48e2e8
+EBUILD gitolite-gentoo-2.3.3-r1.ebuild 1853 BLAKE2B d98b1f8655cb929e23dc51908b1d20517a5f8915369574ab228c7c255d1028b509316bd238225e708a1a94a916061e7d156db0550c0d47ded668ac3ef5191cc9 SHA512 48bd7b9c9fbd7f527d395d9c5988e1596f624325969742bc57f2f7700fd89a24d590ac3297a05c11212530dbf99a819ccc90cb6db6ffb657ec807f4961efe8f6
+EBUILD gitolite-gentoo-3.5.3.1.ebuild 2277 BLAKE2B 824e2f30de95eb40ee055ab8fa5a34959050b311e75134c638281c5e120f242e8615ff92db3a83a341f41bcf883f747a2f87fd8652bf949d11de9b29ab6ea2b3 SHA512 dfbb656030a91dcba1b9f6dba30f6b48daafef1484bc1cd5ec56183aeeaca01c2fb8579ba83be2366d01c28fdfa5dabf7f180696c781a7dc0247bf018ddc7484
+EBUILD gitolite-gentoo-3.6.1-r1.ebuild 2734 BLAKE2B fbcafc9d0fc1588fabaf0a0e595e8e9027ced364aff9e1f0b9b16cdceae745888d79454e8687844887fa65318355252327e5050410fb7c51fec17830b2896000 SHA512 d0563316516a999a09b5daa1bc0ab2c416dd52bc599f7b5eb00a5e00bb3bdd17c5fe02dd2594a5153dffd8955e10ef642e99046121ec254712992bbd6ae9c7d4
+EBUILD gitolite-gentoo-3.6.1.ebuild 2277 BLAKE2B 824e2f30de95eb40ee055ab8fa5a34959050b311e75134c638281c5e120f242e8615ff92db3a83a341f41bcf883f747a2f87fd8652bf949d11de9b29ab6ea2b3 SHA512 dfbb656030a91dcba1b9f6dba30f6b48daafef1484bc1cd5ec56183aeeaca01c2fb8579ba83be2366d01c28fdfa5dabf7f180696c781a7dc0247bf018ddc7484
+EBUILD gitolite-gentoo-3.6.2.1.ebuild 2734 BLAKE2B fbcafc9d0fc1588fabaf0a0e595e8e9027ced364aff9e1f0b9b16cdceae745888d79454e8687844887fa65318355252327e5050410fb7c51fec17830b2896000 SHA512 d0563316516a999a09b5daa1bc0ab2c416dd52bc599f7b5eb00a5e00bb3bdd17c5fe02dd2594a5153dffd8955e10ef642e99046121ec254712992bbd6ae9c7d4
+EBUILD gitolite-gentoo-3.6.2.2.ebuild 2734 BLAKE2B fbcafc9d0fc1588fabaf0a0e595e8e9027ced364aff9e1f0b9b16cdceae745888d79454e8687844887fa65318355252327e5050410fb7c51fec17830b2896000 SHA512 d0563316516a999a09b5daa1bc0ab2c416dd52bc599f7b5eb00a5e00bb3bdd17c5fe02dd2594a5153dffd8955e10ef642e99046121ec254712992bbd6ae9c7d4
+EBUILD gitolite-gentoo-3.6.2.3.ebuild 2741 BLAKE2B a695156050032526591a273374755a6fb39a7ecac72ebeff0d6e29e35e74d5b3b8406c4d36d9b5899a4457360d02a36540fc9449e00e43e5687e07739350e978 SHA512 90e91cea8309a2058ce508ce521d65e2c4a5f9026253de7410d35f9430494a4660bc380ced3f8bf0d07af9d2efd1c7e65d48018dab37c116ebe0423931b3f000
+EBUILD gitolite-gentoo-3.6.2.4.ebuild 2741 BLAKE2B a695156050032526591a273374755a6fb39a7ecac72ebeff0d6e29e35e74d5b3b8406c4d36d9b5899a4457360d02a36540fc9449e00e43e5687e07739350e978 SHA512 90e91cea8309a2058ce508ce521d65e2c4a5f9026253de7410d35f9430494a4660bc380ced3f8bf0d07af9d2efd1c7e65d48018dab37c116ebe0423931b3f000
+EBUILD gitolite-gentoo-3.6.3.2.ebuild 2790 BLAKE2B 8ca32a75e449f42b5856e5a49eb0469dcea0247c3988167bd0fe1a1278d9c395c1a6679573d9aaa2a34780ff8a59a85baba33a3b38c782a2fcbbe2ca289f74b4 SHA512 c30568b53dfaece456c58603a0c63fc474819c66da2bb12ebe3c465edd67ce3dd38a9cb5667655b90fcb46af425a523098962c7d8f1f4dc938048f192f9001e0
+EBUILD gitolite-gentoo-3.6.3.ebuild 2741 BLAKE2B a695156050032526591a273374755a6fb39a7ecac72ebeff0d6e29e35e74d5b3b8406c4d36d9b5899a4457360d02a36540fc9449e00e43e5687e07739350e978 SHA512 90e91cea8309a2058ce508ce521d65e2c4a5f9026253de7410d35f9430494a4660bc380ced3f8bf0d07af9d2efd1c7e65d48018dab37c116ebe0423931b3f000
+EBUILD gitolite-gentoo-3.6.4.1-r1.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd04bd4482584f9780af9a98633c8b6723f0220f8f55c98335f3243d79d7afe5342be0ce972781027d1a0d36b56fdf2cc6e SHA512 3bd502a5cb7279968993e0070065b27e707c53e065ca143db5bb38e6f2a6d3b6a6282567a80522aa1a15509150218185bd1de5a2be40176acef03d30b395909c
+EBUILD gitolite-gentoo-3.6.4.1.ebuild 2790 BLAKE2B 8ca32a75e449f42b5856e5a49eb0469dcea0247c3988167bd0fe1a1278d9c395c1a6679573d9aaa2a34780ff8a59a85baba33a3b38c782a2fcbbe2ca289f74b4 SHA512 c30568b53dfaece456c58603a0c63fc474819c66da2bb12ebe3c465edd67ce3dd38a9cb5667655b90fcb46af425a523098962c7d8f1f4dc938048f192f9001e0
+EBUILD gitolite-gentoo-3.6.4.ebuild 2790 BLAKE2B 8ca32a75e449f42b5856e5a49eb0469dcea0247c3988167bd0fe1a1278d9c395c1a6679573d9aaa2a34780ff8a59a85baba33a3b38c782a2fcbbe2ca289f74b4 SHA512 c30568b53dfaece456c58603a0c63fc474819c66da2bb12ebe3c465edd67ce3dd38a9cb5667655b90fcb46af425a523098962c7d8f1f4dc938048f192f9001e0
+EBUILD gitolite-gentoo-3.6.5.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd04bd4482584f9780af9a98633c8b6723f0220f8f55c98335f3243d79d7afe5342be0ce972781027d1a0d36b56fdf2cc6e SHA512 3bd502a5cb7279968993e0070065b27e707c53e065ca143db5bb38e6f2a6d3b6a6282567a80522aa1a15509150218185bd1de5a2be40176acef03d30b395909c
+EBUILD gitolite-gentoo-3.6.6.1.ebuild 2796 BLAKE2B fc76471fd3d786d481fd98bb552818dd17177738fe73cec64e8b7391b6a1405641c04bd95f0409accb1633ce30bc72b68343e47086549b4f624e4bf5bcb9d67f SHA512 8f2800d6c8a11fd1d7ef43f754c17642db284c93e63a0028153dc33da647c59fe272eb09a2c8c0569915b7f57a5d29737a7be200b4ae8da88939e2bdecce4338
+EBUILD gitolite-gentoo-3.6.6.ebuild 2796 BLAKE2B fc76471fd3d786d481fd98bb552818dd17177738fe73cec64e8b7391b6a1405641c04bd95f0409accb1633ce30bc72b68343e47086549b4f624e4bf5bcb9d67f SHA512 8f2800d6c8a11fd1d7ef43f754c17642db284c93e63a0028153dc33da647c59fe272eb09a2c8c0569915b7f57a5d29737a7be200b4ae8da88939e2bdecce4338
+EBUILD gitolite-gentoo-9999.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd04bd4482584f9780af9a98633c8b6723f0220f8f55c98335f3243d79d7afe5342be0ce972781027d1a0d36b56fdf2cc6e SHA512 3bd502a5cb7279968993e0070065b27e707c53e065ca143db5bb38e6f2a6d3b6a6282567a80522aa1a15509150218185bd1de5a2be40176acef03d30b395909c
+MISC metadata.xml 478 BLAKE2B c178da3340159b14dc13fed855672892da98d2bd1ded28759120d60c93823b48e3887f59991776b1b68ab3941124e98b1b224f64544bbae9ea363e4c91266a2e SHA512 c014b88113a5769aa13b2d898afef78df07a642c4ccc964ae62bb64f07d3dac3c6e81df0defd873bc85be4434714abfeac160be0b4b1e9b77510f6cb5ad54810
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..68d699eaea57
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}-gentoo" > conf/VERSION
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+	gl_bin=${gl_bin/\/\//\/}
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	export PATH="${gl_bin}:${PATH}"
+	./src/gl-system-install ${gl_bin} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+	ewarn
+	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
+	elog "then please check the permissions of all repositories using the umask feature"
+	ewarn
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..f03af212c5f8
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}-gentoo" > conf/VERSION
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+	gl_bin=${gl_bin/\/\//\/}
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	export PATH="${gl_bin}:${PATH}"
+	./src/gl-system-install ${gl_bin} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+	ewarn
+	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
+	elog "then please check the permissions of all repositories using the umask feature"
+	ewarn
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
new file mode 100644
index 000000000000..7460fb092445
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module user versionator
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.txt CHANGELOG
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..fb86e51f1c28
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild
new file mode 100644
index 000000000000..7460fb092445
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module user versionator
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.txt CHANGELOG
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild
new file mode 100644
index 000000000000..fb86e51f1c28
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild
new file mode 100644
index 000000000000..fb86e51f1c28
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild
new file mode 100644
index 000000000000..3f6d38426043
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild
new file mode 100644
index 000000000000..3f6d38426043
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild
new file mode 100644
index 000000000000..2df90f3a53b1
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild
new file mode 100644
index 000000000000..3f6d38426043
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild
new file mode 100644
index 000000000000..7120a4c7c21d
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild
new file mode 100644
index 000000000000..2df90f3a53b1
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild
new file mode 100644
index 000000000000..2df90f3a53b1
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild
new file mode 100644
index 000000000000..7120a4c7c21d
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild
new file mode 100644
index 000000000000..e3537a2dee5e
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild
new file mode 100644
index 000000000000..e3537a2dee5e
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
new file mode 100644
index 000000000000..7120a4c7c21d
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/metadata.xml b/dev-vcs/gitolite-gentoo/metadata.xml
new file mode 100644
index 000000000000..6eeb785c12d0
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<use>
+		<flag name="contrib">Install user-contributed files</flag>
+		<flag name="tools">Install tools to e.g. convert a Gitosis config to
+			gitolite or one to check if your setup is gitolite &gt;= 3.x compatible</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
new file mode 100644
index 000000000000..64e6940a99b0
--- /dev/null
+++ b/dev-vcs/gitolite/Manifest
@@ -0,0 +1,23 @@
+AUX gitolite-3.6.6-fix-shebang.patch 731 BLAKE2B 2e3bd0dbf56c955587dfc6a446ea2397875a0f9051e69ed891e9b630441407846f65bb2583999bb9f1c94693410d4bdd81e314da42e22ba978cb72af89968482 SHA512 dfffd0a7ef37e01edc690bba13f39edb4a751684addc1cfae8248c59fe48a59e51232ba21a1a9f1056756dcd6b51f04375f6652085f2dccad1f55073751bc105
+DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9cc908ed092b55272c59a4bd52145302e638612f1788d68b2445b8c665f025b24c47d50992dd3f6ef2fd6eb63ee7 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee
+DIST gitolite-3.6.1.tar.gz 165506 BLAKE2B 82c7eaaf6f05475eba5e0cf51c88190783e3342a0c6caacae22be4210d06a8040245274c8f9ad819cef40370c4b5d02be2f36daa42433427ada88b49da1502ff SHA512 b568f9e96ddfa4cd482197a89cb0142fcb2717028227a0a2e9caa9864bb95379042ec464352a1d99dfd8ccff780b1211e8f926ad8de284245fc280038eda481a
+DIST gitolite-3.6.2.tar.gz 167670 BLAKE2B 83f26069751f3a75a51cafa484d2d77239bc49f82a62418d84fe0863e66031de66fa062319a841dacb9bafa0be7c2fefab3be890118334222a8d64f1112871e0 SHA512 f8f041fde1b7c533fcb9cc32beec99dd83bc0a81795115e7205585bbe2f25135e2347df437e123349525a0186fe702f265330b259d336389b437cecf0e894629
+DIST gitolite-3.6.3.tar.gz 174689 BLAKE2B bf58c4991d4bb9b578b983854dcd5011d55f05515a13781910327bd07aa00ab7426367f5c084341326742796266f5648ce5470dec5247b74bc850f5cfa327c93 SHA512 afb8bcf27052d46725c4b3a6dd483e98ac3e574651bfe2ee35b442f044791acae8a17cbbab4237992a9755367e37f5160514d67cd2d863d623d32ed5fdf39362
+DIST gitolite-3.6.4.tar.gz 180619 BLAKE2B 183769c8dce0d4fcba10ad57b29b56913493b3f44f2f606d7ea2bd704c225658a55760022ac9ebbf82875c2c74a561770e80e2f8dc375158765a8e069a0f9fd2 SHA512 7c709372f66c4620109824191d6bf736b1066d74e5acd481fa552a6f010a38d6d7d17629a92fe7b944b43c6cac864db80217cefadc0e3a6dbf63530cff89cd6d
+DIST gitolite-3.6.5.tar.gz 182496 BLAKE2B 478bed0642886ee8b79b1e6c2091482a43663a644c46758ef3c9c55308b10bfa4c4608456e24214bad04607c49487df213e5bff84abb5529c9b0759c39f9288b SHA512 60796663a87c2b169c08e4e26edfb76408428887d3e932677f4ca95a8c7f82e9e300a7400d3d900c371628b23972be063444b7c036218f6ff0ab13626a886f90
+DIST gitolite-3.6.6.tar.gz 183469 BLAKE2B 91b1b04820f8abe427c7d6a81131a9fce1ff3df8d06c3f1d7515ead91b654048ef24b391fc28f2fe9c6dd0e502e24064a55b5fee8c1da34e3d07974c8f203c26 SHA512 1529330ed2afa315fcb650c55d515e5d4b61921f46b4d763a759537434492959f100d2219ab7673e568d46f397a25a45d4388fe3827ea988333fc8719820f8bc
+DIST gitolite-3.6.7.tar.gz 186298 BLAKE2B 32ccedce5cfe877d69f66ccc354300b1b363de0ac16bf8ec6d97010441d1e5a95e63252c833604d7e4e5b90dd4d84b4e262ee5ed092df80631e7478500e3da97 SHA512 d22bf5c34834f82df771e6d4527496a302da312f7f78dfe81c1284f5a1ea05de90ec217e03e94918d69a006a72fa16dc0006b1f555826ad6183d9dce2dd9d425
+DIST gitolite-3.6.tar.gz 156481 BLAKE2B 4cb36e631c458c529d51689bb9612ede34b352d523b62afefed70ab90fadbda1c1d954400c5ddf407ef57a3df8371814c73fdcc526bf3750dad9bfa10f1e7747 SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f
+EBUILD gitolite-2.3.1-r1.ebuild 1647 BLAKE2B cf918594448f8cbb0d381118c5fdc6ba3bfcd3669a26b3ca5264f66deb2e4273c29554ba7edf0a04e350619fd45a8083e69017793eb48bf7facf2e4f4d3bb25f SHA512 77347b4575a9236a5e259e9c67eb29ecd023092c2713ca45d8871af2303222d827296405168126f7f88ff45c8bcb96427325391801baa5740a90b2548bb25da4
+EBUILD gitolite-3.6.1.ebuild 1868 BLAKE2B dd6c05d7831b14bc2baa3de478f6382ef57bc1a6d9dcf6b81b22a881df3ed53dd5499222a8bfa38a4231a55acd87eff35acc6be4be05f11a108f6930e6b05f91 SHA512 816b9b4f1dbb13bc08de4511c8770b3ca0e43487793ffc06cb4b2579d0339c6b2c7d51c18e474bbdcdce7a6c7ffcd1cc1803d9b4b5ce5d23780efd354fb22788
+EBUILD gitolite-3.6.2-r1.ebuild 2303 BLAKE2B dcccd91d2c84dd445e3d16a2324c10a7e60440f5c1d37ebce348c22e8d0fde62a86457828675b41c80bc9986a38c78fa496225120e2fa918233dca44779b4490 SHA512 0b529e19c8b8efe3f18d80dddb91fad5103b93f87f58a891e488bfd29162718eb08549071686faee6871fd693996930ac76cebe10f67819e476785b8883ddb59
+EBUILD gitolite-3.6.2.ebuild 1873 BLAKE2B f02f4853328beb5c2c07abc7cc79779a1499bb327f3a204028edc68da5080319dd8821d5116a16ccbe8eb2b160b83ad83638b90ec35952458388286595981e0a SHA512 c5e562c9db575a053afeb98146c61bd2c05f4f478e49b1581d61b716916af47234548ecc1d8b043388d991a3adde1d8a6cffcbcff83fbc060d1deac9973da50a
+EBUILD gitolite-3.6.3.ebuild 2350 BLAKE2B 085ed29e81b5c2914201168b94dd4d01b86dbc0bb4c221956f8ff382bade290c41a76e62d417e42cb2c03a1b220704e029240c3cce7b93d02a75e7d0aaef17b1 SHA512 c0a6ba41dc2854d273f780b4f59f9350d660e18861ea6153d4e42ae05235db16caeb10c2ae7f13a462eeb370b8e4e6879d7336949e4563d9d507848581e98d83
+EBUILD gitolite-3.6.4-r1.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111
+EBUILD gitolite-3.6.4.ebuild 2352 BLAKE2B 7bc3ad034046f8c2bcae2dc1aa7ef3a312e242a43c9044a685040562c566c27c9d6fab58587905eaebfcdc7d3ba2632c46c2e0150914c60e87740df6a5525f77 SHA512 ecab29b2a31c6bb98d76c7daff75f0b7df25396c84787dd235da65c16390ceb4c35c96e9d263559f20ea3bd450346bd3599a5c87aa52226304d3e66df45610fc
+EBUILD gitolite-3.6.5.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111
+EBUILD gitolite-3.6.6.ebuild 2431 BLAKE2B 3d34e9ddf77bb044de9a1bd1984082e33d8f6fd6cafc71e63bf4860c2cf94e934dba75346b0648badf0637cbbe77a57c9bce5971c1e4d01c597c9d951cfe0164 SHA512 8b4cf676c8a3434e97962301be3608b7ea10b48e8b5f0f8d185b274c1d9e2bc3d6f7c046879d2b825d16bdc5d514d9c790caa6bb4922b1a1d5a5827a17858c3d
+EBUILD gitolite-3.6.7.ebuild 2398 BLAKE2B 864703fc35faa76894bb8a7c82dd97fe80cc5ebd02a607cab670ebf168eaf6ca97b10ca93824023da02974f5fd740002084f0d08f9eb6411c6b2082bcae16f95 SHA512 1584babccb49c0d491bc749d804bf6ff5e3c4adcb1dfdf80d04d577a076e11315ceec5989f7e9be0e410b86b450aa8637d2cca177a75216a66bcc8577a28384b
+EBUILD gitolite-3.6.ebuild 1866 BLAKE2B cd81d9ee5108877d42a2cc3ccf3f6ae57f870838c2a11b17638e49d47ab56e6dd54c31481a226b31c8a22fb4c2d1407153d0e7b349c492831614f271a917818b SHA512 be5e90a8996a7c9f433d28e975de5d1a462fe57b134f903572069c43a373f81b6ba4253395f62b66e467a8b3de4e8036b6db37dac3dae9b1c1d4cacc94365b58
+EBUILD gitolite-9999.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111
+MISC metadata.xml 780 BLAKE2B e496a65ffe9f06db9f4ef1c74a16fafb434c9c8a7309f0effc02515270bcc0137b1bf7861ac11f6dd1a7c06fd4ef4eb7d72b27b60a73ed535ba4fad3e08a2066 SHA512 0a7c6ac8bc127892e5f6fe24774f095cb0bcf5971926c65b4d8a52748cfb7ae22d1ddc47365ece99612bc64853dfa224d42ded5093f0cd0976a2ae1b544eb5c8
diff --git a/dev-vcs/gitolite/files/gitolite-3.6.6-fix-shebang.patch b/dev-vcs/gitolite/files/gitolite-3.6.6-fix-shebang.patch
new file mode 100644
index 000000000000..21437f51fe5a
--- /dev/null
+++ b/dev-vcs/gitolite/files/gitolite-3.6.6-fix-shebang.patch
@@ -0,0 +1,23 @@
+From 72c02387f6e1a9d2791dd78533d0c3e909400715 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@atc.tcs.com>
+Date: Fri, 25 Nov 2016 18:16:33 +0530
+Subject: [PATCH] fix shebang in repo-specific-hooks
+
+(thanks to Dieter on the mailing list for catching this!)
+---
+ src/triggers/repo-specific-hooks | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/triggers/repo-specific-hooks b/src/triggers/repo-specific-hooks
+index 7ed28e5..6e229ea 100755
+--- a/src/triggers/repo-specific-hooks
++++ b/src/triggers/repo-specific-hooks
+@@ -85,7 +85,7 @@ for my $repo (keys %repo_hooks) {
+ }
+ 
+ __DATA__
+-#/bin/sh
++#!/bin/sh
+ 
+ # Determine what input the hook needs
+ # post-update takes args, pre/post-receive take stdin
diff --git a/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild b/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..ced390150277
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+SRC_URI="https://milki.github.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}" > conf/VERSION
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+	gl_bin=${gl_bin/\/\//\/}
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	# install using upstream method
+	export PATH="${gl_bin}:${PATH}"
+	./src/gl-system-install ${gl_bin} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.1.ebuild b/dev-vcs/gitolite/gitolite-3.6.1.ebuild
new file mode 100644
index 000000000000..30a7fda7883a
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module user versionator
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.txt CHANGELOG
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.2-r1.ebuild b/dev-vcs/gitolite/gitolite-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..a1fb9c6b9da4
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.2-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.2.ebuild b/dev-vcs/gitolite/gitolite-3.6.2.ebuild
new file mode 100644
index 000000000000..10f8ddcbf3f9
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module user versionator
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.3.ebuild b/dev-vcs/gitolite/gitolite-3.6.3.ebuild
new file mode 100644
index 000000000000..4fc564404802
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.4-r1.ebuild b/dev-vcs/gitolite/gitolite-3.6.4-r1.ebuild
new file mode 100644
index 000000000000..928bbe83926c
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.4-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.4.ebuild b/dev-vcs/gitolite/gitolite-3.6.4.ebuild
new file mode 100644
index 000000000000..26ef161375f9
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.5.ebuild b/dev-vcs/gitolite/gitolite-3.6.5.ebuild
new file mode 100644
index 000000000000..928bbe83926c
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.6.ebuild b/dev-vcs/gitolite/gitolite-3.6.6.ebuild
new file mode 100644
index 000000000000..10ab3eef999b
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm x86"
+else
+	SRC_URI=""
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-shebang.patch )
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	default
+	echo $PF > src/VERSION || die
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.7.ebuild b/dev-vcs/gitolite/gitolite-3.6.7.ebuild
new file mode 100644
index 000000000000..cd1b715bb24d
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+PATCHES=( )
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	default
+	echo $PF > src/VERSION || die
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.ebuild b/dev-vcs/gitolite/gitolite-3.6.ebuild
new file mode 100644
index 000000000000..91aadb960309
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module user versionator
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.txt CHANGELOG
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-9999.ebuild b/dev-vcs/gitolite/gitolite-9999.ebuild
new file mode 100644
index 000000000000..928bbe83926c
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/metadata.xml b/dev-vcs/gitolite/metadata.xml
new file mode 100644
index 000000000000..4073771df8b6
--- /dev/null
+++ b/dev-vcs/gitolite/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<longdescription lang="en">
+	Gitolite is an access control layer on top of git, which allows access
+	control down to the branch level, including specifying who can and cannot
+	rewind a given branch.
+	</longdescription>
+	<use>
+		<flag name="contrib">Install user-contributed files</flag>
+		<flag name="tools">Install tools to e.g. convert a Gitosis config to
+			gitolite or one to check if your setup is gitolite &gt;= 3.x compatible</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">sitaramc/gitolite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/gitsh-0.11.2 b/dev-vcs/gitsh-0.11.2
deleted file mode 100644
index d9b8c63264ba..000000000000
--- a/dev-vcs/gitsh-0.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-vcs/git ) test? ( ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/parslet[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/parslet[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/bundler[ruby_targets_ruby25] dev-ruby/parslet[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/pry[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/pry[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/pry[ruby_targets_ruby25] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=An interactive shell for git
-EAPI=6
-HOMEPAGE=https://github.com/thoughtbot/gitsh
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~amd64-linux
-LICENSE=BSD
-RDEPEND=sys-libs/readline ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/parslet[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/parslet[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/bundler[ruby_targets_ruby25] dev-ruby/parslet[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/thoughtbot/gitsh/archive/v0.11.2.tar.gz -> gitsh-0.11.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0f885a1fa60c1574dbadce647aabc7d7
diff --git a/dev-vcs/gitsh/Manifest b/dev-vcs/gitsh/Manifest
new file mode 100644
index 000000000000..1e91b5f11ee5
--- /dev/null
+++ b/dev-vcs/gitsh/Manifest
@@ -0,0 +1,3 @@
+DIST gitsh-0.11.2.tar.gz 101503 BLAKE2B 72a01da8412a680eb0afeab0d31a39261e389b96e528b0d1b5c6821b066f7b1d9244adc407d677c98b5f486cd8788daacf21e2467fc60254592ad9683b7e3ee4 SHA512 e8d473b4a13481722eb9a6b9232eb47174ed40f86af45848f33b9b936f09cf2010f8235036d9897bd637b841f35d051d3e426b56642f247b07c3a0d323e9a968
+EBUILD gitsh-0.11.2.ebuild 1240 BLAKE2B 1d4cd7085540616861eaa1a7658226d2c8679516387a0e996be749138817277b0ccd74f97ff32056f47016a5f27d41980b197f7e16d3e587ab2d4be144849711 SHA512 12c71962cdce3ba6fdff9cee21b0544666d170737ea23d732ea2ecb1bc6a37a508e7369d6015eb24595c240c7412e60ac0d4493ffddf891ef2b8af8f0f0f90ad
+MISC metadata.xml 253 BLAKE2B 1c7e0d89cebb5c7bd8f65377de8222c8e2c23ea8b370326685b763daecfeca18072af431bd6ca061315cae8aa6f0b8e9359659ee60822b48cd9cb94902f07ba9 SHA512 d7442414e86260bf43803d60d20da7d8e74cf4ec6f6c523ad03e091aa9a63c9299f12d29ba03f05792c822e4f4da35782be737b5b797b0c67a550b3d05fb9bd8
diff --git a/dev-vcs/gitsh/gitsh-0.11.2.ebuild b/dev-vcs/gitsh/gitsh-0.11.2.ebuild
new file mode 100644
index 000000000000..85f90bbc053b
--- /dev/null
+++ b/dev-vcs/gitsh/gitsh-0.11.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit autotools ruby-fakegem
+
+DESCRIPTION="An interactive shell for git"
+HOMEPAGE="https://github.com/thoughtbot/gitsh"
+SRC_URI="https://github.com/thoughtbot/gitsh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="test"
+
+RDEPEND+=" sys-libs/readline "
+
+DEPEND+=" test? ( dev-vcs/git ) "
+
+ruby_add_rdepend "
+	dev-ruby/bundler
+	dev-ruby/parslet
+	"
+
+ruby_add_bdepend "test? ( dev-ruby/pry )"
+
+DOCS="README.md"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+
+	# Avoid integration tests that assume they can use /usr/bin/ruby
+	rm -f spec/integration/running_scripts_spec.rb || die
+	# or the TTY
+	sed -i -e '/with valid arguments and no script file/,/^    end/ s:^:#:' spec/units/cli_spec.rb || die
+}
+
+each_ruby_prepare() {
+	eautoreconf
+
+	if use test; then
+		git init . || die
+	fi
+}
+
+each_ruby_configure() {
+	RUBY=${RUBY} default
+}
+
+each_ruby_compile() {
+	default
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	doman "${S}"/man/man1/${PN}.1
+}
diff --git a/dev-vcs/gitsh/metadata.xml b/dev-vcs/gitsh/metadata.xml
new file mode 100644
index 000000000000..faa8f02e9175
--- /dev/null
+++ b/dev-vcs/gitsh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">thoughtbot/gitsh</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/gitstats-0_pre131024 b/dev-vcs/gitstats-0_pre131024
deleted file mode 100644
index 53e14ac463aa..000000000000
--- a/dev-vcs/gitstats-0_pre131024
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Statistics generator for git
-EAPI=5
-HOMEPAGE=http://gitstats.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-visualization/gnuplot[gd] dev-vcs/git
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/gitstats-0_pre131024.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=773f1cac3a6bb05d17a3ec8ea3c969cc
diff --git a/dev-vcs/gitstats-0_pre20151223 b/dev-vcs/gitstats-0_pre20151223
deleted file mode 100644
index 7cc90022620a..000000000000
--- a/dev-vcs/gitstats-0_pre20151223
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:*
-DESCRIPTION=Statistics generator for git
-EAPI=6
-HOMEPAGE=http://gitstats.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-visualization/gnuplot[gd] dev-vcs/git
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/gitstats/gitstats-0_pre20151223.tar.xz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7e79a6ffa22dbe5656f0927ba647f09f
diff --git a/dev-vcs/gitstats-9999 b/dev-vcs/gitstats-9999
deleted file mode 100644
index 8d9087a80bb4..000000000000
--- a/dev-vcs/gitstats-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:* >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Statistics generator for git
-EAPI=6
-HOMEPAGE=http://gitstats.sourceforge.net/
-IUSE=python_targets_python2_7
-LICENSE=|| ( GPL-2 GPL-3 ) MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-visualization/gnuplot[gd] dev-vcs/git
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7bd512b2926761c7b853de511c683528
diff --git a/dev-vcs/gitstats/Manifest b/dev-vcs/gitstats/Manifest
new file mode 100644
index 000000000000..66191caf8521
--- /dev/null
+++ b/dev-vcs/gitstats/Manifest
@@ -0,0 +1,8 @@
+AUX gitstats-0_pre131024-filter-invalid-unicode.patch 601 BLAKE2B 29eb8156205a0003746e54211397befba17c8c289f0dbbac96c808790b8130fe66fd372d359d3ba832230a154ba8c1700247be6106d3709d10d43946fd335e98 SHA512 a1ce080e6a9aee89fc5cc3b5aca60628759a0ef9f0e8ad93dcd813aeecb8ae9bd016c945d31a0704a0c124ee72cd0e788f339caf5eef8c498903f75dc001a73a
+AUX gitstats-0_pre20151223-grep-force-text.patch 577 BLAKE2B 529322d860d9d015692de00cdcba373a475018e29f2692f97c7b415376faeb8dfb7acbd98a987846b3c40d4d3af3143688a9b5a61cef559a67772609ca5d4f36 SHA512 a61ab86a93fe4ea605b5fdcba891e5b754fe1b56a8d2e54af4dee164835cc43c8578843f44dc4d8e041b3236f2775d246f3ed6726a88422887dd308b5f3768a2
+DIST gitstats-0_pre131024.tar.xz 32104 BLAKE2B 87288f2e29fede41aaaf2ffdc69aa6993c753992a1c5494b0f16ae85fb7ccb8a6a2a83334e31fa2fea3d6169a6d3f236ac087f3080920ed223744e21ed2f01ad SHA512 a42c6ca37d39c24782c19a1157cc5aaf3a16e34c603c5fa3f91fcd5165e6f4788d5d75786b78f962ab81b3db66dd94f051dd929f02f4ffef845ec5b793feba53
+DIST gitstats-0_pre20151223.tar.xz 32236 BLAKE2B f2d3e52f7fa3777cdf8854940a1180a6203a77d16cc1b6910158332fdbdfbcf8e8cf0de15fe57b75284bb3334893db6920cacc35db8971c9b2e95f6bf8839d93 SHA512 ea9ae5be4d2654621493eb87ba112cf99f1f940ba547f7cc1facc8ec042cc91c37c9120098e6788ba98876f7cf0bdda78c263174402b05a279748064c6323f82
+EBUILD gitstats-0_pre131024.ebuild 905 BLAKE2B 40d09ad1dfdfec11eaedf0eda9ab211dce438c60999e1c5bbfdff8bb665b165733ec262deffcf0a0f2d810a67b3a0ad9f43d5d8be0b22611ed3133c065ef4b65 SHA512 e98842d050356646b49bc8bc03f90969b2a41af4ace1b96a12066c1032f077af99f06c4ec81c39d2374eab0a38e4a0bf653a4cdcf3aba635955ae606b1cb06b8
+EBUILD gitstats-0_pre20151223.ebuild 1165 BLAKE2B dd02429c58b04726fcd9bba5688db2ad259e25130265fec867bd6e96439db03355e95cd975367bf894832b333ead09bfbc51a7c71a422c56a6a925b496e05614 SHA512 743e32d8fb41ebda6478eb6878991b1ee2f061397ebdd319ab84f99b598dcdc0129046cce0a1f83d43e80f31d35811f4785291fee55d3a668c07ba519b09ae8a
+EBUILD gitstats-9999.ebuild 1116 BLAKE2B 823647e68007d86a21d4848120b9b6180099f160d188721c9d802ab1cdaad336762235f7796299af578c28fb4d8e0aa9fb150ed4c0ce90641720d6035c35717f SHA512 aeec58866f477999efec002d99d5e04ec49f9813abcb6e2f6bf42cce5a3e468cfa82135c5ae820644604a22b635687705c2b6bd0d271f1f9e6360492f409b59e
+MISC metadata.xml 547 BLAKE2B a9dcc6cb6f250ff1b58198ad68bddb57c0106eba500dc30c96b0eb2d600770e18615e6e6fe83274b2a2eb45d7841b6e7dadb4152d8c02d25dc7874ed91c2653f SHA512 cb86285a7dc9783e0301f4ba657cb78667ad4d2301569cb9704bcd4be5577e48aa5b415a39df9a206d574bf81c67c9ce5c5874bd2c1e94459a0f7d5e2421c238
diff --git a/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch b/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch
new file mode 100644
index 000000000000..4af6f890ec40
--- /dev/null
+++ b/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch
@@ -0,0 +1,11 @@
+--- gitstats	2016-03-24 10:57:18.000000000 -0300
++++ gitstats.mod	2016-03-24 10:57:11.355016439 -0300
+@@ -321,7 +321,7 @@
+ 
+ 		# Collect revision statistics
+ 		# Outputs "<stamp> <date> <time> <timezone> <author> '<' <mail> '>'"
+-		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getcommitrange('HEAD'), 'grep -v ^commit']).split('\n')
++		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getcommitrange('HEAD'), 'grep -av ^commit | grep -ax \'.*\'']).split('\n')
+ 		for line in lines:
+ 			parts = line.split(' ', 4)
+ 			author = ''
diff --git a/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch b/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch
new file mode 100644
index 000000000000..9663afcd4f62
--- /dev/null
+++ b/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch
@@ -0,0 +1,11 @@
+--- a/gitstats	2016-04-01 09:46:31.000000000 -0300
++++ b/gitstats	2016-04-01 09:46:18.458667610 -0300
+@@ -327,7 +327,7 @@
+ 
+ 		# Collect revision statistics
+ 		# Outputs "<stamp> <date> <time> <timezone> <author> '<' <mail> '>'"
+-		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getlogrange('HEAD'), 'grep -v ^commit']).split('\n')
++		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getlogrange('HEAD'), 'grep -av ^commit']).split('\n')
+ 		for line in lines:
+ 			parts = line.split(' ', 4)
+ 			author = ''
diff --git a/dev-vcs/gitstats/gitstats-0_pre131024.ebuild b/dev-vcs/gitstats/gitstats-0_pre131024.ebuild
new file mode 100644
index 000000000000..ec6665528e09
--- /dev/null
+++ b/dev-vcs/gitstats/gitstats-0_pre131024.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Statistics generator for git"
+HOMEPAGE="http://gitstats.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	sci-visualization/gnuplot[gd]
+	dev-vcs/git"
+
+src_prepare() {
+	sed \
+		-e "s:basedir = os.path.dirname(os.path.abspath(__file__)):basedir = '${EPREFIX}/usr/share/gitstats':g" \
+		-i gitstats || die "failed to fix static files path"
+	epatch "${FILESDIR}"/${P}-filter-invalid-unicode.patch
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr VERSION="${PV}" install
+	dodoc doc/{README,*.txt}
+	python_replicate_script "${ED}"/usr/bin/${PN}
+}
diff --git a/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild b/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild
new file mode 100644
index 000000000000..f7f2ad6c28c6
--- /dev/null
+++ b/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/hoxu/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Statistics generator for git"
+HOMEPAGE="http://gitstats.sourceforge.net/"
+LICENSE="|| ( GPL-2 GPL-3 ) MIT"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-visualization/gnuplot[gd]
+	dev-vcs/git"
+DEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl:*
+"
+
+DOCS=( doc/{AUTHOR,README,TODO.txt} )
+
+src_prepare() {
+	sed \
+		-e "s:basedirs = \[binarypath, secondarypath, '/usr/share/gitstats'\]:basedirs = \['${EPREFIX}/usr/share/gitstats'\]:g" \
+	-i gitstats || die "failed to fix static files path"
+	eapply "${FILESDIR}"/${P}-grep-force-text.patch
+	default
+}
+
+src_compile() {
+	emake VERSION="${PV}" man
+}
+
+src_install() {
+	emake PREFIX="${ED}"usr VERSION="${PV}" install
+	doman doc/${PN}.1
+	einstalldocs
+	python_replicate_script "${ED}"usr/bin/${PN}
+}
diff --git a/dev-vcs/gitstats/gitstats-9999.ebuild b/dev-vcs/gitstats/gitstats-9999.ebuild
new file mode 100644
index 000000000000..4cfb9dd321c0
--- /dev/null
+++ b/dev-vcs/gitstats/gitstats-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/hoxu/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Statistics generator for git"
+HOMEPAGE="http://gitstats.sourceforge.net/"
+LICENSE="|| ( GPL-2 GPL-3 ) MIT"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-visualization/gnuplot[gd]
+	dev-vcs/git"
+DEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl:*
+"
+
+DOCS=( doc/{AUTHOR,README,TODO.txt} )
+
+src_prepare() {
+	sed \
+		-e "s:basedirs = \[binarypath, secondarypath, '/usr/share/gitstats'\]:basedirs = \['${EPREFIX}/usr/share/gitstats'\]:g" \
+	-i gitstats || die "failed to fix static files path"
+	default
+}
+
+src_compile() {
+	emake VERSION="${PV}" man
+}
+
+src_install() {
+	emake PREFIX="${ED}"usr VERSION="${PV}" install
+	doman doc/${PN}.1
+	einstalldocs
+	python_replicate_script "${ED}"usr/bin/${PN}
+}
diff --git a/dev-vcs/gitstats/metadata.xml b/dev-vcs/gitstats/metadata.xml
new file mode 100644
index 000000000000..cb682c150cea
--- /dev/null
+++ b/dev-vcs/gitstats/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>amadio@gentoo.org</email>
+		<name>Guilherme Amadio</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>NP-Hardass@gentoo.org</email>
+		<name>NP-Hardass</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gitstats</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/gti-9999 b/dev-vcs/gti-9999
deleted file mode 100644
index d99381298c8a..000000000000
--- a/dev-vcs/gti-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install prepare unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=A silly git launcher, basically. Inspired by sl
-EAPI=7
-HOMEPAGE=http://r-wos.org/hacks/gti
-LICENSE=MIT
-RDEPEND=dev-vcs/git
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=0b18d499cf1d7ecdd669bf7802d143e1
diff --git a/dev-vcs/gti/Manifest b/dev-vcs/gti/Manifest
new file mode 100644
index 000000000000..fec060be21a0
--- /dev/null
+++ b/dev-vcs/gti/Manifest
@@ -0,0 +1,2 @@
+EBUILD gti-9999.ebuild 648 BLAKE2B 27bd8d5e0231f6a16a3cf216412d6fa917b69200fc519fbefa20c7d8206e0829d39df06aa55d618f792d1e26be31913cde1a3d05512650c55c9a1229c7698f0e SHA512 e8931f6c2bd46a0a6a96c6ff1c15a7990630e0d216f6b4f94ef23973f59be1a2ad802a2d0c9e22316df723deb3bfc270477135ce36522abba9734a4260a3d2a8
+MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/dev-vcs/gti/gti-9999.ebuild b/dev-vcs/gti/gti-9999.ebuild
new file mode 100644
index 000000000000..5ab71a691c09
--- /dev/null
+++ b/dev-vcs/gti/gti-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/rwos/${PN}.git"
+inherit git-r3
+
+DESCRIPTION="A silly git launcher, basically. Inspired by sl"
+HOMEPAGE="http://r-wos.org/hacks/gti"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-vcs/git"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	# fix the makefile
+	sed -i \
+		-e "s:CC=:CC?=:g" \
+		-e "s:CFLAGS=:CFLAGS?=:g" \
+		-e "/-\$(STRIP)/d" \
+		-e 's:$(CC):$(CC) $(LDFLAGS):' \
+		Makefile || die
+}
+
+src_install() {
+	dobin gti
+}
diff --git a/dev-vcs/gti/metadata.xml b/dev-vcs/gti/metadata.xml
new file mode 100644
index 000000000000..15fd2f3a22be
--- /dev/null
+++ b/dev-vcs/gti/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/guilt-0.36 b/dev-vcs/guilt-0.36
deleted file mode 100644
index 010d8ac21f75..000000000000
--- a/dev-vcs/guilt-0.36
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-vcs/git app-text/asciidoc app-text/xmlto dev-lang/perl
-DESCRIPTION=A series of bash scripts which add a quilt-like interface to git
-EAPI=6
-HOMEPAGE=http://repo.or.cz/w/guilt.git
-KEYWORDS=amd64 ~ia64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git
-RESTRICT=test
-SLOT=0
-SRC_URI=http://repo.or.cz/w/guilt.git/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> guilt-0.36.tar.gz
-_md5_=e010d13267b6c90fb932f017e4a51e2c
diff --git a/dev-vcs/guilt/Manifest b/dev-vcs/guilt/Manifest
new file mode 100644
index 000000000000..10b7b19397e9
--- /dev/null
+++ b/dev-vcs/guilt/Manifest
@@ -0,0 +1,3 @@
+DIST guilt-0.36.tar.gz 64624 BLAKE2B 8514f0fa6c7dd96e3a8c90939046b45b2e3115f2361a428ad58e1c67db0cc73cab1304a1493a45b1fda2928cc8a03b03e2986c845c826bcd7b491d264d3d1333 SHA512 882438d5b9ed4d16e3dfc95ddbef6ec1d76860d82aa6abc78010351577fb65578f919c6fe55f9d7593c82b0eae2d0dd80d577eee906fff84a426391936242652
+EBUILD guilt-0.36.ebuild 1224 BLAKE2B f00929b77ab0b0a48f2f965bc763bcef45ab60d703ea1e6f93204b3befb80f31c7b4b723ee1a564a5da028de405d74dfc899a055a3b2339f13c6dea681081576 SHA512 de51109ca240eed4c23d98fccc088faa4151b7e8064dafdffa9ddc528397c90b0692a02a090703b44ec8a0579d4eda13eedf39ccbeacc8f1c68058aa6f2a2aff
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/guilt/guilt-0.36.ebuild b/dev-vcs/guilt/guilt-0.36.ebuild
new file mode 100644
index 000000000000..1069fa84b2dc
--- /dev/null
+++ b/dev-vcs/guilt/guilt-0.36.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A series of bash scripts which add a quilt-like interface to git"
+HOMEPAGE="http://repo.or.cz/w/guilt.git"
+SRC_URI="${HOMEPAGE}/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+IUSE=""
+
+# Since we need to build the man pages anyway, I don't think it makes
+# much sense to hide the HTML docs behind USE=doc.
+RDEPEND="dev-vcs/git"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	dev-lang/perl"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-22d785d"
+
+src_prepare() {
+	default
+
+	# The doc makefile tries to shell out to `git` for the version.
+	sed -i Documentation/Makefile \
+		-e "s/VERSION=.*/VERSION=${PV}/" \
+		|| die 'failed to set VERSION in Documentation/Makefile'
+}
+
+src_compile() {
+	emake -C Documentation all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	dodoc Documentation/{Contributing,Features,HOWTO,Requirements}
+	emake -C Documentation \
+			  DESTDIR="${D}" \
+			  PREFIX=/usr \
+			  mandir=/usr/share/man \
+			  htmldir="/usr/share/doc/${PF}/html" \
+			  install install-html
+}
diff --git a/dev-vcs/guilt/metadata.xml b/dev-vcs/guilt/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/dev-vcs/guilt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/hg-fast-export-160914 b/dev-vcs/hg-fast-export-160914
deleted file mode 100644
index 65ad6fd59b22..000000000000
--- a/dev-vcs/hg-fast-export-160914
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=mercurial to git converter using git-fast-import
-EAPI=6
-HOMEPAGE=https://github.com/frej/fast-export
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git dev-vcs/mercurial
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/frej/fast-export/archive/v160914.tar.gz -> hg-fast-export-160914.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=b0e532d159c50a1bcb474888676fe509
diff --git a/dev-vcs/hg-fast-export/Manifest b/dev-vcs/hg-fast-export/Manifest
new file mode 100644
index 000000000000..417ceec99ec4
--- /dev/null
+++ b/dev-vcs/hg-fast-export/Manifest
@@ -0,0 +1,3 @@
+DIST hg-fast-export-160914.tar.gz 11379 BLAKE2B b751fd954af7a69430459c27dc1948d82aa7abd71db48fcdb98bb0d1b8151910b3417723d2acac1192d26b7f8dde98739b24fd90833fae5d123408293a4c274a SHA512 9e57e7835cc50e8db5d2ebf840d60b4ce25ec19e9722e705eba1178cc41fde57129664de3e1fc157ce8352632c8d0b8be33109afa50b53e159793a8a2ed21fea
+EBUILD hg-fast-export-160914.ebuild 920 BLAKE2B 3f7ab53844838196a6dfba6d94f0b19aa641647bb36864b3c268598d103b237c7d52ec1b211f0a3dd66086e5d3c07ecb33c1e85ae17a76de77350e428cc67f49 SHA512 ea94e0fec5cc405446ecb2fe591373007f1610f30555dba17849dc3d83c73b2820b4829e7e01716c7a90c7c3273ee3bbe1ba3bab33cdef8f39a88fd9ccd8cf33
+MISC metadata.xml 398 BLAKE2B 7a4b6ae1605b89afc842b2232ff12bf2863d1a2d6eb1fbcb995ec3b76257be86d30c18171ac2d98d056bbab4852f9673a404d892ced9345348f81bdba3f32b26 SHA512 e085ace0752eaf009dd9c86ffb5f1198d1feb44f3c46d219457e6871208b2ea96d3d58ab54d28c8ca02b5ca3b5b21ae0ae2c96aedb9926b747110740a296142c
diff --git a/dev-vcs/hg-fast-export/hg-fast-export-160914.ebuild b/dev-vcs/hg-fast-export/hg-fast-export-160914.ebuild
new file mode 100644
index 000000000000..60a39b304cf5
--- /dev/null
+++ b/dev-vcs/hg-fast-export/hg-fast-export-160914.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 vcs-snapshot
+
+DESCRIPTION="mercurial to git converter using git-fast-import"
+HOMEPAGE="https://github.com/frej/fast-export"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-vcs/git
+	dev-vcs/mercurial"
+
+src_prepare() {
+	default
+	sed -e '/^PYTHON/s/python/&2.7/' \
+		-e '/^PYTHON/s/PYTHON:/E&/g' \
+		-e "/^ROOT/s:=.*:='${EPREFIX}/usr/bin':" \
+		-i "${PN}".sh hg-reset.sh || die
+}
+
+src_install() {
+	default
+	newbin "${PN}".sh "${PN}"
+	newbin hg-reset.sh hg-reset
+	python_foreach_impl python_doexe "${PN}".py
+	python_foreach_impl python_doexe hg-reset.py
+	python_foreach_impl python_domodule hg2git.py
+}
diff --git a/dev-vcs/hg-fast-export/metadata.xml b/dev-vcs/hg-fast-export/metadata.xml
new file mode 100644
index 000000000000..9886b5971a1e
--- /dev/null
+++ b/dev-vcs/hg-fast-export/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">frej/fast-export</remote-id>
+		<bugs-to>https://github.com/frej/fast-export/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/hg-git-0.8.10 b/dev-vcs/hg-git-0.8.10
deleted file mode 100644
index 5410f7fd3540..000000000000
--- a/dev-vcs/hg-git-0.8.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=push to and pull from a Git repository using Mercurial
-EAPI=6
-HOMEPAGE=http://hg-git.github.io https://pypi.org/project/hg-git/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.10.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8dbfe5d98de13b5fe5da3373221479b6
diff --git a/dev-vcs/hg-git-0.8.10-r1 b/dev-vcs/hg-git-0.8.10-r1
deleted file mode 100644
index a00eacdc9eb3..000000000000
--- a/dev-vcs/hg-git-0.8.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=push to and pull from a Git repository using Mercurial
-EAPI=6
-HOMEPAGE=http://hg-git.github.io https://pypi.org/project/hg-git/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.10.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c30b5477f4f0ce35cd98472007fe73fd
diff --git a/dev-vcs/hg-git-0.8.11 b/dev-vcs/hg-git-0.8.11
deleted file mode 100644
index a1f8f5be6e37..000000000000
--- a/dev-vcs/hg-git-0.8.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=push to and pull from a Git repository using Mercurial
-EAPI=6
-HOMEPAGE=http://hg-git.github.io https://pypi.org/project/hg-git/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.11.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fa071c9f436414780217935b5db6766
diff --git a/dev-vcs/hg-git-0.8.8 b/dev-vcs/hg-git-0.8.8
deleted file mode 100644
index 807397d641f3..000000000000
--- a/dev-vcs/hg-git-0.8.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=push to and pull from a Git repository using Mercurial
-EAPI=6
-HOMEPAGE=http://hg-git.github.io https://pypi.org/project/hg-git/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.8.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=328c7bbf2fa988b70cdfcf0dedc6feb9
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
new file mode 100644
index 000000000000..b45d9b76bd78
--- /dev/null
+++ b/dev-vcs/hg-git/Manifest
@@ -0,0 +1,10 @@
+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.11.tar.gz 118537 BLAKE2B 05a63633f8909260428197334812d314cdba115324fa7dd70ccb5d0ee1e21089be0b8bb0cb1cf09f5f738cbee00e3e688646daa3debed9fa36fac2ff62bfcb8b SHA512 ced6b8b522f75b0e2b59c5113b3afd7b02eb2e3798a7aecdc211a15aba1363d3785234e909644626b5c16d7e8b158a6fe1f1120dcd85b5709d8a84ff1f4b6655
+DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
+EBUILD hg-git-0.8.10-r1.ebuild 800 BLAKE2B c8cdbe02f8d1b72922d1143a3cbd7f8f971d13de62f2841c59e52cac107ec5ff25d977ae29fc27444783bed30db955f88ebda714bf3df3f0ea43071cd13afa31 SHA512 848a5b4cc539da8fb4e578a11602e279f562211bcde22d5e7a0b8fe49e0f8fe01d4d560b90bfd17d7a502f5ad80cd664fad0ada8d02b60f42c60d7fcd648f9b6
+EBUILD hg-git-0.8.10.ebuild 707 BLAKE2B d0013bc65ff7b9470d40728d9fc4393fc552cbefa710ca340ff894069e0e2af56415313eb632f117a85674bfa68e57d401f0dc28eb85fdb1ccaa700773b9c9ab SHA512 11e15d0520c9371175706bb633e71101f179072270987a952628d7fe6b11294d67501b9e934e7fbf61270794ce57ce81941e5109e42b41c88f8ee04995bc9fe9
+EBUILD hg-git-0.8.11.ebuild 707 BLAKE2B 6bf0f75ecf2877a5b3d4775949aea77332dbb57d874c21acf36c10c0a377e543f6087e882a34127c56b92931ab47456f36a10019091c247cd81e0e84c4fa0b71 SHA512 b404e426bbfe1cefe5d56db9ef463ca4833c1e40dd7ec5ef9c4fd2eb249301fafcc8e321417557058307b8992420a56244245e1a908485c30977b30428849123
+EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2
+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..d35e34623578
--- /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.org/project/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/hg-git/hg-git-0.8.10.ebuild b/dev-vcs/hg-git/hg-git-0.8.10.ebuild
new file mode 100644
index 000000000000..acf6cae2bdae
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="push to and pull from a Git repository using Mercurial"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/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}]
+"
diff --git a/dev-vcs/hg-git/hg-git-0.8.11.ebuild b/dev-vcs/hg-git/hg-git-0.8.11.ebuild
new file mode 100644
index 000000000000..c8f0f56632ed
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.11.ebuild
@@ -0,0 +1,24 @@
+# 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.org/project/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}]
+"
diff --git a/dev-vcs/hg-git/hg-git-0.8.8.ebuild b/dev-vcs/hg-git/hg-git-0.8.8.ebuild
new file mode 100644
index 000000000000..cf1461ddfdee
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.8.ebuild
@@ -0,0 +1,24 @@
+# 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.org/project/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-python/dulwich-0.9.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-vcs/hg-git/metadata.xml b/dev-vcs/hg-git/metadata.xml
new file mode 100644
index 000000000000..d755c79481f8
--- /dev/null
+++ b/dev-vcs/hg-git/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">hg-git</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/hgsubversion-1.8.5 b/dev-vcs/hgsubversion-1.8.5
deleted file mode 100644
index e8e0bd3f7c5b..000000000000
--- a/dev-vcs/hgsubversion-1.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=hgsubversion is a Mercurial extension for working with Subversion repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/subvertpy-0.7.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-1.5[python] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgsubversion/hgsubversion-1.8.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e0012e822edba461d789de4f11af00e
diff --git a/dev-vcs/hgsubversion-1.8.6 b/dev-vcs/hgsubversion-1.8.6
deleted file mode 100644
index 0d3cf87557d9..000000000000
--- a/dev-vcs/hgsubversion-1.8.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=hgsubversion is a Mercurial extension for working with Subversion repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/subvertpy-0.7.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-1.5[python] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgsubversion/hgsubversion-1.8.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=208c7047a3db72b09e40ca7bc31c4879
diff --git a/dev-vcs/hgsubversion-9999 b/dev-vcs/hgsubversion-9999
deleted file mode 100644
index aa7cea7bcb28..000000000000
--- a/dev-vcs/hgsubversion-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial
-DESCRIPTION=hgsubversion is a Mercurial extension for working with Subversion repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/
-IUSE=test python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/subvertpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4224c9039e85ced2ca3b171f5a7e41ba
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
new file mode 100644
index 000000000000..9614ef40f788
--- /dev/null
+++ b/dev-vcs/hgsubversion/Manifest
@@ -0,0 +1,6 @@
+DIST hgsubversion-1.8.5.tar.gz 179639 BLAKE2B 3fa5dd690e404837ccca7efeef7d873c579f717aaad274bed594aef751338450b347d8e82d3a139d00206e12a6c3979d18355be6c2c3a7ae23d01f51c3be09e8 SHA512 1d3f0824c3b83a2e00485ef3f412767bdb378a5a545f2fcf533eafebb20cbd40becf54cf9a29705200d221d6d6c0eb284fae0692354b1795feb391de2a02ca0c
+DIST hgsubversion-1.8.6.tar.gz 180720 BLAKE2B fc3cb8b3b4298a11eab4e7374615b80c7653449efd39f7ac48663a211988654bf173dce7016d8c40efbb60d55ed8884680a2139461fea1537c459cdcd807c176 SHA512 8431e995a9f2c150936af004527fea6d562a34c653af6d51e69afdb10397528bbe7f230d92b18c3d04e2315c7b0078ecfc1bd619be4c2540bb564d50092566c4
+EBUILD hgsubversion-1.8.5.ebuild 971 BLAKE2B 998c16b40e54cceb14093685f1d4bf19ff743ff686294cc206619735509c15e37d88306cd33317d4f8606bdf336d6ba02c6b5be050697e69c4d2bf387b91a803 SHA512 d6d0e5ca08ad8a16a6491be4eae2efa1a058d66716b7b5c9cc04f0a91df91c0ca680ce29a63262c7cf7bcce5fef984246f836e0f7874c25f29c411d22a0fcd52
+EBUILD hgsubversion-1.8.6.ebuild 971 BLAKE2B 6b2f602f4a6972fada4acadb04488edc2bfaa3951bb84d65a645a5dfcebfd3baf4931bcea716657b1c3c2691872832aed8827b8906d8c0b13dd525b1073503ef SHA512 1c3dcd2b6f6ea852a0b3ed4ff81f1968551a355270809c139522b90b16e9bd93877b9cd70fd4501399af90155f607f3403e3b44f76e4738b3148adc357416351
+EBUILD hgsubversion-9999.ebuild 747 BLAKE2B cea962df0ed0feaa4ae4515df5d44215223f65ae1f679656fe36a49ebb0470f0d3965343c33828d0a9caddde2036c414df2344b9f1c2c4e8a8d0e4fbb96e9fa4 SHA512 cacbb889c5853dc8a9aa17905bd58f5c339bfff94f75f97b9d2d6a90d82f308fd184e95eafaa3fda9cfc822a746d5b3194ee4374e9cc88a054d8fc3645d387f1
+MISC metadata.xml 305 BLAKE2B ae280ffce2435476e46877db066a5967861112aef4cbde989981b8d01919e32706a758691ba0f085015eb681c2a55b2a601313bd9d9d9319497037e689d55bb8 SHA512 a5d7eb8c02ff08bf50591a24a4b0b76a76e799fe5903a27c8a648e1ab839f28135f6f16eac2ba557006936dabadfb08543c203fe0fcb3ff8f89f62e63fdb300f
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
new file mode 100644
index 000000000000..a10a7ca95686
--- /dev/null
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
@@ -0,0 +1,31 @@
+# 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="hgsubversion is a Mercurial extension for working with Subversion repositories"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test"
+
+# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
+RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
+	dev-vcs/mercurial[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
+		>=dev-vcs/subversion-1.5[python] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( README )
+
+#python_test() {
+#	"${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
+#}
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
new file mode 100644
index 000000000000..e4bc74e2fc34
--- /dev/null
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test"
+
+# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
+RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
+	dev-vcs/mercurial[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
+		>=dev-vcs/subversion-1.5[python] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( README )
+
+#python_test() {
+#	"${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
+#}
diff --git a/dev-vcs/hgsubversion/hgsubversion-9999.ebuild b/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
new file mode 100644
index 000000000000..c3c40ed2703f
--- /dev/null
+++ b/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
@@ -0,0 +1,27 @@
+# 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 mercurial
+
+DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
+SRC_URI=""
+EHG_REPO_URI="https://bitbucket.org/durin42/hgsubversion"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="dev-vcs/mercurial[${PYTHON_USEDEP}]
+	|| (
+		dev-python/subvertpy[${PYTHON_USEDEP}]
+		>=dev-vcs/subversion-1.5[${PYTHON_USEDEP}]
+	)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( README )
diff --git a/dev-vcs/hgsubversion/metadata.xml b/dev-vcs/hgsubversion/metadata.xml
new file mode 100644
index 000000000000..9ed0465431f5
--- /dev/null
+++ b/dev-vcs/hgsubversion/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">hgsubversion</remote-id>
+		<remote-id type="bitbucket">durin42/hgsubversion</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/hgsvn-0.2.3-r1 b/dev-vcs/hgsvn-0.2.3-r1
deleted file mode 100644
index d5fe667d694e..000000000000
--- a/dev-vcs/hgsvn-0.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=A set of scripts to work locally on Subversion checkouts using Mercurial
-EAPI=5
-HOMEPAGE=https://pypi.org/project/hgsvn/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~x86-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-vcs/mercurial dev-vcs/subversion[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://pypi/h/hgsvn/hgsvn-0.2.3.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8c68894c0c4061caecac3cf8e72f1b6
diff --git a/dev-vcs/hgsvn/Manifest b/dev-vcs/hgsvn/Manifest
new file mode 100644
index 000000000000..789fdb079420
--- /dev/null
+++ b/dev-vcs/hgsvn/Manifest
@@ -0,0 +1,3 @@
+DIST hgsvn-0.2.3.zip 199696 BLAKE2B 1947d69a5f9a01d7802a3f0a1fd7f38b15df4f653ca9aaf836646eb03be30e4a4f09c24469a9b118e4eba769a94636fe04d2f7399fb3d835d54c8d0225af6f1e SHA512 d88d683730430b825411b4267c78e82e492f45d55c49c8a19ed159a95390e58507b07217c4e5082a223c3217042fdc1ae2c96648b1880bd441117ca173ca4c09
+EBUILD hgsvn-0.2.3-r1.ebuild 874 BLAKE2B 404e85efde9125a387274f3bcb7e029c6f597315594c2c23376867eea04ae32ff379adbc6e618146720b227eba265e76187044e5d054b1266fc3fd89d4b16714 SHA512 2ff0b6f48fce253c5f8c96f883a4646c1f194206ff8bd010c49428de2e207a6a5643a3eefd339b04cc5c3f5c7ca014124da4289f097f2acb9416b314c37d90be
+MISC metadata.xml 344 BLAKE2B 7f7a9ed296fdf435cef6b24832bc3d83d59d795942197655c8c69c75162f0e66832a5c2982201029d7fc1008296f1523c6b6e4b6e34024876ef95a7cafe73a13 SHA512 9d31dde261ac9899cc9b5aa6f503b1d46db57b973ba9d26191f0d6d12424d63a1fce55dfe8d2bc198653c0ea8af1585f3a6b6969dd8b943fbc1d4a19592d819f
diff --git a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild b/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..abbb8844768e
--- /dev/null
+++ b/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+PYTHON_REQ_USE="xml"
+
+DESCRIPTION="A set of scripts to work locally on Subversion checkouts using Mercurial"
+HOMEPAGE="https://pypi.org/project/hgsvn/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-vcs/mercurial
+"
+RDEPEND="${DEPEND}
+	dev-vcs/subversion[${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -e "/use_setuptools/d" -i setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	rm -fr "${ED}$(python_get_sitedir)/hgsvn/unittests"
+}
diff --git a/dev-vcs/hgsvn/metadata.xml b/dev-vcs/hgsvn/metadata.xml
new file mode 100644
index 000000000000..4d85440d8473
--- /dev/null
+++ b/dev-vcs/hgsvn/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>A set of scripts to work locally on Subversion checkouts using Mercurial</longdescription>
+	<upstream>
+		<remote-id type="pypi">hgsvn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/hgview-1.9.0-r1 b/dev-vcs/hgview-1.9.0-r1
deleted file mode 100644
index 68161d4023f9..000000000000
--- a/dev-vcs/hgview-1.9.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( app-text/asciidoc app-text/xmlto ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Mercurial interactive history viewer
-EAPI=6
-HOMEPAGE=https://www.logilab.org/project/hgview/ https://pypi.org/project/hgview/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgview/hgview-1.9.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0616f1b16d9887747938e90de7c86e11
diff --git a/dev-vcs/hgview/Manifest b/dev-vcs/hgview/Manifest
new file mode 100644
index 000000000000..23695d7f60c8
--- /dev/null
+++ b/dev-vcs/hgview/Manifest
@@ -0,0 +1,3 @@
+DIST hgview-1.9.0.tar.gz 181130 BLAKE2B 55b9a161d5a650e802e959c68b0b59d33679790a57067d96b58d93868de8f99fd4323a18493829b94f2e72d7f1973b1558250989787bdf682cc784896fb36e90 SHA512 604631776e096daf27241e8387d6fddfb9b3f2c54dbfccc95e770ebf2d5d27f64009c3698cf0d427f9a89e073db0d8d7623d57969ca6fcf036d5cb1dbd74eece
+EBUILD hgview-1.9.0-r1.ebuild 1155 BLAKE2B a5f5c405e136bce114fc6b1458db5def89beaff7628cab74ad4d9fad103bb623d96b595e9d2f64a84c05dedc57fd702f89f503bd98cd63ef16189835a532f002 SHA512 669caf87f8304eb4cbafa8ee67454b2d4c06dcd1d2eb456f20a615d9952b894c498c3ab1b15366e81fea32896d0c99c72a79a1b9cb41c0c1e17931f5565fc690
+MISC metadata.xml 325 BLAKE2B 6e8ffb4a8dd14475279406140e9b2f1997773fdf290950fc00ed1948bfdfe04adc2644529b551d0af3d468af16b7be59b8b4bdf6526e7aabf659bc1483a41555 SHA512 c77434a8a447b17a0a0759e0f55ed41617fd524eacb3cfed869b6d010f6062a3bfc914c690cb11c2406f9910d30660b44cbc2ac8b4ee8b600629a3a560989c7e
diff --git a/dev-vcs/hgview/hgview-1.9.0-r1.ebuild b/dev-vcs/hgview/hgview-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..8dddd30bab7f
--- /dev/null
+++ b/dev-vcs/hgview/hgview-1.9.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="A Mercurial interactive history viewer"
+HOMEPAGE="https://www.logilab.org/project/hgview/ https://pypi.org/project/hgview/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/urwid-1.0.0[${PYTHON_USEDEP}]
+	dev-vcs/mercurial[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)"
+
+python_configure_all() {
+	mydistutilsargs=(
+		build $(use doc || echo --no-doc)
+		build --no-qt
+	)
+}
+
+src_prepare() {
+	# https://www.logilab.org/ticket/103668
+	sed -i \
+		-e 's:MANDIR=$(PREFIX)/man:MANDIR=$(PREFIX)/share/man:' \
+		-e 's:$(INSTALL) $$i:$(INSTALL) -m 644 $$i:' \
+		doc/Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Install Mercurial extension config file
+	insinto /etc/mercurial/hgrc.d
+	doins hgext/hgview.rc
+}
diff --git a/dev-vcs/hgview/metadata.xml b/dev-vcs/hgview/metadata.xml
new file mode 100644
index 000000000000..e6f47dd730bd
--- /dev/null
+++ b/dev-vcs/hgview/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">hgview</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/hub-2.2.9 b/dev-vcs/hub-2.2.9
deleted file mode 100644
index 91ccca05d151..000000000000
--- a/dev-vcs/hub-2.2.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=>=dev-lang/go-1.5.1:=
-DESCRIPTION=Command-line wrapper for git that makes you better at GitHub
-EAPI=6
-HOMEPAGE=https://github.com/github/hub
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-vcs/git-1.7.3
-SLOT=0
-SRC_URI=https://github.com/github/hub/archive/v2.2.9.tar.gz -> hub-2.2.9.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e7378094200712e5595699948eaca622
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
new file mode 100644
index 000000000000..413c4aa3d02e
--- /dev/null
+++ b/dev-vcs/hub/Manifest
@@ -0,0 +1,3 @@
+DIST hub-2.2.9.tar.gz 318275 BLAKE2B 731c3bb4cc4d92082f93bba94a5cc7ba31fc436479655fa19ffa8078416cedd814d2667589af9d6eed59a0be0c8b38963779429838d8dbaab8a628f838a5915c SHA512 69d69683eb5f1c881b15c9b3294878c35edc51f9b7d568a3e0609c3d77cebf5c1be5c7c018b0356bdd68cf3f56691a860381a53f3e016b28b9f95ab0b852d9f9
+EBUILD hub-2.2.9.ebuild 905 BLAKE2B f71ee495cb55cf5a7f64f643f7a8e79a9604f4b7dffeb94226bf3feda1759667e5d93d645239c6ad3a97e3ea2ab1c75be2d3e1aeddda59e400199ec7e37d0208 SHA512 51c336022318210fe0a37615f92f61842da7a2d4d76005c61d5b86ebdc5f0f44dbf47874f2811f6f7870cd592bf118545c48c7e32c02a11dfcd40c26050e45dd
+MISC metadata.xml 459 BLAKE2B ea97b6ea14e01abac1128117c1fd4a3b500e58c7821584de640c32168319a0fbd5c431f139e624a372866e845d3c4c8d09bb4aee68f42103ebe5e174641b1eb8 SHA512 2f87715926a447fc6a3a036a713a054f785d3918b40ef2502940a99afeb8f897402bb7698a05ffa26f1e99704f6dcadac8f41d5bea2b6c7ba41a58b9e4c3dc53
diff --git a/dev-vcs/hub/hub-2.2.9.ebuild b/dev-vcs/hub/hub-2.2.9.ebuild
new file mode 100644
index 000000000000..e05d3627ad9b
--- /dev/null
+++ b/dev-vcs/hub/hub-2.2.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 readme.gentoo-r1
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.5.1:="
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
+
+src_compile() {
+	./script/build || die
+}
+
+#src_test() {
+#	./script/test || die
+#}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dobin bin/hub
+
+	doman man/${PN}.1
+	dodoc README.md
+
+	newbashcomp etc/${PN}.bash_completion.sh ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/hub.zsh_completion _${PN}
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-vcs/hub/metadata.xml b/dev-vcs/hub/metadata.xml
new file mode 100644
index 000000000000..a0b5847fbe06
--- /dev/null
+++ b/dev-vcs/hub/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>vikraman@gentoo.org</email>
+    <name>Vikraman Choudhury</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>junghans@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">defunkt/hub</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/kdesvn-2.0.0 b/dev-vcs/kdesvn-2.0.0
deleted file mode 100644
index 84b1a6c0e9af..000000000000
--- a/dev-vcs/kdesvn-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A frontend to the subversion vcs
-EAPI=6
-HOMEPAGE=https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git
-IUSE=+man debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion !dev-vcs/kdesvn:4 !kde-apps/kdesdk-kioslaves:4[subversion(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kdesvn/2.0.0/kdesvn-2.0.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa68c1865ae469db6efb3c7a90da5a02
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
new file mode 100644
index 000000000000..43627fe05168
--- /dev/null
+++ b/dev-vcs/kdesvn/Manifest
@@ -0,0 +1,6 @@
+AUX kdesvn-2.0.0-deps.patch 1436 BLAKE2B edce1dd6ed89dd991b790aae05da128e585bafc20be94dd220176ec264b9db38c15973ea0b2ec7e4ba566849897bf82d25593a598c31c27e3c128defd725354b SHA512 8a4dffee12f8974d60662b4035baa564f02e69e6f24d81c8e63f03c102302c3b617c5b02a5734616fa614ac6984db600da8765aa1fddf78b2d07ed38436d9c36
+AUX kdesvn-2.0.0-desktop.patch 654 BLAKE2B 8f28395849e732c499ac205970da753af9ba7532cc078321fdb4c214927da38a7f566d7e5c3e30faa46e494599a5ee3c5a49604ccd58969f7fc0d10769b3fac8 SHA512 f12b78a2f5640639a9dc781b8754b7dbdc31fa8198c0f3157771ef199e0d17acb86cd592cb903022ee46fca035c55d6cb80108b76891454ceb630086d88be6eb
+AUX kdesvn-2.0.0-qt-5.11.patch 706 BLAKE2B 8c8aae9d62aae648b6c72239c3ebaf13202953b583c8b6b471e9cd142f04701a5bd1c479eb1388a90732ce379f06ff88855ae5a706a0fae249769709c5da2724 SHA512 f706636642d26f9c97f4c917ac388c9903bce9349dc0607cf35e88d72c70e60a969c0ad94cae0896ed5dddea0ff22341ef720a150d1f20224b285c40c3dcc9c4
+DIST kdesvn-2.0.0.tar.xz 2014660 BLAKE2B 41999913ecb1cd3a526bc898feaddd1385773ffdd64bee4b037625745172da62281cf34da284d1dabdae652fad0e4ab31bf0d305ca30309290c35003a2488d9c SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2
+EBUILD kdesvn-2.0.0.ebuild 1575 BLAKE2B 66adeca1e53695dd3d268c0f877c88b0d50782c6f68e3d71602621dd4cc6b9313a40dfebd733e9446bd51d541650387132b570ee72e3c29e18f6b202cc1bd775 SHA512 9f14f4b5802c74c3019ddff981cc0676ca678a3c391169337238305ddf9deeb8044780986acb24923b95554269c19deb39d402cf203b435ad1f6f9d0d6657004
+MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
new file mode 100644
index 000000000000..d943ded7d74f
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
@@ -0,0 +1,47 @@
+commit f62020c59ffb2d8ec84ff3328dddc06cd57d73ed
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Apr 1 15:12:20 2017 +0200
+
+    Replace KF5TextEditor with actual implicit deps
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08a2104a..53d279fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,13 +46,14 @@ include(FeatureSummary)
+ include(ECMInstallIcons)
+ 
+ find_package(KF5 REQUIRED COMPONENTS
+-    Bookmarks Config ConfigWidgets CoreAddons
+-    DBusAddons DocTools I18n IconThemes ItemViews
+-    JobWidgets KIO Notifications Parts Service
+-    TextEditor Wallet WidgetsAddons
++    Bookmarks Codecs Completion Config
++    ConfigWidgets CoreAddons DBusAddons DocTools
++    I18n IconThemes ItemViews JobWidgets KIO
++    Notifications Parts Service TextWidgets
++    Wallet WidgetsAddons XmlGui
+ )
+ find_package(Qt5 REQUIRED COMPONENTS
+-    Core DBus Gui Sql Widgets
++    Core DBus Gui Sql Widgets Xml
+ )
+ 
+ # Set the version
+diff --git a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt
+index 44b8d219..2b0087c8 100644
+--- a/src/ksvnwidgets/CMakeLists.txt
++++ b/src/ksvnwidgets/CMakeLists.txt
+@@ -79,5 +79,11 @@ target_link_libraries(ksvnwidgets
+     PUBLIC
+         svnqt
+         Qt5::Widgets
+-        KF5::TextEditor
++        KF5::Completion
++        KF5::ConfigWidgets
++        KF5::I18n
++        KF5::KIOWidgets
++        KF5::Parts
++        KF5::TextWidgets
++        KF5::XmlGui
+ )
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch
new file mode 100644
index 000000000000..d6427c57f912
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch
@@ -0,0 +1,21 @@
+commit 5ea40285741a885198a351bd9afe58ff746a1192
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Dec 4 23:26:07 2016 +0100
+
+    Fix startup: s/caption/qwindowtitle/
+    
+    REVIEW: 129614
+
+diff --git a/src/org.kde.kdesvn.desktop b/src/org.kde.kdesvn.desktop
+index 0fbac0d..5455338 100644
+--- a/src/org.kde.kdesvn.desktop
++++ b/src/org.kde.kdesvn.desktop
+@@ -49,7 +49,7 @@ GenericName[sl]=Odjemalec za SVN
+ GenericName[sv]=SVN-klient
+ GenericName[uk]=Клієнт SVN
+ GenericName[x-test]=xxSVN Clientxx
+-Exec=kdesvn -caption "%c" %u
++Exec=kdesvn -qwindowtitle "%c" %u
+ Icon=kdesvn
+ Type=Application
+ X-DocPath=kdesvn/index.html
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
new file mode 100644
index 000000000000..019d2271001a
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
@@ -0,0 +1,25 @@
+From 605484fd9fc873b9b8d571f398c3cab05c68d860 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 09:28:15 +0200
+Subject: Fix build with Qt 5.11
+
+Some includes added transitively previously now need to be explicitly
+put.
+---
+ src/svnfrontend/blamedisplay.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp
+index 2d87502..5673181 100644
+--- a/src/svnfrontend/blamedisplay.cpp
++++ b/src/svnfrontend/blamedisplay.cpp
+@@ -30,6 +30,7 @@
+ #include <KTextEdit>
+ #include <KTreeWidgetSearchLine>
+ 
++#include <QAction>
+ #include <QBrush>
+ #include <QFontDatabase>
+ #include <QInputDialog>
+-- 
+cgit v0.11.2
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
new file mode 100644
index 000000000000..b89d778a3a1f
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A frontend to the subversion vcs"
+HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git"
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="+man"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/apr:1
+	dev-libs/apr-util:1
+	dev-vcs/subversion
+"
+RDEPEND="${DEPEND}
+	!dev-vcs/kdesvn:4
+	!kde-apps/kdesdk-kioslaves:4[subversion(-)]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-deps.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use man ; then
+		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+	fi
+}
diff --git a/dev-vcs/kdesvn/metadata.xml b/dev-vcs/kdesvn/metadata.xml
new file mode 100644
index 000000000000..ac7f14a78a1d
--- /dev/null
+++ b/dev-vcs/kdesvn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="man">Build and install man pages</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-vcs/mercurial-4.5.2 b/dev-vcs/mercurial-4.5.2
deleted file mode 100644
index 0e8ef3fa6cf8..000000000000
--- a/dev-vcs/mercurial-4.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Scalable distributed SCM
-EAPI=6
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-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
-LICENSE=GPL-2+
-RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.5.2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e65733c3d82d9f9d29811d341b225598
diff --git a/dev-vcs/mercurial-4.5.3 b/dev-vcs/mercurial-4.5.3
deleted file mode 100644
index c63b380dcfa7..000000000000
--- a/dev-vcs/mercurial-4.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Scalable distributed SCM
-EAPI=6
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-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
-LICENSE=GPL-2+
-RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.5.3.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aa5ecc2a0bb964a287a7b11f0908a974
diff --git a/dev-vcs/mercurial-4.6.1 b/dev-vcs/mercurial-4.6.1
deleted file mode 100644
index fb47fe1b0bb1..000000000000
--- a/dev-vcs/mercurial-4.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Scalable distributed SCM
-EAPI=6
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-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
-LICENSE=GPL-2+
-RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.6.1.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aa5ecc2a0bb964a287a7b11f0908a974
diff --git a/dev-vcs/mercurial-4.6.2 b/dev-vcs/mercurial-4.6.2
deleted file mode 100644
index 759f1f85b2db..000000000000
--- a/dev-vcs/mercurial-4.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Scalable distributed SCM
-EAPI=6
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-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
-LICENSE=GPL-2+
-RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.6.2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70fae71148c2d8fd713d734e2f8b8c78
diff --git a/dev-vcs/mercurial-9999 b/dev-vcs/mercurial-9999
deleted file mode 100644
index 473fbc02f6f7..000000000000
--- a/dev-vcs/mercurial-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial
-DESCRIPTION=Scalable distributed SCM
-EAPI=5
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=bugzilla emacs gpg test tk zsh-completion python_targets_python2_7
-LICENSE=GPL-2+
-RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d35cc8b8bec112773b7152b7c22f2469
diff --git a/dev-vcs/mercurial-server-1.2-r1 b/dev-vcs/mercurial-server-1.2-r1
deleted file mode 100644
index d55852aad170..000000000000
--- a/dev-vcs/mercurial-server-1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Mercurial authentication and authorization tools
-EAPI=6
-HOMEPAGE=http://www.lshift.net/mercurial-server.html
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://dev.lshift.net/paul/mercurial-server/mercurial-server_1.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c42baffe8660a11beef6c531d77768a8
diff --git a/dev-vcs/mercurial-server-9999 b/dev-vcs/mercurial-server-9999
deleted file mode 100644
index 67b87d2736f2..000000000000
--- a/dev-vcs/mercurial-server-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-vcs/mercurial
-DESCRIPTION=Mercurial authentication and authorization tools
-EAPI=6
-HOMEPAGE=http://www.lshift.net/mercurial-server.html
-IUSE=doc python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f396b55db02dfcac53999ad3c076362
diff --git a/dev-vcs/mercurial-server/Manifest b/dev-vcs/mercurial-server/Manifest
new file mode 100644
index 000000000000..1c51a42d0afc
--- /dev/null
+++ b/dev-vcs/mercurial-server/Manifest
@@ -0,0 +1,4 @@
+DIST mercurial-server_1.2.tar.gz 21560 BLAKE2B 60d7dd9d0fdb55fc82d8cd268ab7ec7a53b1ba425c28520bff2f4920c1e404fbe0c0bb11e4af34b1952a8cdb2f44cecba1b5f29c6c5d85f49e992bd31cd88c1d SHA512 3dec14309fc050fa49ffd5253a491b2d65507ed8da04741ba5247d420701a9f836a1c3ef6924a706671e28bafbe0200af03c817184e303179002419887400ce0
+EBUILD mercurial-server-1.2-r1.ebuild 1785 BLAKE2B b0de1d1d1d479b94a9e277ac8f29ae2c113e727e2e3b06ca00561d83460e7b7e8d61b94bab58c187d2cfe5534210c6a29aba37f05580b48ec14873dda3d12e0a SHA512 151e85d1fddcfea7b3d23d3619a3ae48417a01e21becfeeb293742d46a96197185c8eebfa7aa4d60a47ecf472d814a846a044c0e19a47ee9a656b4998dfe4020
+EBUILD mercurial-server-9999.ebuild 1780 BLAKE2B 32a3bcbac38dbf215f747af3cef0797a3b2d6192cb91919030bc3c8a13b1844364be6bee1635d97693719ef0af836089b31454caed14c8eda9a208bedb674cf3 SHA512 a857790b3f3d1261146302bfeaa22a4e17b503ef59d7b94b85cf6b58dc7df8ccd069e66e6002032b6078de8d83537c71232f633b3fe43f182f14b594e0bc4177
+MISC metadata.xml 526 BLAKE2B 52da18d729cb3361bd21fbf46cad7561ffa3ea624b1323e05523832ac9f7a6d83af2d9a4ae02658aeb28c7f9266bfddf640f5ab1623103f3365d4c32435ca5a4 SHA512 b10db22126af52b4d38754d846fffdbcf529ca2c86b6f5bb59d19343762e2df48324e4e2dc6d72c191b54f48a89fcf753253639c7f043cb6eb27e76d70391a29
diff --git a/dev-vcs/mercurial-server/mercurial-server-1.2-r1.ebuild b/dev-vcs/mercurial-server/mercurial-server-1.2-r1.ebuild
new file mode 100644
index 000000000000..ab1be829c3fe
--- /dev/null
+++ b/dev-vcs/mercurial-server/mercurial-server-1.2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# force single impl to avoid python-exec wrapping
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit mercurial
+	EHG_REPO_URI="http://hg.opensource.lshift.net/mercurial-server"
+	KEYWORDS=""
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="http://dev.lshift.net/paul/mercurial-server/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}.orig"
+fi
+
+DESCRIPTION="Mercurial authentication and authorization tools"
+HOMEPAGE="http://www.lshift.net/mercurial-server.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="dev-vcs/mercurial"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+pkg_setup() {
+	enewgroup hg
+	enewuser hg -1 /bin/bash "/var/lib/${PN}" hg
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	# remove useless makefile
+	rm Makefile || die
+
+	# fix installation paths
+	sed -i -e "s|'init'|'share/${PN}/init'|" setup.py \
+		|| die 'sed setup.py failed.'
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build documentation
+	if use doc; then
+		xsltproc --nonet -o manual.html \
+			/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl \
+			doc/manual.docbook || die "xsltproc failed"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install --install-scripts="/usr/share/${PN}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# install configuration files
+	insinto "/etc/${PN}"
+	doins -r src/init/conf/.
+	keepdir /etc/mercurial-server/keys/{root,users}
+
+	# install documentation
+	use doc && dodoc manual.html
+
+	# install hg home directory
+	keepdir "/var/lib/${PN}"
+	fowners hg:hg "/var/lib/${PN}"
+	fperms 750 "/var/lib/${PN}"
+}
diff --git a/dev-vcs/mercurial-server/mercurial-server-9999.ebuild b/dev-vcs/mercurial-server/mercurial-server-9999.ebuild
new file mode 100644
index 000000000000..701b33206779
--- /dev/null
+++ b/dev-vcs/mercurial-server/mercurial-server-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# force single impl to avoid python-exec wrapping
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit mercurial
+	EHG_REPO_URI="http://hg.opensource.lshift.net/mercurial-server"
+	KEYWORDS=""
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="http://dev.lshift.net/paul/mercurial-server/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Mercurial authentication and authorization tools"
+HOMEPAGE="http://www.lshift.net/mercurial-server.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="dev-vcs/mercurial"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+pkg_setup() {
+	enewgroup hg
+	enewuser hg -1 /bin/bash "/var/lib/${PN}" hg
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	# remove useless makefile
+	rm Makefile || die
+
+	# fix installation paths
+	sed -i -e "s|'init'|'share/${PN}/init'|" setup.py \
+		|| die 'sed setup.py failed.'
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build documentation
+	if use doc; then
+		xsltproc --nonet -o manual.html \
+			/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl \
+			doc/manual.docbook || die "xsltproc failed"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install --install-scripts="/usr/share/${PN}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# install configuration files
+	insinto "/etc/${PN}"
+	doins -r src/init/conf/.
+	keepdir /etc/mercurial-server/keys/{root,users}
+
+	# install documentation
+	use doc && dodoc manual.html
+
+	# install hg home directory
+	keepdir "/var/lib/${PN}"
+	fowners hg:hg "/var/lib/${PN}"
+	fperms 750 "/var/lib/${PN}"
+}
diff --git a/dev-vcs/mercurial-server/metadata.xml b/dev-vcs/mercurial-server/metadata.xml
new file mode 100644
index 000000000000..16b6109563df
--- /dev/null
+++ b/dev-vcs/mercurial-server/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		mercurial-server gives your developers remote read/write access to
+		centralized Mercurial repositories using SSH public key authentication; it
+		provides convenient and fine-grained key management and access control.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
new file mode 100644
index 000000000000..a967c3ca9ec7
--- /dev/null
+++ b/dev-vcs/mercurial/Manifest
@@ -0,0 +1,13 @@
+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-4.5.2.tar.gz 5779915 BLAKE2B 9abc5a8bafc43bc8e930bb51aa2e57397cd5858dc7bb31d9a37795a4e2799dc03b57130b23e29f89a07bd7502f136594a03d1a4bd5dfd04e2e968213b50413da SHA512 f70e40cba72b7955f0ecec9c1f53ffffac26f206188617cb182e22ce4f43dc8b970ce46d12c516ef88480c3fa076a59afcddd736dffb642d8e23befaf45b4941
+DIST mercurial-4.5.3.tar.gz 5884837 BLAKE2B 61e61624cb397786b7a4f6ed62a3ba0c2ed7cbacc5918341d014a7e0fd9bbe07c91def00539411e71d231d18060de8461bef05590626bf1318691f791e0ad2b5 SHA512 9c23ffefb0a194b5a88ee783186347c21e7d973524ba40119439702953b35b01ad6fbc32ce09ae169f1020963e92312a39321b1da3ffe06db1d44158761abbec
+DIST mercurial-4.6.1.tar.gz 6407380 BLAKE2B 02663a11c56bbd05f123a0903463d7e95cdf3f2e553b0f81b365b4ca296c15bccd735487162870a4e38253c6c0cb1d8f0cf1bbb1b05b3c3b721f2209e4e1b2ec SHA512 0c7737ca803691b135b4906cc527b20595e314009096d8a19f37814ee192b182e7c5360fbf993f632d6071da1f9fca38677e7190c14ed92bafa8add72a4a27d9
+DIST mercurial-4.6.2.tar.gz 6407989 BLAKE2B 22aa121b2544e3597f2ea4d3a7a80b3b8f5ca6f9de15326dbee555ca3d14b8a552042c4448aae17b1c015b4f302c3512c204f17a834b758f51fbcc2455ed4e6f SHA512 71afb9ed3f62b1b946563c55851dda1fc8b724afe82a4a253c7f4719ae9e1160d5f9644bed7fd27ee3a21d8e682352364fc9f47bafa552cd4cd7fac7c0d42bdd
+EBUILD mercurial-4.5.2.ebuild 3547 BLAKE2B f472141575aef5f6091625beeb30674e29b3d18e72887045c0e1f70914f285613317f6549679a695f13eda3f8b9af51a0b1270108355394f0ac49de4e76bdbc0 SHA512 04604379d7d11c530bf178f0b316160f0fbfd76ea0aeca5a806482c780a8142109fa23d43383f25f195421f3eacc9217a2dd58128ed2cad45deb1d730cbeb585
+EBUILD mercurial-4.5.3.ebuild 3556 BLAKE2B 97bf79f486cfeaa783c170df4d8460294073eb6a7c5ad6f79faa42bb78c8e35daff20e48d5248ee845f73d3fa231580f2acff63a0104befb900e8dcb08ec143e SHA512 9fb21045a85f89cda4641224ca3b5e8ee7320004b25b2eb134b66c7e25daa93fbfecd23def0ad2bec5b006372eb67bd3d093fa9eac6c62b68153907706b7044b
+EBUILD mercurial-4.6.1.ebuild 3556 BLAKE2B 97bf79f486cfeaa783c170df4d8460294073eb6a7c5ad6f79faa42bb78c8e35daff20e48d5248ee845f73d3fa231580f2acff63a0104befb900e8dcb08ec143e SHA512 9fb21045a85f89cda4641224ca3b5e8ee7320004b25b2eb134b66c7e25daa93fbfecd23def0ad2bec5b006372eb67bd3d093fa9eac6c62b68153907706b7044b
+EBUILD mercurial-4.6.2.ebuild 3554 BLAKE2B cfb166a35a25809c2a3dde7c8619b047387cd5ba7a89e8d78dfbd599382c04b1955936dbccdb8b18da6eb603f2ec3a5565708500d4cd527d15262941d846f120 SHA512 804d587e92e92ef57e7a54a6e0199e7283e9394e28887888505d0a5e49ddbb6fc1fa3549c2dbe8e457f68b24c948033beaa20700dde288b0479b73e6732bc8b4
+EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08
+MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1
diff --git a/dev-vcs/mercurial/files/70mercurial-gentoo.el b/dev-vcs/mercurial/files/70mercurial-gentoo.el
new file mode 100644
index 000000000000..5779a612f204
--- /dev/null
+++ b/dev-vcs/mercurial/files/70mercurial-gentoo.el
@@ -0,0 +1,3 @@
+;;; mercurial site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
\ No newline at end of file
diff --git a/dev-vcs/mercurial/files/cacerts.rc b/dev-vcs/mercurial/files/cacerts.rc
new file mode 100644
index 000000000000..240261c53668
--- /dev/null
+++ b/dev-vcs/mercurial/files/cacerts.rc
@@ -0,0 +1,2 @@
+[web]
+cacerts = /etc/ssl/certs/ca-certificates.crt
diff --git a/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch b/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch
new file mode 100644
index 000000000000..a48932ee9fe5
--- /dev/null
+++ b/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch
@@ -0,0 +1,40 @@
+--- mercurial-3.0.1/i18n/el.po
++++ mercurial-3.0.1/i18n/el.po
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2009-12-02 03:23+0200\n"
+ "Last-Translator: <keramida@ceid.upatras.gr>\n"
+ "Language-Team: Greek\n"
++"Language: el\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- mercurial-3.0.1/i18n/fr.po
++++ mercurial-3.0.1/i18n/fr.po
+@@ -90,6 +90,7 @@
+ "PO-Revision-Date: 2009-10-25 12:43+0100\n"
+ "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
+ "Language-Team: French\n"
++"Language: fr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- mercurial-3.0.1/i18n/ro.po
++++ mercurial-3.0.1/i18n/ro.po
+@@ -110,6 +110,7 @@
+ "PO-Revision-Date: 2011-06-08 17:00+0200\n"
+ "Last-Translator: Daniel Dumitriu <daniel.dumitriu@gmail.com>\n"
+ "Language-Team: Romanian <>\n"
++"Language: ro\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- mercurial-3.0.1/i18n/zh_CN.po
++++ mercurial-3.0.1/i18n/zh_CN.po
+@@ -51,6 +51,7 @@
+ "PO-Revision-Date: 2009-03-31 20:38+0200\n"
+ "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
+ "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n"
++"Language: zh_CN\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/dev-vcs/mercurial/mercurial-4.5.2.ebuild b/dev-vcs/mercurial/mercurial-4.5.2.ebuild
new file mode 100644
index 000000000000..1a3926395a4d
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-4.5.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 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
+}
diff --git a/dev-vcs/mercurial/mercurial-4.5.3.ebuild b/dev-vcs/mercurial/mercurial-4.5.3.ebuild
new file mode 100644
index 000000000000..55a97bb048ec
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-4.5.3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 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
+}
diff --git a/dev-vcs/mercurial/mercurial-4.6.1.ebuild b/dev-vcs/mercurial/mercurial-4.6.1.ebuild
new file mode 100644
index 000000000000..55a97bb048ec
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-4.6.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 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
+}
diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
new file mode 100644
index 000000000000..d89c3546437c
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 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
+}
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
new file mode 100644
index 000000000000..66be22841e62
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+EHG_REPO_URI="http://selenic.com/repo/hg"
+EHG_REVISION="@"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="bugzilla emacs gpg test tk zsh-completion"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )
+	app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+SITEFILE="70${PN}-gentoo.el"
+
+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
+	emake doc
+	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
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg
+	fi
+
+	rm -f doc/*.?.txt || die
+	dodoc CONTRIBUTORS doc/*.txt
+	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 -rf contrib/$f || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial"
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	cd tests || die
+	rm -rf *svn* || die					# Subversion tests fail with 1.5
+	rm -f test-archive* || die			# Fails due to verbose tar output changes
+	rm -f test-convert-baz* || die		# GNU Arch baz
+	rm -f test-convert-cvs* || die		# CVS
+	rm -f test-convert-darcs* || die	# Darcs
+	rm -f test-convert-git* || die		# git
+	rm -f test-convert-mtn* || die		# monotone
+	rm -f test-convert-tla* || die		# GNU Arch tla
+	rm -f test-doctest* || die			# doctest always fails with python 2.5.x
+	rm -f test-largefiles* || die		# tends to time out
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-command-template* || die	# Test is broken when run as root
+		rm -f test-convert* || die			# Test is broken when run as root
+		rm -f test-lock-badness* || die		# Test is broken when run as root
+		rm -f test-permissions* || die		# Test is broken when run as root
+		rm -f test-pull-permission* || die	# Test is broken when run as root
+		rm -f test-clone-failure* || die
+		rm -f test-journal-exists* || die
+		rm -f test-repair-strip* || die
+	fi
+
+	cd .. || 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/metadata.xml b/dev-vcs/mercurial/metadata.xml
new file mode 100644
index 000000000000..6f2bedbfd600
--- /dev/null
+++ b/dev-vcs/mercurial/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <use>
+    <flag name="bugzilla">Support bugzilla integration.</flag>
+    <flag name="gpg">Support signing with GnuPG.</flag>
+    <flag name="tk">Install dev-lang/tk for hgk script.</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-vcs/metadata.xml b/dev-vcs/metadata.xml
new file mode 100644
index 000000000000..851dd074de1b
--- /dev/null
+++ b/dev-vcs/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-vcs category contains utilities focused on version control.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-vcs enthält Programme zur Versionsverwaltung.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-vcs contiene programas para control de versiones.
+	</longdescription>
+</catmetadata>
diff --git a/dev-vcs/mr-1.20170129 b/dev-vcs/mr-1.20170129
deleted file mode 100644
index d31e8e80140d..000000000000
--- a/dev-vcs/mr-1.20170129
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl
-DESCRIPTION=Multiple Repository management tool
-EAPI=6
-HOMEPAGE=https://myrepos.branchable.com/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/libwww-perl dev-perl/HTML-Parser
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tamiko/distfiles/mr-1.20170129.tar.gz
-_md5_=5ffb14182c32550af24e5f7934dbe9ce
diff --git a/dev-vcs/mr-1.20171231 b/dev-vcs/mr-1.20171231
deleted file mode 100644
index 1a4bb838197e..000000000000
--- a/dev-vcs/mr-1.20171231
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl
-DESCRIPTION=Multiple Repository management tool
-EAPI=6
-HOMEPAGE=https://myrepos.branchable.com/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/libwww-perl dev-perl/HTML-Parser
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tamiko/distfiles/mr-1.20171231.tar.xz
-_md5_=d33a1f722e8b06bcdedba190dcfd43fd
diff --git a/dev-vcs/mr-1.99999999 b/dev-vcs/mr-1.99999999
deleted file mode 100644
index 1476249fede1..000000000000
--- a/dev-vcs/mr-1.99999999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Multiple Repository management tool
-EAPI=6
-HOMEPAGE=https://myrepos.branchable.com/
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/libwww-perl dev-perl/HTML-Parser
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=8784fc99120b60d630eeb4624ea7fe14
diff --git a/dev-vcs/mr/Manifest b/dev-vcs/mr/Manifest
new file mode 100644
index 000000000000..d7f2a26967e3
--- /dev/null
+++ b/dev-vcs/mr/Manifest
@@ -0,0 +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 582 BLAKE2B 77a0a4386ad093b1e22b3a35b0f5136a276891ef3ec287c106d6cb77f18f8b8097884a2e5f849bfd30987be5cb2d0261660a85db9b3763cf87ffadcfcecfbc18 SHA512 4588e47ad06b0a696b0bdfbac012879f46d0293068e64b52993aa929e15d868b2b0c3cf2037d2227109567eedb673df55e0bec29d97363577081bfeee8d6c883
+EBUILD mr-1.99999999.ebuild 583 BLAKE2B 635eb59e84c51b375ebb585d5803ef4489ee0fdb3abdc7b6c74d90c8cf6a22518c5e136c7a12af21a8a3e5c7395a7bff4933a431327c496d7e8aba62756edd80 SHA512 d823aaf42d687cbfe30f6e8f671d6f3f831c5678dba172de9687211ba88cd75ab41cc40c966fd3655667ce876a97148c16ceb08010766c5607c9995a45a53888
+MISC metadata.xml 1277 BLAKE2B db16bc955489887b1d8ce168c08171e061dd19ec8b32c4b00195c80d294b494d0a02c5b3862edfcc30a9dd08303ec35d94c366aa895f2b83ae5269d7cb83556f SHA512 43cc57009889ef7f81756c38284dbd2b49105d60979977f239c1ca3ba10d1b57769fd88bc839ba209e4a3835e9bf7293fd4b8a863170a908bd674c27d7e90b09
diff --git a/dev-vcs/mr/metadata.xml b/dev-vcs/mr/metadata.xml
new file mode 100644
index 000000000000..8214b7ad9921
--- /dev/null
+++ b/dev-vcs/mr/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<longdescription lang="en">
+		The mr(1) command can checkout, update, or perform other actions on a
+		set of repositories as if they were one combined respository. It
+		supports any combination of git, svn, mercurial, bzr, darcs, cvs, vcsh,
+		fossil, and veracity repositories, and support for other version control
+		systems can easily be added. (There are extensions adding support for unison
+		and git-svn.)
+
+		It is extremely configurable via simple shell scripting. Some examples
+		of things it can do include:
+
+		* Update a repository no more frequently than once every twelve hours.
+		* Run an arbitrary command before committing to a repository.
+		* When updating a git repository, pull from two different upstreams and merge the two together.
+		* Run several repository updates in parallel, greatly speeding up the update process.
+		* Remember actions that failed due to a laptop being offline, so they can be retried when it comes back online.
+
+		This package also includes the webcheckout command.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/mr/mr-1.20170129.ebuild b/dev-vcs/mr/mr-1.20170129.ebuild
new file mode 100644
index 000000000000..3abb2b7eddb4
--- /dev/null
+++ b/dev-vcs/mr/mr-1.20170129.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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.gz"
+
+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/*
+}
diff --git a/dev-vcs/mr/mr-1.20171231.ebuild b/dev-vcs/mr/mr-1.20171231.ebuild
new file mode 100644
index 000000000000..494b8dea2439
--- /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/*
+}
diff --git a/dev-vcs/mr/mr-1.99999999.ebuild b/dev-vcs/mr/mr-1.99999999.ebuild
new file mode 100644
index 000000000000..b366a34e942e
--- /dev/null
+++ b/dev-vcs/mr/mr-1.99999999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="Multiple Repository management tool"
+HOMEPAGE="https://myrepos.branchable.com/"
+SRC_URI=""
+EGIT_REPO_URI="git://myrepos.branchable.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+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/*
+}
diff --git a/dev-vcs/notify-webhook-0.1.0 b/dev-vcs/notify-webhook-0.1.0
deleted file mode 100644
index 5d48e216fdb2..000000000000
--- a/dev-vcs/notify-webhook-0.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-python/simplejson
-DESCRIPTION=Git post-receive web hook notifier in Python.
-EAPI=5
-HOMEPAGE=https://github.com/metajack/notify-webhook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/simplejson
-SLOT=0
-SRC_URI=https://github.com/metajack/notify-webhook/archive/v0.1.0.tar.gz -> notify-webhook-0.1.0.tar.gz
-_md5_=3154affc144eb26c9625e2652b4feb82
diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest
new file mode 100644
index 000000000000..fa2e2d5c9cff
--- /dev/null
+++ b/dev-vcs/notify-webhook/Manifest
@@ -0,0 +1,3 @@
+DIST notify-webhook-0.1.0.tar.gz 17525 BLAKE2B 947027414bd30f96c9e27ca8b7f965a077792a6b8962180094df6bdeef8261140c063041f1b6598c518edfd3b6807da5020a4640aadbddb202887bac91d3b51d SHA512 1694f32b1263baecac473ffa49e6e7f9cbfdb73d1abaa88e228771e28a5ed915d9f5f21ab26b05934bdcd8694b4c4f1506763dd2f0c89c35ffa51e1d1b7d03b4
+EBUILD notify-webhook-0.1.0.ebuild 655 BLAKE2B 8102f5779b6d32c70c40d61af786d7a26be8dea3f76de42e81afd28f250aee524c573f75dfcf27e779d752ffc904af4e9202edef0403a94c8739aa8fc9321fa7 SHA512 16ba094c3d211d3551a6296fe9788ccb2f7d61b1d7e1dcd7efba8115da3082e734d75ec706f0801b6c3983b5854b7d2e8babbb58bec1ff4ffd5e00ae4441ea13
+MISC metadata.xml 598 BLAKE2B d3cb099dbdcb844e0158112eaa1748c9587f88241860f1a862d852a96b1ea6fd01fd0e3555442cb6fbe066da5c61722c443f482f26154679fbbd0ac29c9fff3e SHA512 c4c8fd71b9c15c14f397a6bf65dab33907ba702d021315605dcebdbe565671b5e0a2df38d5166ef6ace416fbd0e2a03334b9525c450c2d9e726b194ca63ebf5e
diff --git a/dev-vcs/notify-webhook/metadata.xml b/dev-vcs/notify-webhook/metadata.xml
new file mode 100644
index 000000000000..92ad1c0ab0df
--- /dev/null
+++ b/dev-vcs/notify-webhook/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		notify-webhook is a git post-receive hook script that posts JSON data to a
+		webhook capable server.
+
+		This implements the GitHub Web hooks API as closely as possible. It allows
+		arbitrary git repositories to use webhook capable services.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">metajack/notify-webhook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
new file mode 100644
index 000000000000..5b121749659c
--- /dev/null
+++ b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5} pypy3 )
+
+DESCRIPTION="Git post-receive web hook notifier in Python."
+HOMEPAGE="https://github.com/metajack/notify-webhook"
+#COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6'
+SRC_URI="https://github.com/metajack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/simplejson"
+RDEPEND="${DEPEND}"
+
+#MY_P="${PN}-${COMMIT}"
+#S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dodoc *markdown
+	exeinto /usr/libexec/githook/$PN/
+	doexe notify-webhook.py
+}
diff --git a/dev-vcs/pwclient-20141110122616 b/dev-vcs/pwclient-20141110122616
deleted file mode 100644
index 7a6972312d3b..000000000000
--- a/dev-vcs/pwclient-20141110122616
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=command line utility for interacting with patchwork repos
-EAPI=5
-HOMEPAGE=http://jk.ozlabs.org/projects/patchwork/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gentoo/pwclient-20141110122616
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fdf1f3d7947a8a87c96559033070dfe
diff --git a/dev-vcs/pwclient/Manifest b/dev-vcs/pwclient/Manifest
new file mode 100644
index 000000000000..db851e8fe7c0
--- /dev/null
+++ b/dev-vcs/pwclient/Manifest
@@ -0,0 +1,6 @@
+AUX pwclient-20141110122616-0001-pwclient-handle-missing-.pwclientrc-better.patch 1812 BLAKE2B dc3adab92d7aea4666d827a21eabbe2889c12a166559bafa5ab53f71ca2b019dfa16d859c67b89c38155eda0ae327d538d0a7b977e092011c7fc2348862364e1 SHA512 8d712a184d8dceb5eeb69596a65072f6b23ec998f78878b795574464aed1811764d7cb35ea50a36f0f1d8cb0cddb4ed2fb0fe9532b55a4d4992df648fbf2b974
+AUX pwclient-20141110122616-0002-pwclient-use-print_function-for-better-py3-compatibi.patch 4005 BLAKE2B c591d837988f4d5f698ad9c723b77491ed547bb017f4382549b450856eaf570579ca3e1d8ac7506bac13282fd0527e177851171145104a3361a44664bc2c9ab8 SHA512 6bd87392b99a6339f71ab0ed47115a63a5ed43c0d3c1b8b56e2fdfd77ebb8f8692ae3074c6e858f44b1de5d9bd439042b9d50fa38c90712b62d524e4cfcb8ba3
+AUX pwclient-20141110122616-0003-pwclient-basic-python3-support.patch 4223 BLAKE2B d4709dd5a2f18647e646cc285a52bad1aaab7637f9b96dc528cac429b39253f0f7c9361cf81f851edfc68337f3805a80f8ceb4bc63098a037aa7a70bdaddf3c5 SHA512 be178e4f303ff777ed870a029561802e2294a53feed1e9bbf546b0947cc1ae0ca5ede44c6e73018c1a3370e3df388f5dc921459d9f0730f1152078ff439acaab
+DIST pwclient-20141110122616 23527 BLAKE2B 61a49c6104db0015d0cf9ea4fddefe3ccde6495d0a0caf918d858e535bbbd085ee5a80f856753ea547b1ac18fb22344036734a5814d06865bde2622368b88155 SHA512 4933b7c5b4129d5fa1e47fa09dd8a75e5e5aac3254d8ed4bb65f8e7363d082217deecf8fc99f53092b607c49eebf9144e335079472a790a0193d0c6cddcf433f
+EBUILD pwclient-20141110122616.ebuild 1053 BLAKE2B 92d1e35e6551828c250c973de5e91ebd429ab1483be8d1fe9c4c1fd28d15407448eb95d76a2c63637c357234e11bfd68107583e197a02f2e58045824b9d419bf SHA512 84d3287c8dfc3bd0c408b09a0cce78db126fd123dad760e6cd7f7837ab282367d1635a7d447f1d18ecb49676181e213f15c96a4acb1912f6f82d84ec1a3e975e
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/pwclient/files/pwclient-20141110122616-0001-pwclient-handle-missing-.pwclientrc-better.patch b/dev-vcs/pwclient/files/pwclient-20141110122616-0001-pwclient-handle-missing-.pwclientrc-better.patch
new file mode 100644
index 000000000000..43e2606efa67
--- /dev/null
+++ b/dev-vcs/pwclient/files/pwclient-20141110122616-0001-pwclient-handle-missing-.pwclientrc-better.patch
@@ -0,0 +1,45 @@
+From 601e1362d63293ca567295f63cb52bcfeb5d9959 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 5 May 2015 23:19:57 -0400
+Subject: [PATCH 1/3] pwclient: handle missing ~/.pwclientrc better
+
+The upgrade path will crash if ~/.pwclientrc doesn't exist, so add an
+explicit check for the file before we try to "upgrade" it.
+
+The default error messages don't mention the config file, so it can be
+a bit confusing what pwclient is complaining about when running.
+
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+---
+ apps/patchwork/bin/pwclient | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient
+index 2a80981..56aa909 100755
+--- a/apps/patchwork/bin/pwclient
++++ b/apps/patchwork/bin/pwclient
+@@ -552,7 +552,7 @@ def main():
+     config = ConfigParser.ConfigParser()
+     config.read([CONFIG_FILE])
+ 
+-    if not config.has_section('options'):
++    if not config.has_section('options') and os.path.exists(CONFIG_FILE):
+         sys.stderr.write('~/.pwclientrc is in the old format. Migrating it...')
+ 
+         old_project = config.get('base','project')
+@@ -590,10 +590,10 @@ def main():
+             sys.exit(1)
+ 
+     if not config.has_section(project_str):
+-        sys.stderr.write("No section for project %s\n" % project_str)
++        sys.stderr.write('No section for project %s in ~/.pwclientrc\n' % project_str)
+         sys.exit(1)
+     if not config.has_option(project_str, 'url'):
+-        sys.stderr.write("No URL for project %s\n" % project_str)
++        sys.stderr.write('No URL for project %s in ~/.pwclientrc\n' % project_str)
+         sys.exit(1)
+     if not do_signoff and config.has_option('options', 'signoff'):
+         do_signoff = config.getboolean('options', 'signoff')
+-- 
+2.4.0
+
diff --git a/dev-vcs/pwclient/files/pwclient-20141110122616-0002-pwclient-use-print_function-for-better-py3-compatibi.patch b/dev-vcs/pwclient/files/pwclient-20141110122616-0002-pwclient-use-print_function-for-better-py3-compatibi.patch
new file mode 100644
index 000000000000..70f54a7aed3a
--- /dev/null
+++ b/dev-vcs/pwclient/files/pwclient-20141110122616-0002-pwclient-use-print_function-for-better-py3-compatibi.patch
@@ -0,0 +1,101 @@
+From 0991ccb0e7c0be66e087839f88a7120394c2f052 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 5 May 2015 23:54:16 -0400
+Subject: [PATCH 2/3] pwclient: use print_function for better py3 compatibility
+
+The script already tries to use print like a function in many places but
+is really passing a parenthesized string.  Import the print_function from
+the future module so that it actually works as intended.
+
+We also need to fix up a few latent print statements to make it work.
+
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+---
+ apps/patchwork/bin/pwclient | 26 ++++++++++++++------------
+ 1 file changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient
+index 56aa909..2e6daa5 100755
+--- a/apps/patchwork/bin/pwclient
++++ b/apps/patchwork/bin/pwclient
+@@ -19,6 +19,8 @@
+ # along with Patchwork; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
++from __future__ import print_function
++
+ import os
+ import sys
+ import xmlrpclib
+@@ -170,9 +172,9 @@ def action_list(rpc, filter, submitter_str, delegate_str, format_str=None):
+         else:
+             for id in ids:
+                 person = rpc.person_get(id)
+-                print "Patches submitted by %s <%s>:" % \
+-                        (unicode(person['name']).encode("utf-8"), \
+-                         unicode(person['email']).encode("utf-8"))
++                print('Patches submitted by %s <%s>:' %
++                      (unicode(person['name']).encode('utf-8'),
++                       unicode(person['email']).encode('utf-8')))
+                 f = filter
+                 f.add("submitter_id", id)
+                 patches = rpc.patch_list(f.d)
+@@ -187,8 +189,8 @@ def action_list(rpc, filter, submitter_str, delegate_str, format_str=None):
+         else:
+             for id in ids:
+                 person = rpc.person_get(id)
+-                print "Patches delegated to %s <%s>:" % \
+-                        (person['name'], person['email'])
++                print('Patches delegated to %s <%s>:' %
++                      (person['name'], person['email']))
+                 f = filter
+                 f.add("delegate_id", id)
+                 patches = rpc.patch_list(f.d)
+@@ -245,7 +247,7 @@ def action_get(rpc, patch_id):
+     try:
+         f.write(unicode(s).encode("utf-8"))
+         f.close()
+-        print "Saved patch to %s" % fname
++        print('Saved patch to %s' % fname)
+     except:
+         sys.stderr.write("Failed to write to %s\n" % fname)
+         sys.exit(1)
+@@ -258,13 +260,13 @@ def action_apply(rpc, patch_id, apply_cmd=None):
+         sys.exit(1)
+ 
+     if apply_cmd is None:
+-      print "Applying patch #%d to current directory" % patch_id
++      print('Applying patch #%d to current directory' % patch_id)
+       apply_cmd = ['patch', '-p1']
+     else:
+-      print "Applying patch #%d using %s" % (
+-          patch_id, repr(' '.join(apply_cmd)))
++      print('Applying patch #%d using %s' %
++            (patch_id, repr(' '.join(apply_cmd))))
+ 
+-    print "Description: %s" % patch['name']
++    print('Description: %s' % patch['name'])
+     s = rpc.patch_get_mbox(patch_id)
+     if len(s) > 0:
+         proc = subprocess.Popen(apply_cmd, stdin = subprocess.PIPE)
+@@ -295,7 +297,7 @@ def action_update_patch(rpc, patch_id, state = None, commit = None):
+     success = False
+     try:
+         success = rpc.patch_set(patch_id, params)
+-    except xmlrpclib.Fault, f:
++    except xmlrpclib.Fault as f:
+         sys.stderr.write("Error updating patch: %s\n" % f.faultString)
+ 
+     if not success:
+@@ -668,7 +670,7 @@ def main():
+         for patch_id in non_empty(h, patch_ids):
+             s = rpc.patch_get_mbox(patch_id)
+             if len(s) > 0:
+-                print unicode(s).encode("utf-8")
++                print(unicode(s).encode('utf-8'))
+ 
+     elif action == 'info':
+         for patch_id in non_empty(h, patch_ids):
+-- 
+2.4.0
+
diff --git a/dev-vcs/pwclient/files/pwclient-20141110122616-0003-pwclient-basic-python3-support.patch b/dev-vcs/pwclient/files/pwclient-20141110122616-0003-pwclient-basic-python3-support.patch
new file mode 100644
index 000000000000..da75ac1d3e1a
--- /dev/null
+++ b/dev-vcs/pwclient/files/pwclient-20141110122616-0003-pwclient-basic-python3-support.patch
@@ -0,0 +1,125 @@
+From fcbd40fe7fa3fbdc5ffb386c5c7b72a8704e7136 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 6 May 2015 00:12:02 -0400
+Subject: [PATCH 3/3] pwclient: basic python3 support
+
+This fixes a few random issues to make the script work at least somewhat
+under python 3:
+- set the default encoding to utf-8
+- handle xmlrpclib/xmlrpc.client module renames
+- handle ConfigParser/configparser module renames
+- add a unicode() stub for python 3
+- fix old style class definition w/Filter
+- use list comprehension instead of map()
+- drop the unused version= keyword w/argparse
+
+The code still runs under python 2 the same as before, and now works for
+the most part under python 3 -- the handling of encoded content still needs
+some work, but that'll require more surgery, and is best left to another
+commit after this.
+
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+---
+ apps/patchwork/bin/pwclient | 31 +++++++++++++++++++++++--------
+ 1 file changed, 23 insertions(+), 8 deletions(-)
+
+diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient
+index 2e6daa5..5080a17 100755
+--- a/apps/patchwork/bin/pwclient
++++ b/apps/patchwork/bin/pwclient
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env python
++# -*- coding: utf-8 -*-
+ #
+ # Patchwork command line client
+ # Copyright (C) 2008 Nate Case <ncase@xes-inc.com>
+@@ -23,16 +24,31 @@ from __future__ import print_function
+ 
+ import os
+ import sys
+-import xmlrpclib
++try:
++    import xmlrpclib
++except ImportError:
++    # Python 3 has merged/renamed things.
++    import xmlrpc.client as xmlrpclib
+ import argparse
+ import string
+ import tempfile
+ import subprocess
+ import base64
+-import ConfigParser
++try:
++    import ConfigParser
++except ImportError:
++    # Python 3 has renamed things.
++    import configparser as ConfigParser
+ import shutil
+ import re
+ 
++# Add a shim for Python 2's unicode() helper.
++try:
++    unicode
++except NameError:
++    # Python 3 does everything by unicode now.
++    unicode = str
++
+ # Default Patchwork remote XML-RPC server URL
+ # This script will check the PW_XMLRPC_URL environment variable
+ # for the URL to access.  If that is unspecified, it will fallback to
+@@ -40,7 +56,7 @@ import re
+ DEFAULT_URL = "http://patchwork/xmlrpc/"
+ CONFIG_FILE = os.path.expanduser('~/.pwclientrc')
+ 
+-class Filter:
++class Filter(object):
+     """Filter for selecting patches."""
+     def __init__(self):
+         # These fields refer to specific objects, so they are special
+@@ -135,7 +151,7 @@ def person_ids_by_name(rpc, name):
+     if len(name) == 0:
+         return []
+     people = rpc.person_list(name, 0)
+-    return map(lambda x: x['id'], people)
++    return [x['id'] for x in people]
+ 
+ def list_patches(patches, format_str=None):
+     """Dump a list of patches to stdout."""
+@@ -352,7 +368,7 @@ class _RecursiveHelpAction(argparse._HelpAction):
+         parser.exit()
+ 
+ def main():
+-    hash_parser = argparse.ArgumentParser(add_help=False, version=False)
++    hash_parser = argparse.ArgumentParser(add_help=False)
+     hash_parser.add_argument(
+         '-h', metavar='HASH', dest='hash', action='store',
+         help='''Lookup by patch hash'''
+@@ -362,7 +378,7 @@ def main():
+         help='Patch ID',
+     )
+ 
+-    filter_parser = argparse.ArgumentParser(add_help=False, version=False)
++    filter_parser = argparse.ArgumentParser(add_help=False)
+     filter_parser.add_argument(
+         '-s', metavar='STATE',
+         help='''Filter by patch state (e.g., 'New', 'Accepted', etc.)'''
+@@ -397,7 +413,7 @@ def main():
+         'patch_name', metavar='STR', nargs='?',
+         help='substring to search for patches by name',
+     )
+-    help_parser = argparse.ArgumentParser(add_help=False, version=False)
++    help_parser = argparse.ArgumentParser(add_help=False)
+     help_parser.add_argument(
+         '--help', action='help', help=argparse.SUPPRESS,
+         #help='''show this help message and exit'''
+@@ -406,7 +422,6 @@ def main():
+     action_parser = argparse.ArgumentParser(
+         prog='pwclient',
+         add_help=False,
+-        version=False,
+         formatter_class=argparse.RawDescriptionHelpFormatter,
+         epilog='''(apply | get | info | view | update) (-h HASH | ID [ID ...])''',
+     )
+-- 
+2.4.0
+
diff --git a/dev-vcs/pwclient/metadata.xml b/dev-vcs/pwclient/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/dev-vcs/pwclient/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/pwclient/pwclient-20141110122616.ebuild b/dev-vcs/pwclient/pwclient-20141110122616.ebuild
new file mode 100644
index 000000000000..327b429fd3e1
--- /dev/null
+++ b/dev-vcs/pwclient/pwclient-20141110122616.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils python-r1
+
+# The PV comes from:
+#	git clone ${EGIT_REPO_URI}
+#	cd patchwork
+#	EGIT_COMMIT=$(git log -n1 --format=%H apps/patchwork/bin/pwclient)
+#	date --date="$(git log -n1 --format=%ci ${EGIT_COMMIT})" -u +%Y%m%d%H%M%S
+EGIT_REPO_URI="git://ozlabs.org/home/jk/git/patchwork"
+EGIT_COMMIT="8904a7dcaf959da8db4a9a5d92b91a61eed05201"
+
+DESCRIPTION="command line utility for interacting with patchwork repos"
+HOMEPAGE="http://jk.ozlabs.org/projects/patchwork/"
+SRC_URI="mirror://gentoo/${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} ${PN} || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-*.patch
+}
+
+src_install() {
+	python_setup
+	python_doscript ${PN}
+}
diff --git a/dev-vcs/qgit-2.7 b/dev-vcs/qgit-2.7
deleted file mode 100644
index af568ee1821c..000000000000
--- a/dev-vcs/qgit-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt GUI for git repositories
-EAPI=6
-HOMEPAGE=http://libre.tibirna.org/projects/qgit/wiki/QGit
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-vcs/git !dev-vcs/qgit:2
-SLOT=0
-SRC_URI=https://github.com/tibirna/qgit/archive/qgit-2.7.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb0316dc9191b0101032e6bd7c12230b
diff --git a/dev-vcs/qgit-2.7-r1 b/dev-vcs/qgit-2.7-r1
deleted file mode 100644
index 538d290186e3..000000000000
--- a/dev-vcs/qgit-2.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt GUI for git repositories
-EAPI=6
-HOMEPAGE=http://libre.tibirna.org/projects/qgit/wiki/QGit
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-vcs/git !dev-vcs/qgit:2
-SLOT=0
-SRC_URI=https://github.com/tibirna/qgit/archive/qgit-2.7.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b77034f0035f3f18723b940da1683c21
diff --git a/dev-vcs/qgit/Manifest b/dev-vcs/qgit/Manifest
new file mode 100644
index 000000000000..1be1e54d41e8
--- /dev/null
+++ b/dev-vcs/qgit/Manifest
@@ -0,0 +1,6 @@
+AUX qgit-2.7-highdpi-support.patch 1558 BLAKE2B 0dcf7aedacbb054bbb2868aeb69835c6b091d9a5c54e4937eb49fca5a7cc183fda22a9eb5ac1125ad2831c1ed59d1724090816be16f00b607671c2f1c66d88c2 SHA512 179e58795c6023b3f344ed7a5f03a36d38f0e1e364fe497608a2651f0c71e30cf56de934f48ac437c0cf0794b50e7673ae9199e231e533324c87d65706401817
+AUX qgit-2.7-qt-5.11.patch 590 BLAKE2B 42d45014c3f630d72509a79f598945b4ebc253d0c89f36fd09560b9e4aff5cd71863e68a9915a08dc0ccde98ab50de50a71b1576556d81f0ec276044486e4e8f SHA512 46360172f9d22927910f6f238c0963c6cf9c55909d53944583b2c1316484fce5c21f7f76797bd8a43a0bdb2885239dd1940b71e8a08800666ec9de436a100f48
+DIST qgit-2.7.tar.gz 259624 BLAKE2B 48c5b7bd7da6b037b4be103a7de32375128311200ab98956edb1ac269fd46d6f4ec93049d86ce92fa009999e87bb8df6706f44847f795d993c829ee9d117ce69 SHA512 024fd825aaec64301f0bcbe0ca1d02eb8da0d754d79d09075b1cd87a507d44c97092b824949f2637b37f0e71b36723cad6963cd00dcb2f7597832aba3a5ab842
+EBUILD qgit-2.7-r1.ebuild 605 BLAKE2B af3a5c65f6852b68af8cf99ecd36c49ef33cef461f0e0cd6447bcc68cbbb64857198d80589e1ae2a9576c7fbd4b0a077eff6abcc1da9902608174f90030fdb06 SHA512 6d85689071c4ea8550e7d8308b21ea6ddc449cb3f63628234361312caac0813af0cfefc5f87f4ab0a78e09f9a846f047d11069becc2192cca04d8a8ab63310d5
+EBUILD qgit-2.7.ebuild 514 BLAKE2B a87270e53ba783cf6c30a9d80a34988d15e9fe8f5ac988e31afe7aea94b645dad99e460ca4c97fe4b5e40398d3f226a3801d9c36fccc0eb263b2b5a542018c7a SHA512 333220a77d749fb3ee5f32a845acebf30a69247c7605237e8a5f27d21fc6ea9fe611f5ff5107f44c3585cc9fb540d5ee8d18f4a16b8ca87472a61f00669222a2
+MISC metadata.xml 324 BLAKE2B 1046f76dc321a6155b49edb4972d9d353d47e4103a0356cc83f459faac05985e201daef4197420cadb19f50c37eb528b990c8d9d93537822fbf0698501b3fb5c SHA512 e4e0bbc60b8af9512584b93e60d29ac47a4150691ea46bb3281c6d99acf119d0c6717497286c324a9ccc91624bbd56211a513c1fd675ec89603d431b9b052248
diff --git a/dev-vcs/qgit/files/qgit-2.7-highdpi-support.patch b/dev-vcs/qgit/files/qgit-2.7-highdpi-support.patch
new file mode 100644
index 000000000000..17f940aa23b7
--- /dev/null
+++ b/dev-vcs/qgit/files/qgit-2.7-highdpi-support.patch
@@ -0,0 +1,51 @@
+From e60ae49271e06384163afa1ebd1e562eb7c520ed Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 15 Feb 2018 17:39:22 +0000
+Subject: [PATCH] Add high DPI support
+
+---
+ src/listview.cpp | 11 ++++++++++-
+ src/qgit.cpp     |  5 ++++-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/listview.cpp b/src/listview.cpp
+index dd6a8cb..e4f094e 100644
+--- a/src/listview.cpp
++++ b/src/listview.cpp
+@@ -884,7 +884,16 @@ void ListViewDelegate::addTextPixmap(QPixmap** pp, SCRef txt, const QStyleOption
+         int pw = fm.boundingRect(txt).width() + 2 * spacing;
+         int ph = fm.height();
+ 
+-	QPixmap* newPm = new QPixmap(ofs + pw, ph);
++    QSize pixmapSize(ofs + pw, ph);
++
++#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
++    qreal dpr = qApp->devicePixelRatio();
++	QPixmap* newPm = new QPixmap(pixmapSize * dpr);
++    newPm->setDevicePixelRatio(dpr);
++#else
++    QPixmap* newPm = new QPixmap(pixmapSize);
++#endif
++
+ 	QPainter p;
+ 	p.begin(newPm);
+ 	if (!pm->isNull()) {
+diff --git a/src/qgit.cpp b/src/qgit.cpp
+index 266a7b8..b01c49e 100644
+--- a/src/qgit.cpp
++++ b/src/qgit.cpp
+@@ -18,7 +18,10 @@ using namespace QGit;
+ int main(int argc, char* argv[]) {
+ 
+ 	QApplication app(argc, argv);
+-	QCoreApplication::setOrganizationName(ORG_KEY);
++#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
++    app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
++#endif
++    QCoreApplication::setOrganizationName(ORG_KEY);
+ 	QCoreApplication::setApplicationName(APP_KEY);
+ 
+ 	/* On Windows msysgit exec directory is set up
+-- 
+2.15.1
+
diff --git a/dev-vcs/qgit/files/qgit-2.7-qt-5.11.patch b/dev-vcs/qgit/files/qgit-2.7-qt-5.11.patch
new file mode 100644
index 000000000000..a92e1e50f726
--- /dev/null
+++ b/dev-vcs/qgit/files/qgit-2.7-qt-5.11.patch
@@ -0,0 +1,24 @@
+From 563bc3ab3f928a3ba1c22e5e62ab8cbe15c6bc15 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 13:28:19 +0200
+Subject: [PATCH] Fix build with Qt 5.11 (missing header)
+
+---
+ src/patchview.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/patchview.cpp b/src/patchview.cpp
+index 5e3765d..afa796e 100644
+--- a/src/patchview.cpp
++++ b/src/patchview.cpp
+@@ -6,6 +6,7 @@
+ 	Copyright: See COPYING file that comes with this distribution
+ 
+ */
++#include <QButtonGroup>
+ #include <QScrollBar>
+ #include "common.h"
+ #include "git.h"
+-- 
+2.17.0
+
diff --git a/dev-vcs/qgit/metadata.xml b/dev-vcs/qgit/metadata.xml
new file mode 100644
index 000000000000..241d7194c1ea
--- /dev/null
+++ b/dev-vcs/qgit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tibirna/qgit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/qgit/qgit-2.7-r1.ebuild b/dev-vcs/qgit/qgit-2.7-r1.ebuild
new file mode 100644
index 000000000000..b7930738acae
--- /dev/null
+++ b/dev-vcs/qgit/qgit-2.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Qt GUI for git repositories"
+HOMEPAGE="http://libre.tibirna.org/projects/qgit/wiki/QGit"
+SRC_URI="https://github.com/tibirna/qgit/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	dev-vcs/git
+	!dev-vcs/qgit:2
+"
+
+S=${WORKDIR}/${PN}-${P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-highdpi-support.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
diff --git a/dev-vcs/qgit/qgit-2.7.ebuild b/dev-vcs/qgit/qgit-2.7.ebuild
new file mode 100644
index 000000000000..9ac66aa17552
--- /dev/null
+++ b/dev-vcs/qgit/qgit-2.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Qt GUI for git repositories"
+HOMEPAGE="http://libre.tibirna.org/projects/qgit/wiki/QGit"
+SRC_URI="https://github.com/tibirna/qgit/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	dev-vcs/git
+	!dev-vcs/qgit:2
+"
+
+S=${WORKDIR}/${PN}-${P}
diff --git a/dev-vcs/rabbitvcs-0.16-r1 b/dev-vcs/rabbitvcs-0.16-r1
deleted file mode 100644
index 03b11e07fd46..000000000000
--- a/dev-vcs/rabbitvcs-0.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=sys-apps/sed-4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Integrated version control support for your desktop
-EAPI=6
-HOMEPAGE=http://rabbitvcs.org
-IUSE=caja cli diff gedit git nautilus spell thunar python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pysvn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] caja? ( dev-python/python-caja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gnome-vfs-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) diff? ( dev-util/meld ) gedit? ( app-editors/gedit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) git? ( dev-python/dulwich[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nautilus? ( >=dev-python/nautilus-python-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gnome-vfs-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) spell? ( dev-python/gtkspell-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) thunar? ( dev-python/thunarx-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/rabbitvcs/rabbitvcs/tarball/v0.16 -> rabbitvcs-0.16.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d8d4b48b92fb92179fa0d8ceddb5e64
diff --git a/dev-vcs/rabbitvcs/Manifest b/dev-vcs/rabbitvcs/Manifest
new file mode 100644
index 000000000000..73ea73e1f749
--- /dev/null
+++ b/dev-vcs/rabbitvcs/Manifest
@@ -0,0 +1,3 @@
+DIST rabbitvcs-0.16.tar.gz 1670167 BLAKE2B 44d60de0bf6beb659fe8c8d1dffdb35d1a767e47a6c9aa26515e70e46d888f4394512d2b407f9f0b28edc501392ea873dfbf44dd858169ef1943cf1e02f0eaf1 SHA512 dac3b98acb5b7ef1147105aa0f735bb964c098f764c62d0e2e601a2ce34b315a5c83b3bac8929cbac898f674c86266a200f28042aad0340c1c5273bec4a6279c
+EBUILD rabbitvcs-0.16-r1.ebuild 3116 BLAKE2B e0a939bda5471cc3fd44aa2e14fbd7d0d0059b76b83e1063dc7d5384ba84cd1f2948c8566117cafc1abd50b640072af9b2c6a5efd8db684e3fb77fce18f1a6c6 SHA512 ba042954748dc63ab64bae55241363d726126033f51e51a0c055c5a7c67a7b702d4831603d5c37613ad658c4d85708af78905fe9d2437645756f1b46027173f2
+MISC metadata.xml 1006 BLAKE2B 033fb349c1e1e5d9166014b8f241cd9dbdcc8483c25bc88d762b8e68f99acfdf7740d7cad7f404731f60dfee123c7f758079eba5ad61a74bed6c103682101489 SHA512 99879d14ad0c09948e11dc70c304798954e062c09b5679e3af86d6c92cda5f0be5b40012f0838285371bc1b6a5446c364d45c64fcf75a0cfe23f984d24188f1b
diff --git a/dev-vcs/rabbitvcs/metadata.xml b/dev-vcs/rabbitvcs/metadata.xml
new file mode 100644
index 000000000000..a2d833d6ca7d
--- /dev/null
+++ b/dev-vcs/rabbitvcs/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription>
+		RabbitVCS is a set of graphical tools written to provide
+		simple and straightforward access to the version control systems you use.
+		RabbitVCS is inspired by TortoiseSVN and others.
+	</longdescription>
+	<use>
+		<flag name="caja">Enable extension for <pkg>mate-base/caja</pkg></flag>
+		<flag name="cli">Eanble console based frontend</flag>
+		<flag name="diff">Use for diff command <pkg>dev-util/meld</pkg></flag>
+		<flag name="gedit">Enable plugin for <pkg>app-editors/gedit</pkg></flag>
+		<flag name="nautilus">Enable extension for <pkg>gnome-base/nautilus</pkg></flag>
+		<flag name="thunar">Enable extension for <pkg>xfce-base/thunar</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">rabbitvcs/rabbitvcs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/rabbitvcs/rabbitvcs-0.16-r1.ebuild b/dev-vcs/rabbitvcs/rabbitvcs-0.16-r1.ebuild
new file mode 100644
index 000000000000..f9e95ffff779
--- /dev/null
+++ b/dev-vcs/rabbitvcs/rabbitvcs-0.16-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2-utils distutils-r1 vcs-snapshot
+
+DESCRIPTION="Integrated version control support for your desktop"
+HOMEPAGE="http://rabbitvcs.org"
+SRC_URI="https://github.com/rabbitvcs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caja cli diff gedit git nautilus spell thunar"
+
+RDEPEND="dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pysvn[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	caja? ( dev-python/python-caja[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
+	diff? ( dev-util/meld )
+	gedit? ( app-editors/gedit[${PYTHON_USEDEP}] )
+	git? ( dev-python/dulwich[${PYTHON_USEDEP}] )
+	nautilus? ( >=dev-python/nautilus-python-0.7.0[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
+	spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )
+	thunar? ( dev-python/thunarx-python[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+#	python_convert_shebangs -r 2 .
+
+#	distutils_src_prepare
+
+	# we should not do gtk-update-icon-cache from setup script
+	# we prefer portage for that
+	sed -e 's/"install"/"fakeinstall"/' -i "${S}/setup.py" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use caja ; then
+		python_moduleinto /usr/share/caja-python/extensions
+		python_domodule clients/caja/RabbitVCS.py
+	fi
+	if use cli ; then
+		python_doscript clients/cli/rabbitvcs
+	fi
+	if use gedit ; then
+		python_moduleinto /usr/$(get_libdir)/gedit-2/plugins
+		python_domodule clients/gedit/rabbitvcs-plugin.py
+		insinto /usr/$(get_libdir)/gedit-2/plugins
+		doins clients/gedit/rabbitvcs-gedit2.gedit-plugin
+		python_moduleinto /usr/$(get_libdir)/gedit-2/plugins
+		python_domodule clients/gedit/rabbitvcs-plugin.py
+		insinto /usr/$(get_libdir)/gedit/plugins
+		doins clients/gedit/rabbitvcs-gedit3.plugin
+	fi
+	if use nautilus ; then
+		python_moduleinto /usr/$(get_libdir)/nautilus/extensions-2.0/python
+		python_domodule clients/nautilus/RabbitVCS.py
+		python_moduleinto /usr/share/nautilus-python/extensions
+		python_domodule clients/nautilus-3.0/RabbitVCS.py
+	fi
+	if use thunar ; then
+		python_moduleinto "/usr/$(get_libdir)/thunarx-2/python"
+		python_domodule clients/thunar/RabbitVCS.py
+		python_moduleinto "/usr/$(get_libdir)/thunarx-1/python"
+		python_domodule clients/thunar/RabbitVCS.py
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "You should restart file manager to changes take effect:"
+	use caja && elog "\$ caja -q"
+	use nautilus && elog "\$ nautilus -q"
+	use thunar && elog "\$ thunar -q && thunar &"
+	elog ""
+	elog "Also you should really look at known issues page:"
+	elog "http://wiki.rabbitvcs.org/wiki/support/known-issues"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/dev-vcs/rapidsvn-0.12.1-r3 b/dev-vcs/rapidsvn-0.12.1-r3
deleted file mode 100644
index fcef5867be44..000000000000
--- a/dev-vcs/rapidsvn-0.12.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/apr dev-libs/apr-util dev-vcs/subversion x11-libs/wxGTK:3.0[X] doc? ( dev-libs/libxslt app-text/docbook-sgml-utils app-doc/doxygen app-text/docbook-xsl-stylesheets media-gfx/graphviz ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Cross-platform GUI front-end for the Subversion revision system
-EAPI=5
-HOMEPAGE=http://rapidsvn.tigris.org/
-IUSE=doc static-libs python_targets_python2_7
-KEYWORDS=amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2.1 FDL-1.2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/apr dev-libs/apr-util dev-vcs/subversion x11-libs/wxGTK:3.0[X]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.rapidsvn.org/download/release/0.12.1/rapidsvn-0.12.1.tar.gz doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=8e48a8d7264d6eb0083d9dbe81868761
diff --git a/dev-vcs/rapidsvn/Manifest b/dev-vcs/rapidsvn/Manifest
new file mode 100644
index 000000000000..b2538377aaa1
--- /dev/null
+++ b/dev-vcs/rapidsvn/Manifest
@@ -0,0 +1,8 @@
+AUX rapidsvn-0.12.1-locale.patch 834 BLAKE2B e8080c657627597050b3c0061a465d863526c10338855945578aa578f9c694d57d152870184cbc354d066796a9d21c4202500204cf20f1cf1b86aabe7c2388b5 SHA512 0901b3242edffb128152b9db9982ad446098cc1f21a3b9e41aa8db3217353e8e691091637e609ddf32f23cedbc9007856d900eb53152d34010b1f1b01afbf508
+AUX rapidsvn-0.12.1-subversion1.9-private-api.patch 3602 BLAKE2B 7c49f7e5e92c2d81c9a9a050535d51714fce09b8c8275b1535239bb62978c0191a50b2fb6f0df369cf5714b29ce358589e070bd53d12e8391b089416fe1b96e1 SHA512 90f4f16cfb44d0d7291fdd340be8ca2a86f6fa33353a8af4503abb35e9d91219b9f60319b62f1bbffffde1f6251754b68c120b9fe27939c90543b09955dfac8b
+AUX rapidsvn-0.12.1-svncpp_link.patch 336 BLAKE2B b3db001ce73052c733934298b6e04313b08d5a85f86457ddffb782ffcdfdc85a7db26ba9d3f1d9103b085e4db24912267367f16b167744a47693b0225d99b890 SHA512 abcce45777c2c28b08df772ea69305600b0ee18dbb4cc7aa1bc13ec81c962410a2f9fe8685428115e3c9547e5bf21d2323f2712e6566100e7cbfe2271a95efd4
+AUX rapidsvn-0.12.1-wx3.0.patch 5121 BLAKE2B 85dc9f1ca63d38660c4fe8106d642b818a1aeb4888e14daf3f572fa4e0d97389f18e96e6937474de68675de9592b04f62003074ddfcdf7a774be9a41722f40f4 SHA512 90719ee6f3b7cc9f3446afcca1f5ba27496cb3f1bd8311328b4bc01a02f81de769691825f5cba906183fd060a89a118c776a7cf549569505f0a18c12eb6fc6b9
+DIST rapidsvn-0.12.1.tar.gz 1087511 BLAKE2B c3e32766baab520d4de31387915b79b9199557f01269128853e366c2d75d28727bd220770c2683d78969cc1919c43089d4c2b1b81ca893a0028de4d0b9deb427 SHA512 892dab56e8ec19c5f26a0ddfab378187bc0325275f9fcf759c12beead70aab17876f7e5920bcf214fc86354faef58244ce25926ba010158f7354cd144e1c4c07
+DIST svncpp.dox.xz 1684 BLAKE2B 64725edae989b09b38fa3fff04aa0908356b67ffa8ab50abddf42f2562ccdaa80c9599f5c6790d8b1f2c17d707c227ee6dd8e114e8527362b628463690db17f9 SHA512 6314632b2f6a0f21bdd4644f856c8d60951c30135a82e509a7f929908dacb56462a2fa768c2e45cd7baf99face50fa5d4592a0691cfa1f16335bf64892933589
+EBUILD rapidsvn-0.12.1-r3.ebuild 2648 BLAKE2B 004dfbfe503d58751f5c6aa73810de34958f895a0ae442cf81551d143c958c7fce58d3f734b8d92d74241a461c47b81f1bcdfe5d9e9e60de705658ff60966ef1 SHA512 0d062ca454d71b7cb5c8c78dd9b76f41ba6d26760a64257704627ba86df9218b71f03e21b6607cc229d0f709ed693ea51dbd9c4060e95666046c9c07523139fb
+MISC metadata.xml 389 BLAKE2B 1cb8d2d932e9fed848d341ff6b4f3a43d29ffb2f4465f3ce231344e8a62ab8d3b165bb849fc569d9936c0b8a4ffc0adc975cd3e1ab7eba27c3dfd73748945f5c SHA512 4f5598218e1d473e47a831b414cfe40edb305a903ff5a021b587ebf3687c5f2e2d775ccbbb4db04ff5d67c1533b59952c59652f9e783e6b16812e4afa0611042
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch
new file mode 100644
index 000000000000..e1712df85b19
--- /dev/null
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch
@@ -0,0 +1,23 @@
+--- rapidsvn-0.12.0dfsg.orig/src/locale/Makefile.in
++++ rapidsvn-0.12.0dfsg/src/locale/Makefile.in
+@@ -369,8 +369,7 @@ all: all-mo
+ distclean: clean
+ clean:
+ 	for i in $(RAPIDSVN_LANGUAGES) ; do \
+-		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo ; \
+-		fi ; \
++		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo || true; \
+ 	done
+ .PHONY: all-mo
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- rapidsvn-0.12.0dfsg.orig/src/locale/Makefile.am
++++ rapidsvn-0.12.0dfsg/src/locale/Makefile.am
+@@ -38,7 +38,6 @@ all: all-mo
+ distclean: clean
+ clean:
+ 	for i in $(RAPIDSVN_LANGUAGES) ; do \
+-		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo ; \
+-		fi ; \
++		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo || true; \
+ 	done
+ .PHONY: all-mo
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch
new file mode 100644
index 000000000000..7c84c8d481fd
--- /dev/null
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch
@@ -0,0 +1,129 @@
+Fix compile errors due to hiding of private API in subversion 1.9.
+See also:
+  https://bugs.gentoo.org/show_bug.cgi?id=558572
+  https://slackbuilds.org/cgit/slackbuilds/commit/?id=c2df77021b476ca9484772361003df04fa03038a
+  https://github.com/RapidSVN/RapidSVN/issues/6
+
+--- rapidsvn-0.12.1/src/svncpp/client_ls.cpp
++++ rapidsvn-0.12.1/src/svncpp/client_ls.cpp
+@@ -29,6 +29,7 @@
+ #include "svn_client.h"
+ #include "svn_path.h"
+ #include "svn_sorts.h"
++#include "svn_version.h"
+ //#include "svn_utf.h"
+ 
+ // svncpp
+@@ -37,6 +38,8 @@
+ #include "svncpp/exception.hpp"
+ 
+ 
++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
++
+ static int
+ compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
+ {
+@@ -90,6 +93,72 @@
+   }
+ }
+ 
++#else
++
++#include <algorithm>
++
++static svn_error_t* store_entry(
++        void *baton,
++        const char *path,
++        const svn_dirent_t *dirent,
++        const svn_lock_t *,
++        const char *abs_path,
++        const char *,
++        const char *,
++        apr_pool_t *scratch_pool)
++{
++  svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
++  if (path[0] == '\0') {
++    if (dirent->kind == svn_node_file) {
++      // for compatibility with svn_client_ls behaviour, listing a file
++      // stores that file name
++      entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
++    }
++  } else {
++    entries->push_back(svn::DirEntry(path, dirent));
++  }
++  return SVN_NO_ERROR;
++}
++
++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
++{
++  return svn_path_compare_paths(a.name(), b.name()) < 0;
++}
++
++namespace svn
++{
++  DirEntries
++  Client::list(const char * pathOrUrl,
++               svn_opt_revision_t * revision,
++               bool recurse) throw(ClientException)
++  {
++    Pool pool;
++    DirEntries entries;
++
++    svn_error_t * error =
++      svn_client_list3(pathOrUrl,
++                       revision,
++                       revision,
++                       SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
++                       SVN_DIRENT_ALL,
++                       FALSE, // fetch locks
++                       FALSE, // include externals
++                       &store_entry,
++                       &entries,
++                       *m_context,
++                       pool);
++
++    if (error != SVN_NO_ERROR)
++      throw ClientException(error);
++
++    std::sort(entries.begin(), entries.end(), &sort_by_path);
++
++    return entries;
++  }
++}
++
++#endif
++
+ /* -----------------------------------------------------------------
+  * local variables:
+  * eval: (load-file "../../rapidsvn-dev.el")
+--- rapidsvn-0.12.1/include/svncpp/dirent.hpp
++++ rapidsvn-0.12.1/include/svncpp/dirent.hpp
+@@ -41,7 +41,7 @@
+     /**
+      * constructor for existing @a svn_dirent_t entries
+      */
+-    DirEntry(const char * name, svn_dirent_t * dirEntry);
++    DirEntry(const char * name, const svn_dirent_t * dirEntry);
+ 
+     /**
+      * copy constructor
+--- rapidsvn-0.12.1/src/svncpp/dirent.cpp
++++ rapidsvn-0.12.1/src/svncpp/dirent.cpp
+@@ -47,7 +47,7 @@
+     {
+     }
+ 
+-    Data(const char * _name, svn_dirent_t * dirEntry)
++    Data(const char * _name, const svn_dirent_t * dirEntry)
+         : name(_name), kind(dirEntry->kind), size(dirEntry->size),
+         hasProps(dirEntry->has_props != 0),
+         createdRev(dirEntry->created_rev), time(dirEntry->time)
+@@ -78,7 +78,7 @@
+   {
+   }
+ 
+-  DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
++  DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
+       : m(new Data(name, DirEntry))
+   {
+   }
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
new file mode 100644
index 000000000000..e26ecda15d9b
--- /dev/null
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
@@ -0,0 +1,12 @@
+Index: src/svncpp/Makefile.am
+===================================================================
+--- rapidsvn-0.12.1/src/svncpp/Makefile.am	(revision 7100)
++++ rapidsvn-0.12.1/src/svncpp/Makefile.am	(working copy)
+@@ -27,3 +27,7 @@
+ 	url.cpp \
+ 	wc.cpp
+ 
++libsvncpp_la_LIBADD= $(SVN_LIBS) \
++	$(NEON_LIBS) \
++	$(APR_LIBS) \
++	-lstdc++
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch
new file mode 100644
index 000000000000..2862e30b21fd
--- /dev/null
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch
@@ -0,0 +1,192 @@
+Description: Update for wx 3.0.0
+ Update configure to recognise that wx 3.0.0 >= 2.4.2.
+ Fix code for wx API changes.
+Author: Olly Betts <olly@survex.com>
+Origin: debian
+Forwarded: no
+Last-Update: 2014-04-10
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -171,6 +171,8 @@
+         ;;
+     [2.[5-9].*])
+ 	;;
++    3.*)
++	;;
+     *)
+         AC_MSG_ERROR([wxWidgets >= 2.4.2 required, found version $WX_VERSION])
+ 	AC_MSG_ERROR([Try --with-wx-config.])
+--- a/src/filelist_ctrl.cpp
++++ b/src/filelist_ctrl.cpp
+@@ -1029,7 +1029,7 @@
+ 
+     // Workaround for issue 324 (only local+non-flat+update):
+     //   we chdir to the requested dir and pass "." to svn
+-    if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode)
++    if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode && !m->Path.empty())
+     {
+       m->IsRelative = true;
+       ::wxSetWorkingDirectory(m->Path);
+@@ -1606,7 +1606,7 @@
+   }
+ }
+ 
+-inline void
++bool
+ FileListCtrl::SetColumnWidth(const int col, const int width)
+ {
+   m->ColumnWidth[col] = width;
+@@ -1614,8 +1614,9 @@
+   int index = m->ColumnIndex[col];
+   if (index != -1)
+   {
+-    wxListCtrl::SetColumnWidth(index, width);
++    return wxListCtrl::SetColumnWidth(index, width);
+   }
++  return false;
+ }
+ 
+ int
+--- a/src/filelist_ctrl.hpp
++++ b/src/filelist_ctrl.hpp
+@@ -118,7 +118,7 @@
+    * @param col column number
+    * @param width
+    */
+-  void
++  bool
+   SetColumnWidth(const int col, const int width);
+ 
+   /**
+--- a/src/hist_val.cpp
++++ b/src/hist_val.cpp
+@@ -113,7 +113,7 @@
+       }
+ 
+       // if we have an entry, select it
+-      if (!comboBox->IsEmpty())
++      if (!comboBox->IsListEmpty())
+         comboBox->SetSelection(0, 0);
+     }
+ 
+--- a/src/listener.cpp
++++ b/src/listener.cpp
+@@ -167,7 +167,7 @@
+     wxMutexLocker lock(mutex);
+     wxString localCertFile = wxFileSelector(
+                                _("Select Certificate File"), wxT(""), wxT(""), wxT(""),
+-                               wxT("*.*"), wxOPEN | wxFILE_MUST_EXIST, parent);
++                               wxT("*.*"), wxFD_OPEN | wxFD_FILE_MUST_EXIST, parent);
+     LocalToUtf8(localCertFile, certFile);
+ 
+     dataReceived = !localCertFile.empty();
+--- a/src/log_dlg.cpp
++++ b/src/log_dlg.cpp
+@@ -211,7 +211,7 @@
+ 
+     for (size_t idx = 0; idx < str.Length(); idx++)
+     {
+-      switch (str[idx])
++      switch ((wchar_t)str[idx])
+       {
+       case wxT('\r'):
+       case wxT('\n'):
+--- a/src/preferences_dlg.cpp
++++ b/src/preferences_dlg.cpp
+@@ -126,7 +126,7 @@
+ PreferencesDlg::SelectExecutable(const wxString & title, wxTextCtrl * textCtrl)
+ {
+   wxFileDialog dlg(this, title, wxEmptyString, wxEmptyString,
+-                   EXECUTABLE_WILDCARD, wxOPEN);
++                   EXECUTABLE_WILDCARD, wxFD_OPEN);
+   dlg.SetPath(textCtrl->GetValue());
+ 
+   if (dlg.ShowModal() != wxID_OK)
+--- a/src/verblist.cpp
++++ b/src/verblist.cpp
+@@ -71,7 +71,7 @@
+ const wxString &
+ VerbList::GetName(size_t /*index*/) const
+ {
+-  return wxT("");
++  return wxEmptyString;
+ }
+ 
+ 
+--- a/src/checkout_action.cpp
++++ b/src/checkout_action.cpp
+@@ -120,7 +120,8 @@
+       pegRevision = svn::Revision(revnum);
+   }
+ 
+-  wxSetWorkingDirectory(m_data.DestFolder);
++  if (!m_data.DestFolder.empty())
++    wxSetWorkingDirectory(m_data.DestFolder);
+ 
+   svn::Path repUrlUtf8(PathUtf8(m_data.RepUrl));
+   svn::Path destFolderUtf8(PathUtf8(dest_folder));
+--- a/src/action.cpp
++++ b/src/action.cpp
+@@ -218,7 +218,9 @@
+ bool
+ Action::Prepare()
+ {
+-  wxSetWorkingDirectory(Utf8ToLocal(m->path.c_str()));
++  const wxString & dir = Utf8ToLocal(m->path.c_str());
++  if (!dir.empty())
++    wxSetWorkingDirectory(dir);
+ 
+   return true;
+ }
+--- a/src/cleanup_action.cpp
++++ b/src/cleanup_action.cpp
+@@ -52,7 +52,9 @@
+   svn::Client client(GetContext());
+   const svn::Path & path = GetPath();
+ 
+-  wxSetWorkingDirectory(Utf8ToLocal(path.c_str()));
++  const wxString & dir = Utf8ToLocal(path.c_str());
++  if (!dir.empty())
++    wxSetWorkingDirectory(dir);
+   client.cleanup(path.c_str());
+ 
+   return true;
+--- a/src/export_action.cpp
++++ b/src/export_action.cpp
+@@ -111,7 +111,8 @@
+       pegRevision = svn::Revision(revnum);
+   }
+ 
+-  wxSetWorkingDirectory(m_data.DestPath);
++  if (!m_data.DestPath.empty())
++    wxSetWorkingDirectory(m_data.DestPath);
+ 
+   svn::Path srcPathUtf8(PathUtf8(m_data.SrcPath));
+   svn::Path destPathUtf8(PathUtf8(m_data.DestPath));
+--- a/src/get_action.cpp
++++ b/src/get_action.cpp
+@@ -56,7 +56,9 @@
+              m_data.revision.revnum());
+   Trace(msg);
+ 
+-  wxSetWorkingDirectory(Utf8ToLocal(GetPath().c_str()));
++  const wxString & dir = Utf8ToLocal(GetPath().c_str());
++  if (!dir.empty())
++    wxSetWorkingDirectory(dir);
+   client.update(svn::Path(LocalToUtf8(m_data.path)),
+                 m_data.revision,
+                 true, false);
+--- a/src/update_action.cpp
++++ b/src/update_action.cpp
+@@ -75,7 +75,9 @@
+     }
+   }
+ 
+-  wxSetWorkingDirectory(Utf8ToLocal(GetPath().c_str()));
++  const wxString & dir = Utf8ToLocal(GetPath().c_str());
++  if (!dir.empty())
++    wxSetWorkingDirectory(dir);
+   svn::Client client(GetContext());
+ 
+   client.update(GetTargets(), revision, m_data.recursive,
diff --git a/dev-vcs/rapidsvn/metadata.xml b/dev-vcs/rapidsvn/metadata.xml
new file mode 100644
index 000000000000..0302c7d43632
--- /dev/null
+++ b/dev-vcs/rapidsvn/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+RapidSVN is a cross-platform GUI front-end for the Subversion revision 
+system written in C++ using the wxWidgets framework. This project also 
+includes a Subversion client C++ API.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
new file mode 100644
index 000000000000..b9d42abac214
--- /dev/null
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER=3.0
+
+inherit autotools eutils fdo-mime flag-o-matic python-single-r1 versionator wxwidgets
+
+MY_PV=$(get_version_component_range 1-2)
+MY_REL="1"
+
+DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
+HOMEPAGE="http://rapidsvn.tigris.org/"
+SRC_URI="
+	http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz
+	doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )"
+
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEP="
+	${PYTHON_DEPS}
+	dev-libs/apr
+	dev-libs/apr-util
+	dev-vcs/subversion
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${COMMON_DEP}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-sgml-utils
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		media-gfx/graphviz
+	)"
+RDEPEND="${COMMON_DEP}"
+
+DOCS=( HACKING.txt TRANSLATIONS )
+
+src_prepare() {
+	need-wxwidgets unicode
+	if use doc; then
+		mv "${WORKDIR}"/svncpp.dox doc/svncpp/ || die
+	fi
+	strip-linguas $(grep ^RAPIDSVN_LANGUAGES src/locale/Makefile.am | sed 's:RAPIDSVN_LANGUAGES=::g')
+	sed \
+		-e "/^RAPIDSVN_LANGUAGES/s:=.*:=${LINGUAS}:g" \
+		-i src/locale/Makefile.am || die
+
+	mv configure.in configure.ac || die
+	epatch "${FILESDIR}/${P}-svncpp_link.patch"
+	epatch "${FILESDIR}/${P}-locale.patch"
+	epatch "${FILESDIR}/${P}-wx3.0.patch"
+	epatch "${FILESDIR}/${P}-subversion1.9-private-api.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags $( apr-1-config --cppflags )
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with doc manpage) \
+		$(use_with doc xsltproc) \
+		$(use_with doc doxygen) \
+		$(use_with doc dot) \
+		--with-wx-config="${WX_CONFIG}" \
+		--with-svn-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-svn-include="${EPREFIX}/usr/include" \
+		--with-apr-config="${EPREFIX}/usr/bin/apr-1-config" \
+		--with-apu-config="${EPREFIX}/usr/bin/apu-1-config"
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc/manpage manpage
+}
+
+src_install() {
+	default
+
+	doicon src/res/rapidsvn.ico src/res/bitmaps/${PN}*.png
+	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
+		"${EPREFIX}/usr/share/pixmaps/rapidsvn_32x32.png" \
+		"RevisionControl;Development"
+
+	if use doc ; then
+		doman doc/manpage/${PN}.1
+		dodoc doc/svncpp/html/*
+	fi
+
+	prune_libtool_files
+}
+
+src_test() {
+	pushd src/tests/svncpp > /dev/null || die
+	default
+	./svncpptest | grep OK || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-vcs/rcs-5.8.2 b/dev-vcs/rcs-5.8.2
deleted file mode 100644
index 1b39758cf3f4..000000000000
--- a/dev-vcs/rcs-5.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Revision Control System
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/rcs/
-IUSE=doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=sys-apps/diffutils
-SLOT=0
-SRC_URI=mirror://gnu/rcs/rcs-5.8.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80d7b6be333ee3a56190b11ee1fe5ab6
diff --git a/dev-vcs/rcs-5.9.3 b/dev-vcs/rcs-5.9.3
deleted file mode 100644
index 3f1782f13090..000000000000
--- a/dev-vcs/rcs-5.9.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-apps/diffutils sys-apps/ed
-DESCRIPTION=Revision Control System
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/rcs/
-IUSE=doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=sys-apps/diffutils sys-apps/ed
-SLOT=0
-SRC_URI=mirror://gnu/rcs/rcs-5.9.3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46a668925b5ca86a37e476610060a02c
diff --git a/dev-vcs/rcs-5.9.4 b/dev-vcs/rcs-5.9.4
deleted file mode 100644
index 56eb6a0abc70..000000000000
--- a/dev-vcs/rcs-5.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-apps/diffutils sys-apps/ed
-DESCRIPTION=Revision Control System
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/rcs/
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=sys-apps/diffutils sys-apps/ed
-SLOT=0
-SRC_URI=mirror://gnu/rcs/rcs-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b3c85e104c58044fa6e5d9fd1de2d3b4
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
new file mode 100644
index 000000000000..ea20574cce7f
--- /dev/null
+++ b/dev-vcs/rcs/Manifest
@@ -0,0 +1,7 @@
+DIST rcs-5.8.2.tar.gz 1209822 BLAKE2B 48eb7f5dd0d1c1433acb85e7623c1a99a59d2e5fa8b6933b598cec5f20136dc8b370aaa3e3d5dac96e524a98b4380b85d7efd765049a8134d7b293980eeb7d74 SHA512 59bfdb57d1e361f01b6682aae99115e5b181ee429e4d49bf1eadd7c7d24abf8547f7368a608d5aac480ca2b8a095ca3d1b56723ba308c15aa5c612676088c374
+DIST rcs-5.9.3.tar.xz 800736 BLAKE2B aa3f17555e5b65a9d65dfa781f2e12496e282128d9412529f67a831b5d6035302a6f70c4fe0b9d9519a2bf02fc5a98d03f4aa3b86696fd27874bfa7549e8c8a3 SHA512 99b124a94f285d8c675a2a51397ca4a97468f053d42aecf543e9266f16aea6b2667613f565c3462ffd2350c28e22baa4d01d598e2cc7e1e940625086f6de0ba6
+DIST rcs-5.9.4.tar.xz 801360 BLAKE2B 18cb97aae7a70f9f12b1018d6b6b42fbc06dd96b491caa7ee5ae2a4a746339e22ffc93ead5756add62f8a08d5cd1ec589c242f0a75e9d78aff29b95114869b25 SHA512 c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
+EBUILD rcs-5.8.2.ebuild 777 BLAKE2B 9d25571be91520b0ae1cb6ceae921a1d0e7c09c7bf80b965f97ef53fe52cc7b49e6ed7775663002702762dbeebfe0e40766e6b4a51a36a50d783d7fd3d9599a7 SHA512 510ce2c4dc570a4cefbb1a5caee03699c70caab09ee8c06da56fdf63a03867c6885d066378ccdd729542f1087a6f3ecc4426ed0a65a37d6fa6f482f1ed142763
+EBUILD rcs-5.9.3.ebuild 903 BLAKE2B 800b719465709ad38a2ed49f97bec87023846f0c7d32056cd414c5f97fe692b4788bbc337c7141362cdbee743f54aab67a080c2826e11f3214ab6d2e565dc7f8 SHA512 a7fcadd7bfe288e3106552fb9d1136a476ce73aa809e3a918fcce3bde4a138be3f316e8152065c6e2e788f1804d38fc974381b3b650a42935208c0c0c4f31832
+EBUILD rcs-5.9.4.ebuild 913 BLAKE2B 43f2e4a5af99e1d942871a3c6922175d06349ea7a70d2fed3ce6230047885ba321c3d70306826c57eb94d52fa8eaa63a3527813f992e502906b6a9504f02eca4 SHA512 c4c4ff4041dc3fa30fc5866d308b1bc324415a891e159b91b3389e134f16652f3d4b9840b57b8f23d452ca83be73e43d05b41e4044e05517ea2b9c631fc6f0d0
+MISC metadata.xml 614 BLAKE2B 053b53062b14bba99cb48bc2c19af60ae78c8e0bebb378f6c7c8e6a3d5b9b5b8950d165c7c582d7c8df34c98c12a86e1666f2a7ab38c4fe1fa915cbe4fba00ed SHA512 db77e48d0c4775308f57044e38b8e41c4cd110b42c4a2c305b8d7d719d1885418c1fd534383fec0ed9c38d4be1bf731dd6d00c064afdd3ea0fae9c432bdd4c3b
diff --git a/dev-vcs/rcs/metadata.xml b/dev-vcs/rcs/metadata.xml
new file mode 100644
index 000000000000..2fb1872a15b3
--- /dev/null
+++ b/dev-vcs/rcs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<longdescription>
+		The Revision Control System (RCS) is a system for managing
+		multiple versions of files. RCS automates the storage, retrieval,
+		logging, identification and merging of file revisions. RCS is useful
+		for text files that are revised frequently (for example, programs,
+		documentation, graphics, papers and form letters).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/rcs/rcs-5.8.2.ebuild b/dev-vcs/rcs/rcs-5.8.2.ebuild
new file mode 100644
index 000000000000..ba609ed52b45
--- /dev/null
+++ b/dev-vcs/rcs/rcs-5.8.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Revision Control System"
+HOMEPAGE="https://www.gnu.org/software/rcs/"
+SRC_URI="mirror://gnu/rcs/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc"
+
+RDEPEND="sys-apps/diffutils"
+
+src_prepare() {
+	sed -i \
+		-e '/gets is a security hole/d' \
+		lib/stdio.in.h || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use doc; then
+		emake DESTDIR="${D}" install-html
+		rm -R "${ED}/usr/share/doc/rcs"
+		dohtml -r doc/rcs.html/
+	fi
+}
diff --git a/dev-vcs/rcs/rcs-5.9.3.ebuild b/dev-vcs/rcs/rcs-5.9.3.ebuild
new file mode 100644
index 000000000000..298b1d364618
--- /dev/null
+++ b/dev-vcs/rcs/rcs-5.9.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Revision Control System"
+HOMEPAGE="https://www.gnu.org/software/rcs/"
+SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc"
+
+RDEPEND="
+	sys-apps/diffutils
+	sys-apps/ed"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e '/gets is a security hole/d' \
+		lib/stdio.in.h || die
+}
+
+src_configure() {
+	append-flags -std=gnu99
+	econf
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog NEWS README
+
+	if use doc; then
+		emake -C doc html
+		rm -R "${ED}/usr/share/doc/rcs"
+		mv doc/rcs.html doc/html
+		dodoc -r doc/html/
+	fi
+}
diff --git a/dev-vcs/rcs/rcs-5.9.4.ebuild b/dev-vcs/rcs/rcs-5.9.4.ebuild
new file mode 100644
index 000000000000..7740f1422be6
--- /dev/null
+++ b/dev-vcs/rcs/rcs-5.9.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Revision Control System"
+HOMEPAGE="https://www.gnu.org/software/rcs/"
+SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc"
+
+RDEPEND="
+	sys-apps/diffutils
+	sys-apps/ed"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e '/gets is a security hole/d' \
+		lib/stdio.in.h || die
+}
+
+src_configure() {
+	append-flags -std=gnu99
+	econf
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog NEWS README
+
+	if use doc; then
+		emake -C doc html
+		rm -R "${ED}/usr/share/doc/rcs"
+		mv doc/rcs.html doc/html
+		dodoc -r doc/html/
+	fi
+}
diff --git a/dev-vcs/rcsi-0.5 b/dev-vcs/rcsi-0.5
deleted file mode 100644
index b5f5aef311f9..000000000000
--- a/dev-vcs/rcsi-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-apps/sed
-DESCRIPTION=A program to give information about RCS files
-EAPI=4
-HOMEPAGE=http://www.colinbrough.pwp.blueyonder.co.uk/rcsi.README.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/rcs-5.7-r2
-SLOT=0
-SRC_URI=http://www.colinbrough.pwp.blueyonder.co.uk/rcsi-0.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e24109d7d6651891d877b5834021204a
diff --git a/dev-vcs/rcsi/Manifest b/dev-vcs/rcsi/Manifest
new file mode 100644
index 000000000000..26914810c44d
--- /dev/null
+++ b/dev-vcs/rcsi/Manifest
@@ -0,0 +1,3 @@
+DIST rcsi-0.5.tar.gz 68705 BLAKE2B 7ed066463d65ad60056114f15b069667365c222c6389f7301916f609b557a3a36a198be8520dcf614481083988ee06d0bffc2a72df55196b00bb8cf1463363f5 SHA512 4b9cf2bc9232fdad45461de1f2eca06958a26f2cfd1bb823be465102a152f31405aa611da922be5ebd9c83ff6efa62784fe9954563dee980befe1acd9c032f72
+EBUILD rcsi-0.5.ebuild 658 BLAKE2B 6434ee29cfffe468d9d3a615273472b5ed4c0ffbd6954f295d5e1a5c56b907967d99a4d6cd6b876e3c35034e270877734be3be8b193864d874933c8d4cd0c6c5 SHA512 041bd1d29a1e40d436c80f2cf9b8faa463014e4937eb172f568972b7f70a1566605b25ea79d6c8455ea22371beeece64ccaba02ab7ce1a311ecd345c7026ec47
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-vcs/rcsi/metadata.xml b/dev-vcs/rcsi/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/dev-vcs/rcsi/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/rcsi/rcsi-0.5.ebuild b/dev-vcs/rcsi/rcsi-0.5.ebuild
new file mode 100644
index 000000000000..cd4a10ad87e1
--- /dev/null
+++ b/dev-vcs/rcsi/rcsi-0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="A program to give information about RCS files"
+HOMEPAGE="http://www.colinbrough.pwp.blueyonder.co.uk/rcsi.README.html"
+SRC_URI="http://www.colinbrough.pwp.blueyonder.co.uk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=">=dev-vcs/rcs-5.7-r2"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	$(tc-getCC) $CFLAGS $LDFLAGS rcsi.c -o rcsi || die "Compile failed"
+}
+
+src_install() {
+	dobin rcsi
+	doman rcsi.1
+	dodoc README
+	dohtml README.html example{1,2}.png
+}
diff --git a/dev-vcs/rsvndump-0.6 b/dev-vcs/rsvndump-0.6
deleted file mode 100644
index a1eedc297da6..000000000000
--- a/dev-vcs/rsvndump-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-vcs/subversion dev-libs/apr dev-libs/apr-util sys-devel/gettext doc? ( app-text/xmlto >=app-text/asciidoc-8.4 )
-DESCRIPTION=Dump a remote Subversion repository
-EAPI=7
-HOMEPAGE=http://rsvndump.sourceforge.net
-IUSE=debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ BSD public-domain
-RDEPEND=dev-vcs/subversion dev-libs/apr dev-libs/apr-util sys-devel/gettext
-SLOT=0
-SRC_URI=mirror://sourceforge/rsvndump/rsvndump-0.6.tar.bz2
-_md5_=73df324e817229cac9aaec1fd31ce46e
diff --git a/dev-vcs/rsvndump/Manifest b/dev-vcs/rsvndump/Manifest
new file mode 100644
index 000000000000..399e9b5efe6b
--- /dev/null
+++ b/dev-vcs/rsvndump/Manifest
@@ -0,0 +1,3 @@
+DIST rsvndump-0.6.tar.bz2 220891 BLAKE2B 97792a13beb0a37452df941599a753297f0322d04608e86da0740cb553a9da7d1a2f9b6e712c15698ae9d5f2c8d4911d8bed45e66c58ca46b2d1b0c29ec4f275 SHA512 cadb10b48e66be1ea562fa6b96460b5c864e2f16a1e0d5fbb4be4d31023b6d5dfa978634900b1649530a12335eb712032d9d9cc82f663737581521121d3b2120
+EBUILD rsvndump-0.6.ebuild 608 BLAKE2B 43a8bdbf78d8501eb4c134d43e42ef66d9881559e9fb4b5d773600f315e8313528ddf47ab40f40419253bd2540f1e60f8a99145b155b417270c296a7e90dd398 SHA512 5a3a6b80f598568a6763d9be4138c77149e5803b0cc8adaf5f3421aab5d13a93fe1bb89db21038c8c57c6c3c0a88399bd6217ff835ab4ecd4ab3d85826f548fe
+MISC metadata.xml 327 BLAKE2B 0ca261a8df3086ea9173f80e74a58f39300002f01fe7202e6c354bc01c3beb91a0984e9151f4ac97fc3bf36db0f1281dab8fc38cee8134c93813eef2012bb3f6 SHA512 e2369924ca25cbb5c415f5aaabc86420e0a7d051a9409b9031a16bc489c3146b63d9e119b6128bb3cd82843bce740b32e9b4138a407330fc5059b4f5fe59aba2
diff --git a/dev-vcs/rsvndump/metadata.xml b/dev-vcs/rsvndump/metadata.xml
new file mode 100644
index 000000000000..47d01a8e9fa1
--- /dev/null
+++ b/dev-vcs/rsvndump/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rsvndump</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/rsvndump/rsvndump-0.6.ebuild b/dev-vcs/rsvndump/rsvndump-0.6.ebuild
new file mode 100644
index 000000000000..0fd269ce1768
--- /dev/null
+++ b/dev-vcs/rsvndump/rsvndump-0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dump a remote Subversion repository"
+HOMEPAGE="http://rsvndump.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3+ BSD public-domain"  # rsvndump, snappy-c, critbit89
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="dev-vcs/subversion
+	dev-libs/apr
+	dev-libs/apr-util
+	sys-devel/gettext"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto
+		>=app-text/asciidoc-8.4 )"
+
+src_configure() {
+	econf \
+		$(use_enable doc man) \
+		$(use_enable debug)
+}
diff --git a/dev-vcs/stgit-0.16-r2 b/dev-vcs/stgit-0.16-r2
deleted file mode 100644
index bf9f3dce5025..000000000000
--- a/dev-vcs/stgit-0.16-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-vcs/git-1.6.3.3 doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Manage a stack of patches using GIT as a backend
-EAPI=5
-HOMEPAGE=http://www.procode.org/stgit/
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/stgit/stgit-0.16.tar.gz mirror://gentoo/stgit-0.16-missing-patches.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b4d21f18d6283fde808f3b36183521c1
diff --git a/dev-vcs/stgit-0.18 b/dev-vcs/stgit-0.18
deleted file mode 100644
index d32f4cd30daa..000000000000
--- a/dev-vcs/stgit-0.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-vcs/git-1.6.3.3 doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Manage a stack of patches using GIT as a backend
-EAPI=6
-HOMEPAGE=http://www.procode.org/stgit/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ctmarinas/stgit/archive/v0.18.tar.gz -> stgit-0.18.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e713415a855b5b4f6ce1c6b749fdd7d
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
new file mode 100644
index 000000000000..34c5caafebe1
--- /dev/null
+++ b/dev-vcs/stgit/Manifest
@@ -0,0 +1,8 @@
+AUX stgit-0.16-asciidoc-compat.patch 561 BLAKE2B a12cba6e1f07623ed82d2aa48ce9f840a4e3759040211645b3c718a29a1fca126b1493b0b154f699f4b26d08f49ecab4ce0bc506bcc33421bb75070d8fca8c8a SHA512 f5a4a260b5b732332a4157a82d7bd153971d0a41c55ce8c38beb58f85a989d7636ec3ff15dc3161d4c5775a392840d4970437abf4fd8c741cdcdf509fd826329
+AUX stgit-0.16-man-linkfix.patch 429 BLAKE2B 11cd98b7a58a55fed445be700bc492a4fd926b9bac20a54e095b9c9470d6294a4c32800622b42e87ff10908a40a2bf71e8e139dc306ade3b4989c10609dcceaa SHA512 c71e32a6e6b007ebbbe738dae93bf2109d2be1ed3f3418c98c6ff6ebb602fb8523f974160276649bb66745340d752d69e87c9f0730ca3dd595a6b2b32a0104df
+DIST stgit-0.16-missing-patches.tar.gz 1667 BLAKE2B 3aa26305b948c49bde0aec71e9698f9c1822c26e1f15ceba99c4725eaa35eee6a7a5335f0bfe6e43e89be62c304e1eebe2ffdaa0a5b7fdc0da3e13244505abaf SHA512 29d4c3e68121654153b4e5142dd70d818737b09bbc8371d644a36dd9d18afaf78fdda91bc16f953c330bcbae19084384d8bcd216cdfe674df784e33165186db1
+DIST stgit-0.16.tar.gz 362687 BLAKE2B 4d6579d39d8a22929d70268ae07bf7c5ac17eae21c615aac0ae8e9adb146aa87a3f7d1b057fd7269175c363ef5057f4ce24f6ef1087f54dfb1165f2800a813cf SHA512 782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd
+DIST stgit-0.18.tar.gz 235852 BLAKE2B ff35856c1f20a6a611a2faa22ba573b1c33636c9e913322456011c4c5a73c3207ddbd8bfe41cb81b11dffe8db8b89594c1598989ae9fb896cd686594a21d96b2 SHA512 5820cc1a8cdd5183fbe309b4b80568098844ff57934c75a43263b5cfcdac4b64e015abc9ed6a53dd856236d76bd0ebeec31e87561bca0d0d82a6e5ec7a10745f
+EBUILD stgit-0.16-r2.ebuild 1732 BLAKE2B 2be40c1d991060b15413ae0c718b7b8793c1f8458fa0c52fc45e2e62568566975ac2c15c12b1f8065b475d9753f39dd92ae8095ee8c971c638d008da64ab82d3 SHA512 015a83ab10571d9000f0394c2173a56feac071ca6680ec9b4ee6b6e7c4be3a6e098a231be71bac87ddec9dfc415808f0a86dd30c4bb142493358d8558810cc0a
+EBUILD stgit-0.18.ebuild 1892 BLAKE2B e1465b92146958a500666e23ce4925c867759afab76a1dfe32cf7ab087650a71eb00326ff9d5306ba92a2ba5c0b5e46a963470cab74035651aebbe373851ee14 SHA512 9c2ca4be361b2b0b78711a48b069d00ec2ea52e9197303d7f3763724ce07201d2ca5bff6bcde793bddae7f3c5ec66f80e06d0bf73360133d51e91de985cdd397
+MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch b/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch
new file mode 100644
index 000000000000..4386953a3ef6
--- /dev/null
+++ b/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch
@@ -0,0 +1,13 @@
+diff -urN stgit-0.16.orig/Documentation/asciidoc.conf stgit-0.16/Documentation/asciidoc.conf
+--- stgit-0.16.orig/Documentation/asciidoc.conf	2012-01-09 13:12:42.000000000 -0800
++++ stgit-0.16/Documentation/asciidoc.conf	2012-07-06 04:31:38.279051055 -0700
+@@ -100,3 +100,9 @@
+ [linkstgsub-inlinemacro]
+ <a href="stg-{target}.html">{target}</a>
+ endif::backend-xhtml11[]
++
++[macros]
++# regexen to match macro templates above
++(?P<name>linkman):(?P<target>\w+)\[(?P<attrlist>\d+)]=
++(?P<name>linkstgsub):(?P<target>\w+)\[]=
++(?P<name>linkstg):(?P<target>\w+)\[]=
diff --git a/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch b/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch
new file mode 100644
index 000000000000..559cf8fa789a
--- /dev/null
+++ b/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch
@@ -0,0 +1,11 @@
+--- a/Documentation/Makefile	2012-07-08 23:55:38.958779174 +0200
++++ b/Documentation/Makefile	2012-07-08 23:56:42.638010483 +0200
+@@ -72,7 +72,7 @@
+ 	$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $<
+ 
+ %.1 : %.xml
+-	xmlto -m callouts.xsl man $<
++	xmlto -m callouts.xsl --stringparam man.base.url.for.relative.links=$(htmldir) man $<
+ 
+ %.xml : %.txt
+ 	$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf $<
diff --git a/dev-vcs/stgit/metadata.xml b/dev-vcs/stgit/metadata.xml
new file mode 100644
index 000000000000..4f503c94254e
--- /dev/null
+++ b/dev-vcs/stgit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/stgit/stgit-0.16-r2.ebuild b/dev-vcs/stgit/stgit-0.16-r2.ebuild
new file mode 100644
index 000000000000..07c880d7990f
--- /dev/null
+++ b/dev-vcs/stgit/stgit-0.16-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Manage a stack of patches using GIT as a backend"
+HOMEPAGE="http://www.procode.org/stgit/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-missing-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-vcs/git-1.6.3.3"
+
+# NOTE: It seems to be quite important which asciidoc version to use.
+# So keep an eye on it for the future.
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asciidoc-compat.patch"
+	"${FILESDIR}/${P}-man-linkfix.patch"
+)
+
+pkg_setup() {
+	if ! use doc; then
+		echo
+		ewarn "Manpages will not be built and installed."
+		ewarn "Enable the 'doc' useflag, if you want them."
+		echo
+	fi
+}
+
+python_prepare_all() {
+	# this will be a noop, as we are working with a tarball,
+	# but throws git errors --> just get rid of it
+	sed -i -e 's/version\.write_builtin_version()//' setup.py || die
+
+	# Workaround hardcoded prefix
+	sed -i -e "/prefix/s|/usr|${EPREFIX}/usr|" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			doc
+	fi
+}
+
+python_install_all() {
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			install-doc install-html
+	fi
+
+	distutils-r1_python_install_all
+
+	newbashcomp stgit-completion.bash 'stg'
+}
diff --git a/dev-vcs/stgit/stgit-0.18.ebuild b/dev-vcs/stgit/stgit-0.18.ebuild
new file mode 100644
index 000000000000..e56d0dbace52
--- /dev/null
+++ b/dev-vcs/stgit/stgit-0.18.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Manage a stack of patches using GIT as a backend"
+HOMEPAGE="http://www.procode.org/stgit/"
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${UPSTREAM_PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-vcs/git-1.6.3.3"
+
+# NOTE: It seems to be quite important which asciidoc version to use.
+# So keep an eye on it for the future.
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.16-man-linkfix.patch"
+)
+
+pkg_setup() {
+	if ! use doc; then
+		echo
+		ewarn "Manpages will not be built and installed."
+		ewarn "Enable the 'doc' useflag, if you want them."
+		echo
+	fi
+}
+
+python_prepare_all() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && \
+		eapply "${WORKDIR}"/patches-upstream
+
+	# this will be a noop, as we are working with a tarball,
+	# but throws git errors --> just get rid of it
+	sed -i -e 's/version\.write_builtin_version()//' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	# bug 526468
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			doc
+	fi
+}
+
+src_install() {
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			install-doc install-html
+	fi
+
+	distutils-r1_src_install
+
+	newbashcomp stgit-completion.bash 'stg'
+}
diff --git a/dev-vcs/subversion-1.10.0 b/dev-vcs/subversion-1.10.0
deleted file mode 100644
index 668869d01402..000000000000
--- a/dev-vcs/subversion-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Advanced version control system
-EAPI=6
-HOMEPAGE=https://subversion.apache.org/
-IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
-SLOT=0
-SRC_URI=mirror://apache/subversion/subversion-1.10.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ffa3f1368904a645138310c99c5f08c4
diff --git a/dev-vcs/subversion-1.9.7-r1 b/dev-vcs/subversion-1.9.7-r1
deleted file mode 100644
index 279c7b21328d..000000000000
--- a/dev-vcs/subversion-1.9.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Advanced version control system
-EAPI=6
-HOMEPAGE=https://subversion.apache.org/
-IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
-SLOT=0
-SRC_URI=mirror://apache/subversion/subversion-1.9.7.tar.bz2 https://dev.gentoo.org/~mgorny/dist/subversion-1.8.18-patchset.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=520f14724fee211c4f277ed2687b99da
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
new file mode 100644
index 000000000000..62572693adf2
--- /dev/null
+++ b/dev-vcs/subversion/Manifest
@@ -0,0 +1,12 @@
+AUX 47_mod_dav_svn.conf 422 BLAKE2B 505c5f7f5c2eba9951b1337d452fde8e2b51351d2af0a4e620e86ce95aa2520460b7e353e5465edc15dc284a17b0770806ba97bb91c3d4a8451f3818d49c8469 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d
+AUX subversion-1.9.7-kf5.patch 9904 BLAKE2B 493c58c6567e2389bc9f33bb60981b22a2454c5bd5432bafcf33d9908f93cf93703fe106e1e3bb6c8d4227d3c8219c71c88f6af3f46846139d209749675e1e67 SHA512 9793c04d71b24e262d910f862b319842c0c819f71865d994351945ca2f15fef7f3a07c208c0b82ec50580b20d0732fe57f861842f03c44b4be9e7177f72e6354
+AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0735b973c0b6c5ff3f7ca0086f9bc852e499b1b9af82f4ee305c8553e114df50e468e9d70fd4655f SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289
+AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
+AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
+DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d7c46e2ac91f0360c2287a7b91c19e4cf5eae1a4421f79ceb2be4b998ee47735b22f5c22947992ff736a8d743f819556 SHA512 26e49c961d54c4e78067caa202f384c36544e0ce7506abbffe73e59186ac34559a70cbd6c0934ed47dcc5c3580fce0f0cc2ef14b77695c26e8dbbc6358d1ec6a
+DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
+DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
+DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
+EBUILD subversion-1.10.0.ebuild 15267 BLAKE2B 75507211a3abba7e806d8d4c5a0a0f150f4b9278b04cb695b5eee26df59b36cddbac29f0a3b8b386195a33f9dcdce680b909e9ebc2925aa3836a5714e2448a20 SHA512 4b6e1997e414beb1ddf6359b7fe30eb7e7d45ba44c7d42fe5fb7d5498d73416927ab78d387b45749122013054687dc6906c3cfd1788e0609f04162c02e6412ef
+EBUILD subversion-1.9.7-r1.ebuild 15815 BLAKE2B 22d899a6f52135775822749a9b2ffbf1cfe02bc80e3565265d1b4afc8bec0c57d7c956b75ed404ced7a6726daa77b1be2c2889c8b01407aec31ee52cb91c5573 SHA512 00c23e222b0a27e9a0239be4eeaa87706402c6bad5c4d8b5202bf21e4d7ff5c564848fffbcf2cea827b16e7b319215b2d2bf420e0c793ad607c81b040f75a2dd
+MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
diff --git a/dev-vcs/subversion/files/47_mod_dav_svn.conf b/dev-vcs/subversion/files/47_mod_dav_svn.conf
new file mode 100644
index 000000000000..52d08b7ab558
--- /dev/null
+++ b/dev-vcs/subversion/files/47_mod_dav_svn.conf
@@ -0,0 +1,16 @@
+<IfDefine SVN>
+LoadModule dav_svn_module modules/mod_dav_svn.so
+<IfDefine SVN_AUTHZ>
+LoadModule authz_svn_module modules/mod_authz_svn.so
+</IfDefine>
+
+# Example configuration:
+#<Location /svn/repos>
+#       DAV svn
+#       SVNPath ${SVN_REPOS_LOC}/repos
+#       AuthType Basic
+#       AuthName "Subversion repository"
+#       AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
+#       Require valid-user
+#</Location>
+</IfDefine>
diff --git a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
new file mode 100644
index 000000000000..5b692fa30668
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
@@ -0,0 +1,211 @@
+diff -u b/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp
+--- b/subversion/libsvn_auth_kwallet/kwallet.cpp	(revision 1798731)
++++ b/subversion/libsvn_auth_kwallet/kwallet.cpp	2018-01-18 16:48:52.026801597 +0100
+@@ -39,8 +39,6 @@
+ #include <QtCore/QString>
+ 
+ #include <kaboutdata.h>
+-#include <kcmdlineargs.h>
+-#include <kcomponentdata.h>
+ #include <klocalizedstring.h>
+ #include <kwallet.h>
+ 
+@@ -221,14 +219,15 @@
+       app = new QCoreApplication(argc, q_argv);
+     }
+ 
+-  KCmdLineArgs::init(q_argc, q_argv,
+-                     get_application_name(parameters, pool),
+-                     "subversion",
+-                     ki18n(get_application_name(parameters, pool)),
+-                     SVN_VER_NUMBER,
+-                     ki18n("Version control system"),
+-                     KCmdLineArgs::CmdLineArgKDE);
+-  KComponentData component_data(KCmdLineArgs::aboutData());
++  KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
++
++  /* componentName appears in KDE GUI prompts */
++  KAboutData aboutData(QStringLiteral("subversion"),     /* componentName */
++                       i18n(get_application_name(parameters,
++                                                 pool)), /* displayName */
++                       QStringLiteral(SVN_VER_NUMBER));
++  KAboutData::setApplicationData(aboutData);
++
+   QString folder = QString::fromUtf8("Subversion");
+   QString key =
+     QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring);
+@@ -291,14 +290,15 @@
+       app = new QCoreApplication(argc, q_argv);
+     }
+ 
+-  KCmdLineArgs::init(q_argc, q_argv,
+-                     get_application_name(parameters, pool),
+-                     "subversion",
+-                     ki18n(get_application_name(parameters, pool)),
+-                     SVN_VER_NUMBER,
+-                     ki18n("Version control system"),
+-                     KCmdLineArgs::CmdLineArgKDE);
+-  KComponentData component_data(KCmdLineArgs::aboutData());
++  KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
++
++  /* componentName appears in KDE GUI prompts */
++  KAboutData aboutData(QStringLiteral("subversion"),     /* componentName */
++                       i18n(get_application_name(parameters,
++                                                 pool)), /* displayName */
++                       QStringLiteral(SVN_VER_NUMBER));
++  KAboutData::setApplicationData(aboutData);
++
+   QString q_password = QString::fromUtf8(password);
+   QString folder = QString::fromUtf8("Subversion");
+   KWallet::Wallet *wallet = get_wallet(wallet_name, parameters);
+unchanged:
+--- a/build/ac-macros/compiler.m4	(revision 1798730)
++++ b/build/ac-macros/compiler.m4	(revision 1798731)
+@@ -126,3 +126,18 @@
+     SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
+   fi
+ ])
++
++dnl The KWallet provider needs to use C++11 mode when using KDE 5
++AC_DEFUN([SVN_CXX_MODE_SETUP11],
++[
++  CXXFLAGS_KEEP="$CXXFLAGS"
++  CXXFLAGS=""
++
++  if test "$GXX" = "yes"; then
++    SVN_CXXFLAGS_ADD_IFELSE([-std=c++11])
++  fi
++
++  CXXMODEFLAGS="$CXXFLAGS"
++  CXXFLAGS="$CXXFLAGS_KEEP"
++  AC_SUBST(CXXMODEFLAGS)
++])
+unchanged:
+--- a/build/ac-macros/kwallet.m4	(revision 1798730)
++++ b/build/ac-macros/kwallet.m4	(revision 1802646)
+@@ -25,8 +25,10 @@
+ AC_DEFUN(SVN_LIB_KWALLET,
+ [
+   AC_ARG_WITH(kwallet,
+-    [AS_HELP_STRING([[--with-kwallet[=PATH]]],
+-                    [Enable use of KWallet (KDE 4) for auth credentials])],
++    [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]],
++                    [Enable use of KWallet (KDE 5 or 4) for auth credentials.
++                     PATH is the KDE install path, alternatively INCDIR:LIBDIR
++                     are the header and library install paths. ])],
+                     [svn_lib_kwallet="$withval"],
+                     [svn_lib_kwallet=no])
+ 
+@@ -42,40 +44,70 @@
+         if test "$APR_HAS_DSO" = "yes"; then
+           if test -n "$PKG_CONFIG"; then
+             if test "$HAVE_DBUS" = "yes"; then
+-              AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
+-              if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
+-                AC_MSG_RESULT([yes])
++              AC_MSG_CHECKING([for Qt])
++              if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then
++                AC_MSG_RESULT([yes, Qt5])
++                qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui"
++                kde_config_name="kf5-config"
++                kde_inc_names="KF5/KWallet KF5/KCoreAddons KF5/KI18n"
++                kde_lib_names="-lKF5Wallet -lKF5I18n -lKF5CoreAddons -lQt5Gui -lQt5DBus -lQt5Core"
++              elif $PKG_CONFIG --exists QtCore QtDBus QtGui; then
++                AC_MSG_RESULT([yes, Qt4])
++                qt_pkg_config_names="QtCore QtDBus QtGui"
++                kde_config_name="kde4-config"
++                kde_inc_names="/"
++                kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore"
++              fi
++              if test -n "$qt_pkg_config_names"; then
+                 if test "$svn_lib_kwallet" != "yes"; then
+-                  AC_MSG_CHECKING([for kde4-config])
+-                  KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config"
+-                  if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then
++                  AC_MSG_CHECKING([for $kde_config_name])
++                  KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name"
++                  if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then
+                     AC_MSG_RESULT([yes])
+                   else
+-                    KDE4_CONFIG=""
+-                    AC_MSG_RESULT([no])
++                    if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then
++                      AC_MSG_RESULT([unneeded])
++                      KDE_CONFIG="unneeded"
++                      kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"]
++                      kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"]
++                    else
++                      AC_MSG_RESULT([no])
++                      KDE_CONFIG=""
++                    fi
+                   fi
+                 else
+-                  AC_PATH_PROG(KDE4_CONFIG, kde4-config)
++                  AC_PATH_PROG(KDE_CONFIG, $kde_config_name)
++                  if test -n "$KDE_CONFIG"; then
++                    kde_incdir="`$KDE_CONFIG --install include`"
++                    kde_libdir="`$KDE_CONFIG --install lib`"
++                  fi
+                 fi
+-                if test -n "$KDE4_CONFIG"; then
+-                  AC_MSG_CHECKING([for KWallet])
++                if test -n "$KDE_CONFIG"; then
++                  if test $kde_config_name = "kf5-config"; then
++                    dnl KF5 does not compile with -std=c++98
++                    SVN_CXX_MODE_SETUP11
++                  fi
+                   old_CXXFLAGS="$CXXFLAGS"
+                   old_LDFLAGS="$LDFLAGS"
+                   old_LIBS="$LIBS"
+-                  for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
++                  dnl --std=c++11 may be required
++                  CXXFLAGS="$CXXFLAGS $CXXMODEFLAGS"
++                  AC_MSG_CHECKING([for KWallet])
++                  for d in [`$PKG_CONFIG --cflags $qt_pkg_config_names`]; do
+                     if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then
+                       CPPFLAGS="$CPPFLAGS $d"
+                     fi
+                   done
+-                  qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
+-                  kde_incdir="`$KDE4_CONFIG --install include`"
+-                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir"
+-                  qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
+-                  SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
+-                  CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
++                  qt_include_dirs="`$PKG_CONFIG --cflags-only-I $qt_pkg_config_names`"
++                  for kde_inc_name in $kde_inc_names; do
++                    kde_kwallet_includes="$kde_kwallet_includes -I$kde_incdir/$kde_inc_name"
++                  done
++                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_kwallet_includes"
++                  qt_libs_other_options="`$PKG_CONFIG --libs-only-other $qt_pkg_config_names`"
++                  SVN_KWALLET_LIBS="$DBUS_LIBS $kde_lib_names $qt_libs_other_options"
++                  CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES -fPIC"
+                   LIBS="$LIBS $SVN_KWALLET_LIBS"
+-                  qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
+-                  kde_libdir="`$KDE4_CONFIG --install lib`"
++                  qt_lib_dirs="`$PKG_CONFIG --libs-only-L $qt_pkg_config_names`"
+                   LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`"
+                   AC_LANG(C++)
+                   AC_LINK_IFELSE([AC_LANG_SOURCE([[
+@@ -87,16 +119,19 @@
+                     AC_MSG_RESULT([yes])
+                     CXXFLAGS="$old_CXXFLAGS"
+                     LIBS="$old_LIBS"
++                    if test "$kde_config_name" = "kf5-config"; then
++                      AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 available])
++                    fi
+                   else
+                     AC_MSG_RESULT([no])
+                     AC_MSG_ERROR([cannot find KWallet])
+                   fi
+                 else
+-                  AC_MSG_ERROR([cannot find kde4-config])
++                  AC_MSG_ERROR([cannot find $kde_config_name])
+                 fi
+               else
+                 AC_MSG_RESULT([no])
+-                AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
++                AC_MSG_ERROR([cannot find Qt])
+               fi
+             else
+               AC_MSG_ERROR([cannot find D-Bus])
diff --git a/dev-vcs/subversion/files/svnserve.confd b/dev-vcs/subversion/files/svnserve.confd
new file mode 100644
index 000000000000..83997ce92719
--- /dev/null
+++ b/dev-vcs/subversion/files/svnserve.confd
@@ -0,0 +1,10 @@
+# The commented variables in this file are the defaults that are used
+# in the init-script.  You don't need to uncomment them except to
+# customize them to different values.
+
+# Options for svnserve
+#SVNSERVE_OPTS="--root=/var/svn"
+
+# User and group as which to run svnserve
+#SVNSERVE_USER="svn"
+#SVNSERVE_GROUP="svnusers"
diff --git a/dev-vcs/subversion/files/svnserve.initd3 b/dev-vcs/subversion/files/svnserve.initd3
new file mode 100644
index 000000000000..a28ce0b478a6
--- /dev/null
+++ b/dev-vcs/subversion/files/svnserve.initd3
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+description="svn server"
+pidfile="/var/run/svnserve.pid"
+command="/usr/bin/svnserve"
+command_args="--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}"
+command_background="true"
+start_stop_daemon_args="-u ${SVNSERVE_USER:-apache} -g ${SVNSERVE_GROUP:-apache}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	# Ensure that we run from a readable working dir, and that we do not
+	# lock filesystems when being run from such a location.
+	cd /
+}
diff --git a/dev-vcs/subversion/files/svnserve.xinetd b/dev-vcs/subversion/files/svnserve.xinetd
new file mode 100644
index 000000000000..e29f906b5096
--- /dev/null
+++ b/dev-vcs/subversion/files/svnserve.xinetd
@@ -0,0 +1,14 @@
+service svn
+{
+    socket_type     = stream
+    wait            = no
+    user            = apache
+    group           = apache
+    umask           = 002
+    protocol        = tcp
+    log_on_failure += USERID HOST
+    port            = 3690
+    server          = /usr/bin/svnserve
+    server_args     = -i
+    disable         = yes
+}
diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
new file mode 100644
index 000000000000..a8dc2a284ccc
--- /dev/null
+++ b/dev-vcs/subversion/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<use>
+		<flag name="ctypes-python">Build and install Ctypes Python bindings</flag>
+		<flag name="dso">Enable runtime module search</flag>
+		<flag name="extras">Install extra scripts (examples, tools, hooks)</flag>
+		<flag name="http">Enable http support using <pkg>net-libs/serf</pkg></flag>
+		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-vcs/subversion/subversion-1.10.0.ebuild b/dev-vcs/subversion/subversion-1.10.0.ebuild
new file mode 100644
index 000000000000..324c064f3d79
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.10.0.ebuild
@@ -0,0 +1,524 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby22 ruby21"
+DISTUTILS_OPTIONAL=1
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Subversion GPL-2"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/lz4
+	>=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.3:1
+	>=dev-libs/apr-util-1.3:1
+	dev-libs/expat
+	dev-libs/libutf8proc
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	ctypes-python? ( ${PYTHON_DEPS} )
+	gnome-keyring? (
+		dev-libs/glib:2
+		gnome-base/libgnome-keyring
+		sys-apps/dbus
+	)
+	http? ( >=net-libs/serf-1.3.4 )
+	kwallet? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kwallet:5
+		sys-apps/dbus
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	sasl? ( dev-libs/cyrus-sasl )"
+RDEPEND="${COMMON_DEPEND}
+	apache2? ( www-servers/apache[apache2_modules_dav] )
+	java? ( >=virtual/jre-1.5 )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}
+	!!<sys-apps/sandbox-1.6
+	ctypes-python? ( dev-python/ctypesgen )
+	doc? ( app-doc/doxygen )
+	gnome-keyring? ( virtual/pkgconfig )
+	http? ( virtual/pkgconfig )
+	java? ( >=virtual/jdk-1.5 )
+	kwallet? (
+		kde-frameworks/kdelibs4support:5
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+	test? ( ${PYTHON_DEPS} )"
+
+REQUIRED_USE="
+	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		!dso
+	)"
+
+want_apache
+
+pkg_setup() {
+	if use berkdb ; then
+		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
+			| sed 's:.*b::')"
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
+		fi
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
+	fi
+
+	depend.apache_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+
+	if ! use http ; then
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn "Consider enabling \"http\" USE flag"
+		echo -ne "\a"
+	fi
+
+	if use debug ; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+	# Allow for custom repository locations.
+	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+			if has_version dev-lang/ruby:${rbslot} ;  then
+				RB_VER="${rbslot/.}"
+				break
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+	fi
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patches"
+	eapply_user
+
+	fperms +x build/transform_libtool_scripts.sh
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	# this bites us in particular on Solaris
+	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+		die "/bin/sh is not POSIX shell!"
+
+	eautoconf
+	elibtoolize
+
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	if use python ; then
+		# XXX: make python_copy_sources accept path
+		S=${S}/subversion/bindings/swig/python python_copy_sources
+		rm -r "${S}"/subversion/bindings/swig/python || die
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		$(use_with apache2 apache-libexecdir)
+		$(use_with apache2 apxs "${APXS}")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_enable dso runtime-module-search)
+		$(use_with gnome-keyring)
+		$(use_enable java javahl)
+		$(use_with java jdk "${JAVA_HOME}")
+		$(use_with kwallet)
+		$(use_enable nls)
+		$(use_with sasl)
+		$(use_with http serf)
+		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--disable-experimental-libtool
+		--without-jikes
+		--disable-mod-activation
+		--disable-static
+	)
+
+	if use python || use perl || use ruby; then
+		myconf+=( --with-swig )
+	else
+		myconf+=( --without-swig )
+	fi
+
+	if use java ; then
+		myconf+=( --without-junit )
+	fi
+
+	case ${CHOST} in
+		*-aix*)
+			# avoid recording immediate path to sharedlibs into executables
+			append-ldflags -Wl,-bnoipath
+		;;
+		*-cygwin*)
+			# no LD_PRELOAD support, no undefined symbols
+			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
+			;;
+		*-interix*)
+			# loader crashes on the LD_PRELOADs...
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-mint*)
+			myconf+=( --enable-all-static --disable-local-library-preloading )
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=( --enable-local-library-preloading )
+		;;
+	esac
+
+	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
+	#compile for x86 on amd64, so workaround this issue again
+	#check newer versions, if this is still/again needed
+	myconf+=( --disable-disallowing-of-undefined-references )
+
+	# for build-time scripts
+	if use ctypes-python || use python || use test; then
+		python_setup
+	fi
+
+	if use python && [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_compile="$(tc-getCC)"
+	fi
+
+	# allow overriding Python include directory
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake local-all
+
+	if use ctypes-python ; then
+		# pre-generate .py files
+		use ctypes-python && emake ctypes-python
+
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_compile() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			python_export PYTHON_INCLUDEDIR
+			emake swig-py \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn"
+		}
+
+		# this will give us proper BUILD_DIR for symlinking
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_compile
+	fi
+
+	if use perl ; then
+		emake swig-pl
+	fi
+
+	if use ruby ; then
+		emake swig-rb
+	fi
+
+	if use java ; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+	fi
+
+	if use extras ; then
+		emake tools
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl
+		fi
+	fi
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P} ; then
+		default
+
+		if use ctypes-python ; then
+			python_test() {
+				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
+					|| die "ctypes-python tests fail with ${EPYTHON}"
+			}
+
+			distutils-r1_src_test
+		fi
+
+		if use python ; then
+			swig_py_test() {
+				pushd "${BUILD_DIR}" >/dev/null || die
+				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
+				popd >/dev/null || die
+			}
+
+			BUILD_DIR=subversion/bindings/swig/python \
+			python_foreach_impl swig_py_test
+		fi
+	else
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+		ewarn "before running the test suite."
+		ewarn "Test suite skipped."
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use ctypes-python ; then
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_install() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			emake \
+				DESTDIR="${D}" \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn" \
+				install-swig-py
+		}
+
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_install
+	fi
+
+	if use perl ; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+		perl_delete_localpod
+		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
+	fi
+
+	if use ruby ; then
+		emake DESTDIR="${D}" install-swig-rb
+	fi
+
+	if use java ; then
+		emake DESTDIR="${D}" install-javahl
+		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2 ; then
+		keepdir "${APACHE_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}/47_mod_dav_svn.conf"
+	fi
+
+	# Install Bash Completion, bug 43179.
+	newbashcomp tools/client-side/bash_completion svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+	rm -f tools/client-side/bash_completion
+
+	# Install hot backup script, bug 54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	#adjust default user and group with disabled apache2 USE flag, bug 381385
+	if ! use apache2 ; then
+		sed -e "s\USER:-apache\USER:-svn\g" \
+			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
+			-i "${ED%/}"/etc/init.d/svnserve || die
+		sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED%/}"/etc/xinetd.d/svnserve || die
+	fi
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install extra files.
+	if use extras ; then
+		cat <<- EOF > 80subversion-extras
+			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+		EOF
+		doenvd 80subversion-extras
+
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
+
+		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
+		rm -fr tools/client-side/svnmucc
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+
+		insinto /usr/share/${PN}
+		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
+		doins -r tools
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/doxygen/html/*
+
+		if use java ; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	prune_libtool_files --all
+
+	cd "${ED%/}"/usr/share/locale
+	for i in * ; do
+		if [[ ${i} != *${LINGUAS}* ]] ; then
+			rm -r ${i} || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+			CHANGED_BDB_VERSION="1"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+		ewarn "You upgraded from an older version of Berkeley DB and may experience"
+		ewarn "problems with your repository. Run the following commands as root to fix it:"
+		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+
+	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+}
+
+pkg_postrm() {
+	:
+}
+
+pkg_config() {
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+		einfo "Setting repository permissions..."
+		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+		if use apache2 ; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+		fi
+		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
+		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
+		echo "to finish the configuration."
+	fi
+}
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
new file mode 100644
index 000000000000..6f65e8a0b77d
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
@@ -0,0 +1,526 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby22 ruby21"
+DISTUTILS_OPTIONAL=1
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${PN}-1.8.18-patchset.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Subversion GPL-2"
+SLOT="0"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	>=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.3:1
+	>=dev-libs/apr-util-1.3:1
+	dev-libs/expat
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	ctypes-python? ( ${PYTHON_DEPS} )
+	gnome-keyring? (
+		dev-libs/glib:2
+		gnome-base/libgnome-keyring
+		sys-apps/dbus
+	)
+	http? ( >=net-libs/serf-1.3.4 )
+	kwallet? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kwallet:5
+		sys-apps/dbus
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	sasl? ( dev-libs/cyrus-sasl )"
+RDEPEND="${COMMON_DEPEND}
+	apache2? ( www-servers/apache[apache2_modules_dav] )
+	java? ( >=virtual/jre-1.5 )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}
+	!!<sys-apps/sandbox-1.6
+	ctypes-python? ( dev-python/ctypesgen )
+	doc? ( app-doc/doxygen )
+	gnome-keyring? ( virtual/pkgconfig )
+	http? ( virtual/pkgconfig )
+	java? ( >=virtual/jdk-1.5 )
+	kwallet? (
+		kde-frameworks/kdelibs4support:5
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+	test? ( ${PYTHON_DEPS} )"
+
+REQUIRED_USE="
+	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		!dso
+	)"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch
+	"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch
+	"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch
+	"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch
+	"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch
+	"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch
+	"${FILESDIR}"/${P}-kf5.patch
+)
+
+want_apache
+
+pkg_setup() {
+	if use berkdb ; then
+		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
+			| sed 's:.*b::')"
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
+		fi
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
+	fi
+
+	depend.apache_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+
+	if ! use http ; then
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn "Consider enabling \"http\" USE flag"
+		echo -ne "\a"
+	fi
+
+	if use debug ; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+	# Allow for custom repository locations.
+	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+			if has_version dev-lang/ruby:${rbslot} ;  then
+				RB_VER="${rbslot/.}"
+				break
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+	fi
+}
+
+src_prepare() {
+	default
+
+	fperms +x build/transform_libtool_scripts.sh
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	# this bites us in particular on Solaris
+	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+		die "/bin/sh is not POSIX shell!"
+
+	eautoconf
+	elibtoolize
+
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	if use python ; then
+		# XXX: make python_copy_sources accept path
+		S=${S}/subversion/bindings/swig/python python_copy_sources
+		rm -r "${S}"/subversion/bindings/swig/python || die
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		$(use_with apache2 apache-libexecdir)
+		$(use_with apache2 apxs "${APXS}")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_enable dso runtime-module-search)
+		$(use_with gnome-keyring)
+		$(use_enable java javahl)
+		$(use_with java jdk "${JAVA_HOME}")
+		$(use_with kwallet)
+		$(use_enable nls)
+		$(use_with sasl)
+		$(use_with http serf)
+		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--disable-experimental-libtool
+		--without-jikes
+		--disable-mod-activation
+		--disable-static
+	)
+
+	if use python || use perl || use ruby; then
+		myconf+=( --with-swig )
+	else
+		myconf+=( --without-swig )
+	fi
+
+	if use java ; then
+		myconf+=( --without-junit )
+	fi
+
+	case ${CHOST} in
+		*-aix*)
+			# avoid recording immediate path to sharedlibs into executables
+			append-ldflags -Wl,-bnoipath
+		;;
+		*-cygwin*)
+			# no LD_PRELOAD support, no undefined symbols
+			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
+			;;
+		*-interix*)
+			# loader crashes on the LD_PRELOADs...
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-mint*)
+			myconf+=( --enable-all-static --disable-local-library-preloading )
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=( --enable-local-library-preloading )
+		;;
+	esac
+
+	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
+	#compile for x86 on amd64, so workaround this issue again
+	#check newer versions, if this is still/again needed
+	myconf+=( --disable-disallowing-of-undefined-references )
+
+	# for build-time scripts
+	if use ctypes-python || use python || use test; then
+		python_setup
+	fi
+
+	if use python && [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_compile="$(tc-getCC)"
+	fi
+
+	# allow overriding Python include directory
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake local-all
+
+	if use ctypes-python ; then
+		# pre-generate .py files
+		use ctypes-python && emake ctypes-python
+
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_compile() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			python_export PYTHON_INCLUDEDIR
+			emake swig-py \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn"
+		}
+
+		# this will give us proper BUILD_DIR for symlinking
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_compile
+	fi
+
+	if use perl ; then
+		emake swig-pl
+	fi
+
+	if use ruby ; then
+		emake swig-rb
+	fi
+
+	if use java ; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+	fi
+
+	if use extras ; then
+		emake tools
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl
+		fi
+	fi
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P} ; then
+		default
+
+		if use ctypes-python ; then
+			python_test() {
+				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
+					|| die "ctypes-python tests fail with ${EPYTHON}"
+			}
+
+			distutils-r1_src_test
+		fi
+
+		if use python ; then
+			swig_py_test() {
+				pushd "${BUILD_DIR}" >/dev/null || die
+				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
+				popd >/dev/null || die
+			}
+
+			BUILD_DIR=subversion/bindings/swig/python \
+			python_foreach_impl swig_py_test
+		fi
+	else
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+		ewarn "before running the test suite."
+		ewarn "Test suite skipped."
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use ctypes-python ; then
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_install() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			emake \
+				DESTDIR="${D}" \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn" \
+				install-swig-py
+		}
+
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_install
+	fi
+
+	if use perl ; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+		perl_delete_localpod
+		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
+	fi
+
+	if use ruby ; then
+		emake DESTDIR="${D}" install-swig-rb
+	fi
+
+	if use java ; then
+		emake DESTDIR="${D}" install-javahl
+		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2 ; then
+		keepdir "${APACHE_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}/47_mod_dav_svn.conf"
+	fi
+
+	# Install Bash Completion, bug 43179.
+	newbashcomp tools/client-side/bash_completion svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+	rm -f tools/client-side/bash_completion
+
+	# Install hot backup script, bug 54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	#adjust default user and group with disabled apache2 USE flag, bug 381385
+	use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \
+			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
+			-i "${ED%/}"/etc/init.d/svnserve || die
+	use apache2 || sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED%/}"/etc/xinetd.d/svnserve || die
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install extra files.
+	if use extras ; then
+		cat <<- EOF > 80subversion-extras
+			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+		EOF
+		doenvd 80subversion-extras
+
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
+
+		find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
+		rm -fr tools/client-side/svnmucc
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+
+		insinto /usr/share/${PN}
+		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
+		doins -r tools
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/doxygen/html/*
+
+		if use java ; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	prune_libtool_files --all
+
+	cd "${ED%/}"/usr/share/locale
+	for i in * ; do
+		[[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; }
+	done
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	if use berkdb && [[ -f "${EROOT%/}/usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+			CHANGED_BDB_VERSION="1"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+		ewarn "You upgraded from an older version of Berkeley DB and may experience"
+		ewarn "problems with your repository. Run the following commands as root to fix it:"
+		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+
+	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+}
+
+pkg_postrm() {
+	:
+}
+
+pkg_config() {
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+		einfo "Setting repository permissions..."
+		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+		if use apache2 ; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+		fi
+		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
+		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
+		echo "to finish the configuration."
+	fi
+}
diff --git a/dev-vcs/svn2cl-0.12 b/dev-vcs/svn2cl-0.12
deleted file mode 100644
index 303e9b6f0abb..000000000000
--- a/dev-vcs/svn2cl-0.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=Create a GNU-style ChangeLog from subversion's svn log --xml output
-EAPI=0
-HOMEPAGE=http://ch.tudelft.nl/~arthur/svn2cl/
-KEYWORDS=amd64 ~mips ~ppc x86
-LICENSE=BSD
-RDEPEND=dev-libs/libxslt dev-vcs/subversion
-SLOT=0
-SRC_URI=http://ch.tudelft.nl/~arthur/svn2cl//svn2cl-0.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=87ee9f3954285f0b2b2a14be6d6fc8c1
diff --git a/dev-vcs/svn2cl/Manifest b/dev-vcs/svn2cl/Manifest
new file mode 100644
index 000000000000..66529183ddf2
--- /dev/null
+++ b/dev-vcs/svn2cl/Manifest
@@ -0,0 +1,4 @@
+AUX 0.9-wrapper.patch 531 BLAKE2B c4540c9768cfa687d39b1193d59e0426c238f7c9aa71b3b4e80113e31700e64cd3bd2c50f86f5d5825c2e668081e385502ca5973eb4a9a24d150fe67affc3208 SHA512 8e36433178d68e6e1c0f7d1259c8aecb1ee70f04fc47033f5e7c58b0aa273fcdf20aa425bce673bea3c36d8374da8ef35f4e0854fc6f62a3c0f36b414ff21610
+DIST svn2cl-0.12.tar.gz 18171 BLAKE2B 88e66d4bcc3e05132462d1c9794846a644f121876d36dc1b42ef0cb7bf8481536d62a6d764e92edc670c149fbe5702a46b02d875ad1cd477a05b497780232296 SHA512 c84f0f67b34d615b1732cd03ecbdb6d3bb082677145acf2f32f74518306347eb984d65d4837f2463b369cd7a8a7443d2cfba589c531b46f423870c55b0b48aa2
+EBUILD svn2cl-0.12.ebuild 968 BLAKE2B a48d2df2292210fbd4b94424d4818912f0aad5137f59cfd8476cfba5d905061de629947e3e3ca2a43e846d7cde9619fb0c2084e15a43d035b1b5f7d8fc2e8f17 SHA512 959120933c895f6a99ca6db51de2763cc94a7f5abd7bc2128bd093dce788acc0331ed74131ea701b227c746efcc589ecdc265eafbe8ca7a7db3feb805f53bf10
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/svn2cl/files/0.9-wrapper.patch b/dev-vcs/svn2cl/files/0.9-wrapper.patch
new file mode 100644
index 000000000000..478b2a032d2a
--- /dev/null
+++ b/dev-vcs/svn2cl/files/0.9-wrapper.patch
@@ -0,0 +1,20 @@
+--- svn2cl.sh	2006-10-18 23:38:06.000000000 +0200
++++ svn2cl.sh.1	2006-11-12 01:41:05.000000000 +0100
+@@ -234,16 +234,7 @@
+   esac
+ done
+ 
+-# find the directory that this script resides in
+-prog="$0"
+-while [ -h "$prog" ]
+-do
+-  dir=`dirname "$prog"`
+-  prog=`ls -ld "$prog" | sed "s/^.*-> \(.*\)/\1/;/^[^/]/s,^,$dir/,"`
+-done
+-dir=`dirname "$prog"`
+-dir=`cd "$dir" && pwd`
+-XSL="$dir/svn2${OUTSTYLE}.xsl"
++XSL="/usr/share/svn2cl/svn2${OUTSTYLE}.xsl"
+ 
+ # check if the authors file is formatted as a legacy
+ # colon separated file
diff --git a/dev-vcs/svn2cl/metadata.xml b/dev-vcs/svn2cl/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/dev-vcs/svn2cl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/svn2cl/svn2cl-0.12.ebuild b/dev-vcs/svn2cl/svn2cl-0.12.ebuild
new file mode 100644
index 000000000000..1591242a7069
--- /dev/null
+++ b/dev-vcs/svn2cl/svn2cl-0.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="Create a GNU-style ChangeLog from subversion's svn log --xml output"
+HOMEPAGE="http://ch.tudelft.nl/~arthur/svn2cl/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxslt
+	dev-vcs/subversion"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# the wrapper script looks for the xsl files in the
+	# same directory as the script.
+	epatch "${FILESDIR}"/0.9-wrapper.patch
+}
+
+src_install() {
+	newbin svn2cl.sh svn2cl || die "failed to install wrapper script"
+	insinto /usr/share/svn2cl
+	doins svn2cl.xsl svn2html.xsl || die
+	dodoc README NEWS TODO ChangeLog authors.xml svn2html.css || die
+	doman svn2cl.1 || die
+}
+
+pkg_postinst() {
+	einfo "You can find samples of svn2html.css and authors.xml in"
+	einfo "/usr/share/doc/${PF}/"
+	einfo "Read man page for details."
+}
diff --git a/dev-vcs/svn2git-1.0.11-r1 b/dev-vcs/svn2git-1.0.11-r1
deleted file mode 100644
index 32a7a14cdbca..000000000000
--- a/dev-vcs/svn2git-1.0.11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
-DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=6
-HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.11.tar.gz -> svn2git-1.0.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cfd1659a95be5b5b2bd1d88d200afef4
diff --git a/dev-vcs/svn2git-1.0.12 b/dev-vcs/svn2git-1.0.12
deleted file mode 100644
index 656a93a53056..000000000000
--- a/dev-vcs/svn2git-1.0.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
-DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=6
-HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.12.tar.gz -> svn2git-1.0.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=52837763d5dd358013fbc34e6b3a05d2
diff --git a/dev-vcs/svn2git-9999 b/dev-vcs/svn2git-9999
deleted file mode 100644
index 0a4ea24a238d..000000000000
--- a/dev-vcs/svn2git-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=dev-qt/qtcore:5 dev-vcs/subversion >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=6
-HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e406737d43cce97595e7f948f7c0c714
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
new file mode 100644
index 000000000000..961a61728733
--- /dev/null
+++ b/dev-vcs/svn2git/Manifest
@@ -0,0 +1,8 @@
+AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d91932b2057be81063b55ee93d94c62806e3e9abd3e2392358b0527c7e29f59caa849f3928ebd17352c92296ba31fb SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03
+AUX svn2git-1.0.2.1-include-path.patch 641 BLAKE2B 4df6dbbb8935377355cf9fa35c005e349f5ce5b7d7decb7fb5038db5b70bff25aa1ff91b345c1f3b3d9a3c4a7c566417a49b4385a7f7e6660dcd54f528990210 SHA512 2be52266425ba4b287eb5adde4f2a643759a65b5ece00a7ef1982256dc0f460c069afd4b7d4aee63f2e4a99ebcaabc6f24b5688dd939cb172f333c2d4755a36f
+DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9
+DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359
+EBUILD svn2git-1.0.11-r1.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
+EBUILD svn2git-1.0.12.ebuild 1103 BLAKE2B 964d3ac156984cb4feac87159b5e9ef63bbdd2e7669fab10da459a69a9128f9c22e9ead763eed9b1fab88febaf68572be6fc231d1d79e489ad49ce4543467c5c SHA512 062419fe42725915a9c3fa5de76fe2dc9f709785ce6e909beea831a9b3db1f21eea3708a1918cffd5a59e35ca7119da7d0e276146be6d0be55969b6f4997b2e1
+EBUILD svn2git-9999.ebuild 1087 BLAKE2B 8eab32efa9f4e0a54a6a071a26bdd3aface14ffb0d6b9d621545d23b7f81fc9db41f2c299238191b40401dd2eec0b7bc010d26867705c39df4df03834beb9ce2 SHA512 36acedf8fe41f50789da0ecad078d6335ba50c10cf14eea2220ab9afa6a3c170a41cdec83acd8d6281bcd8abb3ef497917037bf95e2fcff2a778e6fb29dea508
+MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch
new file mode 100644
index 000000000000..894cf2c2a10e
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch
@@ -0,0 +1,23 @@
+From d8b1c8c774a61666e7c62bf5beb8f0f1b4a3e01a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 21 May 2013 23:11:25 +0200
+Subject: [PATCH] Stop using Git SHA1 version string
+
+diff --git a/src/src.pro b/src/src.pro
+index da6d40d..2626a6f 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -6,10 +6,7 @@ SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
+ APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1
+ exists(local-config.pri):include(local-config.pri)
+ 
+-VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
+-    !isEmpty(VERSION){
+-      VERSION = $${VERSION}
+-    }
++VERSION = $$(SVN_ALL_FAST_EXPORT_VERSION)
+ 
+ VERSTR = '\\"$${VERSION}\\"'  # place quotes around the version string
+ DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
+-- 
+1.8.2.1
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
new file mode 100644
index 000000000000..e5c898ba9738
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
@@ -0,0 +1,13 @@
+--- a/src/src.pro	2011-01-11 09:02:15.696463807 +0100
++++ b/src/src.pro	2011-01-11 09:03:59.793959849 +0100
+@@ -3,8 +3,8 @@
+ # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007
+ ######################################################################
+ 
+-SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
+-APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1
++SVN_INCLUDE = /usr/include/subversion-1
++APR_INCLUDE = /usr/include/apr-1
+ exists(local-config.pri):include(local-config.pri)
+ 
+ VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
diff --git a/dev-vcs/svn2git/metadata.xml b/dev-vcs/svn2git/metadata.xml
new file mode 100644
index 000000000000..53b9b59c3902
--- /dev/null
+++ b/dev-vcs/svn2git/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">svn-all-fast-export/svn2git</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
new file mode 100644
index 000000000000..0fd35c4b742f
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Tool for one-time conversion from svn to git"
+HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
+else
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
+
+src_prepare() {
+	# Note: patching order matters
+	default
+
+	if [[ "${PV}" != "9999" ]]; then
+		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
+		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
+	fi
+}
+
+src_configure() {
+	eqmake5 fast-export2.pro
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/${PN}/samples
+	doins samples/*.rules || die 'doins failed'
+	dobin svn-all-fast-export || die 'dobin failed'
+	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+}
diff --git a/dev-vcs/svn2git/svn2git-1.0.12.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
new file mode 100644
index 000000000000..ab7c62035ef9
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Tool for one-time conversion from svn to git"
+HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
+else
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=( README.md )
+
+src_configure() {
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+		VERSION=${PV}
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/${PN}/samples
+	doins samples/*.rules || die 'doins failed'
+	dobin svn-all-fast-export || die 'dobin failed'
+	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+}
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
new file mode 100644
index 000000000000..77393d1e3fbe
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Tool for one-time conversion from svn to git"
+HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
+else
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=( README.md )
+
+src_configure() {
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/${PN}/samples
+	doins samples/*.rules || die 'doins failed'
+	dobin svn-all-fast-export || die 'dobin failed'
+	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+}
diff --git a/dev-vcs/svneverever-1.3.0 b/dev-vcs/svneverever-1.3.0
deleted file mode 100644
index a13777950b6f..000000000000
--- a/dev-vcs/svneverever-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Tool collecting path entries across SVN history
-EAPI=5
-HOMEPAGE=https://github.com/hartwork/svneverever
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/pysvn[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/hartwork/svneverever/archive/v1.3.0.tar.gz -> svneverever-1.3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bab3424ea86a717f58f759e9c0038134
diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest
new file mode 100644
index 000000000000..143f9e0ad472
--- /dev/null
+++ b/dev-vcs/svneverever/Manifest
@@ -0,0 +1,3 @@
+DIST svneverever-1.3.0.tar.gz 6006 BLAKE2B ab5b280f5aaba0cbe25cbbf1223930d4dff9f272666ede8845338bea77da6079de9b49be2c9efd346045be5a6af7a9a372365b577df27b0815a57179ce2e050f SHA512 dfc5f8e96808d95ce387b2c0d2ea34c4cae81851dc5813b05eeec719ae7cbfb69ff33f38a88429b1caab2873af676072ce3d76592d8fac5dd186f18454bade10
+EBUILD svneverever-1.3.0.ebuild 496 BLAKE2B fa476de18ab8a794081632c7020cf8f91f5d83f28875a5fa4f066cdc2fd33099063aac97e1050195a5bff9e15315663ef4f9e6a1eda34af0f7eebcfb0c50f7a2 SHA512 0bfb481d6c80408a792861c027c132742682f8b6afee3b710cc7dafaf827701c3ef1552e0d9dc1827542557f72b2f3271add4139e8773370dd29d7af8f833f5b
+MISC metadata.xml 334 BLAKE2B 8d3ce38a8ae3289ed55ea0daa72adcbfa8ea7cfaea7bbae2f7afded9c79cf3d41658ccc0bdc324db4640e73f3fd902be86bec29927f73582d860f697564a9f6d SHA512 d50e4630b891664dd365e38a57ed146acdcca6d645994d010b58b46b70adb77c3bad5f0ab5088302dd8f21adb33e8b478ac31426dd8bfcf94b1f82fe2613b446
diff --git a/dev-vcs/svneverever/metadata.xml b/dev-vcs/svneverever/metadata.xml
new file mode 100644
index 000000000000..7e285c826651
--- /dev/null
+++ b/dev-vcs/svneverever/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hartwork/svneverever</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/svneverever/svneverever-1.3.0.ebuild b/dev-vcs/svneverever/svneverever-1.3.0.ebuild
new file mode 100644
index 000000000000..d6506788667c
--- /dev/null
+++ b/dev-vcs/svneverever/svneverever-1.3.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Tool collecting path entries across SVN history"
+HOMEPAGE="https://github.com/hartwork/svneverever"
+SRC_URI="https://github.com/hartwork/svneverever/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/pysvn[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/svnmailer-1.0.9-r1 b/dev-vcs/svnmailer-1.0.9-r1
deleted file mode 100644
index 795f13850a35..000000000000
--- a/dev-vcs/svnmailer-1.0.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/mta python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=A subversion commit notifier written in Python
-EAPI=5
-HOMEPAGE=http://opensource.perlig.de/svnmailer/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/mta python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://storage.perlig.de/svnmailer/svnmailer-1.0.9.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1671f77b009b1d2278d18601cb9f80e
diff --git a/dev-vcs/svnmailer/Manifest b/dev-vcs/svnmailer/Manifest
new file mode 100644
index 000000000000..b74cd8af7232
--- /dev/null
+++ b/dev-vcs/svnmailer/Manifest
@@ -0,0 +1,3 @@
+DIST svnmailer-1.0.9.tar.bz2 354935 BLAKE2B 72a46c39f11295cb789fdc5b1f01162b9cd150828cde15cefef826b0eb44f580abd7a0ce5a56c4e3eb8741b03a7b45a6b5faeb0b58e60baace91949f40cd5ff8 SHA512 2dae9b123e3f511f022cf4d0db75b30b7fad33719382a7ab57897726ababc73bf24bb838cd92258ee5573996e1fef9805f8afbe958694e7cb4682433dba9a6e0
+EBUILD svnmailer-1.0.9-r1.ebuild 760 BLAKE2B 83de962b83e0e9acdc27bbf668dbac5f070b7b76b05fd702f273a5787f9a854d5d5bda9eee4c9542128da8ff62ab59319807527eae4e1ff84d67e340406fc02e SHA512 d7bcc686bb9dfedee4e7992215e69df72f53a83552fbda0efa5e02963b25be22fb2f32898c66460119378128985668a286183a47b7065d8c7326b336779af25d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/svnmailer/metadata.xml b/dev-vcs/svnmailer/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/dev-vcs/svnmailer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild b/dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..27d43db65303
--- /dev/null
+++ b/dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A subversion commit notifier written in Python"
+HOMEPAGE="http://opensource.perlig.de/svnmailer/"
+SRC_URI="http://storage.perlig.de/svnmailer/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${DEPEND}
+	dev-vcs/subversion[python,${PYTHON_USEDEP}]
+	virtual/mta"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -i -e "s:man/man1:share/&:" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-vcs/tig-2.3.3 b/dev-vcs/tig-2.3.3
deleted file mode 100644
index 2dab7699e4c2..000000000000
--- a/dev-vcs/tig-2.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
-DESCRIPTION=text mode interface for git
-EAPI=6
-HOMEPAGE=https://jonas.github.io/tig/
-IUSE=test unicode
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
-REQUIRED_USE=test? ( unicode )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.3.3/tig-2.3.3.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0c41b0d524e281ce5b1a629bac9f9c0c
diff --git a/dev-vcs/tig-9999 b/dev-vcs/tig-9999
deleted file mode 100644
index edec7a699ec1..000000000000
--- a/dev-vcs/tig-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= app-text/asciidoc app-text/xmlto >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=text mode interface for git
-EAPI=6
-HOMEPAGE=https://jonas.github.io/tig/
-IUSE=test unicode
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
-REQUIRED_USE=test? ( unicode )
-RESTRICT=test
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c2b2664aea7f68768327f9ea72977ffe
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
new file mode 100644
index 000000000000..a6e9677f752b
--- /dev/null
+++ b/dev-vcs/tig/Manifest
@@ -0,0 +1,4 @@
+DIST tig-2.3.3.tar.gz 1082818 BLAKE2B 0e9bcd02726b004c233a5efd7f58e4fda478dc1d2b738a7f8c086a3d71807d319ac8bd296b0f7c7569ed69a5b2b1db18e5c957cc5ce890a67b8f6ee7ead29551 SHA512 1d1cdf7184eeb3fea301c1959023f4aa97c4f8e25fc96cd61933ca39cf7549b6c7e1d9517f7ffd45d212ae9542ea4be07370b41c623cf6d0db8d025634b1d6d1
+EBUILD tig-2.3.3.ebuild 1319 BLAKE2B c910552b030958a43c583f0d745c972b6817fe9ef0840409e283f8ec7c3d28b88dfccbf33cf66c4cfeca3247b046c9d70835c01986281af934ed4ed00c53696e SHA512 22997fc3b229a3ca78eee445d4a6761b6bfdb9a379f62d091c57afb17928441f0dc0b2829d48acf3ce474b0785037ad093a4cef5c07813d8fb7169311c6518d1
+EBUILD tig-9999.ebuild 1322 BLAKE2B 6f0cd425ccbe143e45fa5934b2340560a1cad00863cd4691cfb062b745d3f2a8f67672e2e112943d096df23297e11c457d6223e05036780a70cac977591d9302 SHA512 22c37d4453001599b3c7e2cd57da25cb29ac00f44538a916ce1b5cc1c0c95b0e8847a0d5c5223f5fe797355c2c64343eb33dabd34fe84d25ae74a7b26117bafb
+MISC metadata.xml 330 BLAKE2B b73d4c5a79937e78cff86c138950085a6c69ed2b28c8615d37065c7143df047237c014e8c3306b795a3b4fb64a4584fe06bf23d41caa75138f5d6ca07eb75b22 SHA512 bc921303a62d48f0b1b9792df22bf54c1555545c17a2c44a4f946b800c012067cc122011f7735b0f44d0275279450d6290970f127132dc6947ebe09fcba83e98
diff --git a/dev-vcs/tig/metadata.xml b/dev-vcs/tig/metadata.xml
new file mode 100644
index 000000000000..beb9c6e702ff
--- /dev/null
+++ b/dev-vcs/tig/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jonas/tig</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/tig/tig-2.3.3.ebuild b/dev-vcs/tig/tig-2.3.3.ebuild
new file mode 100644
index 000000000000..139284ad8542
--- /dev/null
+++ b/dev-vcs/tig/tig-2.3.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	docinto examples
+	dodoc contrib/*.tigrc
+}
diff --git a/dev-vcs/tig/tig-9999.ebuild b/dev-vcs/tig/tig-9999.ebuild
new file mode 100644
index 000000000000..59b31c7161c2
--- /dev/null
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	docinto examples
+	dodoc contrib/*.tigrc
+}
diff --git a/dev-vcs/tkcvs-8.2.2 b/dev-vcs/tkcvs-8.2.2
deleted file mode 100644
index 9b987c4d2b64..000000000000
--- a/dev-vcs/tkcvs-8.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/tk
-DESCRIPTION=Tcl/Tk-based graphical interface to CVS with Subversion support
-EAPI=4
-HOMEPAGE=http://www.twobarleycorns.net/tkcvs.html
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tk dev-vcs/cvs dev-vcs/subversion sys-apps/diffutils dev-util/tkdiff
-SLOT=0
-SRC_URI=http://www.twobarleycorns.net/tkcvs_8_2_2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=31b2a33e6a32a332e3132e9dd34a9c73
diff --git a/dev-vcs/tkcvs-8.2.3 b/dev-vcs/tkcvs-8.2.3
deleted file mode 100644
index 0844179e0a1a..000000000000
--- a/dev-vcs/tkcvs-8.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/tk
-DESCRIPTION=Tcl/Tk-based graphical interface to CVS with Subversion support
-EAPI=4
-HOMEPAGE=http://www.twobarleycorns.net/tkcvs.html
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tk dev-vcs/cvs dev-vcs/subversion sys-apps/diffutils dev-util/tkdiff
-SLOT=0
-SRC_URI=http://www.twobarleycorns.net/tkcvs-8.2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e24d85a2b4ac2cf582d49b4a53acd2c2
diff --git a/dev-vcs/tkcvs/Manifest b/dev-vcs/tkcvs/Manifest
new file mode 100644
index 000000000000..9090226d0488
--- /dev/null
+++ b/dev-vcs/tkcvs/Manifest
@@ -0,0 +1,5 @@
+DIST tkcvs-8.2.3.tar.gz 570910 BLAKE2B e612fb2fa01ad0205973eef48eaa6c11677d3aec8f1a5344b1d1719aafde79e830f550f990a7bceb8063edb530de807b7878937015bcd0175aef038031663bb0 SHA512 42fb03acf6367e02f6f7b3e1ad66232be4825f152b3e4d123080e0ce7d2f53b5eacb71ac95fbc15224fb4c4c2cae979b612dbb11d0cd0b8fc4a0222a8cd40c8a
+DIST tkcvs_8_2_2.tar.gz 1183853 BLAKE2B 01195764b85b7f3e24f937052d1f21e969f7c060bef97664ce8fc6000dd8025064274610b0159940630dd1f8c51b92e2331793146fd44fc4b736b512118328be SHA512 7a3f76f8157601a9359382597746e7ee4ed491f94d4ba5992848d48b8c5de1c81c91e8245a88b17c68af6898f269fcd3bf6ba9c920bb083190c849ec13e7bf9f
+EBUILD tkcvs-8.2.2.ebuild 874 BLAKE2B 39cafd5706b6ebf5c6707420a6c0a43b92849db106de2344043d08330f7ad01b1b8d66f35cd9f9cbb847762e1df8c37df8ead0f84b59170d04b62773d147619e SHA512 2d917259d7c55f750eb900115b669016c5087a5d0222f8f14694023a0b364e44b6a1178cf2a07b8902a5fb266bc323840ac54702446d0aa06ade42272f228363
+EBUILD tkcvs-8.2.3.ebuild 927 BLAKE2B b4a22c3dc12c5e4d74f2ac96d1c3fc19097cd0ccf3546517fa762f56dc3a3344ceecb889f41fe7d0657fa240f3bd2b2ef732496c4133937358f938b2c27afa11 SHA512 a9d20f59ff32cfaac97caa531a2239b111d6df93ac929401f66347c2f109a24d6f72bfd57ff47345dd7ebb0a1eba1890d8277be779a7ec42a53d709ab328a6e6
+MISC metadata.xml 253 BLAKE2B 19a7f4e84d1def1f97bb3b985a4959704c25d31ff2b1b7e6527ec6867d68dc2a6b15c0399935a8311789c4fac61136dcfdebaf7c113f296ec50c9523597a74db SHA512 9881e4487c9512c1b72ff2fa72a45b82ef3bf4ade0ec982aea1222f629367ac784ef922b839224add5829cba1717a25d49c31c1481610a02658d0bb265d4eaf6
diff --git a/dev-vcs/tkcvs/metadata.xml b/dev-vcs/tkcvs/metadata.xml
new file mode 100644
index 000000000000..2b168a2f48c6
--- /dev/null
+++ b/dev-vcs/tkcvs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild b/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild
new file mode 100644
index 000000000000..c8898cdbe2ec
--- /dev/null
+++ b/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib
+
+MY_P=${PN}_${PV//./_}
+
+DESCRIPTION="Tcl/Tk-based graphical interface to CVS with Subversion support"
+HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
+SRC_URI="http://www.twobarleycorns.net/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/tk"
+RDEPEND="${DEPEND}
+	dev-vcs/cvs
+	dev-vcs/subversion
+	sys-apps/diffutils
+	dev-util/tkdiff"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	sed \
+		-e "/set MANDIR/s/man man1/share man man1/" \
+		-e "/set LIBDIR/s/lib/$(get_libdir)/" \
+		-i doinstall.tcl || die
+}
+
+src_install() {
+	# bug 66030
+	unset DISPLAY
+	./doinstall.tcl -nox "${D}"/usr || die
+
+	# dev-tcktk/tkdiff
+	rm "${D}"/usr/bin/tkdiff
+
+	# Add docs...this is important
+	dodoc CHANGELOG FAQ
+}
diff --git a/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild b/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild
new file mode 100644
index 000000000000..8038509e10e9
--- /dev/null
+++ b/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib
+
+DESCRIPTION="Tcl/Tk-based graphical interface to CVS with Subversion support"
+HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
+SRC_URI="http://www.twobarleycorns.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/tk"
+RDEPEND="${DEPEND}
+	dev-vcs/cvs
+	dev-vcs/subversion
+	sys-apps/diffutils
+	dev-util/tkdiff"
+
+src_prepare() {
+	sed \
+		-e "/set MANDIR/s/man man1/share man man1/" \
+		-e "/set LIBDIR/s/lib/$(get_libdir)/" \
+		-i doinstall.tcl || die
+}
+
+src_install() {
+	# bug 66030
+	unset DISPLAY
+	./doinstall.tcl -nox "${D}"/usr || die
+
+	# dev-tcktk/tkdiff
+	rm "${D}"/usr/bin/tkdiff
+
+	# Add docs...this is important
+	dodoc {CHANGELOG,FAQ}.txt
+
+	make_desktop_entry ${PN} TkCVS "${EPREFIX}"/usr/$(get_libdir)/tkcvs/bitmaps/ticklefish_med.gif
+}
diff --git a/dev-vcs/topgit-0.9 b/dev-vcs/topgit-0.9
deleted file mode 100644
index ca3cb4d49c70..000000000000
--- a/dev-vcs/topgit-0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-apps/sed virtual/awk
-DESCRIPTION=A different patch queue manager
-EAPI=5
-HOMEPAGE=https://github.com/greenrd/topgit
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/greenrd/topgit/archive/topgit-0.9.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=09d811c2710d098b2c5e88686b1fa3f9
diff --git a/dev-vcs/topgit-0.9-r1 b/dev-vcs/topgit-0.9-r1
deleted file mode 100644
index 0c89abfd2964..000000000000
--- a/dev-vcs/topgit-0.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-apps/sed virtual/awk
-DESCRIPTION=A different patch queue manager
-EAPI=6
-HOMEPAGE=https://github.com/greenrd/topgit
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/greenrd/topgit/archive/topgit-0.9.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ba256bdcd88ac785dfe63097750361bf
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
new file mode 100644
index 000000000000..95745577aeb6
--- /dev/null
+++ b/dev-vcs/topgit/Manifest
@@ -0,0 +1,4 @@
+DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c
+EBUILD topgit-0.9-r1.ebuild 697 BLAKE2B d2403274c59bea10d676003f7e307b7f2138264693fff979257ebdc7eb157a0e88d945bfea3fd0b1c5ef1cabbb3d5dc57ad196d782fad4b5b8d94feb7f4fabf6 SHA512 171f8e2c67a2ab9605385c8f6241c192f78bc571451a99994cd53e1817eb58e91e2fd4a5a15774286b60c9e761e4ec68ce42cfeb5bbea38244d1e9dd46b2c015
+EBUILD topgit-0.9.ebuild 695 BLAKE2B 0e0c9bc9bd63eb09a5809b82831d25cd577f580655823aacac354609cc270a833fcc9f6b8a4702c37fcb590cc7623a906cd059eb8a5c72ac90b5ed5df4c0923e SHA512 7fc7ce4938c1b881d4a8724901b93789c05e21c78b1729d5db68eccae6d06284ff79769fb0b4755b81154acc1f6410f256a4cf73d1be57029aa48db89e6760de
+MISC metadata.xml 246 BLAKE2B f9d665b30ee34751053156150dfc0251a79530710ce6db75be5f79bf681bbab29d630af66d390be6870a424eeff55679e2ad226f9d268d1ba4261381a5708262 SHA512 453ca444336afd5e9a05f704cb9228b1415a4440aeb43847b80bfbdfacc3a21bf4706efc408acbb692b5a9130051c802d23b04791cfa0d84f499a8b359c393ce
diff --git a/dev-vcs/topgit/metadata.xml b/dev-vcs/topgit/metadata.xml
new file mode 100644
index 000000000000..a4bff25eb375
--- /dev/null
+++ b/dev-vcs/topgit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">greenrd/topgit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/topgit/topgit-0.9-r1.ebuild b/dev-vcs/topgit/topgit-0.9-r1.ebuild
new file mode 100644
index 000000000000..85d51d45244a
--- /dev/null
+++ b/dev-vcs/topgit/topgit-0.9-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="A different patch queue manager"
+HOMEPAGE="https://github.com/greenrd/topgit"
+SRC_URI="https://github.com/greenrd/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed
+	virtual/awk"
+RDEPEND="dev-vcs/git"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_compile() {
+	# Needed because of "hardcoded" paths
+	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"
+}
+
+src_install() {
+	emake prefix="${D}/usr" sharedir="${D}/usr/share/doc/${PF}" install
+
+	newbashcomp contrib/tg-completion.bash tg
+	dodoc README
+}
diff --git a/dev-vcs/topgit/topgit-0.9.ebuild b/dev-vcs/topgit/topgit-0.9.ebuild
new file mode 100644
index 000000000000..e7df0c5baa14
--- /dev/null
+++ b/dev-vcs/topgit/topgit-0.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="A different patch queue manager"
+HOMEPAGE="https://github.com/greenrd/topgit"
+SRC_URI="https://github.com/greenrd/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-apps/sed
+	virtual/awk"
+RDEPEND="dev-vcs/git"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_compile() {
+	# Needed because of "hardcoded" paths
+	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"
+}
+
+src_install() {
+	emake prefix="${D}/usr" sharedir="${D}/usr/share/doc/${PF}" install
+
+	newbashcomp contrib/tg-completion.bash tg
+	dodoc README
+}
diff --git a/dev-vcs/tortoisehg-4.5.2 b/dev-vcs/tortoisehg-4.5.2
deleted file mode 100644
index 12af122671a4..000000000000
--- a/dev-vcs/tortoisehg-4.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=6
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.5.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b41777a711895e6d4e1a38972c3f042c
diff --git a/dev-vcs/tortoisehg-4.5.3 b/dev-vcs/tortoisehg-4.5.3
deleted file mode 100644
index 7b74b18b1336..000000000000
--- a/dev-vcs/tortoisehg-4.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=6
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.5.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3f74f7d737859a466638d0da94761f0f
diff --git a/dev-vcs/tortoisehg-4.6 b/dev-vcs/tortoisehg-4.6
deleted file mode 100644
index 1dc4ec25c6fe..000000000000
--- a/dev-vcs/tortoisehg-4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-vcs/mercurial-4.5 <dev-vcs/mercurial-4.7 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=6
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-4.5 <dev-vcs/mercurial-4.7 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd967a297044df85552326e89ef44e20
diff --git a/dev-vcs/tortoisehg-4.6.1 b/dev-vcs/tortoisehg-4.6.1
deleted file mode 100644
index c2d91d3a7acc..000000000000
--- a/dev-vcs/tortoisehg-4.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-vcs/mercurial-4.5 <dev-vcs/mercurial-4.7 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=6
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-4.5 <dev-vcs/mercurial-4.7 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.6.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd967a297044df85552326e89ef44e20
diff --git a/dev-vcs/tortoisehg-9999 b/dev-vcs/tortoisehg-9999
deleted file mode 100644
index 6863d9df7af8..000000000000
--- a/dev-vcs/tortoisehg-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=6
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3f74f7d737859a466638d0da94761f0f
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
new file mode 100644
index 000000000000..0232f882872b
--- /dev/null
+++ b/dev-vcs/tortoisehg/Manifest
@@ -0,0 +1,10 @@
+DIST tortoisehg-4.5.2.tar.gz 7935559 BLAKE2B c69107f28767936232937ee0b730b9b937dc1a475d142f0783b59b434072be1b2413f141e02985f3efe09a107782e64411323bd7c0a41be8802b1f23f54fdc77 SHA512 7be831203a33a9d7ea9e3caebb5a4d3f21ff0f07c508926b33b43db39ae11b3533c4274af78cdc2955fbea20f3e4ebe364004c9ad0a781ec7d49c19c2f5a1935
+DIST tortoisehg-4.5.3.tar.gz 7929645 BLAKE2B 95b867f372d636ed84eda918a707e24f4b11e34679ae9ed1c25f82a7aa6bb77f424bd68a99b5f961d14960a2f33005536996de2f3df9871684bb53f68130b1b2 SHA512 0c6c512f7a46a084904a5e66912deb8ef4abb99a6a97c46b6b058537332f091395f4b9b8a4b645d7c42637abbb4e8abe16f5040fd694bb43ea8b4c6ddb1e18f6
+DIST tortoisehg-4.6.1.tar.gz 7947844 BLAKE2B 68d0e8672febb9bfdca763e77cbaff8de79c2de79b61e0096c3ef7370cf9d9287a5fd65fbe3c262e13f185bcf5e384ece5d8365979bc05188e74ccfb49f43543 SHA512 adf5ebfc7a76843b62f66feddfde42c0f915c970a951e037f082ee4a6b393822b023f116dc650d5242838d006dc572235a4089c3805929727435588c24ded480
+DIST tortoisehg-4.6.tar.gz 7947478 BLAKE2B b2176e3fd508a84c247802490822d47ed117f3102b4ddc10987114018611a710696e2910f3e4b63f80357611fd2ebd8333322df1e5f549a9a618ea1b9017e430 SHA512 a57d3f10dde22da48b03252e41286dd40b7e261ae9ac9a0c09c8ccc361773d9f66ddb0f71c7eb800bfdae65587915a988367472885eb473ee810a07828044ce0
+EBUILD tortoisehg-4.5.2.ebuild 1954 BLAKE2B 39ba4dcab7e5adc52259be8fde3759374be41a5b222933f12c1fba2214e47827187164fe63342a59767e75d37ccb888deb45c329943698bedb52a39f813c24eb SHA512 cd6906236863be316c45f0208ef174cdaf03a7075d148bf1cb573fc4620f051a81ba764c8852109ed2365da15c8395947d0622feffd0d6831069df0c4634e6bb
+EBUILD tortoisehg-4.5.3.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
+EBUILD tortoisehg-4.6.1.ebuild 1956 BLAKE2B d50b774f17318c1cf54b28ad6e4af8df223505ca784679f9ddef11c8a22a1b814f38ee285c6f825745c0076f37bfa3c5104c4b36cb6e138822880418d8a93c52 SHA512 6b6e0868b76709c25461777c13af1c65c14ac6e843aadca60246bf831366395a2b0169caac279a8d7ea48120101550ad3647640759be8d97b89955cb8b72b737
+EBUILD tortoisehg-4.6.ebuild 1956 BLAKE2B d50b774f17318c1cf54b28ad6e4af8df223505ca784679f9ddef11c8a22a1b814f38ee285c6f825745c0076f37bfa3c5104c4b36cb6e138822880418d8a93c52 SHA512 6b6e0868b76709c25461777c13af1c65c14ac6e843aadca60246bf831366395a2b0169caac279a8d7ea48120101550ad3647640759be8d97b89955cb8b72b737
+EBUILD tortoisehg-9999.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/metadata.xml b/dev-vcs/tortoisehg/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/dev-vcs/tortoisehg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild
new file mode 100644
index 000000000000..d5027f979624
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild
@@ -0,0 +1,79 @@
+# 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 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="amd64 x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${L10N+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${L10N}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.5.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.5.3.ebuild
new file mode 100644
index 000000000000..3e6b1f3db8cc
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.5.3.ebuild
@@ -0,0 +1,79 @@
+# 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 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${L10N+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${L10N}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.6.1.ebuild
new file mode 100644
index 000000000000..7b53e9b14fbf
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.6.1.ebuild
@@ -0,0 +1,79 @@
+# 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 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.5 <dev-vcs/mercurial-4.7"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${L10N+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${L10N}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.6.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.6.ebuild
new file mode 100644
index 000000000000..7b53e9b14fbf
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.6.ebuild
@@ -0,0 +1,79 @@
+# 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 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.5 <dev-vcs/mercurial-4.7"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${L10N+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${L10N}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
new file mode 100644
index 000000000000..3e6b1f3db8cc
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -0,0 +1,79 @@
+# 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 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${L10N+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${L10N}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/dev-vcs/vcsh-1.20151229.1 b/dev-vcs/vcsh-1.20151229.1
deleted file mode 100644
index 7770c6b03e5a..000000000000
--- a/dev-vcs/vcsh-1.20151229.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Manage config files in $HOME via fake bare git repositories
-EAPI=6
-HOMEPAGE=https://github.com/RichiH/vcsh/
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=dev-vcs/git
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/RichiH/vcsh/archive/v1.20151229-1.tar.gz -> vcsh-1.20151229.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b5533e174c6bc637545b18666046501d
diff --git a/dev-vcs/vcsh/Manifest b/dev-vcs/vcsh/Manifest
new file mode 100644
index 000000000000..264576d03f66
--- /dev/null
+++ b/dev-vcs/vcsh/Manifest
@@ -0,0 +1,3 @@
+DIST vcsh-1.20151229.1.tar.gz 38309 BLAKE2B 9f9bb6fecfbfb01a88f7f0fb15cac3d83cb470ee6a73bfbbf2fde11b6d0bc7b8ea70da0c527563b4c06caa261fde98273baa80623783bef7345e02380d005f04 SHA512 da26044aa9bf884c178b1a2493f6bb4bea978d39d97f0dd31aef0130bac375ef2e519a3f7a14087467a3fccfd815f11c0718ca0f668d61dd91c97ac74af8afeb
+EBUILD vcsh-1.20151229.1.ebuild 917 BLAKE2B a877d89dbff5b922f3c1c4f45811c1f56060429a0f78db1ac44885171624af2dfae903972e3d76f4ad93f8360aa863b24db7b1858a0fe9bf8da1387525b54fd9 SHA512 e79025a27a3a5aca7af1d6905033ced9779262735ed1d665068858cd65ed548069a164896cf6a5d9815c49b9b6543f98e41f5320504c2a9e4f3bb061f2ae5450
+MISC metadata.xml 323 BLAKE2B 371d4afb7fc196b496f78215314b00694546dd2a998376efd2d21532b852b4321439866dcdc58607e03bf2d9f9e3454072642c3cc0e8e268fef04addc519e63f SHA512 53f63accf14a80139fd3d951f4916bd3bce437e445c6ed603d7fceb90cce3acaecb376024a1fc4633ba7db840754d10e83e1332352faeac33e5ede792bab310a
diff --git a/dev-vcs/vcsh/metadata.xml b/dev-vcs/vcsh/metadata.xml
new file mode 100644
index 000000000000..a876f3b7ae3a
--- /dev/null
+++ b/dev-vcs/vcsh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">RichiH/vcsh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/vcsh/vcsh-1.20151229.1.ebuild b/dev-vcs/vcsh/vcsh-1.20151229.1.ebuild
new file mode 100644
index 000000000000..dd891d7529e8
--- /dev/null
+++ b/dev-vcs/vcsh/vcsh-1.20151229.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION='Manage config files in $HOME via fake bare git repositories'
+HOMEPAGE="https://github.com/RichiH/vcsh/"
+
+MY_PV="$(replace_version_separator 2 '-')"
+SRC_URI="https://github.com/RichiH/vcsh/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="dev-vcs/git"
+DEPEND=""
+
+DOCS=( changelog README.md CONTRIBUTORS )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's,vendor-completions,site-functions,' \
+		-e "s,\(\$(DOCDIR_PREFIX)\)/\$(self),\1/${PF}," \
+		Makefile || die "sed failed"
+
+	# remove dysfunctional tests
+	sed -i -e 's,install: all,install:,' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	default
+	dodoc -r doc/sample_hooks
+}