public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/drogon/files/, dev-cpp/drogon/
@ 2021-08-16 21:09 Ronny Gutbrod
  0 siblings, 0 replies; 4+ messages in thread
From: Ronny Gutbrod @ 2021-08-16 21:09 UTC (permalink / raw
  To: gentoo-commits

commit:     adce6ec38af302335c76c031a4806e0b24ba4caa
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Mon Aug 16 21:02:34 2021 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon Aug 16 21:08:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=adce6ec3

dev-cpp/drogon: New package.

C++14/17 based HTTP web application framework

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-cpp/drogon/Manifest                            |  1 +
 dev-cpp/drogon/drogon-1.7.1.ebuild                 | 64 ++++++++++++++++++++++
 .../drogon/files/drogon-1.7.1_GNUInstallDirs.patch | 33 +++++++++++
 dev-cpp/drogon/metadata.xml                        | 17 ++++++
 4 files changed, 115 insertions(+)

diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest
new file mode 100644
index 000000000..58b45827d
--- /dev/null
+++ b/dev-cpp/drogon/Manifest
@@ -0,0 +1 @@
+DIST drogon-1.7.1.tar.gz 465299 BLAKE2B 72ddcc050333f6ff8d0749c3de5a4db80cf5f36613253d90abcbf8983aa53db44a6a4e71b73cc42c0596684b7a56a1cb69faa348652c0fc673e6be7d3ad383b3 SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6

diff --git a/dev-cpp/drogon/drogon-1.7.1.ebuild b/dev-cpp/drogon/drogon-1.7.1.ebuild
new file mode 100644
index 000000000..ce75c0321
--- /dev/null
+++ b/dev-cpp/drogon/drogon-1.7.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+brotli examples mariadb postgres redis sqlite +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/trantor
+	dev-libs/jsoncpp
+	sys-libs/zlib
+	brotli? ( app-arch/brotli )
+	mariadb? ( dev-db/mariadb:= )
+	postgres? ( dev-db/postgresql:= )
+	redis? ( dev-libs/hiredis )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.1_GNUInstallDirs.patch" )
+
+DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md )
+
+src_prepare() {
+	sed -i '/add_subdirectory(trantor)/d' CMakeLists.txt || die
+	sed -i '/${PROJECT_SOURCE_DIR}\/trantor\/trantor\/tests\/server.pem/d' \
+		lib/tests/CMakeLists.txt || die
+	use brotli || sed -i '/find_package(Brotli)/d' CMakeLists.txt || die
+	use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
+
+	use examples && DOCS+=( "${S}/examples" )
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# NOTE: Next version has BUILD_DOC switch.
+	local -a mycmakeargs=(
+		"-DBUILD_EXAMPLES=NO"
+		"-DBUILD_DROGON_SHARED=YES"
+		"-DBUILD_POSTGRESQL=$(usex postgres)"
+		"-DBUILD_MYSQL=$(usex mariadb)"
+		"-DBUILD_SQLITE=$(usex sqlite)"
+		"-DBUILD_REDIS=$(usex redis)"
+		"-DBUILD_TESTING=$(usex test)"
+	)
+
+	cmake_src_configure
+}

