gentoo resync : 16.01.2021

25 files changed, 237 insertions, 87 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 0d658d486c06..e7f90d59070d 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 9bf8ab0fd082..7ab1a038b257 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -3,6 +3,8 @@ AUX benchmark-1.6.0-disable_Werror.patch 461 BLAKE2B 3f286f7f8fc6dffd0a8c072ea97
 AUX benchmark-1.6.0-versioned_docdir.patch 303 BLAKE2B 7cc8c4d61bcbdefaef17cebf1107010e966dd35b69afe1cf762b3796d05b135d5cc2a85fb246ccda33e511628f0606a2d596e0f09e45d11f8e8f8154f42099ba SHA512 e704352323699a7827f4e125e5ea2989e02381d2984ad024f0712d95c8cc4772b167ad85d9e5d4ddd86541432a792ca2d9b7855c939a591fabd7d2ed6b25c3b5
 DIST benchmark-1.5.6.tar.gz 177911 BLAKE2B ea4e98cb98471b2b8e2371109b96017bc483459dc924deaa1d9770b065de946ea2d69ca36098c27283f15370699f2475448af1e205cfca3d9c64408f08c202a9 SHA512 b3c1fd4407d660456ae51abd7c427460a2c7b029ab6344e21bb61d3ec84e3b60638b7a719655aa04fb9ca639b6371e553e9de18539aca8dd38c361b4c6522538
 DIST benchmark-1.6.0.tar.gz 178527 BLAKE2B b31fdd2a00d80c63102ea81ed9d1392f243e0d6d67ebf7d1e1a3d20cf7702acc68a3ddd3edd6ccbcfe76c01438c492c15f4d0146689587ccf8a3dccd6043ed11 SHA512 83788f64322067cedca4e459dd2b4117a80d3dc480e1ce0a4d9c323827e13cb1969889a6049cd487dc28ecb0ff52c868a73492c738283ee1236e527b0ca8b11d
-EBUILD benchmark-1.5.6.ebuild 796 BLAKE2B 0e64c039c1cf3e9c69515515b91fd5c5b72e7c712f97787a96bc84abec53376ffaecf27ea632614585e7035aa4583ab927405e0acfe69eb7e0e7934cc98c37ba SHA512 6ad73f38dab12b2646fe4e52d3cade4a04ff152591ebeee7e2addc12882fae9b4308b8be4fb80681f34bba73ec6d367000179d31484b4eba35e51033c707ee46
-EBUILD benchmark-1.6.0.ebuild 899 BLAKE2B e991b00dbe8ecbcddc4076d594ef430798ac23fc9e2550f6e054499999c03a4eaa6f4e78c1f5a232f4e390bf2137c01f9c4819d5d1c1f5c2946dead2cd33afaf SHA512 8b4b6a16d146cdfd1c70491482e996dffcfae68179f9da2e283055c67fa9bfdde06bb07b3fabb574c704748d4dc8a7efbcd885b33487b8b4f0578e5510273aff
-MISC metadata.xml 468 BLAKE2B 1cccded2d58d45121482aedc04732f83d8e1b034fa34eb037ae2e68922c6394b6ce7ad019cca64b0c2496e4328b124a9f06d9b8bba037e36e6f46f716acee9cf SHA512 c7a6087c885a8587799d32fcba2abdef1bac08eb7f6cb7ec195280b0464c962acdfe92cba1ca137bb049d895962bcbecc97b53818a24b84757263f90c345e094
+DIST benchmark-1.6.1.tar.gz 184616 BLAKE2B bcbc69ae4c4f5f21ed8199f34faccf41a9b97d311aaeeba8cecb6acc47780c91d2cb41a1dadfe400accecd46f90f02211a219a0000739c122dc7398ae1fa76a7 SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
+EBUILD benchmark-1.5.6.ebuild 809 BLAKE2B 5c5555f9335d84c2412698ca19418ddea0507e9ea1aaea1f554967a070770e695bcef1070a089722c0a572219236a08d4c074bfe9f9b63f152907d550ddbb0d3 SHA512 6308f898d7e0781bd7f9482cdaf51bb865cb616af0a568e354eedfd4e84a7f1d839bde000859c09f1ccb02dc3ef7766bd9fb932fd44c3045651857e64f518c6b
+EBUILD benchmark-1.6.0.ebuild 912 BLAKE2B 72b146ecde7c39665b220814f969b3c8f06d21fd79e47c58beaf42452ea9ccb9f882bf378e39508034080d36c3ff06ab293405e1f882988f86e5b873657f5001 SHA512 e2855e4908a476a5e93c0f3876bd85ae9b5d48357b2e822153e1d09a783d801c98637bb29ede406212c8e1e3d192b6ddbe5896a2a26700ac13e0eb90bef727c6
+EBUILD benchmark-1.6.1.ebuild 910 BLAKE2B 0df52fbea5d0858ba42c1791e6198b8eb4bf3835db0ff50e9142ecb2f3f9b1b717ff6139e0feff8404cc69fdd0738ad13bfa306ef43e304b82a2b620a2e68d6e SHA512 de53943dcfa882408ce4bfbf6c1dff1893ca082b3e49be28c596ba5c56fa1098a3e1aeb965f9c9f2871f1e9fa346b123b56dd5880df9e253c500543df11e1b80
+MISC metadata.xml 563 BLAKE2B 2c825b6895d64a3e5e4ea6b61a707e03e14873bc5fbe9f67a756a56c8edd0dd04dd8f3aa1d1a80bf8b4921f25aad19320222b3607494ab512d3713152b1ce41e SHA512 09856cb99c18336b143b725f8acd7fce84d7cce2aea22f03f80934f6681161fcf667f084af236fd654051acf4a261c7e25026822ce3ab79d6fef0ea3212a601d
diff --git a/dev-cpp/benchmark/benchmark-1.5.6.ebuild b/dev-cpp/benchmark/benchmark-1.5.6.ebuild
index 447bfdaa52d6..3c1508d4ecd1 100644
--- a/dev-cpp/benchmark/benchmark-1.5.6.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.5.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="A microbenchmark support library"
 HOMEPAGE="https://github.com/google/benchmark"
