[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/

["Cédric Krier" <cedk@gentoo.org>]

commit:     65fabffdfa14b2dbbdf072fb107a7b0ef12a87e7
Author:     Cédric Krier <cedk <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 22:29:44 2024 +0000
Commit:     Cédric Krier <cedk <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 22:29:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65fabffd

dev-vcs/mercurial: add 6.8

Signed-off-by: Cédric Krier <cedk <AT> gentoo.org>

 dev-vcs/mercurial/Manifest                         |   3 +
 ...{mercurial-9999.ebuild => mercurial-6.8.ebuild} | 196 +++++++++++++++++++--
 dev-vcs/mercurial/mercurial-9999.ebuild            |   2 -
 3 files changed, 186 insertions(+), 15 deletions(-)

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 372cfa2005b7..df1b203c25a4 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -26,6 +26,7 @@ DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
 DIST cpython-0.7.1.crate 126286 BLAKE2B 04fb62bff2396ad3f705b495eda917704f67647278e22cd4e42716163340f0e7ea0b3155f6a007cb82baafa02a1d82918c8ae398c50142561f33eeaf31ddec24 SHA512 9a57a3c7406d7cf703578dcf5ee8da87855b5a053f2a68b43755690a2f0f51488dd9e4d85491a9c2ab0f1f602ac0046016b3e48340fb36c3453d86094c43e9d0
+DIST cpython-0.7.2.crate 125539 BLAKE2B e131bc7c7e7407c43fd713bf9bbe32363d434ee5a897dbc178c60254008cf104e84388679a334b026640226aba0f75d8400209be2a22c1f4cf934669ad5fdd53 SHA512 128a4734532b9f092714beddebccc5d0397ceaa61303564acc6fb4a91ac618e3eb5b3ba018379e0947541db64d924d35a01d1f8f396bedb2ef2c310a322ff801
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a
 DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3
@@ -80,6 +81,7 @@ DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db
 DIST mercurial-6.5.3.tar.gz 8235306 BLAKE2B d48c467e2c791a7421741e7aaae223eabcfb0bea5123cf80886edb6ef5ddec411540bae49f085ff03a478d42e63ef4803fd32c8953470cadc2de0153b9372aad SHA512 af90ec414fbf9da518ce0de5b855b5dd6e4141f838ab0da54a40f31aa00245d21f14f1352fe537744fb6ae5a3e4f2723076f4773fafac649b8483fefd002b510
 DIST mercurial-6.6.2.tar.gz 8252567 BLAKE2B 8fb2395e463bc6678cadb902c5559aea5a9ae08eebe2733228dabe78ed52cef89c8fb2690c677c9d1f9e5fdcf6a89ff065def0b9daa7292136b32ab45f9136d7 SHA512 cf45c7c43555bd64d95ec6de2af7952bb50c2fba9ec59ce1afd9437b1fb53e399bd1e6f1b6e17cc5699f598cca4e087f82b3097d2d772219dd0337bbbde2d16b
 DIST mercurial-6.7.4.tar.gz 8310726 BLAKE2B a4567ca200b89a1563cad4ef07832137b22b7c6b948c6fd5471f733d6a50b63ff0fe4c4b4e3298625c84da60353a903a83841038e8f8da743ee03d42a5ce513f SHA512 d2668750b4b86bf31323f103095a47cc963820f37769384f00b763b0cb2810ca660bce985a2d0b35b2617b57d6ecb61c97e7698198e89bb69c183bc91eeab96f
+DIST mercurial-6.8.tar.gz 8322075 BLAKE2B 72164cca8d5e75989a431eb79c53ad188e734842157d6dd1098729ff024dcfaac32d5570eca9f5a3c710694b2272221a36b259918520947e6ef0902e07ba03c6 SHA512 e0eab77c4599f24e33210404b16d591952fbcb7c5e3b64805abc18167c67eaad3d9baa2226e885add5e36569a5148d6a11c5690d68167690570e6e5b243e50f0
 DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
 DIST nom8-0.2.0.crate 162020 BLAKE2B e196fb349cdbb263d4fc754f922cd3b819f85bd323672f2f23ad465eea5352fdd631a7e411381f19447ff3b1f2780186fbb738d6f04fff33d97ca060ab94c2c2 SHA512 0d4cca8f13978e9101cc2eb9fb65ad879929a5361353c9a04e9850061e788e942948a6ea064c6986440a2576c10ce84daa8aa21d75214f322691da5f63668454
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
@@ -97,6 +99,7 @@ DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931
 DIST python3-sys-0.7.1.crate 47312 BLAKE2B a35f99cc2eadf412d3c0a98e0bc6bac4db0ce7fc9b4020fcb59367757123a822ed2475d0d556f44938ec4011e4181976246a1b2d8ced1f15c4418be2fb6a2649 SHA512 e52ca25357895b186f4d129902254831118a2c97785b9f11dbe8d82cb7895d0e181bc6c3bc1365dfdefbaee1c931bca58ef30cde6961d1d139b5db3887d1648a
+DIST python3-sys-0.7.2.crate 47056 BLAKE2B a47be67720b34d4d6a7f41bb5a9a4b5d79065322f8d73ad6d2c2c8acab0f4432bfad5da2cd07d93fac5492e9428ca12ae9338ec84f0a75b764fbd9ad8c9423bf SHA512 c848a366526fb0826d189f7789e8b0b77b11c539a12571b2506e12980600f1a870c3a6bc47fd2b48d4320ce292d1748c0dbf89dda8878e1e217c49ad95659562
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e

diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-6.8.ebuild
similarity index 51%
copy from dev-vcs/mercurial/mercurial-9999.ebuild
copy to dev-vcs/mercurial/mercurial-6.8.ebuild
index d271835b7698..6131cdb5b538 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.8.ebuild
@@ -9,20 +9,193 @@ DISTUTILS_EXT=1
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic multiprocessing
+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.2
+	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.2
+	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
+"
+
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="https://www.mercurial-scm.org/"
-EHG_REPO_URI="https://www.mercurial-scm.org/repo/hg"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
+	rust? ( ${CARGO_CRATE_URIS} )"
 
-LICENSE="GPL-2+"
+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 ~ia64 ~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="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	rust? ( ${RUST_DEPEND} )"
-
+BDEPEND="rust? ( ${RUST_DEPEND} )"
 RDEPEND="
 	app-misc/ca-certificates
 	gpg? ( app-crypt/gnupg )
@@ -32,19 +205,17 @@ 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 )"
 
 src_unpack() {
-	mercurial_src_unpack
+	default_src_unpack
 	if use rust; then
 		local S="${S}/rust/hg-cpython"
-		cargo_live_src_unpack
+		cargo_src_unpack
 	fi
 }
 
@@ -76,7 +247,6 @@ python_compile() {
 
 python_compile_all() {
 	rm -r contrib/win32 || die
-	emake doc
 	if use chg; then
 		emake -C contrib/chg
 	fi

diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index d271835b7698..86634c6fd33c 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -34,8 +34,6 @@ DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 		dev-python/pygments[${PYTHON_USEDEP}]
 		)"
 
-REQUIRED_USE="rust? ( !$(python_gen_useflags 'python3_12') )"
-
 SITEFILE="70${PN}-gentoo.el"
 
 RESTRICT="!test? ( test )"