6 files changed, 98 insertions, 6 deletions
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 1c72bf65a157..4fe08f538e6e 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,2 +1,3 @@
 DIST benchmark-1.7.1.tar.gz 196575 BLAKE2B 05a0ae69c0eee231b5d3c06d474c89680e4a2dfaae2ac0ffa1777cf011907cce6230648bfdb631008c2aa10f01b55652f58949849714d6333c5a0351ef42e567 SHA512 396af1c1d3eaa2b78c6d23b1472f6088db85a294056ae1c2366dc5c0becdc8f141ba8fc3a235033324ab0a41c2298f5d242ef09b9b6f69d9877de6bcb2062efd
 DIST benchmark-1.8.0.tar.gz 204701 BLAKE2B d4a2b673152c784efef118b7c5e2971a7f7749b2bbb3b5eb09d1567261853a3e85983e82bbb3a470be72204581a2d031b194cb92d4386e120ffaab71c8a58f6b SHA512 ae8df163ca1319752a03497a259800dc33c71164e7def2feeadcf18d018c64eaf846ea2a562183e3d3cde0af58291de0b091ec6d9c025076f469c403b2ab0d51
+DIST benchmark-1.8.2.tar.gz 205926 BLAKE2B b39ee0c983e1b7417c54878507e692d9bc04d83da91c8059ae08373fc59286f28b8910d1d5ea425b0c512502de0aee51b10b1b191bac3ec29ec5f9ffc9056d64 SHA512 532f2cee66cf527ef4452a060cfdedba6417e5d8f72225d6bf50adf6422d9a769b0f54f48982b438fa9ced975ac47bcc5e62c3c23ce871b5cfdbcf9cc0d2b829
diff --git a/dev-cpp/benchmark/benchmark-1.8.2.ebuild b/dev-cpp/benchmark/benchmark-1.8.2.ebuild
new file mode 100644
index 000000000000..10aeaa981372
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.8.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A microbenchmark support library"
+HOMEPAGE="https://github.com/google/benchmark"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug doc lto test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.11.0 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
+		-DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
+		-DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
+		-DBENCHMARK_ENABLE_LTO=$(usex lto)
+		-DBENCHMARK_ENABLE_TESTING=$(usex test)
+		-DBENCHMARK_ENABLE_WERROR=OFF
+		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
+	)
+
+	use debug || append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 364f06a709d9..b21b09849640 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,3 +1,4 @@
 DIST cpp-httplib-0.12.3.tar.gz 639107 BLAKE2B 15db0056069cbda5359c6279ebc84520039e809f32cd8314c180dd761324a76fccaae0e80f39d0b69563903bd667799425c7e85708962b2763416a3c8bbd09bb SHA512 3465e5c843ad4087bababadf8fe9f3e6961213301540053bb47f242f958280f43c85b03b8cf6f955a6b91bf9511a81669feeb9989344caf2a1e42ff587b3a460
 DIST cpp-httplib-0.12.6.tar.gz 641145 BLAKE2B 56a1a9c2d048a608664cce1ea3737d8633d6dbc124b4a5b2b5a33f81d678efdd2b8b0c79fb88c23dd861f1c6264eddba32349740142e3765d61f811dd50d9909 SHA512 63f0172bb7f4b02f3640634f25801bc1e34d85f53c9915e6402d825891793de26faa7551dff88a44c23af39e3592b7863454d9c070b5bd0e546cb987bca14885
 DIST cpp-httplib-0.13.0.tar.gz 644021 BLAKE2B 9ed1d49819662dbb6af04c4ab8b1d1cfa68db07d5b147f64c8c20a6a61f61490f518d9c8e405f867a130f0b455e530582ec9685deaadfd4b9f34790becf6495f SHA512 8d91fe1f2780d2330112ebb3f3d3c6ac6526e8cb04902e15edefe6121d588495519551007c3c134e0d16f71460cba1680860e229b2318f8725ce651027a68a9a
+DIST cpp-httplib-0.13.1.tar.gz 644015 BLAKE2B 99a9f58885c6313f18a459987c64ab2cdcca33238997117299016bb5a86e83383e24d01519ede831730fdad6ed8bec0fe0196cac5b53f680721e77883952aefa SHA512 4a70ebafd0920116a78ea18982606f0bec396e5cdcea9ba583c1da4fd77fa45c5bf30a6ac14eeee9424f3e445a882a560345d731a7113ab4e7dff88f4ef0a436
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.13.1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.13.1.ebuild
new file mode 100644
index 000000000000..629522c91039
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.13.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022-2023 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 toolchain-funcs
+
+DESCRIPTION="C++ HTTP/HTTPS server and client library"
+HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
+SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"  # soversion
+KEYWORDS="~amd64 ~loong ~x86"
+
+IUSE="brotli ssl test zlib"
+REQUIRED_USE="test? ( brotli ssl zlib )"
+RESTRICT="!test? ( test )"
+
+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 -a 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
+}
+
+multilib_src_test() {
+	cp -p -R --reflink=auto "${S}/test" ./test || die
+
+	GTEST_FILTER='-*.*_Online' emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
+}
diff --git a/dev-cpp/gflags/gflags-2.2.2.ebuild b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
index da0ea88c47b5..a841f16304c3 100644
--- a/dev-cpp/gflags/gflags-2.2.2.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
@@ -25,6 +25,8 @@ RESTRICT="!test? ( test )"
 DOCS=( ChangeLog.txt README.md )
 
 multilib_src_configure() {
+	append-lfs-flags
+
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTING=$(usex test)
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 613e8bc12948..a6c7626265c0 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
@@ -25,6 +25,8 @@ RESTRICT="!test? ( test )"
 DOCS=( ChangeLog.txt README.md )
 
 multilib_src_configure() {
+	append-lfs-flags
+
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTING=$(usex test)