gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-cpp
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
71 files changed, 411 insertions, 743 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a1bcfcf53b2e..af98db5689ae 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 1b9f629bd2b0..bde44a83fc3f 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,6 +1,9 @@
+AUX abseil-cpp-20200923-arm_no_crypto.patch 782 BLAKE2B 88d68fee79064727b32f8468d9f985ed7546ce632b36526ecf6e1b34acfe01910e92fd3dd9901dceabc65614057bc76b14104afba75d21171e62f83d58fb1b51 SHA512 2ca48562f8296f81af0b61eb700e60f5b0c9a59290a472f98a7316034300a0424c5a6e7119d16710eabcfd424ad80b585318571f17fe316d88aa9ee2ba34f04a
 DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
 DIST abseil-cpp-20200923.2.tar.gz 1783972 BLAKE2B 7ba01cab353de9bf34230e0efa567b1dc16680144579841a0fd127b95fb36cc8b63fc3c7da6a0a7c350c32b91955c6b6bb23a3ca52e50174a4dce5d3c1b9e936 SHA512 fdbb0f84265bc1d4f24aac0af6d0eb8cb603f801fc14d63ac1e9d3bab47703a8a2ff5f44a0a4d325819dbea50fc533d967e1bfd65004ec11ef35fadc44a2b855
+DIST abseil-cpp-20210324.1.tar.gz 1774134 BLAKE2B 8dd42b3d60a38995eeeeb72ba8aaa367c3caff118d88069dba9df24b155318ffd6c4e289c263346899bf7fc0bf6e8332380407a8a93c77f8cade0e8e74743b84 SHA512 fe593ed98eeea5461abca95ebb9dd3f7e8eedaa15e009f776945fdbb6ed489c61966611c1c72558d2ccdd541b952a345e51885d522ff29542cbcc837cf565866
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
-EBUILD abseil-cpp-20200225.2.ebuild 902 BLAKE2B 33192eca05a77c195fc65b05928fca880a0dd05943f4ec7d0ed139e90e7b09fc110b0c4983726220dd50b7a0b411c3c0c0050fa3dde2193e863f4e4f95caad6e SHA512 43765b4e66baee817772a9193a58753663c9a8894c31f94fd1b954b662a8cf69172c68762bd91bf9ec33489d799649d90a5f67e3ad9344baed785ba7034ae027
-EBUILD abseil-cpp-20200923.2.ebuild 1531 BLAKE2B b671f0034ec2dcf9ab3197863174c870a6cb53baeb6d500778d802ed119a360364c8a41ace1ff8dde9b9d727d54167396e7b6c965d13d2da876022d4a3004de1 SHA512 6baeae6d005d8fafd8872af40ae45128471e17ef99f1091d4c051472008e93acf1ea8008dbc270b3275fc37364acc91c63fb4f9436ddecab7e90ccd33796b91a
+EBUILD abseil-cpp-20200225.2-r1.ebuild 968 BLAKE2B c873e52fcc15eabf024db55ae332e6997e60c65188bece3cace092de1e0b356072dd6b718ee129974110facc9eb76ca221e66423a643d3e78a2a5625f00b267c SHA512 0e7c2697c8955ab03566b3405131e352e234644ec7310d587edd5c3b07aa11ab0360ca229f5c77cc4b234b70130f77f8ec637c19e1d9ebcac2cf428b89a35ee4
+EBUILD abseil-cpp-20200923.2-r1.ebuild 1923 BLAKE2B b1d33772e9c63060d7f5b4745d71e2ebebe090a36bfec4c934d14c04766fec1fc2997a48c9dc5948a417fa3821b6bf84c4ccddcfdb15e6abd3bc8cff339f67e1 SHA512 63ac983d95e592858131e6771efc61deb0c3e8b010bf4ebd139a9b3158512b0a6e116ca40e56874f5e6e49a5734916ae3bffeb569e68600d2dcf7afe4c19d635
+EBUILD abseil-cpp-20210324.1.ebuild 1926 BLAKE2B f197fe665b05a29a62f1f21874e15e27cd0c4b40326e69a9ecce320d32984dcf3ca0bb85a917e198aea818cf0cb63713b5151669f5352f1e570fa6a7f1274295 SHA512 4c73a8f2c02df6df96d65e2ad51a59eeacafdf06c76192e8af396ed9fa818d7bd76f65d045e7b8bdf1c381d29f7ed1be5ff0140858969f217f972e375b20ba33
 MISC metadata.xml 356 BLAKE2B 192cd53686f89cf886b3dccd4d3c64dd44912c3572c3ec16c786c81c62b5ad1090be7c6e43bf2900d731ca72804f57f17d2eef619b88932d14423e72363e61b2 SHA512 39f66dcee864111412707467b6757811eeb9ddb24cb23bd3ff01b9426dff922fbd69312fda9142e03df146c22cd2b5fc1b06249cd1b6c334b076b798721fdca2
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
index 8570f4e66998..344942f1ecaa 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-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 cmake python-any-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://abseil.io"
 SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/${PV%%.*}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
@@ -35,6 +35,7 @@ src_prepare() {
 		absl/copts/copts.py || die
 
 	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
 	absl/copts/generate_copts.py || die
 }
 
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild
index 8e62b032d05f..a5ffd719aa27 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# 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 python-any-r1
+inherit cmake python-any-r1 toolchain-funcs
 
 # yes, it needs SOURCE, not just installed one
 GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
@@ -20,9 +20,9 @@ LICENSE="
 	Apache-2.0
 	test? ( BSD )
 "
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cxx17 test"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+cxx17 test"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -34,6 +34,10 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -46,6 +50,7 @@ src_prepare() {
 		absl/copts/copts.py || die
 
 	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
 	absl/copts/generate_copts.py || die
 
 	sed -i 's/-Werror//g' \
@@ -53,6 +58,12 @@ src_prepare() {
 }
 
 src_configure() {
+	if use arm || use arm64; then
+		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}"
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
new file mode 100644
index 000000000000..136d41f23b4d
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
@@ -0,0 +1,76 @@
+# 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 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="+cxx17 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
+		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}"
+		$(usex cxx17 -DCMAKE_CXX_STANDARD=17 '') # it has to be a useflag for some consumers
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
new file mode 100644
index 000000000000..b74a6c70e904
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
@@ -0,0 +1,16 @@
+--- /absl/random/internal/randen_hwaes.cc
++++ /absl/random/internal/randen_hwaes.cc
+@@ -50,8 +50,11 @@
+     (defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO))
+ #define ABSL_RANDEN_HWAES_IMPL 1
+ 
+-#elif ABSL_RANDOM_INTERNAL_AES_DISPATCH && !defined(__APPLE__) && \
+-    (defined(__GNUC__) && __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 9)
++// When ABSL_ARCH_ARM_NO_CRYPTO is defined, then ARM CPU without
++// crypto extension is assumed.
++#elif !defined(ABSL_ARCH_ARM_NO_CRYPTO) && \
++    (ABSL_RANDOM_INTERNAL_AES_DISPATCH && !defined(__APPLE__) && \
++    (defined(__GNUC__) && __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 9))
+ // ...or, on GCC, we can use an ASM directive to
+ // instruct the assember to allow crypto instructions.
+ #define ABSL_RANDEN_HWAES_IMPL 1
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index 9360b3d087b3..59063ba984f1 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -3,5 +3,5 @@ AUX 2.7.7-libtool.patch 621 BLAKE2B a0e48b7911bf016dbf1422768cd73e887cded6a9795d
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-cpp-4.7.2.zip 1494927 BLAKE2B 007aac6655dc3c4e3a0c2073ca9c8c016b46bdf97dca4494d4ea2c44d27a458bfbb09811b3beb0aec1ce2873c3b62ad6789c6a9e3e7ddc62cde51c8357e9123b SHA512 3298b83a06ddd8d8852462401e46fe2eb83d20af4ba14c722cb31b33d929d1c5a4ffb694ee084495a4ae26ed3246b6781ca6045d11253c94efc09729fa001090
 EBUILD antlr-cpp-2.7.7-r1.ebuild 2804 BLAKE2B c03a8989fc0e0d9ca8409ec82676405f37e2041f1fc9f40d8a823ed5aaea940144b5855d64311f2f9ea29ccc54fbeaa42b958a147eac47c12ce21917a4908422 SHA512 12674af8eed6304c0ebac94e1216bc4ef7c3e2cb8935d21319a4a3a15c3912c3be23b0e9a399cb245a028f370c5f3507856a7cf82e8e3a451ee586fb0f53084e
-EBUILD antlr-cpp-4.7.2.ebuild 634 BLAKE2B 5f0116026e47e7448360471f5fb9b96e2c24d2ecedd7c5a446b7710cb773dcdbf2f545b4613a4c9562a3d6e676ca5af3873822ef810ac00a602b55727163f3b2 SHA512 31211740e9d28309335aeebe88fef2c46059f490bee9efab633c026e2cef0e7f4c3bd55b1af2e97f1c3eee31aba7dc71f5604bd3aef36f0e4253474f5912d559
+EBUILD antlr-cpp-4.7.2.ebuild 636 BLAKE2B 871b5616e3c8286e79e43448e99dc795e82e6e88717bc9f457b993093e930f173227485836132738d45963bc83fdb776375ce1221b82c4164cdd4bfa5714efb9 SHA512 73c8d0dbf898eb7086b290f86c82055b203cc6f5d3bbf389fb4c4921d3527ecb7acbe71908217405d75deeec65611e9b941b423349c0661734456342420ce826
 MISC metadata.xml 313 BLAKE2B fed6320dfc4160af517e7b6f605da9f43a882af049730c41cbaadee0b73ace2b84780e7803fb9f82b74633a18d7696fb38788e3885af6d0f626877a80b66abcb SHA512 047fde5417bc4b8514902bebfdc5be4d14fe490b7638270fdc381cf300f32c34c889596489a028821d880f159ba0dc00efb583c5bdc707a3de3c63f2e99f842f
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
index 9f123f017901..674acf4c9f29 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
@@ -8,19 +8,19 @@ inherit cmake
 DESCRIPTION="The ANTLR 4 C++ Runtime"
 HOMEPAGE="https://www.antlr.org/"
 SRC_URI="https://www.antlr.org/download/antlr4-cpp-runtime-${PV}-source.zip -> ${P}.zip"
+S="${WORKDIR}"
+
 LICENSE="BSD"
 SLOT="4"
 KEYWORDS="amd64 ~arm ~ppc x86"
 
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
 	sed -i -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
 		"${S}"/runtime/CMakeLists.txt || die "failed sed"
 
-	sed -i -e "s#share/doc/libantlr4#share/doc/${P}#g" \
+	sed -i -e "s#share/doc/libantlr4#share/doc/${PF}#g" \
 		"${S}"/CMakeLists.txt || die "failed sed"
 
 	cmake_src_prepare
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index bd0a8e8f34e6..9636359a5490 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,7 +1,5 @@
-DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa98db977e94249dfd8fa6c4fdea88cabb385dcfdb2d79874017c4e648a737413bae021121d1423d62e335d2737 SHA512 8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc
 DIST atkmm-2.28.1.tar.xz 688912 BLAKE2B dd18c2e0151192eb56cc81ceb6d8da2b41850e9c31e357f14822ac99418f57237e5ffe876b0c0b05768ad93ffb9d2e5edfddd518c838a1cc916b40df7b7c0933 SHA512 9f336b594930b62e9789011f4584f569d40b6153e5f3f04ac0f5b48704c50fb7b99d3f5d8639eec8dfd42b9c268df3cf21c2ae2372fdb781729fa29c57365916
 DIST atkmm-2.36.0.tar.xz 735400 BLAKE2B d8b821fdddd27d10f1995aa6bb8ab8a2ccc3357c7553656e30ee45e4ad677457b7a64a86ee9511124547c1680b5f95c3fd306fb315f3911787a6f0817ca5e130 SHA512 8527dfa50191919a7dcf6db6699767352cb0dac800d834ee39ed21694eee3136a41a7532d600b8b3c0fcea52da6129b623e8e61ada728d806aa61fdc8dc8dedf
