gentoo resync : 09.07.2022

15 files changed, 178 insertions, 12 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 48059a2ca51b..f72648df0522 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 6edfd1ad4a46..13e87d0ef4df 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -2,7 +2,7 @@ AUX asio-1.22.1-cpp20ex.patch 664 BLAKE2B bef8ef8e761832f1268f3dfca4fb666fd2a3e7
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
 DIST asio-1.21.0.tar.bz2 1967398 BLAKE2B 95e0ba44910e7450e614011b487acac0cd292302c0f502ec678639b70af7e6f9b86ee2c50c7f7e3e3437ce4474323e44b5e371c08f3a9ed464ffb3f428de728b SHA512 62252b2d3ca4fb99579c5fe57bf64b700792198dd7fa45acb4af7f64e83494bade1885b848f9e364f4c42d9db025841324cbd9a0fd3fe45526e7e4be6f60f8c0
 DIST asio-1.22.1.tar.bz2 3085878 BLAKE2B 07326a2273d5b8c0aef8402c92a6a88abbcb961d2a029596d58735d6626279e6d4d591371cc368a41fac1d0161b8786174ba71153e73aac38fa81a83f5f5be86 SHA512 be4a066d9f73662f68a771f63a59fc2e16e8ee1ae1ca6c581e09922514029e58c479edfc0517ee6b29a1fd377d202a2a6eb80d9d17f6e957233c11331f04a479
-EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
+EBUILD asio-1.10.8.ebuild 920 BLAKE2B 57c2107a8b11c2f9532c7afcb7a98ea0a61a71180242e834a9090f4b25c69de0ae1a29398fbaa63fbf90036dbb949a9e76968102b4fd3a414c3679b4930ecb14 SHA512 0153b702cab5a6e8678c393c1644276915c69a522fa790e54a9fb932fea5f2fa37ce12ee7f9ba09b7020e14f1cb3263d89884e7d96e29238e5b01fa285f95f83
 EBUILD asio-1.21.0.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
 EBUILD asio-1.22.1.ebuild 1182 BLAKE2B 9de5498ce41f731bef970b9b52e0c2ddc560237c55e2b0821a2d8d79f1f04e98d12a3e00eeecf13806df4779abfa250c2204f5b2e0c6197d08866a74dedf9ccc SHA512 6ca510a82d054ce32d58de816461c3d9d5c72c3323d8cf157824c51f0a86d5a7307f0080b5eaae84c635bd87da1d24329516e0c8fe23f6781ff9bd4e05ba8266
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.10.8.ebuild b/dev-cpp/asio/asio-1.10.8.ebuild
index dcdcee8f9c29..7c46389ab54c 100644
--- a/dev-cpp/asio/asio-1.10.8.ebuild
+++ b/dev-cpp/asio/asio-1.10.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index 4d47c501cd1b..44b01f2899be 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -2,6 +2,8 @@ AUX doctest-2.4.6-remove-unused-bla2.patch 665 BLAKE2B 2c91d9905421944f5c2d1fd5e
 AUX doctest-2.4.8-move-only-types-fix.patch 2460 BLAKE2B e2bb6e7cc1e921503d177529de4dbe80440745bf6404605df0b9512c43720c2e8508c48fb79b8a8d734dba9549bad65bd371c1bbbb5374b8f4b6f2b3c2032a7b SHA512 02b5cf8188e946ff5e6eebd4b72a3c2fd24485e21e81739225bfbd28b19483423787c9d4f6747248ce936e601c0d9ca7376b050b6ce6d45469c77d2a78077b59
 DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788
 DIST doctest-2.4.8.tar.gz 2275833 BLAKE2B 334ed6fda624788adf07fb92a773f3fa69addfbff389e3669e58f66271536d42ff8d20e73e20a4f1d3eee59233d476e527680bb19dcae1d9a6d062e6feedfde5 SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c
+DIST doctest-2.4.9.tar.gz 2292632 BLAKE2B 7d501eede5a2311117a04a11da5b518fcac4de53a73ba7b14f47395a759bc5d708438f25df61053a16a256ffcdfa37500a6892ef0890aa4df4d9f23533bfb18d SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb
 EBUILD doctest-2.4.6.ebuild 602 BLAKE2B 901726397e929185369fce55da53dfd2b2abb58ee00ceab766cddd8e9b907813f24f50d1355f43db29a618364b136ed47cb6b279a99b0d507ee8e068cc8c5145 SHA512 518556cd10a57ff0bba1def28183045ef03d4f755462c9448e41a446b47085458695f5e5a9faacd203e49dc7c6d9814e2fdeea70149364bf94ddd88db2cf72fe
 EBUILD doctest-2.4.8-r1.ebuild 616 BLAKE2B e4c6e825425e713b3aa1e4ad00e7ca2e34afff7e9ca58134e504bd3168077834c383e014e3884c69de3b2fdf29ce91eaccc2738e22f8d5d8989e36d250da8074 SHA512 0766087c7e7d404d0237824d5f630ec4e1dc96e121368d8a34af636fb794ee08cd68e5d2941700b98af83ca5b2413efbc202d38626cfffd400fefdb8a80f57ca
