gentoo resync : 06.04.2022

4 files changed, 4 insertions, 67 deletions

diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index c6b7af72f338..2da6936124b9 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,9 +1,7 @@
-DIST folly-2022.02.28.00.tar.gz 3600258 BLAKE2B 5943b0e4b6178c8293714f673ed289daed26b1dad22dcb52dc80475f385961cf0a690accc44139f245f2df5cf10c0bdb5638c8bed52cb97fefd3ad6d8dc147b8 SHA512 91ee21e463ffc6eee3b0e5e0244721a9612337b9afe92645556a154f521aec1070f4f381962247bb9bf11592efb5b8bb01f70d1a66acd3444967538062dfe826
-DIST folly-2022.03.07.00.tar.gz 3604306 BLAKE2B fe255678d6f827c82ada3e136742d07bd62dfb81c1250ca6bae9a4f3e1f015904032da8de1488342da1326fa520b448c63a59ef7e0139ecb0844a1ae19c1dfed SHA512 e63eff137711ca71b5a78469e4feff1b4e7b65465413eefb91b7c0cb26b94e1d581a305a9df9937ce05bcd8af3dc465adb816ad95538689811d8ab5b5b9f269f
-DIST folly-2022.03.14.00.tar.gz 3605018 BLAKE2B 11a58e3c23c1e1299c16821e552d500f8215d2fb2fbdee3699b8487e1073196dfc322461e7670d3968c703d84b0b526d2479bcb74005b763f195ce48f04a419d SHA512 0b3710862360788eb55dc40703e3862f57819acf217287f13ce125b56692c4e5b1de12289f02520ecca9007fa872a69e8936df0ec9260adf974a88286489a9b1
 DIST folly-2022.03.21.00.tar.gz 3611725 BLAKE2B 6b0d3431810a26484b2c15a8ba4b245e720d717364a4305269b3adabaa2d005466dfd7ad086b38cb06ee2a2d5908e903e68486aadc62834a32b4fe59cd313095 SHA512 4e0fda55f007179883af30024fe1d389642159b1b4c915f7ef1a3c1003c8c52e2370f53ffa79d5fa75533d33becfb946d2bcbb2abdc62b9a297f977403d13dd7
-EBUILD folly-2022.02.28.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
-EBUILD folly-2022.03.07.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
-EBUILD folly-2022.03.14.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+DIST folly-2022.03.28.00.tar.gz 3616507 BLAKE2B da003701abe599f20ac87a2785fe9a4cd4a8896d182737eb1eac6384f3d75a792225b426febea7cc4ea99aac1a1f31eb7330e0a297f43ae7d5aafccd93784560 SHA512 6eee07b3e82247c3c8672442503e9a69a1c4607604269fc0760e11a2d0e5595029e6995fbe7c970d2052a7f228f6b92112630e6d5c624369fc52e5ad1823ef74
+DIST folly-2022.04.04.00.tar.gz 3629241 BLAKE2B 6e606c7412a8c2dcf731bf1373d3ed33680b07641109fd5da066bd648961d9608d82496322496bf6334a8576ae2394a36603ba8098e972c9b949a989f04baa4f SHA512 923cab43820b75ef7f614a3e62d278ecb3a64beeabefee64d6fb113fbbfd368b69a2a90015706ba58e68967eb9bbf97052678edd1f2d6d4d466792f08e547488
 EBUILD folly-2022.03.21.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+EBUILD folly-2022.03.28.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+EBUILD folly-2022.04.04.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/folly-2022.03.14.00.ebuild b/dev-cpp/folly/folly-2022.03.14.00.ebuild
deleted file mode 100644
index b644181fecc6..000000000000
--- a/dev-cpp/folly/folly-2022.03.14.00.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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() {
-	if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
-		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
-}
diff --git a/dev-cpp/folly/folly-2022.02.28.00.ebuild b/dev-cpp/folly/folly-2022.03.28.00.ebuild
index b644181fecc6..b644181fecc6 100644
--- a/dev-cpp/folly/folly-2022.02.28.00.ebuild
+++ b/dev-cpp/folly/folly-2022.03.28.00.ebuild
diff --git a/dev-cpp/folly/folly-2022.03.07.00.ebuild b/dev-cpp/folly/folly-2022.04.04.00.ebuild
index b644181fecc6..b644181fecc6 100644
--- a/dev-cpp/folly/folly-2022.03.07.00.ebuild
+++ b/dev-cpp/folly/folly-2022.04.04.00.ebuild