gentoo auto-resync : 29:03:2025 - 00:32:15

4 files changed, 130 insertions, 0 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 9b1c8436b50b..d5af072017ad 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index bfaf669d5bf8..3efcfaec4c05 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,8 +1,11 @@
 AUX cpp-httplib-0.18.6-onlinetest.patch 370 BLAKE2B 7a40c0d8e5effd07e656b0c4fcebdce324d8dff9b40c70b301b62c91e61094ed33f298cb76d82c34141e5e5634ea21e56fa6c9e7a050a911c639085fa301a04e SHA512 24e52eee5114cafa45a6dc859b3a356265fdcba740679c89093cade5dbc134b231d90f9db5f1b2844090ad2bd616ee040880e9c750325dba025b6cad15a41024
+AUX cpp-httplib-0.20.0-zstd.patch 615 BLAKE2B 78b242f6367c50080e4264c124d11c7d29123f416c7cb0ca9bb4795dddd25a70d7cb016e0bd244a985b7955a6bb412221e9add055ddcfd161c03651e2732a3ef SHA512 16315a15aa537bded3465a86a74cfe90edccdb08d8d62e0d99cf430dc4170816455c103b8a093f9a840a618e46cc1fdf6671f1ee8c58566714bed4acc29b0cba
 DIST cpp-httplib-0.18.1.tar.gz 1323636 BLAKE2B 8335c9a4d69d7e9b2e7e3c4036b49627536c8d6cffa7a5ae2c3dff693c5458f7fa2f89f3da2c130325069225d3204ec579900d5c5266dff7a9c732c134b39907 SHA512 6dd1054d0171594bf871a918b5540cc67981a48f7dbb82e9029a4877afc6d8c36e2f69411f5eec7b052bf0245554d01f33ef2180f42a15f6b8dd86ebb2427a41
 DIST cpp-httplib-0.18.3.tar.gz 1324253 BLAKE2B 995ae8cd63013ec03e86f56e089b4f1374a8913eaf02d8fc07997b986dc8f65b1bda710ed686b6cc111e6203d15bbcb9db08cd810d2167c1658bfa99dc9b61b2 SHA512 d9eb70dfd8ebde658852d1a8cf9f96419ca11cad889b54672aa4812c0b5db0c3f1fddf63f536aec19fc4a849f41ed22461581a18f0733d3f906e45dd096bafd8
 DIST cpp-httplib-0.18.6.tar.gz 1326428 BLAKE2B bee65790b8f2a19f80fd8f38799d650ceaef021b6e9f28b2fd0678f4c50b95d210f9764775d67365e65e6f9e03d6999091f28aa553655444c8ff369172cf13f9 SHA512 326c1b3315256c1e1e8b6406b9209215f5c264e1071ab3de400011486713b90cb8f88b48ac979fb024ba91441c2fb00aa40a15b85bfac9895c052f2131773249
+DIST cpp-httplib-0.20.0.tar.gz 1408009 BLAKE2B f3888337edd0bf6753b28641a9d7196e59b73648de3e70b7d9e6072a7966c40ead4ef169a6f224b3c31cf4829ab71ffb3e461257f661e613cc806a596c1d6c30 SHA512 a20d306bfc7b3749f67c3f213f410cf61e1d3896cb7b02582299af7a396731594d514680d8af54a48e1462223a30354446c7970dc38f68fb2f647c9d2e018581
 EBUILD cpp-httplib-0.18.1.ebuild 2386 BLAKE2B 163602bbb043f11a616a876cc9194a8023627048eba3ec3d0a38bfd5fc0a7df59a6fa9ed9fe9b8ad28ee66350a72b10147e6e23f355f847f9c094c0c5e762951 SHA512 d2b08b158d542adb28af5ba253b903f48188a64387cefe9290b065a8cf8aa01f03eb47c3211a6543846463ba00f7a217b460eee022771a8fc5c2a526121b6cf8
 EBUILD cpp-httplib-0.18.3.ebuild 2394 BLAKE2B 4878163750a041ebaf8da7e541a8f30e0672f1ff2ca3fa3ec2e3201ca9e17199c2c89ab9debc0a3d0e10a5ecb106b4b996a32203d5a91d5bc7ec963de22520f5 SHA512 b9ca92f58fa7f9d9f2ce2d8f3d861a8c98042f57be263d4aa04da58d1f722a70e57704c5393ee1878cc0832c024e2e8dcde50a1d789e815fb974cafd49a23bee
 EBUILD cpp-httplib-0.18.6.ebuild 2444 BLAKE2B bd072b8983b3376fcd4f59caaba7c158f26535d5a283da8c68568963c9d87d544c25f52961951a3ebec59dd18231d7d4b0eb5c7e6daf3b980591ff3f9c10eb59 SHA512 5e10cc426cdc0c1005ccf77f3034c14ebac41403dc1fef843c35cf7f650b03af51ac7fc01680a011ab1d1bafb58eb4598903a5c5c2b2c9f3572f84752ef70e2c
