gentoo auto-resync : 24:06:2023 - 13:27:08

6 files changed, 79 insertions, 249 deletions

diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 1c107606c082..75acf58c6972 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,13 +1,10 @@
 AUX folly-2022.07.04.00-musl-fix.patch 1150 BLAKE2B 6774badf3856fa94ae69dc4ca3fb3aca628dcf3b96fd7d141967815a9a07c07349f852a35275baba7b91d60e0c61dc3e1639cab4727666fa128d0334f36815a2 SHA512 15029e25b4da1f9cfe227978a54f63c198361df665b4657ef6a80ffdd3911c80be8e6c3799c8c16ff0fcca050932155628651a6e5ed566a41174dced9e51dc58
 AUX folly-2023.05.22.00-musl-fix.patch 895 BLAKE2B 72f3dde91fa7eabdc08c3375e660f31beb833835decc129570667984d973d8a71db37cdef3aaca28375a64e6afbd04df0849fc47798d7982556a84a028e034f4 SHA512 afdaa0edd233f21693b947d30d549ed13a8871bf49e05be97d8d86015452d85769c2e46929f5cce14c3cff8eb7000431638ee0c8fc3f97b0765a4b3aea3b20b9
-DIST folly-v2022.08.29.00.tar.gz 3696645 BLAKE2B c1ff618be8b6a73bf0a1249212cf904ac472711086e54da73dd631ecf002761e30496e8631d6591f51e279b736ae9b3fe50959de6b1f86f01f9d6bc08fe675fc SHA512 1437a1314e26624715a0bb781049e19300eb3a67648287b319c55ce0dfbc867a09bd9d2f0cece6fc75fc62b21899aa94b464ae49c12687be7c94fdf0c7b95790
+AUX folly-2023.06.19.00-fmt.patch 1970 BLAKE2B eb1cff98c8bbd779c6c402c75e6076a89853c79df975a65574ab4ee105d7bd124306d0e200b3f0d082da55be4a6b19bf431b5e3312cfa8bf5790c447998e5bbc SHA512 a0c77475cb0575d1d0e27299f7d47514157af51bda06c41fcc7742250ece11f7c858a43ef701f11951a069dbe311492472508f7055944ecece2c5d9ed3e6fdf1
 DIST folly-v2023.02.06.00.tar.gz 3790845 BLAKE2B b1c0eed7a2dccba3ccb5e25aa24cc0a6d628fbc3134bf0ed82a1e0e614825a3ae620d79a54e2bea398274afcb662bdfca48d7193f69db35f624ed6a2fa9bae99 SHA512 b9cd8132a702e88e4c9fefcce190d9fd403253c9b71dc22316f237922d99f9cd980ab81d50ddb48ae0e614a493b3d61865b03eee46d59805f83fce528f831646
-DIST folly-v2023.04.10.00.tar.gz 3816300 BLAKE2B fe262148583321ee55da9305a9e060e48915598c08edbd0edb884529d0a9547783f2e1a45b0f39e461ea6b92e9c0b74fc7b071ec1ed044b810ac2065c93a5f10 SHA512 4f154127f24e2e57873ed8e135989c214ae3bbaf0302594b3e67de89e04bf4905f45471a488220ecade56b9ae2b928a779b66f7632210a02b1087a4c05141d5a
-DIST folly-v2023.05.01.00.tar.gz 3821115 BLAKE2B 6b2e14dd7b88daa5f81294143f0ad62dc119d7f20f4e4a48859213997cf67df9840a46b7933cd806af166394de1981b0a9f2d9f194e2cb54c73eed8e60c3ed04 SHA512 92bea2e7449a85936a93aef8a216e83f402be41bbd9ab4e90759600bb40e7903e4c8e490cadcf40f098c7a69e187db4d1062645fba8ef15764ba753276ada535
 DIST folly-v2023.05.22.00.tar.gz 3834791 BLAKE2B e981f844b12620b274a78fa6640d1510525c1b4cc3bb35594bd5c5daf238eb19291a1ddf19f29e26269effbe79c22ccc9c002f5f547e06566aa804f0d92a0a9c SHA512 4af93f23a6835efaca317dc7a15abe13619d498efbaa5b349a30682be35c129bd87ab9723c5186e63e3d3b646a80816b994f5237108f8d489a50a028bb16c9da
