gentoo auto-resync : 04:08:2022 - 14:05:20

4 files changed, 85 insertions, 4 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 3ada329782d2..57b91ceb5443 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index bfc0644d22ff..bf6d44e2baed 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -3,10 +3,12 @@ DIST tortoisehg-5.9.1.tar.gz 8637928 BLAKE2B 57687359eb00018a811e28449dccce26056
 DIST tortoisehg-5.9.3.tar.gz 8637453 BLAKE2B 9fa90c108f32b1e15c233e7ccbadbda08e434f23aa5c5fe7c235c743c98f54f4222a1804c06b0ca300cc3d0b049c117007a53452ff20ae4411bca30d8ed9013b SHA512 870b3b717962b8450d07fca5300f971d187236edce5a9d2926144b832c0771b8f5a324bdfd05a1fed3d2b4de4bad913c0c8f4435908e602e268c561ed64abbb2
 DIST tortoisehg-6.1.2.tar.gz 8676222 BLAKE2B 08f8ed7e17ebf9223b91496a5a7ca90f11d1c859d82c5ec7ad714690fe4bb00ac96d89cd7552cba0215b505604688bae875d59e3efe5cde64a26baf331e6301a SHA512 baadb018a0e426a83b7be484834c336099e8969711bc6b6752e98262b88ea5ff3fab7dbb13fe9622e4823f719f008ca0ee599823e65253c7c7741efb0f796558
 DIST tortoisehg-6.1.tar.gz 8651661 BLAKE2B 0b66c057973eeef443370151884205144d75a7f21f3f3af5521ba43c2e366cc28c52850ddd7eec6e33ba97236fca99e63fdf9c0eb570213f382d726e63837217 SHA512 98b2d1c357f0996f8e2ef9e2440fe005e28672effe8a871a2bf940a973cbba9f49afb234eb28d4d9b3a15bad4bedd61d302e975787e76f9abd52f5958a7a219f
+DIST tortoisehg-6.2.tar.gz 8876113 BLAKE2B e6840c6c3e6f0dc19e06313644072c21d28ee59a7f5d7b3b4114b643ef4a013375df8f27ce8ad8e7a2ba49d4086ea46e249fc3bda63b217940bc6e9deea2b0e0 SHA512 1a63d4ed92887c6dc4fef153c6dc8c054c5927c0e3b92b26e6a7782af4438cf4f4c83271c0a037fb107538f781d26a765937197658b8250df3735e39a0194344
 EBUILD tortoisehg-5.8.1.ebuild 2164 BLAKE2B 14da93c64160f5a6c91f149c7a288d5a881d434475ebf7fd3ea3a083d9ff4979351a4cbe6c0aa63d80a54c3ce4add40ced1740455ca7f070af601283055487d9 SHA512 242b69d6694fe007cf99c22a815add13e177243475d03006272a4757d7fc0e1892be03986626cc00aada6d8fb316dd0bfa2738197ab8ed50f60eca033eeb04b5
 EBUILD tortoisehg-5.9.1.ebuild 2166 BLAKE2B 37f3f4cceb3c06419e6e8748e4275d1dd1a7016c487ff84896214cdd38b846c65ef670df8d9edf1b0f50c55644424bcf54777965efc57e78a514fde0fe540ff2 SHA512 7428b10790d699dfeef38a0113e3310ba5c7a30799e47799fca9d9183658ca8ca0d9c6797f2cddb5b37e1c6f2ac8fa55384dbbc6d03bac0c7e1e4e56c2e67229
 EBUILD tortoisehg-5.9.3.ebuild 2167 BLAKE2B 13e6c2192566a0b9e8516dd9559de8a950725d015d05bb758cfbdae971d8c2d36adefbdba6bdd0a4af016b3d7c35c4c9cf685cf6a768200e536b79524d72e365 SHA512 f1cf4730cf2df0e123f870abcc9dcbbc086fc57401510f3a15eb005a48b4fcbbfaa15cf6b7e759cd2b9497c121f2a1b459fa94930bcfe74955922d4c13bd4351
 EBUILD tortoisehg-6.1.2.ebuild 2288 BLAKE2B 8eecbcdb19d6f5d751165c42081cc3e55704fc6b7a3d91123ddbe65fc8b9a6689dd4ac430fbdf79d2939dcce92c36a8db96b6dfb83cb902611a3ee120430199a SHA512 a56732ab51c022d79388425fc5f0e7006c294db622f655b88d119137ec0fb7770053d32443cf9535451be2f7865ab361530aa7ecd22aafea281d3ea02844525f
 EBUILD tortoisehg-6.1.ebuild 2278 BLAKE2B 58939a72d5a5b3f0e29a888c7c5bd1dd10c6cee156f15ece7a96d2275a120b4de407f68ff0754559c20beb22f803b3e3a7790723ea48552b0fdf040b87d0e657 SHA512 e82068b5541af14d1240dacad789b842d3afde556903fdf80651614f4e5d5ce3f9a037fc5a5975a27f36ff62d927bc98ea9f2b23250acc6ed52286e8248685e1
