From bd3c6f11646b7601637fa3245cf8a363e9fa0034 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Jul 2022 07:32:04 +0100 Subject: gentoo auto-resync : 12:07:2022 - 07:32:03 --- dev-cpp/Manifest.gz | Bin 11925 -> 11923 bytes dev-cpp/range-v3/Manifest | 4 + dev-cpp/range-v3/files/0.12.0-fix-any-1.patch | 31 +++++ dev-cpp/range-v3/files/0.12.0-fix-any-2.patch | 156 ++++++++++++++++++++++++++ dev-cpp/range-v3/range-v3-0.12.0.ebuild | 46 ++++++++ 5 files changed, 237 insertions(+) create mode 100644 dev-cpp/range-v3/files/0.12.0-fix-any-1.patch create mode 100644 dev-cpp/range-v3/files/0.12.0-fix-any-2.patch create mode 100644 dev-cpp/range-v3/range-v3-0.12.0.ebuild (limited to 'dev-cpp') diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index aa88fc8dc2c7..a1f9c91a15ce 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/range-v3/Manifest b/dev-cpp/range-v3/Manifest index 1be8fa0dd3e5..e7b4d9252d4b 100644 --- a/dev-cpp/range-v3/Manifest +++ b/dev-cpp/range-v3/Manifest @@ -1,7 +1,11 @@ AUX 0.11.0-gcc10.patch 5360 BLAKE2B 2b679699a6c98004322caa0cc3334a898010263afff7ee870576855993f9cca8887066306d154ca63f53af224e2601e998deed0eff8c48f93c4b1b91d8bc0e77 SHA512 081032ea9f458f0d3bdc5931e89cab49ae32d4e0cf5a8a5a7ebbc7fd0e103469c78822d5f1ccba75b0425fa8c9b8b9057069a786a6f4fdb229b94a583172cbf7 AUX 0.11.0-no-werror.patch 1543 BLAKE2B 31a87abcfbfd23d1f585053befaa869a7299c74d903028b4c2c4b19194787cc325f6dda2dc5d9255d6aa38ce3b4b3182e9b9a133fa61d24569c56ac344cde643 SHA512 8ddc6073e1386cb667e66e5496d2566b60bc64f9670bd94d3d66582a43db66466e4f57995c68bf1ceca500c07f8f7feccfaeeb1c0cf9fafa14de5a81482eca5c +AUX 0.12.0-fix-any-1.patch 1252 BLAKE2B 307bbfa93cbecc4b58ff04172958e5d32c7e4f83b19140e6b3819517cb23a9089654954390e081a3ed82dc299f3bb1e3d0b257ed46b5f24cdb926bcaa28506e5 SHA512 617dfae7cf816cb554136a895f277541a2fa0030e78df60bcdbe6e3a2728f7d702b7c82ac15089f4c3a0fe83e92199b95c665a696471ceac70c8966d66381f25 +AUX 0.12.0-fix-any-2.patch 5500 BLAKE2B b1d5df033bdda42d7db172e07a6577d398603ddc262d409529463866f0e5ebd87ff5082941313b61a346c8bae1ac6870103e307c123d525c49eefc97a00af26c SHA512 51dfa7f70020b174666034636de4e326c80bc292c6e579731df95ba07ec60a9523b4f231bd31a0f8217f23e4fd64be785dda3af8e018ebe7b17ba087fe6446f2 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 EBUILD range-v3-0.10.0-r1.ebuild 854 BLAKE2B 17533e47f71866b1b7be5b7323e7179513dad88287a61506bb1fb145004927a64a2809682b91c548cc89f544238ee3cbbc2ec42159a3686f5a5c8cc4d63a9f0c SHA512 9d326cb93b3bc3fd32adf43ee6229ea672d56be1c711afe0724cd012451d570ac4ea9404992bee1faa64c4cdffacfef78193192953626a771780bb17939cd5cc EBUILD range-v3-0.11.0.ebuild 1184 BLAKE2B 394fd260a78eded8e8f328b103d296431ec5617c6ec2f37579137a089fad3c2be225c5b2ddf04fda724d804197061ada41a0d00cb67a815733210ef95c4dd431 SHA512 4b47b7dbbc7e275eb152b2725e161bae133b903b7d5f9a58ad74c628b4299a381c055224c05da966cf2a67ae173afa297f7ce0cfd01fdb1f12e72e2d841a11bc +EBUILD range-v3-0.12.0.ebuild 1216 BLAKE2B d4b1017633e70689d574c8d6905fa7b44b609b1f4953755a07384565e24eb133ee5cdabdd54596b364fe131ee4a6ae4b4466495b0b627b61489e7d96ebf9a39a SHA512 4a8c769ac7a00b0d283ac600ae9e0e8a114cd59df49452d59eb94549e69f8e06a3b60896a57b4c6dd67605a0cfa5d3d41f64e258405ad61aaa08f8bdbd692a76 MISC metadata.xml 810 BLAKE2B bdebf063bfd0652ef3a38f5c96f08fbcfe3933937aa00883d39cc216a79ebfd65fa3c538d15ab0b5b4855ef7696b98e14c292b6587f2d870ca9d4eb6d7d7e96c SHA512 b24ff8d2452b70c34a941c693e6b2bc256fbcc23a49acabdb7126d593b44de30116d9543edf57bf49ca5c6ba854b851b802167347a08736b16a1b200c28aa5fc diff --git a/dev-cpp/range-v3/files/0.12.0-fix-any-1.patch b/dev-cpp/range-v3/files/0.12.0-fix-any-1.patch new file mode 100644 index 000000000000..00eb457b5dcb --- /dev/null +++ b/dev-cpp/range-v3/files/0.12.0-fix-any-1.patch @@ -0,0 +1,31 @@ +From 64fe7d738bb2c2aa8e9ba24d170a8548519156a7 Mon Sep 17 00:00:00 2001 +From: Eric Niebler +Date: Wed, 22 Jun 2022 17:06:16 -0700 +Subject: [PATCH] avoid constraint recursion with ranges::any ctor/assign + +--- + include/range/v3/utility/any.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/range/v3/utility/any.hpp b/include/range/v3/utility/any.hpp +index 0d2889264..5feb2f8cd 100644 +--- a/include/range/v3/utility/any.hpp ++++ b/include/range/v3/utility/any.hpp +@@ -123,7 +123,7 @@ namespace ranges + public: + any() noexcept = default; + template(typename TRef, typename T = detail::decay_t)( +- requires copyable AND (!same_as)) // ++ requires (!same_as) AND copyable) // + any(TRef && t) + : ptr_(new impl(static_cast(t))) + {} +@@ -138,7 +138,7 @@ namespace ranges + return *this; + } + template(typename TRef, typename T = detail::decay_t)( +- requires copyable AND (!same_as)) // ++ requires (!same_as) AND copyable) // + any & operator=(TRef && t) + { + any{static_cast(t)}.swap(*this); diff --git a/dev-cpp/range-v3/files/0.12.0-fix-any-2.patch b/dev-cpp/range-v3/files/0.12.0-fix-any-2.patch new file mode 100644 index 000000000000..94898cc21a52 --- /dev/null +++ b/dev-cpp/range-v3/files/0.12.0-fix-any-2.patch @@ -0,0 +1,156 @@ +From 390a35e5815d1cb4e40e87d332df711de379a852 Mon Sep 17 00:00:00 2001 +From: Eric Niebler +Date: Wed, 22 Jun 2022 22:56:28 -0700 +Subject: [PATCH] work around strange gcc bug causing constraint recursion in + ranges::any + +--- + include/range/v3/detail/config.hpp | 8 ++--- + include/range/v3/utility/any.hpp | 58 +++++++++++++++++------------- + 2 files changed, 36 insertions(+), 30 deletions(-) + +diff --git a/include/range/v3/detail/config.hpp b/include/range/v3/detail/config.hpp +index f8015f436..d29dada10 100644 +--- a/include/range/v3/detail/config.hpp ++++ b/include/range/v3/detail/config.hpp +@@ -351,9 +351,6 @@ namespace ranges + #define RANGES_WORKAROUND_CLANG_43400 // template friend is redefinition of itself + #endif + #else // __GNUC__ +-#if __GNUC__ < 6 +-#define RANGES_WORKAROUND_GCC_UNFILED0 /* Workaround old GCC name lookup bug */ +-#endif + #if __GNUC__ == 7 || __GNUC__ == 8 + #define RANGES_WORKAROUND_GCC_91525 /* Workaround strange GCC ICE */ + #endif +@@ -724,8 +721,9 @@ namespace ranges + #endif + #endif // RANGES_CONSTEXPR_IF + +-#if !defined(RANGES_BROKEN_CPO_LOOKUP) && !defined(RANGES_DOXYGEN_INVOKED) && \ +- (defined(RANGES_WORKAROUND_GCC_UNFILED0) || defined(RANGES_WORKAROUND_MSVC_895622)) ++#if !defined(RANGES_BROKEN_CPO_LOOKUP) && \ ++ !defined(RANGES_DOXYGEN_INVOKED) && \ ++ defined(RANGES_WORKAROUND_MSVC_895622) + #define RANGES_BROKEN_CPO_LOOKUP 1 + #endif + #ifndef RANGES_BROKEN_CPO_LOOKUP +diff --git a/include/range/v3/utility/any.hpp b/include/range/v3/utility/any.hpp +index 5feb2f8cd..7a3807499 100644 +--- a/include/range/v3/utility/any.hpp ++++ b/include/range/v3/utility/any.hpp +@@ -61,25 +61,9 @@ namespace ranges + template + T const * any_cast(any const *) noexcept; + +- struct any ++ namespace _any_ + { +- private: +- template +- friend meta::if_c() || (bool)copyable, T> any_cast(any &); +- +- template +- friend meta::if_c() || (bool)copyable, T> any_cast( +- any const &); +- +- template +- friend meta::if_c() || (bool)copyable, T> any_cast( +- any &&); +- +- template +- friend T * any_cast(any *) noexcept; +- +- template +- friend T const * any_cast(any const *) noexcept; ++ struct _base {}; + + struct interface + { +@@ -117,15 +101,39 @@ namespace ranges + return typeid(T); + } + }; ++ } // namespace _any_ ++ ++ struct any ++ #if RANGES_BROKEN_CPO_LOOKUP ++ : private _any_::_base ++ #endif ++ { ++ private: ++ template ++ friend meta::if_c() || (bool)copyable, T> any_cast(any &); ++ ++ template ++ friend meta::if_c() || (bool)copyable, T> any_cast( ++ any const &); ++ ++ template ++ friend meta::if_c() || (bool)copyable, T> any_cast( ++ any &&); ++ ++ template ++ friend T * any_cast(any *) noexcept; ++ ++ template ++ friend T const * any_cast(any const *) noexcept; + +- std::unique_ptr ptr_; ++ std::unique_ptr<_any_::interface> ptr_; + + public: + any() noexcept = default; + template(typename TRef, typename T = detail::decay_t)( + requires (!same_as) AND copyable) // + any(TRef && t) +- : ptr_(new impl(static_cast(t))) ++ : ptr_(new _any_::impl(static_cast(t))) + {} + any(any &&) noexcept = default; + any(any const & that) +@@ -185,7 +193,7 @@ namespace ranges + { + if(x.type() != typeid(detail::decay_t)) + throw bad_any_cast{}; +- return static_cast> *>(x.ptr_.get())->get(); ++ return static_cast<_any_::impl> *>(x.ptr_.get())->get(); + } + + /// \overload +@@ -194,7 +202,7 @@ namespace ranges + { + if(x.type() != typeid(detail::decay_t)) + throw bad_any_cast{}; +- return static_cast> const *>(x.ptr_.get())->get(); ++ return static_cast<_any_::impl> const *>(x.ptr_.get())->get(); + } + + /// \overload +@@ -203,7 +211,7 @@ namespace ranges + { + if(x.type() != typeid(detail::decay_t)) + throw bad_any_cast{}; +- return static_cast> *>(x.ptr_.get())->get(); ++ return static_cast<_any_::impl> *>(x.ptr_.get())->get(); + } + + /// \overload +@@ -211,7 +219,7 @@ namespace ranges + T * any_cast(any * p) noexcept + { + if(p && p->ptr_) +- if(any::impl * q = dynamic_cast *>(p->ptr_.get())) ++ if(_any_::impl * q = dynamic_cast<_any_::impl *>(p->ptr_.get())) + return &q->get(); + return nullptr; + } +@@ -221,7 +229,7 @@ namespace ranges + T const * any_cast(any const * p) noexcept + { + if(p && p->ptr_) +- if(any::impl const * q = dynamic_cast const *>(p->ptr_.get())) ++ if(_any_::impl const * q = dynamic_cast<_any_::impl const *>(p->ptr_.get())) + return &q->get(); + return nullptr; + } diff --git a/dev-cpp/range-v3/range-v3-0.12.0.ebuild b/dev-cpp/range-v3/range-v3-0.12.0.ebuild new file mode 100644 index 000000000000..e3e0a4cc2eea --- /dev/null +++ b/dev-cpp/range-v3/range-v3-0.12.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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.12.0-fix-any-1.patch" + "${FILESDIR}/0.12.0-fix-any-2.patch" +) + +src_prepare() { + # header-only libraries go to arch-independent dirs + sed -i -e 's@CMAKE_INSTALL_LIBDIR@CMAKE_INSTALL_DATADIR@g' CMakeLists.txt || die + rm include/module.modulemap || die # https://bugs.gentoo.org/755740 + cmake_src_prepare +} + +src_configure() { + local 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 +} -- cgit v1.2.3