5 files changed, 147 insertions, 0 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 1e06e027f74b..91753af71266 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/edencommon/Manifest b/dev-cpp/edencommon/Manifest
index 995d29158934..0c6d8153b196 100644
--- a/dev-cpp/edencommon/Manifest
+++ b/dev-cpp/edencommon/Manifest
@@ -1,7 +1,9 @@
 DIST edencommon-2022.08.29.00.gh.tar.gz 143430 BLAKE2B a66bae35413097140b24c9313b12d55d52cbd98396ff1afacc751eb9752d4116ab19aeb9320dead5500189d74b4d91fdc09d9648fc6b5fbb55a706328488e7ef SHA512 6622c5de2dbff96717a345c82aaf9335745ed57262bb55c7a6704a68259ce81376ff0a2e9f3818ed1c1f08434da704f31fd4e3d8c48dd13646f0202e7564b2c7
 DIST edencommon-2022.09.12.00.gh.tar.gz 143483 BLAKE2B 414060f4d43e16e92f654a0d5d74fede2621bf7f39b880588e3c172dca6cffc59c88de15ece3ce42e1860c351bdef16b1f4daa6ba4fa203aef91d714e43b63ea SHA512 3c6da5425228ada48510208978facfd9fd233e607be076f05c3f431a473098329b23a81609ac8c4766ecf16d8e887aa8667d76c4e48219f0ab61074dbe207333
 DIST edencommon-2023.01.16.00.gh.tar.gz 144525 BLAKE2B 5c30a7bcc2fec9fc18461bb1b71090bd6e6fe6a5dfba587dcd649cc0de1cd9fcd96f83d8f2651f37af7ae1066f73d1671ab3dea464c19bf7c1dc4aa75209655a SHA512 103a3b4a8f2a510fd5e31fd8ce3e0974290b409f2ea9ff6ab655f85833d3fda49c9f552a846ba52d6e6db2198cb8cdda64e148ba3fe4e48f692378f87ee080e7
+DIST edencommon-2023.02.06.00.gh.tar.gz 144809 BLAKE2B bfde04282eff3ad745ed02708ba550e81c3d7916c634f01bc3fa9f2232953b4ccc8f319378636add4122cdf4c944212d7ecb649072c82f44dd8751640bc8f260 SHA512 c5763aa6a035febc6ce2a8b32c7ffb576b0a73448cf44e4a3788d87c45507a429065a02c37bce2165b2b51b3139cef51dc5ecd6cce203093f9043387b8912b15
 EBUILD edencommon-2022.08.29.00.ebuild 869 BLAKE2B 55f75751770a07d0201ff07640ebda0fd724541acdd174976577e16dabf95582f346491fa713ac7d2af12d465884ef69dd3e44799b6f772847dbf8942def247a SHA512 775e7af49b381efb4062c02cc407b6dbbbada6ba5428e7cf96f6264a2240876fef841099320d5335c445ac0e3cd3f06056c23e1ca94f2c066efea5cb8a7cc472
 EBUILD edencommon-2022.09.12.00.ebuild 870 BLAKE2B eecf489c6f86f054bdce8dd0803f91cde8617cb50a19342935fecb183fa1c44e1c20a36bac6e89e19439fcf7f221235dc9631076151fb8aa868ff19405b397b6 SHA512 79b70462f52ce627ca03fcf2fa6ac462acb6f4c2927c531b56fb3514fdee02374735a52793df8160aa0967f99292d91f4a3dd32bc99515fd0f3aeb9e2bfc238c
 EBUILD edencommon-2023.01.16.00.ebuild 875 BLAKE2B 9923ebe3369d37693f295570084ea079de3116099b9ed507ccda4279da5e64fcecaddaa2b3e5d710eb9d066e62a96e3308f2da3dfaaa42f7b1f0e9df73cc0d93 SHA512 e9e9cb9c0ec650a3599ade17a854faf679f67c2277beaafacd1f38f9db97bc032bb74b502acf87b32e2c81fb13f60a79036e28682d976250c9c309eb136cacbd
+EBUILD edencommon-2023.02.06.00.ebuild 875 BLAKE2B 9923ebe3369d37693f295570084ea079de3116099b9ed507ccda4279da5e64fcecaddaa2b3e5d710eb9d066e62a96e3308f2da3dfaaa42f7b1f0e9df73cc0d93 SHA512 e9e9cb9c0ec650a3599ade17a854faf679f67c2277beaafacd1f38f9db97bc032bb74b502acf87b32e2c81fb13f60a79036e28682d976250c9c309eb136cacbd
 MISC metadata.xml 336 BLAKE2B d87d655ad085e53410760329202ce130e41d98fd35ca8c9e38c07665177a21d187c94a4570d3c18a409eeb89f00017edd50cd127adbbd35f99a0da1fd342f048 SHA512 894ed9ebd715743d2ce4591456a5776e1e215cf8845ffa0e16e6b6a25b316213b5547b0e3717050dc83518c9c2e100348c0804f25e599cb785415b8411def8ac
