Adding metadata

21 files changed, 92 insertions, 20 deletions

diff --git a/dev-cpp/cpp-utilities/Manifest b/dev-cpp/cpp-utilities/Manifest
new file mode 100644
index 000000000000..d62ed5cbf2e6
--- /dev/null
+++ b/dev-cpp/cpp-utilities/Manifest
@@ -0,0 +1 @@
+DIST cpp-utilities-5.31.0.tar.gz 213089 BLAKE2B 3b35ed559ae8e15ec9a92719bdbdb0affb6d7b4bd01b9558042f51e2e5dce757fb819d08ae5ae7b38783a6461c08da249c9bc0daecd393da84d8a598f6df380e SHA512 1d1b294e9df060fa2332f877378d8865e8f84467901783f0e3839ae37578426c71a00ebcd42b9b628e38c46dbb20a99f04d9c3304a8f0cb627264a479a9b22e7
diff --git a/dev-cpp/cpp-utilities/cpp-utilities-5.31.0.ebuild b/dev-cpp/cpp-utilities/cpp-utilities-5.31.0.ebuild
new file mode 100644
index 000000000000..9034ccc29e13
--- /dev/null
+++ b/dev-cpp/cpp-utilities/cpp-utilities-5.31.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Useful C++ classes and routines"
+HOMEPAGE="https://github.com/Martchus/cpp-utilities"
+
+SRC_URI="https://github.com/Martchus/cpp-utilities/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DEXCLUDE_TESTS_FROM_ALL=$(usex !test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/cpp-utilities/metadata.xml b/dev-cpp/cpp-utilities/metadata.xml
new file mode 100644
index 000000000000..c41c001b8ca0
--- /dev/null
+++ b/dev-cpp/cpp-utilities/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>esteve.varela@gmail.com</email>
+  <name>Esteve Varela Colominas</name>
+ </maintainer>
+ 
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild b/dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild
index e80ab350ff21..b47a838f5a4f 100644
--- a/dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild
+++ b/dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 	dev-libs/libfmt:=
 	dev-libs/openssl:=
 	dev-libs/xxhash:=
-	sys-libs/zlib:=
+	virtual/zlib:=
 "
 RDEPEND="
 	${DEPEND}
diff --git a/dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild b/dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild
index f068080311b4..993e2ce18db8 100644
--- a/dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild
+++ b/dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 	dev-libs/libfmt:=
 	dev-libs/openssl:=
 	dev-libs/xxhash
-	sys-libs/zlib:=
+	virtual/zlib:=
 "
 RDEPEND="
 	${DEPEND}
diff --git a/dev-cpp/fizz/fizz-2025.04.14.00.ebuild b/dev-cpp/fizz/fizz-2025.04.14.00.ebuild
index 3debe0b5d7a4..70a07e17db6d 100644
--- a/dev-cpp/fizz/fizz-2025.04.14.00.ebuild
+++ b/dev-cpp/fizz/fizz-2025.04.14.00.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	dev-libs/libfmt:=
 	dev-libs/libsodium:=
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 "
 uEPEND="
 	${RDEPEND}
diff --git a/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild b/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild
index 0257d178791a..777723a3e707 100644
--- a/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild
+++ b/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ RDEPEND="
 	dev-libs/libsodium:=
 	dev-libs/openssl:=
 	>=sys-libs/liburing-2.3:=
-	sys-libs/zlib
+	virtual/zlib:=
 	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 "
diff --git a/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild b/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild
index 9cbed7021ae2..6c715c7b5636 100644
--- a/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild
+++ b/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	dev-libs/libsodium:=
 	dev-libs/openssl:=
 	>=sys-libs/liburing-2.3:=
-	sys-libs/zlib
+	virtual/zlib:=
 	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 "
