11 files changed, 168 insertions, 29 deletions
diff --git a/dev-cpp/catch/catch-3.0.1.ebuild b/dev-cpp/catch/catch-3.0.1.ebuild
index 93cbc6d8c05b..176fa952e0c4 100644
--- a/dev-cpp/catch/catch-3.0.1.ebuild
+++ b/dev-cpp/catch/catch-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -28,6 +28,10 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.1-gcc13.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/dev-cpp/catch/files/catch-3.0.1-gcc13.patch b/dev-cpp/catch/files/catch-3.0.1-gcc13.patch
new file mode 100644
index 000000000000..88431c2704d6
--- /dev/null
+++ b/dev-cpp/catch/files/catch-3.0.1-gcc13.patch
@@ -0,0 +1,61 @@
+https://github.com/catchorg/Catch2/pull/2611
+
+From 12a93b20b9aec1df537781c9c0712ec24d31d739 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 8 Jan 2023 02:03:32 +0000
+Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> is no longer transitively included.
+
+Explicitly include <cstdint> for uint64_t.
+
+```
+FAILED: src/CMakeFiles/Catch2.dir/catch2/internal/catch_clara.cpp.o
+/usr/lib/ccache/bin/g++-13  -I/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/.. -I/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1_build/generated-includes  -O2 -pipe
+-march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type -D_GLIBCXX_ASSERTIONS  -ggdb3 -fdiagnostics-color=always
+-ffile-prefix-map=/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1=. -Wall -Wc++20-compat -Wcast-align -Wcatch-value -Wdeprecated -Wexceptions -Wextra -Wextra-semi -Wfloat-equal -Winit-self
+-Wmisleading-indentation -Wmismatched-new-delete -Wmismatched-tags -Wmissing-braces -Wmissing-declarations -Wmissing-noreturn -Wnull-dereference -Wold-style-cast -Woverloaded-virtual -Wparentheses
+-Wpedantic -Wreorder -Wshadow -Wstrict-aliasing -Wsuggest-override -Wundef -Wuninitialized -Wunreachable-code -Wunused -Wunused-function -Wunused-parameter -Wvla -MD -MT
+src/CMakeFiles/Catch2.dir/catch2/internal/catch_clara.cpp.o -MF src/CMakeFiles/Catch2.dir/catch2/internal/catch_clara.cpp.o.d -o src/CMakeFiles/Catch2.dir/catch2/internal/catch_clara.cpp.o -c
+/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/internal/catch_clara.cpp
+In file included from /var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/internal/catch_clara.cpp:12:
+/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/../catch2/internal/catch_string_manip.hpp:47:14: error: 'uint64_t' in namespace 'std' does not name a type; did you mean 'wint_t'?
+   47 |         std::uint64_t m_count;
+      |              ^~~~~~~~
+      |              wint_t
+/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/../catch2/internal/catch_string_manip.hpp:51:42: error: expected ')' before 'count'
+   51 |         constexpr pluralise(std::uint64_t count, StringRef label):
+      |                            ~             ^~~~~~
+      |                                          )
+```
+--- a/src/catch2/catch_test_case_info.hpp
++++ b/src/catch2/catch_test_case_info.hpp
+@@ -15,6 +15,7 @@
+ #include <catch2/internal/catch_unique_ptr.hpp>
+ 
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/catch2/internal/catch_string_manip.hpp
++++ b/src/catch2/internal/catch_string_manip.hpp
+@@ -10,6 +10,7 @@
+ 
+ #include <catch2/internal/catch_stringref.hpp>
+ 
++#include <cstdint>
+ #include <string>
+ #include <iosfwd>
+ #include <vector>
+--- a/src/catch2/internal/catch_xmlwriter.cpp
++++ b/src/catch2/internal/catch_xmlwriter.cpp
+@@ -11,6 +11,7 @@
+ #include <catch2/internal/catch_enforce.hpp>
+ #include <catch2/internal/catch_xmlwriter.hpp>
+ 
++#include <cstdint>
+ #include <iomanip>
+ #include <type_traits>
+ 
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 21b06cb3f734..6f6efb0756d7 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1 +1 @@
-DIST cpp-httplib-0.10.9.tar.gz 620951 BLAKE2B da2722be97efd85f35114a20022c49010f1f6e01423c83f897e8378e4f77107a3448025cfdc27d73a76e1260f44e204d374597479044eb962bc3f10c0078b0da SHA512 7bcb5e35342202df3358d40830e1ccefeb17ca26208daf149411250d9e9408b340764ebbe5d59c4bc0faca42db810452d6ba5ad7c10edacc2dedd340c321d040
+DIST cpp-httplib-0.11.3.tar.gz 633203 BLAKE2B 7418b958610a5f9fa634bd67622d176bdbb54a93c6478578ea0f9a9f1104b72923a8909702ae994edecc6e1f37d63ba09444913d44785e944426464df7c48cb1 SHA512 b0c46bf11c8bc84ab52143559ff1c4682b02504921855e5cd7e82bc65a04b192281ef7a124c7c7dfe928ae3842d5065097b6a4608be1c74dc51b563b15b93d0f
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.10.9.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.10.9.ebuild
deleted file mode 100644
index 982b2d79e0a9..000000000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.10.9.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ header-only HTTP/HTTPS server and client library"
-HOMEPAGE="https://github.com/yhirose/cpp-httplib"
-SRC_URI="https://github.com/yhirose/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild
new file mode 100644
index 000000000000..f7bb12cd596a
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="C++ HTTP/HTTPS server and client library"
+HOMEPAGE="https://github.com/yhirose/cpp-httplib"
+SRC_URI="https://github.com/yhirose/cpp-httplib/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0.11" # soversion
+KEYWORDS="~amd64 ~x86"
+
+IUSE="brotli ssl zlib"
+
+RDEPEND="
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHTTPLIB_COMPILE=yes
+		-DBUILD_SHARED_LIBS=yes
+		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
+		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
+		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
+		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
+		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
+		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake-multilib_src_configure
+}
diff --git a/dev-cpp/cpp-httplib/metadata.xml b/dev-cpp/cpp-httplib/metadata.xml
index 0eb8cd867580..787dff8a5163 100644
--- a/dev-cpp/cpp-httplib/metadata.xml
+++ b/dev-cpp/cpp-httplib/metadata.xml
@@ -2,9 +2,22 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>samuel.bauer@yahoo.fr</email>
-  <name>Samuel Bauer</name>
+  <email>xgqt@gentoo.org</email>
+  <name>Maciej Barć</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <maintainer type="person">
+  <email>alexey+gentoo@asokolov.org</email>
+  <name>Alexey Sokolov</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/yhirose/cpp-httplib/issues</bugs-to>
+ </upstream>
+ <use>
+  <flag name="brotli">Enable <pkg>app-arch/brotli</pkg> support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-cpp/magic_enum/Manifest b/dev-cpp/magic_enum/Manifest
new file mode 100644
index 000000000000..f363ac357209
--- /dev/null
+++ b/dev-cpp/magic_enum/Manifest
@@ -0,0 +1 @@
+DIST magic_enum-0.8.2.tar.gz 171915 BLAKE2B e8915aa7cafa9407d5d4ab3b6837fafde6b1cb75877c8b56f82568e6291ca317720950947b2dfc7e12ca459279ba4e809a8c5782fc04adc2d7636eddcb80122d SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a
diff --git a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild b/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild
new file mode 100644
index 000000000000..df1937ee496b
--- /dev/null
+++ b/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# As of 0.8.2, it has meson, but only for subproject use(?)
+# Doesn't install anything.
+inherit cmake
+
+DESCRIPTION="Static reflection for enums in header-only C++"
+HOMEPAGE="https://github.com/Neargye/magic_enum"
+SRC_URI="https://github.com/Neargye/magic_enum/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+# Tests fail to compile
+RESTRICT="!test? ( test ) test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAGIC_ENUM_OPT_BUILD_TESTS=$(usex test)
+		-DMAGIC_ENUM_OPT_INSTALL=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/magic_enum/metadata.xml b/dev-cpp/magic_enum/metadata.xml
new file mode 100644
index 000000000000..1b8db8b4c1d6
--- /dev/null
+++ b/dev-cpp/magic_enum/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="project">
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
index 633a2cde4a86..c353ee1fdfb1 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/taskflow/taskflow-3.3.0.ebuild b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
index 7622706d17f6..27b159cb6268 100644
--- a/dev-cpp/taskflow/taskflow-3.3.0.ebuild
+++ b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/taskflow-${PV}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/taskflow-${PV}"
 fi