gentoo resync : 20.03.2022

4 files changed, 28 insertions, 47 deletions

diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index fdf2d0814f2c..94524da6e4ff 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,10 +1,9 @@
 AUX catch-1.12.2-glibc-2.34-sigstksz.patch 2667 BLAKE2B 890af64dcf7fb85d02a00d22b3c297ffcf6c6cc5ce4ef21310cdc030587cb2d26841040ae73a15bca0c86be1813de49667904648baf89df34779fb6e97b18e19 SHA512 bc524945b7570fad29482bafdc0f7d35a180dc3a000a5e2cdc14c5fbc54684cabfa0448d53418c122a99fca6955fda5afbac25c46fc1e7c6aa16f4ad687bac76
+AUX catch-2.13.8-musl-tests.patch 854 BLAKE2B c593febfdd8d18912a0ceac2d63c3af21ed917df0b8ba416fe6d40adee5c2f5472c282e5c325fbd98ece23b27ef6b1975bfc4855808c8e7df86ee08c06a79845 SHA512 7a54bc2c06204203da6277866f793adcf14edcff915a12f3ad75b0b5d919dc06bcc5798188d3b002a0a872e2d8589178123c9960a25d0ff42b7be227be52fddf
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
-DIST Catch2-2.13.7.tar.gz 661014 BLAKE2B 7d874832082db74895bfd696c409a77693ae68c456d1287acf965ec6884c323cd2f3bc4b9eecc3e8210d262a6da8e897dfef09ec035f8bed4d408a28e7147cc5 SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
 DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B 973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65 SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e
 EBUILD catch-1.12.2-r1.ebuild 889 BLAKE2B dcc10c4f7ac2ed34d0730b9fd7bfc5cd21eb6d1f5326a8a3a1d712f6525620aaebb56927f81c62b10c9094b9b2f6ef04f843458fe594af5c6066552ad3ea845f SHA512 4d8d7cca3f745ac8094c4a585d61881a3de3ebb91413f226a0fed59d4d57ec8aa1a4b808f419610849466136c53c3ac9b742a558f91b7845fd0e664e947ac9ed
 EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e
-EBUILD catch-2.13.7.ebuild 917 BLAKE2B 0d76845c51cfab5f90c87c07938f6e1001713b6cf9e043c8840ae2af7c141e402d22719b174fee2163dca1951feb99f10bbc8b5fb26aad9a25f1b4f9ff564f05 SHA512 e084a3882f717ea9c6bf3b6062182e257f191dccb30b3d37bef66bc8574bf63e6cce0014fe6b7d508411aa429c879d8aec66052d31afa446c4b3feccef7a0bed
-EBUILD catch-2.13.8.ebuild 917 BLAKE2B 0d76845c51cfab5f90c87c07938f6e1001713b6cf9e043c8840ae2af7c141e402d22719b174fee2163dca1951feb99f10bbc8b5fb26aad9a25f1b4f9ff564f05 SHA512 e084a3882f717ea9c6bf3b6062182e257f191dccb30b3d37bef66bc8574bf63e6cce0014fe6b7d508411aa429c879d8aec66052d31afa446c4b3feccef7a0bed
+EBUILD catch-2.13.8.ebuild 966 BLAKE2B cd760e459aacbb982d7e540a74140006d4a64c0a8679c7010e02bf7e53784ce2d5826685a202d2e6be4b23fe4267e563df3908aec4cf2931f41c2c318f6e7c05 SHA512 49bf3e035b7cb254795701b58c5b3fac004f7065b563c273d5c26ce8213b5767b742ec3cb89a2e77b22eb7c0ac4cd871285a2c74d1dd9d4327b1f88a724f3450
 EBUILD catch-9999.ebuild 929 BLAKE2B dab69a496e41ace27c41efa0e48567b945ccaa2cef1089dfc5acf09f16260c6dab24dcbf1e5653740dd4f956cf0613822718cdd579d0bef08ef94c41cc5b0089 SHA512 235ac11bd0b91c18f92e2be38b0073c8b6dda575c6aaff4938821f7d1f6b38a2a44363ab30351bf3a64afa60850aee35738e72f209aef9bbde45ba88a82646c1
 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4
diff --git a/dev-cpp/catch/catch-2.13.7.ebuild b/dev-cpp/catch/catch-2.13.7.ebuild
deleted file mode 100644
index a57a9d4e9d0f..000000000000
--- a/dev-cpp/catch/catch-2.13.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
-else
-	MY_P=${PN^}2-${PV}
-	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCATCH_ENABLE_WERROR=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	use test &&
-		mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/catch/catch-2.13.8.ebuild b/dev-cpp/catch/catch-2.13.8.ebuild
index a57a9d4e9d0f..9711bc919ca8 100644
--- a/dev-cpp/catch/catch-2.13.8.ebuild
+++ b/dev-cpp/catch/catch-2.13.8.ebuild
@@ -28,6 +28,8 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
+PATCHES=( "${FILESDIR}"/${P}-musl-tests.patch )
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch b/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch
new file mode 100644
index 000000000000..86c60c15f34d
--- /dev/null
+++ b/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch
@@ -0,0 +1,24 @@
+From 3e88ccff3ba573fb6d1ab746596411eebe310a6b Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Thu, 31 Dec 2020 16:24:16 +0100
+Subject: [PATCH] Do not match exact amount of spaces for errno macro expansion
+ in approvalTests.py
+
+E.g. musl libc expands errno() to __errno_location() without a space between, glibc has 1 space.
+---
+ scripts/approvalTests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
+index f8b9425c7c..73e9b83239 100755
+--- a/scripts/approvalTests.py
++++ b/scripts/approvalTests.py
+@@ -44,7 +44,7 @@
+ 
+ # errno macro expands into various names depending on platform, so we need to fix them up as well
+ errnoParser = re.compile(r'''
+-    \(\*__errno_location\ \(\)\)
++    \(\*__errno_location\s*\(\)\)
+     |
+     \(\*__error\(\)\)
+     |