+EBUILD doctest-2.4.9.ebuild 544 BLAKE2B f6315f245067139c3f11d95a4fcc426cb40fa7b938442d6518d65a293dab19d056ac23c8009181bf5aaf4757dd9c6065e38f896527c7f663d2b2e31bf80159bf SHA512 5f6467ce06518c8e20d6451569f4df412afc9e30198f43fff446a0d5395b881aa57465d802cf3a5970fba042db33534386faf91f279d70dfcf8c53a656ee64c8
 MISC metadata.xml 471 BLAKE2B 530d91c53109b2e99bf3b5ef79fb1343f1cf37bc48aaae35da5468c304c8a2e38c439e79a43c139b5dca5dca8dd9231e7a9020b6f1f12d2074d92b95542bbf31 SHA512 5d143f4ba813a3de07351c5e45cec1aa66d395806fdbc9a04151c0adf1c74dff8192b7993d767e2e82da54090f7c3948ce33c747d6bd030333fc35329203083c
diff --git a/dev-cpp/doctest/doctest-2.4.9.ebuild b/dev-cpp/doctest/doctest-2.4.9.ebuild
new file mode 100644
index 000000000000..fa60bdec8854
--- /dev/null
+++ b/dev-cpp/doctest/doctest-2.4.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The fastest feature-rich C++11/14/17/20 single-header testing framework"
+HOMEPAGE="https://github.com/doctest/doctest"
+SRC_URI="https://github.com/doctest/doctest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCTEST_WITH_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
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
+}
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index d7c36168ac10..9a23cceb9bcb 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -5,6 +5,8 @@ AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3029 BLAKE2B 3b46cca54d2f
 AUX glog-0.5.0-vmodule_levels_changeability.patch 5974 BLAKE2B 1ba487bdc097f6ec021d44496c72beaca0239445eadb4bd11f022d6abdfdb5b97bc9e8bebc5f79255999bf655fde5572009e6fa71e7d8a0af785581a574cc5ec SHA512 db883cd941cab39954f06a75929520c94d824344de81c712d495d03bdd438a2cd79a1d975330848c84f0b482bcbf8c4fb120c45171e51c37dce960bf9cf4c2d5
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
+DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226
 EBUILD glog-0.4.0.ebuild 1139 BLAKE2B 4aad89f7c76c7744037cc2a72db92bd321a9c686022accacf55efb1f37b76a594b245f6d018f0f48cc246b3f281f7d280cf8829ae89dacfbe2eb224a311e553d SHA512 d80010ebb2d0a530b98bcc1af9a4b6f0c9c2ff94be9e9172e068ab0e6d5a2a501e72b6aa3df8c7307356cc92ac4062a5b2467948c916a0b109a57fcf1aff987d
 EBUILD glog-0.5.0.ebuild 1506 BLAKE2B 869ed3d3b2be384250d53bcac744354dea33296667822d40227d317d9bd99135dc3edfb0b9632e66663569561af83ac665c17427ed3755e74ef2d865f4679078 SHA512 f9fa6fe43960ff1b61a3d2c50a28c6890bfa9427ba20cfa5760f2c0ecf9fefd6efd76bc52b5fe1de41a1bf58efae3239a3f0fa6759e3a5025e56124da1f40684
+EBUILD glog-0.6.0.ebuild 1218 BLAKE2B 480b81305b29753732377552ac17eabc79665c3252ee087ed4dd5343ca78e69297132ba74550876dc488c0ef4d816c6df46318e1a959f70c40e87f31486645bb SHA512 248aac9080de5fd56f2c9ead88e52ccfa2f9adb8dd79fca7220ab454b86b2443e31643fdffbf3430814798dcf18025bef72bd24ef416be148c22e9d62455e799
 MISC metadata.xml 738 BLAKE2B 6c95cd538d9c896f256172d0f8c9281016a177fb6e8f507bbe07b6ca3d4cea4ef18eaa10a991f80c8937b58c388181dec81bf9b25a8ab0b6568e3c4c2731dc82 SHA512 f93c8a05ecfc96f29602d3a976431e6148df576c458769916db6c181ae0753826d64482ef7b9029c6c68bfbae0861cc42f39aff774890960f394775dca7e62c3
diff --git a/dev-cpp/glog/glog-0.6.0.ebuild b/dev-cpp/glog/glog-0.6.0.ebuild
new file mode 100644
index 000000000000..3d09a50835b2
--- /dev/null
+++ b/dev-cpp/glog/glog-0.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake-multilib
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/google/glog"
+fi
+
+DESCRIPTION="Google Logging library"
+HOMEPAGE="https://github.com/google/glog"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gflags +libunwind llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="gflags? ( dev-cpp/gflags:0=[${MULTILIB_USEDEP}] )
+	libunwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:0=[${MULTILIB_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DWITH_GFLAGS=$(usex gflags ON OFF)
+		-DWITH_GTEST=$(usex test ON OFF)
+		-DWITH_UNWIND=$(usex libunwind ON OFF)
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_test() {
+	cmake-multilib_src_test -j1
+}
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 41382d55b26e..e3f5f725df76 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -5,5 +5,5 @@ DIST gtkmm-4.6.1.tar.xz 13911284 BLAKE2B a456d19a7a5146f6a4ba93a77a053318353f141
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
 EBUILD gtkmm-3.24.6.ebuild 1415 BLAKE2B ff110d5e239b4adfcd8e9e4527b27fa02f2bab69e46ce12c6a63a7c19156bfa0a6b92e68184a8d26330d05d39f20fc86ff43bab0ad6a610aad248327209f85ef SHA512 cb8d952cc2b48947eee4872f85f0dd6085c617e8a3152bf58b852780b939139b073bf915adbdc614dba58397ae724c89f58505d8e93daed0b4a1a14fb12484c4
 EBUILD gtkmm-4.6.0.ebuild 991 BLAKE2B 7299f8bfdc1dcc8e9ddc75d251540368555f09c9c32112dee19d4f0c4151b9f655cde42b8bee58748225743369d58754252cb96b1041c3801d9a6fab684f0027 SHA512 516c52e0839d3ca3349358f32b167ee5e6bc9dd8cf59da58e42f6eaa1a542b6a5e75c2f3d649dd99e29717d0a1b2327995d7a682905e1d1c6339fc91242ae3bf
-EBUILD gtkmm-4.6.1.ebuild 1017 BLAKE2B e55a5951619c58f52bb77ab9358672155067568832d32f19f0d8e7808884dde78762b434b6c43cb72cc0efa267d5b3a77b54fd4a6ee7fdcf2f69a1a638f9d7c9 SHA512 2587c3992107cc479870c4ef343359832ae21bd6959921b3f73529266a20d6e39102577cb04935ba2cb326ae3f12cef2a544f3a287a53d9dc2f52635d80d0a4e
+EBUILD gtkmm-4.6.1.ebuild 1016 BLAKE2B 304917820c6a76d80b3e654810d5dda3bf528d44b0fa840ce69ceea3ac94ce3e02153b0bc0cc198a21abd7533165103f5fd764a939be85cd76392d917c606e17 SHA512 2d9ff331c0b1546cb615afe40c2dd517a00b4a3fe85bd92315e089d81c8175eb5e2fd8e25bc31b8c3415de381741fb830dea4d64f69c478da173c11d6db7ccf6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild b/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
index 09535b3cee8a..e4887e7be835 100644
--- a/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 9d82e6e9b5f5..66db7e30efd3 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -11,5 +11,5 @@ DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebe
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 EBUILD tbb-2020.3.ebuild 3328 BLAKE2B 49da765405909bdf94c7e315ae00b4503113db99ea1c13e411a5349bd52b816b36654e06a2cb7c8d10b66caced270f8a7bc2d9c569296ecf4f99a91accf2301e SHA512 19edba39e17bf21471309fb769a3ffb0af06b6cbf61f3523767b8980ea2655cca96edd6191ace397610d9e2460a2e684361077e57b82393500950255dd0a7c8a
 EBUILD tbb-2021.4.0.ebuild 1003 BLAKE2B 60f60e47a512ee0a715cabc1f7bf876aa8f4be338cf3563ccc5aeb6b4f8c83dc6671e1fe168a96c2e856c95912fd5766021040ce593b5d656e95136f7afff5e2 SHA512 27a5925c68d5f369753c72e4cd8bb472cdc9e21758e7b3e1d144afb374f12d92964b1721d39c885c6da9500aed0aecee17914ffc87a675721e7b6a5d41c43a60
-EBUILD tbb-2021.5.0-r1.ebuild 1397 BLAKE2B 5e65e7ff239f914e0ab6e30448284bf0e87a7c0d5aa0b7a0057a87945328e0ebf9bf2bfc53980188266bcf5a0393f1a1dcb77f83a507f4219052ccb2ef7608b9 SHA512 f0c90af831e85cf55b4a3a89f1ce23807fd14441df11c2bbf22ba2238285226efc2f5562b7ceea16d907a0834e2576fd705634a7bc56b5b5cc224c2c846f9803
+EBUILD tbb-2021.5.0-r1.ebuild 1428 BLAKE2B 6d3c7826ea2b6341ff0638810d04049d86c8f6cadd17eaba451c797600061272b261a86e0f7c54800ef373e2864887b86f23586cdd3a6c337ad786ad170fff3e SHA512 70eacced105c3861c750241c62648ebde87f1c799b272fcb719dc0716a5084f03faf69face48e70635c87d4760b72c0caee28989ac8cdbd2a05dca9b7a4a6957
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
index cbe0ea277696..472d9fb15954 100644
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -14,11 +14,11 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="sys-apps/hwloc:="
+RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"