gentoo auto-resync : 26:03:2025 - 00:31:47

4 files changed, 430 insertions, 2 deletions

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 7d7471afc310..51b18960d07c 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,5 +1,6 @@
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 AUX python3.12.patch 2212 BLAKE2B f5992925ca9e89e97908b155bcdb722882c150983248010ddbc7f63afc36b2cec40f984568d029ec69f59171e5b8d5a2dadb5701943a1984c7d24acfa4060db8 SHA512 8571a633867b505f2af860f07ba24f5b92cb3bb94db2714887006d32f24d3b2974c77fd546b836e6dcea648d919fb48fc0937d517adc90358ab5ec4b208ba513
+AUX python3.13.patch 1177 BLAKE2B 19d0e453a14b04d9f3e79feb274f05b4b7a3e783e72112f8029e6fc867417ad85396756dc231ca98345c564a87ad42547fc24525802eaa905f28f824938b1c50 SHA512 afeaeafb516fdbda3db9db9e5e3eba8023b63023b4f745ef12c3ef9b022cdf6feec77054ba21fa686a1303c09cebc56a1ffe5191eb86bec19fa302e95e80f3e0
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.8.2.crate 42491 BLAKE2B 95e07f014d3e985bf7b32f71741d18c87201c0a57d85b5f433834a40d964c73ec9f121f20523bb5ff9f3579fc9fa733a745765ff718261e468ef5d7b18e89df4 SHA512 efc633b4dcd790e8dbc2da4e103a7ee82c3e0f97d37e15a06fd6fc0b73923d721604708f13435a9dcba50c4d53ca5db498e62f84320d8e966581889c2e9d9722
 DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
@@ -219,7 +220,8 @@ DIST zstd-0.12.3+zstd.1.5.2.crate 29693 BLAKE2B 57789ec212f12d3416784d7d8830a197
 DIST zstd-safe-6.0.4+zstd.1.5.4.crate 20856 BLAKE2B 05ef99fecb0d49c47dda75c23e89b7c5193ea00cee153be1856818ce3cbb97171b631ad27c01bde6fb02cc532a4aa8115ad9c6f2359ae6917e86062d833b75e4 SHA512 db03385ae800053ddb1bb6a2089712f284c21e43a99deeed6367ca8dabbb3f96b12066dfb57f484172a386fc9576c28e38d1a7bbf838debc05877bc68cd5c9cf
 DIST zstd-sys-2.0.7+zstd.1.5.4.crate 732100 BLAKE2B 1859d1feb7c31d53df56b198b88a391bf09e221d09d449878043dc780ae6e3b3a0ad05fe3fb4980e849ab914f68d281d41f51f7bbceec6e1403d9b4e25572b4c SHA512 dcddc4f0d7486ee144df4e2173536dc02c9714b6f702edb9a9e04b4c02f4d347b5a70fbc020c1d08c079d38a423c4dc8b6b86e7e43ec3ccfcc8e3ff9861be11b
 EBUILD mercurial-6.7.4-r2.ebuild 8360 BLAKE2B fb630c6ff9bc36010b1f32733bee492406b9ef662dbf0fffb42279fe3d73d628d697e03b378e6ea8fcaf6dbd26fcb9305206c6a0ca71906a640f3dbc7f76e298 SHA512 68368549c508956cbf5aebf58c9ed958e00eb93f8ee864284c8bf847685bdc143341808b4675c0f091e73d3fdc0e64bb4ce8666697dfacc1554b51dca74d8ff6
