gentoo resync : 31.05.2021

34 files changed, 52 insertions, 768 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 9cd66f4ff681..2157e7a22c20 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 5d0b31c8d0ab..57bf15c80171 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -4,6 +4,6 @@ DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72
 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-r1.ebuild 1335 BLAKE2B 36a2211e821fbb9257aae09d0a5b2d49d3ee7e27ffd6eacd21387746983b9f600ddc0137c9581ca88fb2ca3431594590f5b43539f15e8b7bee5ce4ab8b9eb9bb SHA512 7311121c0b25b27b95d19115a194e16dda45f02ed6e2c8fbc83ff6eb44d20500f583e0ae0d2ab5e384b02758c57828521b8845efee5d9f11d50a41c1ff5d0307
-EBUILD abseil-cpp-20200923.3.ebuild 1979 BLAKE2B 99049668df386c2f2f754c513921a4106c13e5a57a90aa62a8c84eeb14ca5fe664505aae9f871d3d02df8848c9051f82f63b5b85a42c2d8543831022b68f8f43 SHA512 0d9958d85dd3ba91d6bcfcda4f59676b4a3c281c80842612c8e835ab4f91f6fcc35fedcb5611080a8fc093a46d49ef47bcca7a791872452adb7d16c3cc5be3e8
+EBUILD abseil-cpp-20200923.3.ebuild 1977 BLAKE2B ef17c3577458836d9f6503691ce4b67102a32dbb661fb33532180a120538dcba59af29b1146401928eab55a59a7333c176fae55e19509249456b0cb73a49f194 SHA512 50a0a8631a37f186364b413dc7ed9b728483361325c0453dae7c9eca5ae3e1a694289feca051d48994161fa93a732651270dd81edbe41cf166052a5f8aa9f84b
 EBUILD abseil-cpp-20210324.1.ebuild 1887 BLAKE2B cb5445c3be46ab7eed9451e40a9e04a6514955b9517727f060686c5e022a96d648df8794605d38ad3e3b8d46b531de523d2b75a3facea7137848f3d4753046da SHA512 ec9dab5feabf0c6354227361ee78a8ec7befa239aecd2d6d76e815fc3dd765a90cc021541a099fc84564edf73f0f4e462abdca2186a81aa3751917cf78130005
 MISC metadata.xml 356 BLAKE2B 192cd53686f89cf886b3dccd4d3c64dd44912c3572c3ec16c786c81c62b5ad1090be7c6e43bf2900d731ca72804f57f17d2eef619b88932d14423e72363e61b2 SHA512 39f66dcee864111412707467b6757811eeb9ddb24cb23bd3ff01b9426dff922fbd69312fda9142e03df146c22cd2b5fc1b06249cd1b6c334b076b798721fdca2
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
index a215a3844394..40f5fbae8e28 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
@@ -21,7 +21,7 @@ LICENSE="
 	test? ( BSD )
 "
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+cxx17 test"
 
 DEPEND=""
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index c8e8491af54e..adce345b52f5 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,9 +1,5 @@
-DIST atkmm-2.28.1.tar.xz 688912 BLAKE2B dd18c2e0151192eb56cc81ceb6d8da2b41850e9c31e357f14822ac99418f57237e5ffe876b0c0b05768ad93ffb9d2e5edfddd518c838a1cc916b40df7b7c0933 SHA512 9f336b594930b62e9789011f4584f569d40b6153e5f3f04ac0f5b48704c50fb7b99d3f5d8639eec8dfd42b9c268df3cf21c2ae2372fdb781729fa29c57365916
 DIST atkmm-2.28.2.tar.xz 689944 BLAKE2B 24a71e98af483ed5a5a0c517fecca775ad0206b972fc3906b9b002910ca07dd1d1ae1a9aa6f044231470b484d36d580d8d263ac7b8ddee668d3a0e1845bd47b0 SHA512 df20b89b603a6ae419db24b21acbd6a9d0e91c07e374b4b774f6a67581ce1581affb0d079a264f0d7f2e6d8b63210639dd7aa15e7e94fb5904d161e9a2aac286
-DIST atkmm-2.36.0.tar.xz 735400 BLAKE2B d8b821fdddd27d10f1995aa6bb8ab8a2ccc3357c7553656e30ee45e4ad677457b7a64a86ee9511124547c1680b5f95c3fd306fb315f3911787a6f0817ca5e130 SHA512 8527dfa50191919a7dcf6db6699767352cb0dac800d834ee39ed21694eee3136a41a7532d600b8b3c0fcea52da6129b623e8e61ada728d806aa61fdc8dc8dedf
 DIST atkmm-2.36.1.tar.xz 736828 BLAKE2B 5dc5d8fb9a29fe16bad0aea7737110df08f10504b5994239015a85ebfd98b6e38414259ecb6819e1dd9459fdf49e0f6b85c5ed9936802bd56d5c154c91443add SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a
