gentoo resync : 17.06.2021

2 files changed, 71 insertions, 0 deletions

diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 43eac4827f0a..459568ba6375 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,7 +1,10 @@
 AUX criterion-2.4_pre20200110-gcc11.patch 370 BLAKE2B 63b68e20cb7d2b84df561bc308e61a6dc3b0398c52f2f575cfb5750b80aa6d83209d770c4feb52c53245e85d6f8b9268a89cfb1892cc26ef9bb79824e5a9b9a4 SHA512 25008b50b4b9b957083fc14537b76f8015264f030a3902ec70629c58ee491f4eaa92009004316f7a2b70b110e498c942d9cbb6ad138fbc599669940b74a5a652
 DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
+DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21
 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
+DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a
 EBUILD criterion-2.4_pre20200110.ebuild 1936 BLAKE2B 188447cc2878f4933ef220f7b5282a35c3e47c1d38fe32fe8fe509d5a6e8a76626f3d7d1e8caaa4114ca962981a300e0cc3b66f33c3099698bb06014d5254533 SHA512 313dd311531830f92952874e5c0a712a5d55b18816f6681c919d71db6a2eadcee9c927f6ef646afc8c35ede0fa6c20d79716f408347992e233dd149e6fba3e48
+EBUILD criterion-2.4_pre20210114.ebuild 1929 BLAKE2B 15da10459a48a1d720d4c7ffbdbbe3489ab851d8a537e42a63342391d1d21a7994c64b3b728b9ec52d7fe8b7b96a8d4ff01a7c4ae8265ba57fe9c8459eb93bd2 SHA512 d2b23b09dba767caed1c9ce2e06b0c2894a2a28c3ef94473d37e4cfebbb92b578f322f0e02dae6c61c78f654e86d63e741568f03aaa08b50c15cbe61134dd1a4
 MISC metadata.xml 494 BLAKE2B 87f251d2ac7543391bbc2648981a34953fcd20426433ca89632d888316677ff0c542fdce8aa37c3df1a06d3bf714cb4dfc11f954451a51fc8f08ccef042563ac SHA512 c40f763d2a1e8610c7ab547b49520ab0afaa1b5c69584db9cb0c913367777147a159322ad19f733729719af7974a9e07d4431bfe1d722ad1e655ad76c7d98f7f
diff --git a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
new file mode 100644
index 000000000000..2a210335a427
--- /dev/null
+++ b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson python-any-r1
+
+CRITERION_COMMIT="4cf886a2d96ada425e8c88d3c4d935e510c7c712"
+DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
+KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
+NANOPB_COMMIT="70f0de9877b1ce12abc0229d5df84db6349fcbfc"
+
+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
+	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
+	test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+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}]"
+}
+
+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
+}