gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-cpp
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
74 files changed, 843 insertions, 937 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 2157e7a22c20..1a503dfaf81b 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 57bf15c80171..7ab3b209f951 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -2,8 +2,10 @@ AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4
 DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
 DIST abseil-cpp-20210324.1.tar.gz 1774134 BLAKE2B 8dd42b3d60a38995eeeeb72ba8aaa367c3caff118d88069dba9df24b155318ffd6c4e289c263346899bf7fc0bf6e8332380407a8a93c77f8cade0e8e74743b84 SHA512 fe593ed98eeea5461abca95ebb9dd3f7e8eedaa15e009f776945fdbb6ed489c61966611c1c72558d2ccdd541b952a345e51885d522ff29542cbcc837cf565866
+DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 EBUILD abseil-cpp-20200225.2-r1.ebuild 1335 BLAKE2B 36a2211e821fbb9257aae09d0a5b2d49d3ee7e27ffd6eacd21387746983b9f600ddc0137c9581ca88fb2ca3431594590f5b43539f15e8b7bee5ce4ab8b9eb9bb SHA512 7311121c0b25b27b95d19115a194e16dda45f02ed6e2c8fbc83ff6eb44d20500f583e0ae0d2ab5e384b02758c57828521b8845efee5d9f11d50a41c1ff5d0307
 EBUILD abseil-cpp-20200923.3.ebuild 1977 BLAKE2B ef17c3577458836d9f6503691ce4b67102a32dbb661fb33532180a120538dcba59af29b1146401928eab55a59a7333c176fae55e19509249456b0cb73a49f194 SHA512 50a0a8631a37f186364b413dc7ed9b728483361325c0453dae7c9eca5ae3e1a694289feca051d48994161fa93a732651270dd81edbe41cf166052a5f8aa9f84b
-EBUILD abseil-cpp-20210324.1.ebuild 1887 BLAKE2B cb5445c3be46ab7eed9451e40a9e04a6514955b9517727f060686c5e022a96d648df8794605d38ad3e3b8d46b531de523d2b75a3facea7137848f3d4753046da SHA512 ec9dab5feabf0c6354227361ee78a8ec7befa239aecd2d6d76e815fc3dd765a90cc021541a099fc84564edf73f0f4e462abdca2186a81aa3751917cf78130005
+EBUILD abseil-cpp-20210324.1.ebuild 1886 BLAKE2B d6febb034da61816a2b16e7348f5d6aa9fed91c2bdd14a49ce04b4280236a87eec67ad0e5457e1721ff635e79147f876db274cca05f856932f7705cedbf61874 SHA512 eece97f84aac1db70180d382cdac79baa8156256213e84a0ed90958c39337b7fb9517a9d5aeb05f2fb8d45d1c99df87be43df4bd141aedf92ce9de09b5af1be3
+EBUILD abseil-cpp-20210324.2.ebuild 1887 BLAKE2B cb5445c3be46ab7eed9451e40a9e04a6514955b9517727f060686c5e022a96d648df8794605d38ad3e3b8d46b531de523d2b75a3facea7137848f3d4753046da SHA512 ec9dab5feabf0c6354227361ee78a8ec7befa239aecd2d6d76e815fc3dd765a90cc021541a099fc84564edf73f0f4e462abdca2186a81aa3751917cf78130005
 MISC metadata.xml 356 BLAKE2B 192cd53686f89cf886b3dccd4d3c64dd44912c3572c3ec16c786c81c62b5ad1090be7c6e43bf2900d731ca72804f57f17d2eef619b88932d14423e72363e61b2 SHA512 39f66dcee864111412707467b6757811eeb9ddb24cb23bd3ff01b9426dff922fbd69312fda9142e03df146c22cd2b5fc1b06249cd1b6c334b076b798721fdca2
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
index f251363fd3dd..2414ecd661e2 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
@@ -21,7 +21,7 @@ LICENSE="
 	test? ( BSD )
 "
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
new file mode 100644
index 000000000000..f251363fd3dd
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake flag-o-matic python-any-r1 toolchain-funcs
+
+# yes, it needs SOURCE, not just installed one
+GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
+GTEST_FILE="gtest-1.10.0_p20200702.tar.gz"
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+
+LICENSE="
+	Apache-2.0
+	test? ( BSD )
+"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+
+	if use test; then
+		sed -i 's/-Werror//g' \
+			"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
+	fi
+}
+
+src_configure() {
+	if use arm || use arm64; then
+		# bug #778926
+		if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
+			append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		-DCMAKE_CXX_STANDARD=17
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 11fef08c53d7..a5dd817dbd61 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,7 +1,9 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
 DIST asio-1.17.0.tar.bz2 1694631 BLAKE2B 0463355eef1714604290be43247139ea0220c5614c3c280ccf6049b64a2bb920c9eb885cf5f00c7e007caf3b049fe5cd6589dad0cb23cda4994fd31c7ecd8102 SHA512 5978cbf452aff07d6d19a2e641824628f409ab74e2e1a964776dae4c586386149acea56e4c8aa1075b247d2ce566daad640c3bbd15e211df1f73fc7b02964353
 DIST asio-1.18.1.tar.bz2 1729219 BLAKE2B 3f020407403175ffb6777b855a38e708241499e0fc8f1389b367bac4faf1e14b94cdf45f3b5ba64e12303237c8a3f817f7b7c320e7a58d72be6b19e04022c681 SHA512 06b41869858b69bc523564d5b219f8ebc995ca862e989f65233778c7596143075662880b6c5dd2eb24c21ba6e68a450888ab07a6bc8585bb6ede9a738e1e27c0
+DIST asio-1.18.2.tar.bz2 1743146 BLAKE2B 8db47419180095e4f05a63e4f414f33399e44f1dfb36299c70fef8bfef347f25df67ae78abf6b6b051e350b10099ec49e751b129bb1913dadf792e24048233a2 SHA512 ebe659f958b1813c4a843dce94a8f51d3a3b9f8e0237aa0f032009adaf85400b63b04ac8d664c9424397927d34d78206cbc646d921a520ed415c505f086628b1
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 EBUILD asio-1.17.0.ebuild 1121 BLAKE2B b39f6f2a7060601d146fa3146fc0d487c894cf7ac2a4afb2d6b8370692944853f976b16e70a6e30aa3292f6e5b811a0718b503c6c061b49d63dbe87daac6ed46 SHA512 dd346b7cf8b7ff07ae8ddd387065350d1aefc938bb9dc20ab2c0af7946bb455cb5d1694aa064ca4e601ad477099d4ff96b729de524769510a292577ae27fb40e
 EBUILD asio-1.18.1.ebuild 1128 BLAKE2B 51a905624608b573a9bf246531d1c7d53f0fd685c2b02440b5c9493b2969e7ca418b323c8cf70c9f8caa526412f5f7a2c186520554dfc1d9b562d09f3814e20e SHA512 f08b8c89cd36ca32f6c9f58aa72c68abf9962495a6953f36c7df80f6c149099d0540c1dd26b91188a8e1051ac2380e0a054ced86332e3a659599e74c5b0a6bfa
+EBUILD asio-1.18.2.ebuild 1128 BLAKE2B 51a905624608b573a9bf246531d1c7d53f0fd685c2b02440b5c9493b2969e7ca418b323c8cf70c9f8caa526412f5f7a2c186520554dfc1d9b562d09f3814e20e SHA512 f08b8c89cd36ca32f6c9f58aa72c68abf9962495a6953f36c7df80f6c149099d0540c1dd26b91188a8e1051ac2380e0a054ced86332e3a659599e74c5b0a6bfa
 MISC metadata.xml 486 BLAKE2B 90de27749adaf253e5d03d290225f1d8b7f7ce36cf2ada6289d68b07513973fa21a47363aeb965da9914867e954e69b9e4868eb9a4ffe8e6e3a685bbe8ccf1d2 SHA512 11558b26c58abda9bae1b0314be4761f0637652b3ccc978d49f1a4dbfc57e12a126c9a152fabd6a8c81c628e8a47cae58b1456444671331c7d15369d6e07b0ff
diff --git a/dev-cpp/asio/asio-1.18.2.ebuild b/dev-cpp/asio/asio-1.18.2.ebuild
new file mode 100644
index 000000000000..82d648ca221a
--- /dev/null
+++ b/dev-cpp/asio/asio-1.18.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Asynchronous Network Library"
+HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
+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"
+IUSE="doc examples ssl test"
+RESTRICT="!test? ( test )"
+# test searches for libssl during ./configure, and REQUIRED_USE is easier than
+# patching configure to not search for it with USE=-ssl
+REQUIRED_USE="test? ( ssl )"
+
+RDEPEND="dev-libs/boost:=
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		# Don't build nor install any examples or unittests
+		# since we don't have a script to run them
+		cat > src/Makefile.in <<-EOF || die
+			all:
+
+			install:
+
+			clean:
+		EOF
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	default
+
+	if use examples; then
+		# Get rid of the object files
+		emake clean
+		dodoc -r src/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index adce345b52f5..3561bb0253ee 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,5 +1,5 @@
 DIST atkmm-2.28.2.tar.xz 689944 BLAKE2B 24a71e98af483ed5a5a0c517fecca775ad0206b972fc3906b9b002910ca07dd1d1ae1a9aa6f044231470b484d36d580d8d263ac7b8ddee668d3a0e1845bd47b0 SHA512 df20b89b603a6ae419db24b21acbd6a9d0e91c07e374b4b774f6a67581ce1581affb0d079a264f0d7f2e6d8b63210639dd7aa15e7e94fb5904d161e9a2aac286
 DIST atkmm-2.36.1.tar.xz 736828 BLAKE2B 5dc5d8fb9a29fe16bad0aea7737110df08f10504b5994239015a85ebfd98b6e38414259ecb6819e1dd9459fdf49e0f6b85c5ed9936802bd56d5c154c91443add SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a
-EBUILD atkmm-2.28.2.ebuild 1013 BLAKE2B a3c70945d9d5ff0627f91acd206195a74036c5c8e537726d8cb2f0796a600f526ceadd344e47adb600c77be9a8a633ed5874226f3c7c80ff7cce82e93a9f2729 SHA512 8aede60c462a167a5395795b1d9582f23d527065414355ffad99c30c9682ce34aca64c2f611d485714d1782fab1c0a85e19822261eb92844feaa5fdb828afb10
-EBUILD atkmm-2.36.1.ebuild 1017 BLAKE2B d3686cf5ea906f85b8dbc952769a89b81b27ce6a5009c092db272e614c58303c3bb153d29a484f6fdf37bdfbdfe521bcb5e616543146362c91dbdd8037bb3f93 SHA512 efc463b57e62eb5829d9c1ca48bc36d76fb11e00bc234e8760172ebe89bf90f0244b9c0370c062dc2a7cfc53cd7cd0f7c79afbc209769ea897c56b16db66d1c7
+EBUILD atkmm-2.28.2.ebuild 858 BLAKE2B edb3f8f16127788f0c9986657cd1023483257c2a04c7f3db360dc24bbbd370e85bb4eecccba58402585962aa7b4ed4ae21c9327eb063353330c40ff301e7f546 SHA512 bf77530d2443bcef9f964173dd4b049038e58b062f9fc108ad407301999472cdea1facc60dd83230f9c6d3a3069df744b0736a81dd086aec56660937391a3e44
+EBUILD atkmm-2.36.1.ebuild 862 BLAKE2B 5ce6805128c9ddb6c5f4c5ad41ef1c41231d9c22696e2c817c25b7577bf5002880e6e00737c845e5b6f7f69d10310be292b2a7a9b6c8f38861bac044d358d091 SHA512 96432de220120835ef6712426eec07b3c719c59a5088eface6e682914e9df1ce6718da077100227ea8bc7ea12421e56170d2a5c9d53c21d020df6708d0518713
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.28.2.ebuild b/dev-cpp/atkmm/atkmm-2.28.2.ebuild
index 01366db0ae40..1ff41a607801 100644
--- a/dev-cpp/atkmm/atkmm-2.28.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
+inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for the ATK library"
 HOMEPAGE="https://www.gtkmm.org"
@@ -32,19 +32,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/atkmm/atkmm-2.36.1.ebuild b/dev-cpp/atkmm/atkmm-2.36.1.ebuild
index 0ab832b961c8..6889038a2d5e 100644
--- a/dev-cpp/atkmm/atkmm-2.36.1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
+inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for the ATK library"
 HOMEPAGE="https://www.gtkmm.org"
@@ -32,19 +32,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 094dff28f8f2..c8fdb6752da2 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,3 +1,5 @@
 DIST benchmark-1.5.3.tar.gz 163465 BLAKE2B cea8929c5595be55e74e6232eb147a00c656cc5afe6f5b9d3d788de002c51c40c46012461a7c6840aff9e590ed4304f24a31249402bbbeae28ec443a433a2e53 SHA512 11f726686ad8b36870fc2a3542fad4c52a58df2eb580564dcfdfb154fe6ac00dbbf69c514395148d7ab11a45e40e869549cf971462c384f59cbae5fa60160e3b
+DIST benchmark-1.5.5.tar.gz 176710 BLAKE2B 394f8b34873ccd45100e3b1f58dd7819d443733d9224ff003a9410ca30d8bacc6c7736b74dd50623144767e840dbc3cd9ff819a60de6e22a00b1edaf802f0992 SHA512 91a2cdf0245625c657b9bb8d76c7d616a99eaed333e42b34ceff4e996b8fa6027b1c7313a815e7b441d2f6e2e1244c139a0911d585bf0d2e767ac3cea23a67d1
 EBUILD benchmark-1.5.3.ebuild 646 BLAKE2B e52d1c59d0baa10accf07140fc6e86921947412b18e75e8119b74bbeaf468ef7cbaf10eb2819f1bc42e522cd89553fb268480e6ebf86d59a79a70eb80bc34cd1 SHA512 72f0128943a5fb9bd355a13e404bfcd3ee57535dbefc1cb82530ddda9af673646d197991cd5388203810db508af8bc68d233cf4879cd56a3bd4e401596658438
+EBUILD benchmark-1.5.5.ebuild 646 BLAKE2B e52d1c59d0baa10accf07140fc6e86921947412b18e75e8119b74bbeaf468ef7cbaf10eb2819f1bc42e522cd89553fb268480e6ebf86d59a79a70eb80bc34cd1 SHA512 72f0128943a5fb9bd355a13e404bfcd3ee57535dbefc1cb82530ddda9af673646d197991cd5388203810db508af8bc68d233cf4879cd56a3bd4e401596658438
 MISC metadata.xml 467 BLAKE2B 67f5526ae27e792ff62d6ae18acd3a0e061f6acb92f034b05f24281a28a3acb4e8482f7f8aea549203b68002ec9813023f09ee3fa7c1de27bf9384c45e5a1d27 SHA512 10ea030f21ab9faa277b1d9a8d2b231390d03ce63198de13a21b6a05052790d0bc65f41968cca7805c92179d34b6d15d1d0ac649b9380ffeb78dea21451aeafa
diff --git a/dev-cpp/benchmark/benchmark-1.5.5.ebuild b/dev-cpp/benchmark/benchmark-1.5.5.ebuild
new file mode 100644
index 000000000000..1463b00dc41b
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.5.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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 ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBENCHMARK_ENABLE_TESTING=$(usex test)
+		-DBENCHMARK_ENABLE_GTEST_TESTS=OFF
+		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
+	)
+
+	use debug || append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index e22ee77fd49b..34ffb719df8e 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,5 +1,5 @@
 DIST cairomm-1.14.3.tar.xz 604572 BLAKE2B a626ee20a229c4597622e7ead3320e5ff971632548488e970b877712d5579731093a14791a13416bec783e180a4f8432be1a743c7a5d77af2fdf30fa36ee3caa SHA512 8dc8a0de733904742c54d4935b596d4103f2e498c6735894bc6a5a81eb4962c6ea944bad94102b18b25850f78e948d38f117c566b197bc76da23a4e88b62ee4e
 DIST cairomm-1.16.1.tar.xz 580020 BLAKE2B 219e83fb328a73cc7c5801aa155156e65245fbccfb3899d98573266f78f9f489ef968fac3c8c577fa98fbdc61af6d873293783c41dd00046e5db327443bdeda2 SHA512 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757
