gentoo auto-resync : 15:04:2024 - 12:04:02

7 files changed, 89 insertions, 59 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 7d7835760010..fab796b1b855 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest
index 44baa6fdf6b2..446257d1ed08 100644
--- a/dev-vcs/git-filter-repo/Manifest
+++ b/dev-vcs/git-filter-repo/Manifest
@@ -1,4 +1,3 @@
 DIST git-filter-repo-2.38.0.tar.xz 153772 BLAKE2B 491269226c5db9fa57bb5e2038e2c8cb3e82577ff1ba8b34920857c2ec4275d4491e8e17f5bd34e63148ae0d6f7bb57ab3d1d36ffecd390579e0fdc773046d71 SHA512 786c27c1952a5e3625c924e71958cfd61d9065d32754a3e957f258767ccb5b147778c5d499eb82c7c1bf36a2f5a50b1cde372ebbc927aeeedbd713e5ab6563d8
-EBUILD git-filter-repo-2.38.0-r1.ebuild 1038 BLAKE2B 253a5596ed09668fe688cb35c4ab15b8511fbb3ed558a467d4a1e3bb9e15c0c1fad28cf6f293168d1ebb79ea6429e7a515cee53fdcafeff497bdd8ddbbd43118 SHA512 06626669ec797cfd902260400add1faf73bfa9a5ac3f78b6d00bbbc1eaab2137f392c2946498e024e20e88d8f70eb30cec4aa3229fb8bb47a10020d6bf13844b
 EBUILD git-filter-repo-2.38.0-r2.ebuild 1343 BLAKE2B af7186865e0eed2292234388a5b2a92453d1b92dbe245ef30eee0a8f7c46be6dc11823f061e725d77e69e03da3eaff9cc6259380b1ffa9146fa04665209d6c5f SHA512 b0d2aa30fd0dcb81bc9dad525c0a87ec858cc1d5d338afb83bf72f00d79af5662ae10c7ead429ef5f1adf2937835fa7ef6dbd6e9b5a7355824d976f8e424869c
-MISC metadata.xml 412 BLAKE2B 8f13a3d32ba207832ddf15614499392df1b7247c9e58407bc90897c3388de4441060a1e7a8057d694ceb5e76b72b31e4f2e07eb0da3aff0a2d711976be112481 SHA512 9050983df62a5229ed75e844cf955b28ccc5b2547a5e4c22122a8691ae685c4049200f7482a3283e2d919b6cb11343ac9db1bc3f03f4a62ecf9c887857ca5355
+MISC metadata.xml 332 BLAKE2B 768cfa834a427091d08c837a789a642a1542d9cfc0075426f43f6316e7a405841c2b858aec27d82b7201807d0aa2af759d2daf6a5b3ac86629bbf8a970d5f781 SHA512 9d4e308e7fb88017a68b0e2b6b612c39c805d10fa143824e7e9b7a881f5b7f132e0b77d0c51ffe57cca773cd4439ae31888ef90854ec0801f6d074d37b3a35ee
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
deleted file mode 100644
index 5519692b3750..000000000000
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1
-
-DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
-HOMEPAGE="https://github.com/newren/git-filter-repo/"
-SRC_URI="https://github.com/newren/git-filter-repo/releases/download/v${PV}/${P}.tar.xz"
-S="${S}/release"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-vcs/git-$(ver_cut 1-2)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	cat > PKG-INFO <<-EOF || die
-	Metadata-Version: 2.1
-	Name: git-filter-repo
-	Version: ${PV}
-	EOF
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd .. || die
-	bash t/run_tests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# Points to dead symlink
-	rm "${ED}"/usr/share/doc/${PF}/README.md || die
-	rmdir "${ED}"/usr/share/doc/${PF} || die
-
-	dodoc "${WORKDIR}"/${P}/README.md
-}
diff --git a/dev-vcs/git-filter-repo/metadata.xml b/dev-vcs/git-filter-repo/metadata.xml
index 32ef83f7cb36..568f4c434329 100644
--- a/dev-vcs/git-filter-repo/metadata.xml
+++ b/dev-vcs/git-filter-repo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">newren/git-filter-repo</remote-id>
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 64069528a6ed..6a23c5de4b03 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,4 +1,6 @@
 DIST tortoisehg-6.5.1.tar.gz 8854923 BLAKE2B 7536f5d7c2b0cda5bb812b2135dcb54ce9bf02a523648e4569bbca5772d3568a63cb09549b6e10c46d212e3c98791f3014b62386d68b488f78f57a235e0be36c SHA512 0e568937f25afa681e8c5f8b8ecc40ede046999318ff80bdd27516b523169c778c695a2a800876eac40480d6e009c83c6493dec3110673f5b79f284be1d4948b
