gentoo auto-resync : 12:02:2023 - 09:56:54

4 files changed, 87 insertions, 3 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 776e1a20de0a..442eda6e0ff6 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 0ed1f864c286..ae39c7b37346 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,8 +1,10 @@
 DIST tortoisehg-5.9.3.tar.gz 8637453 BLAKE2B 9fa90c108f32b1e15c233e7ccbadbda08e434f23aa5c5fe7c235c743c98f54f4222a1804c06b0ca300cc3d0b049c117007a53452ff20ae4411bca30d8ed9013b SHA512 870b3b717962b8450d07fca5300f971d187236edce5a9d2926144b832c0771b8f5a324bdfd05a1fed3d2b4de4bad913c0c8f4435908e602e268c561ed64abbb2
 DIST tortoisehg-6.2.1.tar.gz 8877912 BLAKE2B c3741c89656e339c37238208c639717e95a8de40ab84e3dbcf151e97e9a51674ca481f7bacbe2cdf90a8b80e15f2cd10a13317b0da691ebb3103f1a460bbdb03 SHA512 282dfc765a57d8d47c81f68e72b22ac56e6d67b7eb2a76cb999880ed225067c590507af95629c621b129bdb6212450cf666aa72da7907584373f3a56fbfd6bcc
 DIST tortoisehg-6.2.3.tar.gz 8878641 BLAKE2B ede267f48c7b58db1fcdf16a11fb343e4fcf21193a43f6d6114ef6f930946beea458acc52780deaa889d429989c7b8b25045a9ed340297c0d1ee7e5e5e998d2a SHA512 8c7e62822bdbdcae7a371b910e3e549864019b3a74a090e59d0f26291525ebda078de3f41d8442b457e14727ec94143290d0f3fac9f49cbe842d1de298ae2edd
+DIST tortoisehg-6.3.2.tar.gz 8885325 BLAKE2B bb9a7043f7d2e44b32e20b6dd88372927977a6fd94b662a8a56d26776c72268e0953de3edc93b2f7b9efc580286632f500f5181a5ef7bf3edd3fb5ba5ec64761 SHA512 b711f9d347b2f00978b42b258713d365188c4de100668a09fea4b6f80bb8083a7980a462b8fb4705d31f9da310dbdeb2d9891e93f6e3f6f2833e4c7ccfa4d800
 EBUILD tortoisehg-5.9.3.ebuild 2167 BLAKE2B 98fe938cf4a84675cfb603c21ed26f5a5771a481fc2a49e0d7a31501bd76fcf821e8aba56560762399b1bf7704647c2378e9f6831a5429146cd6e9b2ad91fdff SHA512 b3702e07b333227b3ea283cf971efd8640bba3b8f5f1cd1806263ce0198f18352ebbc470f47e13e00a2a7cc345405068e6f78713955700dcd3a7894ee049148d
 EBUILD tortoisehg-6.2.1.ebuild 2288 BLAKE2B fde233f6384f203a5d63bb655ce4f7240846464d439e1078054045c2c9e93f620f2a5c0ca86807022b5bac1a207c902b43a0e0bb2ea070a8d116279712bdc495 SHA512 8afc4e9a5b9b092ce5e5fde2aef7ce072e1665df6e68a1b451819641d3efa0cca78126b75a9b2b460209cde6d7d3b88f538ad9ca724f22c3ab6b5acf0ec82638
 EBUILD tortoisehg-6.2.3.ebuild 2286 BLAKE2B 28dc72c911cb1574f9872f857b14a086532fa4b10e10690c20b42acd7724f5572f75a2ef1ffd8d2d96d589af055da69c94fb2ecc63dd947cbc26465fc903441b SHA512 6a62ff1e3f2af96dc688cef53a1a0021acfbceb94f531fa39931c99dec979b21d9ce08a539717902b2642a5bfac269c90486d701592ab6ff13388f8ee8cc6b62
-EBUILD tortoisehg-9999.ebuild 2288 BLAKE2B fde233f6384f203a5d63bb655ce4f7240846464d439e1078054045c2c9e93f620f2a5c0ca86807022b5bac1a207c902b43a0e0bb2ea070a8d116279712bdc495 SHA512 8afc4e9a5b9b092ce5e5fde2aef7ce072e1665df6e68a1b451819641d3efa0cca78126b75a9b2b460209cde6d7d3b88f538ad9ca724f22c3ab6b5acf0ec82638
+EBUILD tortoisehg-6.3.2.ebuild 2371 BLAKE2B 492fd50ac3c8b7d3bf4c67c5951f8006ce5b2bd10b75cddeece424b04384cc64398bcb41b1572d42e7125c43b78c380e0dcc69d44b61eb92f370317bca3beb7b SHA512 2e347aade2daed3f0b26124517d15bedc9004b3913c9a19aac15ef0a27a0d731abab4f3cc4e3d5579f34ab9165538aefc70341e66fec117177025bc7dcc0067f
+EBUILD tortoisehg-9999.ebuild 2371 BLAKE2B 492fd50ac3c8b7d3bf4c67c5951f8006ce5b2bd10b75cddeece424b04384cc64398bcb41b1572d42e7125c43b78c380e0dcc69d44b61eb92f370317bca3beb7b SHA512 2e347aade2daed3f0b26124517d15bedc9004b3913c9a19aac15ef0a27a0d731abab4f3cc4e3d5579f34ab9165538aefc70341e66fec117177025bc7dcc0067f
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.3.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.3.2.ebuild
new file mode 100644
index 000000000000..b14e5b79045a
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-6.3.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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}]
+		$(python_gen_cond_dep '>=dev-vcs/mercurial-6.3.2[${PYTHON_USEDEP}]' python3_11 )
+		<dev-vcs/mercurial-6.4[${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 c4e1efd98699..b14e5b79045a 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit desktop distutils-r1 optfeature xdg-utils
@@ -12,7 +12,8 @@ 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}]"
+		$(python_gen_cond_dep '>=dev-vcs/mercurial-6.3.2[${PYTHON_USEDEP}]' python3_11 )
+		<dev-vcs/mercurial-6.4[${PYTHON_USEDEP}]"
 	S="${WORKDIR}/thg-${PV}"
 else
 	inherit mercurial