-EBUILD folly-2022.08.29.00.ebuild 2474 BLAKE2B ba8b143ee679b37e2facd8ac30f6eee6ca8fd2606c5731757f2a2b5d6f6a9ce655d97f97317c907c5452e0e6494e81ee1dee376d97c708cc950b9e1e6090853d SHA512 81b7baddf458a0d394e158671f71f613fc7b760aea065b5ce7ab26856bdae9303462ac770b6dd067bf49f63fc776fdae4a66c9437cd9de009a2e716969e044f1
+DIST folly-v2023.06.19.00.tar.gz 3850872 BLAKE2B 6332b6de28fd4a0c19b20c4b23fa7093bded940fb07de92ad9fa7f44b8347fb5e5543e5a57c32d2414f345b4f7b306eed806c5d48a871a06833c1d2a71a34584 SHA512 9189adddf59019787969c7edb27a3e57436c2dca772f3142cdbf66e3a69b398be7ae4f2c36a9576c7ad9c51fd3703555e2a7ad6ed1ddce4036f8760d8095d371
 EBUILD folly-2023.02.06.00.ebuild 2690 BLAKE2B 589a40f4a2fe368b18be4ea70797cf6eea3b6727b4efad54d355db9d67502cd939198d11f13d5c513c4e228d9ea3b39bd5671cd823af1dd5a0c2827c791eb4f2 SHA512 efa4c04142de56766c4e6beb227b00839e1f6bc3e8df6b4f27ff487521f0676e7164775f7a6e77c93a6ed14fe23009abcd525557e2a4bb29fa135373a2ab2fa3
