gentoo resync : 18.12.2020

2 files changed, 64 insertions, 0 deletions

diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 871fae3db620..691d4ac8d85c 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,8 +1,10 @@
 DIST tortoisehg-5.5.1.tar.gz 8918085 BLAKE2B 33aef61d97a34f45b10b291eb3a71bc46b70a1f24006fda0e651e88c61b0351701a3abdf6c1b0277fd81a0c5c9ff225b742215103c280eb11976a86e6bf2a47c SHA512 ca2d3833e379620b1a467b5a6016c8dbd54837d6ac5267063eb6768675dcb0c020a9b4ca2b2b8924a57c9e7d117668347e23762e8ff46c87825290071783aaa8
 DIST tortoisehg-5.5.2.tar.gz 8919653 BLAKE2B 33842e0df31efd4302e210119b098b9debcf1003d320f4b0d5d0c29796ae2149a4aca70871e5f5a82c635fb8e5a12eb56572b23f691152860a386ff8dde20ade SHA512 eaac888f1171d3e4bc1de49ccb5cff550ea859d702b65548040072e3805b54c93d38afdd1a132f6340275172cb456461d76bb4e53a477d0a6e180ac85783a1f4
+DIST tortoisehg-5.6.1.tar.gz 8904309 BLAKE2B 7faad055560560eeeb776349889b45ae8b1de72614f794de9a124b6293a549eeeed1276e9b8308e077f2d171efdfa695660ad7010edd2d8ab2804f28687715b2 SHA512 21a410277469803e1af45103bc5c7196bc7128e66ab297399b98731c32caa517da46bd06389f08ad740b78c22e58244757dbad4207b71d5643b9d1284ed9c936
 DIST tortoisehg-5.6.tar.gz 8920111 BLAKE2B 3779ea89f196bbf49c5efdc957983ff674d3c70c6ef04d758b2946851300bb115173a82d3ee9d0a51df6db51ed30acfa33abdfb2e6b3c08177d9dd5416741a10 SHA512 30013a776ea7e8b1167280350b64a993ebccbf82486f93164a1eaa42e98587719503c3dd939f9ea682d4302532216575ad7a20e9e2122315f63af7d002d08b03
 EBUILD tortoisehg-5.5.1.ebuild 1599 BLAKE2B 105f731aa25c4039994c6c165b4bdbe84558a6a8f91e4d2025a11fd068d39050a12a20c8e133b3cfe72aafa2be4edd8a1e47a10f77359fbf3704a3fe13b5e02a SHA512 0302ce34c000a686bb101e1d2f91a199baa4a744368740338bc60ba8b6cb49420237525db201ac1f78932d961622887b8e2560bda2f4c62b58b236f25590b9a0
 EBUILD tortoisehg-5.5.2.ebuild 1629 BLAKE2B f0eafc0cd3988992b564e3ba205eee8220606985c784230e2b7d74906cb403b52754d5991365f758bd0f45682fcb682f21aa0c6d1ece6d4077fa8b8c079f5be6 SHA512 75d32ef53a3b772026b82db17a403decd2af5a851e5967cbed5e94e0b8010fea85f17c2ae9cedfba85a464ddb9c9fe63369e4276e7e2acdf49b4eb12aa554582
+EBUILD tortoisehg-5.6.1.ebuild 1681 BLAKE2B be33d2db298c7de97da9ac2755f1af603b5cadc73215d2f6162eb7d33564a3360db6b9e334c249a69c57f73ee565d8dbb53b82ddb3e0f2724e8a143aeb0889ef SHA512 3f0e112ce2551fad78af3a5bb2cfb1bc960216a832c3eaf32108124d7aecc48ab5aa86b3fde77235cc0aab408b849fb5f879e155b37296a58dee72f213711828
 EBUILD tortoisehg-5.6.ebuild 1629 BLAKE2B 9db14ddd316e82560d4b0bd5a090b8879f69a4055bb6d1489fd3ad1cc3d928bb8890b083a2f176c9463b0e87eaad9a3e0649b146e09dfc9190e1fd6bd3d8c4fe SHA512 24bd77c5af5443f2b6e5563b2d03127dc5c93fd939b16f23e49291b84b2d1c40f1dde37f95acb8f155c8c74c521a21937d3bcad664ab4303b1f5347b972ada48
 EBUILD tortoisehg-9999.ebuild 1629 BLAKE2B 9db14ddd316e82560d4b0bd5a090b8879f69a4055bb6d1489fd3ad1cc3d928bb8890b083a2f176c9463b0e87eaad9a3e0649b146e09dfc9190e1fd6bd3d8c4fe SHA512 24bd77c5af5443f2b6e5563b2d03127dc5c93fd939b16f23e49291b84b2d1c40f1dde37f95acb8f155c8c74c521a21937d3bcad664ab4303b1f5347b972ada48
 MISC metadata.xml 774 BLAKE2B b03f2b762867838c9870f1ccc744ae17a866759efb26690e05e666f77635042d637c901905060c203f178beee3f44034d3af4813f8ec915f4af9cab928fa957b SHA512 1a4492a7f467cb8e2eadc760064768bd3bcd55deca269d643a0c07c9486b3a59c8be66ca8243efc76c65642e9b794ad334511c5ee9b6fdbbfd3b9dc7f5a64df1
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild
new file mode 100644
index 000000000000..7655deb4a47f
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit desktop distutils-r1 xdg-utils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND=">=dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+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}"
+
+distutils_enable_sphinx doc/source
+
+python_prepare_all() {
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	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."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}