Adding metadata

6 files changed, 31 insertions, 17 deletions

diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest
index 0a798ba4f914..b63d15f46ade 100644
--- a/dev-cpp/drogon/Manifest
+++ b/dev-cpp/drogon/Manifest
@@ -1,4 +1,4 @@
-DIST drogon-1.8.2.tar.gz 538230 BLAKE2B d4ad90ed6a32e6ada9d7d37409ab6f35e2a11e82b13b71a062f1f05ab3df50cf39a7e5d72ceadb6ae5886a90aeadf035d3dd4cf9fc379b3c1046c293cee3581e SHA512 f50252a59951570c87cc1254b1954ef275ee7b2a5cac229aba98b49f34f9f73314d2db9df0abc92efdfeab565f6c1ee14080e049d370384e3398b8c27f5519b7
 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 trantor-1.5.8.tar.gz 112315 BLAKE2B ee7b1805005fe33c8820fe84adf2af23a12e3758646fe18e681e2fc7a89109546f9bfa2b64cc03fd667a3d78d70377da31dfad67f76269b9afa3d9659163fee4 SHA512 6c90d3dbbc4e175500dfa8365dd42b1e260c5401b6551fb8f28e3673a6540b0937a66ca9f2ae0cc1ef6b1ba27c6232a053ef5402e5ef36835a51f841354de5c9
+DIST trantor-1.5.11.tar.gz 113152 BLAKE2B 6ec0c8ae98835ad5fa94ab154ac3910496ddba2f67e307f90b48ee5bc39d3b4158adcac39b1bd2c2b7343a31f9fba394a6cbbb4fa86c1d1a8f1f28887d5a7955 SHA512 dd65938bebb2e6714e5603db3bfc82cd1a63395c17dce014147a41fdc74548cb526e1457a7472aa51bb80ce629a9935b4db9eeadf735efaf30899ef73f776a58
diff --git a/dev-cpp/drogon/drogon-1.8.2.ebuild b/dev-cpp/drogon/drogon-1.8.4.ebuild
index 3d9c5914f4f4..0ae2e618caf9 100644
--- a/dev-cpp/drogon/drogon-1.8.2.ebuild
+++ b/dev-cpp/drogon/drogon-1.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake
 
-MY_TRANTOR_V="1.5.8"
+MY_TRANTOR_V="1.5.11"
 
 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,13 @@ RDEPEND="
 	postgres? ( dev-db/postgresql:= )
 	redis? ( dev-libs/hiredis:= )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:= )
+	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 +44,8 @@ DEPEND="
 "
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-test-build.patch )
+
 DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md )
 
 src_unpack() {
@@ -56,14 +60,6 @@ src_unpack() {
 	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 +72,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 +81,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/drogon/files/drogon-1.8.4-fix-test-build.patch b/dev-cpp/drogon/files/drogon-1.8.4-fix-test-build.patch
new file mode 100644
index 000000000000..6fd9810cb97c
--- /dev/null
+++ b/dev-cpp/drogon/files/drogon-1.8.4-fix-test-build.patch
@@ -0,0 +1,15 @@
+# fix build error that happens without trantor submodule
+# upstream: <https://github.com/drogonframework/drogon/issues/1551>
+
+diff --git a/lib/tests/CMakeLists.txt b/lib/tests/CMakeLists.txt
+index 62a2240..424fec2 100644
+--- a/lib/tests/CMakeLists.txt
++++ b/lib/tests/CMakeLists.txt
+@@ -42,6 +42,7 @@ else()
+ endif()
+ 
+ add_executable(unittest ${UNITTEST_SOURCES})
++target_include_directories(unittest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
+ 
+ if (BUILD_CTL)
+   set(INTEGRATION_TEST_CLIENT_SOURCES
diff --git a/dev-cpp/drogon/metadata.xml b/dev-cpp/drogon/metadata.xml
index 6088b582ffd1..cb9d4b238f64 100644
--- a/dev-cpp/drogon/metadata.xml
+++ b/dev-cpp/drogon/metadata.xml
@@ -16,6 +16,7 @@
 			Add support for the Redis database via
 			<pkg>dev-libs/hiredis</pkg>
 		</flag>
+  <flag name="yaml">Add support for yaml config file</flag>
  </use>
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-cpp/trantor/Manifest b/dev-cpp/trantor/Manifest
index 72b52d6b492e..56535ef234a1 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.8.tar.gz 112315 BLAKE2B ee7b1805005fe33c8820fe84adf2af23a12e3758646fe18e681e2fc7a89109546f9bfa2b64cc03fd667a3d78d70377da31dfad67f76269b9afa3d9659163fee4 SHA512 6c90d3dbbc4e175500dfa8365dd42b1e260c5401b6551fb8f28e3673a6540b0937a66ca9f2ae0cc1ef6b1ba27c6232a053ef5402e5ef36835a51f841354de5c9
+DIST trantor-1.5.11.tar.gz 113152 BLAKE2B 6ec0c8ae98835ad5fa94ab154ac3910496ddba2f67e307f90b48ee5bc39d3b4158adcac39b1bd2c2b7343a31f9fba394a6cbbb4fa86c1d1a8f1f28887d5a7955 SHA512 dd65938bebb2e6714e5603db3bfc82cd1a63395c17dce014147a41fdc74548cb526e1457a7472aa51bb80ce629a9935b4db9eeadf735efaf30899ef73f776a58
diff --git a/dev-cpp/trantor/trantor-1.5.8.ebuild b/dev-cpp/trantor/trantor-1.5.11.ebuild
index 9aad885bb6e5..85df49d01e5f 100644
--- a/dev-cpp/trantor/trantor-1.5.8.ebuild
+++ b/dev-cpp/trantor/trantor-1.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8