gentoo resync : 05.12.2021

3 files changed, 14 insertions, 15 deletions

diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 81cd41e1833f..8dfc59814442 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,9 +1,9 @@
 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
 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.4.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
 EBUILD catch-2.13.6.ebuild 910 BLAKE2B fef5a8ee3771f072401f0d5af0805dee98ea1b84a6ebaeaa9e59a7c97a7d5a3da9d202b092a50eeaeb865308029f7c9f77bc4d25e5a09e1a0bd9724f0ae03edf SHA512 3dc06f4b01fea561422692e27fc55389da99f0860931b8bc40b581db74488921d5e22a169eb4011ac855bab94d1504b12b407ce54db14020a22aab6ec5801aea
-EBUILD catch-9999.ebuild 957 BLAKE2B d8834959413b85dc5a5181a060a4e75730d5b258b113024e7e426793dfab806475bec2dd02ec24149086e98cfcc35e1def04a63b604f2fd98cf53034616586be SHA512 ded76b95e18991428e08d15533ec76db77226687955888f8db016d35c47aa00d25cac0e1749899dd5884d28c7f2e3afa77976ce3505f5e47a3e652c62383ef38
+EBUILD catch-2.13.7.ebuild 919 BLAKE2B ab3f43e428fddc1488c25ec3a0ba27dedb4514dd33a486dc138b918771e50e8e5301b52296597454dbd04bb176e0b21db8ea79f8975794059f2bd32ea3954d5f SHA512 b47f064c75c197a5272cb25a7544b11293636e44876b2b2a6afc439d53fe2c5314bc437235ce453ffcd887881c31ad86ab8d5ca2a862cad916c1beec61b19995
+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.4.ebuild b/dev-cpp/catch/catch-2.13.7.ebuild
index 4ef090102289..bea68985144e 100644
--- a/dev-cpp/catch/catch-2.13.4.ebuild
+++ b/dev-cpp/catch/catch-2.13.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -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"
@@ -38,7 +38,7 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 	)
 	use test &&
-		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+		mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
 
 	cmake_src_configure
 }
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 7501403174d5..339f89fdb860 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -1,9 +1,9 @@
-# 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_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -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
 }