gentoo resync 31.01.2019

20 files changed, 83 insertions, 489 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 258a13ca3497..afec3286729a 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 0632d8113774..9072995a227e 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,11 +1,5 @@
-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 2459 BLAKE2B 45d564c149ed3d5cf18c8a851c83867ba23f12b030664b261c3de2fe035316b1a8e1c94956929f0f9705bed95f3c13f7799da0a0856242e83462df051739258a SHA512 e06a318b5c742cfaa96f43ca161b80c4a8ea8d1597f85511f29882799f187c7a0e2853bcb5427f882b3274c4b2d9d58b035db772827ad257e41f2d8518937971
-EBUILD bzr-2.6.0.ebuild 2620 BLAKE2B a657288486403d51dedbc38c84160964e28259a83e3024e0e1929a81180a04ffa20cf3f5c6c9cbbcaec996711db1ec11b895c19918893371a33d632e13d63283 SHA512 10b98ec974074a78ca19ba62c1028becdf4370b86565855d8dbaaec97a2c7f1b54baa4971bfc8c8c0593f089b6b8b5e4cb7bfb978ac871d105c185ec1fbbdb6d
 EBUILD bzr-2.7.0.ebuild 2611 BLAKE2B 8a05b594dad05f945eec856e496109cbbf76de7a0597aa377c21ba0885312a59cbf689a115bfa7205e5354d5b16ee1f217c5b17b9d8aed058fda0782c197ebfa SHA512 3f60cd5bdaba84b1003ffee1b69061bb372c379befebdfdfc77ea739f40792bd1d35d4f6b3be79c46dbb8e9881de5ea27a3ecd8f566a5a2d803db43746ba01b2
 EBUILD bzr-2.7.1_pre.ebuild 2596 BLAKE2B d3a44f37fa78c3dc7d0aeb4303577e23af17fd23180f22e1997171cb689cbce5b8cab58cb99cdaae99ad992918c6eea71d0c4cc7bbfe634ad6f746ba6725b93a SHA512 aacd53a54c4a9427bb458f177dd93d1b4abe0b533e382a207eede33b9e88576c7fc5545092586a16f95ed6f0ac612de22f579c04e41dc05cac52bd8227718369
 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
deleted file mode 100644
index 7aaa0aa22229..000000000000
--- a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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 ~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
deleted file mode 100644
index 9ddf9d73ddf5..000000000000
--- a/dev-vcs/bzr/bzr-2.6.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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 ~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/files/bzr-2.4.2-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
deleted file mode 100644
index a5128a03d628..000000000000
--- a/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
deleted file mode 100644
index ac1fd0212d6b..000000000000
--- a/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 4b8c699e1ab4..89c18ce8a42e 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,5 +1,3 @@
-DIST cvs-fast-export-1.44.tar.gz 512435 BLAKE2B 2dfcd34efbf400c9d9a726933a18504a8d241928646d73f54f1860d1580030fa0328df4aaf5b57f1fbdc4b7b2c0a988ac903c8f9f03384515fdd5241fbf51c06 SHA512 66209589c692d2b0b2e60494386cb4dbae04f5f6676c89733d3ad6e5ce8b76d3cb70d7b03430be643e44eaff5848fdb7413795e10716a9ed8b4f2a4043f822a5
 DIST cvs-fast-export-1.45.tar.gz 517917 BLAKE2B 47d0debe2ea4d5674630065ee320c5db71f7ab6e4b17b7850d28c1951359ea98c639639574a7c3a25b9ec4e09ff53f1c5db566bff070e6381061fd828e875061 SHA512 f3acadabdd74f2099003a0cda29b021ea2173127af1a358bcb855397be95edaff2b1f30d3cf31dd6c08e79a8bad07b80b826c374d9b5e43555ec60d08dd577e4
-EBUILD cvs-fast-export-1.44.ebuild 936 BLAKE2B 9e127e6c4aeb2990c431cd0730c6d639d3becbadbb89dc879d48763fcf34450b899f6668de986ae5698b62afd80d5c1b0d4e52a8ed8aa76f634592cf407987fa SHA512 613e331d0054271bb3f2f6e67e16bbe2561b2e7e2f202662b71145f08fe4055657fd6621358a953b0772dc04820e86259630014a9f845fbcfb76754cfcb080a9
 EBUILD cvs-fast-export-1.45.ebuild 936 BLAKE2B 3edd1b15e04d12db47f0fbb6462f39f0d88ffbde284cbe65036207bd3543f65191d3ab6b4abeae1af4197cae2e60f5c04b44e396d07c9c0f1128ff0013408d40 SHA512 4f741abb002bea0dc0181351633a01df7af5935193e6314a690397f3ad5b9311036a715961f5c2d678a90455940844f5927d83ff8fb742f9dde3cada741c604a
 MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild
deleted file mode 100644
index 37967a3e1452..000000000000
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 some tests in tarball
-
-src_prepare() {
-	default
-
-	tc-export CC
-	export prefix=/usr
-
-	# respect CC, CFLAGS and LDFLAGS
-	sed \
-		-e 's/cc /$(CC) $(LDFLAGS) /' \
-		-e 's/^CFLAGS += -O/#&/' \
-		-e 's/CFLAGS=/CFLAGS+=/' \
-		-i Makefile || die
-}
-
-src_compile() {
-	# '.adoc.html' rules can't be executed in parallel
-	# as they reuse the same 'docbook-xsl.css' file name.
-	emake -j1 html
-	# Allow full parallelism for the rest
-	emake
-}
-
-src_install() {
-	default
-	dodoc README
-}
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 3831790e8c94..3944cdce7f77 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,6 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r11.ebuild 2984 BLAKE2B 722d554d0c47634755f07c7931a7397d07bda684eb301134c6257c76e7412e85a37e8c3a4e16aa1d5ba792711b057418b9d2ee87c7fbd4b253c4211ed579efaa SHA512 af3615d49bdc9cca776efaf8e05cb682710ef815a8dd319fac74964e7d5aa25e59814dbb962882a2acf0adec671e387012455edb340b9f4cfdceb3314a1773a3
 EBUILD cvs-1.12.12-r12.ebuild 2979 BLAKE2B 963559a287c19354b0b0f050fac6c04480e97e58e7a8b896447eed70918be2789133a3b4c9e5d68eca9b733fbe7d45b5ab04f81cfb8201bdb69f16ffd17d7307 SHA512 3406b3b1edf52d8b481fd5c3f43445a0d9221480e9c18e2f3b29a75f5afcd9b56c0743f18378333c402ea5ad79a671625f4f60c12e8d14e5ffac353ea2110dc5
 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
deleted file mode 100644
index 79106939bf1a..000000000000
--- a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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 ~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/cvsgraph/Manifest b/dev-vcs/cvsgraph/Manifest
index 1e41f5f9d2a7..2200cc530b45 100644
--- a/dev-vcs/cvsgraph/Manifest
+++ b/dev-vcs/cvsgraph/Manifest
@@ -1,5 +1,3 @@
-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
deleted file mode 100644
index 564e2b19c8f7..000000000000
--- a/dev-vcs/cvsgraph/cvsgraph-1.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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/cvsutils/Manifest b/dev-vcs/cvsutils/Manifest
index 07509c50e235..4cc66d7fdea5 100644
--- a/dev-vcs/cvsutils/Manifest
+++ b/dev-vcs/cvsutils/Manifest
@@ -1,4 +1,3 @@
 DIST cvsutils-0.2.5.tar.gz 79596 BLAKE2B db3a701e378892ac9986f981c5fc1f18cf1d75903741c74cbf0936682412b46c6292e00bd2962ef597c16f46fa256835b8ab5e272246ca142583ac90c6d1a459 SHA512 7ad840ebfdbc9e53bd7463bc523108381ad3d5d474e166e7dd0d8f1ffb5c6751d027d19b93743c412001ba63a60a6d4bb63a05a735d2f0b2246e14141ef638c1
 EBUILD cvsutils-0.2.5-r1.ebuild 410 BLAKE2B 7847406e36ed1b8d3aed9f93a068fe13e402d4457069419e2ba5e353da0cd2b1617e7d788c2d395d7a49ccaa673090d483c954bb0d346c569570923aba419ec6 SHA512 41d7976d917b2a6b67e54000ba18d83f2dceba5ccd84debb0c47e40233e7ddfc7f4e36ee04192a52e190d4a4ba313f236acc94f054b6bdb1e089c9e94d1a1347
-EBUILD cvsutils-0.2.5.ebuild 520 BLAKE2B 7b2873f0d0f391f244a770bcc16e0489829f0b826af16c9e62afc79061a473c7361e0137e4159180fa622b56bb0106345d57821e5131e3e289302d8649480335 SHA512 20c7226d24da154fa7af221a3aa4e0dcd79b0c7397a09bad17ab80711491111151d8b276445d205617c94ddd16f84334b1e509c2522b782ee6804109888d03d0
 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