diff --git a/dev-cpp/benchmark/benchmark-1.6.0.ebuild b/dev-cpp/benchmark/benchmark-1.6.0.ebuild
index 604dda9d01d5..79dd281a1d6d 100644
--- a/dev-cpp/benchmark/benchmark-1.6.0.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="A microbenchmark support library"
 HOMEPAGE="https://github.com/google/benchmark"
diff --git a/dev-cpp/benchmark/benchmark-1.6.1.ebuild b/dev-cpp/benchmark/benchmark-1.6.1.ebuild
new file mode 100644
index 000000000000..41c2180ad81c
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A microbenchmark support library"
+HOMEPAGE="https://github.com/google/benchmark"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug doc lto test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.11.0 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
+		-DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
+		-DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
+		-DBENCHMARK_ENABLE_LTO=$(usex lto)
+		-DBENCHMARK_ENABLE_TESTING=$(usex test)
+		-DBENCHMARK_ENABLE_WERROR=OFF
+		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
+	)
+
+	use debug || append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/benchmark/metadata.xml b/dev-cpp/benchmark/metadata.xml
index ac75eeab418b..1a6a996e42c9 100644
--- a/dev-cpp/benchmark/metadata.xml
+++ b/dev-cpp/benchmark/metadata.xml
@@ -10,4 +10,7 @@
 		<doc lang="en">https://github.com/google/benchmark/tree/master/docs/</doc>
 		<remote-id type="github">google/benchmark</remote-id>
 	</upstream>
+	<use>
+		<flag name="lto">Optimize the build using Link Time Optimization (LTO)</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index d77f71c9a057..a2bcce1a0049 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -3,9 +3,8 @@ DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee
 DIST Catch2-2.13.6.tar.gz 659811 BLAKE2B d876c51589259ef9fa9640811c17049ee5f1559a2863d146b0d8f79e9531b3528db34bc23e4fee090436a92b430756442eee4820083e71225da0f24399131a73 SHA512 f63e240994b5982cf019a33b8999b62237cce174962f00437d64fd287b34f7217d066225d99322431ef60da67b025f36db703dab94b3d58bbd81095d98917278
 DIST Catch2-2.13.7.tar.gz 661014 BLAKE2B 7d874832082db74895bfd696c409a77693ae68c456d1287acf965ec6884c323cd2f3bc4b9eecc3e8210d262a6da8e897dfef09ec035f8bed4d408a28e7147cc5 SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
 EBUILD catch-1.12.2-r1.ebuild 889 BLAKE2B dcc10c4f7ac2ed34d0730b9fd7bfc5cd21eb6d1f5326a8a3a1d712f6525620aaebb56927f81c62b10c9094b9b2f6ef04f843458fe594af5c6066552ad3ea845f SHA512 4d8d7cca3f745ac8094c4a585d61881a3de3ebb91413f226a0fed59d4d57ec8aa1a4b808f419610849466136c53c3ac9b742a558f91b7845fd0e664e947ac9ed
-EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed
 EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e
 EBUILD catch-2.13.6.ebuild 910 BLAKE2B fef5a8ee3771f072401f0d5af0805dee98ea1b84a6ebaeaa9e59a7c97a7d5a3da9d202b092a50eeaeb865308029f7c9f77bc4d25e5a09e1a0bd9724f0ae03edf SHA512 3dc06f4b01fea561422692e27fc55389da99f0860931b8bc40b581db74488921d5e22a169eb4011ac855bab94d1504b12b407ce54db14020a22aab6ec5801aea
-EBUILD catch-2.13.7.ebuild 919 BLAKE2B ab3f43e428fddc1488c25ec3a0ba27dedb4514dd33a486dc138b918771e50e8e5301b52296597454dbd04bb176e0b21db8ea79f8975794059f2bd32ea3954d5f SHA512 b47f064c75c197a5272cb25a7544b11293636e44876b2b2a6afc439d53fe2c5314bc437235ce453ffcd887881c31ad86ab8d5ca2a862cad916c1beec61b19995
+EBUILD catch-2.13.7.ebuild 917 BLAKE2B 0d76845c51cfab5f90c87c07938f6e1001713b6cf9e043c8840ae2af7c141e402d22719b174fee2163dca1951feb99f10bbc8b5fb26aad9a25f1b4f9ff564f05 SHA512 e084a3882f717ea9c6bf3b6062182e257f191dccb30b3d37bef66bc8574bf63e6cce0014fe6b7d508411aa429c879d8aec66052d31afa446c4b3feccef7a0bed
 EBUILD catch-9999.ebuild 929 BLAKE2B dab69a496e41ace27c41efa0e48567b945ccaa2cef1089dfc5acf09f16260c6dab24dcbf1e5653740dd4f956cf0613822718cdd579d0bef08ef94c41cc5b0089 SHA512 235ac11bd0b91c18f92e2be38b0073c8b6dda575c6aaff4938821f7d1f6b38a2a44363ab30351bf3a64afa60850aee35738e72f209aef9bbde45ba88a82646c1
 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4
diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2.ebuild
deleted file mode 100644
index 22741eef0105..000000000000
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
-	EGIT_BRANCH="Catch1.x"
-else
-	MY_P=${PN^}-${PV}
-	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-	S="${WORKDIR}/${PN^}2-${PV}"
-fi
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-
-LICENSE="Boost-1.0"
-SLOT="1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!<dev-cpp/catch-1.12.2:0"
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_SELFTEST=$(usex !test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r docs/.
-}
diff --git a/dev-cpp/catch/catch-2.13.7.ebuild b/dev-cpp/catch/catch-2.13.7.ebuild
index bea68985144e..a57a9d4e9d0f 100644
--- a/dev-cpp/catch/catch-2.13.7.ebuild
+++ b/dev-cpp/catch/catch-2.13.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/libglademm/Manifest b/dev-cpp/libglademm/Manifest
index d31cd7c5f384..3a6a04a97555 100644
--- a/dev-cpp/libglademm/Manifest
+++ b/dev-cpp/libglademm/Manifest
@@ -1,3 +1,3 @@
 DIST libglademm-2.6.7.tar.bz2 326385 BLAKE2B b79bd099f7eba02585921cd88331cd3c2f0a362396efded2996b149689f1869146a81ef174e9f983f348fe231866e4dcc719eeef62f5f3a2b0ba5dbaf1375504 SHA512 d7042d0549df9322d3202d5c0733d65b153a8ff451bb9e401b9d93a915ec4c2c086428e4febcbae2ecec5936955b7afbc59beff93d492f23b7b8e2b19fe806b0
