gentoo auto-resync : 06:12:2024 - 02:07:38

7 files changed, 98 insertions, 46 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 1c2d3bd11be0..aa86bdbc30e3 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 3e1a3d82f44f..56cc7a0de576 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,5 +1,7 @@
 DIST cpp-httplib-0.18.0.tar.gz 1321763 BLAKE2B 7807c2f4e3a6a0703a1253f0ec4ac7ef5fbcfad000e517af034a2aff64393229fb47830d215a1959e9893a66f51d19989c33b6b646b79be71e69687fe08cbbf2 SHA512 35ff903d51fee5428d7a95a0406460f8a18d1b5653f6ec8f353d7a2f1084598e599b24d0401f7214d5ee8d9764c74a4e617fff55acd4e6733ab1b9f2d7d4403c
 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
 EBUILD cpp-httplib-0.18.0.ebuild 2381 BLAKE2B 278349677e050af68a1b532c550a89194f5dfa7a1f180265433583cfc08f8d6a492aff0ff327be7880449e04cffbfa561595cadd924aa45d9d355e0915ee51e3 SHA512 4677c16d4583e5ad57f21e4600aa8ccfd6509beab76e8db0255babe6c55b92180b4b64f44f1b7ee9f4f63ca3a90c6b20268f08f6ed88044634f0069af0e3dc7b