-EBUILD tortoisehg-9999.ebuild 2168 BLAKE2B 15d7fde70b89afb0d760d1b11ea5f7f2f1bbd9eb70c85a86dc9123f1e7199ef047f9eae7d8f38aab32fc4844c46038e18f3a6e2d32eadb8e87e30b283cca224b SHA512 c14c6428297b9dab3b7204d504ae4cf46938ed117f4168462d8757acc5654f3f79a548cb0a4dea0803ff7556d9795ff80544312f0ff40cbb955b2c676cf30128
+EBUILD tortoisehg-6.2.ebuild 2288 BLAKE2B 510e52441f7b064df2279c3ea55594f33d6d1ff9431955a21b7ea469557c3df1409cd172a5d985f39bb9262f822dd8ee417e362a8a13e087a697b4b59f12b6f5 SHA512 805275039e76f706056581e8a2945a8837bfa8881ac1bbc6f91219d21cd9bced4bef43643e66ebec1594aa7c930ff49e4f27fd3ffb954294906ca889c0d89bd2
+EBUILD tortoisehg-9999.ebuild 2168 BLAKE2B 644e8ac3b2f9c8ef622aacab32b8bf84ceb9f398e494ca628e82b134a77c2310d4e752a62c23279e9905f8f0cf160b8757460566051ca59461cd62611bf6a22c SHA512 2211902250f5c344ca0eff4f1e67fb939d10f53d5f673bae4f359e948560b954a14f45d5d65620c592223f08312cf2238af6c2ecc9d08cf6323886383d398b34
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.2.ebuild
new file mode 100644
index 000000000000..d1fbe12fabfd
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-6.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-6.3[${PYTHON_USEDEP}]"
+	S="${WORKDIR}/thg-${PV}"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+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.11.6[qt5(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+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"
+
+	sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} tests/run-tests.py -m 'not largefiles' --disable-pytest-warnings --doctest-modules tests || die "Tests failed with ${EPYTHON}"
+	${EPYTHON} tests/run-tests.py -m largefiles --disable-pytest-warnings tests || die "Tests failed with ${EPYTHON}"
+}
+
+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."
+
+	optfeature "the core git extension support" dev-python/pygit2
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index fbf56b913fc3..56fb962cbc28 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit desktop distutils-r1 optfeature xdg-utils
@@ -13,7 +12,7 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
 	HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]
-		<dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]"
+		<dev-vcs/mercurial-6.3[${PYTHON_USEDEP}]"
 	S="${WORKDIR}/thg-${PV}"
 else
 	inherit mercurial
@@ -35,7 +34,7 @@ RDEPEND="
 	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}]
+	>=dev-python/qscintilla-python-2.11.6[qt5(+),${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}