Merge updates from master

dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r1.ebuild

@@ -26,21 +26,10 @@ BDEPEND=">=dev-util/cmake-3.23
 
 PATCHES=(
 	"${FILESDIR}"/cpprestsdk-${PV}-warnings.patch
+	"${FILESDIR}"/cpprestsdk-${PV}-disabl-int-tests.patch
 )
 
-src_prepare(){
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=( -DCMAKE_BUILD_TYPE=Release )
 	cmake_src_configure
 }
-
-src_compile(){
-	cmake_src_compile
-}
-
-src_install(){
-	cmake_src_install
-}

dev-cpp/cpprestsdk/files/cpprestsdk-2.10.19-disabl-int-tests.patch

@@ -0,0 +1,24 @@
+--- a/Release/tests/functional/http/CMakeLists.txt
++++ b/Release/tests/functional/http/CMakeLists.txt
+@@ -1,3 +1,3 @@
+ add_subdirectory(utilities)
+-add_subdirectory(client)
++#add_subdirectory(client)
+ add_subdirectory(listener)
+--- a/Release/tests/functional/websockets/CMakeLists.txt
++++ b/Release/tests/functional/websockets/CMakeLists.txt
+@@ -27,9 +27,9 @@ if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
+     client/stdafx.cpp
+   )
+ 
+-  add_casablanca_test(websocketsclient_test SOURCES)
+-  if(NOT TEST_LIBRARY_TARGET_TYPE STREQUAL "OBJECT")
+-    target_link_libraries(websocketsclient_test PRIVATE websockettest_utilities)
+-  endif()
+-  target_include_directories(websocketsclient_test PRIVATE utilities)
++#  add_casablanca_test(websocketsclient_test SOURCES)
++#  if(NOT TEST_LIBRARY_TARGET_TYPE STREQUAL "OBJECT")
++#    target_link_libraries(websocketsclient_test PRIVATE websockettest_utilities)
++#  endif()
++#  target_include_directories(websocketsclient_test PRIVATE utilities)
+ endif()

mail-client/mailspring-bin/mailspring-bin-1.13.2-r1.ebuild

@@ -16,16 +16,19 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	app-accessibility/at-spi2-core:2
+	app-crypt/mit-krb5
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
+	dev-libs/openssl-compat
 	gnome-base/gvfs
 	media-libs/alsa-lib
 	media-libs/mesa
 	net-print/cups
 	sys-apps/dbus
 	sys-devel/libtool
+	sys-libs/db
 	x11-libs/cairo
 	x11-libs/gtk+:3
 	x11-libs/gtk+:3