gentoo resync : 20.03.2022

3 files changed, 9 insertions, 28 deletions

diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 7d9a4b7392b8..5e5e734e9e81 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,10 +1,8 @@
-AUX criterion-2.4_pre20200110-gcc11.patch 370 BLAKE2B 63b68e20cb7d2b84df561bc308e61a6dc3b0398c52f2f575cfb5750b80aa6d83209d770c4feb52c53245e85d6f8b9268a89cfb1892cc26ef9bb79824e5a9b9a4 SHA512 25008b50b4b9b957083fc14537b76f8015264f030a3902ec70629c58ee491f4eaa92009004316f7a2b70b110e498c942d9cbb6ad138fbc599669940b74a5a652
-DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21
+DIST criterion-2.4.0.tar.gz 870099 BLAKE2B 06d81344f6e9110cbb4313c847e0fb1d596ddfad7ab57d4a0c9df2140c5506450f702082d6fc893d819b74252b20193720ca44a903b43c43e940122529da88ad SHA512 4a7cd9cd26f64bfeb95683a0479a59b29676ffc5110041757417ab152dced7a360a94fd721b31e45e1b91d0ca08fec0327d7a7d56a2cf9d2f3e9e25e2b95f446
 DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
-DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a
 DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbbdddd34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62
-EBUILD criterion-2.4_pre20210114.ebuild 1928 BLAKE2B 494af9c52b899784e4beb95f2d65571d099ce8fb63d47cea3adbfd2875dfe6a26145eeeaf6ceacb867429b9d9f0e979d88536396ac80fc02eba71539bbbd164a SHA512 b771c5e2e378e8f1e8c352da31c6d11f4b86aaf8667cd28f0076aac8b3e8a1d043da244fd6653d8d459a33a003832569f2fcd896ae65e09101b44f9e6cf6a981
+EBUILD criterion-2.4.0.ebuild 1767 BLAKE2B d38d7b8efaabfa7d539af8352422316d8606126c3afee62c7aab29f6f0b5051b7508c3bfe54996b5aea50b9d9828e896cb5bcc5537481b54081efa375ebb970b SHA512 e79c1afb902e1e2ac1993cfb198c528c0c2289cd169cf11c2e691c31d60a13ea09d3dba976290b3a95b7515cc3b98e11653409e0393ecdd9536620ff9d9476d2
 EBUILD criterion-2.4_pre20211218.ebuild 1866 BLAKE2B c14ccfcb7d68b88ef3d79bdc559c62e3e7d3c2e74810e79893c87166715b5037fc499c116c01370d664b3bbb89203052cc59950ee644b72b7ddffb6b5bb2f5f6 SHA512 c94762c0dabc9a99636ed75b02139dc28545f16b20d4150fa43e4568b44500007d587cc94e1e5bd19c50e587c60bf1b8fa9cc09626b581e7a59d6fc4b316497d
 MISC metadata.xml 495 BLAKE2B e26a19888a85984288468d569c85fc5076c0e78fa79c759ef0fb4f62e2c84453200f819459a9b85ac3dd7d4a08017b4c61bfdd01b73288ed4663332030f9a8aa SHA512 9602e9b6e0405dce29b8e90c72d95ce64fe0c4f54df0ed01416cc9562533195c2fcbde1fd139547387b3aabda8b4896a05bf4a277bb3a2921bf02cf66f81b744
diff --git a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild
index 220b6acc2d46..f43eea0b2b1c 100644
--- a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
+++ b/dev-libs/criterion/criterion-2.4.0.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-any-r1
 
-CRITERION_COMMIT="4cf886a2d96ada425e8c88d3c4d935e510c7c712"
 DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
 KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
-NANOPB_COMMIT="70f0de9877b1ce12abc0229d5df84db6349fcbfc"
+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/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -35,11 +34,7 @@ DEPEND="${RDEPEND}
 	)"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
-)
+S="${WORKDIR}/Criterion-${PV}"
 
 python_check_deps() {
 	has_version "dev-util/cram[${PYTHON_USEDEP}]"
diff --git a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
deleted file mode 100644
index c99e03af6f19..000000000000
--- a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/criterion/internal/assert/ieee.h b/include/criterion/internal/assert/ieee.h
-index 3b6de3b..2063d87 100644
---- a/include/criterion/internal/assert/ieee.h
-+++ b/include/criterion/internal/assert/ieee.h
-@@ -29,6 +29,7 @@
- #ifdef __cplusplus
- 
- # include <cmath>
-+# include <limits>
- 
- namespace criterion { namespace internal { namespace operators {
-