deleted file mode 100644
index c34b4efd0f12..000000000000
--- a/dev-vcs/cvsutils/cvsutils-0.2.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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="https://www.red-bean.com/cvsutils/"
-SRC_URI="https://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/easygit/Manifest b/dev-vcs/easygit/Manifest
index c2bb7ab279d9..245488fcbb5e 100644
--- a/dev-vcs/easygit/Manifest
+++ b/dev-vcs/easygit/Manifest
@@ -1,5 +1,3 @@
-DIST easygit-1.6.5.5 283019 BLAKE2B 77d81b193a9dbb0d75df9aa66dd549418c9249a4b073528d72e770bc1857ee1165b33adbefcff94621cedf48edf8b551e065678b0a64166305467e2a01d2076c SHA512 2e639ffa40ac6ea8619abf5d8aced57a9fb203aaf96e259b2d3905b1d6d040d3d64adf14dad0552bd710808e3c23b63e859f1b5b02bd13aca1ad232fe05c2bbd
 DIST easygit-1.7.5.2 283887 BLAKE2B 978e60add4f9a3e982010a002bad74d88fd7b00b544a9150d6926aae24430e833f56115fce80568b9095d2b1896bd45838312012609c47a4499a7e67b05e9d91 SHA512 fa798a18b3d9ae8394faa3a5772ad21c6c439835de977dbce077b79823e022f9aa15e2d603ab16ea592048dab039aed2d647018cd83f7b3ec0b6c0e7679d0eec
-EBUILD easygit-1.6.5.5.ebuild 517 BLAKE2B 36e84d7bbc2ac2263979b81226df52f0ca44bdd3eeb3aee6cdb55b7d7f440d7b4d15dcfe836658a875ec868e2203532072bdeadbb72e6e6e06c41ea1441f83f9 SHA512 bc29b551e3fc1dd6f2aa6c75483a96cb258815e9ff809fe9389455eda391ab51a069c9fb4148dfe9830912a33c9317fcffa17be6249ca26bd7c9e99086cdbab7
 EBUILD easygit-1.7.5.2.ebuild 517 BLAKE2B 200072df1a75b28ba5dbe45c5482a4aea0ad923d1b30934ae303c32e918a72051a21d1d8c1e2ff97b84e376427cf86abbe11af9ac9f8a090b28a9547d8e57884 SHA512 20344edec75e386df8a23a902f1051b29cdffad1bd727ef3450e18f3862046355fb6249275115ae468ed275486a0b08c5f23c45746e91c68a0eff795bff05e72
 MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1
diff --git a/dev-vcs/easygit/easygit-1.6.5.5.ebuild b/dev-vcs/easygit/easygit-1.6.5.5.ebuild
deleted file mode 100644
index 0989d901a4ad..000000000000
--- a/dev-vcs/easygit/easygit-1.6.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/subversion/Manifest b/dev-vcs/subversion/Manifest
index 8799af3f776b..fe18b8e281fa 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -12,7 +12,7 @@ DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01
 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
 EBUILD subversion-1.10.3.ebuild 15403 BLAKE2B 3b64708ed206c09b91ba8c637c0a56f0b29f30992ab215fa4b496362bf86be83137165b1f86843ef06a76db0837e1a5472827714069f8fa9ec225f6b36f0eab7 SHA512 be239cab2cb71159d875c0d7a8e92d0a808b3f570c45586ec1c45e9f10c4f8ff90582d07e3385fee8442cb4562c05f6ae670a4dfb3a895b6f3f7d8bdd4355309
-EBUILD subversion-1.10.4.ebuild 15407 BLAKE2B b707fc18b9207a6c8d56010743e7794a408a26fbc5fb54dbcd2c38d701d6a05ee610dfb0fe9180fe9c2f2bc91a990ae6a56c9f46e7d55c3f09553285c78c6465 SHA512 f957dd67c64bc4c5bddd059ea5ce24efb1d4306846cbdabdc6e9eb35b18faf412457c32eaaa3b826e9ebdfe6d7b54290911fc765a38bfa2249241fee39cd038a
+EBUILD subversion-1.10.4.ebuild 15405 BLAKE2B 604a058d296f4a2ad603914a30a0e1bf06015486a0c63eaf330d77cde13741cdcd9701fa7d898ad5e5a09bbccfeaaa3bedea96df24bdd33c0c796caad1adc388 SHA512 55f05fa4184b05272078562eae5b85c268af4215a88201aa72d9bb21a2815c1f8f963477582df41398f77d4f9e52ee5f764e10dfed7db1cc2eae816938e73510
 EBUILD subversion-1.11.0.ebuild 15400 BLAKE2B 48a0c2c41995eb70c26bb875d0568bfa46987593afd6a0dc0a72c887e91cc668c8b176e1a2fe7dcb572ba51720510fcdbbb71be4fe59eb188b19adec24bffc57 SHA512 21b758cb2e8d5dd0288dd5e15c194991369423e38b4710290825faebdc9371e696a7ced51b702e19cfea70c9c6fd72ec0c321823ea6baf9f65fc0c3d4369e921
 EBUILD subversion-1.11.1.ebuild 15400 BLAKE2B 48a0c2c41995eb70c26bb875d0568bfa46987593afd6a0dc0a72c887e91cc668c8b176e1a2fe7dcb572ba51720510fcdbbb71be4fe59eb188b19adec24bffc57 SHA512 21b758cb2e8d5dd0288dd5e15c194991369423e38b4710290825faebdc9371e696a7ced51b702e19cfea70c9c6fd72ec0c321823ea6baf9f65fc0c3d4369e921
 EBUILD subversion-1.9.7-r1.ebuild 15859 BLAKE2B 0e057b982dc5c69823580408b77e3961aed8f57f262034fdbc5ca5df53de038f7cbb4a9a51bffd50406bc386887da3482ea542a614f997ddfd3b27bbea2a85cf SHA512 3de363cf9407f1525cfd30655740966a641f2252d4b0d65ba997252cf699cafa951327d886f181370ebb53cfcaf3cd7d3bbfbdd4e9a8248ea0a332f4b969fe26
diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild
index ef55999b2c52..735264320a53 100644
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.4.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 85077a075aca..39ee9ab0a296 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -3,10 +3,12 @@ DIST tortoisehg-4.5.3.tar.gz 7929645 BLAKE2B 95b867f372d636ed84eda918a707e24f4b1
 DIST tortoisehg-4.6.1.tar.gz 7947844 BLAKE2B 68d0e8672febb9bfdca763e77cbaff8de79c2de79b61e0096c3ef7370cf9d9287a5fd65fbe3c262e13f185bcf5e384ece5d8365979bc05188e74ccfb49f43543 SHA512 adf5ebfc7a76843b62f66feddfde42c0f915c970a951e037f082ee4a6b393822b023f116dc650d5242838d006dc572235a4089c3805929727435588c24ded480
 DIST tortoisehg-4.7.2.tar.gz 7948303 BLAKE2B 9439b86cfd004aa78fc39941cee005b3fe7fcf3a7a5d5dab4c0e0ac12477338000f07105fd7ee6c67def731f406313280acb6af7d5f1d70c51331d7339b21038 SHA512 d4d3c2bb097d12f69594d25c0029bf347f6aee7e4eb3fdecf3d49f3c679b11112376410a87733bb5e29ffdef2c6837e47f7af18121cb5b14ccef22f27a55ebfe
 DIST tortoisehg-4.8.1.tar.gz 7950273 BLAKE2B 91babad30d7fc34d6115babe86a6cf3a2a8afde73719bfec7220633f7824f953f3b6f6128a0f2956c0cafa568e3b12a4fd92d4a955f3b729c47a375c90ed500f SHA512 6ee1efe504265a7a43cae88d6fe25777ffb9109f4b01056e6248b6df1a0214a6f9eacc3121c458e6e0ea051dc56faf48acb2bda73f6e89fc3f686026fa0528b2
+DIST tortoisehg-4.8.2.tar.gz 8961094 BLAKE2B 3230ccd1f5fbfe44e1a656c5942592023d392816972663030df4d7c604dbea79a757b1695e60c450637d74aa53e0a821fd1e159ee9f1560ea6e48c766fd13dcb SHA512 46357dd982bdb1ecde419b63ae845f60523769e1be8145e883fcd6928008bac63a4c206423e764d4e6723049bd7ebad5fcd8027fa11beea485287fe3e74be566
 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.7.2.ebuild 1954 BLAKE2B 1d3c090f6041b99c8029b3550641836b326e85ffb3198501592730ed65fc4106adb76d74297323151595e08d19fbc06cbee07afe67ec8abc0d865a1ae6b92a69 SHA512 6f2f0ed76fb574a7b1edd3ecb0afc45bbef15967d37e3c45db8953e0e71b81eb3705e801564c5e9af882cff9885e7d5b5a94b406f8a698921db678bba22bfe32
 EBUILD tortoisehg-4.8.1.ebuild 1954 BLAKE2B 1e666f788f120557593592b3ce03ba805f4034082777b973caead1afd26be2d9e418dcab62a50f454c49322bbc5a73b31d1c0d783b872bdd849af8a6f1e185bd SHA512 e7f7741d1946ceb29fe0773197b03d5353d3d1b403dfeed1e7a0833be608ce29acda444a367c5bac1e174bd3bc9becae2a174d81ddbe1b472559cb13d534a029
+EBUILD tortoisehg-4.8.2.ebuild 1954 BLAKE2B f9d216665c4096ac29672635363b759f52e17503c0b62d4d208a44c7da31107bc16be3486122ade24a0b3a45e11ad27fe03d0116412364bf38b894da5e5b4237 SHA512 e87da39e030e65be2df13fc830f183b98f6a105d885c991868cc224c40a1a102dc8d75765dff8357b3464dc08b4b3eb131946fa1fdc868d521e00e56e9fd55de
 EBUILD tortoisehg-9999.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.8.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.8.2.ebuild
new file mode 100644
index 000000000000..c13880f7663e
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.8.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop distutils-r1
+
+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.7 <dev-vcs/mercurial-4.9"
+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."
+}