+DIST tortoisehg-6.6.3.tar.gz 8857342 BLAKE2B 166d1305ed3ee54496b3e0b08fc92a34a56a9398aa618a0f2266e7413fafc371be3c308debc3260a15b59c147a00bbe0773df52a838c4a4f0028b29c1cb05090 SHA512 8de8a68a753e8554dcb9936f6ba237e0598df65e6039f7c608e692bc375258e64a443e27e63c337f361fc32c0076b79bd98a972c220089902ff4489ab3507928
 EBUILD tortoisehg-6.5.1.ebuild 2370 BLAKE2B 3183105b138f71a1a85a7de181a21f00e3cde0d0c3ab2a00fbec2a42200e625a3e0bd6273221e8ce763a0aac3e30b51456e70bbe61bc38ef40e41550c1fa6d4f SHA512 01f9acfa19f2ce2accefb15dd529890fc77156777ca9e4e13f7daed03c67c3d45d288cb6fadea6ea2d3b025cd85b722a28b0718cc3be2b2787a628250754fe7e
-EBUILD tortoisehg-9999.ebuild 2372 BLAKE2B 95d4ac68665dcf08e3bcf8a3319e8135ab6dcd6633e2735906a0d4cdf73956b195895f90a22eb6c9a75a61d2a1e999e4cfee00dc1f2993d6099312b274421bbb SHA512 f7c49e299d9f042a42b6df96cb53c5f767e06060cb034b0cb33c0870842b311cbf93fbf7cc37315a1c73cfd7716a2189d1ede874b27219f22adcad5c5010a4bf
+EBUILD tortoisehg-6.6.3.ebuild 2372 BLAKE2B ed663aba0a7d5f7b3388888b182fa470cbf894d950d00f4bec18fa5b9b7d7c1f75d01ce98076450f828db6530782bc4ecfb6241b4757d19cd1339c6a039bcffd SHA512 3bf65159d1c43ef7ca95faf964715d81fb08a238de01048c93b08029fe556088b02c3e8bf1df3a1c2d9bdaea4f719af80b05c1fb523686118e196a16c4820d03
+EBUILD tortoisehg-9999.ebuild 2372 BLAKE2B ed663aba0a7d5f7b3388888b182fa470cbf894d950d00f4bec18fa5b9b7d7c1f75d01ce98076450f828db6530782bc4ecfb6241b4757d19cd1339c6a039bcffd SHA512 3bf65159d1c43ef7ca95faf964715d81fb08a238de01048c93b08029fe556088b02c3e8bf1df3a1c2d9bdaea4f719af80b05c1fb523686118e196a16c4820d03
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild
new file mode 100644
index 000000000000..51dfb4c89ae7
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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.7[${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 372918b6780f..51dfb4c89ae7 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit desktop distutils-r1 optfeature xdg-utils
@@ -13,7 +13,7 @@ if [[ ${PV} != *9999* ]]; then
 	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.6[${PYTHON_USEDEP}]"
+		<dev-vcs/mercurial-6.7[${PYTHON_USEDEP}]"
 	S="${WORKDIR}/thg-${PV}"
 else
 	inherit mercurial