From bff543bb632933380da922cbfc07c67157d72d42 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 23 Jun 2024 00:11:31 +0100
Subject: gentoo auto-resync : 23:06:2024 - 00:11:30

---
 dev-libs/criterion/Manifest                  |  3 +-
 dev-libs/criterion/criterion-2.4.0.ebuild    | 64 -------------------------
 dev-libs/criterion/criterion-2.4.1-r1.ebuild | 71 ++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 66 deletions(-)
 delete mode 100644 dev-libs/criterion/criterion-2.4.0.ebuild
 create mode 100644 dev-libs/criterion/criterion-2.4.1-r1.ebuild

(limited to 'dev-libs/criterion')

diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index beb0d78cf974..b5a7e6960618 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,8 +1,7 @@
-DIST criterion-2.4.0.tar.gz 870099 BLAKE2B 06d81344f6e9110cbb4313c847e0fb1d596ddfad7ab57d4a0c9df2140c5506450f702082d6fc893d819b74252b20193720ca44a903b43c43e940122529da88ad SHA512 4a7cd9cd26f64bfeb95683a0479a59b29676ffc5110041757417ab152dced7a360a94fd721b31e45e1b91d0ca08fec0327d7a7d56a2cf9d2f3e9e25e2b95f446
 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.0.ebuild 1792 BLAKE2B aa47040b99b461f3a0e5cec179b81fb44f48088fd574512a7717bf1da63d5e37daf851a30c78009620a97cc3bae0b4da04d12f773e3fdc3eabb4e6b41d232667 SHA512 769960bfa6945ed6e21fad03f53f2b5f08ae1c3defa30a697d937b4929224b6157e240851435daf47529bafd550f47bf7d2c70adb37096f369c340d4eeb58bb2
+EBUILD criterion-2.4.1-r1.ebuild 2001 BLAKE2B dbe3dd3cf37bc0813b401d7928ddb26d55bd118fe31075285676e90f6f3d150f44f0a280c5865bb7f2c19af36c6d23a000c595ca3580a99b22977f62f67d071b SHA512 a8f78e8e33fd4edd2a035fc7e454010792b68b895498f20ddce5fa4a49ca62cb48ca12adeea28a960c1c1bcf2ef5ea4267590979a3567f08d761296a4f41cd61
 EBUILD criterion-2.4.1.ebuild 2000 BLAKE2B 57dfd437b1c3435e13ae840d1e0a9bce9814a187564170fd77946be3a0fe58cc92088cf987a0af1a326f9e40a6776742058c007c3e9c3ed5b06ebdf834b817b4 SHA512 2df149165d7a46649fc763bd2b80f2d14fc4a438b81179cf95b2b8768fe00058152e7d7f7077d38743d5fa1aad978c3eafa5a253c8031fb2c0ea373847be5619
 MISC metadata.xml 495 BLAKE2B e26a19888a85984288468d569c85fc5076c0e78fa79c759ef0fb4f62e2c84453200f819459a9b85ac3dd7d4a08017b4c61bfdd01b73288ed4663332030f9a8aa SHA512 9602e9b6e0405dce29b8e90c72d95ce64fe0c4f54df0ed01416cc9562533195c2fcbde1fd139547387b3aabda8b4896a05bf4a277bb3a2921bf02cf66f81b744
diff --git a/dev-libs/criterion/criterion-2.4.0.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild
deleted file mode 100644
index b1bb4480889a..000000000000
--- a/dev-libs/criterion/criterion-2.4.0.ebuild
+++ /dev/null
@@ -1,64 +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 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() {
-	local emesonargs=(
-		-Dsamples=$(usex test true false)
-		-Dtests=$(usex test true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/criterion/criterion-2.4.1-r1.ebuild b/dev-libs/criterion/criterion-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..9ac50fdbef62
--- /dev/null
+++ b/dev-libs/criterion/criterion-2.4.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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"
+
+S="${WORKDIR}/Criterion-${PV}"
+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"
+
+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
+}
-- 
cgit v1.2.3