Adding metadata

3 files changed, 14 insertions, 49 deletions

diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest
index 4457bb02c42c..ad2f1df70b80 100644
--- a/dev-cpp/drogon/Manifest
+++ b/dev-cpp/drogon/Manifest
@@ -1,4 +1,4 @@
-DIST drogon-1.8.0.tar.gz 519707 BLAKE2B 94a557641f957172ced0e5b6f023040201cdc78c6bdda10375a6093a8fd4cabd1d6f7a798d4e9d3df83f9c76eb0412e102cee841744cf61f796ab0ba485e58ba SHA512 a834d937e3719059223d9bf19d777dbc92eaf09c5c9c44b5a742bfefcbcd95a146a6568cef8c058050fb87e330f221434ffe784dfa29a49de12b031f86ab1a33
 DIST drogon-1.8.1.tar.gz 531042 BLAKE2B f12c76ddc0ad13b6ec154bdb39a2eb287f1be4df2b651cd95a50731c830592398e9cfdf921b71b7c76c2469d6f0e40ff9dbb5a67c5c0886a1c029a32355befb3 SHA512 ee7303350fd2b6d7a6ad283d0edcc5a7e6ef289652e3393699d9c4101308681f0124ebff6225de1665e86d2e2cf4c3192a17e70a204268e40d935acd097324a3
-DIST trantor-1.5.6-test.pem 2949 BLAKE2B cd413aea981b8ec279ede073f8a19702ee1fa7bbe1c56177368dba7dda00bef2fef439eb9ee7f4d7be78834a6ab87cdbeb2f196d8bc0d7e9ce91b19c4484f1ea SHA512 4c73bc66102989a5c6706a1874940512b9d643383e943f2dea2cd1fafbfad3089da84fd08a3758261127fe756fe1f732790c589d77bcf94fa223202f38ef5852
+DIST drogon-1.8.2.tar.gz 538230 BLAKE2B d4ad90ed6a32e6ada9d7d37409ab6f35e2a11e82b13b71a062f1f05ab3df50cf39a7e5d72ceadb6ae5886a90aeadf035d3dd4cf9fc379b3c1046c293cee3581e SHA512 f50252a59951570c87cc1254b1954ef275ee7b2a5cac229aba98b49f34f9f73314d2db9df0abc92efdfeab565f6c1ee14080e049d370384e3398b8c27f5519b7
 DIST trantor-1.5.7.tar.gz 112139 BLAKE2B f0584b762c9c4f4e34eaec06f7438ef9bc587f5f6333ee9ee26a8c65f60bafc159f1b9b52a9079d5454824ec0911015274c4dcedaf102d1a09b3edc6a9cf06d5 SHA512 52fe66a5eb4a682abffe90b69b5ebf4f5791d07e020bf8bbe88317b3fddbc9f3c04b6a2664aa3ca1851c5c9681433f99e3851458bb9a99be89452382ca33e837
+DIST trantor-1.5.8.tar.gz 112315 BLAKE2B ee7b1805005fe33c8820fe84adf2af23a12e3758646fe18e681e2fc7a89109546f9bfa2b64cc03fd667a3d78d70377da31dfad67f76269b9afa3d9659163fee4 SHA512 6c90d3dbbc4e175500dfa8365dd42b1e260c5401b6551fb8f28e3673a6540b0937a66ca9f2ae0cc1ef6b1ba27c6232a053ef5402e5ef36835a51f841354de5c9
diff --git a/dev-cpp/drogon/drogon-1.8.0-r1.ebuild b/dev-cpp/drogon/drogon-1.8.2.ebuild
index a884fc440216..3d9c5914f4f4 100644
--- a/dev-cpp/drogon/drogon-1.8.0-r1.ebuild
+++ b/dev-cpp/drogon/drogon-1.8.2.ebuild
@@ -5,13 +5,13 @@ EAPI=8
 
 inherit cmake
 
-MY_PEM_V="1.5.6"
+MY_TRANTOR_V="1.5.8"
 
 DESCRIPTION="C++14/17 based HTTP web application framework"
 HOMEPAGE="https://github.com/drogonframework/drogon"
 SRC_URI="
 	https://github.com/drogonframework/drogon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://raw.githubusercontent.com/an-tao/trantor/v${MY_PEM_V}/trantor/tests/server.pem -> trantor-${MY_PEM_V}-test.pem )