-EBUILD cpp-httplib-0.18.1.ebuild 2388 BLAKE2B c66c6ec0ac6cce1cb14ff50cbea9a35f606cf09c459f2e8207f614bba3c7d363bc331d9751039cace5c6b5c51bca210e85062c1514c90fcf836f33c8cce85c98 SHA512 da218f7f940cfbab85157d15c718681c2bec554359914135f7ce68fd1e1b0b662269ad52cc013b522025a8ceed18dbb65bdeaed6fdd0eb9b810a0a1a661891f7
+EBUILD cpp-httplib-0.18.1.ebuild 2384 BLAKE2B c11f2e947005ec1a037a6f7e97d911786b333fdeb5b2f0faf4fde22d6c79a3ff5409115b13d4987c94d307e4c431f61d2ea398ea98a311a955f6b59c659eaf40 SHA512 c17bc1183fc176752f27aa75535a7026089fa5e807dfa7697a72b2cbd13cc1fd545ec14ab0944d7b59d79b154fff92fdbb86aad0e5176c51ee20a17a777637b7
+EBUILD cpp-httplib-0.18.3.ebuild 2388 BLAKE2B c66c6ec0ac6cce1cb14ff50cbea9a35f606cf09c459f2e8207f614bba3c7d363bc331d9751039cace5c6b5c51bca210e85062c1514c90fcf836f33c8cce85c98 SHA512 da218f7f940cfbab85157d15c718681c2bec554359914135f7ce68fd1e1b0b662269ad52cc013b522025a8ceed18dbb65bdeaed6fdd0eb9b810a0a1a661891f7
 MISC metadata.xml 659 BLAKE2B c9c46e9a3121e3c3f81bc1f141a21847128a3a56014dd9128d2a81b0926daa61255d8343c3616ea30a22c6e5079ef0d2c5cc0b4787f41c5723ec01113c92d202 SHA512 796b439f7b02af71da07f5a434bf99ad3403c9e425163aadebbb2bc2c73db32291fbb72ddfaed97db2a7a1bc05950738faa1eddfa88e65ea80601075f99d1975
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild
index 9972ed866068..ebee3a28a135 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild
new file mode 100644
index 000000000000..9972ed866068
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022-2024 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"  # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
+
+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-3.0.13:=[${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
+
+	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// /:}"
+
+	# 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/gulrak-filesystem/Manifest b/dev-cpp/gulrak-filesystem/Manifest
index 9dcc81e45bf5..4e31a094bd38 100644
--- a/dev-cpp/gulrak-filesystem/Manifest
+++ b/dev-cpp/gulrak-filesystem/Manifest
@@ -1,5 +1,3 @@
-DIST gulrak-filesystem-1.5.12.tar.gz 209661 BLAKE2B 9eb0bce08659396f3ef254b0ad772ae9ad29654aef3c90ab1f9eee1c4f830544ad947680e072fcf7d3c251a3afb77447617610c49931d50743444a6b88b4745d SHA512 2cba74921104fa84547288ff983260ce1e81967df6a7d2a334074826c355c72945ad64e6979cd302a23c5e3a398990706b01fc573c046512e9f508edca9da12c
 DIST gulrak-filesystem-1.5.14.tar.gz 211137 BLAKE2B 9734907da65e0f390e461d76c7b1c7e8ffa1a0f7f01e5952d69d9d6b6cc3c85e20f5e4495235f2589635fb665040bf2ee4def4d3bdcb0f3453a00ee8c4e8ac3f SHA512 6eae921485ecdaf4b8329a568b1f4f612ee491fc5fdeafce9c8000b9bf1a73b6fa4e07d0d4ddf05be49efe79e9bddfbcc0aba85529cb016668797a8d89eb9b82
-EBUILD gulrak-filesystem-1.5.12.ebuild 855 BLAKE2B 510f1c74cabd2618303155896017f429e985a28d83e28843bffcce0d014b27998f9afb6eafe52df6308eede0eef354c053138c39289773f5ab81a3e4e597b497 SHA512 dfdeec0f734b25183f4b03ac39682eab3decf92e0027f3195f4147116a6d1a4c5494dbda7d32521bc6bb1fd9f12d1fa1433cbdd5bbd337f5b197c5a59e193e54
-EBUILD gulrak-filesystem-1.5.14.ebuild 856 BLAKE2B 17c011b1c53bc0f0a81d67d2ab8aa6b3e11fd9b7727c27f98b7af915b2a9fcac7feed46fcd0d11bb17959747bd748711f6e9c68f3f3e70b1191df6d981407670 SHA512 39c087f3caee68ef0c8ea2ebe20f68a7cc93443ba1cc16c5d5c8301ac90a19655ccf2958329fa256602bef1dc03e3627054b6c467f3f357a971cb1cb83effc17
+EBUILD gulrak-filesystem-1.5.14.ebuild 855 BLAKE2B 362257d2368faecb56f72f9927509f60a6d6c86780958ef58948afd2c099a093171206a393f0cf7615ecfbb97bba4af3e2fbdfcfb4202d3e56f94b18b9adc2a5 SHA512 3b0b83526f7570b1e0cde8e32b0f6bb6c8618e129aa3c96b7cdce9fba83148a357354c94e3b81a33244942d79d20f47eaa20e289bbc8068362a2adea10e61b27
 MISC metadata.xml 330 BLAKE2B 00186bf8c44c6d7268ff44a6914530d56ef344300d10285a84b3a705e9f463e74aabcdb8bd4375d5e094e662565dbeeca882d33e72f24ae35392c63b7d63377f SHA512 9e84dee6929db5525f13d961bdf17b2db795f5f8cb4211aed4b1d3286207b8935e9a4276a7c0ebe09317347f64e8a54a835d2f607ae47b737462bdf9dbfc1c79
diff --git a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild b/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
deleted file mode 100644
index e35c0185bc92..000000000000
--- a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Header-only single-file std::filesystem compatible helper library"
-HOMEPAGE="https://github.com/gulrak/filesystem"
-SRC_URI="https://github.com/gulrak/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P#*-}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "s:-Werror::g" cmake/GhcHelper.cmake test/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGHC_FILESYSTEM_BUILD_EXAMPLES=OFF
-		-DGHC_FILESYSTEM_BUILD_TESTING=$(usex test)
-		-DGHC_FILESYSTEM_WITH_INSTALL=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	docinto examples
-	use examples && dodoc examples/*.cpp
-}
diff --git a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.14.ebuild b/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.14.ebuild
index a6c16dd2f0f3..a3d0b978f42e 100644
--- a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.14.ebuild
+++ b/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gulrak/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"