gentoo resync : 15.06.2021

5 files changed, 19 insertions, 90 deletions

diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 768e94d73daa..43eac4827f0a 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,9 +1,7 @@
-AUX criterion-libdir.patch 977 BLAKE2B 4d8c3510563d32a0b9bb8d61d90379173403f51046b87345e41f3f85014c8f88ff90b8c15fa0de1d99f4440c4d6d1a6f2735f73bf3e2f49bb87e6618ac16a97f SHA512 ff63aa827deb529c8e87978af9646cb52cc632edb7cd31fe398a989786303fef3830af3fbcedc59b1aa09268abc6c697f31355d084387e28067ebd3a1ad2c792
+AUX criterion-2.4_pre20200110-gcc11.patch 370 BLAKE2B 63b68e20cb7d2b84df561bc308e61a6dc3b0398c52f2f575cfb5750b80aa6d83209d770c4feb52c53245e85d6f8b9268a89cfb1892cc26ef9bb79824e5a9b9a4 SHA512 25008b50b4b9b957083fc14537b76f8015264f030a3902ec70629c58ee491f4eaa92009004316f7a2b70b110e498c942d9cbb6ad138fbc599669940b74a5a652
 DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
-DIST criterion-v2.3.3.tar.bz2 1821413 BLAKE2B 7972bf03870ae07da57252f7d62f3f5818755ad9ea2a0bed7b73d42649fbf5069c1a9af16bd8da9366d0506bbc86ec93a12904809bf91e36618d53f5d8674c18 SHA512 bf53716ff90421a42dd4d1bbd61451a4183aa6436af901c222e43e9e9b3e008008a891157a1c982b80c04e7e68aadc287392503094a3c4ad9c2066432d548e16
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
-EBUILD criterion-2.3.3.ebuild 1068 BLAKE2B 75f224ac5e583fca3bbcc50cfe73d95e42ad170d1693c31ba599c1218751613f239a54926bf7763a479785f71d87e5ce6a199fef3a71cbc8d37ab82947608f96 SHA512 1256d827ed9165cb3db614351881875ad00ee0539f7c2353e47d4ee4946a5628860240f4398eb1446bad739c4be6a43211ec37d01b60e55c3fbe51f38531f8aa
-EBUILD criterion-2.4_pre20200110.ebuild 1872 BLAKE2B 7373ea105be2fc03182d11133d5c8885a278fde1919ba61e2a0ce275bca4798192da7c4164d61ed7f3421320949e1539fb8c6a629859c115970669c4a4cc9cdb SHA512 8f96b4b6b975cf069ac35fe7d72a753eb29ca78f4f9445393509f809e3cb986e95b28ee14bb702e8db80bb387fe747a40974cc47a777f1622a49930d4e87ee3a
+EBUILD criterion-2.4_pre20200110.ebuild 1936 BLAKE2B 188447cc2878f4933ef220f7b5282a35c3e47c1d38fe32fe8fe509d5a6e8a76626f3d7d1e8caaa4114ca962981a300e0cc3b66f33c3099698bb06014d5254533 SHA512 313dd311531830f92952874e5c0a712a5d55b18816f6681c919d71db6a2eadcee9c927f6ef646afc8c35ede0fa6c20d79716f408347992e233dd149e6fba3e48
 MISC metadata.xml 494 BLAKE2B 87f251d2ac7543391bbc2648981a34953fcd20426433ca89632d888316677ff0c542fdce8aa37c3df1a06d3bf714cb4dfc11f954451a51fc8f08ccef042563ac SHA512 c40f763d2a1e8610c7ab547b49520ab0afaa1b5c69584db9cb0c913367777147a159322ad19f733729719af7974a9e07d4431bfe1d722ad1e655ad76c7d98f7f
diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild
deleted file mode 100644
index 808455b3876b..000000000000
--- a/dev-libs/criterion/criterion-2.3.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake python-any-r1
-
-DESCRIPTION="Cross platform unit testing framework for C and C++"
-HOMEPAGE="https://github.com/Snaipe/Criterion"
-SRC_URI="https://github.com/Snaipe/Criterion/releases/download/v${PV}/${PN}-v${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/nanomsg:="
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
-	)"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/${PN}-libdir.patch"
-S="${WORKDIR}/${PN}-v${PV}"
-
-QA_EXECSTACK="usr/lib*/libcriterion.so*"
-
-python_check_deps() {
-	has_version "dev-util/cram[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCTESTS="$(usex test ON OFF)"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use test; then
-		cmake_build criterion_tests
-	fi
-}
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
index 169702c042ff..54b81b96c9dc 100644
--- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit meson python-any-r1
 
@@ -37,6 +37,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
+)
+
 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
new file mode 100644
index 000000000000..c99e03af6f19
--- /dev/null
+++ b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
@@ -0,0 +1,12 @@
+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 {
+ 
diff --git a/dev-libs/criterion/files/criterion-libdir.patch b/dev-libs/criterion/files/criterion-libdir.patch
deleted file mode 100644
index 91b28b06b947..000000000000
--- a/dev-libs/criterion/files/criterion-libdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/.cmake/Modules/PackageUtils.cmake b/.cmake/Modules/PackageUtils.cmake
-index 593f2d1..a771fd5 100644
---- a/.cmake/Modules/PackageUtils.cmake
-+++ b/.cmake/Modules/PackageUtils.cmake
-@@ -50,9 +50,9 @@ function (cr_add_library _LIB)
-   endforeach ()
- 
-   install(TARGETS ${_LIB}
--    RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib ${install_flags}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${install_flags}
-   )
- endfunction ()
- 
-diff --git a/src/criterion.pc.in b/src/criterion.pc.in
-index 18ac3d6..23737a4 100644
---- a/src/criterion.pc.in
-+++ b/src/criterion.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
- includedir=${prefix}/include
--libdir=${prefix}/lib
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- 
- Name: @PROJECT_NAME@
- Description: A KISS, Cross platform unit testing framework for C and C++