diff --git a/dev-cpp/edencommon/edencommon-2023.02.06.00.ebuild b/dev-cpp/edencommon/edencommon-2023.02.06.00.ebuild
new file mode 100644
index 000000000000..411e811b2905
--- /dev/null
+++ b/dev-cpp/edencommon/edencommon-2023.02.06.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-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
+
+DESCRIPTION="Shared library for Watchman and Eden projects"
+HOMEPAGE="https://github.com/facebookexperimental/edencommon"
+SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind"
+
+RDEPEND="
+	dev-cpp/gflags:=
+	dev-cpp/glog:=[gflags]
+	dev-cpp/folly:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index bc8535005e09..5ae53182be03 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -4,7 +4,9 @@ AUX folly-2023.01.16.00-liburing.patch 2064 BLAKE2B 353a6985b1a7a237b9600227f0da
 DIST folly-v2022.08.29.00.tar.gz 3696645 BLAKE2B c1ff618be8b6a73bf0a1249212cf904ac472711086e54da73dd631ecf002761e30496e8631d6591f51e279b736ae9b3fe50959de6b1f86f01f9d6bc08fe675fc SHA512 1437a1314e26624715a0bb781049e19300eb3a67648287b319c55ce0dfbc867a09bd9d2f0cece6fc75fc62b21899aa94b464ae49c12687be7c94fdf0c7b95790
 DIST folly-v2022.09.12.00.tar.gz 3710760 BLAKE2B af59580ebee3229a6564c4b29e1d24bc405f4ae3b79751af315245c87472293f97c2d78348c92620d3196d1d41a7b55af9627cd42d23f74cbf6f00d129b3b77c SHA512 f9d0ca44f6f0c343d16e8ee5408808830b30155d42a257c48e627f9a82bb4a57568a7feeba01cf73704db68af1eee7424971540635d5dfe1728fc2ae73953940
 DIST folly-v2023.01.16.00.tar.gz 3774935 BLAKE2B e6c5925de0e571d83ac6db363a92f3d8c2fa7e911efc3db8f41b702dacd64aed5247313102ca12ca36a27a6fd8d8d5168ca8e98835f4000b425c10560a39e392 SHA512 941e09c90fab9e668d5f6b77f22caeff1da4347324c017ad64359748e18fc7c713d13f839d90a116164005041824c8a8d2039cfcc7687e23d9be8fa5acbd61ec
+DIST folly-v2023.02.06.00.tar.gz 3790845 BLAKE2B b1c0eed7a2dccba3ccb5e25aa24cc0a6d628fbc3134bf0ed82a1e0e614825a3ae620d79a54e2bea398274afcb662bdfca48d7193f69db35f624ed6a2fa9bae99 SHA512 b9cd8132a702e88e4c9fefcce190d9fd403253c9b71dc22316f237922d99f9cd980ab81d50ddb48ae0e614a493b3d61865b03eee46d59805f83fce528f831646
 EBUILD folly-2022.08.29.00.ebuild 2474 BLAKE2B ba8b143ee679b37e2facd8ac30f6eee6ca8fd2606c5731757f2a2b5d6f6a9ce655d97f97317c907c5452e0e6494e81ee1dee376d97c708cc950b9e1e6090853d SHA512 81b7baddf458a0d394e158671f71f613fc7b760aea065b5ce7ab26856bdae9303462ac770b6dd067bf49f63fc776fdae4a66c9437cd9de009a2e716969e044f1
 EBUILD folly-2022.09.12.00.ebuild 2475 BLAKE2B 04744830b870ccbe5cacc9108fa169f34da17ce6a05c9c795d8533d8e309ce60020084ac5d0e1c0e48e7ea28bdd2fae79facf59630737b2f36dfe90eccf758fe SHA512 0c86667f9d75ad4b6e7b9f70d376343616f9f780cfa94bf6cf82624bda963f0e1600beefbafc88357bfbf35eaaaf10eb1e8e4a287eef3eff06190e1fb0dcbf70
 EBUILD folly-2023.01.16.00-r1.ebuild 2657 BLAKE2B e3cb7fe971ab44af5e3d28c8b0075e92f2804092dfd8ac3df3749b4a93e79821cac3872250828e7235b46aa9e489c9be16580e500c6f73fafaa5f19ef88588d2 SHA512 0f3e5de47fdbb8d613adbc9d9b4ee60c010281f11c322fe0a5eb6ac0aa43701f084f8d6d7ddc9482aefb1f0aa89cd2fede7240eac50853f86a9eb2f375492afb
+EBUILD folly-2023.02.06.00.ebuild 2575 BLAKE2B 3a7ed9cd63a76b30d818fce2c2bf7e59eb4a317cb8ce7f1b4d82008137850fc97779e3eba2df411a3f205e9095dd9895e88494a0fce75fe60222ba30a553f882 SHA512 f39040f22fa081a144a36ff2066212a762ade8e360a3082ae1a78fecbee949e8c527e16d2dd2374bd9c0a33f2795fe902c3c5a8cb59b4e5d845676c86079d0a3
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/folly-2023.02.06.00.ebuild b/dev-cpp/folly/folly-2023.02.06.00.ebuild
new file mode 100644
index 000000000000..ec2a1bff52c6
--- /dev/null
+++ b/dev-cpp/folly/folly-2023.02.06.00.ebuild
@@ -0,0 +1,102 @@
+# 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"
+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.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_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
+		# - concurrent_hash_map_test.*
+		# TODO: All SIGSEGV, report upstream!
+		-E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout|concurrent_hash_map_test.*)"
+	)
+
+	cmake_src_test
+}