-EBUILD atkmm-2.28.0.ebuild 820 BLAKE2B 7c1f0b1df7be64edeee9f602ee8ac2403614b4122b4a7f2e46b158c840702f08f252c399873f1ce5e6f5f0782cab4d14afd7de122b1815f8895ce5bca701999b SHA512 9ace55c82803a6d45277168da4b2e6c8af8058f0db1753cae978d22082425f01df371573353be4e3325edc490fb8556615dcfc2f949e185340979ad0ae79afcc
-EBUILD atkmm-2.28.1.ebuild 953 BLAKE2B 753068c962b038613a9eb0a955b77c0f970bb8aa2e3124dd401c9685c93c9d44f1266a72bd34b4583b556d806a76192fe531de638c4e41976c6e0de4f2e08893 SHA512 62d5ad22f519b68f1111454248f148c1ac4436f9c4aaa217a90d86b16f8db97cd407ebe37a706e86d21c19faa0f5da63c82eae9f0b3c7e7dd7cd6333298a5915
-EBUILD atkmm-2.36.0.ebuild 953 BLAKE2B e2b563f9d4caa5e2dd7ce31d9036208d22046c02b9d0edd09472436dfa7fc4095573f6f316745eea40d54dce72d9a4eb4bd20a79fe953b71d3d3cb47cd5198f5 SHA512 2afca7f5c6ab71c712ed300c0254eaf4d698f95a1f893f2b09cc14f5521f06664c64903be46a2ceb145519121275bf42a0ce77423e0655c6cc6f324ce30212a0
+EBUILD atkmm-2.28.1.ebuild 1013 BLAKE2B a3c70945d9d5ff0627f91acd206195a74036c5c8e537726d8cb2f0796a600f526ceadd344e47adb600c77be9a8a633ed5874226f3c7c80ff7cce82e93a9f2729 SHA512 8aede60c462a167a5395795b1d9582f23d527065414355ffad99c30c9682ce34aca64c2f611d485714d1782fab1c0a85e19822261eb92844feaa5fdb828afb10
+EBUILD atkmm-2.36.0.ebuild 1017 BLAKE2B d3686cf5ea906f85b8dbc952769a89b81b27ce6a5009c092db272e614c58303c3bb153d29a484f6fdf37bdfbdfe521bcb5e616543146362c91dbdd8037bb3f93 SHA512 efc463b57e62eb5829d9c1ca48bc36d76fb11e00bc234e8760172ebe89bf90f0244b9c0370c062dc2a7cfc53cd7cd0f7c79afbc209769ea897c56b16db66d1c7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
deleted file mode 100644
index ab767bba974a..000000000000
--- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for the ATK library"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.46.2:2[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-cpp/gtkmm-2.22.0
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/atkmm/atkmm-2.28.1.ebuild b/dev-cpp/atkmm/atkmm-2.28.1.ebuild
index 15b3924ba531..01366db0ae40 100644
--- a/dev-cpp/atkmm/atkmm-2.28.1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.1.ebuild
@@ -2,14 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for the ATK library"
 HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~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="
