diff options
Diffstat (limited to 'dev-cpp/drogon')
| -rw-r--r-- | dev-cpp/drogon/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/drogon/drogon-1.8.1.ebuild (renamed from dev-cpp/drogon/drogon-1.7.5-r1.ebuild) | 35 |
2 files changed, 28 insertions, 10 deletions
diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest index 6888f11ce791..4457bb02c42c 100644 --- a/dev-cpp/drogon/Manifest +++ b/dev-cpp/drogon/Manifest @@ -1,3 +1,4 @@ -DIST drogon-1.7.5.tar.gz 500398 BLAKE2B 9956542206119abd3fa8f2be61a59e09127c1c57019082a372b08e9e04f20d1361ae439118593078db13397e7c925ee5f904ff186dbb51c89f4e7245f4647f98 SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7 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 trantor-1.5.7.tar.gz 112139 BLAKE2B f0584b762c9c4f4e34eaec06f7438ef9bc587f5f6333ee9ee26a8c65f60bafc159f1b9b52a9079d5454824ec0911015274c4dcedaf102d1a09b3edc6a9cf06d5 SHA512 52fe66a5eb4a682abffe90b69b5ebf4f5791d07e020bf8bbe88317b3fddbc9f3c04b6a2664aa3ca1851c5c9681433f99e3851458bb9a99be89452382ca33e837 diff --git a/dev-cpp/drogon/drogon-1.7.5-r1.ebuild b/dev-cpp/drogon/drogon-1.8.1.ebuild index 8fee28811121..28241753dc58 100644 --- a/dev-cpp/drogon/drogon-1.7.5-r1.ebuild +++ b/dev-cpp/drogon/drogon-1.8.1.ebuild @@ -5,9 +5,14 @@ EAPI=8 inherit cmake +MY_TRANTOR_V="1.5.7" + 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" +SRC_URI=" + https://github.com/drogonframework/drogon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/an-tao/trantor/archive/refs/tags/v${MY_TRANTOR_V}.tar.gz -> trantor-${MY_TRANTOR_V}.tar.gz ) +" LICENSE="MIT" SLOT="0" @@ -16,7 +21,7 @@ IUSE="+brotli doc examples mariadb postgres redis sqlite +ssl test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-cpp/trantor-1.5.5:= + >=dev-cpp/trantor-${MY_TRANTOR_V}:= dev-libs/jsoncpp:= sys-libs/zlib brotli? ( app-arch/brotli:= ) @@ -31,28 +36,40 @@ RDEPEND=" sys-apps/util-linux ) ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} test? ( dev-cpp/gtest ) " BDEPEND="doc? ( app-doc/doxygen )" DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md ) -src_prepare() { - cmake_comment_add_subdirectory "trantor" - sed -i '/${PROJECT_SOURCE_DIR}\/trantor\/trantor\/tests\/server.pem/d' \ - lib/tests/CMakeLists.txt || die +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 trantor-${MY_TRANTOR_V}/trantor/tests/server.pem \ + ${P}/trantor/trantor/tests/server.pem \ + || die "could not copy test certificate" + 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/." ) + 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) @@ -62,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 } |