-EBUILD folly-2023.04.10.00.ebuild 2822 BLAKE2B fa3df4771db2609c819bc25f63999bd46162b65887aacb713ec4d009ba8b93c332fa1c5d0138e57d8a7bbee302c383fa2f0f32784a59afabdfc0660d7a2328ea SHA512 d82f58b20eecc0420fba647575d2822f0e13ec5b33cf8a72db5a459ad8e7131f4255136229331c21338015109eb99000d4711b6fc145b6309d16db719167ca65
-EBUILD folly-2023.05.01.00.ebuild 2822 BLAKE2B fa3df4771db2609c819bc25f63999bd46162b65887aacb713ec4d009ba8b93c332fa1c5d0138e57d8a7bbee302c383fa2f0f32784a59afabdfc0660d7a2328ea SHA512 d82f58b20eecc0420fba647575d2822f0e13ec5b33cf8a72db5a459ad8e7131f4255136229331c21338015109eb99000d4711b6fc145b6309d16db719167ca65
-EBUILD folly-2023.05.22.00.ebuild 2159 BLAKE2B 3d0e07df3f6bd8f6ed0fdfe9c4eb03eed6fa13081491b5e01427d356ca3e9d84a6a764272185820da275f9386d254ee44b60bdb00c1ffcc83c3f8ee339b5f19c SHA512 9ef6005423f1c9d2e847e479c487518aa16be92c64009af52648d2a657620744eb79a1024f42a0699a8e7b190fa7ca077b0a86bd3f0f866edd99bd28a5f63bbd
+EBUILD folly-2023.05.22.00.ebuild 2142 BLAKE2B c82d207d11f0124fd1003d5e9c019ccba809931b20c18a468b02fb522e3bf1c2b7eab120815cddd5fbe4f8ce7a11e7f5f1c1851564f77f2eea14afd130a29a69 SHA512 803355781f6e29d6f9f2c78197f45d2bfadab7c316a1ef07bb1521db0b6b140635c66806fcc9d76f82f24a61c51aca12ba03e6ae1b07df2d5b361045bdbffd10
+EBUILD folly-2023.06.19.00.ebuild 2188 BLAKE2B 3ba8a40c38052a22dd1aef2dfbdd8fcaa1c1586bfa5af188a09b4a7bc214e1927ede3b4ad2955a104d70fd32787bdce0739f379b22988a13156dba8529cba257 SHA512 0fa5d3f4629f90ede7fbd37f6cb4c024df6ef0409d1271800d715d8c63d109e88d5b4daa0e3b98b6ed6723407f3bb0c6aa819735376897685caddf12a8cd3771
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/files/folly-2023.06.19.00-fmt.patch b/dev-cpp/folly/files/folly-2023.06.19.00-fmt.patch
new file mode 100644
index 000000000000..80e4a2fbf80a
--- /dev/null
+++ b/dev-cpp/folly/files/folly-2023.06.19.00-fmt.patch
@@ -0,0 +1,62 @@
+https://github.com/facebook/folly/commit/a65b35c03797c86969a7b0d9ec281935a21cfa18
+https://github.com/facebook/folly/pull/2022
+
+From a65b35c03797c86969a7b0d9ec281935a21cfa18 Mon Sep 17 00:00:00 2001
+From: Giuseppe Ottaviano <ott@meta.com>
+Date: Sun, 18 Jun 2023 00:40:43 -0700
+Subject: [PATCH] fmt/core.h is enough in Core.cpp
+
+Reviewed By: Orvid, luciang
+
+Differential Revision: D46788525
+
+fbshipit-source-id: 03da65f3499ca56b34baa4e75b2340bea36690f6
+---
+ folly/futures/detail/Core.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/folly/futures/detail/Core.cpp b/folly/futures/detail/Core.cpp
+index 26bd4afbffe..858229100f9 100644
+--- a/folly/futures/detail/Core.cpp
++++ b/folly/futures/detail/Core.cpp
+@@ -18,7 +18,7 @@
+ 
+ #include <new>
+ 
+-#include <fmt/format.h>
++#include <fmt/core.h>
+ #include <folly/lang/Assume.h>
+ 
+ namespace folly {
+
+From d783a64391c02b40d78dfc6be04932fa45c46b9a Mon Sep 17 00:00:00 2001
+From: Marcus Holland-Moritz <github@mhxnet.de>
+Date: Tue, 20 Jun 2023 11:59:42 +0200
+Subject: [PATCH] Fix libfmt errors from not finding enum formatter
+
+Recent versions of libfmt have become more strict and require
+`enum` types to be formattable:
+
+  static assertion failed due to requirement 'formattable': Cannot format an argument. To make type T formattable provide a formatter<T> specialization: https://fmt.dev/latest/api.html#udt
+
+This is a quick fix to simply use the underlying type.
+--- a/folly/futures/detail/Core.cpp
++++ b/folly/futures/detail/Core.cpp
+@@ -19,6 +19,7 @@
+ #include <new>
+ 
+ #include <fmt/core.h>
++#include <folly/Utility.h>
+ #include <folly/lang/Assume.h>
+ 
+ namespace folly {
+@@ -30,7 +31,7 @@ namespace {
+ template <class Enum>
+ void terminate_unexpected_state(fmt::string_view context, Enum state) {
+   terminate_with<std::logic_error>(
+-      fmt::format("{} unexpected state: {}", context, state));
++      fmt::format("{} unexpected state: {}", context, to_underlying(state)));
+ }
+ 
+ } // namespace
+
diff --git a/dev-cpp/folly/folly-2022.08.29.00.ebuild b/dev-cpp/folly/folly-2022.08.29.00.ebuild
deleted file mode 100644
index 6b0a91913e9c..000000000000
--- a/dev-cpp/folly/folly-2022.08.29.00.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# These must be bumped together:
-# dev-cpp/edencommon
-# dev-cpp/folly
-# dev-util/watchman
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="An open-source C++ library developed and used at Facebook"
-HOMEPAGE="https://github.com/facebook/folly"
-SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-IUSE="llvm-libunwind test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/bzip2
-	app-arch/lz4:=
-	app-arch/snappy:=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-cpp/gflags:=
-	dev-cpp/glog:=[gflags]
-	dev-libs/boost:=[context]
-	dev-libs/double-conversion:=
-	dev-libs/libaio
-	dev-libs/libevent:=
-	dev-libs/libfmt:=
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	>=sys-libs/liburing-2.2:=
-	sys-libs/zlib
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	!llvm-libunwind? ( sys-libs/libunwind:= )"
-# libiberty is linked statically
-DEPEND="${RDEPEND}
-	sys-libs/binutils-libs
-	test? ( dev-cpp/gtest )"
-BDEPEND="test? ( sys-devel/clang )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch
-)
-
-pkg_setup() {
-	[[ ${BUILD_TYPE} == binary ]] && return
-
-	if use test && ! tc-is-clang ; then
-		# Always build w/ Clang for now to avoid gcc ICE
-		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106230
-		#if [[ $(gcc-major-version) -eq 12 ]] ; then
-		#	return
-		#fi
-
-		## Only older GCC 11 is broken
-		#if [[ $(gcc-major-version) -eq 11 && $(gcc-minor-version) -ge 3 && $(gcc-micro-version) -ge 1 ]] ; then
-		#	return
-		#fi
-
-		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
-		#ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
-
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	fi
-}
-
-src_configure() {
-	# Fragile when changing compilers
-	export CCACHE_DISABLE=1
-
-	# TODO: liburing could in theory be optional but fails to link
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# - timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest
-		# Long-standing known test failure
-		# TODO: report upstream
-		# - HHWheelTimerTest.HHWheelTimerTest.CancelTimeout
-		# Timeouts are fragile
-		-E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout)"
-	)
-
-	cmake_src_test
-}
diff --git a/dev-cpp/folly/folly-2023.05.01.00.ebuild b/dev-cpp/folly/folly-2023.05.01.00.ebuild
deleted file mode 100644
index 77a442688377..000000000000
--- a/dev-cpp/folly/folly-2023.05.01.00.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# These must be bumped together:
-# dev-cpp/edencommon
-# dev-cpp/folly
-# dev-util/watchman
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="An open-source C++ library developed and used at Facebook"
-HOMEPAGE="https://github.com/facebook/folly"
-SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="llvm-libunwind test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/bzip2
-	app-arch/lz4:=
-	app-arch/snappy:=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-cpp/gflags:=
-	dev-cpp/glog:=[gflags]
-	dev-libs/boost:=[context]
-	dev-libs/double-conversion:=
-	dev-libs/libaio
-	dev-libs/libevent:=
-	dev-libs/libfmt:=
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	>=sys-libs/liburing-2.3:=
-	sys-libs/zlib
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	!llvm-libunwind? ( sys-libs/libunwind:= )"
-# libiberty is linked statically
-DEPEND="${RDEPEND}
-	sys-libs/binutils-libs
-	test? ( dev-cpp/gtest )"
-BDEPEND="test? ( sys-devel/clang )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch
-)
-
-pkg_setup() {
-	[[ ${BUILD_TYPE} == binary ]] && return
-
-	if use test && ! tc-is-clang ; then
-		# Always build w/ Clang for now to avoid gcc ICE
-		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106230
-		#if [[ $(gcc-major-version) -eq 12 ]] ; then
-		#	return
-		#fi
-
-		## Only older GCC 11 is broken
-		#if [[ $(gcc-major-version) -eq 11 && $(gcc-minor-version) -ge 3 && $(gcc-micro-version) -ge 1 ]] ; then
-		#	return
-		#fi
-
-		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
-		#ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
-
-		#export CC=${CHOST}-clang
-		#export CXX=${CHOST}-clang++
-	fi
-}
-
-src_unpack() {
-	# Workaround for bug #889420
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	default
-}
-
-src_configure() {
-	# TODO: liburing could in theory be optional but fails to link
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-
-		-DBUILD_TESTS=$(usex test)
-
-		# https://github.com/gentoo/gentoo/pull/29393
-		-DCMAKE_LIBRARY_ARCHITECTURE=$(usex amd64 x86_64 ${ARCH})
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# - timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest
-		# Long-standing known test failure
-		# TODO: report upstream
-		# - HHWheelTimerTest.HHWheelTimerTest.CancelTimeout
-		# Timeouts are fragile
-		# - concurrent_hash_map_test.*
-		# TODO: All SIGSEGV, report upstream!
-		# - ssl_errors_test.SSLErrorsTest.TestMessage
-		# Network...?
-		-E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout|concurrent_hash_map_test.*|ssl_errors_test.SSLErrorsTest.TestMessage)"
-	)
-
-	cmake_src_test
-}
diff --git a/dev-cpp/folly/folly-2023.05.22.00.ebuild b/dev-cpp/folly/folly-2023.05.22.00.ebuild
index 08296dbb6784..11d6692f182c 100644
--- a/dev-cpp/folly/folly-2023.05.22.00.ebuild
+++ b/dev-cpp/folly/folly-2023.05.22.00.ebuild
@@ -8,7 +8,7 @@ EAPI=8
 # dev-cpp/folly
 # dev-util/watchman
 
