gentoo auto-resync : 13:03:2024 - 18:47:08

6 files changed, 24 insertions, 197 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index b3f3dae39fad..167f26b760d9 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 d6bb748c73b6..7a1ad8211cef 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,12 +1,6 @@
 AUX cpp-httplib-0.14.1-fix-version.patch 439 BLAKE2B e3cad102ce27184e66751dd698bfa38fe32546d179dcf437efe40f73ee96d10c04e5f04bd30246289bbba7bc09a54ebf0e2975185b7820f091dc01bb917f1053 SHA512 3c4e84191126df0b0ea427ddfdf8caa0f7a7ee3fb87c3b754ddeea5f0c0df43f8d9f50d5b76052c9deffe9c4a51b258590d85706106a18e4611c580d08654a45
 DIST cpp-httplib-0.14.1.tar.gz 1148935 BLAKE2B e083fba3281e5b35031e1fda60efe75971d4edf746e52fa4608afbc3af3f7f9532ca59d041692277e963653c77a4878d5bbcb8045aba76d350185ca276a25a64 SHA512 6e995502e0cfd9953044207fabce29a3d6de49e79464b6bf89e1a9e667dc66fe1972c38d6428ad8e8fb96236e85b2d9ac60cbb58b4de03e8f837a9122151a706
-DIST cpp-httplib-0.14.2.tar.gz 1149003 BLAKE2B 9b203a0e584b64d564a87b1b9bea49cd374241f871524ace1aacc02aacf63ab131fc7eaee60708b9ff5713838ef464d98f560792af36952b47d99a019515d213 SHA512 b4f315e174f8efb7884b64b45c500c8259c28379a6079c26747f754db7e1f16a118b1e6f83925b6740a1b5b3516158c1202737dc6385bcefe9c69f4cca57d07e
-DIST cpp-httplib-0.14.3.tar.gz 1149767 BLAKE2B 58dd0d77a783e36a345ae76386ba55eecaf33433a3da2dc7900843d99754cef9f4c8c98c91bcb884666d2f735ed906eb6e04a785af200b133f3920c31e22da07 SHA512 0e7955fc74b87550e260739abf2503b2b0aabb2e2925953956bef8ead9718367d075d37fb5468a40aa340d7bdafb06274e0770baab86b08c6a25020d96033b88
-DIST cpp-httplib-0.15.2.tar.gz 1151164 BLAKE2B 0359aeb5d5ff208143fc9612ee89842300ef4ebf41a7c5246d8714d330c2957fb552595f4f21b36298a378348b5c90edbac0bd47c43a16c66733ef2c01a7373c SHA512 8955a8c19e1dbcee792e0a2d8e87ec32248048f298e19d7d9adfcc4923f6dda73b0755fdfdcabbea0200934e9d0590de819474c50e4a4c1254724c399674ec68
 DIST cpp-httplib-0.15.3.tar.gz 1151398 BLAKE2B 8ce7d7e59c0954efb14a11e565f9cdf02c007a3b6d39dbdcb21b412906eed3ceeca3182096f4b4eadb32a5886e839e64774ae9a1110ddb60fb7cdea35b5b7d50 SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439
 EBUILD cpp-httplib-0.14.1-r1.ebuild 1499 BLAKE2B c02789bab7faf6a8c9585867e9c5d2802c27b3fd80f41a971e2e520d77a6d47b1f31ba717a2b032abd5e8d145558927369694511cdb7d1a5647b434c6f0aa420 SHA512 d40d9de3148efa1b5895e42d8d31e674040da7431439137aeff620d6a530ca0fc3fc40edce14c1b786c43cc94ac1bd01429cdb5ae3fd7942d9eb195d820452b1