diff --git a/dev-cpp/folly/folly-2025.04.14.00-r1.ebuild b/dev-cpp/folly/folly-2025.04.14.00-r1.ebuild
index c3bbe87a20b7..c80379393b45 100644
--- a/dev-cpp/folly/folly-2025.04.14.00-r1.ebuild
+++ b/dev-cpp/folly/folly-2025.04.14.00-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-libs/libfmt:=
 	dev-libs/libsodium:=
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 	io-uring? ( >=sys-libs/liburing-2.10:= )
diff --git a/dev-cpp/folly/folly-2025.04.14.00-r2.ebuild b/dev-cpp/folly/folly-2025.04.14.00-r2.ebuild
index 440014760b5a..b4e0eb1d05a5 100644
--- a/dev-cpp/folly/folly-2025.04.14.00-r2.ebuild
+++ b/dev-cpp/folly/folly-2025.04.14.00-r2.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-libs/libfmt:=
 	dev-libs/libsodium:=
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 	io-uring? ( >=sys-libs/liburing-2.10:= )
diff --git a/dev-cpp/glaze/glaze-5.5.4.ebuild b/dev-cpp/glaze/glaze-5.5.4.ebuild
index cbeff4ec69d1..7a38952ed260 100644
--- a/dev-cpp/glaze/glaze-5.5.4.ebuild
+++ b/dev-cpp/glaze/glaze-5.5.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/glaze-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples fuzzing test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
index caf19cd7e8f6..e5e33b3bb52d 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ RDEPEND="boost? ( dev-libs/boost[context] )
 	!<dev-libs/msgpack-5.0.0"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-text/doxygen[dot] )
-	test? ( sys-libs/zlib )"
+	test? ( virtual/zlib )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
index 35b5204d39c0..41fc11872df3 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ RDEPEND="boost? ( dev-libs/boost[context] )
 	!<dev-libs/msgpack-5.0.0"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-text/doxygen[dot] )
-	test? ( sys-libs/zlib )"
+	test? ( virtual/zlib )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-6.0.0-gcc13.patch
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
index caf19cd7e8f6..e5e33b3bb52d 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ RDEPEND="boost? ( dev-libs/boost[context] )
 	!<dev-libs/msgpack-5.0.0"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-text/doxygen[dot] )
-	test? ( sys-libs/zlib )"
+	test? ( virtual/zlib )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
index 9d825d14faf0..e5e33b3bb52d 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="boost? ( dev-libs/boost[context] )
 	!<dev-libs/msgpack-5.0.0"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-text/doxygen[dot] )
-	test? ( sys-libs/zlib )"
+	test? ( virtual/zlib )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.22.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.22.0.ebuild
index ab64d6bff5f5..1f86c39b4fad 100644
--- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.22.0.ebuild
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.22.0.ebuild
@@ -36,7 +36,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	http? (
 		net-misc/curl
-		sys-libs/zlib
+		virtual/zlib:=
 	)
 	elasticsearch? (
 		dev-cpp/nlohmann_json
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-1.2.4.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-1.2.4.ebuild
index 296f437914a3..5aac6bae234a 100644
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-1.2.4.ebuild
+++ b/dev-cpp/prometheus-cpp/prometheus-cpp-1.2.4.ebuild
@@ -17,7 +17,7 @@ IUSE="test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="net-misc/curl
-	sys-libs/zlib
+	virtual/zlib:=
 	www-servers/civetweb[cxx]"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-cpp/robin-map/robin-map-1.4.0-r1.ebuild b/dev-cpp/robin-map/robin-map-1.4.0-r1.ebuild
index 08d1e850deab..12f19143d630 100644
--- a/dev-cpp/robin-map/robin-map-1.4.0-r1.ebuild
+++ b/dev-cpp/robin-map/robin-map-1.4.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
 else
 	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 93b7a39928fe..0114a8393263 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -5,4 +5,4 @@ DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6
 DIST tbb-2021.9.0.tar.gz 2579150 BLAKE2B f6f701df1605913770222689063ff422416f86f132fb3fbc80f383b7c52762d3804e75200ca4826906b16c66f674918bcfd78b16a1dafb499ca53a9d2b6652ec SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c
 DIST tbb-2022.0.0.tar.gz 2654343 BLAKE2B eac1a8065e401f1329527ccb1db0a8d30eb54ca2d9180560cd3be2263a779d250a0bda4fc3fb11fede3c63e964490420f09d664a7e39071d9b6a6cf743349f8f SHA512 c87b84964b2c323f61895a532968dfa6413a774c177cffbf6e798a07e74e8da5d449144875771df0a1b02657eeb2a7ae4d41c6c432dbf7ea50e3d5a9ea9f8cd3
 DIST tbb-2022.1.0.tar.gz 3434602 BLAKE2B a6441be4830ac79d648eee37a534bb74e2298612237059e2d22778c3aebda7e9a73c58948c8f9e89603cb05270d63d412b28bdc13a7cc6b3f6683ed21f1c221a SHA512 7582748f7d0e0ab46ea6ee7771dfaf7fc08ca7ab7f274fb3373eae0e3411aaafbac192ece15008d9a3d9e8566f8737f96f3f4b5ccf11449ac089d5cd9ebb9eab
-DIST tbb-2022.2.0.tar.gz 4244148 BLAKE2B 91a6265574e2f540f5bda31a90bbc376d10788020021acfcc85e614fdcceeb6b3a2b45e745e9797db260141b81035e4ac4ca3dcd49539ac5c0446dac18f988cb SHA512 d87c67514ca17c9769910194a8fac912e183952ad5c408dbceb48edc8aef13375df3d4c9120a7366206c8ab72699ed953df65c11c261e19d8e9d273c73d073f3
+DIST tbb-2022.3.0.tar.gz 6836514 BLAKE2B 466e599dca7a64608eaa4df2fe16e62261230446a961bfadc65b9cded9489ed0b5a1e2d9d2a9dd3d202b62ac32e10c2cfa9b1a3cf1e292347985ec7b0400a72f SHA512 fdc50589785b1949ca1dd4429bbcedb180be4b8966da5243ddd1f8e9f97310dd603681e0bb83c1d6c2d3e27932f577ef6739e4e82f3c54af147f4d6d906b39f1
diff --git a/dev-cpp/tbb/files/tbb-2022.3.0-no-clobber-hardened.patch b/dev-cpp/tbb/files/tbb-2022.3.0-no-clobber-hardened.patch
new file mode 100644
index 000000000000..ac8b3d756a0f
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2022.3.0-no-clobber-hardened.patch
@@ -0,0 +1,37 @@
+We already set these flags as appropriate in the toolchain.
+--- a/cmake/compilers/Clang.cmake
++++ b/cmake/compilers/Clang.cmake
+@@ -63,15 +63,11 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN)
+ endif()
+ 
+ # Clang flags to prevent compiler from optimizing out security checks
+-set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security -fPIC $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fstack-protector-strong>)
+-
+-if (NOT APPLE AND NOT ANDROID_PLATFORM AND CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)")
+-    set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} -fstack-clash-protection $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fcf-protection=full>)
+-endif()
++set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security -fPIC)
+ 
+ # -z switch is not supported on MacOS
+ if (NOT APPLE)
+-    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack)
++    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,noexecstack)
+ endif()
+ 
+ set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS})
+--- a/cmake/compilers/GNU.cmake
++++ b/cmake/compilers/GNU.cmake
+@@ -121,12 +121,7 @@ endif ()
+ 
+ # Gnu flags to prevent compiler from optimizing out security checks
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv)
+-set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security
+-    -fstack-protector-strong )
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN)
+-    set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fcf-protection=full>)
+-endif ()
+-set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fstack-clash-protection>)
++set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security)
+ 
+ # -z switch is not supported on MacOS and MinGW
+ if (NOT APPLE AND NOT MINGW)
diff --git a/dev-cpp/tbb/tbb-2022.2.0.ebuild b/dev-cpp/tbb/tbb-2022.3.0.ebuild
index edfcdf42ad9a..e1263b783771 100644
--- a/dev-cpp/tbb/tbb-2022.2.0.ebuild
+++ b/dev-cpp/tbb/tbb-2022.3.0.ebuild
@@ -25,6 +25,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch
 	"${FILESDIR}"/${PN}-2022.0.0_do-not-fortify-source.patch
+	"${FILESDIR}"/${PN}-2022.3.0-no-clobber-hardened.patch
 )
 
 src_prepare() {