2025-07-27 20:10:58+00:00

5 files changed, 35 insertions, 83 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 90271e5a2d371..eaa24057adf86 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index fddbd0fe58e68..45f76a58f0dd6 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,8 +1,8 @@
+AUX criterion-2.4.1-cmake4.patch 628 BLAKE2B 0b7e9d852bd6125025cccbcb1d9060751c149905a034847ebc00b9e5e6fbb7121ad8d7577a1f2774b3ecc77dafd27f0beb18924e96982a11e5c0f7ab7ff36f58 SHA512 f3e593cd012dba1fab67b498a6cd27acd2647724bd0575692f7c373d15263308da2e98d54410d8c4926a0e5e5b63a122b24e3e5e4540a233507819757406fa1f
 AUX criterion-2.4.1-includes.patch 276 BLAKE2B 401340e699b4d36fd3af9cac130de25abe8368a37519c8a35af84b4dad3bba6c8a56cc520ebfd1f0ca4f11c4bc54cdafc349074c964fd07049c1014edf34385d SHA512 7d4173ae874bdeeca52a62dda2a29f45ded0b908e4aa25e7ffdc1f6450404daa3cef0379d6a70122dba9b2532f0a63cfe4bd5a41318becec5e1fa83bedd156c3
 DIST criterion-2.4.1.tar.gz 870842 BLAKE2B 8b7db80d5e943d4380072106eb32ffe95896e4e588986588fd8b0ebfe1078657e2a9231090355563fd8bd8588cacbaa5839e269a0a9c4e56b882789c97379f9b SHA512 22f1ae5152db93736282fac098ad510d497aa804589df8070fb6cf36a3063868f2a9ed3c5771bfde8a0352355d81178816870d68b83ca6d6582fd17cdd9332d9
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbbdddd34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62
-EBUILD criterion-2.4.1-r1.ebuild 2054 BLAKE2B 59ed9574abeb0b26021742e32a470c510f751c9ea8d5f446477d843bf8e8728a8b429a49951b1504743b8c785e9c09c139ccb11b709bb85a181d314d5f93c337 SHA512 73dfe07c23337563ee885f1227439d390618f1a34b45fbf4323700032193c4db529179c534ba69b707cdb1e6b54fd91708871ed6d8dda1655cf7d807d23f1513
-EBUILD criterion-2.4.1.ebuild 2000 BLAKE2B 57dfd437b1c3435e13ae840d1e0a9bce9814a187564170fd77946be3a0fe58cc92088cf987a0af1a326f9e40a6776742058c007c3e9c3ed5b06ebdf834b817b4 SHA512 2df149165d7a46649fc763bd2b80f2d14fc4a438b81179cf95b2b8768fe00058152e7d7f7077d38743d5fa1aad978c3eafa5a253c8031fb2c0ea373847be5619
+EBUILD criterion-2.4.1-r1.ebuild 2100 BLAKE2B 495a1da1ad1d49eae543af309edf24c92fbfc1aadc9d4455008937b6126d549e907270b5df30cfec53bd3600ef4099ba9e661e0ec14de4bf2bc15a1948de092b SHA512 0f42facfa825b86d89b4438a97219dbf9fcc1de5c6913f419b0a675e6dc84f0fcd132ccc130b9d26c369cadeee217ec81a5f1da6f1be0941e8c31d64fd2ace01
 MISC metadata.xml 495 BLAKE2B e26a19888a85984288468d569c85fc5076c0e78fa79c759ef0fb4f62e2c84453200f819459a9b85ac3dd7d4a08017b4c61bfdd01b73288ed4663332030f9a8aa SHA512 9602e9b6e0405dce29b8e90c72d95ce64fe0c4f54df0ed01416cc9562533195c2fcbde1fd139547387b3aabda8b4896a05bf4a277bb3a2921bf02cf66f81b744
diff --git a/dev-libs/criterion/criterion-2.4.1-r1.ebuild b/dev-libs/criterion/criterion-2.4.1-r1.ebuild
index 95418b86a7b8d..9ba352ec799be 100644
--- a/dev-libs/criterion/criterion-2.4.1-r1.ebuild
+++ b/dev-libs/criterion/criterion-2.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,19 +25,25 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/nanomsg:=
+RDEPEND="
 	dev-libs/libgit2:=
-	dev-libs/libffi:="
+	dev-libs/libffi:=
+	dev-libs/nanomsg:=
+"
 DEPEND="${RDEPEND}
 	>=dev-libs/boxfort-0.1.4
 	test? (
 		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
-	)"
-BDEPEND="dev-build/cmake
-	virtual/pkgconfig"
+	)
+"
+BDEPEND="
+	dev-build/cmake
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.1-includes.patch
+	"${FILESDIR}"/${P}-includes.patch
+	"${FILESDIR}"/${P}-cmake4.patch # bug 957504
 )
 
 python_check_deps() {
@@ -49,12 +55,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
-
 	rm -r dependencies/{debugbreak,klib} || die
 	mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die
 	mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die
 	mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die
+
+	default
 }
 
 src_configure() {
diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild
deleted file mode 100644
index 02a9df728b503..0000000000000
--- a/dev-libs/criterion/criterion-2.4.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit flag-o-matic meson python-any-r1
-
-DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
-KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
-NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818"
-
-DESCRIPTION="Cross platform unit testing framework for C and C++"
-HOMEPAGE="https://github.com/Snaipe/Criterion"
-SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz
-	https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz
-	https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz"
-
-LICENSE="BSD-2 MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/nanomsg:=
-	dev-libs/libgit2:=
-	dev-libs/libffi:="
-DEPEND="${RDEPEND}
-	>=dev-libs/boxfort-0.1.4
-	test? (
-		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
-	)"
-BDEPEND="dev-build/cmake
-	virtual/pkgconfig"
-
-S="${WORKDIR}/Criterion-${PV}"
-
-python_check_deps() {
-	has_version "dev-util/cram[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	rm -r dependencies/{debugbreak,klib} || die
-	mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die
-	mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die
-	mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/855674
-	# https://github.com/Snaipe/Criterion/issues/524
-	filter-lto
-
-	# bug 906379
-	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
-
-	local emesonargs=(
-		-Dsamples=$(usex test true false)
-		-Dtests=$(usex test true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/criterion/files/criterion-2.4.1-cmake4.patch b/dev-libs/criterion/files/criterion-2.4.1-cmake4.patch
new file mode 100644
index 0000000000000..edd08523237d1
--- /dev/null
+++ b/dev-libs/criterion/files/criterion-2.4.1-cmake4.patch
@@ -0,0 +1,18 @@
+Combines:
+https://github.com/nanopb/nanopb/commit/37bea38a137dda4d90433fe91ac88b671035a5e1
+https://github.com/nanopb/nanopb/commit/0c3bb686654c0629834fd4cf0d4bf58eea30bfcc
+
+--- a/subprojects/nanopb/CMakeLists.txt
++++ b/subprojects/nanopb/CMakeLists.txt
+@@ -1,8 +1,8 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.14.0)
+ 
+-project(nanopb C)
++project(nanopb VERSION 0.4.5 LANGUAGES C)
+ 
+-set(nanopb_VERSION_STRING nanopb-0.4.5)
++set(nanopb_VERSION_STRING ${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}-dev)
+ set(nanopb_SOVERSION 0)
+ 
+ string(REPLACE "nanopb-" "" nanopb_VERSION ${nanopb_VERSION_STRING})