6 files changed, 52 insertions, 63 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index f26a1d90cd3a..6ab5342cba12 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
index 0acbcbc0aaf3..ddb7005e70e8 100644
--- a/dev-cpp/cppgir/Manifest
+++ b/dev-cpp/cppgir/Manifest
@@ -1,4 +1,3 @@
-AUX cppgir-0_p20230625-fix-libcxx-16.patch 1943 BLAKE2B 5fbb16f325508ddac66b07754eac33032eae18aaa79b8a1813e4cd92477ab47808031a322a8c983a7bdec2a513846574e960c9d4e9ade3dbbf8726c8eccbd8e5 SHA512 50ae0d4b096d3b35bf00db2431a64e7a86b50d148fc5d7090312db88755de8710285a9a11377d6adbb437c1f0a1fba52f78b1421a794231ef132ac3281251917
-DIST cppgir-0_p20230625.tar.bz2 93259 BLAKE2B 7593ed17391d40ba69c2915a6f3750ac5a0596977a1ddf61aad2db40e61b967ec8b4a9f6f11b22a2f15660344358b2f4cfd2f46aa50d565163b0508ac411d974 SHA512 9167650ff6d22b2da7c824c91b864a104950ed44156c4fdd222abef3261b7ae9639dbafaca4ad3c175da7707bbf221ef166778c4227bb395149b804e74d91693
-EBUILD cppgir-0_p20230625.ebuild 1030 BLAKE2B c0857d6742d80577212bf358b2f177e24b5a2d0a55206d5a21782a618e00f0fdb4aad78d95e46e994a6b29826538decb3967f5dfedbb7556a304faeccde1e4af SHA512 f59ee1d9a6b698de05f7c13bb56d899cd6c39dbc149849d888541c85d90447979a92b73a625331a887d887e9f204d5873acc3cc3679539ebc535e09887debcaa
+DIST cppgir-0_p20230701.tar.bz2 93266 BLAKE2B 73fe45188c8304da84cc39b838176a9100622f3a2aa6cdb7a8eb4c58bb16fe5a8772c8bdc0d7686a322d86bc1aba3b22c3b1ebfeab98e7d282f7258050249a50 SHA512 90378f73a7c05e8a4fdadddf0add35ffb90fce563eab97ef981d6f9dfbbc4a5d0e83c70a54de9fbbf23d85eb6ce02036e0ffbfafe67384fbc99a997fd8b92f0b
+EBUILD cppgir-0_p20230701.ebuild 964 BLAKE2B bd152d60309e27ee527afcd046d176d7915341eb34a45dbe3368fa759b4c52015e7d937d15fd201c9a0aec40e6f28d780ad935085d368d862c51c4d636fc8962 SHA512 b337f724c80f04d46e05cb0f72a5bda4f72c86e621b8cee765a073e944a29c5c955212f1688440dbf3b3ac8bb24a87f3b4c4cd10d374bcb1e8cf011339a4412f
 MISC metadata.xml 567 BLAKE2B 0684a8a7347f840ff2d683d32ccf4fd37e0c617be78600dde97ad5f1bf5e897b01fbf40474eeaf3bd14a4efd99642dd7e062b05a61fc2a2f15722996b5422673 SHA512 fcd0bfcbaa4a4d684ab29bdc6ef3d251bc17206d548ce15644efa0a5b6cfc7e072c04c6a7e882307e73eb74347e971389fdb01462be28e5bbd9bb8c0ec8934e9
diff --git a/dev-cpp/cppgir/cppgir-0_p20230625.ebuild b/dev-cpp/cppgir/cppgir-0_p20230701.ebuild
index 372c26104fd5..dccf44596ee6 100644
--- a/dev-cpp/cppgir/cppgir-0_p20230625.ebuild
+++ b/dev-cpp/cppgir/cppgir-0_p20230701.ebuild
@@ -8,7 +8,7 @@ inherit cmake flag-o-matic
 DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
 HOMEPAGE="https://gitlab.com/mnauw/cppgir"
 
-MY_PV="70b0e3d522cec60316d116dcbd919b797e85685a"
+MY_PV="ada922a260479da27c989e39ed47e17a36cc2969"
 SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
