gentoo resync : 15.05.2018

7 files changed, 6 insertions, 168 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e2d157e7af9f..e9291e2ab8d2 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 9a5727b5f035..75838da6986a 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,11 +1,11 @@
 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.3.tar.gz 5469979 BLAKE2B 5a0df1bce4b3343a9101b634aed44c7ab3af5ed9a07883b20f87829bedd5abdae92b476a3d108a9ccf093dad18f7c82b36d5d6a6622346e156bca6dcbaeb3c9a SHA512 d74ae5f35d8c415c07737b59e6c5455963dfbf5d038c43d683fd34dd84423b9ccf9cd670667f458db20d8580fc7c7d9e5609d29d990e1e94683734694211c417
 DIST mercurial-4.5.2.tar.gz 5779915 BLAKE2B 9abc5a8bafc43bc8e930bb51aa2e57397cd5858dc7bb31d9a37795a4e2799dc03b57130b23e29f89a07bd7502f136594a03d1a4bd5dfd04e2e968213b50413da SHA512 f70e40cba72b7955f0ecec9c1f53ffffac26f206188617cb182e22ce4f43dc8b970ce46d12c516ef88480c3fa076a59afcddd736dffb642d8e23befaf45b4941
 DIST mercurial-4.5.3.tar.gz 5884837 BLAKE2B 61e61624cb397786b7a4f6ed62a3ba0c2ed7cbacc5918341d014a7e0fd9bbe07c91def00539411e71d231d18060de8461bef05590626bf1318691f791e0ad2b5 SHA512 9c23ffefb0a194b5a88ee783186347c21e7d973524ba40119439702953b35b01ad6fbc32ce09ae169f1020963e92312a39321b1da3ffe06db1d44158761abbec
-EBUILD mercurial-4.3.ebuild 3547 BLAKE2B 21d755c364cb4a6f38c3b50742ab2c1266d559868fa6cd234de9f644f456ecfb3ec9e26ce198232e1bff3d0d828ed2520c5863f92ea8c3216d7fde05cca36763 SHA512 e12beef3deb63a9d375724bb2781467f7f8b3643ba50821d7501ee8e0b93f59b08d7f5428ff2537ca2725ac54246f53473aaa4e3e867fbd4c86c1bbab0d04d2b
+DIST mercurial-4.6.tar.gz 6226745 BLAKE2B 9304fff7f6cc67523e9d1c36aee110f2cfbcf2f059f45072e9175b6cb057273ff13e5823bc7831ac04de2e40b54fa660051861d42426c85b0a62b2c759aaff60 SHA512 2a7e94a338727afc97aab9c33ce4810a17088f5f477a83b581dcbf594e455062e69e6a3782f1665b24ffc011963b0eead6f7e637a63f241d256378d30b006c45
 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.ebuild 3556 BLAKE2B 97bf79f486cfeaa783c170df4d8460294073eb6a7c5ad6f79faa42bb78c8e35daff20e48d5248ee845f73d3fa231580f2acff63a0104befb900e8dcb08ec143e SHA512 9fb21045a85f89cda4641224ca3b5e8ee7320004b25b2eb134b66c7e25daa93fbfecd23def0ad2bec5b006372eb67bd3d093fa9eac6c62b68153907706b7044b
 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08
 MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1
diff --git a/dev-vcs/mercurial/mercurial-4.3.ebuild b/dev-vcs/mercurial/mercurial-4.6.ebuild
index 54d04647c438..55a97bb048ec 100644
--- a/dev-vcs/mercurial/mercurial-4.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 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"
+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}] )
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 3643c4f0683b..de60858802d4 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,10 +1,6 @@
-DIST tortoisehg-4.4.1.tar.gz 7923557 BLAKE2B b2574bb87693a3fb824c3c02424b8f5828c1e3673b111ae82ff0692588083eec639a67b200ce6e3def58e5a0e021898c3df62a053fa61d477f92d4226d3a1b69 SHA512 b364e6d16845c03aacaf691e8528e0bd87151026f9f55bcaf61ba67d1eebfc3f9935457e5ca3391e29417682367b9b33803a9870817c22db31f1dd26850e9d53
-DIST tortoisehg-4.4.2.tar.gz 8939270 BLAKE2B 858ef57f6e80244ebb99b43608b1d939896f60d2154e461a128efdb0d5ebffbf1b8d5a9a40596316b0bed8edd74e292b5e562e3119f75177d430c081ba07511c SHA512 6b0335d8022d015846d456d351b168f826afa5223b77ee45f2124fbd1099904cca4e2a3ca6cb7a48324491211a149bd431d29fab6932e8f8240542e13d814381
 DIST tortoisehg-4.5.2.tar.gz 7935559 BLAKE2B c69107f28767936232937ee0b730b9b937dc1a475d142f0783b59b434072be1b2413f141e02985f3efe09a107782e64411323bd7c0a41be8802b1f23f54fdc77 SHA512 7be831203a33a9d7ea9e3caebb5a4d3f21ff0f07c508926b33b43db39ae11b3533c4274af78cdc2955fbea20f3e4ebe364004c9ad0a781ec7d49c19c2f5a1935
 DIST tortoisehg-4.5.3.tar.gz 7929645 BLAKE2B 95b867f372d636ed84eda918a707e24f4b11e34679ae9ed1c25f82a7aa6bb77f424bd68a99b5f961d14960a2f33005536996de2f3df9871684bb53f68130b1b2 SHA512 0c6c512f7a46a084904a5e66912deb8ef4abb99a6a97c46b6b058537332f091395f4b9b8a4b645d7c42637abbb4e8abe16f5040fd694bb43ea8b4c6ddb1e18f6
-EBUILD tortoisehg-4.4.1-r1.ebuild 1958 BLAKE2B 9bcbdb8041527e8f28e3fa892c1361aba4bef802795d3031d3743713a3cbaedbe5ee36190f5233e6677714bed1462e6033f8fbe2a9ca8908c55de58caf32ac5d SHA512 f5a6d20b69f1196892fc7f7a66605653ea397881122bf9164260160d1be2b05490ee724be7b959bccfe9cb3cb6d92c6feac431e17cc7277811cf8d2e3c5e1c16
-EBUILD tortoisehg-4.4.2.ebuild 1960 BLAKE2B 0b7e73641f2cca4e70f52000e1d3bb0a5a7782a067fff385df4516c9c95b472c5e3ba0a3a9fefe9062d12ee571e8a98714ab073c28ff95fe395a133d35f18218 SHA512 fc5a09758d42c7c6e789607eac3431f8c310490c11e682be905bf7aa2299e5db3bd51692b9438d61521bd4cf16a856e0f6b5091fce23a986f08c22572b1e4afa
-EBUILD tortoisehg-4.5.2.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
+EBUILD tortoisehg-4.5.2.ebuild 1954 BLAKE2B 39ba4dcab7e5adc52259be8fde3759374be41a5b222933f12c1fba2214e47827187164fe63342a59767e75d37ccb888deb45c329943698bedb52a39f813c24eb SHA512 cd6906236863be316c45f0208ef174cdaf03a7075d148bf1cb573fc4620f051a81ba764c8852109ed2365da15c8395947d0622feffd0d6831069df0c4634e6bb
 EBUILD tortoisehg-4.5.3.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
 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.4.1-r1.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.4.1-r1.ebuild
deleted file mode 100644
index 939c734cba2b..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.3 <dev-vcs/mercurial-4.5"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	EHG_REVISION="stable"
-	HG_DEPEND="dev-vcs/mercurial"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="${HG_DEPEND}
-	dev-python/iniparse[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/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 [[ ${LINGUAS+set} ]]; then
-		cd i18n/tortoisehg || die
-		local x y keep
-		for x in *.po; do
-			keep=false
-			for y in ${LINGUAS}; do
-				if [[ ${y} == ${x%.po}* ]]; then
-					keep=true
-					break
-				fi
-			done
-			${keep} || rm "${x}" || die
-		done
-		cd "${S}" || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
-	if use doc ; then
-		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.4.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.4.2.ebuild
deleted file mode 100644
index 441fed1aec6e..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-4.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-4.3 <dev-vcs/mercurial-4.5"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	EHG_REVISION="stable"
-	HG_DEPEND="dev-vcs/mercurial"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="${HG_DEPEND}
-	dev-python/iniparse[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/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 [[ ${LINGUAS+set} ]]; then
-		cd i18n/tortoisehg || die
-		local x y keep
-		for x in *.po; do
-			keep=false
-			for y in ${LINGUAS}; do
-				if [[ ${y} == ${x%.po}* ]]; then
-					keep=true
-					break
-				fi
-			done
-			${keep} || rm "${x}" || die
-		done
-		cd "${S}" || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
-	if use doc ; then
-		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.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild
index 3e6b1f3db8cc..d5027f979624 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 eutils
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
+	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