7 files changed, 49 insertions, 36 deletions
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 0b1d561538b6..3fbc63c93406 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/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 7408dd9cc4d2..7495b5798973 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,2 +1,2 @@
-DIST cpp-httplib-0.16.0.tar.gz 1156790 BLAKE2B 4a75059f16f6e46685c2cf028c6fa4c9cd50c35273795a8dbb6ca9d2997146b04b305893ad50adbb62c39db14ab3f589e902353bb199ee167d2648fe3621aee1 SHA512 63dc5a50f425e7be909d60db138caa1b9d7260c5d4db26603011a329f0d6a645d56f436c79466fbe662f24a94bc0f72926062b3ed49cb658eb91a6bdb2ddf25b
 DIST cpp-httplib-0.16.1.tar.gz 1157395 BLAKE2B 5fb5b5508411819be66df1b3365511d76958715eab7da48022388c8de6332c3726aa1d49d81bbe194ccdb3af2206f6dc1d93c0375cd9452d9c90dc405cc47a99 SHA512 ddd9cedb08a892ff550d6188f91f49fe634dbc86c828a83a58068adf6fae950294a95621729e6203d5df8670c2a8c5ea9ca035ef6948067ae5ca300190cb6f0f
+DIST cpp-httplib-0.16.2.tar.gz 1157538 BLAKE2B 0fdb3946e33f3af0a6b9646d5edf53572d67fb7e2334923c3ef9784aad569672c21e12c6d0f4c1f91ceccb8d9b3e8f14d51b21f4c6cf252da98024cee47cfcbe SHA512 d0a3d5477cb76cbbbc6da53b0abff3b45fd6b77c0d1686b355ce2904593c67c25849d2b1348e49b0b57ece5be91404fe976b06d75d34eb5068b1e130fd7ddbee
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild
index 3ddfccc68bc6..72bacc361f10 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild
@@ -9,17 +9,8 @@ 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
-
+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"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"  # soversion
 
@@ -49,7 +40,7 @@ BDEPEND="
 src_prepare() {
 	if use libressl; then
 		eapply -p1 $FILESDIR/cmakelists.patch
-		eapply -p1 $FILESDIR/httplib_h.patch
+		eapply -p1 $FILESDIR/${PN}-0.16.2-httplib_h.patch
 	fi
 
 	cmake_src_prepare
diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.16.2-httplib_h.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.16.2-httplib_h.patch
new file mode 100644
index 000000000000..a46cc633717c
--- /dev/null
+++ b/dev-cpp/cpp-httplib/files/cpp-httplib-0.16.2-httplib_h.patch
@@ -0,0 +1,30 @@
+diff '--color=auto' -urN cpp-httplib-0.16.2.orig/httplib.h cpp-httplib-0.16.2/httplib.h
+--- cpp-httplib-0.16.2.orig/httplib.h	2024-08-09 19:05:55.831889663 +0200
++++ cpp-httplib-0.16.2/httplib.h	2024-08-09 19:08:48.730886021 +0200
+@@ -274,7 +274,7 @@
+ #error Please use OpenSSL or a current version of BoringSSL
+ #endif
+ #define SSL_get1_peer_certificate SSL_get_peer_certificate
+-#elif OPENSSL_VERSION_NUMBER < 0x30000000L
++#elif OPENSSL_VERSION_NUMBER < 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #error Sorry, OpenSSL versions prior to 3.0.0 are not supported
+ #endif
+ 
+@@ -732,7 +732,7 @@
+         fn();
+       }
+ 
+-#if defined(CPPHTTPLIB_OPENSSL_SUPPORT) && !defined(OPENSSL_IS_BORINGSSL)
++#if defined(CPPHTTPLIB_OPENSSL_SUPPORT) && !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+       OPENSSL_thread_stop();
+ #endif
+     }
+@@ -9108,7 +9108,7 @@
+             return false;
+           }
+ 
+-          auto server_cert = SSL_get1_peer_certificate(ssl2);
++          auto server_cert = SSL_get_peer_certificate(ssl2);
+ 
+           if (server_cert == nullptr) {
+             error = Error::SSLServerVerification;
diff --git a/dev-cpp/cpp-httplib/files/httplib_h.patch b/dev-cpp/cpp-httplib/files/httplib_h.patch
deleted file mode 100644
index b37a49341f4f..000000000000
--- a/dev-cpp/cpp-httplib/files/httplib_h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff '--color=auto' -urN cpp-httplib-0.16.0.orig/httplib.h cpp-httplib-0.16.0/httplib.h
---- cpp-httplib-0.16.0.orig/httplib.h	2024-07-14 10:29:02.536885895 +0200
-+++ cpp-httplib-0.16.0/httplib.h	2024-07-14 10:30:41.405879297 +0200
-@@ -269,7 +269,7 @@
- #include <iostream>
- #include <sstream>
- 
--#if OPENSSL_VERSION_NUMBER < 0x30000000L
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
- #error Sorry, OpenSSL versions prior to 3.0.0 are not supported
- #endif
- 
-@@ -9029,7 +9029,7 @@
-             return false;
-           }
- 
--          auto server_cert = SSL_get1_peer_certificate(ssl2);
-+          auto server_cert = SSL_get_peer_certificate(ssl2);
- 
-           if (server_cert == nullptr) {
-             error = Error::SSLServerVerification;
diff --git a/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch b/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch
new file mode 100644
index 000000000000..29648cf15825
--- /dev/null
+++ b/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch
@@ -0,0 +1,12 @@
+diff --git a/json11.cpp b/json11.cpp
+index 9647846..8266a14 100644
+--- a/json11.cpp
++++ b/json11.cpp
+@@ -22,6 +22,7 @@
+ #include "json11.hpp"
+ #include <cassert>
+ #include <cmath>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <limits>
diff --git a/dev-cpp/json11/json11-1.0.0-r1.ebuild b/dev-cpp/json11/json11-1.0.0-r1.ebuild
index ab8457f641aa..66b400e6f1bd 100644
--- a/dev-cpp/json11/json11-1.0.0-r1.ebuild
+++ b/dev-cpp/json11/json11-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,4 +16,5 @@ KEYWORDS="amd64 x86"
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-multiarch-install.patch
 	"${FILESDIR}"/${PN}-1.0.0-json11.pc-do-not-state-the-defaults.patch
+	"${FILESDIR}"/${PN}-1.0.0-include-cstdint.patch
 )