-EBUILD cairomm-1.14.3.ebuild 1189 BLAKE2B eedd45b0933749fa2adc2c51d326434ca2deee616821379dcc27753970855470554c213155bfc5f40b2387c2c85c3748bcb593c696842385007d8ccd9b010cb2 SHA512 53832cc83796fb52035bbf68d9aaa7a89fcf9269e8c582f5b23491dd01b2c4d11f990b21434afaaaa0eb4bfec9df8b28907494b6a4735dda9be0ae7bd4e96faa
-EBUILD cairomm-1.16.1.ebuild 1191 BLAKE2B d25ecc89918250e42b368274c0fa3ae80373e11dbb57ec7eae80711ac3e7db005a12b8ef8105cfc707a045267d51bc26dee8a28d18baa03a2023797c9a78e56f SHA512 440ef8a3e993a42fa60783bc733f3410e870e446112f6f08da0a9ae4072992d297428a8986472484fe9555f867064cf68d29df525e98a72b316784e76393bfdf
+EBUILD cairomm-1.14.3.ebuild 1026 BLAKE2B 98d9c931a0493467bf5a1a49a3febef4aa1ab97942487d9b275e5cd13f81ace328b504330eccac456c509ded91bc439091a71fb4f4e33216ed3fcd9b23d14d6a SHA512 3cef989377d37107e0c559f354da282856171cf6a59a7223ad82777d2f1b1b0d7032d598495c284ddd10653f663cbce569c3ecf98749ccb2322c8c121bd90139
+EBUILD cairomm-1.16.1.ebuild 1022 BLAKE2B 5f937740c97b48527116939b610620456346a9ffa65607eca3c7be5d28140b0df89066be090143f59c15ddd57335470529b011293b1c195dd851b472455b4cd2 SHA512 8a928dc2f3286ee288f56f3c8e8d4a48baf739eec0aeaec3ea58d4163740eebf11615b4810a77fb26004cb5f22efe27813018986e8cb6cf13148a2eee33180d2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/cairomm/cairomm-1.14.3.ebuild b/dev-cpp/cairomm/cairomm-1.14.3.ebuild
index e06b42ee964d..b526ba21b66b 100644
--- a/dev-cpp/cairomm/cairomm-1.14.3.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="C++ bindings for the Cairo vector graphics library"
 HOMEPAGE="https://cairographics.org/cairomm/"
@@ -36,22 +36,10 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		$(meson_native_use_bool doc build-documentation)
 		-Dbuild-examples=false
-		-Dbuild-tests=$(usex test true false)
+		$(meson_use test build-tests)
 		-Dboost-shared=true
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/cairomm/cairomm-1.16.1.ebuild b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
index 67a60abc4574..a2d8be8732dc 100644
--- a/dev-cpp/cairomm/cairomm-1.16.1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="C++ bindings for the Cairo vector graphics library"
 HOMEPAGE="https://cairographics.org/cairomm/"
@@ -36,22 +36,10 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		$(meson_native_use_bool doc documentation)
 		-Dbuild-examples=false
-		-Dbuild-tests=$(usex test true false)
+		$(meson_use test build-tests)
 		-Dboost-shared=true
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index b42f006096d3..6933fb436311 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -1,7 +1,8 @@
 AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183bdcfa7cb51a6109e957650412394796c7825c38dab9f1f9637c436b10714624dcbcfd3b6ab88dbfef9c5de9582e65ccc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3
+AUX clucene-2.3.3.4-fix-clang.patch 2219 BLAKE2B 7572c05d9e2676eedb3aabc8030eea6b97a19af9f02eb1c336b40606105bc89800a8da8ea6f899ef550fa114776133fec962622ac3e337ca0f52fc0305c81bd3 SHA512 f3822c5d127b37fdb0a405a3fa0a2d2a168133da106a222de0311c2074aaacb7d9651a1be7ad7afda44da22cc2c8baa8d5db756aaaef5c344e12d52625e2c2e1
 AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
-EBUILD clucene-2.3.3.4-r6.ebuild 1511 BLAKE2B 2d8a43ef98ed6ad4e57f7e63442acffb3ee100453f6a41de3d708e0a9ae897a3525b39cfeee3499415625b61b1ebf62ddef0822c405dd3fe8970a953490c6acf SHA512 63ede83997d69c90504ca0297330293d40c472b29a7231b62acd188781b160d9d6a23e043450ebe914f176b41f57865a84b5c649d44d111b0dff71c89a0b56d2
+EBUILD clucene-2.3.3.4-r6.ebuild 1558 BLAKE2B 3b429271b2448f85449e5ca90e7c69250902ac181176605a58792bb0fef8b1514a49c60b4406e8c99c608fb6ed838f7405c10580ea320d6768336cdc4f72b136 SHA512 311c6661d88c03a25eca2cee41483123d519b7390607dad040c116fdf3f527043d03f6d524b22d26cb7550ff3540885f36c9490f5bf3464ac34d970a1a7a248e
 MISC metadata.xml 242 BLAKE2B 42f16f7a7f490260e103b34652b1751b3163c9fa9654b5f8eb155b209d6c57b93634afcb3203b4fdfe45fc8ac2c3e13182750a2ccfd9c8e726bb5d2ea26c69aa SHA512 8408d869c113d8c878e461e3c796233d353df9869af2424361aae629888ee96876cd2a6a00ee8a39ae2069477821c1c9150ca8169723e46167165c39fbc4ba19
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index c52e641b1f87..45755a6557d1 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 PATCHES=(
+	"${FILESDIR}"/clucene-2.3.3.4-fix-clang.patch
 	"${FILESDIR}/${P}-contrib.patch"
 	"${FILESDIR}/${P}-pkgconfig.patch"
 	"${FILESDIR}/${P}-gcc6.patch"
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch
new file mode 100644
index 000000000000..f743fa8c4480
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch
@@ -0,0 +1,35 @@
+--- /src/core/CLucene/queryParser/QueryParser.cpp.original	2018-08-02 15:11:33.157174224 +0200
++++ /src/core/CLucene/queryParser/QueryParser.cpp	2018-08-02 15:12:33.189175705 +0200
+@@ -79,7 +79,7 @@
+     _T("<RANGEEX_GOOP>")
+ };
+ 
+-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000};
++const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,(int32_t)0x80000000,0x20000000,(int32_t)0x80000000,0x10000,0x80000,0x10000,0x1f68000};
+ const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0};
+ 
+ struct QueryParser::JJCalls {
+--- /src/core/CLucene/queryParser/QueryParserTokenManager.cpp.original	2018-08-02 15:14:27.104178515 +0200
++++ /src/core/CLucene/queryParser/QueryParserTokenManager.cpp	2018-08-02 15:15:10.399179583 +0200
+@@ -15,9 +15,9 @@
+ 
+ CL_NS_DEF(queryParser)
+ 
+-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)};
++const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff)};
+ const int64_t QueryParserTokenManager::jjbitVec0[] = {
+-	_ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)
++	(int64_t)_ILONGLONG(0xfffffffffffffffe), (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff)
+ };
+ const int32_t QueryParserTokenManager::jjnextStates[]={
+ 		15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,
+--- /src/core/CLucene/document/DateTools.cpp.original	2018-08-02 15:20:28.903187441 +0200
++++ /src/core/CLucene/document/DateTools.cpp	2018-08-02 15:20:35.441187602 +0200
+@@ -8,6 +8,7 @@
+ 
+ #include "DateTools.h"
+ #include "CLucene/util/Misc.h"
++#include <time.h>
+ 
+ CL_NS_USE(util)
+ CL_NS_DEF(document)
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 628cf8fe6e8f..b3e34f81fe0b 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -1,12 +1,4 @@
-AUX 1.8.0-glibc212.patch 323 BLAKE2B b5b25950d742041b2f1568043d99a3b7b5e6e44f23b894280b7cb40246bb0f08f91929bcac173de7b206b797ca87943a4230de84b3cf27c0babbc91e938a7f2b SHA512 c7807f0cb867343fb167f8428a143e125a36c5c764f6ff0a0c8edab892c12b636bc7a47e87574e30209ee0cf5500642369e4135799aee3d3f4292423496fdd07
-AUX 1.8.1-autoconf-update.patch 1735 BLAKE2B 8c33d1fb88b3a186e59581f19d97aa2315aaaa901d2d484d4824a4a679ed05a22b402da62bce743b74bc6c06f6f15ac401da960ed5206a2267639844c9d03047 SHA512 5c48300d3476913a96f1ea45853ad6092527490f1e36cab669be74766486f7c13ab86c740603cfe7f5381148a69e60bfb0e968c03c1c579f7aa8d9efb36281b6
-AUX 1.8.1-configure_detect_netfilter.patch 641 BLAKE2B edc5958760633efef678aa0d64cb4d054bb3968f56590ea3e9a0674fa2e01bddc3f6b78622c940072f2ca7843e47d0b6594aced3afc235cef9bca7c940d7205d SHA512 d4c3af631ab0ef37cb5943cd17ba6481e229af3537e73769f13ed6fe45e2671a9e9ee8f14f2243e95fd8b17d4a8dbb2c7945a5de9e4ce3f29e842779c55d0ea0
-AUX 1.8.1-fix-buffer-overflow.patch 442 BLAKE2B bfc345bc3d2df77a48e9b35b6462221fab11cd7ba2589f076b83284a5a24a60f6978f8338c287058bdb747bd58ff08cb6dc825250a005ead327c74f58f39d3b4 SHA512 4c3cece95f4a32ee2b37b37f84462aeda43c2d25c2eb5cfaf4bfbbe2bdc2d7db7c2ead2f6150bb108ea124fc29c277371d1d0f415a6b26df98f515d910cb3e8b
-AUX 1.8.1-fix-c++14.patch 1220 BLAKE2B 10df79cc01b26b5df35ede979743cc2d18598fb47d2d83a30b5b0d11264495965d3af7f84ba6e28e4219cae0742b5293ec2f8c60870cf9a7585e7b999fab2e11 SHA512 222c21e7b0b4e035ec3a36edb5b9e68d345550781f21a8c075835bf6f27ee46f62469a17f4cec3c1c1bb69741661dbcc7071c51c964006201ed8c3ff48a60c80
-AUX 1.8.1-fix-gcc9.patch 1222 BLAKE2B d5f93bb1f34ef563d6cf88007f859891e49a8e5bb561a9f702346407c1b3e6bd3fa535b6d0c3ceaefb6b50ef094aa2e91895565b893b453e774de8cc62fa5843 SHA512 b8c2b4a530418bedfa73b89fe8b4e659e38141ca9f4998d4f5217cfc05355263408e7ec2f726e5f8e8283165725c38c454ce92dd8d3cdf920858d70e63070199
-AUX 1.8.1-gnutls-3.4.patch 1229 BLAKE2B a4936cce4fff5a7935c2bd077add555fa8d9b229afaaec545e78c1f6a7d34f35f7168c2381183ceaf4fd56bd1318a9505305ae59e77c87d9813f485e1aa6936d SHA512 92db4deba0ae612fda5873224641d35d5637a48d553d0afee7749c5477ca19a62640656d4781d101db5b545ddd962ce7c11a6edf33d128b031cafebf3cf6db77
-AUX 1.8.1-libgcrypt.patch 1054 BLAKE2B fc96efbbc132972035ca9622cd21427e8d662a3ee3aa3972690305ca14da04d7665b17d33f4b9d16e5128575ee4d378e031b57cc579d777845fc65c3cbab4abe SHA512 76f444739b370681d1b619b78cc77867da197f149c19d036d9d8b430a7a59d697c7ab30529582c308f77bc584a003dc0701d8c06003329589ade652babe5edd2
-AUX 1.8.1-parallel-build.patch 261 BLAKE2B 71e639f976d1c1893f7e3285cecda841f4c90b1c2a153edda527c47804df8821a14a3c340544a9e0860fb4047af2772f036c0e10380b4025b4538e40082046b2 SHA512 e06ca32ffd811897859ef7bf06f3b7998eaa56c7fcbb01f971ec32b6e75c4242e3a2ed5a1bdaa28c02bae08bfbb386d65ebed3e50e2de759d056f085f1f49c1f
+DIST commoncpp2-1.8.1-patches-r1.txz 7144 BLAKE2B 0d464810afc9aab2b198495789ecfe4c84fab9edf33f85523dc711602a2f1c08c24a5c2cd7fd92ef799e049624159eb373a2accff193ddec1413fc9aa4450a4e SHA512 d8df95b0963a47c7049fe80b21dadd004f0d4a4498139d629dcc65034211e58e2dffa5e2e6ab61eba10b265f2737eb6a78c0c92b6ec13ae50ab5826bf6e4d68b
 DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398 SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe
-EBUILD commoncpp2-1.8.1-r4.ebuild 1539 BLAKE2B 8aabbad57624f37806a75f3db758d1903d28b8746feedf30a500cd77e9f2dc9e7a8bf866e8437d3075bf6e2c72844b522cd1a9da66af07a876a48952ba99ec5f SHA512 0ceccc0a461b7874e01f340a39e4c061df3b006e8f173f79b23547e950208625c9f921556ad64d48fc0a65484c10faec88bc35bcc6bb3c7b18d983586157ca12
+EBUILD commoncpp2-1.8.1-r4.ebuild 1713 BLAKE2B e6bf4767e589130b96818d591b3a1f4066ebdc91a80d3d1f9ba5e6b6785c530983382b44e0a7a551fe844139380b544f84d36843d4850a822c09e3449579d171 SHA512 ffbc4c155cd686869b743a15ac57ee5da44cd09a2bfa5de9969d3bc7c2346b6f312dcfd164dd9d1ff4bc15f47073db71eb23bb5bba2d81c8b1d710ff665b6c83
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
index aaa9e49a4ed9..399a2c7ed176 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
@@ -7,12 +7,14 @@ inherit autotools
 
 DESCRIPTION="C++ library offering portable support for system-related services"
 HOMEPAGE="https://www.gnu.org/software/commoncpp/"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+SRC_URI="
+	mirror://gnu/commoncpp/${P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}-patches-r1.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc examples gnutls ipv6 ssl static-libs"
+IUSE="debug doc examples gnutls ipv6 ssl"
 
 RDEPEND="
 	sys-libs/zlib:=
@@ -25,19 +27,21 @@ RDEPEND="
 			dev-libs/openssl:0=
 		)
 	)"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.3.6 )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.3.6 )"
 
 PATCHES=(
-	"${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
-	"${FILESDIR}/1.8.0-glibc212.patch"
-	"${FILESDIR}/1.8.1-autoconf-update.patch"
-	"${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
-	"${FILESDIR}/1.8.1-parallel-build.patch"
-	"${FILESDIR}/1.8.1-libgcrypt.patch"
-	"${FILESDIR}/1.8.1-fix-c++14.patch"
-	"${FILESDIR}/1.8.1-gnutls-3.4.patch"
-	"${FILESDIR}/1.8.1-fix-gcc9.patch" # bug 686012
+	"${WORKDIR}"/patches/1.8.1-configure_detect_netfilter.patch
+	"${WORKDIR}"/patches/1.8.1-glibc212.patch
+	"${WORKDIR}"/patches/1.8.1-autoconf-update.patch
+	"${WORKDIR}"/patches/1.8.1-fix-buffer-overflow.patch
+	"${WORKDIR}"/patches/1.8.1-parallel-build.patch
+	"${WORKDIR}"/patches/1.8.1-libgcrypt.patch
+	"${WORKDIR}"/patches/1.8.1-fix-c++14.patch
+	"${WORKDIR}"/patches/1.8.1-gnutls-3.4.patch
+	"${WORKDIR}"/patches/1.8.1-fix-gcc9.patch
+	"${WORKDIR}"/patches/1.8.1-c++17.patch
+	"${WORKDIR}"/patches/1.8.1-openssl-1.1.patch
 )
 
 src_prepare() {
@@ -47,19 +51,19 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_enable debug) \
 		$(use_with ipv6) \
 		$(use_with ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable static-libs static) \
 		$(use_with doc doxygen)
 }
 
 src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
