Adding metadata

5 files changed, 50 insertions, 61 deletions

diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
index 0c1c029a1eda..9518bc80e153 100644
--- a/dev-cpp/cppgir/Manifest
+++ b/dev-cpp/cppgir/Manifest
@@ -1 +1 @@
-DIST cppgir-0_p20230625.tar.bz2 93259 BLAKE2B 7593ed17391d40ba69c2915a6f3750ac5a0596977a1ddf61aad2db40e61b967ec8b4a9f6f11b22a2f15660344358b2f4cfd2f46aa50d565163b0508ac411d974 SHA512 9167650ff6d22b2da7c824c91b864a104950ed44156c4fdd222abef3261b7ae9639dbafaca4ad3c175da7707bbf221ef166778c4227bb395149b804e74d91693
+DIST cppgir-0_p20230701.tar.bz2 93266 BLAKE2B 73fe45188c8304da84cc39b838176a9100622f3a2aa6cdb7a8eb4c58bb16fe5a8772c8bdc0d7686a322d86bc1aba3b22c3b1ebfeab98e7d282f7258050249a50 SHA512 90378f73a7c05e8a4fdadddf0add35ffb90fce563eab97ef981d6f9dfbbc4a5d0e83c70a54de9fbbf23d85eb6ce02036e0ffbfafe67384fbc99a997fd8b92f0b
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 34ae60229d43..341912467865 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,4 +1,5 @@
 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
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
+}