-EBUILD cpp-httplib-0.14.2.ebuild 1464 BLAKE2B d68884feec79e537a2afe4de5c8b8f884d4364c0be8d780b837e124fca7cdb9872206624ced73be7222a0bb986732a191d747bf1681cbc480fceda1cdb5ca3ec SHA512 cf0b1d74209ab21c2e6770a765395295616e75e0d2dd4caba07fc5c6bfb9092ec9c18e703c4dd8160bce78f26a12060896963d68c2a6e06358df71a8d96d7d85
-EBUILD cpp-httplib-0.14.3.ebuild 1464 BLAKE2B d68884feec79e537a2afe4de5c8b8f884d4364c0be8d780b837e124fca7cdb9872206624ced73be7222a0bb986732a191d747bf1681cbc480fceda1cdb5ca3ec SHA512 cf0b1d74209ab21c2e6770a765395295616e75e0d2dd4caba07fc5c6bfb9092ec9c18e703c4dd8160bce78f26a12060896963d68c2a6e06358df71a8d96d7d85
-EBUILD cpp-httplib-0.15.2.ebuild 1464 BLAKE2B 3226892f277f91415de91104e4eed226be463ade28c34216e2715e0ba69c8bf91bc4de3fb75c3cfddb7206d874a4646d63fc461027aecb228bacde00b81eda94 SHA512 1f88e3704c83336e6baeccf0aba45cf760a27313bf2fd644951d03820a139090ba89b01c6ed593042c964ef1afb5d3f097f957782a94be4f2448c69c826f49d0
-EBUILD cpp-httplib-0.15.3.ebuild 1471 BLAKE2B 71bd38e5aec445dc7223b56a810a5765381c782c13413dbda2e82201387969e18119a17dc4af91c02fd1b42c75932feccf0803afd851bdf538755a3a86939640 SHA512 11effff3f16134f8ce9e300f4c92de3693153085dc1c3e65f5988065dae96adb39d8ebedda91e9c9a9c92a555df0393944cb87e78eb781fb17896c3aea5608fd
+EBUILD cpp-httplib-0.15.3.ebuild 2207 BLAKE2B 2d2fed2c9001d099fa2df167fd06a06a9c45d6724ba37d19ea37d72f1a993f5723931e8ffe3464c3bfd0d90aa59ef1233037f8c2a05a56db8c334a519000d258 SHA512 ff6ac1260ac59b3695554037ef3377b66ee5f508e18dbcc917fa8e9fe7656aebcc78dde57228db5dc598d134dc4c3c7cde39f831aaf08eba6ab1d97af03f046f
 MISC metadata.xml 658 BLAKE2B d97bce6286ac52413eb4c57a63290685efbc41c72482cbc9b0aeadca193e9e9a315a9912b0cd692cd7f3d213b8a784d07dc8981d5df1d750b4324f1fba995302 SHA512 1c9f1aba4dbe32f4e8f78ecad2a2c677b7f662eff4b1e9e6e4389bed969ddd7c878324c1635d66a22e53c56dc5b05cd401d4c384a5c4a0314c3932109f4d6b70
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.14.2.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.14.2.ebuild
deleted file mode 100644
index d547c58852e6..000000000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.14.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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="~amd64 ~loong ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-
-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/cpp-httplib/cpp-httplib-0.14.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.14.3.ebuild
deleted file mode 100644
index d547c58852e6..000000000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.14.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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="~amd64 ~loong ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-
-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/cpp-httplib/cpp-httplib-0.15.2.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.15.2.ebuild
deleted file mode 100644
index 2689fd4a99ae..000000000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.15.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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="~amd64 ~loong ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-
-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/cpp-httplib/cpp-httplib-0.15.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild
index 64fb0aa6f65e..fb9e0f90ef7a 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild
@@ -58,6 +58,28 @@ src_configure() {
 multilib_src_test() {
 	cp -p -R --reflink=auto "${S}/test" ./test || die
 
-	GTEST_FILTER='-*.*_Online' emake -C test \
+	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
+	)
+
+	# Little dance to please the GTEST filter (join array using ":").
+	failing_tests_str="${failing_tests[@]}"
+	failing_tests_filter="${failing_tests_str// /:}"
+
+	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
 		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
 }