gentoo resync : 25.08.2020

5 files changed, 5 insertions, 94 deletions

diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index b5be62eb0d5b..9e89eb9ca838 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,9 +1,6 @@
-AUX libfmt-6.2.0-unsigned-char-strings-in-printf.patch 1478 BLAKE2B e5ffa271437d944d634c9296e5fd2c23e7de05e68e1e65acd660e2389378f0adfda0cc491bfadb5c6bd22166a4888f5d06d57300a71f4aad13b76dc277ba6e44 SHA512 2a8c25cff102236ccad7809a943f3bde823f2bd20277994aaf5325b4af1c9a35f3c4437703fcdbd728598a0d4a83988919b5b0706570ce85d90dc13f617260a2
 DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
-DIST libfmt-6.2.0.tar.gz 733403 BLAKE2B c7ff69a56b90ec8df7d1af5c9934592449f2052046192aa498a6440d2aab76f10c17fa2833a41475b777dca2e3a1ae671021530bf0ef8be12443541f0f5212b3 SHA512 0003543f437bae416600a2b982eb133f65588bd36d7506fa7d883ae3133fcaf7ad825904af9b588ea22e5d91e56560aaf4243a6afa11ff6d8aace2e4bb1b0cee
-DIST libfmt-6.2.1.tar.gz 733646 BLAKE2B 74394efc67065bf7a2259f5c16521b1cc4fb08bd599fe99be86b97b712c60d8790f39d65257ab18fe95bcde3d115d97e91c41d23309596f279cf51ebd4d2957d SHA512 520ef3addfecd9796253c347e0ecf4c18ef2f86d3b1b6b714f7834741f4737f1b7ed8365d3be46c9186617898911b23680cad2ae3cb7aadaf641ab32e327b0dc
+DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d34d5747d9f8b95664aaa499661500b630d1f621698a7a3f8431326ac5a5273e6883d070aab7cb9aa84b0bcd41 SHA512 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a
 EBUILD libfmt-6.1.2.ebuild 779 BLAKE2B 2683bb7f04d4d9280df07b28d745afa01f734bc3fd8d1d52def8b37e1188dd54fe381dc846b877e5978374fad89c0db31d06bac1bac37b533b76403c085fd87f SHA512 abb2693b00595db88f3906bb782213b53b9655de994832eb4a189f89f301506113bf9743eb9b64fd7f835f0707866bc170a20ad52ddb8c08248799d5fe19e797
-EBUILD libfmt-6.2.0-r1.ebuild 843 BLAKE2B bb2d750324db52df30d3f21c3141ae9d871527871d37a4ce26f7bf6364ad5152f59e100f4fc880ad588aa81cfd141378365a5537c619037f19b22a51317b7cba SHA512 d1cfbd8023705dc6e8456ea7c2412b3885ff0434803ceb1665477fff9b1c44d565bc4cc024036a9cf4be4801e5ab10db5b7fdfe182373e97f8b8b2847e58af44
-EBUILD libfmt-6.2.1.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
-EBUILD libfmt-9999.ebuild 772 BLAKE2B 53eaf21c8e01d31c44adc443812fa21ca3e48db4914131ce3a56e52cfa04bedc44e44fc1a7bdf11865336bbb0fee4d364b6521d60945aa5b87c153c5e8019b14 SHA512 0dfb8292beaa1a0f9cc942b303fe5bbfe391d6f6b59cd2399ba5c47d6549eb2077101af54f034a2bfcdcd99c39aad4b5fd3acc545e8a4a2b873fe0f598ebd755
+EBUILD libfmt-7.0.3.ebuild 780 BLAKE2B 3bcc14f9290cdb163611bf2e53d6d96e978585524b15f4dce7af430cf56337bf0c204069071c422551aecf0b0ca76626e90838caffe3aa02ddbc24e49610bffa SHA512 95917a9ab5ca32dc955a8483bed7d1bee84aaad68c1e990f7a4e4927aa1928df477e6e9696046607563019ffdad856845760996ad549173adf0d0eb72fa8f2bb
+EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch b/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch
deleted file mode 100644
index 2ce27c83e622..000000000000
--- a/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7d01859ef16e6b65bc023ad8bebfedecb088bf81 Mon Sep 17 00:00:00 2001
-From: Victor Zverovich <viz@fb.com>
-Date: Wed, 8 Apr 2020 12:32:34 -0700
-Subject: [PATCH] Fix handling of unsigned char strings in printf
-
----
- include/fmt/core.h  | 8 ++++++++
- test/printf-test.cc | 6 ++++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/include/fmt/core.h b/include/fmt/core.h
-index 6df2875ac..dc10722bf 100644
---- a/include/fmt/core.h
-+++ b/include/fmt/core.h
-@@ -972,6 +972,14 @@ template <typename Context> struct arg_mapper {
-     static_assert(std::is_same<char_type, char>::value, "invalid string type");
-     return reinterpret_cast<const char*>(val);
-   }
-+  FMT_CONSTEXPR const char* map(signed char* val) {
-+    const auto* const_val = val;
-+    return map(const_val);
-+  }
-+  FMT_CONSTEXPR const char* map(unsigned char* val) {
-+    const auto* const_val = val;
-+    return map(const_val);
-+  }
- 
-   FMT_CONSTEXPR const void* map(void* val) { return val; }
-   FMT_CONSTEXPR const void* map(const void* val) { return val; }
-diff --git a/test/printf-test.cc b/test/printf-test.cc
-index 5aaa27b13..545e02aab 100644
---- a/test/printf-test.cc
-+++ b/test/printf-test.cc
-@@ -447,6 +447,12 @@ TEST(PrintfTest, String) {
-   EXPECT_PRINTF(L"    (null)", L"%10s", null_wstr);
- }
- 
-+TEST(PrintfTest, UCharString) {
-+  unsigned char str[] = "test";
-+  unsigned char* pstr = str;
-+  EXPECT_EQ("test", fmt::sprintf("%s", pstr));
-+}
-+
- TEST(PrintfTest, Pointer) {
-   int n;
-   void* p = &n;
diff --git a/dev-libs/libfmt/libfmt-6.2.0-r1.ebuild b/dev-libs/libfmt/libfmt-6.2.0-r1.ebuild
deleted file mode 100644
index f5dcf196261c..000000000000
--- a/dev-libs/libfmt/libfmt-6.2.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/$(ver_cut 1)"
-
-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 ~ppc ~ppc64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-unsigned-char-strings-in-printf.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
-}
diff --git a/dev-libs/libfmt/libfmt-6.2.1.ebuild b/dev-libs/libfmt/libfmt-7.0.3.ebuild
index 376757b05ade..28a20d754457 100644
--- a/dev-libs/libfmt/libfmt-6.2.1.ebuild
+++ b/dev-libs/libfmt/libfmt-7.0.3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index 78c2d74959bb..376757b05ade 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi