[gentoo-commits] repo/gentoo:master commit in: dev-cpp/range-v3/files/, dev-cpp/range-v3/

2020-11-23 Thread Georgy Yakovlev
commit: 519e132ee06a9ce07d4eea867332e855b3be1738
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Nov 24 07:39:12 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Nov 24 07:47:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519e132e

dev-cpp/range-v3: add gcc10 patch

Closes: https://bugs.gentoo.org/756289
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-cpp/range-v3/files/0.11.0-gcc10.patch | 133 ++
 dev-cpp/range-v3/range-v3-0.11.0.ebuild   |   5 +-
 2 files changed, 137 insertions(+), 1 deletion(-)

diff --git a/dev-cpp/range-v3/files/0.11.0-gcc10.patch 
b/dev-cpp/range-v3/files/0.11.0-gcc10.patch
new file mode 100644
index 000..caebf0a6316
--- /dev/null
+++ b/dev-cpp/range-v3/files/0.11.0-gcc10.patch
@@ -0,0 +1,133 @@
+From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001
+From: Eric Niebler 
+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_{}
++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))
+-  : parent_()
++  : parent_(parent)
+ {}
+ 
+ CPP_member
+-constexpr CPP_ctor(split_outer_iterator)(Parent & parent,
++constexpr CPP_ctor(split_outer_iterator)(Parent * parent,
+  iterator_t 
current)(
+ /// \pre
+ requires forward_range)
+   : Current{std::move(current)}
+-  , parent_()
++  , parent_(parent)
+ {}
+ 
+ template(bool Other)(
+@@ -519,7 +519,7 @@ namespace ranges
+   ranges::equal_to> &&
+ (forward_range || detail::tiny_range)
+ #endif
+-struct RANGES_EMPTY_BASES split_view
++struct RANGES_EMPTY_BASES split_view
+   : view_interface, is_finite::value ? finite : 
unknown>
+   , private detail::split_view_base>
+ {
+@@ -537,17 +537,17 @@ namespace ranges
+ #if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17
+ outer_iterator()> begin_(std::true_type)
+ {
+-return outer_iterator()>{*this, 
ranges::begin(base_)};
++return outer_iterator()>{this, 
ranges::begin(base_)};
+ }
+ outer_iterator begin_(std::false_type)
+ {
+ this->curr_ = ranges::begin(base_);
+-return outer_iterator{*this};
++return outer_iterator{this};
+ }
+ 
+ outer_iterator()> end_(std::true_type) const
+ {
+-return outer_iterator{*this, ranges::end(base_)};
++return outer_iterator{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)
+-return outer_iterator()>{*this, 
ranges::begin(base_)};
++return outer_iterator()>{this, 
ranges::begin(base_)};
+ else
+ {
+ this->curr_ = ranges::begin(base_);
+-return outer_iterator{*this};
++return outer_iterator{this};
+ }
+ #else
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/range-v3/files/, dev-cpp/range-v3/

2020-11-23 Thread Georgy Yakovlev
commit: 2424d84ad2adf6adbdd3b02ebcddfee4d6e1931e
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Nov 24 07:00:48 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Nov 24 07:06:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2424d84a

dev-cpp/range-v3: minor QA

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-cpp/range-v3/files/0.11.0-no-werror.patch | 39 +++
 dev-cpp/range-v3/range-v3-0.11.0.ebuild   | 19 -
 2 files changed, 52 insertions(+), 6 deletions(-)

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
new file mode 100644
index 000..1894fcc93b6
--- /dev/null
+++ b/dev-cpp/range-v3/files/0.11.0-no-werror.patch
@@ -0,0 +1,39 @@
+From 66e847d4e14be3a369b7e26a03a172b20e62c003 Mon Sep 17 00:00:00 2001
+From: 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.11.0.ebuild 
b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
index 036a9535363..a4019f9f11f 100644
--- a/dev-cpp/range-v3/range-v3-0.11.0.ebuild
+++ b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
@@ -15,21 +15,28 @@ KEYWORDS="~amd64 ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}/0.11.0-no-werror.patch" )
+
 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
+   # 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=(
-   -DRANGE_V3_EXAMPLES=OFF
-   -DRANGE_V3_HEADER_CHECKS=OFF
-   -DRANGE_V3_PERF=OFF
-   -DRANGE_V3_TESTS=$(usex test)
-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