@@ -23,16 +23,13 @@ RDEPEND="
 	dev-libs/libfmt:=
 "
 DEPEND="${RDEPEND}
-	dev-cpp/expected-lite"
+	dev-cpp/expected-lite
+"
 BDEPEND="
 	doc? ( app-text/ronn-ng )
 	test? ( dev-libs/glib )
 "
 
-PATCHES=(
-	"${FILESDIR}/cppgir-0_p20230625-fix-libcxx-16.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOC=$(usex doc)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch
deleted file mode 100644
index 6ca80e05594b..000000000000
--- a/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix building with libcxx-16
-
-https://bugs.gentoo.org/909316
-https://gitlab.com/mnauw/cppgir/-/issues/41
-
---- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/CMakeLists.txt
-+++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/CMakeLists.txt
-@@ -65,8 +65,8 @@
-     -DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH})
- target_compile_definitions(cppgir PRIVATE
-     -DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM})
--target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES})
--set_property(TARGET cppgir PROPERTY CXX_STANDARD 14)
-+target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES})
-+set_property(TARGET cppgir PROPERTY CXX_STANDARD 17)
- 
- add_library(gi INTERFACE)
- target_include_directories(gi INTERFACE
---- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/cppgir.cpp
-+++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/cppgir.cpp
-@@ -3,8 +3,8 @@
- #include "genns.hpp"
- #include "repository.hpp"
- 
--#include <experimental/filesystem>
--namespace fs = std::experimental::filesystem;
-+#include <filesystem>
-+namespace fs = std::filesystem;
- 
- #include <boost/algorithm/string/classification.hpp>
- #include <boost/algorithm/string/split.hpp>
---- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genbase.hpp
-+++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genbase.hpp
-@@ -6,6 +6,7 @@
- #include "repository.hpp"
- 
- #include <set>
-+#include <map>
- 
- struct GeneratorOptions
- {
---- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genns.cpp
-+++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genns.cpp
-@@ -5,8 +5,8 @@
- #include <boost/algorithm/string/join.hpp>
- #include <boost/format.hpp>
- 
--#include <experimental/filesystem>
--namespace fs = std::experimental::filesystem;
-+#include <filesystem>
-+namespace fs = std::filesystem;
- 
- #include <boost/property_tree/xml_parser.hpp>
- 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index bdfd10812e1e..982722eb8b12 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -10,11 +10,13 @@ AUX tbb-2021.5.0-x86-mwaitpkg.patch 1975 BLAKE2B d072f7dfa7f1fbe5986c409147419d7
 AUX tbb-2021.7.0-pthread-eagain.patch 4515 BLAKE2B d5a2d3d5dc0a4607227f03200901985fa823a6be2817c34e58e166e639f1f294a2ab65407140a8b4423e30d217fa3c04a4493dd3e4849d77877473002006870c SHA512 bfbac70acc603796f93c7712017700fa1de99cd1aa984f8015863f66ca6caaa03e5c4705dfc42c1af7592bc5b05b7ba9b48df7e5686d27f4ce67c53b954775cf
 AUX tbb-2021.8.0-gcc-13.patch 735 BLAKE2B d67ab028669cae808058d68c74ec4ef7477641afc025e9c5e3ce59912571330c2e3cc85b7fd25db2a7a084a1f05a82794ccd48c3f5f72a1c0893535de250f038 SHA512 ad9547149a68ab0ab78c28413d85b2496fcaf9d94b0ec48b4d723374092230ab4ed1b6d32cd05a63d8046036ed8f2c68cd91f38585e4dab6839e81383580a8d6
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
+DIST tbb-2021.10.0.tar.gz 2598088 BLAKE2B ba8352474b97c3d98b534cbfd8f61af165352967529f19226dbae17f17d20a8b5dfd7a3b29bab85431620cea1ee1c5990ec7311cc9b1b865d6aa1800540dd6d0 SHA512 d71cf317e7f78948c1ea20977cfcfba1eff72cb20c457c87e624cb3aaa3215a1c24eeeec11ed6ed99cf118c577d956234202458bb5e0215c9c317099d9c3b732
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6c66cdbe369f2702d87fd9877c3d97f8d83f71384028995ea0956f5c5630d4aaf4edbe68538e7c514d3b87085c SHA512 d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49
 DIST tbb-2021.8.0.tar.gz 2575336 BLAKE2B 2c3a7f0e59d70b17550f805461a15a520c7f1b3a37a41bd51c51f9f5863b50812d2b939351e11e0f4ceb3da8a47e413abe171bcb6bfb71c0fe2f81ed373f65f2 SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4
 DIST tbb-2021.9.0.tar.gz 2579150 BLAKE2B f6f701df1605913770222689063ff422416f86f132fb3fbc80f383b7c52762d3804e75200ca4826906b16c66f674918bcfd78b16a1dafb499ca53a9d2b6652ec SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c
 EBUILD tbb-2020.3.ebuild 3336 BLAKE2B 3cb88612974b7fa436a37e00cc610af7580f285e9e01f766df1c8deafe69035d824fa401c2052ffb30c2390de6b5e0795d02ed4dd6510bc968ebce0811bcadcb SHA512 e6eb70f8c893fe8c6b49995fff2dedcd24afbc56e39ee98d6c953aa608655b84adbea8182d4a85bc23a3b1bbadd0ee7616fc76ed449c359e6b9416eb752f9abe
+EBUILD tbb-2021.10.0.ebuild 1270 BLAKE2B 3e120fbc66d50a202dce6ffdf06e4542693966c13b070a9492be80efe815f3d5e5859c15c70fd830d7f826a4803d14eb52dbc7fc6fb0a9150344f783ac1c1c5c SHA512 f020063de2b4eebd591cf01aa99054630181ec99177b602d38a3e7fc817ae58d6c49854eda356f50f7791f2f5a91540c8456aae87fa3796c9d2c8784d5dc2d7f
 EBUILD tbb-2021.5.0-r1.ebuild 1425 BLAKE2B 36fa0f1c44b38b04ab7e9b116d672383fbf2ccb3597d2da9144f4590a08052c00577186f35497ac381207406935448241d8875d1552392b57e4b9d5e1f228415 SHA512 83e3277669a7ac2a4a7886d068f4fd5699bcf6251a32bd406e224f9a6bb5a00d0a9dae7b46b59c88b05fd2787eae0e437e2f8cc76be9eebf00621801ed852365
 EBUILD tbb-2021.7.0-r1.ebuild 989 BLAKE2B 91b110b6bf39cd9ba07930b6481cff9cc209df6b8a9bfba320924e47c3eaa64d8e0b4c393719af729cb26165dd84ca7545dd880210d854d72ce12f60b26c06c7 SHA512 e1a264a8803fb0de0f8d0b518db669ff6e6a860b2a95df5f2f456b7bd027442dfbfa0f52f2f324c5f6f4391bdc571b30b034e65b4d3a07278d8e4bc659a9c9af
 EBUILD tbb-2021.7.0.ebuild 1022 BLAKE2B e2ec61ba46aedb4187975b7e4848fac95fb167cdb803254e8b26dff2a367ab6d8c571e60e72b2e39dd49ed43bbf6fc1e1cb5e4f99fc7dfc13e2746c7e3f1877b SHA512 cfc2423728c85ade66c01b7d1dbbc7c6923e244581bc4b612197fb34fd03e544af2e7b597411b710c121e7ca5bfeff9fcd7a3e8d832fb397ce1754b6d8150438
diff --git a/dev-cpp/tbb/tbb-2021.10.0.ebuild b/dev-cpp/tbb/tbb-2021.10.0.ebuild
new file mode 100644
index 000000000000..2e11233b7583
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2021.10.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://github.com/oneapi-src/oneTBB"
+SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oneTBB-${PV}"
+
+LICENSE="Apache-2.0"
+# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
+# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
+SLOT="0/12.5-2.5-3.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
+)
+
+src_prepare() {
+	# Has an #error to force compilation as C but links with C++ library, dies
+	# with GLIBCXX_ASSERTIONS as a result.
+	sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTBB_TEST=$(usex test)
+		-DTBB_ENABLE_IPO=OFF
+		-DTBB_STRICT=OFF
+	)
+
+	cmake-multilib_src_configure
+}