7 files changed, 98 insertions, 4 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index da32d0ca04bf..6521716cee1e 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index e31226a409ce..114d21b84cee 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -25,5 +25,5 @@ EBUILD abseil-cpp-20230125.3-r5.ebuild 1764 BLAKE2B 8c2ec49ea1596ad8f971414d06d8
 EBUILD abseil-cpp-20230802.0-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe
 EBUILD abseil-cpp-20230802.0-r4.ebuild 1761 BLAKE2B fe7475c6b062a8c1d33d563252ef5918fc30a2d4dda267fb72ebd04bbafb172f2956c2573d4e578b85f7530ba20fc4455ddc06cc55af4f131600f183496c6129 SHA512 7a24e5864c1cbd0bf317d617f4e2db8f0d27780edcc4ddf4de07f8c31ca60f445ac048c620592febf7b6088b61c73b3866660b66bc357f781b9b58f9ca4c6694
 EBUILD abseil-cpp-20240116.2-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe
-EBUILD abseil-cpp-20240116.2-r4.ebuild 1769 BLAKE2B 61165b2a7828888157a467973a156c1fd2a2a422cda429e7da300f2f4db2ea001e69f084c04f63491fa47b4c3595d29b9a11e9f1e0f8939a72d7a3f0f3e84859 SHA512 8f952460905f9cc81c0a3144c0001730f948859dd526b5a485c01e53b9ea0f45cea8a94eedeb18c46a3d33847ffbb66aff5144adf9d21d7d14ac26a7403c808b
+EBUILD abseil-cpp-20240116.2-r4.ebuild 1775 BLAKE2B 46910116e0dcc70fc5fff168bae2ac442e45b2c092cacbf2818011451ddc879ae382aafdabc64299dbc011ba65d28b2155c46157afa68ac1e49708f53de2176a SHA512 089cd3378c8d8825d79887e3644eb362ab4382d9b416d4c9193739151db43c34f76fdabac696e852122b97b09dcaf339d2479b8b118addfaf9fe29a75cd8b66c
 MISC metadata.xml 250 BLAKE2B f2e7e5ef7661a51822a5d563f7a835c3606c9bbb9688d599637e0950aa68dbacd67592a8c5306528653dd2b5f7100dc6f5e6ac69c5d7bf9777b12c984b53304c SHA512 99565f4efff02cf80efcaa76ad9247db3c0de6f855f37337579cfcd6e01f72a6e176d5e69ef1a1d338afee6a07c1620273fe56af046a60f195de4d8894a8d7f9
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
index 28286c4d74e6..7c260feeb088 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index f9f71fcc2736..d9e7be7a1a67 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -4,5 +4,5 @@ DIST asio-1.28.1.tar.bz2 3383257 BLAKE2B 9d98152a6cf8b0e2a807275092b23f6198d8175
 DIST asio-1.30.2.tar.bz2 3196850 BLAKE2B d902fda2338d9717bb8f2f5d43468c5d0b64591814c3ae3134350650f0dd97bf241287347d324b11d0e6993b1b44373df13305d736df09ad3375ce4976f5bb27 SHA512 2d26cdcfcc0c310e82ab502551b51d70fd95ba4628bd306929e78539299974fc14aa6ba27cf256f1df7a56539cb885012ba02a202ae17bf817ee6311308a795a
 EBUILD asio-1.28.1.ebuild 1292 BLAKE2B f1a68c5338831c80f586f10207896fd9e0ee366d942542e9e65a13ef9b16652b4a4aac83f9c6cf8c28001505a092278a98679c18971266c248998cede51ea2c3 SHA512 889122ea7d5ba268c6b069e77eba129764eb31def43e34c2e423603a635ea53d30f5405d350a2ef500c34c5772e4f3c0190760ae0f7474235ce0b88049446be4
 EBUILD asio-1.30.1.ebuild 1095 BLAKE2B 0c28bbb7d5ddc62a5ffed0ed43648d18d0259c6e623e7870f436b45dab3370c9a8fbd169308b480b51013b04e042c02c3fb4196ba84f77fde0fbf70652dfdfad SHA512 f5c1659cfeffec7a682f3dda76f38a907f243f56779f11602944e9dab8ee102f7017be95876f5ad0f4b888ca4b49bd330cf80eb8501813491264aae892cc866b