-EBUILD atkmm-2.28.1.ebuild 1013 BLAKE2B a3c70945d9d5ff0627f91acd206195a74036c5c8e537726d8cb2f0796a600f526ceadd344e47adb600c77be9a8a633ed5874226f3c7c80ff7cce82e93a9f2729 SHA512 8aede60c462a167a5395795b1d9582f23d527065414355ffad99c30c9682ce34aca64c2f611d485714d1782fab1c0a85e19822261eb92844feaa5fdb828afb10
-EBUILD atkmm-2.28.2.ebuild 1019 BLAKE2B 12a47bbb97e154c9569784479368efd2801b2dfd3fc4f94b5e75e729a7db23e4bd6d08c964cd1c48ad91161e33d2d95172b9ecd81ea9da2768a888da84d19a4f SHA512 63477dc77c51929c79c94d014b5b7e49b5251359adc6edd8b37e7af4d9095dca00eca7647e40b04898efca9aa0ce630e9a63f129217d9033c881708f9eace02b
-EBUILD atkmm-2.36.0.ebuild 1017 BLAKE2B d3686cf5ea906f85b8dbc952769a89b81b27ce6a5009c092db272e614c58303c3bb153d29a484f6fdf37bdfbdfe521bcb5e616543146362c91dbdd8037bb3f93 SHA512 efc463b57e62eb5829d9c1ca48bc36d76fb11e00bc234e8760172ebe89bf90f0244b9c0370c062dc2a7cfc53cd7cd0f7c79afbc209769ea897c56b16db66d1c7
+EBUILD atkmm-2.28.2.ebuild 1013 BLAKE2B a3c70945d9d5ff0627f91acd206195a74036c5c8e537726d8cb2f0796a600f526ceadd344e47adb600c77be9a8a633ed5874226f3c7c80ff7cce82e93a9f2729 SHA512 8aede60c462a167a5395795b1d9582f23d527065414355ffad99c30c9682ce34aca64c2f611d485714d1782fab1c0a85e19822261eb92844feaa5fdb828afb10
 EBUILD atkmm-2.36.1.ebuild 1017 BLAKE2B d3686cf5ea906f85b8dbc952769a89b81b27ce6a5009c092db272e614c58303c3bb153d29a484f6fdf37bdfbdfe521bcb5e616543146362c91dbdd8037bb3f93 SHA512 efc463b57e62eb5829d9c1ca48bc36d76fb11e00bc234e8760172ebe89bf90f0244b9c0370c062dc2a7cfc53cd7cd0f7c79afbc209769ea897c56b16db66d1c7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.28.1.ebuild b/dev-cpp/atkmm/atkmm-2.28.1.ebuild
