gentoo resync : 12.03.2021

28 files changed, 73 insertions, 273 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 1fbe1037c2b7..e285d3501ed3 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index d67b2364239a..6c6e6932d2ed 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 644 BLAKE2B 6ac853f719efce91acb0bcfbce44c8890959bff7f2fcfea148ca2cc4fd828eed6ad688fc9d66190fcd33cb759f3d819d61896ca4fa89d7783291bcc65be4b8fd SHA512 f0bc620487de2fe60428121b2c412a2f7560b9c80b0abf672398ab9a33d74450ce027c5281138494185471b4402a3f7515aaa59b8f319a9d8342b8b1483199fe
+EBUILD antlr-cpp-4.7.2.ebuild 634 BLAKE2B 5f0116026e47e7448360471f5fb9b96e2c24d2ecedd7c5a446b7710cb773dcdbf2f545b4613a4c9562a3d6e676ca5af3873822ef810ac00a602b55727163f3b2 SHA512 31211740e9d28309335aeebe88fef2c46059f490bee9efab633c026e2cef0e7f4c3bd55b1af2e97f1c3eee31aba7dc71f5604bd3aef36f0e4253474f5912d559
 MISC metadata.xml 313 BLAKE2B 3ddef83abe4413f33dae4c121c76dfdfab2336d433ef94716eced1df9f669f83883b4174d5a472b06ae8fb16c7179094469fe65258646d7dd9094b5c1673a2a3 SHA512 39988a3826d440aa378b455d18ce23230ba1870bf7b7c64123cfdd09c54b112e8586c87d421a2227370c6b4eae385af46ce3a9e4aab3c676fdfdac360fed8265
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 37ace99caa9e..9f123f017901 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-4.7.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 cmake-utils
+inherit cmake
 
 DESCRIPTION="The ANTLR 4 C++ Runtime"
 HOMEPAGE="https://www.antlr.org/"
@@ -12,7 +12,7 @@ LICENSE="BSD"
 SLOT="4"
 KEYWORDS="amd64 ~arm ~ppc x86"
 
