4 files changed, 16 insertions, 19 deletions
diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest
index b63d15f46ade..1dab2a3e2588 100644
--- a/dev-cpp/drogon/Manifest
+++ b/dev-cpp/drogon/Manifest
@@ -1,4 +1,4 @@
-DIST drogon-1.8.3.tar.gz 543846 BLAKE2B 3faf24f0d3d9115ea463b38c285e43f098dab488df905cc0e467fec1dc981b1587d97112547eb5b5324775d5176a743ff55ebc383243b15efcab64accf9aba10 SHA512 48653f40b408cebe3e2b250df97c1819d090f85daa1f8d6b252aa6824a69f742762dbc1869a3aac378740dd01d0a2cf30af85779c5e56cffa82e2ad8a950fd83
 DIST drogon-1.8.4.tar.gz 550065 BLAKE2B 393c98f5c6f65368e9f89f46c4804a738a153139cc12adbe76c6ceff888637887f0dfa8099099255589e87d27e2840b4a9d65d88140bd18c5202f6eb344a43cc SHA512 381b4b576d316e55690dc0531cfeaeee4c0e00ce540a502e1c1870eea9a463d00d7e4bc9a354c459e5fbc6da5f046757f07ff2077bb3a9603f97f448f2d17ea2
-DIST trantor-1.5.10.tar.gz 112413 BLAKE2B 7ee04f57ba6f41edcc4c5334c63c7194e8a581edaec771ca6a2b2f6c444603da7a43d5ebf30ac89b9302f4302c4a54af9cee3c9532545345f0bf51b56b95dae3 SHA512 27ddc46b81747ba43f2abb5d6f3b82257ee6a7295f3cca3da0320dea2e6ef4b6276641a3fc3f61a082aa7ea360ee56663cebf4c6301ba79dcdbbdc96a450cb28
+DIST drogon-1.8.6.tar.gz 561577 BLAKE2B ad64cbb22b766403156a34cc604e7f9304541a98b86eea83b7afbb3d451c4aa176b7d359db5bfff48ce3f5475e436e13c8cf8d7adc1f4de123026ae2da1e4870 SHA512 4ca09f52fde3b080255c0938d510ea5592ec30e4ea9b7648a7ea1b528c9f096e1c1534647d5bf93d7923b43106227c6c1c3b67f238becbd6da15e8acecbf4c5c
 DIST trantor-1.5.11.tar.gz 113152 BLAKE2B 6ec0c8ae98835ad5fa94ab154ac3910496ddba2f67e307f90b48ee5bc39d3b4158adcac39b1bd2c2b7343a31f9fba394a6cbbb4fa86c1d1a8f1f28887d5a7955 SHA512 dd65938bebb2e6714e5603db3bfc82cd1a63395c17dce014147a41fdc74548cb526e1457a7472aa51bb80ce629a9935b4db9eeadf735efaf30899ef73f776a58
+DIST trantor-1.5.13.tar.gz 143230 BLAKE2B 298870f3b132d4dbacbab88b9689fd2e8fec7450dcca82fc985393b718a701008debea7a50f2d7814871a9399bb423f21b9a9454de59468f7bfade51b70a283d SHA512 4f4cef4103faa323e5213c1b59c0d86606831e97127594d5c9248481ba4ce66905c40c25c5d83d00e78936d53ba03b8450e6848199a85e9120bb8f2522bf7805
diff --git a/dev-cpp/drogon/drogon-1.8.3.ebuild b/dev-cpp/drogon/drogon-1.8.6.ebuild
index bb44f9e87af7..7841c9749ab6 100644
--- a/dev-cpp/drogon/drogon-1.8.3.ebuild
+++ b/dev-cpp/drogon/drogon-1.8.6.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-MY_TRANTOR_V="1.5.10"
+MY_TRANTOR_V="1.5.13"
 
 DESCRIPTION="C++14/17 based HTTP web application framework"
 HOMEPAGE="https://github.com/drogonframework/drogon"
@@ -17,7 +17,8 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+brotli doc examples mariadb postgres redis sqlite +ssl test"
+IUSE="+brotli doc examples mariadb postgres redis sqlite test +yaml"
+# REQUIRED_USE="test? ( postgres sqlite mariadb )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -29,12 +30,12 @@ RDEPEND="
 	postgres? ( dev-db/postgresql:= )
 	redis? ( dev-libs/hiredis:= )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:= )
 	elibc_Darwin? ( sys-libs/native-uuid )
 	elibc_SunOS? ( sys-libs/libuuid )
 	!elibc_Darwin? ( !elibc_SunOS? (
 		sys-apps/util-linux
 	) )
+	yaml? ( dev-cpp/yaml-cpp:= )
 "
 DEPEND="
 	${RDEPEND}
@@ -42,6 +43,8 @@ DEPEND="
 "
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.8.4-fix-test-build.patch )
+
 DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md )
 
 src_unpack() {
@@ -50,20 +53,12 @@ src_unpack() {
 	# the cert is in the trantor submodule normally, but we unbundle that
 	if use test; then
 		mkdir -p ${P}/trantor/trantor/tests || die
-		cp -v trantor-${MY_TRANTOR_V}/trantor/tests/server.pem \
-			${P}/trantor/trantor/tests/server.pem \
-			|| die "could not copy test certificate"
+		cp -v trantor-${MY_TRANTOR_V}/trantor/tests/server.{crt,key} \
+			${P}/trantor/trantor/tests/ \
+			|| die "could not copy test certificate and/or key"
 	fi
 }
 
-src_prepare() {
-	use examples && DOCS+=( "${S}/examples" )
-
-	cmake_comment_add_subdirectory "trantor"
-
-	cmake_src_prepare
-}
-
 src_configure() {
 	use doc && HTML_DOCS=( "${BUILD_DIR}/docs/drogon/html/." )
 
@@ -76,7 +71,8 @@ src_configure() {
 		-DBUILD_REDIS=$(usex redis)
 		-DBUILD_TESTING=$(usex test)
 		-DBUILD_BROTLI=$(usex brotli)
-		$(cmake_use_find_package ssl OpenSSL)
+		-DBUILD_YAML_CONFIG=$(usex yaml)
+		-DUSE_SUBMODULE=NO
 		$(cmake_use_find_package doc Doxygen)
 	)
 
@@ -84,6 +80,7 @@ src_configure() {
 }
 
 src_install() {
+	use examples && DOCS+=( "${S}/examples" )
 	docompress -x /usr/share/doc/${PF}/examples
 
 	cmake_src_install
diff --git a/dev-cpp/trantor/Manifest b/dev-cpp/trantor/Manifest
index 56535ef234a1..0cbc220f24a9 100644
--- a/dev-cpp/trantor/Manifest
+++ b/dev-cpp/trantor/Manifest
@@ -1,2 +1,2 @@
-DIST trantor-1.5.10.tar.gz 112413 BLAKE2B 7ee04f57ba6f41edcc4c5334c63c7194e8a581edaec771ca6a2b2f6c444603da7a43d5ebf30ac89b9302f4302c4a54af9cee3c9532545345f0bf51b56b95dae3 SHA512 27ddc46b81747ba43f2abb5d6f3b82257ee6a7295f3cca3da0320dea2e6ef4b6276641a3fc3f61a082aa7ea360ee56663cebf4c6301ba79dcdbbdc96a450cb28
 DIST trantor-1.5.11.tar.gz 113152 BLAKE2B 6ec0c8ae98835ad5fa94ab154ac3910496ddba2f67e307f90b48ee5bc39d3b4158adcac39b1bd2c2b7343a31f9fba394a6cbbb4fa86c1d1a8f1f28887d5a7955 SHA512 dd65938bebb2e6714e5603db3bfc82cd1a63395c17dce014147a41fdc74548cb526e1457a7472aa51bb80ce629a9935b4db9eeadf735efaf30899ef73f776a58
+DIST trantor-1.5.13.tar.gz 143230 BLAKE2B 298870f3b132d4dbacbab88b9689fd2e8fec7450dcca82fc985393b718a701008debea7a50f2d7814871a9399bb423f21b9a9454de59468f7bfade51b70a283d SHA512 4f4cef4103faa323e5213c1b59c0d86606831e97127594d5c9248481ba4ce66905c40c25c5d83d00e78936d53ba03b8450e6848199a85e9120bb8f2522bf7805
diff --git a/dev-cpp/trantor/trantor-1.5.10.ebuild b/dev-cpp/trantor/trantor-1.5.13.ebuild
index 85df49d01e5f..42685e11c9ba 100644
--- a/dev-cpp/trantor/trantor-1.5.10.ebuild
+++ b/dev-cpp/trantor/trantor-1.5.13.ebuild
@@ -36,7 +36,7 @@ src_configure() {
 		"-DBUILD_DOC=$(usex doc)"
 		"-DBUILD_TESTING=$(usex test)"
 		"-DBUILD_C-ARES=$(usex adns)"
-		"$(cmake_use_find_package ssl OpenSSL)"
+		"-DTRANTOR_USE_TLS=$(usex ssl openssl none)"
 	)
 
 	cmake_src_configure