deleted file mode 100644
index 01366db0ae40..000000000000
--- a/dev-cpp/atkmm/atkmm-2.28.1.ebuild
+++ /dev/null
@@ -1,50 +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 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"
-IUSE="doc"
-
-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[doc?,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/atkmm/atkmm-2.28.2.ebuild b/dev-cpp/atkmm/atkmm-2.28.2.ebuild
index 5329892de00d..01366db0ae40 100644
--- a/dev-cpp/atkmm/atkmm-2.28.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.2.ebuild
@@ -11,7 +11,7 @@ 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="
diff --git a/dev-cpp/atkmm/atkmm-2.36.0.ebuild b/dev-cpp/atkmm/atkmm-2.36.0.ebuild
deleted file mode 100644
index 0ab832b961c8..000000000000
--- a/dev-cpp/atkmm/atkmm-2.36.0.ebuild
+++ /dev/null
@@ -1,50 +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 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="2.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="
-	>=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 916e5fbfeda7..e22ee77fd49b 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,9 +1,5 @@
-DIST cairomm-1.14.2.tar.xz 603804 BLAKE2B 37417fc13f3213c1cd51ac2b0f17e0624c0592f6115a66c96295b6fa2f9974bee7c138f5087b130211a6e4f9fba045404d85e9aa08a36d9000415132400d4da8 SHA512 aef374fca25ad22770407e36512046b266d71ebeccd47fb629cfbf2f67783aa314bb335b972088a88d98417a4774d6f144cd2769c452f8aa23770eae08dca592
 DIST cairomm-1.14.3.tar.xz 604572 BLAKE2B a626ee20a229c4597622e7ead3320e5ff971632548488e970b877712d5579731093a14791a13416bec783e180a4f8432be1a743c7a5d77af2fdf30fa36ee3caa SHA512 8dc8a0de733904742c54d4935b596d4103f2e498c6735894bc6a5a81eb4962c6ea944bad94102b18b25850f78e948d38f117c566b197bc76da23a4e88b62ee4e
-DIST cairomm-1.16.0.tar.xz 579604 BLAKE2B 3aaac8039d13f13ef8fb844e38cb0cd9b0565559544c7a4cab544a46f8f8bdb6d4ee1b8318ec5d9991c33264cd3335a8796e6a49553735516a184565875e1d08 SHA512 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3
 DIST cairomm-1.16.1.tar.xz 580020 BLAKE2B 219e83fb328a73cc7c5801aa155156e65245fbccfb3899d98573266f78f9f489ef968fac3c8c577fa98fbdc61af6d873293783c41dd00046e5db327443bdeda2 SHA512 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757
-EBUILD cairomm-1.14.2.ebuild 1189 BLAKE2B eedd45b0933749fa2adc2c51d326434ca2deee616821379dcc27753970855470554c213155bfc5f40b2387c2c85c3748bcb593c696842385007d8ccd9b010cb2 SHA512 53832cc83796fb52035bbf68d9aaa7a89fcf9269e8c582f5b23491dd01b2c4d11f990b21434afaaaa0eb4bfec9df8b28907494b6a4735dda9be0ae7bd4e96faa
-EBUILD cairomm-1.14.3.ebuild 1195 BLAKE2B 5e7e10285af8efc68fe54a1190cb96575c0df4b950f83d9d3aef05eb009cd8d36a98997becb1f1b8a9013787d6edb46419e05cd5dd59fea2cf5f40534a1f36f1 SHA512 8e2f582e142fd401649ebc43e6499880c76df9210cbbbc953fec7466a7802aaf05292359a044b3b68b4e2f49489b7b6d6eea89bdac568e43550557e24c164fd9
-EBUILD cairomm-1.16.0.ebuild 1191 BLAKE2B d25ecc89918250e42b368274c0fa3ae80373e11dbb57ec7eae80711ac3e7db005a12b8ef8105cfc707a045267d51bc26dee8a28d18baa03a2023797c9a78e56f SHA512 440ef8a3e993a42fa60783bc733f3410e870e446112f6f08da0a9ae4072992d297428a8986472484fe9555f867064cf68d29df525e98a72b316784e76393bfdf
+EBUILD cairomm-1.14.3.ebuild 1189 BLAKE2B eedd45b0933749fa2adc2c51d326434ca2deee616821379dcc27753970855470554c213155bfc5f40b2387c2c85c3748bcb593c696842385007d8ccd9b010cb2 SHA512 53832cc83796fb52035bbf68d9aaa7a89fcf9269e8c582f5b23491dd01b2c4d11f990b21434afaaaa0eb4bfec9df8b28907494b6a4735dda9be0ae7bd4e96faa
 EBUILD cairomm-1.16.1.ebuild 1191 BLAKE2B d25ecc89918250e42b368274c0fa3ae80373e11dbb57ec7eae80711ac3e7db005a12b8ef8105cfc707a045267d51bc26dee8a28d18baa03a2023797c9a78e56f SHA512 440ef8a3e993a42fa60783bc733f3410e870e446112f6f08da0a9ae4072992d297428a8986472484fe9555f867064cf68d29df525e98a72b316784e76393bfdf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/cairomm/cairomm-1.14.2.ebuild b/dev-cpp/cairomm/cairomm-1.14.2.ebuild
deleted file mode 100644
index e06b42ee964d..000000000000
--- a/dev-cpp/cairomm/cairomm-1.14.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="https://cairographics.org/cairomm/"
-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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.6.0:2[doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.0[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[${MULTILIB_USEDEP}]
-		media-libs/fontconfig[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-		-Dbuild-examples=false
-		-Dbuild-tests=$(usex test true false)
-		-Dboost-shared=true
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/cairomm/cairomm-1.14.3.ebuild b/dev-cpp/cairomm/cairomm-1.14.3.ebuild
index 79302671e416..e06b42ee964d 100644
--- a/dev-cpp/cairomm/cairomm-1.14.3.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.3.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/cairomm/cairomm-1.16.0.ebuild b/dev-cpp/cairomm/cairomm-1.16.0.ebuild
deleted file mode 100644
index 67a60abc4574..000000000000
--- a/dev-cpp/cairomm/cairomm-1.16.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="https://cairographics.org/cairomm/"
-SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.16"
-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 )"
-
-RDEPEND="
-	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[${MULTILIB_USEDEP}]
-		media-libs/fontconfig[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-		-Dbuild-examples=false
-		-Dbuild-tests=$(usex test true false)
-		-Dboost-shared=true
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 7a5fe6cf77c2..80c7f612d486 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -3,5 +3,5 @@ AUX eigen-3.3.9-max-macro.patch 476 BLAKE2B aa2e810a7be5a934a8bf5844b7e24633ab8f
 DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
 DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
 EBUILD eigen-3.3.7-r1.ebuild 2251 BLAKE2B 8ac30181d5c64ecb1a5ba47d386b00962e772319dfaeb393deb1c0d742a8c4721b4ea57de43ee79c754634872b455e0ae6a086617b46b4ca9bf19b9ff038a20e SHA512 02b5f22b042d817b9d4729bc13bea27b54683508db23d22ae0215003f49a7b9f70069e92911f9e4e40d5f71ac847035cc89843f426b7dcfca214e1e4cd3034eb
-EBUILD eigen-3.3.9.ebuild 2497 BLAKE2B 983f9090b61665b9bc93dd0f9ffcfe9328383900232364bfbb664ed07941da961a47d4e0dd37135f37f2507f509b1c7f3aee68bd0377bb876869ee1a9374e1a6 SHA512 2cbd455d306813dd0e35ccab44ea4ecbb035a1f666e0a489be5a23cc852d4f1d7bc2f08ab4d11e0c2231d307991e7e8cb4e64f065de1948a806a013469cf6648
+EBUILD eigen-3.3.9.ebuild 2496 BLAKE2B abd67d587c30453b048bfc2ad6115c87543940269fa454381cd358293ea2073d4867eb51a8f5dd932517453cbe8fa5d3399942cfe8cd9763827be19dea61297e SHA512 40cff68d42189cd386ed5d68fc061b6987562d09845bae6c365ec7c2d4371bba759834f7a2484d3d9ccd18ce726c96124b559801c989895459971fd5f3c24be1
 MISC metadata.xml 886 BLAKE2B 650db5b70b6440feb58275f3c949a9b191121798f47baba77e10e53f176470084136fc880914a7cce29d7424472f1f0116a81e33ab7eb25541e1fa549a9aa362 SHA512 32adfdc1a0501b1926b027d729c2c204d8b84c00623ff250bd8b66877371f812a966aed20efc71b5bf47c3fcfe5249f68a4ef0fb3ab2422eec9c8e7f6af341ca
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild
index 622a094a858d..1429076891fa 100644
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index d05b3bfe88ca..2db6b7adb231 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,13 +1,5 @@
-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.66.0.tar.xz 7507608 BLAKE2B e6c8f9bac453e81a0a80850fe13b32751fd9644db40acd9d6a45e96f52cdccdbed633ad1ffde566103eb22af9cb073da11368d5c11db237d43127c0962768a64 SHA512 e6b38847a70d61412e7013a04fae2db1163cf746c1b8cb6bc43bd6985d66c1859ceb74dc2ca070ca88e5e4cd443325ccf8200c14fad9af47e33b5b49a0bb854f
 DIST glibmm-2.66.1.tar.xz 7509820 BLAKE2B 4750940093cadbae7c32d387ac8b16c8230eb08ed1645e457edfa27542a2e8a01d70de08bb41d1872dd1f03d1506bfaefc2af582250ca64ad480ce5f98f20d56 SHA512 caf57c2c9d163fff45041c33ed70d2692040d7bea44660d68e8c16a76be2609e0f857a5e16ad5220a0ec681a560c864dc86c2988a2c40741b4f29c9fe5b7d8b9
-DIST glibmm-2.68.0.tar.xz 7652260 BLAKE2B df87b3f3d8cd74b693f843dec15d5376f2a755b0a72042983383c15cca9fdb90c2fed6320bf0f3fe846fcda5be3ee15c0fc1b683d29cebe64e8dcdd101fc9bf0 SHA512 a13121052315e949acf2528e226079f1a2cf7853080aec770dcb269e422997e5515ed767c7a549231fb3fa5f913b3fd9ef083080589283824b6a218d066b253e
 DIST glibmm-2.68.1.tar.xz 7657712 BLAKE2B a8141e53f89c981a9916d5f71dfd8c6d08e45a653b98c507acaadfefbedf2f22e8130a722f3398f5e0dff8196ffc8efa6567ebb2c8290f7373e34377e281db18 SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c
-EBUILD glibmm-2.64.2.ebuild 1466 BLAKE2B 1f88a4ed53ab42adc54ceca53f1766f0a6f4d8207129142f3f71e21ff3c561ec8bf9a935f827dd14d2bab1f2fb5be87a9b47deb8f89c555a0d5eabc96b3f2106 SHA512 4e5ea2477f1ab5ddaf6844dd765f2bdc127d9e4453b289ed51cd1eeab5ff8e9e0216226e35a11cc487c00caf9539970b62c5f6982fa64980c760a64d7d186d64
-EBUILD glibmm-2.64.5.ebuild 1536 BLAKE2B 90643f5aa0dc607869bf09b3a0355bce6bc1fdcb4daba7cfde5b330c8fdb2bef903b146af47338da39618a4104b11d9bdd1efc5eb34b2b1860c5c4d456872565 SHA512 8084c94c8757bd59d16a0e5bd5f701d5ae294aab79a8bdd5c320639cafc751a540cf6ad961c184066f9b826d2d894697f44c3f3cb740778669c73b13cbf0a854
-EBUILD glibmm-2.66.0.ebuild 1402 BLAKE2B fdfe6c6ff707947a55c50e8cd805fac966dc471988ebede5467e962d3b75b1da854f5d468175a0d10c5df2ba419e8cb8fde9a85a628d013934d4b49155fdaff3 SHA512 e8b55f88c0c68e254c0e41c70b927765bafb42cdc2b5434fa30217dadc2c45c276e4661d9f90136cc6258549244eb86cb82451640f3801b15a334602e39c6e63
-EBUILD glibmm-2.66.1.ebuild 1402 BLAKE2B fdfe6c6ff707947a55c50e8cd805fac966dc471988ebede5467e962d3b75b1da854f5d468175a0d10c5df2ba419e8cb8fde9a85a628d013934d4b49155fdaff3 SHA512 e8b55f88c0c68e254c0e41c70b927765bafb42cdc2b5434fa30217dadc2c45c276e4661d9f90136cc6258549244eb86cb82451640f3801b15a334602e39c6e63
-EBUILD glibmm-2.68.0.ebuild 1359 BLAKE2B bc0d66ed662df3a61153428fb01a0767c55a3a323e5338e45b68448d10ddd09702521acbe9824bb6b0778d95d67c1f7d5065155e2f954c89660f29e31089bc40 SHA512 8175e60c96ee44577b0d7aa7d3e59edbac17bf7e990d2f38b3712bbdab12ddac8dc518df4d92aeeb06c7d22641f299100ed22ef0f6602b3e5139431fef93a98e
+EBUILD glibmm-2.66.1.ebuild 1395 BLAKE2B 16be343fbaeda528b087a7013203ed134caff3cd4fb79c4eef7347029ec5ff299c9a14d62dd65925e160dfb8be1d174354ce2a3a283b20fa48e1da8cd680399d SHA512 d5e37a7e0528197c5a67b451c43936bf57c6918dadf65f59c660ca62bc6d92623d02bdfbe65deda74a43c6263cb1e8fd97ddb0d929134aa60134aa1fda29a456
 EBUILD glibmm-2.68.1.ebuild 1359 BLAKE2B bc0d66ed662df3a61153428fb01a0767c55a3a323e5338e45b68448d10ddd09702521acbe9824bb6b0778d95d67c1f7d5065155e2f954c89660f29e31089bc40 SHA512 8175e60c96ee44577b0d7aa7d3e59edbac17bf7e990d2f38b3712bbdab12ddac8dc518df4d92aeeb06c7d22641f299100ed22ef0f6602b3e5139431fef93a98e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.64.2.ebuild b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
deleted file mode 100644
index e23b61cde0c0..000000000000
--- a/dev-cpp/glibmm/glibmm-2.64.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson multilib-minimal
-
-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="
-	virtual/pkgconfig
-	>=dev-cpp/mm-common-1.0.0
-	sys-devel/m4
-	dev-lang/perl
-	dev-perl/XML-Parser
-	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.64.5.ebuild b/dev-cpp/glibmm/glibmm-2.64.5.ebuild
deleted file mode 100644
index 9cf987f5d897..000000000000
--- a/dev-cpp/glibmm/glibmm-2.64.5.ebuild
+++ /dev/null
@@ -1,69 +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 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
-	dev-perl/XML-Parser
-	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.66.0.ebuild b/dev-cpp/glibmm/glibmm-2.66.0.ebuild
deleted file mode 100644
index 27244f110de8..000000000000
--- a/dev-cpp/glibmm/glibmm-2.66.0.ebuild
+++ /dev/null
@@ -1,66 +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 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
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-perl/XML-Parser
-		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=(
-		-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.66.1.ebuild b/dev-cpp/glibmm/glibmm-2.66.1.ebuild
index 27244f110de8..b72aa8858b3c 100644
--- a/dev-cpp/glibmm/glibmm-2.66.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.1.ebuild
@@ -10,7 +10,7 @@ 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"
+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 )"
 
diff --git a/dev-cpp/glibmm/glibmm-2.68.0.ebuild b/dev-cpp/glibmm/glibmm-2.68.0.ebuild
deleted file mode 100644
index 2cf6d1781f54..000000000000
--- a/dev-cpp/glibmm/glibmm-2.68.0.ebuild
+++ /dev/null
@@ -1,64 +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 gnome.org meson multilib-minimal python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.68"
-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/glib-2.63.0:2[${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-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=(
-		-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/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index c556e3bb208e..dc4cca89167c 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,9 +1,5 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
-DIST gtkmm-3.24.3.tar.xz 13539040 BLAKE2B 24664773ec7b0666575346aa0532e8961fc19d965ef34244ed97707f7e3eb4d1d0f016abf733531269bf3e3201defe31559990e32f4f43faa8d3bb5d1f02fdb7 SHA512 e373807ec245057708655fa5dbf18d5391656a55b008fd6aa0fdc5a56e80d288813c3bbb0093f39aa7679df866a176f1e6b0e842d4d1b18b775a5928eed9fef5
-DIST gtkmm-3.24.4.tar.xz 13534708 BLAKE2B 7fb6e2851d1f73d42612b964d706d55060cbd18806bbefb800e2086706b973cae5296f31df48407d8f7ce80d6e503a5a79bcd54a9e1b86c8ecd6b113665f3255 SHA512 e3a10aed9cf2df7369b5dac3f1de000b006e08aef6f2d953d2faf2b023bd744ed4c9c2ad5221adc1b0c919bcdc966d0c1c9dc698694d8630ceba56e39f91ac26
 DIST gtkmm-3.24.5.tar.xz 13540488 BLAKE2B b55c55e4bb56bc835be9c09dae59ee103fb0ae80ee99bb54c36c366686f4f1a0309435e91c2e323d7ebfabf7922b76ac85de6a1132c53ab708ba17be661d834b SHA512 8cc5aed26cc631123a5b38bc19643cf9e900beb38681b29ead9049f6b8f930f0b8ace317b8290279ab89cad85075dcb66863174082f77a2b67e4d8bd3c29de49
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
-EBUILD gtkmm-3.24.3.ebuild 1495 BLAKE2B 8166cb99c68c772da990809a1302f93a2a10c5f4f09c3deb72d9579557c2d79c19367e92bd55cdb6390e8f561eb961f6187a7af71dff5fe4e1a835b13c094ca4 SHA512 453cb63072525721025df38aa422d301dc94ec35138a1fde2e3f6a31291e6a67f395ee74b57ca2488bcef95cbcc0dc1afd6e68e9bee07f09438ed34caa5e9e16
-EBUILD gtkmm-3.24.4.ebuild 1501 BLAKE2B 157b2d4944c530f458da5638a7aeaa4392d4a9ded67ed56abee52835654efab4aadc640d80417faa34fd90f1c95039d2dcf0d12e5d2985676c28349c73c6ad96 SHA512 d199aca0fac51304a9cc035053a09b33c8688d1e3ac71c81221cf6ea90ffeb413d9fa7f184ff3def7dce8844300e4011b99cf7f714ad18e1aac9696c4335112a
-EBUILD gtkmm-3.24.5.ebuild 1501 BLAKE2B 157b2d4944c530f458da5638a7aeaa4392d4a9ded67ed56abee52835654efab4aadc640d80417faa34fd90f1c95039d2dcf0d12e5d2985676c28349c73c6ad96 SHA512 d199aca0fac51304a9cc035053a09b33c8688d1e3ac71c81221cf6ea90ffeb413d9fa7f184ff3def7dce8844300e4011b99cf7f714ad18e1aac9696c4335112a
+EBUILD gtkmm-3.24.5.ebuild 1495 BLAKE2B 8166cb99c68c772da990809a1302f93a2a10c5f4f09c3deb72d9579557c2d79c19367e92bd55cdb6390e8f561eb961f6187a7af71dff5fe4e1a835b13c094ca4 SHA512 453cb63072525721025df38aa422d301dc94ec35138a1fde2e3f6a31291e6a67f395ee74b57ca2488bcef95cbcc0dc1afd6e68e9bee07f09438ed34caa5e9e16
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
deleted file mode 100644
index d1922c85351e..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
+++ /dev/null
@@ -1,62 +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 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/gtkmm/gtkmm-3.24.4.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.4.ebuild
deleted file mode 100644
index d289e75623bd..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.24.4.ebuild
+++ /dev/null
@@ -1,62 +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 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/gtkmm/gtkmm-3.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
index d289e75623bd..d1922c85351e 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
@@ -11,7 +11,7 @@ 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 )"
diff --git a/dev-cpp/gtksourceviewmm/Manifest b/dev-cpp/gtksourceviewmm/Manifest
index 8bde27e596cd..c7580047f094 100644
--- a/dev-cpp/gtksourceviewmm/Manifest
+++ b/dev-cpp/gtksourceviewmm/Manifest
@@ -1,5 +1,3 @@
-DIST gtksourceviewmm-2.10.3.tar.xz 742184 BLAKE2B bfd61f3ca29afa4b01fef651849189983fbc64c95c0258c19812b6fddfb2f9e793a1a684e44e88384dcb24632a2c247f4b6ec400f2ef3d19f878064e017d986b SHA512 e6ddc4f585251f68e48cf0ea2c33bce02a90031efcd885105a82837715d659a317ee0845b476fc54c1c4c71b518df41ce494505af1524db6acb733e51f44e6ca
 DIST gtksourceviewmm-3.18.0.tar.xz 1079780 BLAKE2B 973f06a3baed8d5ab541b2f179f773391fe562cab2fceffd0366748acafc4bfc1d4717d969bdd5a5716f892ff497b89338f8b3cd085aebb9c033a40b29d3c0b4 SHA512 143de4a650f2a6090efeba359e78d1f4982519a9e7a2be838f9888732c57dcc42db8b6ab45bd23ccd261d8f17bc743846a3bb572566f233cee9b4238c017c64c
-EBUILD gtksourceviewmm-2.10.3-r2.ebuild 995 BLAKE2B fc57b3fdd57c34444d732c0cf1359ab770d8b597e9a9f9f735743118e986555209bdc045f9d05bb949d501a75a34e3f71467518476439d82ca91054d9e0bf1f6 SHA512 04e3f64f7f049ac1d400ddd11891062c0cc92ae05d052df39c93242cceada4842bf090e90d1c21fd35af8c2089a8ec1be8bd8ca62c1217bc8acb1ac6984c7b39
 EBUILD gtksourceviewmm-3.18.0-r1.ebuild 660 BLAKE2B 176bc3af22e4143a622792e79c5749f9ece54493fcf7ca19634935ea8f9d5f8bab8e51de64895c6896ee61e02a00d02e74105ffb5079e885676c91e34220ddc5 SHA512 6cb7550b1ce300268b9b61a03b252fb4a72aff4cb632627eb38b845cb0e36163ea29065a5f5126db617dfbb9e00ce2ee6128e00e9d60ae6650e00efac9b7cfaa
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r2.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r2.ebuild
deleted file mode 100644
index 9df83973b552..000000000000
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r2.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"
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="C++ bindings for gtksourceview"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-SLOT="2.0"
-LICENSE="LGPL-2.1"
-
-RDEPEND="
-	>=dev-cpp/gtkmm-2.12:2.4
-	dev-cpp/atkmm:0
-	>=x11-libs/gtksourceview-2.10.0:2.0
-	!>=dev-cpp/libgtksourceviewmm-1
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove docs from SUBDIRS so that docs are not installed, as
-	# we handle it in src_install.
-	sed -i -e 's|^\(SUBDIRS =.*\)$(doc_subdirs)\(.*\)|\1\2|' Makefile.in || \
-		die "sed Makefile.in failed"
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	gnome2_src_configure \
-		$(use_enable doc documentation) \
-		--disable-static
-}
-
-src_install() {
-	gnome2_src_install
-	use doc && dohtml -r docs/reference/html/*
-}
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index f8f7bcbbd272..f2b59f12679a 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,5 +1,3 @@
-DIST mm-common-1.0.2.tar.xz 271720 BLAKE2B 955a541290ffc9489a7061a1bdcc4b2cca7ac5e0a834a008b4e15173e3b6df38a5fb719f26fe6f83c073c025c7113bba3586f28a6341d37c7c98cfc93ec50f0a SHA512 106f3aae8bb836386148098037c52fef19c3779f5e8cfbafcbe52eca17340a6e2fb7e5c57154cc0a90b75c0bb23900a4274591a71d85f81391be780c53238de0
 DIST mm-common-1.0.3.tar.xz 272932 BLAKE2B 90459cfa75dbcab8bb9b0512f3f3f3703850000e4ea0124afb020c476fce9948ec0128d67510b13482d52f165ba0b7a8aa72e6b1afd4a88554fa52bc4f5598d2 SHA512 fdd79e9a2ca3d7ed311a6994bd04e7cbf2b1562c39968d309765ce3b5268128f98b3f1c08a434b460276e6d911d302a12ccc7aebd6cd67e4df13241a97034a70
-EBUILD mm-common-1.0.2.ebuild 567 BLAKE2B d34816e233e5e97a8973c4e0ebeb1729680c83f6140986978f053db23f4fbe18ab00a5e1f125b3afe0591e59950a707e3c66f136a42856d053539d9e64a213f9 SHA512 f6a326056c275761c43a7f49b65ce2c5bdf897aae1f2e0a4d99d1d7230c675e1c2da7dbf504237d39187edf259ae89cb9f2e188a9a30c598c85136d0746c6c69
-EBUILD mm-common-1.0.3.ebuild 574 BLAKE2B 9701ea55822bf253426d3bb0282fc8f6366f131fdf4cf037e023bc8fb63207f3747aeca690bd5119718122bfd2433279908229841ad0719d0131d1baa5170313 SHA512 15d803bbbb93942609af2f80ce9ab085f4af693a3daee63556976f44f73faccf6e1d9affb91bbaa68d7106a1b2ef38c3fd0f4baff443b2e2155d924272b3f870
+EBUILD mm-common-1.0.3.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.2.ebuild b/dev-cpp/mm-common/mm-common-1.0.2.ebuild
deleted file mode 100644
index c313e2e311c1..000000000000
--- a/dev-cpp/mm-common/mm-common-1.0.2.ebuild
+++ /dev/null
@@ -1,23 +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 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"
-
-BDEPEND="${PYTHON_DEPS}"
-
-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.3.ebuild b/dev-cpp/mm-common/mm-common-1.0.3.ebuild
index 035d8e988cdb..c313e2e311c1 100644
--- a/dev-cpp/mm-common/mm-common-1.0.3.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.3.ebuild
@@ -11,7 +11,7 @@ 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}"
 
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 5248e24e94b8..bc7d1932c5e6 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,7 +1,5 @@
 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
-DIST pangomm-2.48.0.tar.xz 674516 BLAKE2B 58c3e93c6127a14b5bc866b43bff4ab25a1ac1a06813c73e4f2a4d02adad3f51b7ec922f7c6e3d4af518a1f8f31c19de4df0c11b91a10ee61c2e16df8aa025ea SHA512 0c1be5726740669c366214caf8b8b0bca1c7b223aafb2e6ce64f7a5a90d07c62ee509821ac787f3997ae78aa3a3ffd5cff7d33c73bc7ebd7fe642c56689d98a3
 DIST pangomm-2.48.1.tar.xz 675452 BLAKE2B bb012fc5cb66d5cb98f522e3706fdd35bcc5692fcd942f86ee1e20116590ceca26874c5a58bd3f8fac4f154700dfb37ea060747a6c3069e67adf83ba551e7abc SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4
 EBUILD pangomm-2.42.2.ebuild 1051 BLAKE2B 5bc6fb687bfa063c8ef24da32b635882a56203611336cbf36a46c9ecbd9365436e0ee7fb565e75a2e2b824ebd2c11b5d3a71146b31cde06c921a98159a8721f6 SHA512 d35deddcb90fde39fc517d69e2e8d5072d9fc611bff7681fe51c846abbdcea074f5ebf03f9398c9a8465dde239c0b58f85b539a7b342031b7b7f7b6528b4b531
-EBUILD pangomm-2.48.0.ebuild 1069 BLAKE2B 79cb13af7cc48eade2f248088278c34ee82d2b98e611976711103ecdadd4fdb7a4c892213df8b98091b64b7be21c9be73c162811dc188008bf1a0c72fa0d9752 SHA512 309d8cff184fc738a1febe012f10e37d9f3f785a7447730630f0d49a827696f2980e48640870ba483d8199800211c76d39552a454388267aa35c94900072797d
-EBUILD pangomm-2.48.1.ebuild 1069 BLAKE2B 79cb13af7cc48eade2f248088278c34ee82d2b98e611976711103ecdadd4fdb7a4c892213df8b98091b64b7be21c9be73c162811dc188008bf1a0c72fa0d9752 SHA512 309d8cff184fc738a1febe012f10e37d9f3f785a7447730630f0d49a827696f2980e48640870ba483d8199800211c76d39552a454388267aa35c94900072797d
+EBUILD pangomm-2.48.1.ebuild 1056 BLAKE2B 53a0bffa3d9717e84082a841ee2487b3b31f6d3cd3c7df46683366d8524fe82479a0bca797d5a38dafa000783e3d1c740b53089b52bf6e37fbba40a587390c20 SHA512 5efbd571a48911676ab51c342e6e3eb19071452512245a46e1b1ab4253caafd86a0436b6ca9abc34e5766674bd9812766629c287620e444904e4e6b7506ccec3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.48.0.ebuild b/dev-cpp/pangomm/pangomm-2.48.0.ebuild
deleted file mode 100644
index 924043617bfa..000000000000
--- a/dev-cpp/pangomm/pangomm-2.48.0.ebuild
+++ /dev/null
@@ -1,51 +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 gnome.org meson multilib-minimal python-any-r1
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="
-	>=dev-cpp/cairomm-1.16.0:1.16[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-3:3[doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.48.0[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-cpp/pangomm/pangomm-2.48.1.ebuild b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
index 924043617bfa..985db3293d5b 100644
--- a/dev-cpp/pangomm/pangomm-2.48.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
new file mode 100644
index 000000000000..3af25b6a84f3
--- /dev/null
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -0,0 +1,3 @@
+DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
+EBUILD robin-hood-hashing-3.11.2.ebuild 481 BLAKE2B 4b9ec0837cfd3bb3584b61577489fffb4bc66052def4b6f79759a5301d5aa310da2b4f288179257a6bd394622e41e5c8076f5bc9286bd30d99f62dc448baee9a SHA512 b6db825452c417502eb3d093a910beb2b9a3eff6e079a6ad6b04aefbe66244134db549dd45284a7a4217573ccfe44ba27389e270c7a53af7804fe6c893c5f388
+MISC metadata.xml 431 BLAKE2B 301a6f1026a18fd6d6322f95833f515247111fb9bb88d915724c263e167ea93bbc7f72a734c1aa4fffb5e2068a43f42a104446e7dddaf56334c73eb29541481a SHA512 80aac4cd60e6768675f5cf8619b99d7e4d95b3c691dd4cd7400040610abfdc5f9182e166f5b1c301a14380a3216fca87613dd7e4098fe2e1e2330e49f0660654
diff --git a/dev-cpp/robin-hood-hashing/metadata.xml b/dev-cpp/robin-hood-hashing/metadata.xml
new file mode 100644
index 000000000000..c64c3ac674d9
--- /dev/null
+++ b/dev-cpp/robin-hood-hashing/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">martinus/robin-hood-hashing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
new file mode 100644
index 000000000000..13577d90c006
--- /dev/null
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
+HOMEPAGE="https://github.com/martinus/robin-hood-hashing"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_install() {
+	insinto /usr/include
+	doins src/include/robin_hood.h
+}