gentoo (valentine's day) resync : 14.02.2021

6 files changed, 42 insertions, 48 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index eebb5788d95f..f9e486d6cbbf 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index ab0384e52ad3..620d89ec10b5 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.13.4.tar.gz 656645 BLAKE2B 7a8afb099d410af3a7641c948a59307ac72338174356c1219834f050e0971e410275f1eda911444c3e956320fa25b60f91a3aba75aa36d375ba38626a0246485 SHA512 eac081d750e65d4d8d8d5f32b53bd963c6566caabaff424c479fe080416f59b5387adbdf6dbac30fe265243cb5ed184baf6f8a9625052bd498c098b83463390d
-DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
 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 915 BLAKE2B a8e306745af4977acc3e086529c0de6cc530499625be23e385ac250fee13856d320cc44f824178874340bb2040dbf46228b4ecfae04bde5cf168ee60da4e1e73 SHA512 209662d0a7ae9f33974e5048c247a8b2ab6d8502ecd3ab7297609de0f93a7477e3b8f6802584b8e3cf3ad83745f291d2ef6fd605987d6b54d46144bd107a245d
+EBUILD catch-2.13.3.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
 EBUILD catch-2.13.4.ebuild 916 BLAKE2B 25003bc54358c202b635dcc8f1310382f8c38c1020b0a76c10b939e882a8c9f141280447f432014fd393add78cae0143e4e37be5d3637c3edc73a3e6adc7de28 SHA512 caa1a50e9567c32b63a234c177467c3c9e083dbcc5dfe4aa81b9f0dda2dcb86706492c84fd7eff4c3c89bfab6ec6e8ca1fd750d492688ae4220292dc7715c4bb
-EBUILD catch-2.5.0.ebuild 900 BLAKE2B f680c17fcb3e0fa26473f42507b018f2e8e5ce73842b6fc2d3c7ebb1b60434e577602a94e7f3272da3ced49af25f4480f0d2207d9d7c2c59b0002fe46b3cb83a SHA512 dff4281f43baa2fb55ceb841b234cf21264308421cadc91d742244993b6c5ad27781b99e41c7b38f5535c31d2913ebba5b141c91ffde9d82f96690798a6759bb
 EBUILD catch-9999.ebuild 957 BLAKE2B d8834959413b85dc5a5181a060a4e75730d5b258b113024e7e426793dfab806475bec2dd02ec24149086e98cfcc35e1def04a63b604f2fd98cf53034616586be SHA512 ded76b95e18991428e08d15533ec76db77226687955888f8db016d35c47aa00d25cac0e1749899dd5884d28c7f2e3afa77976ce3505f5e47a3e652c62383ef38
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.13.3.ebuild b/dev-cpp/catch/catch-2.13.3.ebuild
index a33a6a89e42c..4ef090102289 100644
--- a/dev-cpp/catch/catch-2.13.3.ebuild
+++ b/dev-cpp/catch/catch-2.13.3.ebuild
@@ -13,7 +13,7 @@ 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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/dev-cpp/catch/catch-2.5.0.ebuild b/dev-cpp/catch/catch-2.5.0.ebuild
deleted file mode 100644
index 6207dd339fb4..000000000000
--- a/dev-cpp/catch/catch-2.5.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_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/string-theory/Manifest b/dev-cpp/string-theory/Manifest
index 5c3aedfe8633..3c8b46b0656e 100644
--- a/dev-cpp/string-theory/Manifest
+++ b/dev-cpp/string-theory/Manifest
@@ -1,3 +1,5 @@
 DIST string-theory-3.3.tar.gz 588360 BLAKE2B ad87857e6d5e3cad1346b759457b434de7612b97e1b19016b1dfc987ac67f0cab318745b14fe1f432cc921ffb1d33b875a2a62f0bc56d815dd35b405a9f08560 SHA512 86209333dce341078c3b973084bd9f3b8ff2ccac0e07a5e6acf5973bd1cfa420897b531b2d1bd6aba9f5ccc8927f85d91f06796ac0e62ec8a735564a0387d2f4
+DIST string-theory-3.4.tar.gz 588522 BLAKE2B 207c490293401829d28590291166bcbeefde4ecb3b70d1cc2751d7582c53cf234b7e01579d3bfbe55681708e4d3e22cedbd6fe96b2fdad1c3ef158bb7a080593 SHA512 36ad82c6da276b7cb66d350ceb4bed2a66f768a6604b2981331ceec6a96d03cc3a7e7e5f733de88ec15e0ea41f99f8657b959a51149c540f530d06268c5657ff
 EBUILD string-theory-3.3.ebuild 790 BLAKE2B 7f5f08a59ee1233e4ab14e520fa837e65c1697215dc8330526a7011ba66a1d28c6f7e953f36b89231dc5e44bdb9dcfccc94f54c3a060a4df37b3341b9df2741d SHA512 b6f1d3baa1c606e0bb470aec7305dae97c7096b876768e45e250bb68480198a5f278a5ce9a9ef654bb29f35e2d435caff1eeba7c59e4be6866bc98b3eb519bc3
+EBUILD string-theory-3.4.ebuild 795 BLAKE2B 910767f3304324fbdfeb462251c98623870dc75a46d1741470d51c2b0f850ee5a15a38ae95175bd46c3449b54a65fbaad37c60e203b1efb7651463d98bb58237 SHA512 ec84431ebdb8c7eb4b5d40d7d95f836b8039a9d90211542287bc0a96dd89405d20050ab51901a350ef77234e587beb80a41777adb58186c7739c314dc12bc524
 MISC metadata.xml 469 BLAKE2B 4826f5bd124fec7815e99d11166a0a4c79d806ace91b25f529f26e2b61e89451d2bd464e24103f24d39a1dc3bde56c608bd4cf4e167948633dbbc8381731a28c SHA512 6df6277f273d4d5a8739df38abe0e3f590bcae55b4bc00d2543f89d5429dc905c81464015f0e07933d8c5e38b9d74338d370baf4c8cf68b1ce66622f75ed1309
diff --git a/dev-cpp/string-theory/string-theory-3.4.ebuild b/dev-cpp/string-theory/string-theory-3.4.ebuild
new file mode 100644
index 000000000000..f894600367c2
--- /dev/null
+++ b/dev-cpp/string-theory/string-theory-3.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A flexible modern C++ library for string manipulation and storage"
+HOMEPAGE="https://github.com/zrax/string_theory/"
+SRC_URI="https://github.com/zrax/string_theory/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/string_theory-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# Drop -Werror from bundled gtest
+	# bug #766468
+	sed -i -e "s/-Werror//" test/gtest-1.10.0/cmake/internal_utils.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DST_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+	./st_gtests || die
+}