-EBUILD libglademm-2.6.7-r2.ebuild 1583 BLAKE2B 3b8bb071e02c37d4f28a6ed6c74fca2ac900d73c00316a858f07e4f8a6b378eb8b6bd00664a1f7bc1565b9585de50742a04501e4df241140df8649fad70de2fb SHA512 f7ad196feaa0154ec34a9beb971db282e65308307d521909b6c74e7e308934b8689e84673c41456b92e34f1f918cd9f29ecbf30714ff8ad30752dc52abde11ca
+EBUILD libglademm-2.6.7-r3.ebuild 1439 BLAKE2B 9ee636ba67514c11b82d02e074fc5c4ad2d736360dc9adfe76786c661e8447d60e2ce60eefae6e8907400d6a2acd517da8b9544399e0607c5db9c2bb2d390850 SHA512 3033b4f869020707b1b4be3ad707c14402fdda9746e2baf010c57cd87032c47c9c17f73df1bc7eec9f6f44b54d2a7dd0a455905920674e357dd4db2a74f7d6fc
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r3.ebuild
index 4b75e756ca7e..0a8fa5f985cd 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
+
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit eutils flag-o-matic gnome2 multilib-minimal
+inherit gnome2 multilib-minimal
 
 DESCRIPTION="C++ bindings for libglade"
 HOMEPAGE="https://www.gtkmm.org"
