gentoo resync : 09.07.2022

4 files changed, 94 insertions, 4 deletions

diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 36101c7b586b..9072a2d267fa 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,5 +1,7 @@
 DIST folly-2022.03.28.00.tar.gz 3616507 BLAKE2B da003701abe599f20ac87a2785fe9a4cd4a8896d182737eb1eac6384f3d75a792225b426febea7cc4ea99aac1a1f31eb7330e0a297f43ae7d5aafccd93784560 SHA512 6eee07b3e82247c3c8672442503e9a69a1c4607604269fc0760e11a2d0e5595029e6995fbe7c970d2052a7f228f6b92112630e6d5c624369fc52e5ad1823ef74
 DIST folly-2022.04.11.00.tar.gz 3632587 BLAKE2B 13820f6dc600727fa97603181be97a568cc8b3c713659717592853827dac050d5f1f6d98178e3054871233b48ac18f713589bf43b36ea29445cad557ce13bacf SHA512 7aa0be95d6f8b21aaa88558cf5921c526ab5a8c8121b858eb6e7ea19946d7a82dff06d90b7a365cef5c56a43d8d57af8d01b8b11b27262fbed9ee8c9e701b5ac
-EBUILD folly-2022.03.28.00.ebuild 1484 BLAKE2B ee0b3d5fec48835b40a2650fc93af4cb11704c18771ab23d0d9c78ad0b8f9c479a48bfbb60cd0c9b7882071d0488bf0a0cee2ec9439683626c70cb432c50ebe1 SHA512 28a1105b97a005ea124d7ee6192619a5d7253d2968e063b702766f9c15ff764ee53976721d0100b725b8164c0420971ed24eef166980f50252b59743f3a32a3a
-EBUILD folly-2022.04.11.00.ebuild 1878 BLAKE2B 856316039333e2173c99e112dd042ec7e81ec417582fedfb79383c84df4c1bc80bc1af259016c6c734667465ab102c98c7ea54e973d9239d52e0c14e7704bcab SHA512 6228518ab204e7a92b75e369be105dfd0fabf40066c87ebd39bfb4848211435166791facc6789ec0062e3442b73b9437f27243c263127a8853dcc2ae4963c524
+DIST folly-v2022.07.04.00.tar.gz 3647988 BLAKE2B ab8916ff4be1468d44dc0892126448682554ea95ce879166f457b621c3157cb22d0292fe2c58744494efe0fbabbf77732184335cd22244724c740910cf3a8303 SHA512 11fc32768539d8d42c7396eeac522238450617c8dde302b45c64bb93fd6ceaef7bb193b897802962782e8211c3931d31bf8df68e06741ce855d9725510677d7a
+EBUILD folly-2022.03.28.00-r1.ebuild 1486 BLAKE2B 629e5c21603de6a7e91532219f357f74df50194e21102c6f2d05e6d613bbecdd5fba2f2042bcbac0dada2066b82def374c671d9c7b263ba3f1f3d16178496dc9 SHA512 2841732188df3b1330ce730aade4a15272208fd16d658c15a29b908963dd8ec1349205cdec2eb218d9acf539043db011498375f248f580730495cee2484a0e96
+EBUILD folly-2022.04.11.00-r1.ebuild 1880 BLAKE2B 9bbab33cb481558b9f857eafb813901fa0a3ee9f977772f3d733a49b9e7c2656fb98ebd402f3f0d877e20c547f31e2ebdd1e9a3b234300e104858aec5e49d1a8 SHA512 aab53b44bee8c2a4bef0d5cc0dad9603f0a84b66db02dfa9062676e6bd97cb25fc6593dc2aa1881ab6cd3f5477f369717d0931e670447be3eec80e0161a5b98f
+EBUILD folly-2022.07.04.00.ebuild 2243 BLAKE2B 0ce26c96eab6ff1797f9c6d893ef8dc7c7a7ceca3cecefcf3bf122793aeb707403a628803d0073a1ef3c29a7dea4f48534dcd71a25603336f31883fb485828d7 SHA512 8f48e795fac9adee9ea2483b9ccdc61571c40cc456f5255777b68e2c9aabee3bf6dedc586c013dff9efa7cab93de8f8450fbcbec70003ccbafaf3196a1c414f7
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/folly-2022.03.28.00.ebuild b/dev-cpp/folly/folly-2022.03.28.00-r1.ebuild
index f832bf20f635..8bffe87201bd 100644
--- a/dev-cpp/folly/folly-2022.03.28.00.ebuild
+++ b/dev-cpp/folly/folly-2022.03.28.00-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="app-arch/bzip2
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-cpp/gflags:=
-	dev-cpp/glog[gflags]
+	dev-cpp/glog:=[gflags]
 	dev-libs/boost:=[context,threads(+)]
 	dev-libs/double-conversion:=
 	dev-libs/libaio
diff --git a/dev-cpp/folly/folly-2022.04.11.00.ebuild b/dev-cpp/folly/folly-2022.04.11.00-r1.ebuild
index ef4a97e38b63..3984f479ebea 100644
--- a/dev-cpp/folly/folly-2022.04.11.00.ebuild
+++ b/dev-cpp/folly/folly-2022.04.11.00-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="app-arch/bzip2
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-cpp/gflags:=
-	dev-cpp/glog[gflags]
+	dev-cpp/glog:=[gflags]
 	dev-libs/boost:=[context,threads(+)]
 	dev-libs/double-conversion:=
 	dev-libs/libaio
diff --git a/dev-cpp/folly/folly-2022.07.04.00.ebuild b/dev-cpp/folly/folly-2022.07.04.00.ebuild
new file mode 100644
index 000000000000..e4b9470d848e
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.07.04.00.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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,threads(+)]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	sys-libs/liburing:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="test? ( sys-devel/clang )"
+
+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() {
+	# 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
+}