diff --git a/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch b/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch
new file mode 100644
index 000000000..bd52972bb
--- /dev/null
+++ b/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch
@@ -0,0 +1,33 @@
+From 318327104fa444f764caccc9ad7ae40ae3452ea9 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Mon, 16 Aug 2021 22:19:46 +0200
+Subject: [PATCH] cmake: Use GNUInstallDirs to figure out install dirs.
+
+---
+ CMakeLists.txt | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 821cf09..9634bfc 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,11 +33,12 @@ set(DROGON_VERSION
+     ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
+ set(DROGON_VERSION_STRING "${DROGON_VERSION}")
+ 
++include(GNUInstallDirs)
+ # Offer the user the choice of overriding the installation directories
+-set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
+-set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
+-set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
+-set(DEF_INSTALL_DROGON_CMAKE_DIR lib/cmake/Drogon)
++set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
++set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables")
++set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for header files")
++set(DEF_INSTALL_DROGON_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/Drogon)
+ set(INSTALL_DROGON_CMAKE_DIR ${DEF_INSTALL_DROGON_CMAKE_DIR}
+     CACHE PATH "Installation directory for cmake files")
+ 
+-- 
+2.31.1
+

diff --git a/dev-cpp/drogon/metadata.xml b/dev-cpp/drogon/metadata.xml
new file mode 100644
index 000000000..80e637052
--- /dev/null
+++ b/dev-cpp/drogon/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<upstream>
+		<doc>https://drogon.docsforge.com/</doc>
+	</upstream>
+	<use>
+		<flag name="brotli">Enable support for brotli compression</flag>
+		<flag name="mariadb">Add support for the mariadb database</flag>
+		<flag name="redis">Add support for the Redis database via
+		dev-libs/hiredis</flag>
+	</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/drogon/files/, dev-cpp/drogon/
@ 2021-10-20 19:07 Ronny Gutbrod
  0 siblings, 0 replies; 4+ messages in thread
From: Ronny Gutbrod @ 2021-10-20 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b93ab49cb28826409ac1c1baa4ab0775634485af
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Oct 20 18:30:22 2021 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Wed Oct 20 19:05:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b93ab49c

dev-cpp/drogon: Remove old ebuild.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-cpp/drogon/Manifest                            |  1 -
 dev-cpp/drogon/drogon-1.7.1.ebuild                 | 64 ----------------------
 .../drogon/files/drogon-1.7.1_GNUInstallDirs.patch | 33 -----------
 3 files changed, 98 deletions(-)

diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest
index 90c964273..d277ad961 100644
--- a/dev-cpp/drogon/Manifest
+++ b/dev-cpp/drogon/Manifest
@@ -1,3 +1,2 @@
-DIST drogon-1.7.1.tar.gz 465299 BLAKE2B 72ddcc050333f6ff8d0749c3de5a4db80cf5f36613253d90abcbf8983aa53db44a6a4e71b73cc42c0596684b7a56a1cb69faa348652c0fc673e6be7d3ad383b3 SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6
 DIST drogon-1.7.2.tar.gz 475266 BLAKE2B dff7cdf76b4d30a7cd44f50efcf3b683eefe06e7b0be1fe167f1891370c55ee76b8f6e14582cbfdf0f2b129211301fd9b97e4dc4db313f28fccb21ca6271a57a SHA512 0546a7a6a1a1e9e1ec068cd45d747ccdd62a9bd9042db4941c004fbe795d051b8d115a71f8000352a2d284f141ebad9b66438dfabc255bb24c92bd5a3dc0ed8a
 DIST drogon-1.7.3.tar.gz 483306 BLAKE2B b5b89f678f285de6533480d403725f172b40f1c97057b3234dc5a9456c1e13f3d3b2a11769e78a16199495584a9a411ccdd375090b3770acdff24054bba75060 SHA512 20146bf59898704f3b44778fa46e919d9124ef8a33eb1cfcce7f437507c20920829a0074e1c9e2493a1764b8a36b1a91b03f117fd78e740253b15d2146dca628

diff --git a/dev-cpp/drogon/drogon-1.7.1.ebuild b/dev-cpp/drogon/drogon-1.7.1.ebuild
deleted file mode 100644
index ce75c0321..000000000
--- a/dev-cpp/drogon/drogon-1.7.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+brotli examples mariadb postgres redis sqlite +ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-cpp/trantor
-	dev-libs/jsoncpp
-	sys-libs/zlib
-	brotli? ( app-arch/brotli )
-	mariadb? ( dev-db/mariadb:= )
-	postgres? ( dev-db/postgresql:= )
-	redis? ( dev-libs/hiredis )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.1_GNUInstallDirs.patch" )
-
-DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md )
-
-src_prepare() {
-	sed -i '/add_subdirectory(trantor)/d' CMakeLists.txt || die
-	sed -i '/${PROJECT_SOURCE_DIR}\/trantor\/trantor\/tests\/server.pem/d' \
-		lib/tests/CMakeLists.txt || die
-	use brotli || sed -i '/find_package(Brotli)/d' CMakeLists.txt || die
-	use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
-
-	use examples && DOCS+=( "${S}/examples" )
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# NOTE: Next version has BUILD_DOC switch.
-	local -a mycmakeargs=(
-		"-DBUILD_EXAMPLES=NO"
-		"-DBUILD_DROGON_SHARED=YES"
-		"-DBUILD_POSTGRESQL=$(usex postgres)"
-		"-DBUILD_MYSQL=$(usex mariadb)"
-		"-DBUILD_SQLITE=$(usex sqlite)"
-		"-DBUILD_REDIS=$(usex redis)"
-		"-DBUILD_TESTING=$(usex test)"
-	)
-
-	cmake_src_configure
-}

