gentoo resync : 25.11.2020

4 files changed, 13 insertions, 58 deletions

diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 31844c644ff3..644af35ee53a 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,11 +1,9 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
+DIST Catch2-2.13.3.tar.gz 655431 BLAKE2B 4343dab41818a4c85b875752b8d86a0dd1a46ce8c94d6773cee210a133f164b669053973c6678228b3afb356e25a3e705c8220b138c247a230e624b3f2412784 SHA512 caf0e3a39a2b5983346c2709ce06113da62881780117021c64db987d6c5190c41a9070fb70caa0ee6957cfef0baad87fff4e6558c9fea4fa464e82882fe17d55
 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
-DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B cec11d79c85ac8a5577467ceb4722a2441a1dbd2fbe42fb06324113d2a6f9fadc12de351735900817274520bf8533ec245ba0a3686c8c1b4813cf3136d6d552f SHA512 ab6c816642a92418c76c8ddabf17eb0c19bef1dc6ac2405c820280d670ef1d78c9ae89909f5a36bf063f0939d253b7c6b5e845c1ac4e63b338927e125dee950d
-DIST Catch2-2.9.1.tar.gz 626539 BLAKE2B b68f17dba65cc8d1a842b105e5aa6a32e713df8d34c32b918e0588e6b87b8e3ae56f9130d1590795489afe2e29035c262a05795d0ee44c9e9ace2e814801821d SHA512 ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6
 EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed
 EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832
+EBUILD catch-2.13.3.ebuild 916 BLAKE2B 559f727bbda4475f593c3705325d1d1a7a612b0ae34a10b6105ef563b3324ee3665c6a251a12e248160553ff127fcb2a6928459d5305b1e43c3697509d1e1042 SHA512 b4af3da0fa6725cdd3acd567d8241a90b512a84f4e2a3ae02077026a4b835865f4b12b3171f9d7c036c33fdfea60c2f79998c93ca3dcc71318d66964e0fe476a
 EBUILD catch-2.5.0.ebuild 904 BLAKE2B 46a8193ac8712652a0ebbb951af317baa92c451498fb7bbadd86e642505bcdd950e42b813cc2ef449e6fe4d7781c2e5e5e08c2df6f85128c29ac3d3c7cd6950c SHA512 524bb5a1ab8eeca5e4cb626590f5b4a5512bf0f27b6e9c2a64e782e02c206fc22ab830481d5a962e739ea6b373d1951f5239b4b2e6ec8e02b686fa698af6032c
-EBUILD catch-2.7.0.ebuild 906 BLAKE2B 544bd24f9701e4e941a7a9436f581006e1dff9d5b279df4b4bbe15aa7cd3d36a59828f2fc6cba2cb8e670b78dc039b6acf7bf955745550f3eb33b5292e1dbae0 SHA512 4e9f3ec76f17269619f6d95902cc289ad441b94d52bf25e2a95ef80ddacd95498afe0fac2897d62d339c2e60f2605814592ada03eac1bde9c028e9afe69913e0
-EBUILD catch-2.9.1.ebuild 925 BLAKE2B f3bfedf40c9b865285f1e58f955c847ab90adac4a6cb0a995f30ad239b5914739e655890b7385892fcc99c5231c7cd4fe2182c7660abb8d9d791bd3446f347cc SHA512 6aae5b852a653ff158380fba611d40d8908bd4103bb9516b03596d3504523a950ab8ed8a9a2ee2983f4eb12418516047b8ba06ab10f26dc25e02c3e0dd3ec26b
-EBUILD catch-9999.ebuild 913 BLAKE2B d2ab757a399604fd1e2223b9baf194abac778b7a68f31c6013f5ce279db42c814cbfc573393e63fbaf670de9428cc9c51c35a487c59d8584ccbc4d6bcc028f97 SHA512 1a7bfbb8e6ac17bff9e05a2ca22df357f38dffcb2dbb4529afe7da741f6461476e25bfd67381a62147665a6cd8ab9941f235898efd42e13d209ddaee655cdc44
+EBUILD catch-9999.ebuild 957 BLAKE2B 205ee11310e6632771e9a8705fc24a5b0652b72dd8c1bd8492d507d409713cc1e67396a8095f39349a5bc8d5f36f839abbd446cc2343d0fdb3547ae13c688003 SHA512 1a362aa2a514d5787de98744ed7a56e1374ec790b9d45646bc03e10b8b0996092db757f65c9c9cf52aceb818a81dee0c65121785279723f8e9b3cf2c00a7fdc6
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.13.3.ebuild
index 77dac8be453e..87bf6c59f3c9 100644
--- a/dev-cpp/catch/catch-2.9.1.ebuild
+++ b/dev-cpp/catch/catch-2.13.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -15,7 +15,7 @@ else
 	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}
+	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -40,5 +40,5 @@ src_configure() {
 	use test &&
 		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/catch/catch-2.7.0.ebuild b/dev-cpp/catch/catch-2.7.0.ebuild
deleted file mode 100644
index 2467542c7d9b..000000000000
--- a/dev-cpp/catch/catch-2.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils 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"
-	KEYWORDS="~amd64 ~x86"
-
-	S=${WORKDIR}/${MY_P}
-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-utils_src_configure
-}
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 07de51f32521..338bc2c2b371 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -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 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-	S=${WORKDIR}/${MY_P}
+	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -36,9 +36,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DCATCH_ENABLE_WERROR=OFF
 		-DBUILD_TESTING=$(usex test)
+		-DCATCH_DEVELOPMENT_BUILD=$(usex test)
 	)
 	use test &&
 		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }