summaryrefslogtreecommitdiff
path: root/dev-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/drogon/Manifest3
-rw-r--r--dev-cpp/drogon/drogon-1.8.1.ebuild (renamed from dev-cpp/drogon/drogon-1.7.5-r1.ebuild)35
-rw-r--r--dev-cpp/range-v3/Manifest2
-rw-r--r--dev-cpp/range-v3/files/0.11.0-gcc10.patch133
-rw-r--r--dev-cpp/range-v3/files/0.11.0-no-werror.patch39
-rw-r--r--dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild34
-rw-r--r--dev-cpp/range-v3/range-v3-0.11.0.ebuild46
-rw-r--r--dev-cpp/trantor/Manifest2
-rw-r--r--dev-cpp/trantor/trantor-1.5.7.ebuild (renamed from dev-cpp/trantor/trantor-1.5.6-r1.ebuild)0
9 files changed, 29 insertions, 265 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
}
diff --git a/dev-cpp/range-v3/Manifest b/dev-cpp/range-v3/Manifest
index 4d3df61de18e..8414af337fcb 100644
--- a/dev-cpp/range-v3/Manifest
+++ b/dev-cpp/range-v3/Manifest
@@ -1,3 +1 @@
-DIST range-v3-0.10.0.tar.gz 525765 BLAKE2B 7dd3aed9b35920e058fe43bccd364831a52ad8d50179d1057ab7a37cdef82df021bb09a9913018ae78982fe136c855ba4101e31d35cfc21747af994d0103b95e SHA512 4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723
-DIST range-v3-0.11.0.tar.gz 533136 BLAKE2B d325b14a9d812cb7a600a947126bcecf9384bec987edbad42eec38560415d075815ab92e3f92dad291029fc3e1b1afa1ceaf54443b4a536078047fd32d344394 SHA512 9d6cdcbc1e50104206ba731c3bdc9aab3acfcf69cd83f0e0b4de18b88df2a9e73d64e55638421768d4433c542b6619f6e5af6b17cccd3090cf8b4d4efe9863e4
DIST range-v3-0.12.0.tar.gz 582834 BLAKE2B 252066fae70aae76450226f2c17248662de4778dcebcd7dbaa2bf757c1bfe3e7441f65e41e3110c1ae83ae93a41c54d6c006dbf5482ffbe09a3aa4f51d02df9c SHA512 b8b632b8e0f2a3234ef61813212c237f648cd741e816ca57bd86f82f6459f7d755e2b70361d2aa43847874fb546a31a792ab1c3ba90292818ae7313438dc62d0
diff --git a/dev-cpp/range-v3/files/0.11.0-gcc10.patch b/dev-cpp/range-v3/files/0.11.0-gcc10.patch
deleted file mode 100644
index caebf0a63162..000000000000
--- a/dev-cpp/range-v3/files/0.11.0-gcc10.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001
-From: Eric Niebler <eniebler@boost.org>
-Date: Mon, 17 Aug 2020 17:48:09 -0700
-Subject: [PATCH] work around premature instantiation problem on gcc; fixes
- #1545
-
----
- include/range/v3/view/chunk.hpp | 6 +++---
- include/range/v3/view/split.hpp | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/include/range/v3/view/chunk.hpp b/include/range/v3/view/chunk.hpp
-index 0c03cf1eb..b8df13303 100644
---- a/include/range/v3/view/chunk.hpp
-+++ b/include/range/v3/view/chunk.hpp
-@@ -313,8 +313,8 @@ namespace ranges
-
- public:
- inner_view() = default;
-- constexpr explicit inner_view(chunk_view_ & view) noexcept
-- : rng_{&view}
-+ constexpr explicit inner_view(chunk_view_ * view) noexcept
-+ : rng_{view}
- {}
- CPP_auto_member
- constexpr auto CPP_fun(size)()(
-@@ -338,7 +338,7 @@ namespace ranges
- constexpr inner_view read() const
- {
- RANGES_EXPECT(!done());
-- return inner_view{*rng_};
-+ return inner_view{rng_};
- }
- constexpr bool done() const
- {
-diff --git a/include/range/v3/view/split.hpp b/include/range/v3/view/split.hpp
-index facf1b37f..496220e4a 100644
---- a/include/range/v3/view/split.hpp
-+++ b/include/range/v3/view/split.hpp
-@@ -389,19 +389,19 @@ namespace ranges
- split_outer_iterator() = default;
-
- CPP_member
-- constexpr explicit CPP_ctor(split_outer_iterator)(Parent & parent)(
-+ constexpr explicit CPP_ctor(split_outer_iterator)(Parent * parent)(
- /// \pre
- requires (!forward_range<Base>))
-- : parent_(&parent)
-+ : parent_(parent)
- {}
-
- CPP_member
-- constexpr CPP_ctor(split_outer_iterator)(Parent & parent,
-+ constexpr CPP_ctor(split_outer_iterator)(Parent * parent,
- iterator_t<Base> current)(
- /// \pre
- requires forward_range<Base>)
- : Current{std::move(current)}
-- , parent_(&parent)
-+ , parent_(parent)
- {}
-
- template(bool Other)(
-@@ -519,7 +519,7 @@ namespace ranges
- ranges::equal_to> &&
- (forward_range<V> || detail::tiny_range<Pattern>)
- #endif
-- struct RANGES_EMPTY_BASES split_view
-+ struct RANGES_EMPTY_BASES split_view
- : view_interface<split_view<V, Pattern>, is_finite<V>::value ? finite : unknown>
- , private detail::split_view_base<iterator_t<V>>
- {
-@@ -537,17 +537,17 @@ namespace ranges
- #if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17
- outer_iterator<simple_view<V>()> begin_(std::true_type)
- {
-- return outer_iterator<simple_view<V>()>{*this, ranges::begin(base_)};
-+ return outer_iterator<simple_view<V>()>{this, ranges::begin(base_)};
- }
- outer_iterator<false> begin_(std::false_type)
- {
- this->curr_ = ranges::begin(base_);
-- return outer_iterator<false>{*this};
-+ return outer_iterator<false>{this};
- }
-
- outer_iterator<simple_view<V>()> end_(std::true_type) const
- {
-- return outer_iterator<true>{*this, ranges::end(base_)};
-+ return outer_iterator<true>{this, ranges::end(base_)};
- }
- default_sentinel_t end_(std::false_type) const
- {
-@@ -580,11 +580,11 @@ namespace ranges
- {
- #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17
- if constexpr(forward_range<V>)
-- return outer_iterator<simple_view<V>()>{*this, ranges::begin(base_)};
-+ return outer_iterator<simple_view<V>()>{this, ranges::begin(base_)};
- else
- {
- this->curr_ = ranges::begin(base_);
-- return outer_iterator<false>{*this};
-+ return outer_iterator<false>{this};
- }
- #else
- return begin_(meta::bool_<forward_range<V>>{});
-@@ -596,7 +596,7 @@ namespace ranges
- /// \pre
- requires forward_range<V> && forward_range<const V>)
- {
-- return {*this, ranges::begin(base_)};
-+ return {this, ranges::begin(base_)};
- }
- CPP_member
- constexpr auto end() //
-@@ -604,14 +604,14 @@ namespace ranges
- /// \pre
- requires forward_range<V> && common_range<V>)
- {
-- return outer_iterator<simple_view<V>()>{*this, ranges::end(base_)};
-+ return outer_iterator<simple_view<V>()>{this, ranges::end(base_)};
- }
- constexpr auto end() const
- {
- #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17
- if constexpr(forward_range<V> && forward_range<const V> &&
- common_range<const V>)
-- return outer_iterator<true>{*this, ranges::end(base_)};
-+ return outer_iterator<true>{this, ranges::end(base_)};
- else
- return default_sentinel;
- #else
diff --git a/dev-cpp/range-v3/files/0.11.0-no-werror.patch b/dev-cpp/range-v3/files/0.11.0-no-werror.patch
deleted file mode 100644
index 1894fcc93b6c..000000000000
--- a/dev-cpp/range-v3/files/0.11.0-no-werror.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 66e847d4e14be3a369b7e26a03a172b20e62c003 Mon Sep 17 00:00:00 2001
-From: eksi <eksi@eksi.eksi>
-Date: Wed, 4 Nov 2020 20:37:01 +0300
-Subject: [PATCH] Add an option to disable -Werror. Fixes #1528
-
----
- cmake/ranges_flags.cmake | 4 +++-
- cmake/ranges_options.cmake | 3 +++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/ranges_flags.cmake b/cmake/ranges_flags.cmake
-index 76d893043..9b09ddcb8 100644
---- a/cmake/ranges_flags.cmake
-+++ b/cmake/ranges_flags.cmake
-@@ -88,7 +88,9 @@ else()
- # Enable "normal" warnings and make them errors:
- ranges_append_flag(RANGES_HAS_WALL -Wall)
- ranges_append_flag(RANGES_HAS_WEXTRA -Wextra)
-- ranges_append_flag(RANGES_HAS_WERROR -Werror)
-+ if (RANGES_ENABLE_WERROR)
-+ ranges_append_flag(RANGES_HAS_WERROR -Werror)
-+ endif()
- endif()
-
- if (RANGES_ENV_LINUX AND RANGES_CXX_COMPILER_CLANG)
-diff --git a/cmake/ranges_options.cmake b/cmake/ranges_options.cmake
-index 4ec39c7f0..8455af306 100644
---- a/cmake/ranges_options.cmake
-+++ b/cmake/ranges_options.cmake
-@@ -16,6 +16,9 @@ option(RANGES_MODULES "Enables use of Clang modules (experimental)." OFF)
- option(RANGES_NATIVE "Enables -march/-mtune=native." ON)
- option(RANGES_VERBOSE_BUILD "Enables debug output from CMake." OFF)
- option(RANGES_LLVM_POLLY "Enables LLVM Polly." OFF)
-+option(RANGES_ENABLE_WERROR
-+ "Enables -Werror. Only effective if compiler is not clang-cl or MSVC. ON by default"
-+ ON)
- option(RANGES_PREFER_REAL_CONCEPTS
- "Use real concepts instead of emulation if the compiler supports it"
- ON)
diff --git a/dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild b/dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild
deleted file mode 100644
index 0c4a5694d936..000000000000
--- a/dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Range library for C++14/17/20, basis for C++20's std::ranges"
-HOMEPAGE="https://github.com/ericniebler/range-v3"
-SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE=""
-
-src_prepare() {
- sed -i -e '/Werror/d' -e '/Wextra/d' -e '/Wall/d' cmake/ranges_flags.cmake || die
- sed -i -e "s@lib/cmake@"$(get_libdir)"/cmake@g" CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DRANGE_V3_EXAMPLES=OFF
- -DRANGE_V3_HEADER_CHECKS=OFF
- -DRANGE_V3_PERF=OFF
- -DRANGE_V3_TESTS=OFF
- -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
- -DRANGES_NATIVE=OFF
- #TODO: clang support + -DRANGES_MODULES=yes
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/range-v3/range-v3-0.11.0.ebuild b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
deleted file mode 100644
index 91aeddf498fa..000000000000
--- a/dev-cpp/range-v3/range-v3-0.11.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Range library for C++14/17/20, basis for C++20's std::ranges"
-HOMEPAGE="https://github.com/ericniebler/range-v3"
-SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/0.11.0-no-werror.patch"
- "${FILESDIR}/0.11.0-gcc10.patch"
-)
-
-src_prepare() {
- # header-only libraries go to arch-independent dirs
- sed -i -e 's@lib/cmake@share/cmake@g' CMakeLists.txt || die
- rm include/module.modulemap || die # https://bugs.gentoo.org/755740
- cmake_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
- -DRANGES_NATIVE=OFF
- -DRANGES_DEBUG_INFO=OFF
- -DRANGES_NATIVE=OFF
- -DRANGES_ENABLE_WERROR=OFF
- -DRANGES_VERBOSE_BUILD=ON
- -DRANGE_V3_EXAMPLES=OFF
- -DRANGE_V3_PERF=OFF
- -DRANGE_V3_DOCS=OFF
- -DRANGE_V3_HEADER_CHECKS="$(usex test ON OFF)"
- -DRANGE_V3_TESTS=$(usex test ON OFF)
- #TODO: clang support + -DRANGES_MODULES=yes
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/trantor/Manifest b/dev-cpp/trantor/Manifest
index 1807896afe65..7945bbd20de2 100644
--- a/dev-cpp/trantor/Manifest
+++ b/dev-cpp/trantor/Manifest
@@ -1,2 +1,2 @@
-DIST trantor-1.5.6.tar.gz 109719 BLAKE2B 5465f1cddd014a9dee4dd1ea1f8e6f36a1eef3a16424305ff2102fb489838260b415d92e43d72a3fe99db924946987e8e8c64f6720488c2e9e0f42b1b031ca0a SHA512 9c9827b1640fa23f2941c6c10ffe692d4207595de1cb149f94140c0f20d4fe6c45e3efcc50d464bd40aff80443dfe3bdd8db263302755ab8f639a920e497c0b3
DIST trantor-1.5.6_p20220801.tar.gz 109915 BLAKE2B f9ef51274e2f67a474239482013ab0460265ed60238ada88d1a6aeb3b3883992424a2aa75c4726e8018083c54fef7f2fb5f3fbb781a1feecfd84e2b187937fc8 SHA512 fb1517eeaaf6a3f374e24767cc64183bc8966635f78d37ba213b2aeeef54b9763c59e376fb42b38892fc0468708e940a421d81f4b5809bfe65404e1e75ffa5ad
+DIST trantor-1.5.7.tar.gz 112139 BLAKE2B f0584b762c9c4f4e34eaec06f7438ef9bc587f5f6333ee9ee26a8c65f60bafc159f1b9b52a9079d5454824ec0911015274c4dcedaf102d1a09b3edc6a9cf06d5 SHA512 52fe66a5eb4a682abffe90b69b5ebf4f5791d07e020bf8bbe88317b3fddbc9f3c04b6a2664aa3ca1851c5c9681433f99e3851458bb9a99be89452382ca33e837
diff --git a/dev-cpp/trantor/trantor-1.5.6-r1.ebuild b/dev-cpp/trantor/trantor-1.5.7.ebuild
index f28b11d3f4bb..f28b11d3f4bb 100644
--- a/dev-cpp/trantor/trantor-1.5.6-r1.ebuild
+++ b/dev-cpp/trantor/trantor-1.5.7.ebuild