diff --git a/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch b/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch
deleted file mode 100644
index bd52972bb..000000000
--- a/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 318327104fa444f764caccc9ad7ae40ae3452ea9 Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Mon, 16 Aug 2021 22:19:46 +0200
-Subject: [PATCH] cmake: Use GNUInstallDirs to figure out install dirs.
-
----
- CMakeLists.txt | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 821cf09..9634bfc 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,11 +33,12 @@ set(DROGON_VERSION
-     ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
- set(DROGON_VERSION_STRING "${DROGON_VERSION}")
- 
-+include(GNUInstallDirs)
- # Offer the user the choice of overriding the installation directories
--set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
--set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
--set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
--set(DEF_INSTALL_DROGON_CMAKE_DIR lib/cmake/Drogon)
-+set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
-+set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables")
-+set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for header files")
-+set(DEF_INSTALL_DROGON_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/Drogon)
- set(INSTALL_DROGON_CMAKE_DIR ${DEF_INSTALL_DROGON_CMAKE_DIR}
-     CACHE PATH "Installation directory for cmake files")
- 
--- 
-2.31.1
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/drogon/files/, dev-cpp/drogon/
  2022-09-09 20:02 [gentoo-commits] repo/proj/guru:master commit in: dev-cpp/drogon/, dev-cpp/drogon/files/ Ronny Gutbrod
@ 2022-09-08 15:56 ` Ronny Gutbrod
  0 siblings, 0 replies; 4+ messages in thread
From: Ronny Gutbrod @ 2022-09-08 15:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3969a15b3da3dd8fe29a7451f013c7c92f61860b
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Thu Sep  8 15:52:50 2022 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Thu Sep  8 15:56:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3969a15b

dev-cpp/drogon: fix race condition in tests

Closes: https://bugs.gentoo.org/868930
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-cpp/drogon/drogon-1.8.0-r1.ebuild              |  2 ++
 .../drogon-1.8.0-fix-tests-race-condition.patch    | 37 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/dev-cpp/drogon/drogon-1.8.0-r1.ebuild b/dev-cpp/drogon/drogon-1.8.0-r1.ebuild
index 784892098..a884fc440 100644
--- a/dev-cpp/drogon/drogon-1.8.0-r1.ebuild
+++ b/dev-cpp/drogon/drogon-1.8.0-r1.ebuild
@@ -41,6 +41,8 @@ DEPEND="${RDEPEND}
 "
 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() {

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
new file mode 100644
index 000000000..efeeb5a3d
--- /dev/null
+++ b/dev-cpp/drogon/files/drogon-1.8.0-fix-tests-race-condition.patch
@@ -0,0 +1,37 @@
+# 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();


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/drogon/files/, dev-cpp/drogon/
@ 2022-11-13  9:29 Ronny Gutbrod
  0 siblings, 0 replies; 4+ messages in thread
From: Ronny Gutbrod @ 2022-11-13  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     0f02fb842bf7a87dc339a757d295f87f2cda70d4
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sun Nov 13 09:26:07 2022 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Sun Nov 13 09:26:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f02fb84

dev-cpp/drogon: drop 1.8.0-r1

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-cpp/drogon/Manifest                            |  2 -
 dev-cpp/drogon/drogon-1.8.0-r1.ebuild              | 88 ----------------------
 .../drogon-1.8.0-fix-tests-race-condition.patch    | 37 ---------
 3 files changed, 127 deletions(-)

diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest
index 3274e5ebb..ad2f1df70 100644
--- a/dev-cpp/drogon/Manifest
+++ b/dev-cpp/drogon/Manifest
@@ -1,6 +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 drogon-1.8.2.tar.gz 538230 BLAKE2B d4ad90ed6a32e6ada9d7d37409ab6f35e2a11e82b13b71a062f1f05ab3df50cf39a7e5d72ceadb6ae5886a90aeadf035d3dd4cf9fc379b3c1046c293cee3581e SHA512 f50252a59951570c87cc1254b1954ef275ee7b2a5cac229aba98b49f34f9f73314d2db9df0abc92efdfeab565f6c1ee14080e049d370384e3398b8c27f5519b7
-DIST trantor-1.5.6-test.pem 2949 BLAKE2B cd413aea981b8ec279ede073f8a19702ee1fa7bbe1c56177368dba7dda00bef2fef439eb9ee7f4d7be78834a6ab87cdbeb2f196d8bc0d7e9ce91b19c4484f1ea SHA512 4c73bc66102989a5c6706a1874940512b9d643383e943f2dea2cd1fafbfad3089da84fd08a3758261127fe756fe1f732790c589d77bcf94fa223202f38ef5852
 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.0-r1.ebuild
deleted file mode 100644
index a884fc440..000000000
--- a/dev-cpp/drogon/drogon-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PEM_V="1.5.6"
-
-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 )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+brotli doc examples mariadb postgres redis sqlite +ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/trantor-1.5.6_pre20220801:=
-	dev-libs/jsoncpp:=
-	sys-libs/zlib
-	brotli? ( app-arch/brotli:= )
-	mariadb? ( dev-db/mariadb:= )
-	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
-	) )
-"
-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 \
-			${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_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_EXAMPLES=NO
-		-DBUILD_POSTGRESQL=$(usex postgres)
-		-DBUILD_MYSQL=$(usex mariadb)
-		-DBUILD_SQLITE=$(usex sqlite)
-		-DBUILD_REDIS=$(usex redis)
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_BROTLI=$(usex brotli)
-		$(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 efeeb5a3d..000000000
--- 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();


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-11-13  9:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-13  9:29 [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/drogon/files/, dev-cpp/drogon/ Ronny Gutbrod
  -- strict thread matches above, loose matches on Subject: below --
2022-09-09 20:02 [gentoo-commits] repo/proj/guru:master commit in: dev-cpp/drogon/, dev-cpp/drogon/files/ Ronny Gutbrod
2022-09-08 15:56 ` [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/drogon/files/, dev-cpp/drogon/ Ronny Gutbrod
2021-10-20 19:07 Ronny Gutbrod
2021-08-16 21:09 Ronny Gutbrod

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox