commit: c646eeae7102523726223758c9e0c0887e44e73a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jun 16 19:00:06 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 8 19:29:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c646eeae
dev-libs/libfmt: drop 8.1.1-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/libfmt/Manifest | 1 - .../files/libfmt-8.1.1-fix-static-assert.patch | 76 ---------------------- dev-libs/libfmt/libfmt-8.1.1-r1.ebuild | 39 ----------- 3 files changed, 116 deletions(-) diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest index 7e52b0cab9d1..c89d89fef4de 100644 --- a/dev-libs/libfmt/Manifest +++ b/dev-libs/libfmt/Manifest @@ -1,5 +1,4 @@ DIST libfmt-10.0.0.tar.gz 851582 BLAKE2B 4e778fd352ed084b9790b59b4875fc6ed04b7a58a40b3673854dd00763f492cc838970e8faef77b5f9db5e912a2fc77943aedb4ca4afb64a3736129cc4611809 SHA512 6188508d74ca1ed75bf6441b152c07ca83971d3104b37f33784a7b55dfcc614d6243e77e0a14220018586fdb86207cc033eece834e7acd5e0907ed4c97403f3b DIST libfmt-10.1.0.tar.gz 849294 BLAKE2B 9e90bdb91ac9f34bf75bcb0c0f45a90ce9d5c27c0a47c2e5c2d09972ab03e6da32e29ddd33761b8347eaa0db0ec79af4f8aac93d3f38c9d9f29b49bb24779467 SHA512 69a7b8584f828528e3bb4b87153449e96df29bd740adcd42a2e3d50ae4a270c80a5eb2c3057337048be5b978094d8bb73bec3378e3b6370748de2b063dd0aa4b DIST libfmt-10.1.1.tar.gz 851454 BLAKE2B 8b1237e6de72e81ebf2ad8d3c321b6ae9352bfeeb817d2e7f4541a722cd7ecc9212a2b83276fa0aa901473e1b90a15f487feefb3ea03acdcabdfe6b6f22997a1 SHA512 288c349baac5f96f527d5b1bed0fa5f031aa509b4526560c684281388e91909a280c3262a2474d963b5d1bf7064b1c9930c6677fe54a0d8f86982d063296a54c -DIST libfmt-8.1.1.tar.gz 826254 BLAKE2B 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9 SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be diff --git a/dev-libs/libfmt/files/libfmt-8.1.1-fix-static-assert.patch b/dev-libs/libfmt/files/libfmt-8.1.1-fix-static-assert.patch deleted file mode 100644 index 9f29d7fb111c..000000000000 --- a/dev-libs/libfmt/files/libfmt-8.1.1-fix-static-assert.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://github.com/fmtlib/fmt/commit/8f8a1a02d5c5cb967d240feee3ffac00d66f22a2.patch -https://github.com/facebook/folly/issues/1705 - -From 8f8a1a02d5c5cb967d240feee3ffac00d66f22a2 Mon Sep 17 00:00:00 2001 -From: Victor Zverovich <v...@fb.com> -Date: Fri, 14 Jan 2022 13:08:14 -0800 -Subject: [PATCH] Fix handling of formattable types implicitly convertible to - pointers - ---- - include/fmt/core.h | 5 +++-- - test/core-test.cc | 21 ++++++++++++++++++++- - 2 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/include/fmt/core.h b/include/fmt/core.h -index f2d21e5c5a..12571ce0da 100644 ---- a/include/fmt/core.h -+++ b/include/fmt/core.h -@@ -1398,10 +1398,11 @@ template <typename Context> struct arg_mapper { - template < - typename T, - FMT_ENABLE_IF( -- std::is_member_pointer<T>::value || -+ std::is_pointer<T>::value || std::is_member_pointer<T>::value || - std::is_function<typename std::remove_pointer<T>::type>::value || - (std::is_convertible<const T&, const void*>::value && -- !std::is_convertible<const T&, const char_type*>::value))> -+ !std::is_convertible<const T&, const char_type*>::value && -+ !has_formatter<T, Context>::value))> - FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer { - return {}; - } -diff --git a/test/core-test.cc b/test/core-test.cc -index b2f2097ea1..c9eea8ffd8 100644 ---- a/test/core-test.cc -+++ b/test/core-test.cc -@@ -737,6 +737,24 @@ struct convertible_to_pointer { - operator const int*() const { return nullptr; } - }; - -+struct convertible_to_pointer_formattable { -+ operator const int*() const { return nullptr; } -+}; -+ -+FMT_BEGIN_NAMESPACE -+template <> struct formatter<convertible_to_pointer_formattable> { -+ auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) { -+ return ctx.begin(); -+ } -+ -+ auto format(convertible_to_pointer_formattable, format_context& ctx) const -+ -> decltype(ctx.out()) { -+ auto test = string_view("test"); -+ return std::copy_n(test.data(), test.size(), ctx.out()); -+ } -+}; -+FMT_END_NAMESPACE -+ - enum class test_scoped_enum {}; - - TEST(core_test, is_formattable) { -@@ -770,11 +788,12 @@ TEST(core_test, is_formattable) { - #endif - - static_assert(!fmt::is_formattable<convertible_to_pointer>::value, ""); -+ const auto f = convertible_to_pointer_formattable(); -+ EXPECT_EQ(fmt::format("{}", f), "test"); - - static_assert(!fmt::is_formattable<void (*)()>::value, ""); - - struct s; -- - static_assert(!fmt::is_formattable<int(s::*)>::value, ""); - static_assert(!fmt::is_formattable<int (s::*)()>::value, ""); - static_assert(!fmt::is_formattable<test_scoped_enum>::value, ""); - diff --git a/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild b/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild deleted file mode 100644 index b621d9247a58..000000000000 --- a/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib - -DESCRIPTION="Small, safe and fast formatting library" -HOMEPAGE="https://github.com/fmtlib/fmt"; - -LICENSE="MIT" -IUSE="test" -SLOT="0/${PV}" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"; - inherit git-r3 -else - SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" - S="${WORKDIR}/fmt-${PV}" -fi - -DEPEND="" -RDEPEND="" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-fix-static-assert.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" - -DFMT_LIB_DIR="$(get_libdir)" - -DFMT_TEST=$(usex test) - ) - cmake_src_configure -}