+EBUILD cpp-httplib-0.20.0.ebuild 2664 BLAKE2B e6c894c33ec8ccf69cc7487c93cfccf86cb9fb6be61451b9c26faa789ab5e86595f494cc30d5fade4a6200f8d499bb0f415c607b9cfd0805cd0aa1cc13f0bccf SHA512 3a86c2c727f3976a8ce40d21103c9fa89dc5b6303cb6531cb8fd134d2992199247857e62f4404d3da6ec04264a782a2f143b3f2c8103c2f63418d252d3acabf8
 MISC metadata.xml 555 BLAKE2B dbc2f2c5ca081d49d0dc9de469c9a749c8704938a7f92550b1ab7013e6a026330fddc824fa72ed2d5b0b7faacddb5f87fdb34df6cbf1cfdca3a04f929b0f5e5a SHA512 518900e3f6b10de4548556dda93fdfdd8f92e87d30c5b8b7063029bd2b20a778b3bb3aff6cfc322e0be1c6abfc07283f38dc6b094ba6d14dbb433147312aa530
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.20.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.20.0.ebuild
new file mode 100644
index 000000000000..3097564bc7ab
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.20.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit cmake-multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ HTTP/HTTPS server and client library"
+HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/yhirose/${PN}.git"
+else
+	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/0.20"  # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
+
+IUSE="brotli ssl test zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	brotli? (
+		app-arch/brotli:=[${MULTILIB_USEDEP}]
+	)
+	ssl? (
+		>=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}]
+	)
+	zlib? (
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+	zstd? (
+		app-arch/zstd[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-zstd.patch"
+)
+
+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_USE_ZSTD_IF_AVAILABLE=no
+		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
+		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
+		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
+		-DHTTPLIB_REQUIRE_ZSTD=$(usex zstd)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	cp -p -R --reflink=auto "${S}/test" ./test || die
+
+	local -a failing_tests=(
+		# Disable all online tests.
+		"*.*_Online"
+
+		# Fails on musl x86:
+		ServerTest.GetRangeWithMaxLongLength
+		ServerTest.GetStreamedWithTooManyRanges
+
+		# https://github.com/yhirose/cpp-httplib/issues/1798
+		# Filed by mgorny's testing, fails on openssl >=3.2:
+		SSLClientServerTest.ClientCertPresent
+		SSLClientServerTest.ClientEncryptedCertPresent
+		SSLClientServerTest.CustomizeServerSSLCtx
+		SSLClientServerTest.MemoryClientCertPresent
+		SSLClientServerTest.MemoryClientEncryptedCertPresent
+		SSLClientServerTest.TrustDirOptional
+
+		# https://github.com/yhirose/cpp-httplib/issues/2113
+		MaxTimeoutTest.ContentStream
+		MaxTimeoutTest.ContentStreamSSL
+	)
+
+	# Little dance to please the GTEST filter (join array using ":").
+	failing_tests_str="${failing_tests[@]}"
+	failing_tests_filter="${failing_tests_str// /:}"
+
+	# PREFIX is . to avoid calling "brew" and relying on stuff in /opt
+	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
+		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=.
+}
diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.20.0-zstd.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.20.0-zstd.patch
new file mode 100644
index 000000000000..3ebee4451bc6
--- /dev/null
+++ b/dev-cpp/cpp-httplib/files/cpp-httplib-0.20.0-zstd.patch
@@ -0,0 +1,22 @@
+https://github.com/yhirose/cpp-httplib/pull/2121
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -159,10 +159,16 @@ elseif(HTTPLIB_USE_BROTLI_IF_AVAILABLE)
+ endif()
+ 
+ if(HTTPLIB_REQUIRE_ZSTD)
+-	find_package(zstd REQUIRED)
++	find_package(zstd)
++	if(NOT zstd_FOUND)
++		find_package(PkgConfig REQUIRED)
++		pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++		add_library(zstd::libzstd ALIAS PkgConfig::zstd)
++	endif()
+ 	set(HTTPLIB_IS_USING_ZSTD TRUE)
+ elseif(HTTPLIB_USE_ZSTD_IF_AVAILABLE)
+ 	find_package(zstd QUIET)
++	# TODO: try to find it via pkg-config
+ 	set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
+ endif()
+