-inherit cmake toolchain-funcs
+inherit cmake
 
 DESCRIPTION="An open-source C++ library developed and used at Facebook"
 HOMEPAGE="https://github.com/facebook/folly"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/folly/folly-2023.04.10.00.ebuild b/dev-cpp/folly/folly-2023.06.19.00.ebuild
index 77a442688377..48db76046492 100644
--- a/dev-cpp/folly/folly-2023.04.10.00.ebuild
+++ b/dev-cpp/folly/folly-2023.06.19.00.ebuild
@@ -8,7 +8,7 @@ EAPI=8
 # dev-cpp/folly
 # dev-util/watchman
 
-inherit cmake toolchain-funcs
+inherit cmake
 
 DESCRIPTION="An open-source C++ library developed and used at Facebook"
 HOMEPAGE="https://github.com/facebook/folly"
@@ -20,7 +20,8 @@ KEYWORDS="~amd64 ~ppc64"
 IUSE="llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="app-arch/bzip2
+RDEPEND="
+	app-arch/bzip2
 	app-arch/lz4:=
 	app-arch/snappy:=
 	app-arch/xz-utils
@@ -37,40 +38,20 @@ RDEPEND="app-arch/bzip2
 	>=sys-libs/liburing-2.3:=
 	sys-libs/zlib
 	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	!llvm-libunwind? ( sys-libs/libunwind:= )"
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+"
 # libiberty is linked statically
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	sys-libs/binutils-libs
-	test? ( dev-cpp/gtest )"
-BDEPEND="test? ( sys-devel/clang )"
+	test? ( dev-cpp/gtest )
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch
+	"${FILESDIR}"/${PN}-2023.05.22.00-musl-fix.patch
+	"${FILESDIR}"/${PN}-2023.06.19.00-fmt.patch
 )
 
-pkg_setup() {
-	[[ ${BUILD_TYPE} == binary ]] && return
-
-	if use test && ! tc-is-clang ; then
-		# Always build w/ Clang for now to avoid gcc ICE
-		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106230
-		#if [[ $(gcc-major-version) -eq 12 ]] ; then
-		#	return
-		#fi
-
-		## Only older GCC 11 is broken
-		#if [[ $(gcc-major-version) -eq 11 && $(gcc-minor-version) -ge 3 && $(gcc-micro-version) -ge 1 ]] ; then
-		#	return
-		#fi
-
-		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
-		#ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
-
-		#export CC=${CHOST}-clang
-		#export CXX=${CHOST}-clang++
-	fi
-}
-
 src_unpack() {
 	# Workaround for bug #889420
 	mkdir -p "${S}" || die