@@ -20,9 +20,8 @@ RDEPEND="
 	>=dev-cpp/gtkmm-2.24.3:2.4[${MULTILIB_USEDEP}]
 	>=dev-cpp/glibmm-2.34.1:2[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	# we will control install manually in install
@@ -33,8 +32,6 @@ src_prepare() {
 	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
 		Makefile.am Makefile.in || die "sed Makefile.{am,in} failed (2)"
 
-	append-cxxflags -std=c++11 #566584
-
 	gnome2_src_prepare
 }
 
@@ -45,30 +42,22 @@ multilib_src_configure() {
 multilib_src_compile() {
 	gnome2_src_compile
 
-	if multilib_is_native_abi && use doc; then
-		emake -C "docs/reference" all
-	fi
+	multilib_is_native_abi && use doc && emake -C docs/reference all
 }
 
 multilib_src_install() {
 	gnome2_src_install
 
-	if use examples; then
-		emake -C "examples" distclean
-	fi
+	use examples && emake -C examples distclean
 }
 
 multilib_src_install_all() {
+	use doc && HTML_DOCS=( docs/reference/html/. )
 	einstalldocs
 
-	if use doc ; then
-		dohtml -r docs/reference/html/*
-	fi
-
 	if use examples; then
-		find "${S}/examples" -name "Makefile*" -delete \
+		find examples/ -name 'Makefile*' -delete \
 			|| die "examples cleanup failed"
-		insinto "/usr/share/doc/${PF}"
-		doins -r examples
+		dodoc -r examples
 	fi
 }
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index a5ae4dacc130..8be8d43f8507 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,5 +1,5 @@
 DIST libxml++-2.40.1.tar.xz 955220 BLAKE2B 44c55ab0e9018af859097e1a753c1457f5694b282f8f5187b32ce908d34f7953b8e73f1e41750ddf5f5c912712539e32f608a33ab79f22644e15010f75be6c51 SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a
 DIST libxml++-3.0.1.tar.xz 948796 BLAKE2B cdfa37f3aebdd8109653c50d6e977a443173fe4ff18b3644a030bba065c7ced01bedc98a273ab3a8def73f78efd2458afd16ec68df9f9109b816527383904025 SHA512 9b8ccea9df11d70bb23d7d9983b18d28c648aa0107f9654a79d1cfe97db4633b69dd4b97b76d155aca8553d014a314247851f18d0371717e44a056ee804ccd95
-EBUILD libxmlpp-2.40.1-r1.ebuild 810 BLAKE2B 4304afc18b23bf425c2a681a639028f1b1ceb8b8817a11a30a53c31f0ef045b0d8ab5337c7e385d920da32df5e2b335a6081eb9848cbe647443ce705c5c4202b SHA512 3323241ee093b2a51781fa05f47a84a49da19b837faeca18833ce9008818bd06c8295f5a609f9b876d3dba1b29324533b713fc6063e6c9a39cc54355700da113
+EBUILD libxmlpp-2.40.1-r2.ebuild 800 BLAKE2B 9bdfe8cfbb1fd60fbc1a24c85d25dbf84ce6c09c2b30a39d7aa1965d19c5336a6ccc8b1c6247138a9694e6e3ff9d0c3b8f19f2dcd750a76cf38ab36a61a27cec SHA512 064c18ee596110679368d3aa01a01fd177223677563d1778798bc570f455c59a9c913ea58acff1e6de5f7cc18cb8525df2c61c397116cc4edbe2cc9fc1d68299
 EBUILD libxmlpp-3.0.1-r1.ebuild 792 BLAKE2B 22898cac985950131f251614cb7cf5a6d74c7a8a87ad481b8e0256132579debe669ae62b7195bfebac2be8340a4fa7326f27a607aceb301b31f1552d760a31e1 SHA512 779c51312d48406105d056d9d53bd987f94277e4a48246beebe51d614619f249f8a238d3595aae0032e0842eac35581931ec3900208d4d3e192fe30004431c4f
 MISC metadata.xml 338 BLAKE2B 9c96a9077c38ffe30382bf2566a2e095eb24e2952a1d758b2853fe217a4d1bde2e16f66b424fe5d99195d0a919300f39aeadb77d9525d0d6deb032391e69774c SHA512 b493478db21e762a8109f34bd354be3cad41977aa4ad6f3df7ebaa3177728ae04418c57dfa215cfb3c584cee84f7975cc14421268acfc44b8d62c33701bee236
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild
index dbcdc3dcd83e..0cee82eb4444 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
+
 GNOME_ORG_MODULE="${PN/pp/++}"
 
 inherit gnome2 multilib-minimal
@@ -19,9 +19,8 @@ RDEPEND="
 	>=dev-libs/libxml2-2.7.7[${MULTILIB_USEDEP}]
 	>=dev-cpp/glibmm-2.32:2[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 multilib_src_prepare() {
 	gnome2_src_prepare
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 7f8759ba1fee..072ee696c744 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,10 +1,12 @@
 DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B 2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2 SHA512 1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
 DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c SHA512 9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
 DIST nlohmann_json-3.10.4.tar.gz 7062443 BLAKE2B 7f526d12c4ce8148c874c76d280090ef69ae3adf817b63758bbcc23ff9476e119ede90bebc397b9bb84b54012f057e3e010d643c595b4699a8ecd437a5a3f913 SHA512 f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835
+DIST nlohmann_json-3.10.5.tar.gz 7021996 BLAKE2B d4219d2f3168341eb8bd8f84af364e53f6caae67aa080b1ca0479216a98ee0256d5436243273b3c12ccdca904b4b17dbb90cf445fc273424d7dab6d2b95632bc SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2
 DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
 DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
 EBUILD nlohmann_json-3.10.0.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.2.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.4.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
+EBUILD nlohmann_json-3.10.5.ebuild 1707 BLAKE2B 9da7b49fd416886d6a394315f53bcd5eb770c551661f8d5555af920ddd181db794a10e038eb46e78225097d9be5ba5df38af6cd911aba17d356170823504b42a SHA512 bc597ffe28c6d8d1f7cb0c616d4679d4ac749e9f30a2c28950c7aa06871766d7c528801d43b31805c0534081398326e1ee7d199d47d7f451c0409c0d91938481
 EBUILD nlohmann_json-3.9.1.ebuild 1564 BLAKE2B 5a5b4e28ec5a79e1f263a7a79b28ff000cfe8b62d56e1d1a6c29ab3fc11deff72e443dba409dc68b431b1e85f86a521f6b2383c8fdda66b6cb656178d2e49c47 SHA512 5cbf13fff01f5e1da5d594e86a3c2c22b135785579391c2d4d6067d95572a9fd0109b5580ae67ebadba745e4a1c8a06f789efdb0c17df0babb6161bbc7beda9c
 MISC metadata.xml 338 BLAKE2B c5eb95ba7048308eab4753ea01c015781ce85db42d2e50f8ed9e3f7fb6945cfb8b90f5b3216799ad53137ceef6eae4636eea482e86206b19589ddf2e42caaaa1 SHA512 4198102ff79678a8e9be9146fc97991b1b205be3d34ebaece3dcab46a36ee5af904f463fcd0dc2a88fb362aa7a81e8d713af7b55db594a7069efc0276c94ff49
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
new file mode 100644
index 000000000000..8bc260638ed9
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#DOCS_BUILDER="mkdocs"
+# Needs unpackaged plantuml-markdown too
+# ... but plantuml (Python bindings anyway) need network access to generate bits at runtime.
+#DOCS_DEPEND="dev-python/mkdocs-material-extensions dev-python/mkdocs-minify-plugin"
+#DOCS_DIR="doc/mkdocs"
+inherit cmake
+
+# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
+TEST_VERSION="3.0.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
+SRC_URI="
+	https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+	# Tests are built by default so we can't group the test logic below
+	local mycmakeargs=(
+		-DJSON_MultipleHeaders=ON
+		-DJSON_BuildTests=$(usex test)
+	)
+
+	# Define test data directory here to avoid unused var QA warning, bug #747826
+	use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+
+	# Skip certain tests needing git per upstream
+	# https://github.com/nlohmann/json/issues/2189
+	local myctestargs=(
+		"-LE git_required"
+	)
+
+	cmake_src_test
+}
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index e81a54c0853a..d7e29b7edfdf 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,7 +1,9 @@
 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
+DIST pangomm-2.46.2.tar.xz 674892 BLAKE2B ac86ef1a229dca29eeb41d3751128bed56d182cecfc6655a478b5a7473d10782fe98cdfee4db6f5afbfe9fb8adbf0e646004aa69c4c4058191078c7b5716434b SHA512 79cad137ec9f22e57a177332df6c6e735aa3baf81df36fc706e81e7a89f23ce3179337507388f65a0d0a74733990dc3547c50243a4559dfd0bb065b1828c0474
 DIST pangomm-2.48.1.tar.xz 675452 BLAKE2B bb012fc5cb66d5cb98f522e3706fdd35bcc5692fcd942f86ee1e20116590ceca26874c5a58bd3f8fac4f154700dfb37ea060747a6c3069e67adf83ba551e7abc SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4
 DIST pangomm-2.50.0.tar.xz 753592 BLAKE2B 0db7d43fe2d23e4cfc2b083a4d832c7875c63a261c6b10c62898bf428351ea7d8d05136a46f9498cdb78c51a0223ca988cbc3481041b997dc5d6a9f16f02ec91 SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477
-EBUILD pangomm-2.42.2-r1.ebuild 902 BLAKE2B f6007d42a4d7a3c96e629b55f48205302a210b3d148ff8f339da365783fef7be0293176742842c8d6ef1e6a982ffc25aca613156d3b9bfa4e487c64a8df1362f SHA512 b1c007e95ea89531a548bf0dbf41c4680cc5c29bae46d078cdcdf90d8957a1e774f7be0d6cdb04cad3c7d95c0ee2c3db115fd3182d17a5eed406ab12e6c6fffa
-EBUILD pangomm-2.48.1.ebuild 913 BLAKE2B 522a1085d98102885f01e29c1569319efb35e451767384ce628ccba8b534276f52d989f2e7d7abee77bb28dc911463f5fb0ddaed30a58f83f7f2cf0411b4c9f9 SHA512 669e597784bc7fa94cc4a6b3dcbe606f7232df4aa652fdf3106a16615644940a7bea66b9833cb9dd7ce542a88b93d2740593fa224b2b2603253d6460417b3912
-EBUILD pangomm-2.50.0.ebuild 915 BLAKE2B 21462900f08c9ff26a70237d382e4fac25908866a97e886b62f5802445d7b800813dd5027e38d8578f8d1339fb3810d124012af06198bde53aa77fde62b49f05 SHA512 2f19a6f0f7126dc91f8602dc18bf662658f6c49b935c454025dd2a604c0bb9ffa9229ed6f2774acf8781923836bfc5a042cbf875f02773ba0f1e4f0b23d43102
+EBUILD pangomm-2.42.2-r1.ebuild 928 BLAKE2B 5dd00f655f213c97922e7153c2736b37f8592763304395b7c579079184ab93a15783f9804efaf165c131f1224bc6ba1a353bd6fd439fbef737caa92a240d53e4 SHA512 4c1f9c4c012d8336374808e738b44e7199a4b5ee3fb79b2346355041ff709bdc9d9cf6454936791d5935f3424c45fe9649c9fc4dcd5df32e01f2134e8a8a2c99
+EBUILD pangomm-2.46.2.ebuild 936 BLAKE2B cc03e12faadd011a6b752b021bc12e816cdd64755c78ec26392b22294f6ac151e3be1b5b01beacfed71a52b6a75b8ef0b1b62e8d2f92af6636a5eb90239a203b SHA512 e70b8e74b45435bcc4f36158d55bde06e6cede02bcaaaa4bff8ab34531fea8c8409cbfee8102f5a137acb1a66fc0d1f18a1a26182445be2e4223b0dd53ab72d3
+EBUILD pangomm-2.48.1.ebuild 939 BLAKE2B 46c0e4c819741a8024e198e9d7db7b8ccedfd94254e7988aa9c574c13d499d651a47b10e2329c14b2352f181a5e05b4664db82d73154dda6bbb45bc660492c21 SHA512 f7a20677df58520b041ae054ddcc39953e578453fbbe97c2a4b8a0455510fe30cc3cbf0d93a985d0f843f6bc4d698434eb7c6982f4d3f128f7066c8988e4bb86
+EBUILD pangomm-2.50.0.ebuild 941 BLAKE2B 19c335bae50ef054e92bd1662c30296a77ff27f173d57c11193d83f16e18c8ebd5f66e1aa04d188df16a399b8a58aa5a4cf07e94b1d27d841258d839fa20c373 SHA512 037fe7147732d5a73c296c3833f362eded545cda2820c0099273afca3f1db8d203c334bedf2250327c0835637faf2a7d6679cc9e3bd50d4c7ed01a61c318e7e9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild b/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
index f647a9f7e6e0..83431f4aa4cd 100644
--- a/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Dmaintainer-mode=false
 		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
diff --git a/dev-cpp/pangomm/pangomm-2.46.2.ebuild b/dev-cpp/pangomm/pangomm-2.46.2.ebuild
new file mode 100644
index 000000000000..9bb444efdde0
--- /dev/null
+++ b/dev-cpp/pangomm/pangomm-2.46.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for pango"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+DEPEND="
+	>=dev-cpp/cairomm-1.2.2:0[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.48.0:2[doc?,${MULTILIB_USEDEP}]
+	dev-libs/libsigc++:2[doc?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.45.1[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	${PYTHON_DEPS}
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dmaintainer-mode=false
+		$(meson_native_use_bool doc build-documentation)
+	)
+	meson_src_configure
+}
diff --git a/dev-cpp/pangomm/pangomm-2.48.1.ebuild b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
index 40e232496a17..b03b7ff634f9 100644
--- a/dev-cpp/pangomm/pangomm-2.48.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
@@ -33,6 +33,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Dmaintainer-mode=false
 		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
diff --git a/dev-cpp/pangomm/pangomm-2.50.0.ebuild b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
index ff1f9a59e9ed..7cbee5d0f71b 100644
--- a/dev-cpp/pangomm/pangomm-2.50.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Dmaintainer-mode=false
 		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 203fc329483a..26abbe965adb 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,9 +1,10 @@
 AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
 AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb14997162d5d4e72ec3b48d6ab5ea03995c6a02957331b65172b2d18d932b59bf655352dcbbc178aa508613681f1 SHA512 d65c84a3246dcf5a7c799fd87566834842adfd104bca2c0b0cbd9e2dcae0b900a189154ca9d9c95351c32ff9014cee15f0eb924228e486b58fdcfc624b12d46b
+AUX tbb-2021.5.0-musl-deepbind.patch 982 BLAKE2B a605db66a697ce4cf826448ea843529464b224882708c26623acdaa573a07ca157d562c0e03e12dc8480871f3327daca144a0bc238a5a15421b17966c429c9fd SHA512 6a6deca9d6ac037704e75abaf1544627c369057636214fa0a9c573fc190900226fab3760d8b5afe3ac7ac456bdaa105f0912173d054fe2eaa6dcdbadcb9822d1
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
 DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b SHA512 96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 EBUILD tbb-2020.3.ebuild 3391 BLAKE2B 518fa0a1a5ffc1b572b9366880f2e6a204e46f1751c923a76bd5cc96c69ad9bbc673bc89e23b9d46ef0c94e271d12001d0398d7e641d80a60d03fdaefa0789a5 SHA512 727e6797c6afc06f55359974add2b0578bcafa10b276bd603a8d6dc39adfe175cf89ee6c080d8543b4919bb9349adc812a4e3f39a5dcba68730acae30cc7be32
 EBUILD tbb-2021.4.0.ebuild 933 BLAKE2B ab62b32a69703dcd5c6898b5b1c436ea02c7f6edec00c93612e933cde4fe4f851e6a06b7ed2d887b9f372f2ebc46474632536b948d101c2fd433be17c03bf897 SHA512 fd18c239eff4381968fb99db7bf6f01197a57489ffeeddd7352a7aa0e57300e1ca819093fa97802bf29334e6a6014737f20889d82ad81815af2485c454cf449d
-EBUILD tbb-2021.5.0.ebuild 973 BLAKE2B 211e3d1b57aee76396121d1987b3fb62166336a3876a5783a3d3d09ee6e4ac1b27642f2130e56067d0cbf558a04a305406bd3330719a01ab0a0d4da477dd41ad SHA512 585e108c6c097811f1ce46057d59cef9eb0bd1245f6d76ae860ff48c325192e508ea84a77db28693898ad83d78f83a4701ae680fbb5de1ac925124e7c2768d39
+EBUILD tbb-2021.5.0.ebuild 1023 BLAKE2B e1a9604d2ce1a06a7b28fa71be0ae4fb5672001e4ce809ea744d35f13c5f5a9662d853cce5e44a2f59b231fd4574c45d3b324a91193f797558a11f4119e926ae SHA512 055ebbc9a6a0a7eb34c69d86cb812f411619cf603a9014ec4fcb0e1dc6b56b2d0d13f30ba3b02fee3d61b32e9d683b411f5d397269011ad993a807e8571cd782
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch
new file mode 100644
index 000000000000..014a3863f452
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch
@@ -0,0 +1,25 @@
+https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38
+https://bugs.gentoo.org/830698
+
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 15 Dec 2021 08:08:07 -0800
+Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684)
+
+Exclude non-glibc linux systems along with android
+Fixes
+src/tbb/dynamic_link.cpp:417:29: error: use
+ of undeclared identifier 'RTLD_DEEPBIND'                                                                                    |             flags = flags | RTLD_DEEPBIND;
+|                             ^
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild
index 0a18fece5fd1..2ab975036c65 100644
--- a/dev-cpp/tbb/tbb-2021.5.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild
@@ -25,6 +25,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	# should be in.. 2022?
 	"${FILESDIR}"/${PN}-2021.4.0-lto.patch
+	"${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch
 )
 
 src_configure() {
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index 13339fe475a3..91711c1cfcf5 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1,3 +1,5 @@
 DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
+DIST tclap-1.2.5.tar.gz 4140723 BLAKE2B e3b48dc602ddd64887ca7764008e2ac406866fd7c17bd5b6f31e248b43f18ed6b1c8415fc29a505b3035befcb9716b3259680c7e53a51ad9df107e1cbad92eea SHA512 3b5b3d76e8ff21133001f5f9589fa6ec143729909bf0b9cc9934377bce178360c161fb5c1f4c4d9e9c74b09cff3d65f1d5100e61d4a732283524a78b6f236b10
 EBUILD tclap-1.2.2.ebuild 610 BLAKE2B fd4849d00f2452cc5240171e5b3b7bf3fb3024f5eba499c8d3a9bd1aaed9eb63062cd443208416271d80e4b58c8bc7a16d6233bfbff6faddaa6478f993a7c7ac SHA512 58fa66874b16d6be1bfa8059042b8c61017e4baf54def88599e3fb49968d399fbb59bb71ccaabf08c3af07e7f31ffc7cc069f49420061415781eeb1f3d362deb
+EBUILD tclap-1.2.5.ebuild 614 BLAKE2B 6cfcbb7d8231236f23310d01dd089e082fb0469d5cd470b263f3fa84072fccd50dece9bf8a6b0dcb5708b83c76671108d795e075c11edabd40921261edef89d3 SHA512 3b5149f8d4c853736c53449b329542e896946c1d1f7fe77583382c58cf77dd5c05322966d46391d5cd636581ab67383b9ff354475d1f6983d1587fbc1c5403f5
 MISC metadata.xml 243 BLAKE2B 5e16a9fdda387cc657f2bf36698c5dea7ae7b7219933e48e90a2a3d786710ea96fac0f842767dd766f50db0d4b0c216456259c1e72d638355ad9d09fcb021434 SHA512 46879cd7fdf95e39dc5fc0e8f6a9d811bba3092fbced1cb3f3c6da50462303c6014c42d4f998b77c9335b38f7135ed66cbf0b75ff651f0d11406c89e28424129
diff --git a/dev-cpp/tclap/tclap-1.2.5.ebuild b/dev-cpp/tclap/tclap-1.2.5.ebuild
new file mode 100644
index 000000000000..635d82ad2d8e
--- /dev/null
+++ b/dev-cpp/tclap/tclap-1.2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2007-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Simple templatized C++ library for parsing command line arguments"
+HOMEPAGE="http://tclap.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf $(use_enable doc doxygen)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF}/html install
+}