gentoo auto-resync : 18:07:2023 - 00:58:24

6 files changed, 85 insertions, 70 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 423911865443..bcfc57aadc8c 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index fcaf07fcf6e0..cbc4e96712f7 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,6 +1,4 @@
-DIST tig-2.5.7.tar.gz 1176146 BLAKE2B e67847741469a776f5cfb9c7f51fd651c81ed2c03e4627e708481eca3a47dfdebb3ef1d827cccb01ec0b5de7514bfe4b6e9e5dcfc1d39469d21eb6297e4c3086 SHA512 26adbb8dc43ef7ec1eaf5d6def29a8b6dcf5e30825242fc489208139c8720805a265dd1ba412601df692f6d0438ee9e3171a3f8a3cc4599841d82dfc08a9ea1f
 DIST tig-2.5.8.tar.gz 1179844 BLAKE2B eff20358443bd794de2985e1c76db8be25f4461ac82182a72004ab380156c15c5ed27dc1c66fb347b1f3d1ccddcead0a031638762e48f7e88a3b0593a278d3d7 SHA512 f4e7648ae7c58e936251f69071a092617368a04eabb4ae6726b2de1dbd305c559b7235f7aa70868f4ada02611196593a6e1c241062f57cd05a9c98685385053e
-EBUILD tig-2.5.7.ebuild 1382 BLAKE2B dab6a6b793b4dc5194d6cd8522f36bb4f4aa75408f41d008dfaa50ced3b3479410420245da630c3a4203e27debaaff665fe4c4ea2024198cd7943f396c6b1dd3 SHA512 a9e8b466b38808e7c5cf5acc3a7d4a0b13b17ef595d6b5016e3a86d7eb0bfde98be64f9f4b8cb217cc0891a1b70c4ab67b80657dc382a16ef784da981fab6981
 EBUILD tig-2.5.8.ebuild 1382 BLAKE2B fd5e2cd40dfa4f9e56e6a4ac2829973f727b19561dadc2972b98a00f739368d6aad65c030d97eaa17d69caa406c456570fa38e57a4d699958d8c6e3225b69e45 SHA512 dce63574bd5851b0fb95c64f9e070d402e13c485e3ebfe6600ff5964fbe5eaa2cac144820baccc3b7f85f6df53770dd24196e207e64866e93335ed91b2faa4d1
 EBUILD tig-9999.ebuild 1387 BLAKE2B d6c8b816650720fec8b55378b82efa8b902f7bfcb956e494042ed1e966bcb8176f67251f374f006fb22b21d294ac6e9952500dad647e35c66b8ebb923afb4299 SHA512 90da86dc0394df0b870e942677a83480c157f798e463dddc63e1ff70d464ffd9632f75d0b509b36eca85ecb89559e3a3159aa09d16c58884ecdd68c2c7c746da
 MISC metadata.xml 717 BLAKE2B c92a0b14d4fd37479475e347e4157da9c6a6d81e7d0ee6c3cf389745eacf8c3cffb32ea696e89aad73f8fd46ce64f26500c2dc26ca8b1414e76019f1268db6f5 SHA512 b0a832d79a25f6d9d8161967a4b659b32f322c7bdc2a0c0d1001d48505c516c4802f941fb433abf9a027292cf5b0dedce2dd60e5ac68a0992eb309b66cc5db39