+	use doc && HTML_DOCS=( doc/html/. )
 	default
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc COPYING.addendum
 
diff --git a/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch b/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch
deleted file mode 100644
index 5132554aea1c..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/334135
-
---- a/src/applog.cpp
-+++ b/src/applog.cpp
-@@ -44,6 +44,7 @@
- #include <cstdio>
- #include <stdarg.h>
- #include <errno.h>
-+#include <sys/stat.h>
- 
- // TODO sc: test if has to move up now that it is into commoncpp
- // NOTE: the order of inclusion is important do not move following include line
diff --git a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch b/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
deleted file mode 100644
index c64ba2f65fa9..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,7 +9,8 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
--AC_INIT(src/thread.cpp)
-+AC_INIT
-+AC_CONFIG_SRCDIR([src/thread.cpp])
- AC_CONFIG_MACRO_DIR([m4])
- m4_pattern_allow(LT_VERSION)
- 
-@@ -81,17 +82,17 @@
- AC_SUBST(ccincludedir)
- 
- AC_CONFIG_AUX_DIR(autoconf)
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET
- AC_PROG_CPP
- AC_PROG_CC
- AC_PROG_CXXCPP
- AC_PROG_CXX
- OST_PROG_CC_POSIX
- NP_PROG_MSC
--AC_LIBTOOL_WIN32_DLL
--AM_PROG_LIBTOOL
-+
-+LT_INIT([win32-dll,disable-static])
- AM_INIT_AUTOMAKE(commoncpp2, [$VERSION])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- AC_C_RESTRICT
- AC_C_VOLATILE
-@@ -395,10 +396,11 @@
- #endif
- 
- ])
--
-+AC_ARG_WITH([doxygen],
-+    AS_HELP_STRING([--without-doxygen], [Do not build documentation]))
- AC_PATH_PROG(DOXYGEN, doxygen, no)
- AC_SUBST(DOXYGEN)
--AM_CONDITIONAL(DOXY, test "$DOXYGEN" != "no")
-+AM_CONDITIONAL([DOXY], [test "x$with_doxygen" != "xno"])
- 
- AM_CONDITIONAL(GETOPT_LONG, [test ! -z "$LIBGETOPTOBJS"])
- 
-@@ -408,10 +410,11 @@
- AC_SUBST(LIB_VERSION)
- AC_SUBST(LIB_MAJOR)
- 
--AC_OUTPUT([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
-+AC_CONFIG_FILES([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
- src/Makefile w32/Makefile w32/vs2008/Makefile w32/vs2008/ccext2.vcproj w32/vs2008/ccgnu2.vcproj w32/vs2008/common.sln m4/Makefile doc/Doxyfile
- doc/Makefile demo/Makefile inc/Makefile inc/cc++/Makefile Makefile
- commoncpp2.spec tests/Makefile commoncpp2.list w32/ccgnu2.dsp w32/ccext2.dsp w32/ccgnu2.vcproj w32/ccext2.vcproj])
-+AC_OUTPUT
- 
- # if test ! -f inc/cc++/thread.h ; then
- #   cp ${srcdir}/inc/cc++/*.h inc/cc++ ; fi
diff --git a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch b/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
deleted file mode 100644
index b6ebf0e0f4a4..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/m4/ost_socket.m4 b/m4/ost_socket.m4
-index bd9db7c..122c938 100644
---- a/m4/ost_socket.m4
-+++ b/m4/ost_socket.m4
-@@ -93,6 +93,9 @@ AC_DEFUN([OST_SYS_SOCKET],[
-                 AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
-                     [#ifdef HAVE_LIMITS_H
-                     #include <limits.h>
-+                    #endif
-+                    #ifdef HAVE_NETINET_IN_H
-+                    #include <netinet/in.h>
-                     #endif])
-                 if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" &&
-                    [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
deleted file mode 100644
index e68b00576cdb..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/inaddr.cpp b/src/inaddr.cpp
-index 5a4b9c4..50127f3 100644
---- a/src/inaddr.cpp
-+++ b/src/inaddr.cpp
-@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char *host)
-             if(ipaddr)
-                 delete[] ipaddr;
-             ipaddr = new struct in_addr[1];
--            memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
-+            memset((void *)&ipaddr[0], 0, sizeof(*ipaddr));
-             return;
-         }
- 
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch
deleted file mode 100644
index cc921060b303..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix building with C++14, which errors out due changed noexcept()
-semantics for dtors caught by -Werror=terminate.
-
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595422
-
---- a/src/nat.cpp
-+++ b/src/nat.cpp
-@@ -145,11 +145,11 @@
-     "nat lookup successful",
-     "nat address not in table",
-     "nat not supported/implemented",
--    "unable to open device "NAT_DEVICE,
-+    "unable to open device " NAT_DEVICE,
-     "unable to get socket name",
-     "unable to get peer name",
-     "unable to get socket type",
--    "unable to lookup, nat "NAT_SYSCALL" failed",
-+    "unable to lookup, nat " NAT_SYSCALL " failed",
-     "unkown nat error code"
- };
- 
---- a/src/socket.cpp
-+++ b/src/socket.cpp
-@@ -2971,12 +2971,7 @@
- 
- TCPStream::~TCPStream()
- {
--#ifdef  CCXX_EXCEPTIONS
--        try { endStream(); }
--        catch( ... ) { if ( ! std::uncaught_exception()) throw;};
--#else
--        endStream();
--#endif
-+    endStream();
- }
- 
- #ifdef  HAVE_GETADDRINFO
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -441,12 +441,7 @@
- 
- SSLStream::~SSLStream()
- {
--#ifdef  CCXX_EXCEPTIONS
--    try { endStream(); }
--    catch( ...) { if ( ! std::uncaught_exception()) throw;};
--#else
-     endStream();
--#endif
- }
- 
- #ifdef  CCXX_NAMESPACES
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch
deleted file mode 100644
index 795e44178c64..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/686012
-In file included from ../inc/cc++/thread.h:50,
-                 from thread.cpp:41:
-../inc/cc++/string.h:734:35: error: friend declaration of ‘std::istream& getline(std::istream&, ost::String&, char, size_t)’ specifies default arguments and isn’t a definition [-fpermissive]
-  734 |     friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
-      |                                   ^~~~~~~
-
---- a/inc/cc++/string.h
-+++ b/inc/cc++/string.h
-@@ -58,6 +58,9 @@
- 
- class MemPager;
- 
-+class String;
-+__EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
-+
- /**
-  * This is a generic and portable string class.  It uses optimized
-  * memory allocation strategies to efficiently handle smaller string
-@@ -731,7 +734,7 @@
-      * @param delim deliminator to use.
-      * @param size optional size limitor.
-      */
--    friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
-+    friend std::istream &getline(std::istream &is, String &str, char delim, size_t size);
- 
-     /**
-      * Stream the content of our string variable directly to a C++
diff --git a/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch b/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch
deleted file mode 100644
index b7365b822065..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ba702b6034444c2e30b0990d06e28bb2dea8ecb7 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 4 Mar 2017 01:36:23 +0200
-Subject: [PATCH] ssl: support gnutls-3.4
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/ssl.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/ssl.cpp b/src/ssl.cpp
-index 5bf526d..38ef0a7 100644
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -344,9 +344,6 @@ ssize_t SSLStream::readData(void *target, size_t size, char separator, timeout_t
- #ifdef  CCXX_GNUTLS
- bool SSLStream::getSession(void)
- {
--        const int cert_priority[3] =
--        {GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0};
--
-     if(ssl)
-         return true;
- 
-@@ -362,7 +359,7 @@ bool SSLStream::getSession(void)
- 
-     gnutls_set_default_priority(ssl->session);
-     gnutls_certificate_allocate_credentials(&ssl->xcred);
--    gnutls_certificate_type_set_priority(ssl->session, cert_priority);
-+    gnutls_priority_set_direct(ssl->session, "NORMAL:+CTYPE-OPENPGP", NULL);
-     gnutls_credentials_set(ssl->session, GNUTLS_CRD_CERTIFICATE, ssl->xcred);
-     gnutls_transport_set_ptr(ssl->session, (gnutls_transport_ptr)so);
-     if(gnutls_handshake(ssl->session)) {
--- 
-2.10.2
-
diff --git a/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch b/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch
deleted file mode 100644
index 08e24e1a06a9..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -99,35 +99,7 @@
-     return 0;
- }
- 
--extern "C" {
--    static int _wrap_mutex_init(void **priv)
--    {
--        return _gcry_mutex_init((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_destroy(void **priv)
--    {
--        return _gcry_mutex_destroy((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_lock(void **priv)
--    {
--        return _gcry_mutex_lock((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_unlock(void **priv)
--    {
--        return _gcry_mutex_unlock((Mutex **)(priv));
--    }
--
--    static struct gcry_thread_cbs _gcry_threads =
--    {
--        GCRY_THREAD_OPTION_PTHREAD, NULL,
--        _wrap_mutex_init, _wrap_mutex_destroy,
--        _wrap_mutex_lock, _wrap_mutex_unlock
--    };
--
--};
-+GCRY_THREAD_OPTION_PTHREAD_IMPL;
- 
- #endif
- 
-@@ -135,7 +107,7 @@
- public:
-     _ssl_global() {
- #ifndef WIN32
--        gcry_control(GCRYCTL_SET_THREAD_CBS, &_gcry_threads);
-+        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
- #endif
-         gnutls_global_init();
-     }
diff --git a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch b/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch
deleted file mode 100644
index 149677ca89b4..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -47,6 +47,7 @@
- 
- if EXTRAS
- libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
-+libccext2_la_DEPENDENCIES = libccgnu2.la
- libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
- 
- if GETOPT_LONG
-
diff --git a/dev-cpp/ctemplate/Manifest b/dev-cpp/ctemplate/Manifest
index 47657c0f56b1..c19bab8018be 100644
--- a/dev-cpp/ctemplate/Manifest
+++ b/dev-cpp/ctemplate/Manifest
@@ -1,4 +1,4 @@
 AUX 70ctemplate-gentoo.el 282 BLAKE2B 6004cc2b2e543f47c0c808bf494160c4b7e7e4768a954c1b0d99bc065a89145875dfc2b1e386bdf3a5e4dbb375a0bf5badc45b1666320f2a00fa8bd108f16c09 SHA512 36bc5424cb6dce40026f1d08b8764bf43d42159ff20e7d81484f5baf1c1e3c2042c12b1a60fc3cef48e297e816a12dbc41169988a6537ee41a2e2528b3c834a3
 DIST ctemplate-2.4.tar.gz 391923 BLAKE2B 96b585ed6ca323fc461857e1f2f381e0ca5c229d8c6039c24efcf34fb9ddf45cc36bef141af337e591e1cdd95ca510ea5ba1e539554322c578c25187b1906195 SHA512 4955489e7327bce18802d50fd9dfc8ac12af685e556d1c9d0eb2b7a2f4a9b6086e30be8388d694ec8912623738973d0c76e9ca97196c63c139ee5b468d4858b7
-EBUILD ctemplate-2.4.ebuild 1519 BLAKE2B b0efc9e593e698a8f1747885d7e1d8554b16a6130c48b4093257f64cf713d856ccdf42750e5829b78e2dd15090c6e73299818b145a4ca2d86ffad1881681bbe0 SHA512 eeb9739d659829dfbbcb3392ee8ad2977a8e2835ae0552e5f29db0e09eb1a754bda1f4a6bbf9992512387a91360e9a54ad6d4577824995dd43bc35929f5d5424
+EBUILD ctemplate-2.4.ebuild 1521 BLAKE2B a2f09889458d826530b80c0c4f348f98d9c80c6d60d414949269d2782de56f85d330fa043dcc20ca28e93932425ee2cfaabce00669f4ea1ec8ea1cd3eac43dd0 SHA512 e4978012875f94d8807d343fc09e46a05afc22824b463226adcd43d2eadee76d1db5c4ecb3db8ff269486438ade74521a22ff53a6dca3410b30b57424c194c42
 MISC metadata.xml 313 BLAKE2B 881d0e8b5849fc9ab98017806d6989ae27d27268bcfa6178db02eb2ef64e88509fd3230faa99440a866d9941832c1a7bf0dfc31f97244be2e04b3438db9bff8e SHA512 2d6beb50366ed619ca45b0552392b711e286f5d657946c7edc0c40aad5be2d1cc345ad1821649ac7d539f21880cb50c6d127a2584f19b82fad2d6cdc74644655
diff --git a/dev-cpp/ctemplate/ctemplate-2.4.ebuild b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
index 1d82a92bb5de..0c28fddff04c 100644
--- a/dev-cpp/ctemplate/ctemplate-2.4.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools elisp-common python-any-r1
 
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 80c7f612d486..3e82e6d7da1b 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -3,5 +3,5 @@ AUX eigen-3.3.9-max-macro.patch 476 BLAKE2B aa2e810a7be5a934a8bf5844b7e24633ab8f
 DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
 DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
 EBUILD eigen-3.3.7-r1.ebuild 2251 BLAKE2B 8ac30181d5c64ecb1a5ba47d386b00962e772319dfaeb393deb1c0d742a8c4721b4ea57de43ee79c754634872b455e0ae6a086617b46b4ca9bf19b9ff038a20e SHA512 02b5f22b042d817b9d4729bc13bea27b54683508db23d22ae0215003f49a7b9f70069e92911f9e4e40d5f71ac847035cc89843f426b7dcfca214e1e4cd3034eb
-EBUILD eigen-3.3.9.ebuild 2496 BLAKE2B abd67d587c30453b048bfc2ad6115c87543940269fa454381cd358293ea2073d4867eb51a8f5dd932517453cbe8fa5d3399942cfe8cd9763827be19dea61297e SHA512 40cff68d42189cd386ed5d68fc061b6987562d09845bae6c365ec7c2d4371bba759834f7a2484d3d9ccd18ce726c96124b559801c989895459971fd5f3c24be1
+EBUILD eigen-3.3.9.ebuild 2503 BLAKE2B e0c027e01780cd25abce3f71812e75699ac26a863eeb9b5631f3e198c5b528616caafcaab76f0d7264d61081bde08997f08a43ba5f4ad6a63ff2d3c405db9e2d SHA512 e65e2f1fea526cfaacfdd6fa65605ef9f2dede1c79e78aa8a472869c5ec25b8b2867490c1683d0e8c18f46b623ddca1fc6699fc501e425d6d402f0023536778a
 MISC metadata.xml 886 BLAKE2B 650db5b70b6440feb58275f3c949a9b191121798f47baba77e10e53f176470084136fc880914a7cce29d7424472f1f0116a81e33ab7eb25541e1fa549a9aa362 SHA512 32adfdc1a0501b1926b027d729c2c204d8b84c00623ff250bd8b66877371f812a966aed20efc71b5bf47c3fcfe5249f68a4ef0fb3ab2422eec9c8e7f6af341ca
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild
index 1429076891fa..1577b712187c 100644
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 2db6b7adb231..d441d9d648cc 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,5 @@
 DIST glibmm-2.66.1.tar.xz 7509820 BLAKE2B 4750940093cadbae7c32d387ac8b16c8230eb08ed1645e457edfa27542a2e8a01d70de08bb41d1872dd1f03d1506bfaefc2af582250ca64ad480ce5f98f20d56 SHA512 caf57c2c9d163fff45041c33ed70d2692040d7bea44660d68e8c16a76be2609e0f857a5e16ad5220a0ec681a560c864dc86c2988a2c40741b4f29c9fe5b7d8b9
 DIST glibmm-2.68.1.tar.xz 7657712 BLAKE2B a8141e53f89c981a9916d5f71dfd8c6d08e45a653b98c507acaadfefbedf2f22e8130a722f3398f5e0dff8196ffc8efa6567ebb2c8290f7373e34377e281db18 SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c
-EBUILD glibmm-2.66.1.ebuild 1395 BLAKE2B 16be343fbaeda528b087a7013203ed134caff3cd4fb79c4eef7347029ec5ff299c9a14d62dd65925e160dfb8be1d174354ce2a3a283b20fa48e1da8cd680399d SHA512 d5e37a7e0528197c5a67b451c43936bf57c6918dadf65f59c660ca62bc6d92623d02bdfbe65deda74a43c6263cb1e8fd97ddb0d929134aa60134aa1fda29a456
-EBUILD glibmm-2.68.1.ebuild 1359 BLAKE2B bc0d66ed662df3a61153428fb01a0767c55a3a323e5338e45b68448d10ddd09702521acbe9824bb6b0778d95d67c1f7d5065155e2f954c89660f29e31089bc40 SHA512 8175e60c96ee44577b0d7aa7d3e59edbac17bf7e990d2f38b3712bbdab12ddac8dc518df4d92aeeb06c7d22641f299100ed22ef0f6602b3e5139431fef93a98e
+EBUILD glibmm-2.66.1.ebuild 1248 BLAKE2B f5839db3fb4763446ce389490406bb05cbd39452b4c2f4c68d586a7ffe5f462b25193b56251dc2b7d7c75c111931b78680901dad7ed48ac6f00d44add7a3eaf0 SHA512 0259e34926a7facc3816ba360367da7106f60b0f73d9eb2f93aae65b6149c3950159ba4d36f0c6803e82fda045234212517ec551463b0217e9c3e30bbac79fbd
+EBUILD glibmm-2.68.1.ebuild 1212 BLAKE2B f14e59f2fdeb8c35c2ad1ea08cf66ec76d4fbe1cb52b40acbb35030635c00f97b4af1d402e56188cfd5669e5df3b8c7553b3e6ee02bb0e4b2087e14733c77424 SHA512 a9adde41b1ccb31741dccbdf4ae45c74973cbc7419d066f3de5fb1ae0dd9b2e67099a9534893b9af05921375439ad75cc38dcc35d26e405a5987e64bc884e794
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.66.1.ebuild b/dev-cpp/glibmm/glibmm-2.66.1.ebuild
index b72aa8858b3c..8a7bb6f7d9a9 100644
--- a/dev-cpp/glibmm/glibmm-2.66.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
+inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="https://www.gtkmm.org"
@@ -46,21 +46,9 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Dwarnings=min
 		-Dbuild-deprecated-api=true
-		-Dbuild-documentation=$(usex doc true false)
-		-Ddebug-refcounting=$(usex debug true false)
+		$(meson_native_use_bool doc build-documentation)
+		$(meson_use debug debug-refcounting)
 		-Dbuild-examples=false
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-cpp/glibmm/glibmm-2.68.1.ebuild b/dev-cpp/glibmm/glibmm-2.68.1.ebuild
index 2cf6d1781f54..a40dc5dd7ad1 100644
--- a/dev-cpp/glibmm/glibmm-2.68.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.68.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
+inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="https://www.gtkmm.org"
@@ -44,21 +44,9 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Dwarnings=min
 		-Dbuild-deprecated-api=true
-		-Dbuild-documentation=$(usex doc true false)
-		-Ddebug-refcounting=$(usex debug true false)
+		$(meson_native_use_bool doc build-documentation)
+		$(meson_use debug debug-refcounting)
 		-Dbuild-examples=false
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 80f3a878f2d9..ec0a311f7c2b 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -1,11 +1,10 @@
-AUX glog-0.3.2-avoid-inline-asm.patch 1837 BLAKE2B 2cd93d0be42a9cf18e610dbccc3859cf7347d25b9205c6bb69c795e3df63c2fdd31972312afaa835cbf1d5eae8b1b6b274d41093bf35d32db7cba2df8833f8c3 SHA512 d45e6e1ef311a8eaccbbcf802c609c19509b74d0647a6ff4e2f0886ecd52d7f107c76d06cba88036870a4c34c62c19df661c59ea5011dff931ad14a3f5d8ab58
-AUX glog-0.3.4-fix-build-system.patch 4861 BLAKE2B d1c10a8c4b264003e0718da28e1df5a24045a61987dae2412a1c72abcc3ec8d8f01d3f5a4e14a97ebb3b482effe8bafa0fe44710a94d16c5db97d44891ca3a68 SHA512 ba162ebb8395044b2bb7b1982a463be01155772acf898614cc13f73c523f63094621f887b8a67e6f810d98914177a1a4a82a45ba7ff7415101f70a8915ae42f0
-AUX glog-0.3.4-fix-gcc5-demangling.patch 1992 BLAKE2B 086661e687a98e34777fd0baf97dec3730acad2ff8fd2184bb0a25d3c516125ca97d92bd799f33fabce4aabfeb1fba6dd865c89aef1659095988c34166285f69 SHA512 6f0b6f74dd039672f80dce55526ae784ff56add01ffc0dc0f5adf4c0ebbf9af15cfd054b370a0631fb7044abb20edf6dc79cb0dd2ac49fda7131ec152f54f054
 AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462e58f56b3f337ad845e1ff4bcdf831e7e231e274bce7db9a4228c307b6bb3baa85ce6cb3eee8625414da6273c9 SHA512 8be72be6d6c27bdbe74dbb95cc2534dcfcd7adc1d85fc5f7022a2b7599ae6b148431623140141ed9863d54febaa414673d18b8fbc8c5aea7f0e43b0f92a54432
 AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0
 AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54
-DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c
+AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3029 BLAKE2B 3b46cca54d2fdfdb51a64d9322246c26848c876c19c6aa13cd344d56fb938879339f41aa89348a1ed5fd7d52182f2803be00033052e7460d9776211df2f6448f SHA512 e83c818d4307ded63c6ee750c76f48594f8dc484b45c56b344a761ab4ed4d9e3c3fa66c78456c40d60ed19a9b0b5e07946de6971285d3779704e85eeb95dea98
+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
-EBUILD glog-0.3.4-r1.ebuild 1197 BLAKE2B cea35c7b86d979e70a48d7ad73eea6089da777a81f96c91e4667c20a53faaa2801f4008e4687f584bccfc141139b059249cb4757bc8033c38e7e2409a764b190 SHA512 9fc0cf68094b667b5aaec75c77f313afb9017c1e82c37fd2cd9bdff959e7522a19baf4414287af878a5724694948b6be5f7b3ef03f74ecca31b0802580518f83
+DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
 EBUILD glog-0.4.0.ebuild 1145 BLAKE2B b5ef97d1fae34eb7ee04acce16fcfc0fa842e2eccffb3df84aee526ad45498d94ce25aedaff1067296359dacdd66cf2d65c5fed9a1f2456728d400f35fdbfda7 SHA512 f5d75698b1ba54da2471bda2d21a8058094101bbf127b0cdfd13dfc148994045794838564298dceabd027248830302fb53ed275ddb3afc41a52b961393b547b2
+EBUILD glog-0.5.0.ebuild 1450 BLAKE2B 7156f879e58f723184efc9fc960c926322bf297549d0d5326712d1ebfd6f9d438b9c1bca915ad19bc1fecdaa122b2ff72811b9cfd8328957568b5b1ab3f65971 SHA512 cf566c17f165ab0ab7e20aabca37f1a16fb3842112b7b60a4ad1894add98e4058ed9559979440340ccb34bb3ed3a5aa298132757999e2a0d6a69227ac9e94ae9
 MISC metadata.xml 765 BLAKE2B cb580cd0aa55d17f3b085e5603693b4c7c4e9ddb932e94fe08fb6fc00891d9d8366d9208c2d4cd7c0f56fa451866cb70575987822beb094525adf44b9410a15f SHA512 afecb5d946250c4a3d5098bf407bbe86ed4e48412e3e08282165c04eb4e7dfd4f48c734b57e2105c423bf9181e6cc74680b98d889f67904effe98cc203cac216
diff --git a/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch b/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch
deleted file mode 100644
index b6fa9cdb7374..000000000000
--- a/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-http://code.google.com/p/google-glog/issues/detail?id=130
-
-make the code work with all gcc targets
-
---- a/src/symbolize_unittest.cc
-+++ b/src/symbolize_unittest.cc
-@@ -60,9 +60,7 @@ using namespace GOOGLE_NAMESPACE;
- #    endif  // __i386__
- #  else
- #  endif  // __GNUC__ >= 4
--#  if defined(__i386__) || defined(__x86_64__)
--#    define TEST_X86_32_AND_64 1
--#  endif  // defined(__i386__) || defined(__x86_64__)
-+#  define TEST_WITH_LABEL_ADDRESSES
- #endif
- 
- // A wrapper function for Symbolize() to make the unit test simple.
-@@ -289,22 +287,24 @@ TEST(Symbolize, SymbolizeWithDemanglingStackConsumption) {
- extern "C" {
- inline void* always_inline inline_func() {
-   register void *pc = NULL;
--#ifdef TEST_X86_32_AND_64
--  __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
-+#ifdef TEST_WITH_LABEL_ADDRESSES
-+  pc = &&curr_pc;
-+  curr_pc:
- #endif
-   return pc;
- }
- 
- void* ATTRIBUTE_NOINLINE non_inline_func() {
-   register void *pc = NULL;
--#ifdef TEST_X86_32_AND_64
--  __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
-+#ifdef TEST_WITH_LABEL_ADDRESSES
-+  pc = &&curr_pc;
-+  curr_pc:
- #endif
-   return pc;
- }
- 
- void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
--#if defined(TEST_X86_32_AND_64) && defined(HAVE_ATTRIBUTE_NOINLINE)
-+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ATTRIBUTE_NOINLINE)
-   void *pc = non_inline_func();
-   const char *symbol = TrySymbolize(pc);
-   CHECK(symbol != NULL);
-@@ -314,7 +314,7 @@ void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
- }
- 
- void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() {
--#if defined(TEST_X86_32_AND_64) && defined(HAVE_ALWAYS_INLINE)
-+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ALWAYS_INLINE)
-   void *pc = inline_func();  // Must be inlined.
-   const char *symbol = TrySymbolize(pc);
-   CHECK(symbol != NULL);
diff --git a/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch b/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch
deleted file mode 100644
index cd38111bc81f..000000000000
--- a/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@
- AC_CONFIG_SRCDIR(README)
- AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS([src/config.h])
- 
- AC_LANG(C++)
- 
-@@ -21,7 +21,7 @@
- AC_PROG_CXX
- AM_CONDITIONAL(GCC, test "$GCC" = yes)   # let the Makefile know if we're gcc
- 
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_SUBST(LIBTOOL_DEPS)
- 
- # Check whether some low-level functions/files are available
-@@ -128,32 +128,48 @@
- fi
- 
- # Check if there is google-gflags library installed.
--SAVE_CFLAGS="$CFLAGS"
--SAVE_LIBS="$LIBS"
--AC_ARG_WITH(gflags, AS_HELP_STRING[--with-gflags=GFLAGS_DIR],
--  GFLAGS_CFLAGS="-I${with_gflags}/include"
--  GFLAGS_LIBS="-L${with_gflags}/lib -lgflags"
--  CFLAGS="$CFLAGS $GFLAGS_CFLAGS"
--  LIBS="$LIBS $GFLAGS_LIBS"
--)
--AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0)
--if test x"$ac_cv_have_libgflags" = x"1"; then
--  AC_DEFINE(HAVE_LIB_GFLAGS, 1, [define if you have google gflags library])
--  if test x"$GFLAGS_LIBS" = x""; then
--    GFLAGS_LIBS="-lgflags"
--  fi
--else
--  GFLAGS_CFLAGS=
--  GFLAGS_LIBS=
--fi
--CFLAGS="$SAVE_CFLAGS"
--LIBS="$SAVE_LIBS"
-+AC_ARG_ENABLE([gflags],
-+	AS_HELP_STRING([--enable-gflags], [Enable google-gflags]))
-+
-+ac_cv_have_libgflags=0
-+AS_IF([test "x$enable_gflags" != "xno"], [
-+	SAVE_CFLAGS="$CFLAGS"
-+	SAVE_LIBS="$LIBS"
-+	AC_ARG_WITH([gflags], AS_HELP_STRING([--with-gflags=GFLAGS_DIR]),[
-+		GFLAGS_CFLAGS="-I${with_gflags}/include"
-+		GFLAGS_LIBS="-L${with_gflags}/lib -lgflags"
-+		CFLAGS="$CFLAGS $GFLAGS_CFLAGS"
-+		LIBS="$LIBS $GFLAGS_LIBS"
-+	])
-+
-+	AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0)
-+	CFLAGS="$SAVE_CFLAGS"
-+	LIBS="$SAVE_LIBS"
-+])
-+
-+AS_IF([test "x$ac_cv_have_libgflags" = "x1"], [
-+	AC_DEFINE([HAVE_LIB_GFLAGS], [1], [define if you have google gflags library])
-+	AS_IF([test "x$GFLAGS_LIBS" = "x"], [
-+		GFLAGS_LIBS="-lgflags"
-+	])
-+], [
-+	GFLAGS_CFLAGS=
-+	GFLAGS_LIBS=
-+])
- 
- # TODO(hamaji): Use official m4 macros provided by testing libraries
- #               once the m4 macro of Google Mocking becomes ready.
- # Check if there is Google Test library installed.
--AC_CHECK_PROG(GTEST_CONFIG, gtest-config, "yes")
--AC_CHECK_LIB(gtest, main, have_gtest_lib="yes")
-+AC_ARG_ENABLE([gtest-config],
-+	AS_HELP_STRING([--enable-gtest-config], [Enable looking for gtest-config]))
-+
-+AS_IF([test "x$enable_gtest_config" != "xno"], [
-+	AC_CHECK_PROG(GTEST_CONFIG, gtest-config, "yes")
-+	AC_CHECK_LIB(gtest, main, have_gtest_lib="yes")
-+], [
-+	have_gtest_lib="no"
-+])
-+
- if test x"$GTEST_CONFIG" = "xyes" -a x"$have_gtest_lib" = "xyes"; then
-   GTEST_CFLAGS=`gtest-config --cppflags --cxxflags`
-   GTEST_LIBS=`gtest-config --ldflags --libs`
-@@ -178,17 +194,13 @@
- AM_CONDITIONAL(HAVE_GMOCK, test x"$GMOCK_CONFIG" = "xyes")
- 
- # We want to link in libunwind if it exists
--UNWIND_LIBS=
--# Unfortunately, we need to check the header file in addition to the
--# lib file to check if libunwind is available since libunwind-0.98
--# doesn't install all necessary header files.
--if test x"$ac_cv_have_libunwind_h" = x"1"; then
-- AC_CHECK_LIB(unwind, backtrace, UNWIND_LIBS=-lunwind)
--fi
--AC_SUBST(UNWIND_LIBS)
--if test x"$UNWIND_LIBS" != x""; then
--  AC_DEFINE(HAVE_LIB_UNWIND, 1, [define if you have libunwind])
--fi
-+AC_ARG_ENABLE([unwind],
-+	AS_HELP_STRING([--enable-unwind], [Enable libunwind]))
-+
-+AS_IF([test "x$enable_unwind" != "xno"], [
-+	PKG_CHECK_MODULES([UNWIND], [libunwind > 0.98])
-+	AC_DEFINE([HAVE_LIB_UNWIND], [1], [define if you have libunwind])
-+])
- 
- # We'd like to use read/write locks in several places in the code.
- # See if our pthreads support extends to that.  Note: for linux, it
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -40,12 +40,11 @@
- nodist_gloginclude_HEADERS = src/glog/logging.h src/glog/raw_logging.h src/glog/vlog_is_on.h src/glog/stl_logging.h
- noinst_HEADERS = src/glog/logging.h.in src/glog/raw_logging.h.in src/glog/vlog_is_on.h.in src/glog/stl_logging.h.in
- 
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
- ## This is for HTML and other documentation you want to install.
- ## Add your documentation files (in doc/) in addition to these
- ## top-level boilerplate files.  Also add a TODO file if you have one.
--dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README.windows \
--                doc/designstyle.css doc/glog.html
-+dist_doc_DATA = AUTHORS ChangeLog INSTALL NEWS README
-+dist_html_DATA = doc/designstyle.css doc/glog.html
- 
- ## The libraries (.so's) you want to install
- lib_LTLIBRARIES =
-@@ -215,7 +214,7 @@
- 
- ## This should always include $(TESTS), but may also include other
- ## binaries that you compile but don't want automatically installed.
--noinst_PROGRAMS = $(TESTS) $(TEST_BINARIES)
-+check_PROGRAMS = $(TESTS) $(TEST_BINARIES)
- 
- rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
- 	@cd packages && ./rpm.sh ${PACKAGE} ${VERSION}
diff --git a/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch b/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch
deleted file mode 100644
index fd1518c68583..000000000000
--- a/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b1639e3014996fbc7635870e013559c54e7e3b2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Mart=C3=ADnez=20Moreno?= <ender@debian.org>
-Date: Thu, 13 Aug 2015 09:31:26 -0700
-Subject: [PATCH] Fix ABI demangling for the GCC 5.x case.
-
-When glog is compiled with gcc-5.2 in cxx11 ABI mode, it barfs about unmangled symbols.  This patches it getting inspiration from binutils and demangle.cc itself, although it may be totally wrong or maybe have to use ParseAbiTag in more places.  I haven't read the spec for the symbols, though.
-
-This patch makes the demangle unit test pass correctly.
----
- src/demangle.cc | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/demangle.cc b/src/demangle.cc
-index e858181..0f0c831 100644
---- a/src/demangle.cc
-+++ b/src/demangle.cc
-@@ -439,6 +439,7 @@ static bool ParseExprPrimary(State *state);
- static bool ParseLocalName(State *state);
- static bool ParseDiscriminator(State *state);
- static bool ParseSubstitution(State *state);
-+static bool ParseAbiTag(State *state);
- 
- // Implementation note: the following code is a straightforward
- // translation of the Itanium C++ ABI defined in BNF with a couple of
-@@ -567,6 +568,8 @@ static bool ParseNestedName(State *state) {
- static bool ParsePrefix(State *state) {
-   bool has_something = false;
-   while (true) {
-+    if (ParseAbiTag(state))
-+      continue;
-     MaybeAppendSeparator(state);
-     if (ParseTemplateParam(state) ||
-         ParseSubstitution(state) ||
-@@ -585,6 +588,22 @@ static bool ParsePrefix(State *state) {
-   return true;
- }
- 
-+// <abi-tag>          ::= B <source-name>
-+static bool ParseAbiTag(State *state) {
-+  State copy = *state;
-+
-+  Append(state, "[", 1);
-+  if (ParseOneCharToken(state, 'B') &&
-+      ParseSourceName(state))
-+  {
-+    Append(state, "]", 1);
-+    return true;
-+  }
-+
-+  *state = copy;
-+  return false;
-+}
-+
- // <unqualified-name> ::= <operator-name>
- //                    ::= <ctor-dtor-name>
- //                    ::= <source-name>
diff --git a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
new file mode 100644
index 000000000000..a19ebdcf0fac
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
@@ -0,0 +1,106 @@
+https://github.com/google/glog/issues/125
+https://github.com/google/glog/pull/651
+https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
+
+--- /src/glog/logging.h.in
++++ /src/glog/logging.h.in
+@@ -594,6 +594,9 @@
+                                             void* prefix_callback_data = NULL);
+ #endif
+ 
++// Check if google's logging library has been initialized.
++GOOGLE_GLOG_DLL_DECL bool IsGoogleLoggingInitialized();
++
+ // Shutdown google's logging library.
+ GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();
+ 
+--- /src/logging_custom_prefix_unittest.cc
++++ /src/logging_custom_prefix_unittest.cc
+@@ -221,11 +221,15 @@
+   LogWithLevels(0, 0, 0, 0);  // simulate "before global c-tors"
+   const string early_stderr = GetCapturedTestStderr();
+ 
++  EXPECT_FALSE(IsGoogleLoggingInitialized());
++
+   // Setting a custom prefix generator (it will use the default format so that
+   // the golden outputs can be reused):
+   string prefix_attacher_data = "good data";
+   InitGoogleLogging(argv[0], &PrefixAttacher, static_cast<void*>(&prefix_attacher_data));
+ 
++  EXPECT_TRUE(IsGoogleLoggingInitialized());
++
+   RunSpecifiedBenchmarks();
+ 
+   FLAGS_logtostderr = true;
+@@ -992,8 +996,10 @@
+   base::SetLogger(GLOG_INFO,
+                   new RecordDeletionLogger(&custom_logger_deleted,
+                                            base::GetLogger(GLOG_INFO)));
++  EXPECT_TRUE(IsGoogleLoggingInitialized());
+   ShutdownGoogleLogging();
+   EXPECT_TRUE(custom_logger_deleted);
++  EXPECT_FALSE(IsGoogleLoggingInitialized());
+ }
+ 
+ _START_GOOGLE_NAMESPACE_
+--- /src/logging_unittest.cc
++++ /src/logging_unittest.cc
+@@ -197,8 +197,12 @@
+   LogWithLevels(0, 0, 0, 0);  // simulate "before global c-tors"
+   const string early_stderr = GetCapturedTestStderr();
+ 
++  EXPECT_FALSE(IsGoogleLoggingInitialized());
++
+   InitGoogleLogging(argv[0]);
+ 
++  EXPECT_TRUE(IsGoogleLoggingInitialized());
++
+   RunSpecifiedBenchmarks();
+ 
+   FLAGS_logtostderr = true;
+@@ -965,8 +969,10 @@
+   base::SetLogger(GLOG_INFO,
+                   new RecordDeletionLogger(&custom_logger_deleted,
+                                            base::GetLogger(GLOG_INFO)));
++  EXPECT_TRUE(IsGoogleLoggingInitialized());
+   ShutdownGoogleLogging();
+   EXPECT_TRUE(custom_logger_deleted);
++  EXPECT_FALSE(IsGoogleLoggingInitialized());
+ }
+ 
+ _START_GOOGLE_NAMESPACE_
+--- /src/utilities.cc
++++ /src/utilities.cc
+@@ -62,6 +62,10 @@
+ 
+ static const char* g_program_invocation_short_name = NULL;
+ 
++bool IsGoogleLoggingInitialized() {
++  return g_program_invocation_short_name != NULL;
++}
++
+ _END_GOOGLE_NAMESPACE_
+ 
+ // The following APIs are all internal.
+@@ -176,10 +180,6 @@
+   }
+ }
+ 
+-bool IsGoogleLoggingInitialized() {
+-  return g_program_invocation_short_name != NULL;
+-}
+-
+ #ifdef OS_WINDOWS
+ struct timeval {
+   long tv_sec, tv_usec;
+--- /src/utilities.h
++++ /src/utilities.h
+@@ -163,8 +163,6 @@
+ 
+ const char* ProgramInvocationShortName();
+ 
+-bool IsGoogleLoggingInitialized();
+-
+ int64 CycleClock_Now();
+ 
+ int64 UsecToCycles(int64 usec);
diff --git a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
new file mode 100644
index 000000000000..f9b90c1521aa
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
@@ -0,0 +1,171 @@
+https://github.com/google/glog/issues/649
+https://github.com/google/glog/pull/650
+https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c
+
+--- /src/glog/vlog_is_on.h.in
++++ /src/glog/vlog_is_on.h.in
+@@ -81,10 +81,10 @@
+ // parsing of --vmodule flag and/or SetVLOGLevel calls.
+ #define VLOG_IS_ON(verboselevel)                                \
+   __extension__  \
+-  ({ static @ac_google_namespace@::int32* vlocal__ = NULL;           \
++  ({ static @ac_google_namespace@::SiteFlag vlocal__{NULL, NULL, 0, NULL};       \
+      @ac_google_namespace@::int32 verbose_level__ = (verboselevel);                    \
+-     (vlocal__ == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
+-                        __FILE__, verbose_level__) : *vlocal__ >= verbose_level__); \
++     (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
++                        __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \
+   })
+ #else
+ // GNU extensions not available, so we do not support --vmodule.
+@@ -105,6 +105,13 @@
+ 
+ // Various declarations needed for VLOG_IS_ON above: =========================
+ 
++struct SiteFlag {
++  @ac_google_namespace@::int32* level;
++  const char* base_name;
++  size_t base_len;
++  SiteFlag* next;
++};
++
+ // Helper routine which determines the logging info for a particalur VLOG site.
+ //   site_flag     is the address of the site-local pointer to the controlling
+ //                 verbosity level
+@@ -114,7 +121,7 @@
+ // We will return the return value for VLOG_IS_ON
+ // and if possible set *site_flag appropriately.
+ extern GOOGLE_GLOG_DLL_DECL bool InitVLOG3__(
+-    @ac_google_namespace@::int32** site_flag,
++    @ac_google_namespace@::SiteFlag* site_flag,
+     @ac_google_namespace@::int32* site_default,
+     const char* fname,
+     @ac_google_namespace@::int32 verbose_level);
+--- /src/logging_unittest.cc
++++ /src/logging_unittest.cc
+@@ -98,6 +98,7 @@
+ static void TestRawLogging();
+ static void LogWithLevels(int v, int severity, bool err, bool alsoerr);
+ static void TestLoggingLevels();
++static void TestVLogModule();
+ static void TestLogString();
+ static void TestLogSink();
+ static void TestLogToString();
+@@ -223,6 +224,7 @@
+   TestLogging(true);
+   TestRawLogging();
+   TestLoggingLevels();
++  TestVLogModule();
+   TestLogString();
+   TestLogSink();
+   TestLogToString();
+@@ -453,6 +455,24 @@
+   LogWithLevels(1, GLOG_FATAL, false, true);
+ }
+ 
++int TestVlogHelper() {
++  if (VLOG_IS_ON(1)) {
++    return 1;
++  }
++  return 0;
++}
++
++void TestVLogModule() {
++  int c = TestVlogHelper();
++  EXPECT_EQ(0, c);
++
++#if defined(__GNUC__)
++  EXPECT_EQ(0, SetVLOGLevel("logging_unittest", 1));
++  c = TestVlogHelper();
++  EXPECT_EQ(1, c);
++#endif
++}
++
+ TEST(DeathRawCHECK, logging) {
+   ASSERT_DEATH(RAW_CHECK(false, "failure 1"),
+                "RAW: Check false failed: failure 1");
+--- /src/vlog_is_on.cc
++++ /src/vlog_is_on.cc
+@@ -125,6 +125,8 @@
+ // Pointer to head of the VModuleInfo list.
+ // It's a map from module pattern to logging level for those module(s).
+ static VModuleInfo* vmodule_list = 0;
++static SiteFlag* cached_site_list = 0;
++
+ // Boolean initialization flag.
+ static bool inited_vmodule = false;
+ 
+@@ -190,6 +192,23 @@
+       info->vlog_level = log_level;
+       info->next = vmodule_list;
+       vmodule_list = info;
++
++      SiteFlag** item_ptr = &cached_site_list;
++      SiteFlag* item = cached_site_list;
++
++      // We traverse the list fully because the pattern can match several items
++      // from the list.
++      while (item) {
++        if (SafeFNMatch_(module_pattern, pattern_len, item->base_name,
++                         item->base_len)) {
++          // Redirect the cached value to its module override.
++          item->level = &info->vlog_level;
++          *item_ptr = item->next;  // Remove the item from the list.
++        } else {
++          item_ptr = &item->next;
++        }
++        item = *item_ptr;
++      }
+     }
+   }
+   RAW_VLOG(1, "Set VLOG level for \"%s\" to %d", module_pattern, log_level);
+@@ -198,7 +217,7 @@
+ 
+ // NOTE: Individual VLOG statements cache the integer log level pointers.
+ // NOTE: This function must not allocate memory or require any locks.
+-bool InitVLOG3__(int32** site_flag, int32* site_default,
++bool InitVLOG3__(SiteFlag* site_flag, int32* level_default,
+                  const char* fname, int32 verbose_level) {
+   MutexLock l(&vmodule_lock);
+   bool read_vmodule_flag = inited_vmodule;
+@@ -211,10 +230,17 @@
+   int old_errno = errno;
+ 
+   // site_default normally points to FLAGS_v
+-  int32* site_flag_value = site_default;
++  int32* site_flag_value = level_default;
+ 
+   // Get basename for file
+   const char* base = strrchr(fname, '/');
++
++#ifdef _WIN32
++  if (!base) {
++    base = strrchr(fname, '\\');
++  }
++#endif
++
+   base = base ? (base+1) : fname;
+   const char* base_end = strchr(base, '.');
+   size_t base_length = base_end ? size_t(base_end - base) : strlen(base);
+@@ -244,7 +270,20 @@
+   ANNOTATE_BENIGN_RACE(site_flag,
+                        "*site_flag may be written by several threads,"
+                        " but the value will be the same");
+-  if (read_vmodule_flag) *site_flag = site_flag_value;
++  if (read_vmodule_flag) {
++    site_flag->level = site_flag_value;
++    // If VLOG flag has been cached to the default site pointer,
++    // we want to add to the cached list in order to invalidate in case
++    // SetVModule is called afterwards with new modules.
++    // The performance penalty here is neglible, because InitVLOG3__ is called
++    // once per site.
++    if (site_flag_value == level_default && !site_flag->base_name) {
++      site_flag->base_name = base;
++      site_flag->base_len = base_length;
++      site_flag->next = cached_site_list;
++      cached_site_list = site_flag;
++    }
++  }
+ 
+   // restore the errno in case something recoverable went wrong during
+   // the initialization of the VLOG mechanism (see above note "protect the..")
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild
deleted file mode 100644
index d6fd3e0dc0d4..000000000000
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Google's C++ logging library"
-HOMEPAGE="https://github.com/google/glog"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="gflags +libunwind static-libs test"
-RESTRICT="test"
-
-RDEPEND="
-	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
-	libunwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
-	"${FILESDIR}"/${PN}-0.3.4-fix-build-system.patch
-	"${FILESDIR}"/${PN}-0.3.4-fix-gcc5-demangling.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable gflags) \
-		$(use_enable static-libs static) \
-		$(use_enable test gtest-config) \
-		$(use_enable libunwind unwind)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
new file mode 100644
index 000000000000..4df075626adc
--- /dev/null
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+CMAKE_ECLASS="cmake"
+
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~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}] )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-IsGoogleLoggingInitialized_public.patch"
+	"${FILESDIR}/${P}-vmodule_levels_changeability.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DWITH_CUSTOM_PREFIX=ON
+		-DWITH_GFLAGS=$(usex gflags ON OFF)
+		-DWITH_GTEST=$(usex test ON OFF)
+		-DWITH_UNWIND=$(usex libunwind ON OFF)
+	)
+	if use libunwind; then
+		mycmakeargs+=(
+			-DUnwind_PLATFORM_LIBRARY="${ESYSROOT}/usr/$(get_libdir)/libunwind.so"
+		)
+	fi
+
+	cmake-multilib_src_configure
+}
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index dc4cca89167c..6285aa8bdd3d 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,5 +1,5 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.5.tar.xz 13540488 BLAKE2B b55c55e4bb56bc835be9c09dae59ee103fb0ae80ee99bb54c36c366686f4f1a0309435e91c2e323d7ebfabf7922b76ac85de6a1132c53ab708ba17be661d834b SHA512 8cc5aed26cc631123a5b38bc19643cf9e900beb38681b29ead9049f6b8f930f0b8ace317b8290279ab89cad85075dcb66863174082f77a2b67e4d8bd3c29de49
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
-EBUILD gtkmm-3.24.5.ebuild 1495 BLAKE2B 8166cb99c68c772da990809a1302f93a2a10c5f4f09c3deb72d9579557c2d79c19367e92bd55cdb6390e8f561eb961f6187a7af71dff5fe4e1a835b13c094ca4 SHA512 453cb63072525721025df38aa422d301dc94ec35138a1fde2e3f6a31291e6a67f395ee74b57ca2488bcef95cbcc0dc1afd6e68e9bee07f09438ed34caa5e9e16
+EBUILD gtkmm-3.24.5.ebuild 1365 BLAKE2B e3d078a20f73f1c8ae1037d85d91c1b4e0a87e9e70604c9f93f97142704490a339d54b170adad236f3a201ca23eba2e312cc91bdf6bd0a3ab3a1b4fe1096e1b3 SHA512 e2a7b7af95a30abc9e3b2efa086f80cbb07e655c515d4dc154fae725cf5435966fac13454c9e383c7a2f3a777145514f0de6245c52d835db2d1eb7faa37424d1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
index d1922c85351e..0296e9dcf52c 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1 virtualx
+inherit gnome.org meson-multilib python-any-r1 virtualx
 
 DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="https://www.gtkmm.org"
@@ -42,21 +42,13 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Dbuild-atkmm-api=true
 		-Dbuild-demos=false
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-		-Dbuild-tests=$(usex test true false)
-		-Dbuild-x11-api=$(usex X true false)
+		$(meson_native_use_bool doc build-documentation)
+		$(meson_use test build-tests)
+		$(meson_use X build-x11-api)
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
 multilib_src_test() {
 	virtx meson_src_test
 }
diff --git a/dev-cpp/htmlcxx/Manifest b/dev-cpp/htmlcxx/Manifest
index 01cab033e390..0973eb389d7d 100644
--- a/dev-cpp/htmlcxx/Manifest
+++ b/dev-cpp/htmlcxx/Manifest
@@ -1,3 +1,4 @@
+AUX htmlcxx-0.87-c++17.patch 1096 BLAKE2B a89fe85362fce52fe7bf97c6b453e15bd4801ea45059aa9dcd722ecf91c8f34d8249d17c6de0ac60f87a2f806cf03f124bc98e3cebe4a4c1e97d9c2fe0fcd30f SHA512 220f0bc91ae5f8183d429ef6a50548efb83e64eeb6df7164582295508520c5bd24eaf4853f7f8f3e1b081f63dd0ff2e87f2d18661d9da46973127cce41749b7a
 DIST htmlcxx-0.87.tar.gz 477083 BLAKE2B 94977e758b4f2643f39a464094e315c11b78bc957a3eb054e6a7608828345704a82c3ca36c5ac2855054e7570daebb80d8a63639f3a7197344d25f2d16830702 SHA512 391b94c7ea2d17a04d46ac80f8146e6c2b14b289379c40f3d432ed9c0f36222ced6384d725cdecfc352e28c30f11976249b6a3f7133bbee3161a7883d197fca7
-EBUILD htmlcxx-0.87.ebuild 613 BLAKE2B 536f4256c4c0bcf4311ac5c8ce220907aafdb4c04c776f7d8018875b7e6f2c21a59115445c3695db73fde207c8fa77f52b7d9075030a8ead30f4f8ceb6876f97 SHA512 1b8bba8b6d5c2837617ea90b9aefab2ec8bc4aea29f39d6b1b3a1ec440965e73b961316a8cde85a21e5ad6f1c8caf9b54511a4fd6d1f7d527942fe69356250bf
+EBUILD htmlcxx-0.87.ebuild 658 BLAKE2B a8d5f4eac406028c768eaee09d455ad40a7c7129751210cd55e4e608e8aa5bbc2d3795396d2f7d975b19b2d4ecea07ccec7427bfbadcdcf19ee38912d3edbbab SHA512 8f7f5a562e741ab464d1fccfd03b20d2359057d3f4f0c73a33deb8910b5bcd17fab6a4c9b439bd572c6428c0a046580dcddf688e093c716bafd8b201144e30d5
 MISC metadata.xml 324 BLAKE2B 41ae2c30cadd90db72f85f0b1a8829cccb8aa250bbd57dc10414f856dc3eadee95e94c6261901da3d7555ea30960d06b4110fd3b426e3faa72df809abded6ec3 SHA512 09d19b383ae7c72a26e069063cb28bd4b96d61e4c27505234131ef635dd2643bba26fbde2d972029969fd209eb9b0370c2a95b582b1f1516dbef31c5e7d9ac43
diff --git a/dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch b/dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch
new file mode 100644
index 000000000000..9f8f060de456
--- /dev/null
+++ b/dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch
@@ -0,0 +1,26 @@
+https://sourceforge.net/p/htmlcxx/patches/8/
+
+diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc
+--- a/html/CharsetConverter.cc	2018-12-29 03:13:56.000000000 +0000
++++ b/html/CharsetConverter.cc	2021-05-31 23:03:10.705334580 +0100
+@@ -7,7 +7,7 @@
+ using namespace std;
+ using namespace htmlcxx;
+ 
+-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception)
++CharsetConverter::CharsetConverter(const string &from, const string &to)
+ {
+ 	mIconvDescriptor = iconv_open(to.c_str(), from.c_str());
+ 	if (mIconvDescriptor == (iconv_t)(-1))
+diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h
+--- a/html/CharsetConverter.h	2018-12-29 03:13:56.000000000 +0000
++++ b/html/CharsetConverter.h	2021-05-31 23:03:19.042574598 +0100
+@@ -17,7 +17,7 @@
+ 						: std::runtime_error(arg) {}
+ 			};
+ 			
+-			CharsetConverter(const std::string &from, const std::string &to) throw (Exception);
++			CharsetConverter(const std::string &from, const std::string &to);
+ 			~CharsetConverter();
+ 			
+ 			std::string convert(const std::string &input);
diff --git a/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
index fdcb01bc5cf2..3ac9069308c3 100644
--- a/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
+++ b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-c++17.patch
+)
+
 ECONF_SOURCE="${S}"
 
 multilib_src_configure() {
diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest
index 4a6ea220946f..761be7590614 100644
--- a/dev-cpp/libmcpp/Manifest
+++ b/dev-cpp/libmcpp/Manifest
@@ -1,8 +1,5 @@
 AUX libmcpp-2.7.2-fix-build-system.patch 1008 BLAKE2B d9a87af2faada430c9bd09bb6d4e70f51385725b45dd380b6eecd67e82ed6f2e001f3768b03e08864055fe4119187cf26efd3f09463c64072a9647f63ad251d1 SHA512 25e2e9cd8d18080947a84c0d76f0b34d74b289ccc7c6172278908c026dd6f7379ebb268aae79c3e8ab458f3883aa212e54a137cbaab336c1277acdad07a13a01
-AUX libmcpp-2.7.2-gniibe.patch 1039 BLAKE2B 2d69c087602432013c86cfe3a54f67e113842b0ae1cb9d293862f9ab1956c0b38a86a93c294936eb9e43c9fc6f7c8726bcfe198d0cdd9ede68bb05acec340e46 SHA512 a31a0f2e7430381e5e62ea4257a35891ce9d2f3beed60c6caad3b6d298a58557e9c850223840ef8c6f6c2e8139cf4a4edf29ac93b2532680feafba503fcfaf6d
-AUX libmcpp-2.7.2-zeroc.patch 2342 BLAKE2B d33a7539044a084ce42d5655db298c92b288574ae677621ccbde252abbc46ea7f5c071c500431e2e761c6158944beb2efd7fa95ec8cebd4e5ea1ce3a6ddf4af9 SHA512 86b2e851490e180dfe3028a5a37019ea423924c921ab053a642fb78d4533a87f913ede2928daf9da4daf60e67795a24521186b40c76961ae99ebeb75f8aa95ad
 DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235
 DIST mcpp_2.7.2-5.debian.tar.xz 7528 BLAKE2B 92f455809cfb49d97ca4e62c7087ebe2ebe0ce835e8f12d6e93b1df2ec1e15472f242637f320be2b6bada85b193545fcf3608e8c9a935805a5f052909d3c6f0b SHA512 08509945048ccc4525ecd61d3f901a4d81fe73c1db84c26b76664d5127970af45662a168b99836b58467afc7202a1a20e0dfe8954a87e4cd1368f2136d7955be
-EBUILD libmcpp-2.7.2-r3.ebuild 843 BLAKE2B a2e1db534a44b4a030c750e38c9e948cca083ec61006a2da7494b0f5d07d3e70b86851f90d0ed6a67762c5422de3ce27383a9bb0016a19815ac59283447fc76e SHA512 e92af5e7f009dd942a204088466e7812a5c6bbae9e36a2a56e544f148daeb31c79b1415542ea0bc8a59c4e1fe0ec12a9aba04cf2976b3e642118651d32fbe4ff
 EBUILD libmcpp-2.7.2_p5.ebuild 891 BLAKE2B 9ee84971fc7f77a78d0cb144a809217d597f5448c609225ccd87fc48c8920b36539b8a8d92bbbd9e9896d268e69ab12be8061293a7ff98dcf0a72d2abf158d6d SHA512 fe30f0c6442ad13262589c5e4aa0dd9fabb5ed180b977db59662131b3230118dfd6135f0a8f7a622b33075120c83905fefc507af3b3fd8db6fbe72d55c54157e
 MISC metadata.xml 241 BLAKE2B 243a081993d2297570d94667e0858f3a05bc5a214321a6d5a132f0b7a20a4cdfd9fdd1ccfd9e4753e6ea74e26907b167c484e504671e68458664d0fee31e1a2b SHA512 d242d2c5f6c5b13d0380745c59f6d4672fefcf85b888df7bc88f4501853f262eb1f615b25787ad4bce10fb8b5aad23de076feff3350f214be3d3793a3d249444
diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch
deleted file mode 100644
index cb5aa6c345ce..000000000000
--- a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Simple fixes
- * Fix freeing unmalloced memory
-   The memory of 'in_file' is not malloced, but points to argv[].
-   It is wrong to free it.
- * When there is no input file specified by argv, it causes error
-   and fp_in == NULL.  Check is needed to call fclose for fp_in.
-Author: NIIBE Yutaka
-
-## Fixes the issue reported at:
-## http://www.forallsecure.com/bug-reports/6b11b6fccda17cc467e055ccf7fec3fa2d89ec00/
-
-Index: mcpp-2.7.2/src/main.c
-===================================================================
---- mcpp-2.7.2.orig/src/main.c	2013-07-09 03:03:05.610947658 +0000
-+++ mcpp-2.7.2/src/main.c	2013-07-09 03:03:05.534947624 +0000
-@@ -428,16 +428,11 @@
- 
- fatal_error_exit:
- #if MCPP_LIB
--    /* Free malloced memory */
--    if (mcpp_debug & MACRO_CALL) {
--        if (in_file != stdin_name)
--            free( in_file);
--    }
-     clear_filelist();
-     clear_symtable();
- #endif
- 
--    if (fp_in != stdin)
-+    if (fp_in && fp_in != stdin)
-         fclose( fp_in);
-     if (fp_out != stdout)
-         fclose( fp_out);
diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch
deleted file mode 100644
index fff5d321fe98..000000000000
--- a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Description: Fixes by ZeroC, Inc.
-Author: ZeroC, Inc.
-Bug-Debian: http://bugs.debian.org/611749
-
---- mcpp-2.7.2.orig/src/main.c
-+++ mcpp-2.7.2/src/main.c
-@@ -326,6 +326,8 @@ static void     init_main( void)
-             = FALSE;
-     option_flags.trig = TRIGRAPHS_INIT;
-     option_flags.dig = DIGRAPHS_INIT;
-+    sh_file = NULL;
-+    sh_line = 0;
- }
- 
- int     mcpp_lib_main
---- mcpp-2.7.2.orig/src/support.c
-+++ mcpp-2.7.2/src/support.c
-@@ -188,7 +188,7 @@ static char *   append_to_buffer(
-     size_t      length
- )
- {
--    if (mem_buf_p->bytes_avail < length) {  /* Need to allocate more memory */
-+    if (mem_buf_p->bytes_avail < length + 1) {  /* Need to allocate more memory */
-         size_t size = MAX( BUF_INCR_SIZE, length);
- 
-         if (mem_buf_p->buffer == NULL) {            /* 1st append   */
-@@ -1722,6 +1722,8 @@ com_start:
-                     sp -= 2;
-                     while (*sp != '\n')     /* Until end of line    */
-                         mcpp_fputc( *sp++, OUT);
-+                    mcpp_fputc( '\n', OUT);
-+                    wrong_line = TRUE;
-                 }
-                 goto  end_line;
-             default:                        /* Not a comment        */
---- mcpp-2.7.2.orig/src/internal.H
-+++ mcpp-2.7.2/src/internal.H
-@@ -390,6 +390,8 @@ extern char * const     work_end;   /* E
- extern char     identifier[];       /* Lastly scanned name          */
- extern IFINFO   ifstack[];          /* Information of #if nesting   */
- extern char     work_buf[];
-+extern FILEINFO * sh_file;
-+extern int      sh_line;
-         /* Temporary buffer for directive line and macro expansion  */
- 
- /* main.c   */
-@@ -557,6 +559,6 @@ extern void     init_system( void);
- #endif
- #endif
- 
--#if HOST_HAVE_STPCPY
-+#if HOST_HAVE_STPCPY && !defined(stpcpy)
- extern char *   stpcpy( char * dest, const char * src);
- #endif
---- mcpp-2.7.2.orig/src/system.c
-+++ mcpp-2.7.2/src/system.c
-@@ -3858,6 +3858,9 @@ static int  chk_dirp(
- }
- #endif
- 
-+FILEINFO*       sh_file;
-+int             sh_line;
-+
- void    sharp(
-     FILEINFO *  sharp_file,
-     int         flag        /* Flag to append to the line for GCC   */
-@@ -3868,8 +3871,6 @@ void    sharp(
-  * else (i.e. 'sharp_file' is NULL) 'infile'.
-  */
- {
--    static FILEINFO *   sh_file;
--    static int  sh_line;
-     FILEINFO *  file;
-     int         line;
- 
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
deleted file mode 100644
index b2aa110f1885..000000000000
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=${P/lib/}
-
-DESCRIPTION="A portable C++ preprocessor"
-HOMEPAGE="http://mcpp.sourceforge.net"
-SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
-	"${FILESDIR}"/${PN}-2.7.2-zeroc.patch
-	"${FILESDIR}"/${PN}-2.7.2-gniibe.patch
-)
-
-src_prepare() {
-	default
-
-	# bug #778461
-	sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-mcpplib \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index 71c7bf885530..e9562b12d96e 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,4 +1,4 @@
 AUX lucene++-3.0.7-boost-1.58.patch 1149 BLAKE2B 0021a7a27caabb92232adb42c7b1e8d4832902954018be4bf89e2765562e1e26cc29a67dc75be82f9d2ca7dfddd1e137fc742850d6707527da04574f2b1bbac9 SHA512 7fd0089895ab77da158a49510241fdc894bd3d30f7a6691ddc230f4d52631ec9222a04e13ef0a118f7838b4320fd313502f635c8f0827ba5bb4c6169fdd404b9
 DIST lucene++-3.0.7.tar.gz 2013570 BLAKE2B 26abb1a2fa2a24d7240505f11639c078744313541b4993ed84e4d0129fda74346e841f0c4c7552e58a15dd492af9ffd33ea66866c8e6810cd41e5d675833ce79 SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220
 EBUILD lucene++-3.0.7-r2.ebuild 788 BLAKE2B f129f3b7b48e71b2f1f6d48b4ecfab25190347419d2ee7edd9c6dda718c70f6ec2e795063289e8eecbf195bb4d079ead7d05406070e0a5c7febfd89ade51e90e SHA512 9883dd748b64847b92143ec3cdf9831b06dfa175da977ab9762e7170b39b56e4e82109f907bfd2b9de604ce24c1989503d5151f72dbd350986fa3db137c0fb40
-MISC metadata.xml 339 BLAKE2B e503e6597ab8a20f9cb8613a4a4b7be729dd84d664b03fefa4cebe16da9adbea68de1adabf0055934815a70abfbdcd8f7603c7b7ff4a75bf8fac7973790a7412 SHA512 8864d26ad6eb0c9e565932a3f9a0e28e0e86c51998136e9ff56c2ef3fe0e7eb78bcc5d3b7a5e3acdbd0a89f3cf335e2af837a1ed3f0e492db42492e5a85eac26
+MISC metadata.xml 261 BLAKE2B d227454a3938787f8b92b2e3d4a4867cbc9c9c9c20411002d07c3836db3dee1b47e2437b0d5286c8661b4a92e320700b67a1919b32501f7983df4fdbd3f5ad2d SHA512 0e4c3636144d1005c8b4a01b97d60e8e2b749464c1fdf4a18802504f69212f08e5667e37e54ad408c7cbaecd33efe78acfbb99a10b1eaff964a7b548eb5bccc4
diff --git a/dev-cpp/lucene++/metadata.xml b/dev-cpp/lucene++/metadata.xml
index 3eaca1156f33..6046aadeea59 100644
--- a/dev-cpp/lucene++/metadata.xml
+++ b/dev-cpp/lucene++/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">luceneplusplus/luceneplusplus</remote-id>
 	</upstream>
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index 18dafc2e38f9..3cd80798112b 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,4 +1,4 @@
-DIST notcurses-2.2.8.tar.gz 11255362 BLAKE2B d56f48ecfcfc107d696bb1da029afba8c8a29ea6f0d6317ccdd42d895d890c0cc1d46120566c2f60bd554c2a57aa60409276632216608b29469421a1c22cecf2 SHA512 7455ad1dfbeda68a0b2c35ba3bb28eab3bc0be1ca4db12ce0e3662cf12f1e541dec506c9896624f77ef8032ae6b644ee85ac5abf2272f54fb1c9038b33214892
-DIST notcurses-doc-2.2.8.tar.gz 115654 BLAKE2B c770f81a3ad4071f75e84caaa4370f26e68ced2489586ae857a8e3c2cf998e0d7b5d84b8fd09150ace51898731150e499f648ad2e6d5be442df11c648ba58ccd SHA512 1a2c8931bd4f68dfdd2fa921d06b639d5fa382d826d5c9e0186b4d0160f220f3f32b1eb19f17136c4d452c8afd9f6fff1b4f463a11d847ef9216ddb94b5c8ab8
-EBUILD notcurses-2.2.8.ebuild 1146 BLAKE2B f127e77839e49fb8b5bef79db19fe222e1fd9fe74bd183b65b4ca44b4a155a2f3e7d6481aafec8cc21f3c793cb33119b2471c4c213a57c91ebe27357a136afcb SHA512 50a76ff1d6b274f4f0ed24c5ddf4e5b022174a523d0b66e9f556c644c898a51e27ab334882df8d1313c74c367293bb9e3f7c32eee624e1fe795532722e3113ab
+DIST notcurses-2.3.2.tar.gz 11753206 BLAKE2B 4ed5a26e71827bbdf64f8c4cca7d7c8b4e6858ac8df304e5d96cefccd11fe0563eec241b1fd756d99b2184d46f30b46effe405cd8aba5a79c84d7bef40d857b3 SHA512 cedd965ec0235762e2c978adeec1771c91018fcfbb135330032038cc4ef6122f31990d29f286ad8eca3166a074e2576420779090c154013af5c79f2d723bf530
+DIST notcurses-doc-2.3.2.tar.gz 121736 BLAKE2B a87d2d3919c6dc4ed67ca5e86a984c65eaaa130d6dcaf87e2ea9bd47bafc96c8ddee9133b4e1966812b473b9991fed39b5884b0a35378688c2df7302174f2a28 SHA512 b8886acae72e3df47b7a793f66688bac615bb43164cd81aa8ccba888db25206601d76c4a7db254be3508957be12cd365bcf686166e9ad0ed20a004c2b487c68f
+EBUILD notcurses-2.3.2.ebuild 1146 BLAKE2B f127e77839e49fb8b5bef79db19fe222e1fd9fe74bd183b65b4ca44b4a155a2f3e7d6481aafec8cc21f3c793cb33119b2471c4c213a57c91ebe27357a136afcb SHA512 50a76ff1d6b274f4f0ed24c5ddf4e5b022174a523d0b66e9f556c644c898a51e27ab334882df8d1313c74c367293bb9e3f7c32eee624e1fe795532722e3113ab
 MISC metadata.xml 869 BLAKE2B c5414b2e27b44526c56e9c476d8c5540a3d7b462b70ed6e3e323c0dbee15c704055cc7d17bf270fbb7a6125bfa10a2934c9d56d5c727d73df0c8125ec30671d6 SHA512 f893bc5d9b44d26e178250432be8762524543f0c124c932d535e4f9742924d27a26b065a5d1275dc451f23b0ff72a55a2f5107749021081e7e399617de132f17
diff --git a/dev-cpp/notcurses/notcurses-2.2.8.ebuild b/dev-cpp/notcurses/notcurses-2.3.2.ebuild
index db8a559116e6..db8a559116e6 100644
--- a/dev-cpp/notcurses/notcurses-2.2.8.ebuild
+++ b/dev-cpp/notcurses/notcurses-2.3.2.ebuild
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index bc7d1932c5e6..9cc92d766cfc 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +1,5 @@
 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
 DIST pangomm-2.48.1.tar.xz 675452 BLAKE2B bb012fc5cb66d5cb98f522e3706fdd35bcc5692fcd942f86ee1e20116590ceca26874c5a58bd3f8fac4f154700dfb37ea060747a6c3069e67adf83ba551e7abc SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4
-EBUILD pangomm-2.42.2.ebuild 1051 BLAKE2B 5bc6fb687bfa063c8ef24da32b635882a56203611336cbf36a46c9ecbd9365436e0ee7fb565e75a2e2b824ebd2c11b5d3a71146b31cde06c921a98159a8721f6 SHA512 d35deddcb90fde39fc517d69e2e8d5072d9fc611bff7681fe51c846abbdcea074f5ebf03f9398c9a8465dde239c0b58f85b539a7b342031b7b7f7b6528b4b531
-EBUILD pangomm-2.48.1.ebuild 1056 BLAKE2B 53a0bffa3d9717e84082a841ee2487b3b31f6d3cd3c7df46683366d8524fe82479a0bca797d5a38dafa000783e3d1c740b53089b52bf6e37fbba40a587390c20 SHA512 5efbd571a48911676ab51c342e6e3eb19071452512245a46e1b1ab4253caafd86a0436b6ca9abc34e5766674bd9812766629c287620e444904e4e6b7506ccec3
+EBUILD pangomm-2.42.2.ebuild 896 BLAKE2B 4db541b36f1f915c83332bc7fee378b0c53f2f8c42db90b26cbbcf777d399ec552b773189451856a7c9c223716c57eed076af04e97c402b020fe72ba23441292 SHA512 99547aae9cac1ec8df470a162ffbbc1cd030992cce80aadf2ad406b8a809c468498f64fe0f5cb64c9a9a1ced880dd91ad335a837bebd2563a31e778f85e78b00
+EBUILD pangomm-2.48.1.ebuild 914 BLAKE2B 0148424dfea1af227bcafabda42393b725da368293a0c29de74d27ae9de4fc8ef80ef8745fb3aee1c2c46ab9b79cb92a488fd13b4930a102c982ec9ae417b038 SHA512 53172a7f948f21c98f7346ac149b9c14abd4b6eb1b000a16b0144dd830b8a293d05951c3b7657124574f0e221eddba6933ae52bba17b221d62eca29439d6d6f5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.2.ebuild b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
index d0a2f770d9af..6dbf81680f89 100644
--- a/dev-cpp/pangomm/pangomm-2.42.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
+inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for pango"
 HOMEPAGE="https://www.gtkmm.org"
@@ -33,19 +33,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/pangomm/pangomm-2.48.1.ebuild b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
index 985db3293d5b..a7d98ee56e48 100644
--- a/dev-cpp/pangomm/pangomm-2.48.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
+inherit gnome.org meson-multilib python-any-r1
 
 DESCRIPTION="C++ interface for pango"
 HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
@@ -33,19 +33,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/pystring/Manifest b/dev-cpp/pystring/Manifest
new file mode 100644
index 000000000000..346a2edd3360
--- /dev/null
+++ b/dev-cpp/pystring/Manifest
@@ -0,0 +1,4 @@
+AUX cmake.patch 2385 BLAKE2B dc19b5e192b6403c283b89055c5acbf6abc87722a7b76142c5e41dd6a8ba287981bb05337f6f6d775d9b1bf7c92dd602c4f459857570aac44ee5ec05279eeeb9 SHA512 533ef9fc79a48cfd51d4aa3b9ea77da9e25b3024082aaa40388453fb38b24701f20fa0c7c832a254a5ec61e67e77169294808f4dee4f9f573fbb532cfe415ca4
+DIST pystring-1.1.3.tar.gz 18364 BLAKE2B caab1a3b1dc688ad6ecbb32e5e8139bb883a88b78ce8a021229924d57376e94b17d89277e2fccf4f7ec478c81ee9259c5e56848f4388c44b2eab9cfb841bcfb8 SHA512 a46bb2e96d6eb351a4a8097cde46ac2877d28e88f9e57e0ac36c42e8fc8543517c4be70306a01e2f88a891fc53c612494aeb37f47a200d94b8e1b050ed16eff6
+EBUILD pystring-1.1.3-r1.ebuild 726 BLAKE2B 1124ab03be8243542fea5494903a397a938cf2caed7d388e5e1f84dc9b773450493ea346d54d7fcfcf82c06e449da7d1aa9e13fe67191b928bea7c62a5f61d95 SHA512 48c670b2660e257ffad81d20f6286ebd393464ddb5274bc93168a7eacc66b63837768a73f3ef5ea3f083cc182eec457ad3fa4dac545d8ecafc950f43d8ebca28
+MISC metadata.xml 485 BLAKE2B 4e8eec930350b75ccd1f00a9b283827f8e0e1e1ca10db2f35e7e6df1f1eedcefb3c6863fcbcd0d04a9b95a2ded7dff7c5bb230a11c80a0bcbdac99aa852516a1 SHA512 e8cc70cea2e1d991fe7feacccb373e7c2cf1793968c0ac8c229dba0975f8052dde2f3dec34e6f3c118e663451039cf3be1afaaa0a1ca6a7da6463722c52d15f6
diff --git a/dev-cpp/pystring/files/cmake.patch b/dev-cpp/pystring/files/cmake.patch
new file mode 100644
index 000000000000..bd4e01e6658b
--- /dev/null
+++ b/dev-cpp/pystring/files/cmake.patch
@@ -0,0 +1,84 @@
+From 4f653fc35421129eae8a2c424901ca7170059370 Mon Sep 17 00:00:00 2001
+From: Harry Mallon <harry.mallon@codex.online>
+Date: Thu, 15 Apr 2021 15:50:22 +0100
+Subject: [PATCH] Add a CMake configuration
+
+---
+ CMakeLists.txt                | 56 +++++++++++++++++++++++++++++++++++
+ cmake/pystringConfig.cmake.in |  4 +++
+ 2 files changed, 60 insertions(+)
+ create mode 100644 CMakeLists.txt
+ create mode 100644 cmake/pystringConfig.cmake.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..0081a83
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,56 @@
++cmake_minimum_required(VERSION 3.2)
++
++option(BUILD_SHARED_LIBS "Create shared libraries if ON" OFF)
++
++project(pystring LANGUAGES CXX)
++
++# pystring library ======
++
++add_library(pystring
++    pystring.cpp
++    pystring.h
++)
++set_target_properties(pystring
++    PROPERTIES
++        PUBLIC_HEADER pystring.h
++        SOVERSION 0.0)
++
++set(EXPORT_NAME "${PROJECT_NAME}Targets")
++set(NAMESPACE "${PROJECT_NAME}::")
++
++# test ======
++
++include(CTest)
++
++if(BUILD_TESTING)
++    add_executable(pystring_test
++        test.cpp
++        unittest.h
++    )
++
++    target_link_libraries(pystring_test pystring)
++
++    add_test(NAME pystring_test COMMAND pystring_test)
++endif()
++
++# install and cmake configs ======
++
++include(GNUInstallDirs)
++install(TARGETS pystring
++        EXPORT "${EXPORT_NAME}"
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pystring)
++
++include(CMakePackageConfigHelpers)
++configure_package_config_file(cmake/pystringConfig.cmake.in
++    ${CMAKE_CURRENT_BINARY_DIR}/pystringConfig.cmake
++    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pystring)
++
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pystringConfig.cmake
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pystring)
++
++install(EXPORT "${EXPORT_NAME}"
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pystring
++        NAMESPACE "${NAMESPACE}")
+diff --git a/cmake/pystringConfig.cmake.in b/cmake/pystringConfig.cmake.in
+new file mode 100644
+index 0000000..82e3995
+--- /dev/null
++++ b/cmake/pystringConfig.cmake.in
+@@ -0,0 +1,4 @@
++@PACKAGE_INIT@
++
++include("${CMAKE_CURRENT_LIST_DIR}/@EXPORT_NAME@.cmake")
++check_required_components("@PROJECT_NAME@")
diff --git a/dev-cpp/pystring/metadata.xml b/dev-cpp/pystring/metadata.xml
new file mode 100644
index 000000000000..1ce859e3e5b3
--- /dev/null
+++ b/dev-cpp/pystring/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>darkdefende@gmail.com</email>
+		<name>Sebastian Parborg</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">imageworks/pystring</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/pystring/pystring-1.1.3-r1.ebuild b/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..808484d4a233
--- /dev/null
+++ b/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ functions matching the interface and behavior of python string methods"
+HOMEPAGE="https://github.com/imageworks/pystring"
+
+if [[ "${PV}" == "9999" ]];  then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/imageworks/pystring.git"
+else
+	SRC_URI="https://github.com/imageworks/pystring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+BDEPEND="
+	virtual/libc
+	sys-devel/libtool
+"
+RESTRICT="mirror"
+
+LICENSE="BSD"
+SLOT="0"
+
+PATCHES=(
+	# Patch to convert the project into cmake. Taken from:
+	# https://github.com/imageworks/pystring/pull/29
+	"${FILESDIR}/cmake.patch"
+)
diff --git a/dev-cpp/range-v3/Manifest b/dev-cpp/range-v3/Manifest
index 11ba5fbb1eb6..c538bdc962ae 100644
--- a/dev-cpp/range-v3/Manifest
+++ b/dev-cpp/range-v3/Manifest
@@ -3,5 +3,5 @@ AUX 0.11.0-no-werror.patch 1543 BLAKE2B 31a87abcfbfd23d1f585053befaa869a7299c74d
 DIST range-v3-0.10.0.tar.gz 525765 BLAKE2B 7dd3aed9b35920e058fe43bccd364831a52ad8d50179d1057ab7a37cdef82df021bb09a9913018ae78982fe136c855ba4101e31d35cfc21747af994d0103b95e SHA512 4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723
 DIST range-v3-0.11.0.tar.gz 533136 BLAKE2B d325b14a9d812cb7a600a947126bcecf9384bec987edbad42eec38560415d075815ab92e3f92dad291029fc3e1b1afa1ceaf54443b4a536078047fd32d344394 SHA512 9d6cdcbc1e50104206ba731c3bdc9aab3acfcf69cd83f0e0b4de18b88df2a9e73d64e55638421768d4433c542b6619f6e5af6b17cccd3090cf8b4d4efe9863e4
 EBUILD range-v3-0.10.0-r1.ebuild 854 BLAKE2B 17533e47f71866b1b7be5b7323e7179513dad88287a61506bb1fb145004927a64a2809682b91c548cc89f544238ee3cbbc2ec42159a3686f5a5c8cc4d63a9f0c SHA512 9d326cb93b3bc3fd32adf43ee6229ea672d56be1c711afe0724cd012451d570ac4ea9404992bee1faa64c4cdffacfef78193192953626a771780bb17939cd5cc
-EBUILD range-v3-0.11.0.ebuild 1161 BLAKE2B f001f5d4a642692e9c6399421fc3baf89e07a28dcbc1e3652a593c3cdbc691f83d9f406fa27f08dc5bd9cce5be46ee8980618332f1bd016c0e7841bc08f02472 SHA512 b345ec01463b82499681c2604453df2f9305be3ef5ccfbbff8a0aa5bc4e4b6298b254ab805d950e065ba8cef5cea2092f70b2cdc6c0cc381d72d334699e3ce8a
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD range-v3-0.11.0.ebuild 1165 BLAKE2B a0e718b00b28789a1b933bf6b9f3f07a60e518e52805881098f5b4ed3f2d150cae4ec090cb439fc480ef8c695a40b1cd2baf6e3d5f5a87967fdb0f29ad379e04 SHA512 75699d6332402246f169737ae00114f3aefddb5a5667c2524c90ff0eb5e60d03d77056c745ae4a60f1d78ddf253b9d2d41b2c67b1e728d60a4072b5b09c9e260
+MISC metadata.xml 809 BLAKE2B 473ed4082bb1990ab967559ca5ea5b8bc833939a2c8e1ab659aca78b7eea52071381b3e79cbcab8233f1066b20fc949431618e52727a421c3e6c55ea49349162 SHA512 aaf9daadbe971cc635fffb913b93b7db012edd5969c8ac423be297e22d96aecbb9963f6037664c11a86c068a4249510bbf9048d6c8e6f0de07fd33c6b558ff99
diff --git a/dev-cpp/range-v3/metadata.xml b/dev-cpp/range-v3/metadata.xml
index 7a38bb900964..6c2436936d1a 100644
--- a/dev-cpp/range-v3/metadata.xml
+++ b/dev-cpp/range-v3/metadata.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Ranges are an extension of the Standard Template Library that makes its
+		iterators and algorithms more powerful by making them composable. Unlike
+		other range-like solutions which seek to do away with iterators, in
+		range-v3 ranges are an abstration layer on top of iterators.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">ericniebler/range-v3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/range-v3/range-v3-0.11.0.ebuild b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
index a12572613b50..c1e6dbe55a00 100644
--- a/dev-cpp/range-v3/range-v3-0.11.0.ebuild
+++ b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index 3af25b6a84f3..c1d47f0a5ec3 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,3 +1,3 @@
 DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
-EBUILD robin-hood-hashing-3.11.2.ebuild 481 BLAKE2B 4b9ec0837cfd3bb3584b61577489fffb4bc66052def4b6f79759a5301d5aa310da2b4f288179257a6bd394622e41e5c8076f5bc9286bd30d99f62dc448baee9a SHA512 b6db825452c417502eb3d093a910beb2b9a3eff6e079a6ad6b04aefbe66244134db549dd45284a7a4217573ccfe44ba27389e270c7a53af7804fe6c893c5f388
+EBUILD robin-hood-hashing-3.11.2.ebuild 486 BLAKE2B 8f617add1fa90ac158574417e78f614b7a47b37c45c1b5b1e8e653a3bed9f5bdb4e6eb03acfedeef938937d4c8a12f1397ad7421528024fd8f5573163c0494bd SHA512 44ea5a95747bb4fdb93251258c820a1b0cedf9312916be6664324b7035f60d932a80b5697a8160360e93fea0a5e1a0a7f1b61de9b44975ca8ba931b364771a78
 MISC metadata.xml 431 BLAKE2B 301a6f1026a18fd6d6322f95833f515247111fb9bb88d915724c263e167ea93bbc7f72a734c1aa4fffb5e2068a43f42a104446e7dddaf56334c73eb29541481a SHA512 80aac4cd60e6768675f5cf8619b99d7e4d95b3c691dd4cd7400040610abfdc5f9182e166f5b1c301a14380a3216fca87613dd7e4098fe2e1e2330e49f0660654
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
index 13577d90c006..7b03f771bc40 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index a73bbf1fa14c..aa3b6c2aa3b5 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1,3 +1,3 @@
 DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
-EBUILD tclap-1.2.2.ebuild 583 BLAKE2B 5adde8b982b3007a994a88748681039e151368f446c41982d63eb4513f848a80c4ef5de380bd2cbfaf82170428ff54cce13ceba9d8e40b9d4269ee70e184b117 SHA512 0a6dfdfe8f981d439de7498fe94b630aea218d236b78fac9bbfa3d79a61be28cea6d0a4838e78cd5fac0843875cb6d99672e45fb567b0224adbf49679dda3362
+EBUILD tclap-1.2.2.ebuild 590 BLAKE2B d5665b8bf1b8e69374ff6097bcb1cd1b0c69ed49035a1baf892165db44065f9ecd86b111d3491a7c348a770b13222bc2752b98da0d69615c8629b2d661c0e068 SHA512 d36f7798c82e4e759e1f33d6975bb1b8df129b699295b86b44ef4086eff83f1f7690e7d3ce5d15ce70cbfde6c348e54c62513a2717e66ad6156b563c736d1ff0
 MISC metadata.xml 242 BLAKE2B 82d9a3ad5f6403991bbdd339716e18a462985eaa3980968d67042c7a9541c070363f43924fb9f203a29e73ae2d1023e3b8ab7e307dc381ac5cdb55a588407a0b SHA512 95904a3f7981543557133918ba83a467f03e6839b3248651dc94870f1b8c3788ac50279d59886c54d12328891964c942e1bbd4e1c9d88837643ded5678a10a85
diff --git a/dev-cpp/tclap/tclap-1.2.2.ebuild b/dev-cpp/tclap/tclap-1.2.2.ebuild
index a41b021a70b1..7b6ef32b7547 100644
--- a/dev-cpp/tclap/tclap-1.2.2.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86 ~amd64-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index 5b5d1a123c06..31401cf33a2e 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -1,5 +1,7 @@
 AUX tree-2.81-gcc11.patch 933 BLAKE2B c3b1afcd9325e9b452eb5b9279e4542d9f82f7d8de7060efbabecb302c2c064e5a5891533449e33f75c45078b2bc8c5fc7f7e3e8f204118345a02afa5a32b5c6 SHA512 43ec3975ecbd4b38105a2c4980da8ca0b19a5075bb6eaa5cae313c4f2eb5b8d44118dc55b778c5f973bc5ad69236bb94086cf1c72e8d9a9198ad25c14a8b5fa1
 AUX tree-2.81-test.patch 550 BLAKE2B fe73799591f7f0c65d2f031792bc87b2d85bc143bf4adb35e04db712ef95a5ba0e15d8256aec28a0ac95d2306fa45de41d1a8dc5d53629d38ede35fe87cef256 SHA512 a859891662a1093f517f43a6ea14a4e1f7d81988d0fe83253554bea83bfdecde0b51ed05795d0d6f0b3494a7cde6db56a8304397ea5ad9fb2d446647f4301514
 DIST tree-2.81.tar.gz 1167128 BLAKE2B ea92724b16fc7ea8a5f0036f5a7a57d000d66b332b4ba46139463f707f95922f38b1d4d56a6d2fca0a3c4ece8f11e28bbf4aa6bec5c5a7bc59ccaa36a01413d6 SHA512 85e910fdb19ffd03ae79302a95ebffdb44725fd9f291a61d6912f743b54fe9b3d1c863e00c7e75d238f428946809e42c7ae6379b1051688fb06ee6c6d761d294
+DIST tree-3.17.tar.gz 1178425 BLAKE2B f59239b861c0495c48036d0fffa49370d4cd78a94bfc35348bbbe0232a3c1221293a23366a6289429adabcb00b21292288ce085fa54f74dc204537c95c5b7c37 SHA512 af11f693c13dd37dddf016751c0f975c21d7a5ad405879e18fbe5387400ee1fcfb42942ee8888efffcb0c985d7875f2698591139aeb18b4809e83e225a743112
 EBUILD tree-2.81.ebuild 811 BLAKE2B 2b55073288c7c192ad70c07289cfb950d0f5b5a50d6374e6ca456ba3b62ce1fa0aaad4430d0479492978622e4d6efde76c33c8b1371ceea2441a2e07866190fe SHA512 3e6f39990b5457f9e55078b1625be939a05c33ad7fd40cdb7b64d726ba0b5ed183fcd9ee029d3a12498309529874b10a2b5fd228821e48299c05d1cd4ab8f003
+EBUILD tree-3.17.ebuild 746 BLAKE2B bb2bbc293508182fd862b6288db20b191272cf2580cfcde626e76c07a8cbe21ee44756ccb92bae02e551f8a23ad9b7446bddd8bbcdbac338d1044bb58dc72ec1 SHA512 a970cc1243baa432db7ad20b31e73246e36d1b188effc0c74e3f403d17443daf1b6843b4455c48bccc9b03f6f13381920822968914b3e5cfc17b51187908b106
 MISC metadata.xml 619 BLAKE2B ac5307e69727d5da71a21955619b8e322df63ebd877617c70b494ad541c470ef6df41a90ddf92b132452c293e2fbcbb85f2b72ee372f95491124ab50f7299ce2 SHA512 b2486910e891482643fc8464b11269ca6f83e87a8403edb78b2163e7fa37586b503597f0ea61332439322d257ad239d0c0a210707788043d555a96f3b712cc84
diff --git a/dev-cpp/tree/tree-3.17.ebuild b/dev-cpp/tree/tree-3.17.ebuild
new file mode 100644
index 000000000000..a07ad494486f
--- /dev/null
+++ b/dev-cpp/tree/tree-3.17.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCS_BUILDER="doxygen"
+DOCS_CONFIG_NAME="doxygen_tree.config"
+DOCS_DIR="doc"
+
+inherit docs toolchain-funcs
+
+DESCRIPTION="An STL-like tree class"
+HOMEPAGE="https://github.com/kpeeters/tree.hh"
+SRC_URI="https://github.com/kpeeters/tree.hh/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.hh-${PV}"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	docs_compile
+}
+
+src_test() {
+	cd src || die
+	emake
+	emake run_tests
+}
+
+src_install() {
+	doheader src/tree.hh src/tree_util.hh
+	dodoc -r examples
+	einstalldocs
+}
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 08b6cc2e2c9f..9da7471f4ac6 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -3,4 +3,4 @@ AUX yaml-cpp-0.6.3-abi-breakage.patch 1911 BLAKE2B e595bdf3dff91624aa75a233a6a95
 AUX yaml-cpp-0.6.3-fix-overflows.patch 4671 BLAKE2B 77a4256a41bc5f0de98ada425c15cea6b377430c0303205895136eaa7588f30d646af1cb670d74b3be405e392f1f3648ef3c3378ce115b983c6ff8bfe398d3fd SHA512 ed6a472e712511ccac1c94c837bc64b933e301476a6d19f59f468487d4ace3e1862e7da310214e5f25b81c907d92f3f9690eebce0ec4f7661fc6584de393c5fb
 DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B 07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14 SHA512 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
 EBUILD yaml-cpp-0.6.3-r3.ebuild 1047 BLAKE2B 48e6082d4d7a9814504ace6472166f026bba2267459080cae0b20774a36bb873a25bb2811ab98b1ac24b349d344b304c9e671518444ebf9f704e78dbeb4b6261 SHA512 a8847865f37d31b0f69025f10f95ccf35bdd6c7badeb1377c24b155f9094fbb13bcbd2bb7e3ef9d6d1f60f57998a3f73074251ed043da694de7a48217694905e
-MISC metadata.xml 325 BLAKE2B 8e094a75d87d80e86efaf6ee191225ad0772dac343ae12ec84e73faffc17464c8431ee78018602127fd52441a6b18d09b58127b7d7ea1ee02163f58d327f0f3f SHA512 a4a5de1911c7bfeb37a3ca5aca8b3c044d51230164ac7d14566a9a4064e5202fac0e613089191ea959d0bb3df157049932d394d167e32fc8a432ab35e4cf24ae
+MISC metadata.xml 247 BLAKE2B fe2c3750c42178bce7c4296e9ba85e4a2b6fafeb7507a87df9871d609a7174a33eca7d300bc5544b5d4dac08a35b2306b963fd290410f14385f0d9aabaa59d45 SHA512 999941830de3e04f7426591552486e2f06d038ca6388ec298dd9487a1d60b53ac262ad51ce7a2c74e025e275ef0371feaf8d0b153968831fc01f10a752cbc380
diff --git a/dev-cpp/yaml-cpp/metadata.xml b/dev-cpp/yaml-cpp/metadata.xml
index f1c1935f78d5..60dee465819e 100644
--- a/dev-cpp/yaml-cpp/metadata.xml
+++ b/dev-cpp/yaml-cpp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jbeder/yaml-cpp</remote-id>
 	</upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-cpp
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)