-EBUILD mercurial-6.8.2.ebuild 8642 BLAKE2B c25dc6ff45974c23e95e63bebbf326e0923c07c338d5a14ab7e3f83ab08c71d1a4d6b829639bcb17efe3465ae749917c3e03890c439a0428bf183b322a6c5b71 SHA512 9d1463b1e6e7485dfd3840041075b9df23b28ae344f4469932962423c58ea23a458e0231c0dce5c0c9cc5b930f78959b0a8873ca4ed5fe487b300db4f1b90dd0
+EBUILD mercurial-6.7.4-r3.ebuild 8399 BLAKE2B f4eeabd7d5cc6e16b5d06fd0fe64388568f504b43f766043836d2cb5459ccb5834d2eddeb60044e5f26c627c4ce3c71575e7554e2da173720865ca92dcd94051 SHA512 b5bc11237a0d55c61e7f237b57b5ecf9c49f6a7d0ec966f4e2bd3e0e96b80e7f24b37ab62796d79ee31b2cd9771068cdff3c69ca56c79f4f46ac910ccc26205c
+EBUILD mercurial-6.8.2.ebuild 8642 BLAKE2B 3135df9a51ba25ea379bc73ca60ff01e14063579d70d2dd23c42a9969bfa63dc84d56fd1f3ca28a3ebfb41e6a325a2116536265fb28c2c168b143b14f70ff824 SHA512 1d982b8294f46eb204f5cb88a7afd25a56701e7c887bf1b2edfcab896dcfd5f38a73b8dc0d149511224553bb4a0a80324688dc1c657ff816548ba8b05a1b6008
 EBUILD mercurial-6.9.4.ebuild 8922 BLAKE2B 401f284d0134ab35806eba2241dcb3b9d8a005cbd21c91172a3c2b6f9d8bf9274756d5adaa9252be2e31c9b24a7b6e5c2ec28a095eeee461a6b872b0661ee2e3 SHA512 2d85eb33f5aaba06e470b2f7fbc7560236f5171c28cb329abb3f56bff1cc7d169d784f6959cfc48c9b773018d6dabae97cf25d91e59b2259244a232c54669b3e
 EBUILD mercurial-9999.ebuild 4769 BLAKE2B 81eb0e1818c3a19c9ad2d9d5f229533d7375111f9db152a1e20bb3cc1817eac36500381c26dd85f643f766bdf2290c2d20503c8c47ae7a989c2e103cc50c3959 SHA512 4045b24dd165af790ba1d7047a99f3af4fbe6b2f2151fe8ae917315ce7f69e75c696a6630dc399139f02b1c02d8c9bb629399ae19bd9aed71e5dd10c80bd34d9
 MISC metadata.xml 543 BLAKE2B 648353ce40bb4e93585e0f34b7bd7eba764b421ae9962835d2e00ae6e893e1b0c9f7e94e1e3548f098a57f5901840986784e5c7e163679b41f6475ff9ba190ce SHA512 e6850e1b5088298ad42f2a9ce5313a4c974562242ee77e7af5c53bcb91bddb1676a24690a14d67dbac911735aaef462d70019b6fb764e1e17556df29b0ac7e1b
