gentoo auto-resync : 19:11:2024 - 03:03:00

13 files changed, 264 insertions, 6 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b3c22d42c9e4..c21bae8d9cb5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 05c4aba4b2d6..787968135317 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,7 @@
 AUX bear-3.1.4-reduce-grpc-verbosity.patch 1813 BLAKE2B 3a4e3faca382d3994bc94e5a3aa95c2d44f255fae95383068d44cc2347323508690451759533e01ebe2845235e7de0e37b1bf1f80aa9adbfe73c2b3a9546460d SHA512 58a1831c763565d443c7fad6b752640706176b19edd4d1fff67d74aecf5a3fb86d91d969b60c6d926deacb18771b9e5e5b00eb791dee45648ae709ccbe9d05ff
 AUX bear-3.1.4-tests.patch 2199 BLAKE2B 2f2c97705aec1d55e6166cb13858d3e6eda3cc44e9de0fdff9a9c452a71790542534bcb0740f28e47e061405eaf9e180cca49c12232fef8b63107a3e0fde1166 SHA512 89451e19647064fcbe7c31c328d0eddf33882a4a5b94903bc6e89b24bbfe30f2152afc813c40c0ae5aeb0909e0c9f7e190e21b7d9505b05c9f52741a35525f51
 DIST bear-3.1.4.tar.gz 127672 BLAKE2B 18deb1172fcd8afdf4721a04b5d72b182190afd92d645841023033d187c812a0a30805af2bfb67b794ab8a8f0ca42965bebab6d035e95e2a25c5fccfe48a1afd SHA512 c63da7586d25a64dd8b3ff82f37505b36071dd064deb973c012840bc52ff6aec861fca21422b86b11629e86dc43d156b233d21b01e689369f0726799083afa98
-EBUILD bear-3.1.4-r1.ebuild 2722 BLAKE2B c62d0ff310125554119ff9f44d04f7c944a40294e4de5c0c877cb6769da78b1a608b512076024b20befdb71b0572af60a2f2d570e0c8584ac67797a5739c0240 SHA512 fdf1d2b3f7ffa1aebbf9ea9b3249b7edd399cb91231b26c7ad9543e703e4132765f99c7a7bca7fd13a0a8e698c345c55f5de5e7b4659f6c79d12b85a68f9013d
+DIST bear-3.1.5.tar.gz 152228 BLAKE2B 64d03d1ca5b1473e4d0b2106969285a2391471a0027cf387c72fe70769293fa361196cb1d37ebb528d27b5741b792472fad09688761ab7f73dc0ea7db96d8be1 SHA512 acf233f7bb8215694734b6c947c965323c0a5ea0c2a6bbb210a37e38fdf545326ca8de3a7b31ce81469756afd1c02233775ddc5936fd04132f216def6e3ce1de
+EBUILD bear-3.1.4-r2.ebuild 2800 BLAKE2B 0d5bac64e24cc287152991e75ba6a2149e8f3423b62612ca4b9a369106e872e90f2bf3805a26137140138c823169f7a4c139bea230053b1011f0efa95426ec4e SHA512 430c9554ec3d1d099de47eb01f2838a0cff807b797b9fd9b846b52b644cd19a3a1c4d708aff0e05adcc4aefb27d784c679d476e0b9437f56ec992853b8e4e9ab
+EBUILD bear-3.1.5.ebuild 2724 BLAKE2B f214d7b91b6e92c9586acfb15eeb4a7025343b1bd533c486c40a723a37a98bbc1c198e2de9d05145f327aac3e1b877d4ee6fa119b24176128881652df584ae49 SHA512 91421997afc187deedb3ce27469fd7ecac5b399734f1d7c405f9e355ed9282e51cad6e86ac12acc462a71a4519d226cacc273b87a3c92eb0cd5d362b6ddcbd8c
 MISC metadata.xml 1067 BLAKE2B 180de420c2173d245fa29b092d80e2c94ae2df8ba5c1c9d3fa2d706c75fbbc489d08b61505bf612fe247b7a9384b220682549f47db77b8bc3e7b170be9663380 SHA512 df9e220346c2098767bafc1e212a94fedae90892de64d8f04c599f3caf124d3ab539a9d9f757b5ba5ed4ff895fa39b954409d551514c9ee6fe44296c2317a021