@@ -25,6 +27,7 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	${PYTHON_DEPS}
 "
 
 multilib_src_configure() {
diff --git a/dev-cpp/atkmm/atkmm-2.36.0.ebuild b/dev-cpp/atkmm/atkmm-2.36.0.ebuild
index 6d37b606cc4d..0ab832b961c8 100644
--- a/dev-cpp/atkmm/atkmm-2.36.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for the ATK library"
 HOMEPAGE="https://www.gtkmm.org"
@@ -25,6 +27,7 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	${PYTHON_DEPS}
 "
 
 multilib_src_configure() {
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 8ca282e38420..eb0655df2882 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,7 +1,5 @@
-DIST cairomm-1.12.0.tar.xz 789588 BLAKE2B 4c864705ce4b232a3dcaf7251cf22f7f9ac2f964253552cdac5a115bc7e085f38a58375e33f99ea03105b59d056a53e91ea9234c4c6b49d8701c01c8a1e12dc2 SHA512 750e05f079c2ee9786d1a1ddb66ff90405549a82aeb542d585f904f7147994a451950a77ecb563f290cf2358f7010360ab03d9aa3a319651615c48bd25aeb7e8
 DIST cairomm-1.14.2.tar.xz 603804 BLAKE2B 37417fc13f3213c1cd51ac2b0f17e0624c0592f6115a66c96295b6fa2f9974bee7c138f5087b130211a6e4f9fba045404d85e9aa08a36d9000415132400d4da8 SHA512 aef374fca25ad22770407e36512046b266d71ebeccd47fb629cfbf2f67783aa314bb335b972088a88d98417a4774d6f144cd2769c452f8aa23770eae08dca592
 DIST cairomm-1.16.0.tar.xz 579604 BLAKE2B 3aaac8039d13f13ef8fb844e38cb0cd9b0565559544c7a4cab544a46f8f8bdb6d4ee1b8318ec5d9991c33264cd3335a8796e6a49553735516a184565875e1d08 SHA512 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3
-EBUILD cairomm-1.12.0-r1.ebuild 1223 BLAKE2B 321ef7fda56bf65c682ad05fd49fe987aa203e9df3edd1d249882979680df3df0607b24b77b78df2d687efc71791181d8d1daaf1d9a99ee0e4cde246ce8ba94b SHA512 7f7f73ff4396e9082834b25b4fbba0ea079ea157f80070d6dc2cba65e822dc57663ecfb1269da07d21777966461846e8df91cfc3c30fa42fc160e9868a2358c3
-EBUILD cairomm-1.14.2.ebuild 1193 BLAKE2B 352f15087dffa7b6a08be7462053426a8e19d00846d82d13c8008bf56e94c52dc3594807047fe1f71920b0120ceb35457558859c47fb808b45d6e97b7b409a9a SHA512 5caff86c30edafd681a0818b212064ca71d509d2d908804dcc6564a7c33d6b3dcded4526f75140792b556dede9b109bc15e36ecfb7abf672115bc2e4309a0d0d
+EBUILD cairomm-1.14.2.ebuild 1189 BLAKE2B eedd45b0933749fa2adc2c51d326434ca2deee616821379dcc27753970855470554c213155bfc5f40b2387c2c85c3748bcb593c696842385007d8ccd9b010cb2 SHA512 53832cc83796fb52035bbf68d9aaa7a89fcf9269e8c582f5b23491dd01b2c4d11f990b21434afaaaa0eb4bfec9df8b28907494b6a4735dda9be0ae7bd4e96faa
 EBUILD cairomm-1.16.0.ebuild 1191 BLAKE2B d25ecc89918250e42b368274c0fa3ae80373e11dbb57ec7eae80711ac3e7db005a12b8ef8105cfc707a045267d51bc26dee8a28d18baa03a2023797c9a78e56f SHA512 440ef8a3e993a42fa60783bc733f3410e870e446112f6f08da0a9ae4072992d297428a8986472484fe9555f867064cf68d29df525e98a72b316784e76393bfdf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
deleted file mode 100644
index 616d02ae0adc..000000000000
--- a/dev-cpp/cairomm/cairomm-1.12.0-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=5
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="https://cairographics.org/cairomm/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="aqua doc +svg X"
-
-RDEPEND="
-	>=x11-libs/cairo-1.12.10[aqua=,svg=,X=,${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.5.1:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz )
-"
-
-src_prepare() {
-	# don't waste time building examples because they are marked as "noinst"
-	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die
-
-	# don't waste time building tests
-	# they require the boost Unit Testing framework, that's not in base boost
-	sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--disable-tests \
-		$(multilib_native_use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/cairomm/cairomm-1.14.2.ebuild b/dev-cpp/cairomm/cairomm-1.14.2.ebuild
index 5d1186952493..e06b42ee964d 100644
--- a/dev-cpp/cairomm/cairomm-1.14.2.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 3f8db6ee22b5..1c54c0b58883 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,9 +1,7 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
-DIST Catch2-2.13.3.tar.gz 655431 BLAKE2B 4343dab41818a4c85b875752b8d86a0dd1a46ce8c94d6773cee210a133f164b669053973c6678228b3afb356e25a3e705c8220b138c247a230e624b3f2412784 SHA512 caf0e3a39a2b5983346c2709ce06113da62881780117021c64db987d6c5190c41a9070fb70caa0ee6957cfef0baad87fff4e6558c9fea4fa464e82882fe17d55
 DIST Catch2-2.13.4.tar.gz 656645 BLAKE2B 7a8afb099d410af3a7641c948a59307ac72338174356c1219834f050e0971e410275f1eda911444c3e956320fa25b60f91a3aba75aa36d375ba38626a0246485 SHA512 eac081d750e65d4d8d8d5f32b53bd963c6566caabaff424c479fe080416f59b5387adbdf6dbac30fe265243cb5ed184baf6f8a9625052bd498c098b83463390d
 EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed
 EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832
-EBUILD catch-2.13.3.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
 EBUILD catch-2.13.4.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
 EBUILD catch-9999.ebuild 957 BLAKE2B d8834959413b85dc5a5181a060a4e75730d5b258b113024e7e426793dfab806475bec2dd02ec24149086e98cfcc35e1def04a63b604f2fd98cf53034616586be SHA512 ded76b95e18991428e08d15533ec76db77226687955888f8db016d35c47aa00d25cac0e1749899dd5884d28c7f2e3afa77976ce3505f5e47a3e652c62383ef38
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.13.3.ebuild b/dev-cpp/catch/catch-2.13.3.ebuild
deleted file mode 100644
index 4ef090102289..000000000000
--- a/dev-cpp/catch/catch-2.13.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-any-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
-else
-	MY_P=${PN^}2-${PV}
-	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCATCH_ENABLE_WERROR=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	use test &&
-		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest
index d52e07de02b1..ea8d7e779844 100644
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@@ -1,6 +1,4 @@
 AUX cpp-hocon-0.2.1-cmake.patch 1792 BLAKE2B 2caf382ed29013b85d989f827a07430aa40dcc2ea8c7357c3efd3e2b41c2be95f385297f021c54125bbc2695e753c7ab97f3e78a16497c11e980bb9a6f41eab0 SHA512 7b039ba0b668b9578f908c1bfe20ca725c8bc753f6b68f8540d3eddc8323f865096d0cb4e9274ef09d210a72844aed54888506be20c964b91c8bbd5e01a4229a
-DIST cpp-hocon-0.2.1.tar.gz 158108 BLAKE2B 4b7097768d4fcbc72df5c63fb036b12bb08108a0e1ef57ec182c64c2aa337b56197c8c10dea8f26f64a273b578d4c1b53a898024558d95e99d2ba1b3778c2414 SHA512 fcc377da7923b77436a6f2787d5b8b1b573f239de4f059c4a5949cbb1a755fd12024b9155f5e44cf60141181942f3e9a2a8fad07ee0b1d516fe2cd4a88d4ac8b
 DIST cpp-hocon-0.3.0.tar.gz 159032 BLAKE2B a5503d28d4740c78ad13836d5e7c60fc56b06d8f60f3d977a1db1008e0e90e159f2bef4d9737215684a4318b3c6d0a5efa20da1c14cd94ceacdb597bc5eaaab8 SHA512 de997e6d90330f901863b7da0d6f6e069a31e052b6f31c1e3009a9559c863f08879ecf4e202c763ec32567dd3a1e436ff5d3bf0b3009a085ef3ee95e5ca6c7e5
-EBUILD cpp-hocon-0.2.1.ebuild 588 BLAKE2B 3cb26d87e544bffdb3d77e51234f580b40ebe30a5d3c53ecab26b7224ff0657396833a1bd4c4d215c4ce3dad2cf87030eb62cfc6fc7ca84f5f9deee95a201157 SHA512 1cbfaf089c07c522c69dc3dc3c1de5af435d9baaa24ce6092fd61b403088f34c5c177fd957de5d75425ba9dfd300d93b294d12fd71de423e9fdb80a21caaf049
 EBUILD cpp-hocon-0.3.0.ebuild 583 BLAKE2B 07e9241102d8402ca278e9c3bef86e961002e8cd66d142e2419bb0824bf7d7337bea4e34085c53ca1044a616c4fba19948a5a761b1fcb85ee82ad0d9e2104cfb SHA512 ae883347f8fe5ed11e1e62121efe7072bb354bffb830147ff47475fc305d4b168bafe617469128b1b1c5892179d95eb49e0b0af58b6a4d1865bf85373b7abbe2
 MISC metadata.xml 339 BLAKE2B 1318ce43b3d36322704fef45dfb7d54658e15394bb96120b9f0afe31099370d263fe033564aac1e113cd287e65900baea0add55fe81b7fe8e2ba31f627834302 SHA512 a7f1e55152a79c6a199de7f1264ecfe59f9e7135fcf650629b19655912d43371648c4b9efa75e6a4d6eafe30a7dc8c597c6936ba7b0ec59e38de2a2bcddd9d01
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild
deleted file mode 100644
index dcede0fa5722..000000000000
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Provides C++ support for the HOCON configuration file format"
-HOMEPAGE="https://github.com/puppetlabs/cpp-hocon"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/boost-1.54:=[nls]
-	>=dev-libs/leatherman-0.9.3:=
-	"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2.1-cmake.patch )
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 63c90d00c1ff..e6c5879d8316 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -5,7 +5,7 @@ DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
 DIST eigen-3.3.8.tar.gz 2141903 BLAKE2B c33e699ba08338e7b9b215c9466e161229164ed3c466ce3d760c6917749af33c0414c3bc4bbdd216e3466e69ece8a38ca8beb78b7e0f1609894df6bb4a7fcca3 SHA512 5b4b5985b0294e07b3ed1155720cbbfea322fe9ccad0fc8b0a10060b136a9169a15d5b9cb7a434470cadd45dff0a43049edc20d2e1070005481a120212edc355
 DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
-EBUILD eigen-3.3.7-r1.ebuild 2251 BLAKE2B d8470d733ed8c1762e6759e28f96c7559e08d2bec7a80590bb504dcabbbf3e262d655c4bce660e7f6611b6f75095125b9ddb62229d46a535343e6343b257912a SHA512 f839c91a430acfb91c641575eaa9e375e227a8dfc19d0600015819955efb25ea148ff42614b9fbb39129e22038d6711fbf55f4e3cc67fa087a6dc628dc89e1c7
+EBUILD eigen-3.3.7-r1.ebuild 2251 BLAKE2B 8ac30181d5c64ecb1a5ba47d386b00962e772319dfaeb393deb1c0d742a8c4721b4ea57de43ee79c754634872b455e0ae6a086617b46b4ca9bf19b9ff038a20e SHA512 02b5f22b042d817b9d4729bc13bea27b54683508db23d22ae0215003f49a7b9f70069e92911f9e4e40d5f71ac847035cc89843f426b7dcfca214e1e4cd3034eb
 EBUILD eigen-3.3.7.ebuild 2432 BLAKE2B 2312d5d606907923882c74f4842128d95f9fa25eff68ab7217a58131c2fab11f42d8e1658129f29a7dbc68d3ab42510f6289ff1fe9ec7987596f691aebb67fd6 SHA512 e411a3a4c08776dc667d2145e52b23225d88b6bc9e6b36e664392fc26bd34195fcfcf2b54d0b20dec4ad8597f6e262d4dd7671513ab3581b10d0a16ed2713701
 EBUILD eigen-3.3.8-r1.ebuild 2292 BLAKE2B ec49dbace8c35444eb8a823270845eca371973500d187d91dbc897329fbe295c0ffdd5bc566301a51b1cc1ac26d51618762fd41c2d958ab4d7d813860df7ad45 SHA512 1aa8b8db7450a986fd3df736de11f7b1060523e30173d0240dc5bbdf18db0cbaf6b5657f2517e8dcdf4dd34b55efba88b3e51686c145b7c0a97502424be2aab8
 EBUILD eigen-3.3.9.ebuild 2499 BLAKE2B 3b9577b804ab4059a94f5fd2fdf0f55fa094d570bc998ea41feb3e0ab3ec3014492b78466e0602d4b9be448b3c82c243b41bfd635f62fe2b0f53bf16fa055e8e SHA512 68b000a435dc937d09d21c6ef3528b561548f7f4903cf902bf32c9c116fdec53ae12bd504b552e39244b06cf1d08d419d4ba07b767a40e4abcbcebd808676585
diff --git a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild b/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
index 78cd681f6b17..6e6a9e5aa2ce 100644
--- a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7-r1.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=7
@@ -8,7 +8,7 @@ inherit cmake cuda fortran-2
 
 DESCRIPTION="C++ template library for linear algebra"
 HOMEPAGE="http://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://gitlab.com/libeigen/eigen/-/archive/3.3.7/${P}.tar.bz2 -> ${P}-gitlab.tar.bz2"
+SRC_URI="https://gitlab.com/libeigen/eigen/-/archive/${PV}/${P}.tar.bz2 -> ${P}-gitlab.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="3"
diff --git a/dev-cpp/gconfmm/Manifest b/dev-cpp/gconfmm/Manifest
index e4238468c636..73233c023875 100644
--- a/dev-cpp/gconfmm/Manifest
+++ b/dev-cpp/gconfmm/Manifest
@@ -1,3 +1,4 @@
+AUX gconfmm-2.28.3-no-extern-c-glib-includes.patch 1337 BLAKE2B ed3ff729cf81f04ec4b3615b376a8750c1c321ef05ee8560eae9ef4e3fd6974285060d9b11714a0325b0dfa51f976a725c59adb0919fa46ab6cca1cff6d9abde SHA512 993f3856fbe1dd69f8329aa7277f98d421433c6d9bdcaed3257a8f8639001c83c61ce9fb8184964802aefbba974ea02b70abfdf06504372794750b9e8b7d657b
 DIST gconfmm-2.28.3.tar.bz2 471125 BLAKE2B 834d63ee91ee6849970ce612c387957607bb3e723afb06b0ee8dad0336ae81c3a4c40a81846d6abbb425b5f3f0cbad026189d563a814d8acd1010f3b1dbdfa93 SHA512 0fd3a43373dfdf514eca61537c19dafd4ad582d2ec6bb325652766fba90ed723feff6daf93effcdf20f917c573131d58c16f1a826194f653864a701bb8a57097
-EBUILD gconfmm-2.28.3-r1.ebuild 720 BLAKE2B bcd3ed3d4f219bc5e886b3e2afd38b0f1cf6e25daf42e00111f15bb7d9e3d45382c3134c667820c7b31df3d8aa3612079da313968138757e8fb99b5029219845 SHA512 67eae5c969a0ae1536779269b31717cd641101b0cb1bf078a70ab928c8178d708c1264e607112c6ab37c16d4ac547359b87284b4962c910f39d5269fd27aaf2e
+EBUILD gconfmm-2.28.3-r1.ebuild 630 BLAKE2B 77d40d7a4eff4c1a872c6e2b991e3814d06ab43c1b734a1de8a3ba890d7c60447b7752ff08dffbaa2dab470f304287a2dd54a43980e7506e149462d6f8f423d5 SHA512 f9a3100656e717200ad16a5f94a1892f0f86bf00432155dcb595d2c80b4a15f44f615ab74020d61ecd3258574a2e5910f230d859c688203da14edb62a32f5872
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gconfmm/files/gconfmm-2.28.3-no-extern-c-glib-includes.patch b/dev-cpp/gconfmm/files/gconfmm-2.28.3-no-extern-c-glib-includes.patch
new file mode 100644
index 000000000000..b05face5b0a0
--- /dev/null
+++ b/dev-cpp/gconfmm/files/gconfmm-2.28.3-no-extern-c-glib-includes.patch
@@ -0,0 +1,44 @@
+diff -Naur gconfmm-2.28.3-original/gconf/gconfmm/callback.h gconfmm-2.28.3/gconf/gconfmm/callback.h
+--- gconfmm-2.28.3-original/gconf/gconfmm/callback.h	2011-10-18 11:33:49.000000000 -0400
++++ gconfmm-2.28.3/gconf/gconfmm/callback.h	2021-02-13 09:21:06.167235506 -0500
+@@ -22,10 +22,7 @@
+ #ifndef GCONFMM_CALLBACK_H
+ #define GCONFMM_CALLBACK_H
+ 
+-extern "C"
+-{
+ #include <gconf/gconf-client.h>
+-}
+ 
+ #include <glibmm/object.h>
+ #include <gconfmm/entry.h>
+diff -Naur gconfmm-2.28.3-original/gconf/gconfmm/schema.h gconfmm-2.28.3/gconf/gconfmm/schema.h
+--- gconfmm-2.28.3-original/gconf/gconfmm/schema.h	2011-10-21 04:51:27.000000000 -0400
++++ gconfmm-2.28.3/gconf/gconfmm/schema.h	2021-02-13 09:21:24.616354041 -0500
+@@ -31,10 +31,8 @@
+ #include <gconfmm/value.h>
+ 
+ 
+-extern "C" {
+-    // TODO: do not include this.
++// TODO: do not include this.
+ #include <gconf/gconf-schema.h>
+-}
+ 
+ namespace Gnome
+ {
+diff -Naur gconfmm-2.28.3-original/gconf/src/schema.hg gconfmm-2.28.3/gconf/src/schema.hg
+--- gconfmm-2.28.3-original/gconf/src/schema.hg	2011-10-18 11:33:49.000000000 -0400
++++ gconfmm-2.28.3/gconf/src/schema.hg	2021-02-13 09:21:58.002568546 -0500
+@@ -24,10 +24,8 @@
+ 
+ _DEFS(gconfmm,gconf)
+ 
+-extern "C" {
+-    // TODO: do not include this.
++// TODO: do not include this.
+ #include <gconf/gconf-schema.h>
+-}
+ 
+ namespace Gnome
+ {
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
index 5fc75bb2c584..745c74a92947 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 GNOME_TARBALL_SUFFIX="bz2"
 
 inherit flag-o-matic gnome2
@@ -14,27 +12,21 @@ HOMEPAGE="https://www.gtkmm.org"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
-IUSE="doc"
 
-RDEPEND="
+DEPEND="
 	>=gnome-base/gconf-2.4:2
-	>=dev-cpp/glibmm-2.12:2[doc?]
+	>=dev-cpp/glibmm-2.12:2
 	>=dev-cpp/gtkmm-2.4:2.4
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-extern-c-glib-includes.patch
+)
 
 src_configure() {
 	append-cxxflags -std=c++11 #568580
 	gnome2_src_configure \
-		$(use_enable doc documentation)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		dohtml -r docs/reference/html/*
-	fi
+		--disable-documentation
 }
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index c8d9e2d75d3d..af5999272af2 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,7 @@
 DIST glibmm-2.64.2.tar.xz 7438116 BLAKE2B 6ff458e90a5dbc606a2e04ecd3589262a1b96e827dba245985467818a7a4ba80a9c4cb15686fe479636cb8ce7e1db3334195d6334d7ec56327076cad87e22170 SHA512 0130af9a16981a54630150db6f4b1a95458d72d650c5e4781ee97ce624ec98c600b79ebf234d212e025781453fd11d78b9e8273235ffa143397423418fe970cc
+DIST glibmm-2.64.5.tar.xz 7491108 BLAKE2B 3c0f2215542a6ccc65c37d566856df326b7c0d45999e525df6153862edd0841c501c64fc3cfd0e4c3f1bae29bbaca1eed44738acc11b3f1515ffc8a396b0791f SHA512 e90bb722a35292b0fc54dff82604ec8d23a9e72b08581de14fd515539392ed713d0691352bf7de42d5027579959f76b268cdc11a76a3d3033ae8268f486ee817
 DIST glibmm-2.68.0.tar.xz 7652260 BLAKE2B df87b3f3d8cd74b693f843dec15d5376f2a755b0a72042983383c15cca9fdb90c2fed6320bf0f3fe846fcda5be3ee15c0fc1b683d29cebe64e8dcdd101fc9bf0 SHA512 a13121052315e949acf2528e226079f1a2cf7853080aec770dcb269e422997e5515ed767c7a549231fb3fa5f913b3fd9ef083080589283824b6a218d066b253e
 EBUILD glibmm-2.64.2.ebuild 1445 BLAKE2B bb31548b8263d78dc9f14f7baed5895814a26b9650ad106c6b60031432129d3df3eb05787e68e717c87ab9b11c645c03a55739582fe0b423b2ba6aad61f29588 SHA512 ec5b14755ee4e3b1b56041f982bc256fb5d2cf1cf883602f6b3dfb15b183c01a634013012689f9358c70ef668c1ef41a8319fd06f6cf3afeead3f0606bc35ad2
-EBUILD glibmm-2.68.0.ebuild 1296 BLAKE2B cd13014224ff45a20aa30e5623a1142895d95bc5f6ef2838aae3709e9ac230e8637078270621abeafa431437c24b94ddd8632340a398ec1e7b3d935fb8ae12f4 SHA512 a12ce7ce63e7e7a02a7382c76da5ff83bd78292f468f7052e2adf8c7678fdddd2158be728f5dc0e35c9c77981b953b877189676450c3f4abce8de79594c71441
+EBUILD glibmm-2.64.5.ebuild 1515 BLAKE2B 2891382d33c079dba65a7ee040e60dc16d8b956b979552aa4e366b6e636b47b59bc7b2029c705dc6dd26880893f1dd27db67b8aa9d92dbf949e4765b8ebbaf57 SHA512 b205e9216663354fa736deb1403edf14419b164b3125d6776da98e7582f0fcbca128c1d942b7e95cc527d673a24ad1533476ed6130e56c7bbab35b3f1131a28b
+EBUILD glibmm-2.68.0.ebuild 1359 BLAKE2B bc0d66ed662df3a61153428fb01a0767c55a3a323e5338e45b68448d10ddd09702521acbe9824bb6b0778d95d67c1f7d5065155e2f954c89660f29e31089bc40 SHA512 8175e60c96ee44577b0d7aa7d3e59edbac17bf7e990d2f38b3712bbdab12ddac8dc518df4d92aeeb06c7d22641f299100ed22ef0f6602b3e5139431fef93a98e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.64.5.ebuild b/dev-cpp/glibmm/glibmm-2.64.5.ebuild
new file mode 100644
index 000000000000..25300c2afb5d
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.64.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=dev-cpp/mm-common-1.0.0
+	sys-devel/m4
+	dev-lang/perl
+	doc? (
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+	)
+"
+
+src_prepare() {
+	default
+
+	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
+	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
+
+	if ! use test; then
+		sed -i -e "/^subdir('tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dmaintainer-mode=true # Set false and drop mm-common dep once tarballs are made with meson/ninja
+		-Dwarnings=min
+		-Dbuild-deprecated-api=true
+		-Dbuild-documentation=$(usex doc true false)
+		-Ddebug-refcounting=$(usex debug true false)
+		-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.0.ebuild b/dev-cpp/glibmm/glibmm-2.68.0.ebuild
index 16c2ce0ff994..2cf6d1781f54 100644
--- a/dev-cpp/glibmm/glibmm-2.68.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.68.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="https://www.gtkmm.org"
@@ -19,6 +20,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen[dot]
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 155357607211..80f3a878f2d9 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -6,6 +6,6 @@ AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea11
 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
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
-EBUILD glog-0.3.4-r1.ebuild 1180 BLAKE2B 2ed697ee1185eaf03e52b38352d200ccbcd86cfa3aba16a6db4f0f4afb7215cca6d00d9e2cf95e137548fc833371e823ac59b1e020d41ece0d8f20e2926810e6 SHA512 0b6eddfa00be3b507c4563697154293af9d1dbd107e9a0e5a221fb66d2ea20e21def06ff5edf2d5355de63ef4a26aa3f148b89fbe8781aaab48be94da0464635
+EBUILD glog-0.3.4-r1.ebuild 1197 BLAKE2B cea35c7b86d979e70a48d7ad73eea6089da777a81f96c91e4667c20a53faaa2801f4008e4687f584bccfc141139b059249cb4757bc8033c38e7e2409a764b190 SHA512 9fc0cf68094b667b5aaec75c77f313afb9017c1e82c37fd2cd9bdff959e7522a19baf4414287af878a5724694948b6be5f7b3ef03f74ecca31b0802580518f83
 EBUILD glog-0.4.0.ebuild 1145 BLAKE2B b5ef97d1fae34eb7ee04acce16fcfc0fa842e2eccffb3df84aee526ad45498d94ce25aedaff1067296359dacdd66cf2d65c5fed9a1f2456728d400f35fdbfda7 SHA512 f5d75698b1ba54da2471bda2d21a8058094101bbf127b0cdfd13dfc148994045794838564298dceabd027248830302fb53ed275ddb3afc41a52b961393b547b2
-MISC metadata.xml 714 BLAKE2B 8263b158cc7cf8e1f403ab37d32e4a36f5d0969f94b6ec9419114ba00b59da7f9f65190bc151eb4f65e93ff9b3946323bd17e8f4ea20e89e8035a418cbcde744 SHA512 df3fdab330ad01a7fc978bd954c6c4313c386508525142c020ba4f7836ce95ececc6bc59a536372898e0015a0f36b7e2bd8470f92190d2febdcdf6323babf5b3
+MISC metadata.xml 765 BLAKE2B cb580cd0aa55d17f3b085e5603693b4c7c4e9ddb932e94fe08fb6fc00891d9d8366d9208c2d4cd7c0f56fa451866cb70575987822beb094525adf44b9410a15f SHA512 afecb5d946250c4a3d5098bf407bbe86ed4e48412e3e08282165c04eb4e7dfd4f48c734b57e2105c423bf9181e6cc74680b98d889f67904effe98cc203cac216
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild
index 4a2cfdd6be43..d6fd3e0dc0d4 100644
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.4-r1.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
@@ -12,12 +12,12 @@ 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 static-libs test unwind"
+IUSE="gflags +libunwind static-libs test"
 RESTRICT="test"
 
 RDEPEND="
 	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
+	libunwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
 
@@ -37,7 +37,7 @@ multilib_src_configure() {
 		$(use_enable gflags) \
 		$(use_enable static-libs static) \
 		$(use_enable test gtest-config) \
-		$(use_enable unwind)
+		$(use_enable libunwind unwind)
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index 3856364cd842..7abf6ed43ca5 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
-		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for stack unwinding instead of glibc/gcc (may be more reliable on x86_64)</flag>
+		<flag name="libunwind">Use libunwind library (<pkg>sys-libs/libunwind</pkg> or <pkg>sys-libs/llvm-libunwind</pkg>) instead of built-in fallback implementation for stack unwinding</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">google/glog</remote-id>
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index fd3f67cd554a..5ebc046e524d 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,5 +1,5 @@
 AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc33314fa15b0bdf78baf6672915befe2c14c695681701975dfb3d6572b2254596789dc1cc2010db2bd391e1d26f17a3a83d6c3aa96a9252a0fd1ea3d5 SHA512 406f1f6e900b0fe2c042cb6d219f20586058e1e7e1af38ffa7059f0d5e6b24cebb7b034237d154d9669a9a860497a36b3c7a0308a0698af23bb07cb29cf38851
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
-EBUILD gtest-1.10.0_p20200702.ebuild 1825 BLAKE2B 14dede4c7184a45bc5520d992b86522bcc47f682856a6c3557ed50095968a9d8d9dd32b3319b18a3762cf714621d206b2100b87e92f55f1aa8ef00585a592491 SHA512 75c7a88812db0f715e386d8ced86200ad2d139c03fdbb010ffac843f771d69018c200d47e7124e73d972ffea3d9cf01002862bd47a466d7dd362d6908a3f4162
+EBUILD gtest-1.10.0_p20200702.ebuild 1826 BLAKE2B e25ffa11181b91f4c8d33c0d21f674c90f7aebae95ef161f15519644c5a1d5f5c4001a5fbce60989f72fa1ed71fdf00c874f7bb22f908fb0a1c580a46bc652cd SHA512 42e6c66855f79e24cfe0384e04bf0557a36646cb61524797cf19c500cc4b422c576ca77c3d65d9fb903c438a0bc3d985e5b6b575804a484621ec3d47d3e10fa9
 EBUILD gtest-9999.ebuild 1705 BLAKE2B 5d6cdc2e1a62ea1cd40a10831c5d28a25ca05242f7e115f9e99d2a2c2b72c4b931b9d820cec0974c895dcac5a07b8d230b59565cdb4077bec3f5329dfcae54bb SHA512 c28e333fe5731d07830f6c19f7a6e91f78f6e1e39a91d6ad4af024d034a00dc1ae0fe94cea00b4f6eb6d58e330d55dd5b53ce46a3ca3e92896e31849b24c59ef
 MISC metadata.xml 565 BLAKE2B 91bfa03883973e06fc2532239899f7e881e59909906fc49829eb657ac9e0b505229878a81fc627a6b66d81951a835e0b74f54030da340c91b22edc81e81359b7 SHA512 3a4f04b89d43ea090a021d8a5d9c571bb119727228f375c089a613c1fd2b62a24d53073bac466cbb6f259ab82504002f0cb23e9db1db25dc8bdbd2a6ebfa04a1
diff --git a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
index 92fc988f039f..d34fc442dfc7 100644
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
@@ -21,7 +21,7 @@ else
 		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
 	fi
 	SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index e41b70d8de40..bfa8cba073aa 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,7 +1,7 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
-DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
 DIST gtkmm-3.24.3.tar.xz 13539040 BLAKE2B 24664773ec7b0666575346aa0532e8961fc19d965ef34244ed97707f7e3eb4d1d0f016abf733531269bf3e3201defe31559990e32f4f43faa8d3bb5d1f02fdb7 SHA512 e373807ec245057708655fa5dbf18d5391656a55b008fd6aa0fdc5a56e80d288813c3bbb0093f39aa7679df866a176f1e6b0e842d4d1b18b775a5928eed9fef5
+DIST gtkmm-3.24.4.tar.xz 13534708 BLAKE2B 7fb6e2851d1f73d42612b964d706d55060cbd18806bbefb800e2086706b973cae5296f31df48407d8f7ce80d6e503a5a79bcd54a9e1b86c8ecd6b113665f3255 SHA512 e3a10aed9cf2df7369b5dac3f1de000b006e08aef6f2d953d2faf2b023bd744ed4c9c2ad5221adc1b0c919bcdc966d0c1c9dc698694d8630ceba56e39f91ac26
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
-EBUILD gtkmm-3.24.2-r1.ebuild 1875 BLAKE2B d90e6f650b5622cf04458f320a61e5500fb3300f9be22799958dbf43dcf8ba0a6a195ed5bf8c9c37e766a8cc7e3c677ff07951993c03f73a5fb6b2d92f29c2ac SHA512 e795ee1cb1c1efda920ee9e6ebf02ec183adec995a02ae2e373c34b1d0dd9baf00a371f879c9a8418c9680955625dafb20ef66feb1c904e1711f4c31ade9bf72
-EBUILD gtkmm-3.24.3.ebuild 1435 BLAKE2B a01b4e8223fc6f96814e75aa8ae9622cd2ffee40093ea973bc943f833f523f4436320edabfd8ceae97ac865eb3076e5d7ebc4f74f3130b55b763aafc52c98b7d SHA512 351c6a1d5c9865f1e841abf911932b50425e8008a9b21e0d541e9b6bbbd4bd04d4698fa5fd4fa5118682a7cd1dc5a5f47ecc02bc3cb77ebb13983c94c04fcd9a
+EBUILD gtkmm-3.24.3.ebuild 1495 BLAKE2B 8166cb99c68c772da990809a1302f93a2a10c5f4f09c3deb72d9579557c2d79c19367e92bd55cdb6390e8f561eb961f6187a7af71dff5fe4e1a835b13c094ca4 SHA512 453cb63072525721025df38aa422d301dc94ec35138a1fde2e3f6a31291e6a67f395ee74b57ca2488bcef95cbcc0dc1afd6e68e9bee07f09438ed34caa5e9e16
+EBUILD gtkmm-3.24.4.ebuild 1501 BLAKE2B 157b2d4944c530f458da5638a7aeaa4392d4a9ded67ed56abee52835654efab4aadc640d80417faa34fd90f1c95039d2dcf0d12e5d2985676c28349c73c6ad96 SHA512 d199aca0fac51304a9cc035053a09b33c8688d1e3ac71c81221cf6ea90ffeb413d9fa7f184ff3def7dce8844300e4011b99cf7f714ad18e1aac9696c4335112a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.2-r1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.2-r1.ebuild
deleted file mode 100644
index 70fdb34353fe..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.24.2-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="aqua doc test wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.54.0:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/atkmm-2.24.2:0[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0:0[${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-# eautoreconf needs mm-common
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	# don't waste time building examples
-	sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--enable-api-atkmm \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
-}
-
-multilib_src_test() {
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find demos -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find demos -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r demos
-}
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
index a1147702594f..d1922c85351e 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
@@ -2,14 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal virtualx
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1 virtualx
 
 DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
@@ -33,6 +35,7 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	${PYTHON_DEPS}
 "
 
 multilib_src_configure() {
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.4.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.4.ebuild
new file mode 100644
index 000000000000..d289e75623bd
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-3.24.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1 virtualx
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE="aqua doc test wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/atkmm-2.24.2:0[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/cairomm-1.12.0:0[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.54.0:2[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/pangomm-2.38.2:1.4[doc?,${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[doc?,${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	${PYTHON_DEPS}
+"
+
+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_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/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index a582ebbda9a0..6947bcddd90d 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1,7 +1,5 @@
 DIST kokkos-3.0.00.tar.gz 1923287 BLAKE2B 4a2935e9388b3d577d6ce8678cad37830970222e6ce8a9c3db67633cb521440f14fdb380f03d3c77cd5ade85abe94aef97e9cc4949cc3a140fae958e0c15fff8 SHA512 c9daf62a2c92462c815aa241934aca5720bac8f88195635ae5a3ff4111d289a48898d32358b91e120756d3412820050297a76f44828f4cbc0b2b837a736e84aa
-DIST kokkos-3.1.00.tar.gz 1972408 BLAKE2B 47c3eb83526dd13430a3b7049a98169d15ef73c6d2b3943c5600a153d28a9c6a0d6ee0b8eda1aac5f1b53556c5cee1680ce92a90f97b1b2741e1e7f0c9222486 SHA512 7933542c24e137052d630a503d707912295022863f2d47c89c4a35a9c8a70514763d89e321c66a3878575e661461ede45ac44d74cf45eca2470e7f57840d5c0c
 DIST kokkos-3.1.01.tar.gz 1972707 BLAKE2B fe31556ecba6b01ed6e480f0cb4ca4d7dc487d6b2a7e52df94d0e93b864ed5269a752f4fcdbacb55383e9dee3b72236f121b67d2f5eed10f3351219b063e7099 SHA512 4fa428ec33ec207147b3fcc5e0d297bcff4ed772ba6baa24ccaf56b691b72b70c69bd48fdf134f4e78234bf755377fe01a31611a41539c2d211ba9caed24b1f2
 EBUILD kokkos-3.0.00.ebuild 1023 BLAKE2B a1d9bca6bea7652c08ee22255df77af679984dc8373fef66ad3ee26043db976919a89b90305fcf2b2150fb50d5c449d5b42fa75489cac8c860a9f6c51722f43e SHA512 8964a283ea1e760085c0b9d5f9fd1427e9ba059f4fd1587685bafa96f06a2c98404104504a92fb224404336a0c92375a1ad4e55de9311044ebfd6725d7ba169c
-EBUILD kokkos-3.1.00.ebuild 1024 BLAKE2B 957eafe9df459038c3795781e6405c27a09b63e7d19f01f34bb5c424fb675b91dab1beb8a092f468b10601f77103170f510744b6517a8318fc6f8aad7504ca75 SHA512 8df43769f7bd8cb238340095ada12834af14197f89f968a827ddc0f1cc60942311a1c4a50301ec390b82cf9a287a7813ea28e2abbeaaa42d0a239acafac185b5
-EBUILD kokkos-3.1.01.ebuild 1024 BLAKE2B 957eafe9df459038c3795781e6405c27a09b63e7d19f01f34bb5c424fb675b91dab1beb8a092f468b10601f77103170f510744b6517a8318fc6f8aad7504ca75 SHA512 8df43769f7bd8cb238340095ada12834af14197f89f968a827ddc0f1cc60942311a1c4a50301ec390b82cf9a287a7813ea28e2abbeaaa42d0a239acafac185b5
+EBUILD kokkos-3.1.01.ebuild 1001 BLAKE2B 953a51a0b3397e8e5d7560e9e9dff920bddb669b47e2f0832f78cb47cc721268682d5d04dbf186919f9c76f0994f6c041b8349753dc7a353ee94f8e0bcbb7a5a SHA512 67d6224e2e2ee9437d80650c00707cd0d77c21c6b8fdf868c16f39af065d711bdd29da862249ecc9aee29793c615f12a5e0de1e7cf5078faa748e80545db112c
 MISC metadata.xml 253 BLAKE2B 58dd329781b98af52e191fbc6b1de24c80612678e467d126dc77ff0559c12eb8fb48546ef7a240f64fadbe289039adfb87dd2b0c8ae01bd9210bac81b2b385bf SHA512 a931cf8d295191e246377a75882955524e9e3a86aeacf4a5067c0025b6a03d608cdfa6763cfc53ba4a00cd6ee4b7db42d1a042dda5e74e578047ad42ad92be50
diff --git a/dev-cpp/kokkos/kokkos-3.1.00.ebuild b/dev-cpp/kokkos/kokkos-3.1.00.ebuild
deleted file mode 100644
index b8bceaa6fda8..000000000000
--- a/dev-cpp/kokkos/kokkos-3.1.00.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Kokkos C++ Performance Portability Programming EcoSystem"
-HOMEPAGE="https://github.com/kokkos"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 -x86"
-IUSE="+openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-apps/hwloc
-	"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		use openmp && ! tc-has-openmp ; then
-			die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
-		-DKokkos_ENABLE_TESTS=$(usex test)
-		-DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
-		-DKokkos_ENABLE_DEPRECATED_CODE=ON
-		-DKokkos_ENABLE_SERIAL=ON
-		-DKokkos_ENABLE_HWLOC=ON
-		-DKokkos_HWLOC_DIR="${EPREFIX}/usr"
-		-DKokkos_ENABLE_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/kokkos/kokkos-3.1.01.ebuild b/dev-cpp/kokkos/kokkos-3.1.01.ebuild
index b8bceaa6fda8..2456f83dc2df 100644
--- a/dev-cpp/kokkos/kokkos-3.1.01.ebuild
+++ b/dev-cpp/kokkos/kokkos-3.1.01.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs
+inherit cmake toolchain-funcs
 
-DESCRIPTION="Kokkos C++ Performance Portability Programming EcoSystem"
+DESCRIPTION="C++ Performance Portability Programming EcoSystem"
 HOMEPAGE="https://github.com/kokkos"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -15,9 +15,7 @@ KEYWORDS="~amd64 -x86"
 IUSE="+openmp test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	sys-apps/hwloc
-	"
+DEPEND="sys-apps/hwloc"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
@@ -41,5 +39,5 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest
index 849540acf6db..4a6ea220946f 100644
--- a/dev-cpp/libmcpp/Manifest
+++ b/dev-cpp/libmcpp/Manifest
@@ -4,5 +4,5 @@ AUX libmcpp-2.7.2-zeroc.patch 2342 BLAKE2B d33a7539044a084ce42d5655db298c92b2885
 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 893 BLAKE2B d4746ed659e1390fb35d515f8e201c55f1b1fccdf6562ceeddc333ea9320bd185ae2f64e1cc74e194b015f87dc293bf2447e5a0536ddc461362d52287fa151a7 SHA512 d6eb6671dfb4206caa08d88af5b7deb08c98f3b78b234791aab2ad50938768c2cc51970d10bfb01cecf04d0ec08d8f2bdfcfaf83b028518674014d3ef4a68112
+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/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild
index ca5877298ab4..5d8068387d5e 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
diff --git a/dev-cpp/metslib/Manifest b/dev-cpp/metslib/Manifest
index 85c0623d8f1d..c04deb531d76 100644
--- a/dev-cpp/metslib/Manifest
+++ b/dev-cpp/metslib/Manifest
@@ -1,3 +1,3 @@
 DIST metslib-0.5.3.tgz 218295 BLAKE2B 259cb3e51a7faac9b36bd43477114e0e91a11ae7874cc6d520d73f400a4cd2252800f66098a611b53a2b6408ed3f7fbe02639fc5ea3c46db95e16f6ede073376 SHA512 27acc3728213f92963e046fa5ffd268686764e02d35765415a544194d70c873cfe38d5bba5a259b63847ab815c5984313fe81a66da1d39c89615a413943f7b04
-EBUILD metslib-0.5.3.ebuild 434 BLAKE2B 235e85450138ede3c75f733e63d9c2d61b94d7ea5a29bdfc3bb604aaddbc6fca2b31dba97c98d9449f3e00aaa465ad2b272040448660704ab04a1cbfe4bb0ce4 SHA512 6184c50ba4c722bde25d6fe3b3327c0efbae3039a399dfdf9e04e28ec25a33e205bb74cc6ea1ff609f704c905d2889a00a7f98dabaa96caacdccc7fc0e939249
+EBUILD metslib-0.5.3.ebuild 393 BLAKE2B 7ef03dcac43cc08495a3fad171e5c95d43ca6c05de554e3cd3b60a4b1a87710b6eb7181facccbcb962545fbe14507495b73577e1233bbd9eed6a990f4a7dee07 SHA512 a1a3e1574dd741e53146e2df45e612cfc220a21d1e215142a644d48160c9a630ecf32c17b68c16e0f2ea64828dd731cc244baac8be4ae9228ba605a302dbcd5b
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/dev-cpp/metslib/metslib-0.5.3.ebuild b/dev-cpp/metslib/metslib-0.5.3.ebuild
index 6cecf6502b7d..334c371311da 100644
--- a/dev-cpp/metslib/metslib-0.5.3.ebuild
+++ b/dev-cpp/metslib/metslib-0.5.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Metaheuristic modeling framework and optimization toolkit"
 HOMEPAGE="https://projects.coin-or.org/metslib"
@@ -10,8 +10,5 @@ SRC_URI="http://www.coin-or.org/download/source/metslib/${P}.tgz"
 LICENSE="|| ( GPL-3 CPL-1.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
 DOCS=( AUTHORS NEWS README )
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index e6bd1e32d53e..49b2670b27a5 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,5 +1,3 @@
-DIST mm-common-1.0.1.tar.xz 271144 BLAKE2B a5c540c9004103298627146e6483de1345f1c3c1c6a48e3f0821a42f1e875f1753df5d5e8164d4c95e844a3b0229a45e697a49596a0671c9717a7561bfc621de SHA512 1dd5fe5fbcc04c6d42cbf4ff33a06058fdb247f6ed9ce958f7231eb99ca7e4b41ea2b91611e0d3909e0fcc9f45a6a4b2c119c0bd3da8afb1741256ca31e1a33b
 DIST mm-common-1.0.2.tar.xz 271720 BLAKE2B 955a541290ffc9489a7061a1bdcc4b2cca7ac5e0a834a008b4e15173e3b6df38a5fb719f26fe6f83c073c025c7113bba3586f28a6341d37c7c98cfc93ec50f0a SHA512 106f3aae8bb836386148098037c52fef19c3779f5e8cfbafcbe52eca17340a6e2fb7e5c57154cc0a90b75c0bb23900a4274591a71d85f81391be780c53238de0
-EBUILD mm-common-1.0.1.ebuild 524 BLAKE2B 4e82c5d0e8ad644c9d98a94e3b46525b4332f8a15ba5567e34fe653ffb59e5f11e634f4a24e2fff55a2f3e49734e9dd243c81c60645b5d6b7ee242f962b58152 SHA512 8baa70e97a72de48bc720aea432948a9fd0a28d49356ecb4d39fc0c1a247aadf7733dc3474a2b4441cf3a67ff433e8e365f9344f5d87d805f416c3bce45d2e7a
-EBUILD mm-common-1.0.2.ebuild 499 BLAKE2B 82986a54c2c0513c928743efa548d203d7f76dfc6e62671f0e0efa37483b0fe88dd1eda45d2d58ec045c99c2908a381eb4e2b92c0c95d12cef918178594a4e84 SHA512 f99b5f4ca4726493230a08707443c5ac0563b1f975b380a496bf3781d5e0743a4b71fb87bb71d8378cc64fc8100974f9e9e7777fb35cf205e202d7443d207107
+EBUILD mm-common-1.0.2.ebuild 567 BLAKE2B d34816e233e5e97a8973c4e0ebeb1729680c83f6140986978f053db23f4fbe18ab00a5e1f125b3afe0591e59950a707e3c66f136a42856d053539d9e64a213f9 SHA512 f6a326056c275761c43a7f49b65ce2c5bdf897aae1f2e0a4d99d1d7230c675e1c2da7dbf504237d39187edf259ae89cb9f2e188a9a30c598c85136d0746c6c69
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/mm-common/mm-common-1.0.1.ebuild b/dev-cpp/mm-common/mm-common-1.0.1.ebuild
deleted file mode 100644
index d9d3bc89f63e..000000000000
--- a/dev-cpp/mm-common/mm-common-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson
-
-DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
-HOMEPAGE="https://www.gtkmm.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	default
-
-	# Include project version in docdir name
-	sed -i -e "s:^install_docdir.*:& + '-' + meson.project_version():" meson.build || die
-}
diff --git a/dev-cpp/mm-common/mm-common-1.0.2.ebuild b/dev-cpp/mm-common/mm-common-1.0.2.ebuild
index 35492b68ab71..c313e2e311c1 100644
--- a/dev-cpp/mm-common/mm-common-1.0.2.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.2.ebuild
@@ -3,14 +3,17 @@
 
 EAPI=7
 
-inherit gnome.org meson
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org python-any-r1 meson
 
 DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
 HOMEPAGE="https://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+
+BDEPEND="${PYTHON_DEPS}"
 
 src_prepare() {
 	default
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 3ffeda56e7b5..aed01202c7e4 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,4 +1,4 @@
 AUX muParser-1.32-parallel-build.patch 680 BLAKE2B 7699b129186f0173bfbc7f742d51175ed67eddb9898b61f7d6a3a462e1a262112a2d4af445e12501caa88d4630308bb5f273ef2a704e2948db9cdb7649ee6bb7 SHA512 a39af330803786ebb86259dd86ecfac00ca04978b0e623b418d887f6b20a6eb6cee2b37da8164aa7038b3accf388b40b6a6d4eccd2f20afdfd6051cc3505ac90
 DIST muParser-2.2.6.1.tar.gz 755653 BLAKE2B b3b6b8da57c0e8a0bda74038689d444ba8da00d6cce80030d8b35693209f0293874e4822c4941974be21fd4b7c09ba7df2c9cef861bc10b890aae4f641040faf SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
-EBUILD muParser-2.2.6.1.ebuild 876 BLAKE2B 6584eeb77afd2bbf1f87551e89310fb1c99304d593057201b775c32c5285eb841fab14c195037909a71e39d1bd515255f1e463a34a8c52d518c8e58a8490a8a0 SHA512 1c5baf9945559baa8442dd38fd308060bfc47cc2e541b924271f98f41e56f44d9386042fb840ab72e6badd8bd8a35a24fcfecfed43c0dadd7fe714439464acb9
+EBUILD muParser-2.2.6.1.ebuild 877 BLAKE2B 9587b640454691d0a48c7a6afb882f94adcda6bd4a595d13709972cf8386ac8e81eb2f196d269a2f06007a0b135fc39a23f1b3c78c5394149e337e5cec858471 SHA512 c22121edf8919ab9dea8ba83be0ac0d8bcf3694776aec619c7b4cd9fa73fff6b2ac300df4ece8e0814d3fb9a1876e5c39b827f2041b4d363fa137ffef4b276f3
 MISC metadata.xml 624 BLAKE2B fc3684b1f97031e5d63bddbe28679529add1a931930a351cc56ae5bef8395f9a05020a00557a0b1bc421e20c09ce59b5332597043f96981405c1911407948d7a SHA512 fdf266f68b3463e7f22358efbba60055512d7f7fce7a98de6f572a0b4c191c0b0b50b29676a432fa7fd604207029314ad5e43f043831d064de8c5f232fb424a5
diff --git a/dev-cpp/muParser/muParser-2.2.6.1.ebuild b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
index 9f4fe65c7235..15e8213cc66a 100644
--- a/dev-cpp/muParser/muParser-2.2.6.1.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Library for parsing mathematical expressions"
 HOMEPAGE="http://muparser.beltoforion.de/"
 SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/muparser-${PV}
 
 LICENSE="MIT"
 SLOT="0"
@@ -15,10 +14,13 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-S=${WORKDIR}/muparser-${PV}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.32-parallel-build.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.32-parallel-build.patch
+	default
+
 	sed -i \
 		-e 's:-O2::g' \
 		configure || die
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 681a42ea9677..362cd0e1e421 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,11 +1,4 @@
-AUX nlohmann_json-3.7.3-gcc-10.patch 4668 BLAKE2B 6c70c34ce5df904ed641d021c8584cf69115f7b9434d5c43c283425e7eabbe40a21f06130b36ac1681302c9498ee0570ce396f82cb9258d5bef36ed7362f526f SHA512 ece8cea0e2aa217df1915df1de138db03320b15220d725bce4cf77282b5aa71952472594066c921efd6aa8a51ad0e2b1b22e83cfa89563f211d1225190a267af
-DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
-DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
-DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f008883333ab8cd SHA512 c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865
 DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
 DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
-EBUILD nlohmann_json-3.6.1-r1.ebuild 798 BLAKE2B 65d37e21588513c043122349c2e89450565b16c534d58849c8af36a9f14695296c624664db03585f0dfa5e8ec935dabf765290155a38714a28fc749bf66c02ea SHA512 b693e518ec9a21edbba894628d31db72463f0c54a4ae7aee190c680abec3b5197937367f44d6aaf5673a31e7a86114760ae3016a9acbec4463038dd8abbbf4c7
-EBUILD nlohmann_json-3.7.0.ebuild 802 BLAKE2B a224e06c3ef1199734674a2f693c448a1c621a2426887912510d5a09fdca0e9a108adf982bf074306098b428e5eef0d4b2ac02697038bdf41ab4c0dc38e39e82 SHA512 8499faa38a4de2f8733bfaeb2484cf7a125819db48836df2a72cefc7c107d88db5574f8096243d91f4c3e4b97a5f56e53c4fe98bb471636ff3f50d6bb107215b
-EBUILD nlohmann_json-3.7.3.ebuild 858 BLAKE2B 852622cec3d775387e1a63bd1c7fdec647d5aebb7d672dd90f780e04cfd3c254f76a56363d4b955277b80aa48dd99e8e044680735fa5a3ff05b575f64e2cdc8f SHA512 4a9435489e2fb3840ef663a915004056d3faa0ea2b6bc24d9d77d74e5c7ccdf2700a1a568938a27e7bc071bb5a9068165369e8f51d20b6217151c578c146ea55
 EBUILD nlohmann_json-3.9.1.ebuild 1402 BLAKE2B a1447d98f8b3fdaedb6de761c23de5ef1a2ea3cfca21d597075bf0ba44775ca19887791b17002d6626310356aee699c8b9a007985fe0ee80c404b9809de4965a SHA512 888ded9b7006374c1230ab51036a14db437bc9650781ba3b993ed00150f3651ab8ac57e0e35666b1e71c132d8120de6c17ceb2cc44d7aa169fd46828643570d1
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch
deleted file mode 100644
index 1cdb6d594eca..000000000000
--- a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com>
-Date: Sun, 12 Apr 2020 22:32:39 +0300
-Subject: [PATCH 1/2] Templatize basic_json ctor from json_ref
-
----
- include/nlohmann/detail/meta/type_traits.hpp | 13 ++++++++++++
- include/nlohmann/json.hpp                    |  8 ++++----
- single_include/nlohmann/json.hpp             | 21 ++++++++++++++++----
- 3 files changed, 34 insertions(+), 8 deletions(-)
-
-diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
-index 280f69534..dd0b3084f 100644
---- a/include/nlohmann/detail/meta/type_traits.hpp
-+++ b/include/nlohmann/detail/meta/type_traits.hpp
-@@ -41,6 +41,19 @@ template<typename> struct is_basic_json : std::false_type {};
- NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
- 
-+//////////////////////
-+// jspn_ref helpers //
-+//////////////////////
-+
-+template <typename>
-+class json_ref;
-+
-+template<typename>
-+struct is_json_ref : std::false_type {};
-+
-+template <typename T>
-+struct is_json_ref<json_ref<T>> : std::true_type {};
-+
- //////////////////////////
- // aliases for detected //
- //////////////////////////
-diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
-index 336d69fe7..0598efc8c 100644
---- a/include/nlohmann/json.hpp
-+++ b/include/nlohmann/json.hpp
-@@ -1773,10 +1773,10 @@ class basic_json
-     // other constructors and destructor //
-     ///////////////////////////////////////
- 
--    /// @private
--    basic_json(const detail::json_ref<basic_json>& ref)
--        : basic_json(ref.moved_or_copied())
--    {}
-+    template <typename JsonRef,
-+              detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
-+                                  std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
-+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
- 
-     /*!
-     @brief copy constructor
-diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
-index 09464f3b2..8927180e6 100644
---- a/single_include/nlohmann/json.hpp
-+++ b/single_include/nlohmann/json.hpp
-@@ -2794,6 +2794,19 @@ template<typename> struct is_basic_json : std::false_type {};
- NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
- 
-+//////////////////////
-+// jspn_ref helpers //
-+//////////////////////
-+
-+template <typename>
-+class json_ref;
-+
-+template<typename>
-+struct is_json_ref : std::false_type {};
-+
-+template <typename T>
-+struct is_json_ref<json_ref<T>> : std::true_type {};
-+
- //////////////////////////
- // aliases for detected //
- //////////////////////////
-@@ -16632,10 +16645,10 @@ class basic_json
-     // other constructors and destructor //
-     ///////////////////////////////////////
- 
--    /// @private
--    basic_json(const detail::json_ref<basic_json>& ref)
--        : basic_json(ref.moved_or_copied())
--    {}
-+    template <typename JsonRef,
-+              detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
-+                                  std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
-+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
- 
-     /*!
-     @brief copy constructor
-
-From 70be9751cd60e622ce6463f41d47c02fc2d83cbc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com>
-Date: Sun, 12 Apr 2020 23:42:26 +0300
-Subject: [PATCH 2/2] typo fix
-
----
- include/nlohmann/detail/meta/type_traits.hpp | 2 +-
- single_include/nlohmann/json.hpp             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
-index dd0b3084f..13e92cb48 100644
---- a/include/nlohmann/detail/meta/type_traits.hpp
-+++ b/include/nlohmann/detail/meta/type_traits.hpp
-@@ -42,7 +42,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
- 
- //////////////////////
--// jspn_ref helpers //
-+// json_ref helpers //
- //////////////////////
- 
- template <typename>
-diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
-index 8927180e6..294e7509b 100644
---- a/single_include/nlohmann/json.hpp
-+++ b/single_include/nlohmann/json.hpp
-@@ -2795,7 +2795,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
- 
- //////////////////////
--// jspn_ref helpers //
-+// json_ref helpers //
- //////////////////////
- 
- template <typename>
-
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
deleted file mode 100644
index 3f251a81fd24..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSON_BuildTests=$(usex test)
-		-DJSON_MultipleHeaders=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && emake -C doc
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
deleted file mode 100644
index 6c95f15b7348..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSON_BuildTests=$(usex test)
-		-DJSON_MultipleHeaders=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && emake -C doc
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
deleted file mode 100644
index 4a92c0804ceb..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.3-gcc-10.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSON_BuildTests=$(usex test)
-		-DJSON_MultipleHeaders=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && emake -C doc
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index 2f98f191a346..261c1d52fa5f 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,4 +1,4 @@
 DIST notcurses-2.2.3.tar.gz 10861361 BLAKE2B e7b487e84b5defbb1208f355c85f7178b05f412c2a746a8bcecb2da7db8df32da563aeb1f1f218014a2ff9803f0984889e4341d59f585add49c944d4707e5cd4 SHA512 9c718a39352cc10e4f4cb24cd7940ccc7ac7ad1f5890f1a87166267b3c24011629464a4720f08c2b8bbf0fab2c5cb9b31fba7a43bc62ae65dff894019adece7d
 DIST notcurses-doc-2.2.3.tar.gz 89550 BLAKE2B a42c74f95166e48ecff99a05d66925869a44a44c4faa867cca663d94ee340748417d6560d022fdb90c7761c19285b0c4838b75843a3d26d25182977f68a0d6ce SHA512 b61f829d1ad5f69147a7b4fe139db406d5a26683b55d72251f3e313c17f591ad4e9e868577fbecf86c4ac9959c942e244927fb29a2e44996fadde7946493ccc8
-EBUILD notcurses-2.2.3.ebuild 1139 BLAKE2B b3f88e3e18ce6bdbac48fbc24f701e723015538c5bab4608fc3e114e7f783b5b3e732e9d6c28ff794e964655192af9a77489c48094decdba4d380f21be2bc314 SHA512 f28252268d25f06eb33659340e10f11316989df79bbedbf7793a313a0d9d005fa8e31353f93d9f485342d733c10c3dc2ada1893ed1d28c7163f061bcf5561ce3
+EBUILD notcurses-2.2.3.ebuild 1143 BLAKE2B d087cfdb4f7e3c67bcac784d5d2c1255ad00debb6d924eb41872368275b55dc365cccdbbf4b498216e6f02ede0b284ac7c67ad77e35397f95e3e9c50dd31efe5 SHA512 d9c3d14b91b017fa4c196a034e17c53bd661f5c75688a03b3c076492e91bea6949f073a03e735af2e84b9a93ddf0691d3f467c3c45f54fa978f4da2313edf285
 MISC metadata.xml 869 BLAKE2B c5414b2e27b44526c56e9c476d8c5540a3d7b462b70ed6e3e323c0dbee15c704055cc7d17bf270fbb7a6125bfa10a2934c9d56d5c727d73df0c8125ec30671d6 SHA512 f893bc5d9b44d26e178250432be8762524543f0c124c932d535e4f9742924d27a26b065a5d1275dc451f23b0ff72a55a2f5107749021081e7e399617de132f17
diff --git a/dev-cpp/notcurses/notcurses-2.2.3.ebuild b/dev-cpp/notcurses/notcurses-2.2.3.ebuild
index 52303eeff6fe..9715255eb4f2 100644
--- a/dev-cpp/notcurses/notcurses-2.2.3.ebuild
+++ b/dev-cpp/notcurses/notcurses-2.2.3.ebuild
@@ -14,9 +14,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-libs/libunistring
+DEPEND="dev-libs/libunistring:=
 	media-video/ffmpeg
-	>=sys-libs/readline-8.0"
+	>=sys-libs/readline-8.0:="
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 19f0e340e28c..24b49c3b6013 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,7 +1,5 @@
-DIST pangomm-2.42.1.tar.xz 882508 BLAKE2B 34b6a93d931e1a27c7859e3cc407c714588890122639a61d30d9886bc3d861f11e1fcb97a08b6be8bddcde776d86f8b6c4cdc4a53da245ea1dc81f50d402303c SHA512 46ba375e61dd32e268397ecb8e69364b642ea3d9a6c4d9e3e52500e1e1c9fa0c6aa822c6d5046f49a2fe4d9a872c6c2b354134d39c17370abcfc6a1d752223b0
 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
 DIST pangomm-2.48.0.tar.xz 674516 BLAKE2B 58c3e93c6127a14b5bc866b43bff4ab25a1ac1a06813c73e4f2a4d02adad3f51b7ec922f7c6e3d4af518a1f8f31c19de4df0c11b91a10ee61c2e16df8aa025ea SHA512 0c1be5726740669c366214caf8b8b0bca1c7b223aafb2e6ce64f7a5a90d07c62ee509821ac787f3997ae78aa3a3ffd5cff7d33c73bc7ebd7fe642c56689d98a3
-EBUILD pangomm-2.42.1-r1.ebuild 927 BLAKE2B 59f19896cf60e1c4296e31d58584ae819ba31044db859b4ba5f4f21c8637091116dcb6eac2ea3fc4372f49e3a0e40211512b0b1c689665bc5c025a2720cd25be SHA512 1c0d1f39152b9c27e67a94544dbf777afbff64bd4d2751d525e60c636b36c9feb8f516ed6c9f7ba7f3187082db2a4f21421f0bcc5c810dd1e6368e63bc26af5e
-EBUILD pangomm-2.42.2.ebuild 991 BLAKE2B daff32bc87f4d3a0978c22a358e59737c64bed09df58e00b4a87dff6671bb7e94674c11dfd04568ca00bb204b4d3363f19dca569534d627762352749e171b408 SHA512 9171d58dbcc3d0348bb38f8e5938a28cd3265754a56f738257ff26f685569d8c41ec07a02f89ea570e02268194b2536206ef966d03b098499668110dc9c77f33
-EBUILD pangomm-2.48.0.ebuild 1005 BLAKE2B a5e2ed5eeba3809426505d9c017654c7affc840256d2874e8d5e14033a6783fbeed2badcad55cf232d79e1728bbf62edaec153e63ddb2a25b88da0cddc5fa689 SHA512 77df10f6dc25ccd967316aa4879ff57c45c9ab1afe22ea98cd0ed26a8f5857703360874349792612934e34b11c823274274d7697f356f6fce64ab3f38cb8b8c3
+EBUILD pangomm-2.42.2.ebuild 1051 BLAKE2B 5bc6fb687bfa063c8ef24da32b635882a56203611336cbf36a46c9ecbd9365436e0ee7fb565e75a2e2b824ebd2c11b5d3a71146b31cde06c921a98159a8721f6 SHA512 d35deddcb90fde39fc517d69e2e8d5072d9fc611bff7681fe51c846abbdcea074f5ebf03f9398c9a8465dde239c0b58f85b539a7b342031b7b7f7b6528b4b531
+EBUILD pangomm-2.48.0.ebuild 1069 BLAKE2B 79cb13af7cc48eade2f248088278c34ee82d2b98e611976711103ecdadd4fdb7a4c892213df8b98091b64b7be21c9be73c162811dc188008bf1a0c72fa0d9752 SHA512 309d8cff184fc738a1febe012f10e37d9f3f785a7447730630f0d49a827696f2980e48640870ba483d8199800211c76d39552a454388267aa35c94900072797d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.1-r1.ebuild b/dev-cpp/pangomm/pangomm-2.42.1-r1.ebuild
deleted file mode 100644
index 5b8d5a7f6e53..000000000000
--- a/dev-cpp/pangomm/pangomm-2.42.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.41.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.48.0:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0:0[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-cpp/gtkmm-2.13:2.4
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/pangomm/pangomm-2.42.2.ebuild b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
index 103bc296f9cc..d0a2f770d9af 100644
--- a/dev-cpp/pangomm/pangomm-2.42.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
@@ -2,14 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for pango"
 HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 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="
@@ -26,6 +28,7 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	${PYTHON_DEPS}
 "
 
 multilib_src_configure() {
diff --git a/dev-cpp/pangomm/pangomm-2.48.0.ebuild b/dev-cpp/pangomm/pangomm-2.48.0.ebuild
index 7a3b8eba6959..924043617bfa 100644
--- a/dev-cpp/pangomm/pangomm-2.48.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for pango"
 HOMEPAGE="https://www.gtkmm.org"
@@ -26,6 +28,7 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	${PYTHON_DEPS}
 "
 
 multilib_src_configure() {
diff --git a/dev-cpp/picojson/Manifest b/dev-cpp/picojson/Manifest
index 1d3ee516a3a5..37bb0a3bb370 100644
--- a/dev-cpp/picojson/Manifest
+++ b/dev-cpp/picojson/Manifest
@@ -1,3 +1,3 @@
 DIST picojson-1.3.0.tar.gz 14695 BLAKE2B 9643a17abd8b53e7191fbab924c36428c71f265cf785f6759d66735a0501cb2b77ef385b4b4c35d8d1512bd9f3b31ee6b38b84e15b7eb6b0dc737f4253f384ef SHA512 76d5a6b3b9e1151198eee707faffcbbba28a2842daccf03d99a5d02ae017f9517ef3ac9da4acc74a4fc1357feaf19e14a15c34698a1d4cb65acb6d23b566b284
-EBUILD picojson-1.3.0.ebuild 579 BLAKE2B 7d41dec9556795e470d059e15a32eb2c268e3c00a945945a3515099fe8f4f97905eadb4a1eb3e90490f9fd252b601ebb544757c2eb081e18d7a5ac1d71ddb4c8 SHA512 e4c2b6049ecfcb38e091f86971191fa0ef38dde1a59bca8fcdf12f791c4b5d3a5ef66efb9fc83dae9ccfacf66087525cd002d807884e9fed78cf8def85767814
+EBUILD picojson-1.3.0.ebuild 537 BLAKE2B b7f21fc7be41fe1a6b5cee0cbbc2292e450ca9a37de9235430887afc6d6b696cfb339fc06136341ce1d4757f72049185a069efdcd9e95ee768d9b21225bf9f7d SHA512 ef96a60cb2aa353d6bbb17b1d624b68f295023edaa32feb5b7afd5b93bd723fd475cd0dace19d9aa89bcfab12ab960ee30710dd2a6139aa5437af7051cb5d58f
 MISC metadata.xml 329 BLAKE2B 37ec3540e2e0e5f4a6807f12bfc0daf5473e8f403a2d21202226766a2ed2266192ad45fd96ea6d05f0fda7fe293ef595ce6ff10b3ba189d002666bd9000f9faf SHA512 2254a5a67beb7a23f59f37bfe88fabf50ee313ed3856a69b5d861c2b741b07255ee45742f750c1d74d18dab941cff06a4b1956b5473d7feaf5d05905521a6da0
diff --git a/dev-cpp/picojson/picojson-1.3.0.ebuild b/dev-cpp/picojson/picojson-1.3.0.ebuild
index c37f0c8e81e2..ca57d8fb939c 100644
--- a/dev-cpp/picojson/picojson-1.3.0.ebuild
+++ b/dev-cpp/picojson/picojson-1.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,10 +12,6 @@ SRC_URI="https://github.com/kazuho/picojson/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 
 src_compile() {
 	:
diff --git a/dev-cpp/pstreams/Manifest b/dev-cpp/pstreams/Manifest
index 731c0b70ee0a..703fb0d4e88d 100644
--- a/dev-cpp/pstreams/Manifest
+++ b/dev-cpp/pstreams/Manifest
@@ -1,4 +1,4 @@
 DIST pstreams-1.0.1.tar.gz 66188 BLAKE2B 937b9ae833dcace9f0f44dbac6907d5c73c5757f604ea96835c0ddf0ec9abd5fa4f40a1c01872a47fd0bcdc094f90215da6b7f80f261172f93f7b5233b60a5cb SHA512 279f758a4aeba124227e3de07e202f6cd838bfca4f34829a446f2f20cf426bd404f28960b881f810b5f2038e3946d38174ca09e6a07d5dacc0501f41746245e6
 DIST pstreams-docs-1.0.1.tar.gz 178382 BLAKE2B dd44e4c6acd83dfc6896145e77408d7c23150c1156e477ccb4052341e041d82163d0ee3e8069ea5fda9033617c3a1162fc2068835d089f6ce7614477c2e3e58b SHA512 e645cb3d1c20cc0c717d03aa24e500489452d0880af0feddcf234e713878159b22a891ec04a66f0aad6988e71418a224a4ba66064e6a83578ecf957d9af167e2
-EBUILD pstreams-1.0.1.ebuild 758 BLAKE2B 63e50465cb35373552e4cc3a049cfa1a803054d7c2187adf74e52b618988f2cc745c49264d49459423c98066f5af87fb98649d381abd22c02de78873f73e9303 SHA512 db3174c8ee41bf0ed26a1392579dcb5bb4c09526f5b3fb34688eee90c8f7a69e684b77b0bd64c5500da34ca89752a77a3308bbd461d9af0a9203617b9ea611e9
+EBUILD pstreams-1.0.1.ebuild 772 BLAKE2B 4305c366edfef5c7c5ee173cec94c8ccbf6baa9d44b4a790032eff3b29b2fd5f8a6f691627b14c2da44db548ddc280fa458bcbcd3faf612242b040f37ef1a4e5 SHA512 9419a5c4fc08164067dc6d71efa92089deb59a2682ecedc0a9768c8e16abfd790cd1527bea028a241c04b7cd8617a0747cfcb043f60a74d506f99fa880d437db
 MISC metadata.xml 337 BLAKE2B 66acb2c28e0ad98c5ac08ea75c9e894bb93c8f4b843f42c8a801a0cc34a381605f966a8c7145e808c78698d4fda35edd3f13f7a70cdd960f8d1289133624a545 SHA512 ddcd30a829ddd52638e7ea4ff45a8050471f21f532f8d7cb7325346f1e81547ba7bc32d51fbae7fc0dbcf04f310be6cc0049941753191a0cee03a976163d6695
diff --git a/dev-cpp/pstreams/pstreams-1.0.1.ebuild b/dev-cpp/pstreams/pstreams-1.0.1.ebuild
index 4d10c3e1bf66..e95044c86695 100644
--- a/dev-cpp/pstreams/pstreams-1.0.1.ebuild
+++ b/dev-cpp/pstreams/pstreams-1.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -11,13 +11,12 @@ SRC_URI="
 	mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${PV}.tar.gz )"
 
-SLOT="0"
 LICENSE="LGPL-3"
+SLOT="0"
 IUSE="doc"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_compile() {
 	if use doc; then
@@ -38,5 +37,8 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog README
 
-	use doc && dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/*
+	if use doc ; then
+		docinto html
+		dodoc -r "${WORKDIR}"/${PN}-docs-${PV}/*
+	fi
 }
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 576eb4d90f6b..7327b1b36d89 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -2,7 +2,7 @@ AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427
 DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
 DIST tbb-2020.2.tar.gz 2637172 BLAKE2B 6b6e65732d3971f7374058513004ca3cfc3855b83c0a2dde59d50e08c26ff220470e31db86f4ab9f009c7e02e454a00a348730e63c829aa8d217320f7879cfc9 SHA512 6d7412fa6ce12d27736af3c8942c5ab5ea6945dd3ca93f309535c0dba3ff757d6507a5ffc3bcd73e6fdcda043cdedfa657631b25ae86fbf221d0f1d66a85b48f
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
-EBUILD tbb-2019.8.ebuild 3219 BLAKE2B da178b7f1be91e0cea538891f93d40842fa7fb72ee81b60fccc46d46c8f0ce8c36aa0a46910013bb78311ce05452d5d8594067f4526a74126341bae446ccd76a SHA512 00281dde79efa4e06a6b98eeb206d823e06a8b846808a58d43f324bb2053e2ac4f20a7b8a0b9d85416877a58efb03410855e10af073675ee85d0313bf87b42fb
-EBUILD tbb-2020.2.ebuild 3397 BLAKE2B b5824f331e87bdfa563c1bb430d8d599ad5d3415c3582d6c3d7deb036b0aef8009798d986af9e8f01f49c1fc77559f0de31a47f75044d13b20a9ca4a35f997c6 SHA512 c659086dd1beedbc05bb1570185d546970040714c2c4bbb3db595a20b04070397538ae79777e3ae01ce18fc5033709ed4e6a8ad535f5c9967e71db05893b846d
-EBUILD tbb-2020.3.ebuild 3391 BLAKE2B 9c8791a0ea337b4db5b6aa3ba819cd0de176eee8581403b037a7d0f84c8890e11182310e5cd31cf8cef812ce13d80c52b70962dc6b5c3e7e02c06ce597fbbbcf SHA512 8a057dc3453a9851b00727e839230cdf24d2e50959b68d4c0c9bfac6314efd3d69c4389d91345d25bc5a3daf1c75ba18fbfa3dddf4d21613fb932d2357232b57
+EBUILD tbb-2019.8.ebuild 3212 BLAKE2B 89073e2f92898de3ede7e4843fefb76b42453ed8c028e0b25821b375b7df0de2125e5ca1435d072ec36f1fbc3c900e709252da4741aa27a8103782d79487018c SHA512 56c50fa1857cb67b76349fdc2d488f17daf7329083f58dee8cd0e7859e943974cde7e5d089990676da78dce2040738de245ea6d4b58656a287463bc1060b1ed1
+EBUILD tbb-2020.2.ebuild 3390 BLAKE2B 93447f24b6b315e583b30e59c601cbd1c211882265305f80ee4154715a36069b164f3c932c597a31ac56a2a1dbc860586e82505a854ac27fa9a9261cc70a7a42 SHA512 5475c1d334a76a3ee8eb97ce83bd50d1155d14f7cbc7edb2996f999f4b9fee07a0f695cec35cb9ca9b4127e346cf291ad715aa73056732a65c44d5207b05f254
+EBUILD tbb-2020.3.ebuild 3384 BLAKE2B 81c592eac141065ea83b0157b7e2b15b761226b8913aeb489290666b1e2b65823ab5dae1c2ff09eba90b85bacf193b9234045e6467695c653de98e4eaa192aad SHA512 b087685bf5ebfb324ea11e3752aecceb45e51f08238d977e6f306a1bfdd4fa66c3f43108064cc284ab6a2aa9fa2c3be43a920f950c7ee7b9a5fa4e66102b5663
 MISC metadata.xml 687 BLAKE2B 3d71a46504de458f31f2de33441c575240d35c0c1fc8135721b58ecf89c30f2687bcbcabd2c0c78c52547a469ac7540bfba41c98799aa621f6802830af3fe6fa SHA512 ae6422c5a68ae7029f966c2cc717b52e8a018c2720838911b2ec9961dd3881f3cd4e0608b996023186d6c4dba1d465e5a726dd1a271c34b063a262efda0b753e
diff --git a/dev-cpp/tbb/tbb-2019.8.ebuild b/dev-cpp/tbb/tbb-2019.8.ebuild
index f8b27cedd94b..da66dd2bd839 100644
--- a/dev-cpp/tbb/tbb-2019.8.ebuild
+++ b/dev-cpp/tbb/tbb-2019.8.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
 
-inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+inherit flag-o-matic multilib-minimal multilib toolchain-funcs
 
 PV1="$(ver_cut 1)"
 PV2="$(ver_cut 2)"
diff --git a/dev-cpp/tbb/tbb-2020.2.ebuild b/dev-cpp/tbb/tbb-2020.2.ebuild
index 25976f821bad..3e132d1c71b7 100644
--- a/dev-cpp/tbb/tbb-2020.2.ebuild
+++ b/dev-cpp/tbb/tbb-2020.2.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
 
-inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+inherit flag-o-matic multilib-minimal multilib toolchain-funcs
 
 PV1="$(ver_cut 1)"
 PV2="$(ver_cut 2)"
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index 08a93301b150..91e579d8a4e4 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+inherit flag-o-matic multilib-minimal multilib toolchain-funcs
 
 PV1="$(ver_cut 1)"
 PV2="$(ver_cut 2)"
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index 0a0daf13bea6..a73bbf1fa14c 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 582 BLAKE2B 79372cd645feea22c5c68a1e6fdd3d4c9b50d5c07c353dc3e7e4bc082779252dff86edc2d72705d53d6d8a3e80d834cd407cdcb5d456d1ac1732c65076a728de SHA512 0a44c717c0ff3039f9233451cd3178351d5204c3d96f7a6f25b325cd8c1ec3a3079b67be6c0f8555cd91fbe6491862f6d6e5d38ff71374ea2a92111a072d5450
+EBUILD tclap-1.2.2.ebuild 583 BLAKE2B 5adde8b982b3007a994a88748681039e151368f446c41982d63eb4513f848a80c4ef5de380bd2cbfaf82170428ff54cce13ceba9d8e40b9d4269ee70e184b117 SHA512 0a6dfdfe8f981d439de7498fe94b630aea218d236b78fac9bbfa3d79a61be28cea6d0a4838e78cd5fac0843875cb6d99672e45fb567b0224adbf49679dda3362
 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 82435d7207ef..a41b021a70b1 100644
--- a/dev-cpp/tclap/tclap-1.2.2.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux"
 IUSE="doc"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	econf $(use_enable doc doxygen)
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index 4b18dc905c4f..790fc3cd5405 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1,4 +1,4 @@
 DIST waylandpp-0.2.8.tar.gz 181950 BLAKE2B 186515308d2e17e39e61f953fcf43df6bcff45a965d6425ffb71f0314fc091d241a975d0e7a61e988091ae7491cab56e163b6bccc0a2584b79b5bd5a7f8573fd SHA512 bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
-EBUILD waylandpp-0.2.8.ebuild 770 BLAKE2B 006d8f8ad20c3125e78a9ddff29069cea75ea2168cf683be2e3b447d0bdaf6187c73f599e17d127c45b24e75bcd7ef1c9f6fb8d92042e9eca9e9516757e92b2a SHA512 8cd51144cd7e2e10510574aa3f193405269bb1ba628bedc04cb577cea9eaf1ce446562ab3a7123f8e2817ee2e139e07ee6bee30cd964fabf92a175dc9b11dd28
+EBUILD waylandpp-0.2.8.ebuild 769 BLAKE2B 03b184b095d853fe38dec739137cb57662cbb8ad25eb3bb83212508428fbb8eb5faa26450d85294120b95f95616b5de1b3ebdd9efc101fef76428860966c79d7 SHA512 80e782e136bf63b4dfa8df2a391deeb0ea58ccd2edfb8fe687e85b452ec7915bfc5e45f8e679353157a23b9cdca0d4c7fbfc2c4c1c07a8ec8c4173027b47ec37
 EBUILD waylandpp-9999.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
 MISC metadata.xml 401 BLAKE2B 3270a9fb51a7a5a0cede7e9bc863f1445db1eda5a3b132b8ed9d2eaaaddeb60b85720484a136e09d3e00b80240a637a9f8a9533311e2b6f17fb9798e2ed19ef6 SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.8.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.8.ebuild
index a2e3ddd55a4e..e3f8ec261a68 100644
--- a/dev-cpp/waylandpp/waylandpp-0.2.8.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.8.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-cpp
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)