From b4b3eb72060f8fbaff6cca73d98564b57ec5e2fd Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:07:47 +0100 Subject: [PATCH 1/9] net-libs/libiscsi: Keyword 1.19.0_p20230208 hppa, #906062 Signed-off-by: Sam James --- net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild index b1a76b05442c9..330f3db3d2740 100644 --- a/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild +++ b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" fi - KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi DESCRIPTION="iscsi client library and utilities" From 65bf87ef524abd5583756a0886fd4b3432a57aa6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:07:48 +0100 Subject: [PATCH 2/9] sys-block/tgt: Keyword 1.0.86 hppa, #906062 Signed-off-by: Sam James --- sys-block/tgt/tgt-1.0.86.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-block/tgt/tgt-1.0.86.ebuild b/sys-block/tgt/tgt-1.0.86.ebuild index 2fa39d5d78450..651a231dc8e22 100644 --- a/sys-block/tgt/tgt-1.0.86.ebuild +++ b/sys-block/tgt/tgt-1.0.86.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc ppc64 x86" +KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 x86" IUSE="fcoe fcp ibmvio infiniband rbd" DEPEND=" From e69c2042c2fcefdbd44d2e96b88c6d823738313a Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:07:49 +0100 Subject: [PATCH 3/9] dev-perl/Config-General: Keyword 2.630.0-r1 hppa, #906062 Signed-off-by: Sam James --- dev-perl/Config-General/Config-General-2.630.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild b/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild index b0be4b9823387..8d85340823903 100644 --- a/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild +++ b/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Config file parser module" LICENSE="Artistic" SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" virtual/perl-File-Spec From 125efc5867d3ef0ab79ac07b606d24047ddf94ab Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:07:50 +0100 Subject: [PATCH 4/9] net-libs/libiscsi: Keyword 1.19.0_p20230208 sparc, #906062 Signed-off-by: Sam James --- net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild index 330f3db3d2740..83769dc114083 100644 --- a/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild +++ b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" fi - KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="iscsi client library and utilities" From dd7ba39c83020bd2f6be7d6ec77e43d8a1f9ec4e Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:07:51 +0100 Subject: [PATCH 5/9] sys-block/tgt: Keyword 1.0.86 sparc, #906062 Signed-off-by: Sam James --- sys-block/tgt/tgt-1.0.86.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-block/tgt/tgt-1.0.86.ebuild b/sys-block/tgt/tgt-1.0.86.ebuild index 651a231dc8e22..8041cfba1d0ff 100644 --- a/sys-block/tgt/tgt-1.0.86.ebuild +++ b/sys-block/tgt/tgt-1.0.86.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 x86" +KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 ~sparc x86" IUSE="fcoe fcp ibmvio infiniband rbd" DEPEND=" From 8a7d3c853243db18938de017802276c527c1ed30 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:07:52 +0100 Subject: [PATCH 6/9] dev-perl/Config-General: Keyword 2.630.0-r1 sparc, #906062 Signed-off-by: Sam James --- dev-perl/Config-General/Config-General-2.630.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild b/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild index 8d85340823903..3019a4cc67718 100644 --- a/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild +++ b/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Config file parser module" LICENSE="Artistic" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" virtual/perl-File-Spec From 5a7f6e70a391191a79c64e0eb95b5c806d7dbb26 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:08:49 +0100 Subject: [PATCH 7/9] profiles: mask =dev-libs/libfmt-10.0.0 Bug: https://bugs.gentoo.org/906077 Bug: https://bugs.gentoo.org/906068 Bug: https://bugs.gentoo.org/906071 Bug: https://bugs.gentoo.org/906074 Bug: https://bugs.gentoo.org/906075 Bug: https://bugs.gentoo.org/906076 Bug: https://bugs.gentoo.org/906069 Signed-off-by: Sam James --- profiles/package.mask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index a9f214ed299e7..416258883eb9a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,11 @@ #--- END OF EXAMPLES --- +# Sam James (2023-05-10) +# Lots of package breakage as usual for new versions. Masked until most/all +# reverse dependencies are fixed. Tracker bug is bug #906077. +=dev-libs/libfmt-10* + # Matt Turner (2023-05-08) # Package is unmaintained and appears quite dead. Last release in 2020. Broken # with stable glib-2.76. Depends on app-text/enchant:0. From 71f385b11af6bcbf09f59a970c531771650d9c2f Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:09:17 +0100 Subject: [PATCH 8/9] Revert "dev-libs/spdlog: add patch metadata" This reverts commit f6ca1358c59588198f05aa99b61fdac26dfad42b. Bug: https://bugs.gentoo.org/906069 Bug: https://bugs.gentoo.org/906071 Signed-off-by: Sam James --- dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch index 03ef4e5910484..185fb12fb7272 100644 --- a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch +++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch @@ -3,18 +3,8 @@ Upstream: https://github.com/gabime/spdlog/pull/2694 Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0 -https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05 - -From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001 -From: H1X4 <10332146+H1X4Dev@users.noreply.github.com> -Date: Fri, 31 Mar 2023 20:39:32 +0300 -Subject: [PATCH] fix build for master fmt (non-bundled) (#2694) - -* fix build for master fmt (non-bundled) - -* update fmt_runtime_string macro - -* fix build of updated macro +diff --git a/include/spdlog/common.h b/include/spdlog/common.h +index e69201a81..5f671c5c6 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -173,12 +173,19 @@ using format_string_t = fmt::format_string; From c75626a840b049c50a500b3d29a54986ea2372da Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 May 2023 17:09:19 +0100 Subject: [PATCH 9/9] Revert "dev-libs/spdlog: fix fails compile with libfmt-10.0.0" This reverts commit 03d7b984817fbf07c4d830f30e34ae20a79af7b4. Bug: https://bugs.gentoo.org/906069 Bug: https://bugs.gentoo.org/906071 Signed-off-by: Sam James --- .../spdlog/files/spdlog-libfmt-10.0.0.patch | 30 ------------------- dev-libs/spdlog/spdlog-1.11.0.ebuild | 1 - 2 files changed, 31 deletions(-) delete mode 100644 dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch deleted file mode 100644 index 185fb12fb7272..0000000000000 --- a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -Bug: https://bugs.gentoo.org/906069 -Upstream: https://github.com/gabime/spdlog/pull/2694 - -Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0 - -diff --git a/include/spdlog/common.h b/include/spdlog/common.h -index e69201a81..5f671c5c6 100644 ---- a/include/spdlog/common.h -+++ b/include/spdlog/common.h -@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string; - template - using remove_cvref_t = typename std::remove_cv::type>::type; - -+template -+#if FMT_VERSION >= 90101 -+using fmt_runtime_string = fmt::runtime_format_string; -+#else -+using fmt_runtime_string = fmt::basic_runtime; -+#endif -+ - // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, - // in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view - template - struct is_convertible_to_basic_format_string - : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> -+ std::is_convertible>::value || std::is_same, fmt_runtime_string>::value> - {}; - - # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) diff --git a/dev-libs/spdlog/spdlog-1.11.0.ebuild b/dev-libs/spdlog/spdlog-1.11.0.ebuild index 6759c44b79f8d..ebda7ae2f4a2a 100644 --- a/dev-libs/spdlog/spdlog-1.11.0.ebuild +++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild @@ -31,7 +31,6 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" - "${FILESDIR}/${PN}-libfmt-10.0.0.patch" ) src_prepare() {