diff --git a/dev-util/bear/bear-3.1.4-r2.ebuild b/dev-util/bear/bear-3.1.4-r2.ebuild
new file mode 100644
index 000000000000..10a1423f03cb
--- /dev/null
+++ b/dev-util/bear/bear-3.1.4-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cuda cmake multiprocessing python-any-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="cuda test"
+RESTRICT="!test? ( test )"
+
+# <libfmt-11 https://github.com/rizsotto/Bear/issues/592
+RDEPEND="
+	>=dev-libs/libfmt-9.1.0:=
+	<dev-libs/libfmt-11
+	dev-libs/protobuf:=
+	>=dev-libs/spdlog-1.11.0:=
+	>=net-libs/grpc-1.49.2:=
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/nlohmann_json-3.11.2:=
+	test? (
+		>=dev-cpp/gtest-1.13
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-build/libtool
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.4-tests.patch"
+	"${FILESDIR}/${PN}-3.1.4-reduce-grpc-verbosity.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Turn off testing before installation
+	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
+}
+
+src_configure() {
+	# TODO: remove this when https://bugs.gentoo.org/928346 is fixed
+	export CMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs)
+
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test)"
+		-DENABLE_FUNC_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if has sandbox "${FEATURES}"; then
+		ewarn "FEATURES=sandbox detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "tests will fail"
+	fi
+	if has usersandbox "${FEATURES}"; then
+		ewarn "FEATURES=usersandbox detected"
+		ewarn "tests will fail"
+	fi
+	if
+		has network-sandbox "${FEATURES}"; then
+		ewarn "FEATURES=network-sandbox detected"
+		ewarn "tests will fail"
+	fi
+	if
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+	fi
+
+	einfo "test may use optional tools if found: gfortran libtool nvcc valgrind"
+
+	# unit tests
+	BUILD_DIR="${BUILD_DIR}/subprojects/Build/BearSource" cmake_src_test
+
+	# functional tests
+	if use cuda; then
+		NVCC_CCBIN="$(cuda_gccdir)"
+		export NVCC_CCBIN
+	else
+		LIT_SKIP_TESTS+=( "cases/compilation/output/compile_cuda.sh" )
+	fi
+
+	mylitopts+=(-j "$(makeopts_jobs)" )
+	[[ -n "${LIT_SKIP_TESTS[*]}" ]] && mylitopts+=( --filter-out "($( IFS='|'; echo "${LIT_SKIP_TESTS[*]}"))" )
+
+	export LIT_OPTS="${mylitopts[*]}"
+
+	BUILD_DIR="${BUILD_DIR}/subprojects/Build/BearTest" cmake_src_test
+}
diff --git a/dev-util/bear/bear-3.1.4-r1.ebuild b/dev-util/bear/bear-3.1.5.ebuild
index ed91401baefe..b3a0ae0c42c0 100644
--- a/dev-util/bear/bear-3.1.4-r1.ebuild
+++ b/dev-util/bear/bear-3.1.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="cuda test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/diff-cover/Manifest b/dev-util/diff-cover/Manifest
index f31494b1a39f..f8017f309ff0 100644
--- a/dev-util/diff-cover/Manifest
+++ b/dev-util/diff-cover/Manifest
@@ -1,3 +1,4 @@
+DIST diff-cover-6.5.0-testfixtures.patch 18608 BLAKE2B d298ca1b756ef7fce4a449c4b84fd5508496f13006e11d93af791b20f47a8039e7a3d7ac2c400577f7816db14b4c84f6aacf361f3d3c57d02278d36f3cc40236 SHA512 3a3041edcbca00a336cbe5b3b8c4aa648a0b70bbcd190349968610d0dc6115da0e5e258fe14de6f73c975d9adf72955126ef9266fd16f82db6d1d683095c64b9
 DIST diff-cover-6.5.0.tar.gz 108392 BLAKE2B fc3a2a46e66501da5c08ce58fc13e46671246737320a0b6350b78f6b777d3759ec47d4ada170bb3dffcfe0927920741a3c5bff03509d92b2cc873cecce282eb1 SHA512 a00a1009fc8b9ca46f93573e3a2d6eb6a6a29f0e61891c839209dbe3d208d873a42524b30e3a18918817d173cefc3c5f481f7eea689170d72b5cd08857a8f021
-EBUILD diff-cover-6.5.0-r2.ebuild 824 BLAKE2B 7369ad0b68748d572acd7184aa2b62b7f048f41861aa4e3d60c6d0c6d128d7fc5a2d83f007c8d8d6862ab85c12343b3b9276c97e0e2374e64a70f124dae15a13 SHA512 e610264403950223b01386538bfe2958a2c659aabf73316f7511a182f9a879708b2c1d4fc056a236005f4c4bdf6d0b317140983e36396384d747a84847be983a
+EBUILD diff-cover-6.5.0-r2.ebuild 1238 BLAKE2B 7c8c46a4a7820129fcc89006f16c812a46bd1b014a41423818ea09f2929bf467f4b74983bafc5ea095b300cddce079b5f3fe46aa77f24149eb3deba1e45c240f SHA512 06dd700b6b48e60a53f9c3e1660ed2accdb3d89306c22b76c489b3b60199e6a3631708a0b58a005dc57120af93de53f608e8e522776769c2ee59116dada722a2
 MISC metadata.xml 385 BLAKE2B 0c08e1f36e3e401c5dff488145fa08bf6705a0a30b5603b9bb22568aecd4ec9f6c06eaf7eef0ccee4aa6b408e0004d631c74fa15014af06d987a75683b4970d2 SHA512 d9f72c773fc0b8cefa142b6822c5cef880ad9a1a73aab2addd56e65b14137811a0b1ecb53186b16479ab43f72a5d96533f60556f12305521543597fb920656d5
diff --git a/dev-util/diff-cover/diff-cover-6.5.0-r2.ebuild b/dev-util/diff-cover/diff-cover-6.5.0-r2.ebuild
index c7342ba66d61..71e57f3a2beb 100644
--- a/dev-util/diff-cover/diff-cover-6.5.0-r2.ebuild
+++ b/dev-util/diff-cover/diff-cover-6.5.0-r2.ebuild
@@ -8,7 +8,10 @@ inherit distutils-r1
 
 DESCRIPTION="Find diff lines that do not have test coverage"
 HOMEPAGE="https://github.com/Bachmann1234/diff-cover"
-SRC_URI="https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/Bachmann1234/diff_cover/commit/bd39c1c410721aac5a73e38d8f989df0261cdbb6.patch?full_index=1
+		-> ${P}-testfixtures.patch"
 S="${WORKDIR}/${P/diff-cover/diff_cover}"
 
 LICENSE="Apache-2.0"
@@ -22,10 +25,19 @@ RDEPEND="
 	>=dev-python/chardet-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/tomli-1.2.1[${PYTHON_USEDEP}]
 "