diff --git a/dev-vcs/tig/tig-2.5.7.ebuild b/dev-vcs/tig/tig-2.5.7.ebuild
deleted file mode 100644
index 46ef18654a01..000000000000
--- a/dev-vcs/tig/tig-2.5.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-DESCRIPTION="text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="pcre test unicode"
-REQUIRED_USE="test? ( unicode )"
-
-DEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	sys-libs/readline:0=
-	pcre? ( dev-libs/libpcre2:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-vcs/git
-"
-[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
-
-# encoding/env issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with pcre) \
-		$(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	LC_ALL=en_US.utf8 emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	docinto examples
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 9427e7fce7d0..f5c79ff1041f 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,8 +1,10 @@
 DIST tortoisehg-6.2.3.tar.gz 8878641 BLAKE2B ede267f48c7b58db1fcdf16a11fb343e4fcf21193a43f6d6114ef6f930946beea458acc52780deaa889d429989c7b8b25045a9ed340297c0d1ee7e5e5e998d2a SHA512 8c7e62822bdbdcae7a371b910e3e549864019b3a74a090e59d0f26291525ebda078de3f41d8442b457e14727ec94143290d0f3fac9f49cbe842d1de298ae2edd
 DIST tortoisehg-6.3.2.tar.gz 8885325 BLAKE2B bb9a7043f7d2e44b32e20b6dd88372927977a6fd94b662a8a56d26776c72268e0953de3edc93b2f7b9efc580286632f500f5181a5ef7bf3edd3fb5ba5ec64761 SHA512 b711f9d347b2f00978b42b258713d365188c4de100668a09fea4b6f80bb8083a7980a462b8fb4705d31f9da310dbdeb2d9891e93f6e3f6f2833e4c7ccfa4d800
 DIST tortoisehg-6.4.2.tar.gz 8854453 BLAKE2B 04c57de8ea745cdcd33fe8a65b95f76937b59f01486eec6f305eed52dceaed898d55b95769de8a4f41606a3dda6d81e44d3eb1690ee6dde7ab21526b2a46032d SHA512 efe23a991130423aa374e7dd5fe051fabcc6d48c3596a355c7d21dfa35de062411cf2edc3efe4800146c6b3ab4dbd064da54a4f27988297cfd6dc1f69ab14e22
+DIST tortoisehg-6.4.5.tar.gz 8854488 BLAKE2B a66478e04d2effe4f79b57789352f8c4a4dcca577c70292a6297cab6abb4738c2bb53979d636d3b1ca511ce3313bde598bd4bafa3ac78fa91262ba9c10e1d8c8 SHA512 cbde470405f1247b93a658c49ff6c0d188e283915825147a05f1957db382596ee35da7b1becd01bf21eb9f5672231efa3adf092bcca05d7d630c2fd1d8aa7338
 EBUILD tortoisehg-6.2.3.ebuild 2286 BLAKE2B 28dc72c911cb1574f9872f857b14a086532fa4b10e10690c20b42acd7724f5572f75a2ef1ffd8d2d96d589af055da69c94fb2ecc63dd947cbc26465fc903441b SHA512 6a62ff1e3f2af96dc688cef53a1a0021acfbceb94f531fa39931c99dec979b21d9ce08a539717902b2642a5bfac269c90486d701592ab6ff13388f8ee8cc6b62
 EBUILD tortoisehg-6.3.2.ebuild 2369 BLAKE2B 33f0a33cb8e0407cd98fbf6f005c31f06122f3fd0f173a122b02c4a1784da79c9c828db6885081329bd63148220b31209e738545474f2e82c8f3f94e3f113388 SHA512 0f3820a1fe27bc4e97f1ef229ce51b7f6026779593e6ead79593c512c2a576b2392ea51434f092012345affc5c0fdf99933c3eb9617414c0980f6a222b2e37b0
 EBUILD tortoisehg-6.4.2.ebuild 2371 BLAKE2B eca66ff4f1d05ac1bd36c5851ea43f8f5c4cd6843b04d6fc1c3d26682ee9b250a6a964f50bf11512cc4051e8917ff3a7b48830eb984409ad53f5679c84c84122 SHA512 f3ba92581ed1be3c07a2b88737cc68c707f480b8a747939749fa12d2841008eea2871073ee1a553c2ff4e3b599cbdb3933f3fc5bec3400de216303a9441146e8
-EBUILD tortoisehg-9999.ebuild 2371 BLAKE2B eca66ff4f1d05ac1bd36c5851ea43f8f5c4cd6843b04d6fc1c3d26682ee9b250a6a964f50bf11512cc4051e8917ff3a7b48830eb984409ad53f5679c84c84122 SHA512 f3ba92581ed1be3c07a2b88737cc68c707f480b8a747939749fa12d2841008eea2871073ee1a553c2ff4e3b599cbdb3933f3fc5bec3400de216303a9441146e8
+EBUILD tortoisehg-6.4.5.ebuild 2372 BLAKE2B e422d13c57bbfec4e6e680e97840eef2b02f9f626e5168c0ea1531b9b1068d8523b15e60323c33f66243df97d1b1d844d55ddb43d78e7a6eeb981dd8804ed1ce SHA512 7d598525bf4520ee89232f85d2aa714405f0ca72c95551c639f8f917059dea6a5f978aebdd22db1f8e76f2f0a3df3dc618bd1ca1617862487a824f0c3904dba6
+EBUILD tortoisehg-9999.ebuild 2372 BLAKE2B e422d13c57bbfec4e6e680e97840eef2b02f9f626e5168c0ea1531b9b1068d8523b15e60323c33f66243df97d1b1d844d55ddb43d78e7a6eeb981dd8804ed1ce SHA512 7d598525bf4520ee89232f85d2aa714405f0ca72c95551c639f8f917059dea6a5f978aebdd22db1f8e76f2f0a3df3dc618bd1ca1617862487a824f0c3904dba6
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.4.5.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.4.5.ebuild
new file mode 100644
index 000000000000..4ac9450fad29
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-6.4.5.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_{10..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-6.2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-vcs/mercurial-6.3.2[${PYTHON_USEDEP}]' python3_11 )
+		<dev-vcs/mercurial-6.5[${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-6.2[${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 7222b381f779..4ac9450fad29 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..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit desktop distutils-r1 optfeature xdg-utils