diff --git a/dev-vcs/mercurial/files/python3.13.patch b/dev-vcs/mercurial/files/python3.13.patch
new file mode 100644
index 000000000000..86a36c94c6c4
--- /dev/null
+++ b/dev-vcs/mercurial/files/python3.13.patch
@@ -0,0 +1,34 @@
+
+# HG changeset patch
+# User Mads Kiilerich <mads@kiilerich.com>
+# Date 1728323604 -7200
+# Node ID 141ed0bf72a1fe00f5a9ea105bb042a182c56fc5
+# Parent  7b8769cca23dc78e9dd0f0eec52dcc467c76ddcb
+hgdemandimport: add collections.abc to the ignore list because Python 3.13 rc3
+
+It worked in Python 3.13 rc2, but something changed for rc3.
+
+Now, when i18n.py imports typing and it touches collections.abc.Hashable , we
+get:
+
+  ValueError: module object for collections.abc substituted in sys.modules during a lazy load
+
+This seems to be a general problem, released in the final Python 3.13 . I have
+not analyzed the problem in details.
+
+We *could* work around the problem by disabling demand import of typing. But
+that would effectively disable demand import of collections.abc too. Instead,
+just disable demand import for collections.abc .
+
+diff -r 7b8769cca23d -r 141ed0bf72a1 hgdemandimport/__init__.py
+--- a/hgdemandimport/__init__.py	Tue Oct 08 20:50:46 2024 +0200
++++ b/hgdemandimport/__init__.py	Mon Oct 07 19:53:24 2024 +0200
+@@ -62,6 +62,7 @@
+     '_weakrefset',
+     'warnings',
+     'threading',
++    'collections.abc',
+ }
+ 
+ _pypy = '__pypy__' in sys.builtin_module_names
+
diff --git a/dev-vcs/mercurial/mercurial-6.7.4-r3.ebuild b/dev-vcs/mercurial/mercurial-6.7.4-r3.ebuild
new file mode 100644
index 000000000000..a9710dce0faa
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-6.7.4-r3.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+DISTUTILS_USE_PEP517="setuptools"
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	adler@1.0.2
+	ahash@0.8.2
+	aho-corasick@0.7.19
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	atty@0.2.14
+	autocfg@1.1.0
+	bitflags@1.3.2
+	bitmaps@2.1.0
+	bitvec@1.0.1
+	block-buffer@0.9.0
+	block-buffer@0.10.3
+	bumpalo@3.11.1
+	byteorder@1.4.3
+	bytes-cast@0.3.0
+	bytes-cast-derive@0.2.0
+	cc@1.0.76
+	cfg-if@1.0.0
+	chrono@0.4.34
+	clap@4.0.24
+	clap_derive@4.0.21
+	clap_lex@0.3.0
+	codespan-reporting@0.11.1
+	convert_case@0.4.0
+	core-foundation-sys@0.8.3
+	cpufeatures@0.2.5
+	cpython@0.7.1
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.6
+	crossbeam-deque@0.8.2
+	crossbeam-epoch@0.9.11
+	crossbeam-utils@0.8.12
+	crypto-common@0.1.6
+	ctor@0.1.26
+	cxx@1.0.81
+	cxx-build@1.0.81
+	cxxbridge-flags@1.0.81
+	cxxbridge-macro@1.0.81
+	derive_more@0.99.17
+	diff@0.1.13
+	digest@0.9.0
+	digest@0.10.5
+	either@1.8.0
+	env_logger@0.9.3
+	fastrand@1.8.0
+	flate2@1.0.24
+	format-bytes@0.3.0
+	format-bytes-macros@0.4.0
+	funty@2.0.0
+	generic-array@0.14.6
+	getrandom@0.1.16
+	getrandom@0.2.8
+	hashbrown@0.12.3
+	hashbrown@0.13.1
+	heck@0.4.0
+	hermit-abi@0.1.19
+	hex@0.4.3
+	home@0.5.4
+	humantime@2.1.0
+	iana-time-zone@0.1.53
+	iana-time-zone-haiku@0.1.1
+	im-rc@15.1.0
+	indexmap@1.9.2
+	instant@0.1.12
+	itertools@0.10.5
+	jobserver@0.1.25
+	js-sys@0.3.60
+	lazy_static@1.4.0
+	libc@0.2.137
+	libm@0.2.6
+	libz-sys@1.1.8
+	link-cplusplus@1.0.7
+	log@0.4.17
+	logging_timer@1.1.0
+	logging_timer_proc_macros@1.1.0
+	memchr@2.5.0
+	memmap2@0.5.8
+	memoffset@0.6.5
+	miniz_oxide@0.5.4
+	nom8@0.2.0
+	num-traits@0.2.15
+	num_cpus@1.14.0
+	once_cell@1.16.0
+	opaque-debug@0.3.0
+	os_str_bytes@6.4.0
+	output_vt100@0.1.3
+	paste@1.0.9
+	pkg-config@0.3.26
+	ppv-lite86@0.2.17
+	pretty_assertions@1.3.0
+	proc-macro-error@1.0.4
+	proc-macro-error-attr@1.0.4
+	proc-macro2@1.0.47
+	python3-sys@0.7.1
+	quote@1.0.21
+	radium@0.7.0
+	rand@0.7.3
+	rand@0.8.5
+	rand_chacha@0.2.2
+	rand_chacha@0.3.1
+	rand_core@0.5.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	rand_hc@0.2.0
+	rand_pcg@0.3.1
+	rand_xoshiro@0.6.0
+	rayon@1.7.0
+	rayon-core@1.11.0
+	redox_syscall@0.2.16
+	regex@1.7.0
+	regex-syntax@0.6.28
+	remove_dir_all@0.5.3
+	rustc_version@0.4.0
+	same-file@1.0.6
+	scopeguard@1.1.0
+	scratch@1.0.2
+	self_cell@1.0.0
+	semver@1.0.14
+	serde@1.0.152
+	serde_derive@1.0.152
+	serde_spanned@0.6.1
+	sha-1@0.9.8
+	sha-1@0.10.0
+	sized-chunks@0.6.5
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strsim@0.10.0
+	syn@1.0.109
+	tap@1.0.1
+	tempfile@3.3.0
+	termcolor@1.1.3
+	thread_local@1.1.4
+	toml@0.6.0
+	toml_datetime@0.5.1
+	toml_edit@0.18.1
+	twox-hash@1.6.3
+	typenum@1.15.0
+	unicode-ident@1.0.5
+	unicode-width@0.1.10
+	vcpkg@0.2.15
+	vcsgraph@0.2.0
+	version_check@0.9.4
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen@0.2.83
+	wasm-bindgen-backend@0.2.83
+	wasm-bindgen-macro@0.2.83
+	wasm-bindgen-macro-support@0.2.83
+	wasm-bindgen-shared@0.2.83
+	web-sys@0.3.60
+	which@4.3.0
+	whoami@1.4.0
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	windows-targets@0.52.0
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.52.0
+	wyz@0.5.1
+	yansi@0.5.1
+	zstd@0.12.3+zstd.1.5.2
+	zstd-safe@6.0.4+zstd.1.5.4
+	zstd-sys@2.0.7+zstd.1.5.4
+"
+
+# for stdsimd
+RUST_MAX_VER=1.77.1
+
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
+	rust? ( ${CARGO_CRATE_URIS} )"
+
+LICENSE="GPL-2+
+	rust? (
+		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+chg emacs gpg test tk rust"
+
+BDEPEND="rust? ( ${RUST_DEPEND} )"
+RDEPEND="
+	app-misc/ca-certificates
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? (
+		app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="rust? ( !$(python_gen_useflags 'python3_12') )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/python3.12.patch"
+	"${FILESDIR}/python3.13.patch"
+)
+
+pkg_setup() {
+	use rust && rust_pkg_setup
+}
+
+src_unpack() {
+	default_src_unpack
+	if use rust; then
+		local S="${S}/rust/hg-cpython"
+		cargo_src_unpack
+	else
+		# Needed because distutils-r1 install under cargo_env if cargo is inherited
+		cargo_gen_config
+	fi
+}
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
+
+	# Build assumes the Rust target directory, which is wrong for us.
+	sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \
+		Makefile \
+		setup.py \
+		tests/run-tests.py \
+		|| die
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	if use rust; then
+		pushd rust/hg-cpython || die
+		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+		popd || die
+	fi
+	distutils-r1_src_compile
+}
+
+python_compile() {
+	filter-flags -ftracer -ftree-vectorize
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+	distutils-r1_python_compile build_ext
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use rust; then
+		pushd rust/rhg || die
+		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+		popd || die
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install() {
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+
+	distutils-r1_python_install build_ext
+	python_doscript contrib/hg-ssh
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-make-site-file "${SITEFILE}"
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+	if use rust; then
+		dobin "rust/$(cargo_target_dir)/rhg"
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
+	rm -f test-https*			# requires to support tls1.0
+	rm -rf test-removeemptydirs*	# requires access to access parent directories
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	cd tests || die
+	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
+		--jobs $(makeopts_jobs) \
+		--timeout 0 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-6.8.2.ebuild b/dev-vcs/mercurial/mercurial-6.8.2.ebuild
index 19bdae5cb609..f0e34dc38666 100644
--- a/dev-vcs/mercurial/mercurial-6.8.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.8.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CARGO_OPTIONAL=1
 DISTUTILS_USE_PEP517="setuptools"
 DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 CRATES="