-DEPEND="app-arch/zip"
+DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
@@ -23,5 +23,5 @@ src_prepare() {
 	sed -i -e "s#share/doc/libantlr4#share/doc/${P}#g" \
 		"${S}"/CMakeLists.txt || die "failed sed"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index ff1fc8b82264..90f01420c2bf 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -2,6 +2,6 @@ DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa9
 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 955 BLAKE2B 96c13e963729a2fd7ff4a88e5fbeebece70c5160cadef973ebc9f1b64a874c12d47015d26c8deb3baa1000ae13fa7826674cac6e102ce143ba5900587d5555df SHA512 045fe639a5a8f7ba842ee68c5f5c279b0a00be430ffec5e0408d439670712f0ad7d57ca7260b70f3f49ef361069efb14e395724a1df824c40e68fe684e614dbb
+EBUILD atkmm-2.28.1.ebuild 954 BLAKE2B 749606009415ecb6252ff903499884db3740ba247869d4099a3212d90d96748fda08877569cb9237e86ac64318c0ad73e58bfc16b1f6e8cc0199d88e9150f3d9 SHA512 806b18581b8a0bf998b37452f20f82928bb0670bce51a0f2c2e366c53a4d842b936074bdd5f020b38caf6afb5726cbd8ddf001017b4b3bf0ab130220131db11e
 EBUILD atkmm-2.36.0.ebuild 953 BLAKE2B e2b563f9d4caa5e2dd7ce31d9036208d22046c02b9d0edd09472436dfa7fc4095573f6f316745eea40d54dce72d9a4eb4bd20a79fe953b71d3d3cb47cd5198f5 SHA512 2afca7f5c6ab71c712ed300c0254eaf4d698f95a1f893f2b09cc14f5521f06664c64903be46a2ceb145519121275bf42a0ce77423e0655c6cc6f324ce30212a0
 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
index e6e27efadfb6..98f561213f20 100644
--- a/dev-cpp/atkmm/atkmm-2.28.1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.1.ebuild
@@ -9,7 +9,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/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 74a374d36f9a..aa002ec86cf3 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,6 +1,6 @@
 AUX benchmark-1.5.2-Add-missing-limits-inclusion.patch 902 BLAKE2B f85c2818fde965325b8f37fad0d40ff0da332610a5bd9caa97857875eefd8c4a68d59450f299fc88a0d569c39e970bcd8b1e9b66d125b213ed6d53dc5cc0d246 SHA512 06ffec26f1129215b96019f96a15b6f87029735f8659a2a2bcc438f488be425fab07f561785b236ac68032a2d4f8483321357720bba983376ef1aaec926c4899
 DIST benchmark-1.5.1.tar.gz 154896 BLAKE2B cb8d74b3e6662e35ea12809d8b62d1e3a6849668840c84697e7f4b2d29eaf68688bb1cda6f43c170e70366de88a93af79bb709d55dfc8d79140c11a31855a46b SHA512 1e8782ab6846b8b29c5eea41ed1ba19dd92a46a135cf74acdc588e2cd5ef05581c644d20fc0d6403456d65417538e1db80109ae87989601298b2fc56ae3c3161
 DIST benchmark-1.5.2.tar.gz 160235 BLAKE2B af14235d174e39b8bbb0a44960834b7d13b1aed6cd4494efa9eb58d32c051efdf244258a33b83b82ad82aa69917356c35ccb470caea838cb6fd7eda37f0f80f6 SHA512 a071613f3af669296aa613e0e64726bdcf27cc3db331d8003f49164581cd6935a86641ec435118ea590a9d722a926d3fef740e938e1a5f6eba8e2a5a615da1b0
-EBUILD benchmark-1.5.1.ebuild 580 BLAKE2B b9cfaafdadc15460de9e82ac2eea626b60b0e9f1137f4d43cbdaf1a48a6e05fe0722e5697293c4b780d81ee25b07894364596a2b293f210108740ec98ca667f8 SHA512 c176e0a30ce1dc759a1c552c20c8d2828f5446d922137ad2da790cfbfbdeaca55c7a8ebd2e5c4fec788ee729345a583149b20ab8186cc117066a3bff63db5668
-EBUILD benchmark-1.5.2.ebuild 708 BLAKE2B c7419a40ad32a0c36178a57848d87893363b307204a361aeb0c290a9e0b6e0739042b0acfeb35b1c2594af681095b25804073e1a1fe3d328143c6c1ab3b9a421 SHA512 0798f1ae60df590fc6d702d88522b3cd3afe5264420001a7ee5f9207e51836e9da43b585fd65598d9879274c4a13b268a06dd21c4f6a7d80243bef034923af62
+EBUILD benchmark-1.5.1.ebuild 586 BLAKE2B 32e3927f94e984581017799ccff367d46b05538f329ba172149dd156e75a6e9384a213c1ec6f96c8fcf89bae0e29c2db0b4ac8c830e7545472deb17fad83344f SHA512 13ded77c738a20317f0e3391885a056d0c829025440e6fbbace2ab7a2ef52f3d1c35f4ca18d000ab2f8356c5b598e16873806e7006b87e505a2b2fe80a3abe59
+EBUILD benchmark-1.5.2.ebuild 714 BLAKE2B 71202b2bb3fadebbe9618eb4b3549507265e642ccd183e7a230509b97f334b51d3988da7ebf428b6c162f325e267f5417914856a5a3743f531c30f5d548a12ee SHA512 7f006e1cdca9027a40231cb5c2e5e23a16589ba6b84b7f93367914d5b297900cdda11a587999ea397c84ad9d376fa226f5c85f1e48e93d4c0693c1ad9b9efbec
 MISC metadata.xml 599 BLAKE2B e7ccfaf68072c7afdc8a1bc7abf3788e566c49dc88bc3fdc4f78a71360293aa310e55e34970544388e604d886e145d3b21d20b058e47d70c89d4dd57405fc980 SHA512 512145e4f2352d1f44c4d5dd43605e24081424219faded0c25271aeb03533e0a48816b66918b24e0025026dbf566b6cb86d581e1b71471114101bcfecbce9679
diff --git a/dev-cpp/benchmark/benchmark-1.5.1.ebuild b/dev-cpp/benchmark/benchmark-1.5.1.ebuild
index c64fe45b19ae..e41b960193ab 100644
--- a/dev-cpp/benchmark/benchmark-1.5.1.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 -hppa ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/benchmark/benchmark-1.5.2.ebuild b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
index 840648c7edc2..afb50c6ad8b3 100644
--- a/dev-cpp/benchmark/benchmark-1.5.2.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 -hppa ~ppc64 ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index bf6b67161607..2862bf6e55ee 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -2,6 +2,6 @@ DIST cairomm-1.12.0.tar.xz 789588 BLAKE2B 4c864705ce4b232a3dcaf7251cf22f7f9ac2f9
 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 1195 BLAKE2B 5e7e10285af8efc68fe54a1190cb96575c0df4b950f83d9d3aef05eb009cd8d36a98997becb1f1b8a9013787d6edb46419e05cd5dd59fea2cf5f40534a1f36f1 SHA512 8e2f582e142fd401649ebc43e6499880c76df9210cbbbc953fec7466a7802aaf05292359a044b3b68b4e2f49489b7b6d6eea89bdac568e43550557e24c164fd9
+EBUILD cairomm-1.14.2.ebuild 1194 BLAKE2B d0cdb0561ccddea2b491653c4c712b41687b05f97be688ca06bb60e9a93473e215f0463f7bd118847251141b40d1391d5ed5ed919d69f12e126a4a07a494fbfb SHA512 1569962d1769ae2156ee2f2c229a8ab85305b0d9950cdfcfa7896f0c2dffa110bac4a8d7f6a56fb06441e65a20a59f17b873fa1c54c5aaf86efca79356535894
 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.14.2.ebuild b/dev-cpp/cairomm/cairomm-1.14.2.ebuild
index 79302671e416..03410d0a124d 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/gflags/Manifest b/dev-cpp/gflags/Manifest
index 549b1925f390..d01224231c4d 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,4 +1,4 @@
 DIST gflags-2.2.1.tar.gz 96985 BLAKE2B 065dac9cf5d878e4179cb6d56ddf240052a552b72036fd06cb83197d9772a9b97fa544f809c6e1efd6f9ad8cd0222872fc6292c44bc013c5f70e235bcc5b290c SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
-EBUILD gflags-2.2.1-r1.ebuild 1017 BLAKE2B 226bc239a301b8524db2dca90550cf6cd273241b9939b98dcbd5a910e5119917cb1df6155516b43943e8694501f1b17a00e5df88fd9c5803aeeb8c82f6907519 SHA512 cef639c5c60e1d914edf537a90579f0762b96ed7c2f733fb366b87853d6c8bc29fdcf8719ccc7e20ae1dd8f2fda1c649b14028e9be9df713d51acc9c2af726de
-EBUILD gflags-9999.ebuild 1023 BLAKE2B fcbc98b3905b1217437dfbca41ea80895561a95dcac2cce72ba44b1d5cfa47a8748f080e7d17dbd309ea828384fa2626049f49d74a19839be6cd56677a3b8458 SHA512 689641092ec7d8809e8dd259b23747ead84c21a250f3fd1b3ade473dfed72a1d9bc92b9f7c02838efd456184a3d7ee9b86edf6d0a5147ebfe538fe4bf238a02d
+EBUILD gflags-2.2.1-r1.ebuild 1031 BLAKE2B d304add4aaecd73971101e156029703405c9866803c4fe79cae17112c3ab38359ce41c330d4357afd37843717f8d7a2eb3ff4feb063fb73d019dd86e8eb96ec8 SHA512 7c78c51be43430dbe0fcdc064992353e8275f0ac4416a9a116f91237a24a925d6b0ecf6928a76967a25c39b58d242891322ac57cb1ebadf32bc527118e32bdc9
+EBUILD gflags-9999.ebuild 1037 BLAKE2B 7b8a3392378b09f4e0cbe9dadb670fadc87678eae5b547fb63d7b2fcdf48c85af869f7fb089778db4c2a81e4ebbb291cde86bf3065726140283a1208d1a2dd73 SHA512 f83e489704c52ffc9c6788e6feeb29dd295ce9c1bb7390fbe3625cb2afcaef7b7bad3512759cbc8018f8c18a134440a1172a7170f7c872e799212b678745d207
 MISC metadata.xml 303 BLAKE2B ffe806891bf2b398e66676c5a17dbbcf2b53a1738a92d994828aecd33bf52dae92d9f2631d262f2c5c375b7f4c6918c9011f03ed94a0bc6a50f2475ee4620537 SHA512 80f049b850a5f55f33964fd8776aa4b510d9937022caac6d3817d583ae3089dd5cc73bd44b8ef48e867a706fd9223861001759281903ee1a1a467149ca7bf37e
diff --git a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
index 3a7f4b44bc0e..4ee23a61cae4 100644
--- a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
@@ -1,8 +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
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
@@ -14,7 +15,7 @@ else
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
-HOMEPAGE="http://gflags.github.io/gflags/"
+HOMEPAGE="https://gflags.github.io/gflags/"
 
 LICENSE="BSD"
 SLOT="0/2.2"
@@ -32,5 +33,5 @@ multilib_src_configure() {
 		# >>> /tmp/portage/dev-cpp/gflags-9999/homedir/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9
 		-DREGISTER_INSTALL_PREFIX=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index e8121a0281aa..6aa92ecf5e55 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -1,8 +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
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
@@ -14,7 +15,7 @@ else
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
-HOMEPAGE="http://gflags.github.io/gflags/"
+HOMEPAGE="https://gflags.github.io/gflags/"
 
 LICENSE="BSD"
 SLOT="0/2.2"
@@ -32,5 +33,5 @@ multilib_src_configure() {
 		# >>> /tmp/portage/dev-cpp/gflags-9999/homedir/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9
 		-DREGISTER_INSTALL_PREFIX=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index ac91dbabf266..ac429815bf57 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -3,5 +3,5 @@ DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c2
 DIST gtkmm-3.24.3.tar.xz 13539040 BLAKE2B 24664773ec7b0666575346aa0532e8961fc19d965ef34244ed97707f7e3eb4d1d0f016abf733531269bf3e3201defe31559990e32f4f43faa8d3bb5d1f02fdb7 SHA512 e373807ec245057708655fa5dbf18d5391656a55b008fd6aa0fdc5a56e80d288813c3bbb0093f39aa7679df866a176f1e6b0e842d4d1b18b775a5928eed9fef5
 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 1437 BLAKE2B 6b6a7e2163f4e9d673a85fae4cf4f597c91e02e33ad3e3bdf6204a668e0109477983e9a2297c002ea4986cd9395957ef2543398f9eb6b684a5d4bd380cebc19e SHA512 c14f48b703e649c310f28e094f74a49c353c7b590b83981bf207262fa1b383e2826d4816e560dfe31d27f2ee9b8e2d8e17914e4fd02a30263a77a9d9b185b22f
+EBUILD gtkmm-3.24.3.ebuild 1436 BLAKE2B 0739259528d672300049a67ad469b4aa2ff29a03ecd126d507a8129ef9c99e049448a925f9553d0106e46fc562cabaf74abcfc69f869ac30c49bdfcdd7005e69 SHA512 f19504473d14f73b669b5eb12d88c7f9f0b49810d653ed1a45e4709da5b7662bede3e8c2c814d4f2a9e064ff974e863fbe80f4781573d81161b215795da73fac
 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
index e7e4f9df4231..654a1c48209a 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
@@ -9,7 +9,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/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 430b96d7d62d..d3e8f4922c9e 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,5 +1,5 @@
 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 501 BLAKE2B 105ef74c62c278c9d1caeb369178973ef13a197c4c61b1fb4f62679b3f51361b0c0aad42b199e8405e3cf5ef87e3ced2f04b362ccb1660bc0d9a420fd154bf15 SHA512 57e5ce96e05860dd697b5db40b9acaaeebc0c4f909a47ef4dbac29ebe075de1a47e612f34c582a1edf96ac1132dbae05fc6066648bd6db739aa241265ddf8f93
+EBUILD mm-common-1.0.2.ebuild 500 BLAKE2B 44f638bde2914f0acbfb68e8cb230ae41a9bcb2b557cc70a20da2f89e17082986090e1e5c79637ce50ece3589a0a27250f108ffe5c38a13065cb69616822ccd0 SHA512 c81593835ddcd40973e0027f04380cd3884ae42e2dcb8172083260bb505ac0c310f0d2cd11f636686d2ccbc39b9990817a3e2d4aca3132fa858cd6520a18977c
 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
index 39f6d7b82324..1203ebd4f1ef 100644
--- a/dev-cpp/mm-common/mm-common-1.0.2.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.2.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
@@ -10,7 +10,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"
 
 src_prepare() {
 	default
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 3df81f37a70a..f147f1deddd1 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +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
 EBUILD pangomm-2.42.1-r1.ebuild 927 BLAKE2B 59f19896cf60e1c4296e31d58584ae819ba31044db859b4ba5f4f21c8637091116dcb6eac2ea3fc4372f49e3a0e40211512b0b1c689665bc5c025a2720cd25be SHA512 1c0d1f39152b9c27e67a94544dbf777afbff64bd4d2751d525e60c636b36c9feb8f516ed6c9f7ba7f3187082db2a4f21421f0bcc5c810dd1e6368e63bc26af5e
-EBUILD pangomm-2.42.2.ebuild 993 BLAKE2B 42b512f9f9b6881e33e92f920407ec26eefd15fb6f0ba56673da55c50ceca0179e380f8aa16aa54a392230360bf586700897ad72c052e32c18628c93fbecd463 SHA512 cc6178c0795343310729fbab94a19c19b14eac34a76b8a3053548f09dafab0095891f061b3d7b1df7463d477a19d8051c1656fa7867d14d4296c1235386f0acc
+EBUILD pangomm-2.42.2.ebuild 992 BLAKE2B c52afcb802ff17893098017611c8d57ffff0e7f872787145e7e8df84a0522fc6c8870931dfdc5d6a03bae465144a69a9423b0d2f7ca14c37681f05b583407f43 SHA512 2fdcf26739ba76e786d4430376a18db93110fbcd26f87bc6086eabc3b3d7baccfe73b3896a4e54ae1831b3737eca7fbc50fedff5ded349d6298f02e0da222bac
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.2.ebuild b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
index 439b237a3a0a..d6cbefb77fe2 100644
--- a/dev-cpp/pangomm/pangomm-2.42.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
@@ -9,7 +9,7 @@ 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="
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
index cddff2262b10..dfe60bc3058f 100644
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -2,9 +2,11 @@ AUX prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.pa
 DIST prometheus-cpp-0.10.0.tar.gz 49694 BLAKE2B f14232e1dad0376ea8e90c89079c4a6d8f2e9f5661a399d38d6f5001506db6c628cb42a934b40139cbb0d904a63c4b4483e6ed92452f5393365ed4209a236247 SHA512 18938b30143ed29985ee56943fd69e0a221f9d25f04fc611554050ee2786e96d968f7db251cccefcbd0017b61bcd8a7ea05af8f217c8aacd9f0694a4702ddcff
 DIST prometheus-cpp-0.11.0.tar.gz 51126 BLAKE2B 8c2126bcba405748fa398d9b8aed472ca5ade45049817995836fbdb1a09fc29e4176a17ecafa6b9a26f8fb7b62cb00037815ba300123fa3c7f39faac54e160e8 SHA512 4ab286c49403d09f182038cda9cb3bd1b9dbf7061493ff5355afef6ec4ac6ef109c875306e76ed3776b07d640ad7034538cfbc00474106108500994242b4cde2
 DIST prometheus-cpp-0.12.1.tar.gz 53034 BLAKE2B cd7f63e76e53cb45c1a23a9b2caba15f56410acfdac5757138cd63d92188a4515563b6e2b5583cf38743c470804422934db40f21293d2dc25fe09daf6a21b82b SHA512 9f9d7ed5b66ff05642e3b0c12cccbd8e23f2685da857d4d24243dfb85239f5478f651043dbe052ac19be4bd44d71875ad0c492797f9a284bad4d4519e970b19b
+DIST prometheus-cpp-0.12.2.tar.gz 55191 BLAKE2B f1430cf6b8ca8272c447e8c2a25af5fb0d515389cb1078f8836a9a1f1ba0e26cc43236e9c147219384df40d601b843219acb95ebc46bb1c2fce6d83a86724182 SHA512 9907658939b7956219c3623bd5997f341f4374fbce2ee606bd1d8df820779ed8dc70658a30aafbb47b9af645205c048270b23e701203e13286bc365094a441d3
 DIST prometheus-cpp-0.9.0.tar.gz 43924 BLAKE2B e2b26b257e44c63ae5bc2a703d0ee9247fd8f093ef58a3b00dec022af9cb56b18d20b74ccdb91899e2385b036c332b62d9959b9258082ca420fecf48926139d5 SHA512 d9d5fbbd8c8aad5dd6a5e872275324d689a0c57199e4158d74e13ea62b286fa71dee01bb4197b906b79792bf1ca4e67a46b5c04621d7070241ac32876f6de891
 EBUILD prometheus-cpp-0.10.0.ebuild 769 BLAKE2B fe1d2756ee9c375fe0962b27be13ade4ea83be5770e93cbc3f4bd3bc7f3645899467b92a4ccc61b5dfc8cfd3e362a4ee62604e16eb8ac05ea9b64c3b7df36492 SHA512 381fb21b7317337fadfdce1b9fe4c4842bf6f5a0b663eb90cb770c1ecc7fae10bf6e62afd0f6984eb8c95da03e07f164449bfb3a45b674534775db92350064f8
 EBUILD prometheus-cpp-0.11.0.ebuild 750 BLAKE2B f837d8b48c2464c0d5eeb3b4e02403ecc0f3f3a31533dd77a6b660da3a26804c1c493a8c6981f66c8853518d325ed32fc4e42bec886e06871c99b0f36bce8c16 SHA512 f31c5398456ed9c069ac83bb215c20850b46f9f090b3e461ceb34a1c13f66ac42ff5fe15c0593590811caf8788442f24d5de268b91f9199cd16e4d9d9a1e2b7f
 EBUILD prometheus-cpp-0.12.1.ebuild 750 BLAKE2B df0efd340967279998b221ff903ac1de3931e890fd121e4c37aa5fdb042455f9da21b18988ecd6e381c70eeba1ec71883c2e4461d82a5258acc8c85711d7e590 SHA512 5d5c552c42e6359691fd079d4af12cadb7d4243d86eb699842f70be3142da1778c55714cb03c06664b1f01ba6e854231044eb48bb592bdc58f163fcd3aa27add
+EBUILD prometheus-cpp-0.12.2.ebuild 821 BLAKE2B b4a5e9817f4cb65919ad504a6d2bcc53cf41b0cc81bfdda34eaf4b335d6bc9054d7648ebf4a344afc1087239b020f073142994b8ceebc0bf77c9daa1798632e5 SHA512 4377daa3ed659ee16bb0dca9bdce029b5e68650cccce4d4a6eb6b518e8f5bfbf4e08f11779e1a45e0b0c782218b8026b1200302e27459d1b7993f931564760f1
 EBUILD prometheus-cpp-0.9.0.ebuild 861 BLAKE2B 5646744ffc35576379efda8660d4766dd5a31f34688e1e1ae8ed203c78741c2a3081ac17d08ecd42bb470c473494f382fd7be520ec7fb272f0eab8fa0b86fd8a SHA512 173615b28f1d1d73f871b22c6fbc8d787cecce06529ce39a5e9bb03dc4ca9672d74ec2a71666b627b445fd104606ef7d2c5e5fc187e645fc227525f58c98e876
 MISC metadata.xml 957 BLAKE2B e5ad4d542af4a50bfe542f810c937f79065d7a77f5733bd9e3ce356da4dac599eacf980ad5650e91da3a64c9a050f08dfd24acead0538884fbe01253cb008130 SHA512 06444b55464c8301512b2f6c25f8d0e0071cab367cca4111bd21891b66ab7432b7e637f4ed46803c189cc657677ed35a8c351a11e440f8f1ccd48c9a5d636626
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.12.2.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-0.12.2.ebuild
new file mode 100644
index 000000000000..9f22bf741501
--- /dev/null
+++ b/dev-cpp/prometheus-cpp/prometheus-cpp-0.12.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Prometheus Client Library for Modern C++"
+HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
+SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-misc/curl
+	sys-libs/zlib
+	www-servers/civetweb[cxx]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gtest
+	)"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PULL=yes
+		-DENABLE_PUSH=yes
+		-DENABLE_COMPRESSION=$(usex zlib)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_THIRDPARTY_LIBRARIES=OFF
+		-DGENERATE_PKGCONFIG=ON
+		-DRUN_IWYU=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index 5a7e64d24e75..4b18dc905c4f 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1,15 +1,4 @@
-AUX waylandpp-0.2.7-fix-std-runtime_error.patch 743 BLAKE2B 4f528ce32190cbc6d54c07beab484297a3bb17982f94162c74f87302bcbe692f252b6f359cd1d3f8571d5e70587c49bef53596e869e3e4b766af5c30817dd5dc SHA512 485272837f4d32b251678cd15a581b8f174ea01a58fd91aa78219b22470426734ce610ca397ff86ff1828d0757e0a66417e18f60b5380324afee14338d26df3e
-DIST waylandpp-0.2.3.tar.gz 180539 BLAKE2B 8941200b46235c8b65926065a3a758871581fe21ffbcc17dc33a00c546c920247739d3137b528fe8971b7c1c2240b5a056387dcbaa1437047709e079cb2e58c2 SHA512 424ccef67e1faedfb03aa7465917e4dfc0eae578a1eb42bcdbe71df02955fef00fc1b480acb4828e168f051a82a13f923e0c9be93d3ede221e791a7af88647a5
-DIST waylandpp-0.2.4.tar.gz 240718 BLAKE2B 4493f3e19dd546412f110227c44440a422d0e1156eb24ed8bc3e58e5ebda22c0aee16e5f2a2efc1328a697c5436f81c11c67d7c46855f32f7531783a1d514ae1 SHA512 74855ea86926692a9f6ccb5645a7ed30000bab0f01a2f37a30f2c0a341d67d511ae217b8f69adc52fa2c25ac65afa182a6dbf2318360435a02b6ff428b4c9d51
-DIST waylandpp-0.2.5.tar.gz 177735 BLAKE2B 9add6147b7694d275f2f15f03476aef5bddebdca029f012743a0c0c388c7ef7394536b4401c78830487bb1c36a0b29ea348bc2acf60617af7bcbf917a5b691dd SHA512 a8c80282022b2ede3c3d0f5516e236aedaf3ef685565da8c61214fe37eda139bf152093eb29960be1889798eef5631b9d68a5e832c10cf1160c4a90f45eccb6e
-DIST waylandpp-0.2.6.tar.gz 178969 BLAKE2B aff9108691dfb2f27ac829865d3367a7f72de0a838b64f6265183a36a9ed5efbfcc9abcf724c784f5bda08c1a312cc7077fa55756b10520114dc8a23aa30f7a3 SHA512 b2d2f22864db830ec6a78282552a3e677f109c49381f21e80efec3cc65cad1820b1e10ad76d960e9d470f84060bb7f3edf0dcdd94025ae80a4a93ffcecfb8c5f
-DIST waylandpp-0.2.7.tar.gz 179121 BLAKE2B 6a8e77817962b8bd6ea93c059cd8cee9c655821bca0dc996b014d6085de1f88fe9a9f2b7c80a8b8fa405e898f7d96dc5d01f78288033d18184b5f0504c78c276 SHA512 67ec76d9bc0146472d70364c98b6b5af957c757a95d55c224ef2d9bf8b3ab15dc4f6333dca1ad803d94403be11abe7055db54d9fc708c6f5c0196f6a328a5ed2
 DIST waylandpp-0.2.8.tar.gz 181950 BLAKE2B 186515308d2e17e39e61f953fcf43df6bcff45a965d6425ffb71f0314fc091d241a975d0e7a61e988091ae7491cab56e163b6bccc0a2584b79b5bd5a7f8573fd SHA512 bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
-EBUILD waylandpp-0.2.3.ebuild 833 BLAKE2B 7556dc863efb653831be0c99d190726c9e8729ae28e5afa45163d775c96b0961bdcf2ea485aca2bd5c761003a1714ecd4dfe244124ba03e26490e051b0fee824 SHA512 5e996f8c29632d6a3e7aedb23fe97a93ffa23c43d19ec7f2d7e24bcc68c6114cc8d7bf33f370b437e35b32c6640a7f03e957b9d3647c2bc4bd4ac03c9faf1782
-EBUILD waylandpp-0.2.4.ebuild 757 BLAKE2B d142eade552ed0a09e10de4c4dda27b167b94f1be1f0797196c89a089c52244e92a1646ab7be804f20608e749546f173fcb281c8c12f00177316f6bf3d649d45 SHA512 79f2f9fddd63335d46edf4edb5312c0c62a7deef0ccfb78eb3fe3989f841455c3350f28225c25dd513a8294a81d6a11cfb140b42031dc5612808b61ba40a777f
-EBUILD waylandpp-0.2.5.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
-EBUILD waylandpp-0.2.6.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
-EBUILD waylandpp-0.2.7.ebuild 828 BLAKE2B fe842549de3930510b371966d7e7a53c64bab7360e63b21634605659b2c27289757f6517a27f3e9758b99a803ea299cf0b698e0fa989abaa2eb09abc081ccf60 SHA512 c3dcd8f3a29e946655bd831e212b49d153b3f00d959fbc1aa982e78e4375dd2d0aeb7b1b4ef834a7d240ee0cad8e76cac473a2b76eed43d6525069ee8debb2c3
 EBUILD waylandpp-0.2.8.ebuild 770 BLAKE2B 006d8f8ad20c3125e78a9ddff29069cea75ea2168cf683be2e3b447d0bdaf6187c73f599e17d127c45b24e75bcd7ef1c9f6fb8d92042e9eca9e9516757e92b2a SHA512 8cd51144cd7e2e10510574aa3f193405269bb1ba628bedc04cb577cea9eaf1ce446562ab3a7123f8e2817ee2e139e07ee6bee30cd964fabf92a175dc9b11dd28
 EBUILD waylandpp-9999.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
 MISC metadata.xml 401 BLAKE2B 3270a9fb51a7a5a0cede7e9bc863f1445db1eda5a3b132b8ed9d2eaaaddeb60b85720484a136e09d3e00b80240a637a9f8a9533311e2b6f17fb9798e2ed19ef6 SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada
diff --git a/dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch b/dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch
deleted file mode 100644
index 41e71eb237bc..000000000000
--- a/dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 695c0881101435a57d24c84d04cbcb79eec49903 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Sat, 18 Jan 2020 23:37:46 +0100
-Subject: [PATCH] [fix] add missing stdexcept include after 2d834a6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-fixes error: ‘runtime_error’ is not a member of ‘std’
----
- include/wayland-util.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/wayland-util.hpp b/include/wayland-util.hpp
-index 9cf5d04..1609651 100644
---- a/include/wayland-util.hpp
-+++ b/include/wayland-util.hpp
-@@ -28,6 +28,7 @@
- 
- #include <algorithm>
- #include <memory>
-+#include <stdexcept>
- #include <string>
- #include <typeinfo>
- #include <utility>
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.3.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.3.ebuild
deleted file mode 100644
index 953c92f45fc0..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.2.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_version_component_range 1-2)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
deleted file mode 100644
index c80260e3db64..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(ver_cut 1-2)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-	>=dev-libs/pugixml-1.4
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
deleted file mode 100644
index 6fda559666cb..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(ver_cut 1-2)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-	>=dev-libs/pugixml-1.9-r1
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild
deleted file mode 100644
index 6fda559666cb..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(ver_cut 1-2)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-	>=dev-libs/pugixml-1.9-r1
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
deleted file mode 100644
index 58a4949eaafd..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.2.7.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
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(ver_cut 1-2)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-	>=dev-libs/pugixml-1.9-r1
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-std-runtime_error.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-	)
-
-	cmake_src_configure
-}