gentoo resync : 18.03.2018

5 files changed, 83 insertions, 2 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index a518ca75b36f..82444078eefc 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 1a8350b9ae86..dbb683898e5d 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -9,7 +9,7 @@ DIST mercurial-4.5.tar.gz 5876130 BLAKE2B aaf4bae584639fad5c7a5cf4df183f2c4f78be
 EBUILD mercurial-4.3.3.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960
 EBUILD mercurial-4.3.ebuild 3547 BLAKE2B 21d755c364cb4a6f38c3b50742ab2c1266d559868fa6cd234de9f644f456ecfb3ec9e26ce198232e1bff3d0d828ed2520c5863f92ea8c3216d7fde05cca36763 SHA512 e12beef3deb63a9d375724bb2781467f7f8b3643ba50821d7501ee8e0b93f59b08d7f5428ff2537ca2725ac54246f53473aaa4e3e867fbd4c86c1bbab0d04d2b
 EBUILD mercurial-4.4.2.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960
-EBUILD mercurial-4.5.2.ebuild 3550 BLAKE2B f10896bb63effe103dc478c467ef177f00b86b4b4c01a9eb730b3ba29069e90ad989b13cfbf80ff51066ac57548d0bcb5e4e0e8eb4b0b769ae82a60cca9d7a13 SHA512 7d42d34235b62d5b39e2fab8cf0fee86718031bc94d0664026b3a25a206437fb4a546e4b1f56206e28870facf13f4b4c311dbeb67447a4289ded0b18622f3bdd
+EBUILD mercurial-4.5.2.ebuild 3548 BLAKE2B e88ecb62aee14e82eda4c3ad59275b5ef6b320bb0ea1b515c2a3ffb18350dec12c8323bd2e00cd31466f4365f09a2c4cbd4a2de58a11c01496efebd01cf98a28 SHA512 41355139a19651adcedc5659061b5c1902ad761a437f5c4581ebfc981d2ff5ab7a7c0a8c28c890cc771602353beaf365610165f819f2bfff0c27f8c9a1e0d776
 EBUILD mercurial-4.5.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.5.2.ebuild b/dev-vcs/mercurial/mercurial-4.5.2.ebuild
index 6f7dff306aea..fea22eccda77 100644
--- a/dev-vcs/mercurial/mercurial-4.5.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.5.2.ebuild
@@ -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 b614c4bbd66a..0e898ebaa887 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,8 +1,10 @@
 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.tar.gz 8941832 BLAKE2B b5dda8acf483400bc7cdcc511ca26bb7edbda94aa7ce03fe2b2e3eadc4e7616a7773e7aa974815d51e06a0a8014186b3cb1817eb751509ee85db8b1a3cd4a5b9 SHA512 258956c1d8f7e3b47f35be1d4587a51bbf79d3b9bd218ab16dbfd36c366570b3b8d32fb9b9af54c3389f69e98185185e7900e6f26fb46d6024c979fb6dfb0f3f
 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.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.5.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild
new file mode 100644
index 000000000000..3e6b1f3db8cc
--- /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."
+}