+# Note: flake8/pylint called as shell tools, not imported libraries
 BDEPEND="
 	test? (
+		dev-python/flake8
+		dev-python/pylint
+		dev-python/pytest-datadir[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 	)
 "
 
+PATCHES=(
+	# updated test fixtures for newer versions of code analysis tools
+	"${DISTDIR}/${P}-testfixtures.patch"
+)
+
 distutils_enable_tests pytest
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 5d04f46b9697..41ebd6fa346f 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -1,7 +1,8 @@
+AUX binutils-2.42-c23.patch 2908 BLAKE2B 3ebceb680ebef59f76e8ec182397cb7854585ebccc3d835c15d282824154b57ac9edc1360b1aeba7ed93d0be69885f91bc58bff41028566c367c413549686226 SHA512 e5280443543cc0fe88ddc38ef811d2213fa6d2f514791a5e9ffb83605bf44e68ca0934e873456e9f3d37c799a752beb1053cf1989c65a60dee18402d3241a539
 AUX gcc-12.2.0-drop-cflags-sed.patch 1077 BLAKE2B 4e0ff834cbfd4597c67d9adf2e287f2e40b746a6a6b31c52b95ab4b20292aad1931a1f64ffabd2bef611af85b643718e5a4a280d1e3b54e0a9f73b086d0dc39e SHA512 35647183fdf82bc179d94504d22a5e00a955121e888b5419a0033b7723a7e385c196096c64bf9ed59ad2c72188cb4792049ce423b226bfeb40ed379c355b91b8
 AUX gcc-14.1.0-no-omit-fp-ice.patch 595 BLAKE2B 543c4c4288f305f68eeba1df0d8e11b1539fbd063f0f9feac8f1731de50950f6b454ed90aecfe2efa854b1de3dda994ce1c31bdd443dd6f2d09f033775fe57a7 SHA512 30e48a0bf4fe5c40f2296307f2f16a80a42153fe2fc9a11516cab468cf3d9bccae7b66b8081837cc6f4b119fb3aeff36bc955ea6d24e2fe4f8e70180ce1a088a
 DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
 DIST gcc-14.1.0.tar.xz 92265736 BLAKE2B 7efd6574b8bca081de6e31480ec0565c6d7fb773383e8e1fdcc17e35bba2bf44b3f4f995cdbcccd001689926e96a6563ef3d099902fe3b37ab09dcf553ab0596 SHA512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea
 DIST mingw-w64-v12.0.0.tar.bz2 10474283 BLAKE2B 6500045f7d77f7de01dea0f4e03f3e4ddf6154586c5e3ee9718ee2c7ef1cc83ce3cbd644b6f1dc293ae6e0bfb55a6b68d439622bd1cfdefefc4cc547317f1943 SHA512 949b2bfab8763ab10ec4e9fdfdaf5361517a4ab787fb98ab419b38d02694061c2e821ebbf6e2e4b39d92bdf17419d116daa8e63afd9e01d11592f39df4da69d7
-EBUILD mingw64-toolchain-12.0.0.ebuild 11832 BLAKE2B 9cfde2c04e42c506c07a13d53b331641fe10c648e0e9465bd56832e71cb1a8fa55ecd6bc60df3c02f117e9e3a5e991169e7885b740576a77ff6d7796257b5c03 SHA512 87e441a532babb56a4bffa69183b3914aa601eb12e5cd76c69999ca0b117c9a22430d030a146b0f39b16be47d8bea6f9f6bfe8bdc9eef36220f39ff9362bd09a
+EBUILD mingw64-toolchain-12.0.0.ebuild 11871 BLAKE2B 3ef78c61d19c6a3f26e65d77fa95a6d42240115755df91de4c69d89b781e9e243597976edf3894e0590d19a2a668920f8e449fa13e7c8b43282c9a692daaae9a SHA512 22992d5e33e48d1b4c89683ff947342fffc553a17fec5d75d508ce3c0dd7c4fdf4c647abfc082517f17b79620d121661d9bec204c587c7fe761a6a956f2c98a4
 MISC metadata.xml 639 BLAKE2B 40e8fb879c8f26b7ba49bf453f242fbfd2a7950a0ec07f41945172a97ae77bdcf3ddfda741c6cf9f436efc42e9f5e72ccef67b408f62ea41335383eab76761f9 SHA512 280133ff26c17f4195635d3ab124a60d73bec1a2d841c91d89821dab18058381d30c4661f621c586ba4af31955cd902f1ef042301e04ff056ce20d0c45b7c4eb
diff --git a/dev-util/mingw64-toolchain/files/binutils-2.42-c23.patch b/dev-util/mingw64-toolchain/files/binutils-2.42-c23.patch
new file mode 100644
index 000000000000..f7e18615d6e0
--- /dev/null
+++ b/dev-util/mingw64-toolchain/files/binutils-2.42-c23.patch
@@ -0,0 +1,93 @@
+Needed with gcc15 due to newly defaulting to c23 (fixed in >=binutils-2.44).
+
+https://bugs.gentoo.org/943715
+https://sourceware.org/PR32372
+https://inbox.sourceware.org/binutils/cover.1731741209.git.sam@gentoo.org/
+(technically the full set of patches is not needed here, but doesn't hurt)
+--- a/binutils/bfd/elf32-ppc.c
++++ b/binutils/bfd/elf32-ppc.c
+@@ -4354,3 +4354,3 @@
+ 		      if (!bfd_elf_link_record_dynamic_symbol (info, opt))
+-			return false;
++			return NULL;
+ 		    }
+--- a/binutils/bfd/elf32-xtensa.c
++++ b/binutils/bfd/elf32-xtensa.c
+@@ -10073,3 +10073,3 @@
+ 
+-  removed = false;
++  removed = NULL;
+   if (is_operand_relocation (fix->src_type))
+@@ -10144,3 +10144,3 @@
+ 
+-  removed = false;
++  removed = NULL;
+   if (is_operand_relocation (ELF32_R_TYPE (orig_rel->rela.r_info)))
+--- a/binutils/bfd/elf64-ppc.c
++++ b/binutils/bfd/elf64-ppc.c
+@@ -4666,3 +4666,3 @@
+ 	  if (ent == NULL)
+-	    return false;
++	    return NULL;
+ 	  ent->next = local_got_ents[r_symndx];
+--- a/binutils/bfd/mach-o.c
++++ b/binutils/bfd/mach-o.c
+@@ -6039,3 +6039,3 @@
+   if (ncmd != 1 || uuid_cmd == NULL)
+-    return false;
++    return NULL;
+   return &uuid_cmd->command.uuid;
+--- a/binutils/bfd/xsym.c
++++ b/binutils/bfd/xsym.c
+@@ -133,3 +133,3 @@
+   if (bfd_seek (abfd, table_offset, SEEK_SET) != 0)
+-    return false;
++    return NULL;
+   return _bfd_alloc_and_read (abfd, table_size, table_size);
+--- a/binutils/binutils/prdbg.c
++++ b/binutils/binutils/prdbg.c
+@@ -2820,3 +2820,3 @@
+       abort ();
+-      return false;
++      return NULL;
+     }
+--- a/binutils/ld/pdb.c
++++ b/binutils/ld/pdb.c
+@@ -177,3 +177,3 @@
+       bfd_close (stream);
+-      return false;
++      return NULL;
+     }
+--- a/binutils/opcodes/i386-gen.c
++++ b/binutils/opcodes/i386-gen.c
+@@ -32,3 +32,5 @@
+    in preference where possible.  */
++#ifndef static_assert
+ #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); }))
++#endif
+ 
+--- a/binutils/opcodes/mips-formats.h
++++ b/binutils/opcodes/mips-formats.h
+@@ -51,3 +51,3 @@
+     typedef char ATTRIBUTE_UNUSED \
+-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++      static_assert_3[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+     static const struct mips_mapped_int_operand op = { \
+@@ -85,3 +85,3 @@
+     typedef char ATTRIBUTE_UNUSED \
+-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++      static_assert_4[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+     static const struct mips_reg_operand op = { \
+@@ -95,3 +95,3 @@
+     typedef char ATTRIBUTE_UNUSED \
+-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++      static_assert_5[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+     static const struct mips_reg_operand op = { \
+--- a/binutils/opcodes/s390-opc.c
++++ b/binutils/opcodes/s390-opc.c
+@@ -38,3 +38,5 @@
+    in preference where possible.  */
++#ifndef static_assert
+ #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); }))
++#endif
+ 
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
index ee5e4abfb62e..1a927aed674b 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
@@ -69,6 +69,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
 	"${FILESDIR}"/gcc-14.1.0-no-omit-fp-ice.patch
+	"${FILESDIR}"/binutils-2.42-c23.patch
 )
 
 pkg_pretend() {
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 70bdbcf8921a..831189738c1c 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -290,6 +290,6 @@ DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007
 DIST xi-unicode-0.2.1.crate 88229 BLAKE2B a091b894959e665e2b46086a3512a6193b54bd8328816d7f3ba31e30fab71ad507eb970e6bcb93ae4a4ba339154b55c4bf9ef513560d6067a46cd53735c24414 SHA512 cd5dde20cde2c9180247df4f6912139a436f7ab71ef86dac66418c0459df665c09fc3c5b497f8157a6209da32b3e9fda5f50d1ef06c1c8cc2557c4b90363e586
 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
 DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
-EBUILD watchman-2023.06.19.00-r1.ebuild 5591 BLAKE2B a11bc7c23b23446ce817eb3759d3fc9452330de68c16f66aa2521dbf0c6fabe9b677b92af007f72ef9465e64fc01b81e738348ecd6cf31a55a2d55dfd530f80b SHA512 facbd074d59f5f153af10cf89990b4187a3cd7003807bd9da8d41d535eecc5c4ace1e16dff2670ba0b508a5436538b542104c2f3a2130ad0e7baa373f1e1320c
+EBUILD watchman-2023.06.19.00-r2.ebuild 5674 BLAKE2B e22d3e491b4c439ceaa7973a2c0470ec9d197389624f638e23087d8699bf2464af964b905c67aef8b6a4f6842588939b8ba3f818be9333d5096b6069d0911863 SHA512 7fabaa014bafbf3ecec4f4af1779c2b59007bcf6970c80ddfeed6fff186a0770c3a101531ad9eebea13c5fad92a6b5109273fb90b5d907e1ec24a5d607bfb1cc
 EBUILD watchman-2024.11.04.00.ebuild 7580 BLAKE2B 2b1de95244795bee971b7df82aebfbf4bf2c703b2294535c325dda18be411c89b01a0d9f33f6870818f9cc201340fd0c809d18a08cb98cb124aca128486d125f SHA512 7ecfc4d45d4681765c2e790c27caf3a28e3b0d073685d6462659499e57ba24fe60a1a700a6c276e6267b0bb48035888e6f3766ac41e971b783ba33536f00dddf
 MISC metadata.xml 582 BLAKE2B 9a1e25a4a46f649c5a39643e52f3b06de92e51701c3948454c769272c32385f4163038edfd59d10591fe83696c46efdcb262a6ff79ce81e537bd3b908c069e1e SHA512 e30706692c771c1e55493b241197cc1c1c68dd2f0412777c97f40c00432f9f01268397a6b9726f15587f84d8e9e35d82a3b8e99233573f60f9670978e37e4d7a
diff --git a/dev-util/watchman/watchman-2023.06.19.00-r1.ebuild b/dev-util/watchman/watchman-2023.06.19.00-r2.ebuild
index 18a9a02d8d3d..591c4924066c 100644
--- a/dev-util/watchman/watchman-2023.06.19.00-r1.ebuild
+++ b/dev-util/watchman/watchman-2023.06.19.00-r2.ebuild
@@ -148,6 +148,7 @@ IUSE="llvm-libunwind python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent
+# <libfmt-10 https://github.com/facebook/watchman/issues/1140
 RDEPEND="
 	dev-libs/libevent:=
 	dev-libs/libpcre2
@@ -155,6 +156,7 @@ RDEPEND="
 	~dev-cpp/folly-${PV}:=
 	dev-cpp/glog:=
 	>=dev-libs/libfmt-8.1.1-r1:=
+	<dev-libs/libfmt-10
 	dev-libs/openssl:=
 	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index 50544f85cd66..27d4198d9d0b 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,5 +1,7 @@
 DIST ydiff-1.3.tar.gz 74115 BLAKE2B 5cc0a4405148940772000e13a0f2d955c8fdbe63890cdd912b78a808dd231c7682de2fa81d5cf7ec7442dc47b2ae0fa5430dbd40ed39c636fdf43a288e8b41aa SHA512 ac9f4ce3383903275e0f71295009098aaca6a38449489bff70026a8090863b2f3b2c566908602c145473b72edf491d0ce2ce75802e397db2e04b10a158b35c99
 DIST ydiff-1.4.1.gh.tar.gz 2966179 BLAKE2B 961f6a0a7af686f1553efc71e0016f6f94a15a061c1b964236d25758bc372c7e4c9ac38c0bc363d1da25119de4047ac35dccd4f1ef3c9034a6f1fc8dad40f0e0 SHA512 75cb0ccd4e589bd71c0d9b59dd40a16697751b4312cd18a06247dba87191cb83b69576cf3a25ca05546d5d2adc064a76c1a4d00833feb3ce49a9a851c1ed7dab
+DIST ydiff-1.4.2.gh.tar.gz 2966400 BLAKE2B ba1b6b4659d3de7d98c357a0d3c44169d04af9e606aac3ec0ef93512b59e04f5d75846ed19f7392031964f198002ff3192077052351703075b4427bbddc1e51b SHA512 8aa0cd510cab0ad73b7f99f566aedbf30929fe9d98a7675a9c271b659bec93a3fced19dc661b0018c99279cf9b1b7fd42c70d5401a348b4b3f614f3be1bec832
 EBUILD ydiff-1.3.ebuild 599 BLAKE2B 42dd7eac4abb2653d46697039f8218e31e3f3c78354ef6f5321e3d1a7a5473240f9a68d00bc4d39158657e80f887903e89130f6c85224861260444305f6f2c5c SHA512 093f67d1613bc2d99deb5aec71f0a88388d2d3c244b2f04ff26a81cf7c54d732af847f48193ad1a790df288bdd84a9867f56bc596c48239091c9821667d23f0f
 EBUILD ydiff-1.4.1.ebuild 687 BLAKE2B 0037158eada3024a0baae98618bd4cf25dad8a8c22af348ad5b0513f216b191d15e292c89b38245f2391cf914c25b110a5aea5403b8161d75ff29b4f74f92013 SHA512 3c8cd77d202429ff43eb3cd64d2d8c43650ecfa41e80944df4d67ccbeee848c424702a9c5a6d49ec8f4e2c53f8b9228e0dc303a62f03d3fe70b8dd4604443447
+EBUILD ydiff-1.4.2.ebuild 687 BLAKE2B 0037158eada3024a0baae98618bd4cf25dad8a8c22af348ad5b0513f216b191d15e292c89b38245f2391cf914c25b110a5aea5403b8161d75ff29b4f74f92013 SHA512 3c8cd77d202429ff43eb3cd64d2d8c43650ecfa41e80944df4d67ccbeee848c424702a9c5a6d49ec8f4e2c53f8b9228e0dc303a62f03d3fe70b8dd4604443447
 MISC metadata.xml 394 BLAKE2B 7333c46ff0d147ca8dc7eafd8e5f3eae67c7217467d45431585898948671df5e836995e89414fb95a9645f69c4f1d2020168a87b952115ce3b6225d89b46aa01 SHA512 781694fc99405f67446875b9fb40a306cd5223f1f27d1fff5f0bd2fe35aee1d6a518486999d06732e89fdc5759afdf0235615170718fea80ba0d69fc95f97fe7
diff --git a/dev-util/ydiff/ydiff-1.4.2.ebuild b/dev-util/ydiff/ydiff-1.4.2.ebuild
new file mode 100644
index 000000000000..35d1eecb3016
--- /dev/null
+++ b/dev-util/ydiff/ydiff-1.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)"
+HOMEPAGE="https://github.com/ymattw/ydiff"
+SRC_URI="https://github.com/ymattw/ydiff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sys-apps/less"
+
+DOCS=( CHANGES.rst README.rst )
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} tests/test_ydiff.py || die "Unit tests failed."
+
+	./tests/regression.sh || die "Regression tests failed."
+}