From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0AF18158086 for ; Wed, 1 Dec 2021 11:52:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A36D2BC024; Wed, 1 Dec 2021 11:52:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 223662BC024 for ; Wed, 1 Dec 2021 11:52:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BB7D342F35 for ; Wed, 1 Dec 2021 11:52:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94E55206 for ; Wed, 1 Dec 2021 11:52:41 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1638359282.a70ce4a9334e2da254e5110d25382553e57f1365.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/drogon/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-cpp/drogon/drogon-1.7.3-r1.ebuild dev-cpp/drogon/drogon-1.7.3.ebuild dev-cpp/drogon/metadata.xml X-VCS-Directories: dev-cpp/drogon/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: a70ce4a9334e2da254e5110d25382553e57f1365 X-VCS-Branch: dev Date: Wed, 1 Dec 2021 11:52:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6dcc60f-f312-4b6c-8952-0ce421713147 X-Archives-Hash: b9f632cbd0dbe0c63f5dc7956ffdd26a commit: a70ce4a9334e2da254e5110d25382553e57f1365 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Dec 1 11:48:02 2021 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Wed Dec 1 11:48:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a70ce4a9 dev-cpp/drogon: revbump (add slot operators) * EAPI 7 -> 8 * replace sed calls by cmake_use_find_package * add libuuid dependency Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> ...{drogon-1.7.3.ebuild => drogon-1.7.3-r1.ebuild} | 49 +++++++++++++--------- dev-cpp/drogon/metadata.xml | 27 ++++++------ 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dev-cpp/drogon/drogon-1.7.3.ebuild b/dev-cpp/drogon/drogon-1.7.3-r1.ebuild similarity index 56% rename from dev-cpp/drogon/drogon-1.7.3.ebuild rename to dev-cpp/drogon/drogon-1.7.3-r1.ebuild index 9d585e902..2455c3b57 100644 --- a/dev-cpp/drogon/drogon-1.7.3.ebuild +++ b/dev-cpp/drogon/drogon-1.7.3-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -17,17 +17,21 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-cpp/trantor-1.5.2 - dev-libs/jsoncpp + dev-libs/jsoncpp:= sys-libs/zlib - brotli? ( app-arch/brotli ) + brotli? ( app-arch/brotli:= ) mariadb? ( dev-db/mariadb:= ) postgres? ( dev-db/postgresql:= ) - redis? ( dev-libs/hiredis ) - sqlite? ( dev-db/sqlite ) - ssl? ( dev-libs/openssl ) + 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} +DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " BDEPEND="doc? ( app-doc/doxygen )" @@ -38,8 +42,6 @@ src_prepare() { cmake_comment_add_subdirectory "trantor" sed -i '/${PROJECT_SOURCE_DIR}\/trantor\/trantor\/tests\/server.pem/d' \ lib/tests/CMakeLists.txt || die - use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die - use doc || sed -i '/find_package(Doxygen/d' CMakeLists.txt || die use examples && DOCS+=( "${S}/examples" ) @@ -48,17 +50,24 @@ src_prepare() { src_configure() { local -a mycmakeargs=( - "-DBUILD_DOC=$(usex doc)" - "-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)" - "-DBUILD_BROTLI=$(usex brotli)" + -DBUILD_DOC=$(usex doc) + -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) + -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/*" + 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/metadata.xml b/dev-cpp/drogon/metadata.xml index 80e637052..782288ff9 100644 --- a/dev-cpp/drogon/metadata.xml +++ b/dev-cpp/drogon/metadata.xml @@ -1,17 +1,16 @@ - + - - gentoo@tastytea.de - Ronny (tastytea) Gutbrod - - - https://drogon.docsforge.com/ - - - Enable support for brotli compression - Add support for the mariadb database - Add support for the Redis database via - dev-libs/hiredis - + + gentoo@tastytea.de + Ronny (tastytea) Gutbrod + + + https://drogon.docsforge.com/ + + + Enable support for brotli compression + Add support for the mariadb database + Add support for the Redis database via dev-libs/hiredis +