+	test? ( https://github.com/an-tao/trantor/archive/refs/tags/v${MY_TRANTOR_V}.tar.gz -> trantor-${MY_TRANTOR_V}.tar.gz )
 "
 
 LICENSE="MIT"
@@ -21,7 +21,7 @@ IUSE="+brotli doc examples mariadb postgres redis sqlite +ssl test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-cpp/trantor-1.5.6_pre20220801:=
+	>=dev-cpp/trantor-${MY_TRANTOR_V}:=
 	dev-libs/jsoncpp:=
 	sys-libs/zlib
 	brotli? ( app-arch/brotli:= )
@@ -36,35 +36,37 @@ RDEPEND="
 		sys-apps/util-linux
 	) )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
 BDEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-tests-race-condition.patch )
-
 DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md )
 
 src_unpack() {
 	default
+
 	# 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 "${DISTDIR}"/trantor-${MY_PEM_V}-test.pem \
+		cp -v trantor-${MY_TRANTOR_V}/trantor/tests/server.pem \
 			${P}/trantor/trantor/tests/server.pem \
 			|| die "could not copy test certificate"
 	fi
 }
 
 src_prepare() {
-	cmake_comment_add_subdirectory "trantor"
-
 	use examples && DOCS+=( "${S}/examples" )
 
+	cmake_comment_add_subdirectory "trantor"
+
 	cmake_src_prepare
 }
 
 src_configure() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}/docs/drogon/html/." )
+
 	local -a mycmakeargs=(
 		-DBUILD_DOC=$(usex doc)
 		-DBUILD_EXAMPLES=NO
@@ -77,12 +79,12 @@ src_configure() {
 		$(cmake_use_find_package ssl OpenSSL)
 		$(cmake_use_find_package doc Doxygen)
 	)
-	use doc && HTML_DOCS=( "${BUILD_DIR}/docs/drogon/html/." )
 
 	cmake_src_configure
 }
 
 src_install() {
 	docompress -x /usr/share/doc/${PF}/examples
+
 	cmake_src_install
 }
diff --git a/dev-cpp/drogon/files/drogon-1.8.0-fix-tests-race-condition.patch b/dev-cpp/drogon/files/drogon-1.8.0-fix-tests-race-condition.patch
deleted file mode 100644
index efeeb5a3d044..000000000000
--- a/dev-cpp/drogon/files/drogon-1.8.0-fix-tests-race-condition.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# Upstream PR (modified): <https://github.com/drogonframework/drogon/pull/1376>
-# Bug: <https://bugs.gentoo.org/868930>
-
-From eb0d322f40967883c8b1fb7aad7d00827c2f819c Mon Sep 17 00:00:00 2001
-From: an-tao <antao2002@gmail.com>
-Date: Thu, 8 Sep 2022 11:06:30 +0800
-Subject: [PATCH] Fix a test bug when clients start before servers
-
----
- lib/tests/RealIpResolverTest.cc  | 1 +
- lib/tests/main_CookieSameSite.cc | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/lib/tests/RealIpResolverTest.cc b/lib/tests/RealIpResolverTest.cc
-index e3d4cfb66..612174d45 100644
---- a/lib/tests/RealIpResolverTest.cc
-+++ b/lib/tests/RealIpResolverTest.cc
-@@ -139,6 +139,7 @@ int main(int argc, char **argv)
-     });
- 
-     f1.get();
-+    std::this_thread::sleep_for(std::chrono::milliseconds(200));
-     int testStatus = test::run(argc, argv);
-     app().getLoop()->queueInLoop([]() { app().quit(); });
-     thr.join();
-diff --git a/lib/tests/main_CookieSameSite.cc b/lib/tests/main_CookieSameSite.cc
-index b271e7a42..43f76198f 100644
---- a/lib/tests/main_CookieSameSite.cc
-+++ b/lib/tests/main_CookieSameSite.cc
-@@ -68,6 +68,7 @@ int main(int argc, char **argv)
-     });
- 
-     f1.get();
-+    std::this_thread::sleep_for(std::chrono::milliseconds(200));
-     int testStatus = test::run(argc, argv);
-     app().getLoop()->queueInLoop([]() { app().quit(); });
-     thr.join();