-EBUILD asio-1.30.2.ebuild 1235 BLAKE2B 8edf680dc17f5e311b1c8fdc890eb74eae889d894e555076d31013b9982363035deba9b4729b2bf6330299b9ec416a7988c61f9bdd9b24dc23513b47a5cf96da SHA512 337fe5917084bfd572dc3a37f68b0621c25fecd44969e5a2968ed05918671f00f6d13c874c1a6837b0123e84920f1adf5fc820f39c746d32ca6ea37556273cb0
+EBUILD asio-1.30.2.ebuild 1230 BLAKE2B 20881a6c5335d2fa438b0a5bc3a7835ba25dfaba87de64295af7d53ab37af64856e579aacc1f86ba1ca14ef79e6400fc834fe53de66e35b9d8647a35961ff2d4 SHA512 df2e327cf72a56484b907d11dd4de1e6e313ed3e9093c2d6ee738cb066d2f9c75352960b7dda38f20b2d88e8000a7a28c3340b1f2289687c13fd6f9b4f7b0583
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.30.2.ebuild b/dev-cpp/asio/asio-1.30.2.ebuild
index 6592a495eec8..879059f5ee1f 100644
--- a/dev-cpp/asio/asio-1.30.2.ebuild
+++ b/dev-cpp/asio/asio-1.30.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/asio/asio/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 9c20f736fe4e..182970ca9155 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,5 +1,7 @@
 DIST cpp-httplib-0.15.3.tar.gz 1151398 BLAKE2B 8ce7d7e59c0954efb14a11e565f9cdf02c007a3b6d39dbdcb21b412906eed3ceeca3182096f4b4eadb32a5886e839e64774ae9a1110ddb60fb7cdea35b5b7d50 SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439
 DIST cpp-httplib-0.16.0.tar.gz 1156790 BLAKE2B 4a75059f16f6e46685c2cf028c6fa4c9cd50c35273795a8dbb6ca9d2997146b04b305893ad50adbb62c39db14ab3f589e902353bb199ee167d2648fe3621aee1 SHA512 63dc5a50f425e7be909d60db138caa1b9d7260c5d4db26603011a329f0d6a645d56f436c79466fbe662f24a94bc0f72926062b3ed49cb658eb91a6bdb2ddf25b
+DIST cpp-httplib-0.16.2.tar.gz 1157538 BLAKE2B 0fdb3946e33f3af0a6b9646d5edf53572d67fb7e2334923c3ef9784aad569672c21e12c6d0f4c1f91ceccb8d9b3e8f14d51b21f4c6cf252da98024cee47cfcbe SHA512 d0a3d5477cb76cbbbc6da53b0abff3b45fd6b77c0d1686b355ce2904593c67c25849d2b1348e49b0b57ece5be91404fe976b06d75d34eb5068b1e130fd7ddbee
 EBUILD cpp-httplib-0.15.3-r1.ebuild 2251 BLAKE2B 9e6e6fef227f0b3b2e118ecef130f0a57d2877e0c4854016ee1ba6c2951a3f18b92cc660b7def42d4e6b3cffdf570eac6637ed502b9133297b2ff25a3441a0bd SHA512 191160987ddaed74c328a380b3363c02b62edfe4e3216fcc3de9d211e00e90855f02641d2dc05f4ec8e98bffd41308ed251db4921b7cda8f2fd69541b54b21cf
 EBUILD cpp-httplib-0.16.0.ebuild 2275 BLAKE2B 9049dff47ccceee35a74ed6d18d535e83c8cf1ab0b5d8718e2b5520710f78dc9aed6419fd90114cc87d1ba921075d7c5bfe3a5449e56323a9ffac23a591c49bf SHA512 97206490f5007f8281d221693cabc91492ca3c233ae4a22c133e46513cd97b9a0bb9b549a1ecadbf24d86cc5c9aabd22c0d022f84094b1c9fafc856349d2fe3f
+EBUILD cpp-httplib-0.16.2.ebuild 2352 BLAKE2B 3d978a8da9edc81eb64ef7d7eb51abaa562b2701f8f51f0d8b9f7e53cc8197f01e9b17ac7be554870c934154a23fddf20b55f24d37f73a53904afc522a80f54e SHA512 2b974b667285768e4fb29317b0b007dd3ccff5dce1ede08ba6a7768864c279d8d1dc39ccbd9ea9eb23b58002782f505000f75865ba9129c49aa79fa7bbd841cc
 MISC metadata.xml 658 BLAKE2B d97bce6286ac52413eb4c57a63290685efbc41c72482cbc9b0aeadca193e9e9a315a9912b0cd692cd7f3d213b8a784d07dc8981d5df1d750b4324f1fba995302 SHA512 1c9f1aba4dbe32f4e8f78ecad2a2c677b7f662eff4b1e9e6e4389bed969ddd7c878324c1635d66a22e53c56dc5b05cd401d4c384a5c4a0314c3932109f4d6b70
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild
new file mode 100644
index 000000000000..43d66265bb25
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.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 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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-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=.
+}