Adding metadata

4 files changed, 26 insertions, 45 deletions

diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 99ab1a9bcbe1..b726e173bafc 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,3 +1,2 @@
 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
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 cb1c1fb7a3dc..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_{7,8,9,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 cb1c1fb7a3dc..2767275531ed 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\(\)\)
+     |