3 files changed, 50 insertions, 6 deletions
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 9e33343c1154..5c6628ab91d1 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,3 +1,4 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.13.4.tar.gz 656645 BLAKE2B 7a8afb099d410af3a7641c948a59307ac72338174356c1219834f050e0971e410275f1eda911444c3e956320fa25b60f91a3aba75aa36d375ba38626a0246485 SHA512 eac081d750e65d4d8d8d5f32b53bd963c6566caabaff424c479fe080416f59b5387adbdf6dbac30fe265243cb5ed184baf6f8a9625052bd498c098b83463390d
 DIST Catch2-2.13.6.tar.gz 659811 BLAKE2B d876c51589259ef9fa9640811c17049ee5f1559a2863d146b0d8f79e9531b3528db34bc23e4fee090436a92b430756442eee4820083e71225da0f24399131a73 SHA512 f63e240994b5982cf019a33b8999b62237cce174962f00437d64fd287b34f7217d066225d99322431ef60da67b025f36db703dab94b3d58bbd81095d98917278
+DIST Catch2-2.13.7.tar.gz 661014 BLAKE2B 7d874832082db74895bfd696c409a77693ae68c456d1287acf965ec6884c323cd2f3bc4b9eecc3e8210d262a6da8e897dfef09ec035f8bed4d408a28e7147cc5 SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
diff --git a/dev-cpp/catch/catch-2.13.7.ebuild b/dev-cpp/catch/catch-2.13.7.ebuild
new file mode 100644
index 000000000000..acf9bf0ff85e
--- /dev/null
+++ b/dev-cpp/catch/catch-2.13.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,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-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 20bc28968c7e..98faa77d8796 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
@@ -13,9 +13,9 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
 	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -35,11 +35,10 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DCATCH_ENABLE_WERROR=OFF
-		-DBUILD_TESTING=$(usex test)
 		-DCATCH_DEVELOPMENT_BUILD=$(usex test)
 	)
 	use test &&
-		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+		mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
 
 	cmake_src_configure
 }