17 files changed, 10 insertions, 413 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 0befa72bcb18..c38c4f25dd0f 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/amqp-cpp/Manifest b/dev-cpp/amqp-cpp/Manifest
index dd6ba8af4277..8664beafc2d4 100644
--- a/dev-cpp/amqp-cpp/Manifest
+++ b/dev-cpp/amqp-cpp/Manifest
@@ -1,3 +1,3 @@
 DIST AMQP-CPP-4.3.10.tar.gz 156600 BLAKE2B 0453259e8d84b223fc8d36d4747b267a84d7db9daef55d13ff31d4c8cf1e5dd8efb87d9f83f7ff7554aa70c5000d6da45187ce03db09ff4c542bd5409d81ada8 SHA512 ef9a20cd066bbefc243d8d58dbded728e0c88f5c47134f835c50dfa01178b53200970333f0d56330c206f74aa7d7691556c3e4693d5276adb7e3bf4e66bcd057
-EBUILD amqp-cpp-4.3.10.ebuild 889 BLAKE2B 796d43515b303bdf39d0d5439d6be8c2ca8331639bbf83a3926218c7052d89c3bc2b4d82fbc901372958cbba3f87d39577c8456c3e2bdf16f53a3de92f81489c SHA512 2ee67976e747b2adcf6c78ce31301984d0ef80c74e7650e0c1d78c7e79498d74a83e7d9b353d6cf670289de35faa45cfe1fa135a7d4265b75781c3f01480e84d
+EBUILD amqp-cpp-4.3.10.ebuild 868 BLAKE2B e0afe13927e61a46198a0ec88de16ce5abc960ed8158000d7853732e4fbc85e7422259e120d10f61893f9c8ed85d2668deb8ac40f8a7ad636b0226552a872230 SHA512 1af574a26834230721c017357d50381513816c08f716a372081d3fd754579180e1057a961cb5d49e307f8a70317755d0927b0f8742c52ba812996ca137b4043b
 MISC metadata.xml 349 BLAKE2B 509cb064b08453cac6096be89d5a07a198a62983cb186d146872a97f9543f615dbb3039c606fb4bcdf877c0d10c1ab4654d1019d7dca2920c48645553ee556f1 SHA512 792290af273069d20eeae7b21409d31aed2b3f9c001dcb72fdceba58150eae68791e832ebe8747bb11a0d31da62922cd46e22eebd95a46c6329492e3ad6a487c
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
index b3e938e0414c..cc3e9267be26 100644
--- a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
+++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS="cmake"
 inherit cmake-multilib
 
 MY_PN=${PN^^}
diff --git a/dev-cpp/argparse/Manifest b/dev-cpp/argparse/Manifest
index b36823958baa..89727a1efce5 100644
--- a/dev-cpp/argparse/Manifest
+++ b/dev-cpp/argparse/Manifest
@@ -1,3 +1,3 @@
 DIST argparse-2.1.tar.gz 72452 BLAKE2B eece3f1cf6a2e58f5bec99f0223b31ba92147964053d98122099dd806a0ab62c6039ee8741281d1eca28b9d0e3aa02d7d076e8bcc64bbd5dd03c777f8e460531 SHA512 35746e0b526bd4406c954ab315f191abc57b08b48a047f108ddacc7baace406d3ddddb1af23d41caff565afecfeb41dfedd27a08cdba8d11b59dbe7c78b7e9b0
-EBUILD argparse-2.1.ebuild 393 BLAKE2B 7aee55db28cba19c7b1bacb35e5e840c6400737db0b87e038b8852390b60caa0be45a770d4a4de67193d974201bde87a1b964d3d199386ff623df8bd3df63cb9 SHA512 2c6cc5535b464c4227f8b723c1044b3e16ae1a7fe3f994c423a7f2778c98e19795762d60abf37198dbb6cc4fc609f3ba124f900e7af84dab1d91b6b779c25db4
+EBUILD argparse-2.1.ebuild 371 BLAKE2B 683a35415c4fc3d57ba84a42218a0c9da142d0a1c63a92489e9b48b3e6531f49524b60aa201d23f7e83480ddc063c47c80244cd4c628349396666e0e831f9b40 SHA512 4ee00fc4d2cfa319cfd6e05b60ae6dccb068d202b133b75309ca2f3d450c607ea286632f8a059d29eccf4f00bf21fed7089d0b689960d4dba36fa1e4e0dc66bf
 MISC metadata.xml 330 BLAKE2B b2116c014f0385ca1a4d617dcb6c48ee60e39d82630fb716230c27f4de79ec6cd4611f9194aa9d8555cdb54e2cc22ab0a96cd755231ef99e272877a490226e5b SHA512 ef007277e64f992e40944f540606c9908ac87284d73dfcf252caa885da6c381bb33640544e841b857483c24dfcc5250a6e59a082cb463a02c059afd23069d686
diff --git a/dev-cpp/argparse/argparse-2.1.ebuild b/dev-cpp/argparse/argparse-2.1.ebuild
index e816482a83fd..ddc41fdbc22b 100644
--- a/dev-cpp/argparse/argparse-2.1.ebuild
+++ b/dev-cpp/argparse/argparse-2.1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS="cmake"
-
 inherit cmake-multilib
 
 DESCRIPTION="Argument Parser for Modern C++"
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 01df1dad33c1..de7d28ff5197 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,6 +1,6 @@
 DIST gflags-2.2.1.tar.gz 96985 BLAKE2B 065dac9cf5d878e4179cb6d56ddf240052a552b72036fd06cb83197d9772a9b97fa544f809c6e1efd6f9ad8cd0222872fc6292c44bc013c5f70e235bcc5b290c SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
 DIST gflags-2.2.2.tar.gz 98704 BLAKE2B 54cbf3b0a422d662e89c1921614ae9f20a4a383524d374d1e7ce1473eff0a6e121c1a2255df0b9d27ae9866c8e63094b908534c5fd2173737033cc0f184a5e4f SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447
-EBUILD gflags-2.2.1-r1.ebuild 1037 BLAKE2B 934c6a370f39c5e1180600682e6577546919babfa63a5bbce2c5a58eb6d86eba9e738fab211a74bd8fbc7f016596346413a7300a5f4971f3f747a8f5ea4488d0 SHA512 13d51fe2b0b92fe55058c864f39163d7d694e4943d520900dff975d79ca72546a2313e412aa52c0e7021db4292d859e52861d203564a0cd3f9bb81b0e8a60fc2
-EBUILD gflags-2.2.2.ebuild 1037 BLAKE2B 934c6a370f39c5e1180600682e6577546919babfa63a5bbce2c5a58eb6d86eba9e738fab211a74bd8fbc7f016596346413a7300a5f4971f3f747a8f5ea4488d0 SHA512 13d51fe2b0b92fe55058c864f39163d7d694e4943d520900dff975d79ca72546a2313e412aa52c0e7021db4292d859e52861d203564a0cd3f9bb81b0e8a60fc2
-EBUILD gflags-9999.ebuild 1037 BLAKE2B 7b8a3392378b09f4e0cbe9dadb670fadc87678eae5b547fb63d7b2fcdf48c85af869f7fb089778db4c2a81e4ebbb291cde86bf3065726140283a1208d1a2dd73 SHA512 f83e489704c52ffc9c6788e6feeb29dd295ce9c1bb7390fbe3625cb2afcaef7b7bad3512759cbc8018f8c18a134440a1172a7170f7c872e799212b678745d207
+EBUILD gflags-2.2.1-r1.ebuild 1018 BLAKE2B 37cac1e05492191a707e69074e2a102a04d3afb363128cd50466324453ed51a09bb72bd9e815999c655de7fedc2c115ff1060c7659a440bd6e7dd364b954be33 SHA512 3a6dc9b386d8788e77bee124a07c2bac305259d7a00a567e98088c00db6528d42f67b3cdd1effa2267012220b2c23542781192a589611f65bb24b85106c8cd9f
+EBUILD gflags-2.2.2.ebuild 1018 BLAKE2B 37cac1e05492191a707e69074e2a102a04d3afb363128cd50466324453ed51a09bb72bd9e815999c655de7fedc2c115ff1060c7659a440bd6e7dd364b954be33 SHA512 3a6dc9b386d8788e77bee124a07c2bac305259d7a00a567e98088c00db6528d42f67b3cdd1effa2267012220b2c23542781192a589611f65bb24b85106c8cd9f
+EBUILD gflags-9999.ebuild 1018 BLAKE2B 6df852e7c1f7327f51ffd9a010d814a2f1502b74bf88ed9a7912beea9caa7171b68fd99babdcdbb4525d0f7b4aa78e7bed90ae801a91781ca0e5b2ae1e26f2d9 SHA512 0a159c9a4750cbf42871ab812475a7252922eb8c3ff131ed7688483bb32100fe00d5ba0113443788e635b6dc63197887e20f81e32bf4e3e9637f74b9f519383f
 MISC metadata.xml 304 BLAKE2B 60a6da87c20f4ada3ec9a2422aff9f3fb9eb1a4705f95dbd571188162d2463c29816c96749afe2b79121111251152c41cad9c3ecc71c7cbff39b1b828fd3e1dc SHA512 d05d1c3c886539f75bc1edcac267dbe1c38db77563680091c2a3aab915a0982a43fe9570b5c8b6180a9d2b7fdc1cc96dca313e2a7339a4a6f398cd09eba90f9e
diff --git a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
index bccf0d7e2b6c..423e936e4bf2 100644
--- a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/dev-cpp/gflags/gflags-2.2.2.ebuild b/dev-cpp/gflags/gflags-2.2.2.ebuild
index bccf0d7e2b6c..423e936e4bf2 100644
--- a/dev-cpp/gflags/gflags-2.2.2.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 6aa92ecf5e55..15ed6ab2c368 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index c6d3f1b770bf..22f65ffc1537 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,12 +1,5 @@
-AUX yaml-cpp-0.6.3-CVE-2017-11692.patch 1433 BLAKE2B 9218756605cf721c86e9ab01b0d8cb7a13371cc32282395dd96a82d184222afb18bf780e1d224ea1ea6d1e4c3e796cb822fb12a4705d54bc6b244007c5b612b1 SHA512 a95e40f6718b099567a37731a09db6679920bb91046632dbc0671b0d99c4c1e706954b39ca7b798732289b4a0d129dba9fa75f198e99db53152ceaf3a259a160
-AUX yaml-cpp-0.6.3-abi-breakage.patch 1911 BLAKE2B e595bdf3dff91624aa75a233a6a95db3862a7bbe645a6219704fa25c0887321dc5c461d13b6694ebca31d0da795bb750701ad0c6b9f79be0eecd85b07a71a256 SHA512 0a3c0655a1319eda09796a7ddbcef8a27884cdcbc95d34d82b6202652da3b15d7afa6e22563af39f6c6c87b7a70bdee3c1216a5523604d309345d556ada702b9
-AUX yaml-cpp-0.6.3-fix-overflows.patch 4671 BLAKE2B 77a4256a41bc5f0de98ada425c15cea6b377430c0303205895136eaa7588f30d646af1cb670d74b3be405e392f1f3648ef3c3378ce115b983c6ff8bfe398d3fd SHA512 ed6a472e712511ccac1c94c837bc64b933e301476a6d19f59f468487d4ace3e1862e7da310214e5f25b81c907d92f3f9690eebce0ec4f7661fc6584de393c5fb
-AUX yaml-cpp-0.6.3-gtest.patch 1271 BLAKE2B caa8384b79dbb1e85b9248b2307f792734cb4f9bce11bd2cbd08a680604e3f396379c0c8b50de1bcad6cae32c0cbccba5f3a1bf155125f461079f10e728790fc SHA512 71c313d4ea78049a8a9c444447d54b10693d4dd61889933b0dabe575b633eeb0b5f80f7e58fcb2703c27daf4d11d5e16ef30017dc0a648db7196bc45b4eb4818
 AUX yaml-cpp-0.7.0-gtest.patch 846 BLAKE2B b9fe25d42402cb019a705c74ff87cfbb018ffd1c8bd6815f39683842f3c7bbdae6f08713dbc298880a5f2787ca24badd1e56a4fedd74340d87a2811f89332c7f SHA512 d7a89218fad73c9de6a5a9cfb5203089f63346c1df7abe5a21670c7a20c348dee55176113db6a2c494b04bab9687820b7ebd9c93f11cd82b9d8b6cde58b9f91c
 AUX yaml-cpp-0.7.0-pkg-config.patch 786 BLAKE2B e15882c2980e3c5697985c097ff8775d8750a4cf6712d4afb370875763646d2355cbeb14e17c21c1ee3cc98335f5edd42b8f7ac71a2e4de6dfb5364188e38669 SHA512 33d7ddedd8414559b5a20a03ebcc5b58ea3e706e1c757a93576fff619e4fab3d9fadda0f2db38ff5dc675620a28d97cef623205d2c568371ad93c597ab735284
-DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B 07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14 SHA512 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
 DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B 69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368 SHA512 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
-EBUILD yaml-cpp-0.6.3-r3.ebuild 1047 BLAKE2B 48e6082d4d7a9814504ace6472166f026bba2267459080cae0b20774a36bb873a25bb2811ab98b1ac24b349d344b304c9e671518444ebf9f704e78dbeb4b6261 SHA512 a8847865f37d31b0f69025f10f95ccf35bdd6c7badeb1377c24b155f9094fbb13bcbd2bb7e3ef9d6d1f60f57998a3f73074251ed043da694de7a48217694905e
-EBUILD yaml-cpp-0.6.3-r4.ebuild 1073 BLAKE2B a2a1737410781e389494b054d1539dec976d3a193ffaa530ac35f65014008928abc056f0f55caf32f48b18d7f1366a1797c37088be17f6bbbec410ce98655bd2 SHA512 be8bacf1a1a3fddb364405e5533af8e402fe42c3e7a7331f92ef644623871aabc86653f748115659c6ec888bcd824acc8617f367f022e941b92699d45ebe7325
-EBUILD yaml-cpp-0.7.0-r1.ebuild 896 BLAKE2B 6bd07e0ede4fd7bb0532629a903f7f6824f770edba183caf177a2d70a96e97bf562bd10b62f48a5c6adb68a2599fc174d1b02a0a6f132eba446b91f069aad62d SHA512 4682ca320932043f1cf930f2578446c51afea0a8137fc7eebffbe18ee41c08950562d3fd545e9e1096a7970e5a4d34ad0b0ff1e56f0996e9d4b34629781d51c5
+EBUILD yaml-cpp-0.7.0-r1.ebuild 875 BLAKE2B 9fce3fa4514b87547ec49bdc6ca6a7bb18d8122b63212a8823d9e8cc212a79dee6a93a440936d9e6e6786aa54936a19753722371ba9d1586faba5aadf185e667 SHA512 78dfdedd17147f93c89910eb1864b9f2ba93070750bd6ed0e072d775617c7379cd2141f990f1d2783309b989592c4d403b94897b389aaf91bb60f1fb25d7e9bc
 MISC metadata.xml 484 BLAKE2B e973aef681bed7de47725bab49d2acfe809ad73c97eea709bec9d5bb9d720f89bc222ff77f09b90780b2a14d6a094f9ddd24a4f15d6ad88b94060d240c5836d8 SHA512 612604d3b0c2edd157c4a55ae22d92e174cdcbc17532de7f2888b9579b4b028da2214e6d756864dfffdeca129f32e5db2241308d326c6ff21044f48bf2d87d73
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
deleted file mode 100644
index fd7a7198c1c6..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c9460110e072df84b7dee3eb651f2ec5df75fb18 Mon Sep 17 00:00:00 2001
-From: Jesse Beder <jbeder@gmail.com>
-Date: Mon, 20 Jan 2020 18:05:15 -0600
-Subject: [PATCH] Fix reading empty token stack with a node with properties but
- no scalar.
-
-E.g. `!2`.
----
- src/singledocparser.cpp             | 6 ++++++
- test/integration/load_node_test.cpp | 5 +++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
-index 52544dd6..47e9e047 100644
---- a/src/singledocparser.cpp
-+++ b/src/singledocparser.cpp
-@@ -79,6 +79,12 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) {
-   if (!anchor_name.empty())
-     eventHandler.OnAnchor(mark, anchor_name);
- 
-+  // after parsing properties, an empty node is again a possibility
-+  if (m_scanner.empty()) {
-+    eventHandler.OnNull(mark, anchor);
-+    return;
-+  }
-+
-   const Token& token = m_scanner.peek();
- 
-   if (token.type == Token::PLAIN_SCALAR && IsNullString(token.value)) {
-diff --git a/test/integration/load_node_test.cpp b/test/integration/load_node_test.cpp
-index 4f4f28e8..0e0dd6bc 100644
---- a/test/integration/load_node_test.cpp
-+++ b/test/integration/load_node_test.cpp
-@@ -257,5 +257,10 @@ TEST(NodeTest, LoadTagWithParenthesis) {
-     EXPECT_EQ(node.as<std::string>(), "foo");
- }
- 
-+TEST(NodeTest, LoadTagWithNullScalar) {
-+  Node node = Load("!2");
-+  EXPECT_TRUE(node.IsNull());
-+}
-+
- }  // namespace
- }  // namespace YAML
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
deleted file mode 100644
index d9160856c47f..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit f5f288c7622d3547c29a8355b8ccda0155483b79
-Author: Till Hofmann <hofmann@kbsg.rwth-aachen.de>
-Date:   Sun Nov 17 22:43:20 2019 +0100
-
-    Revert "fix up static, so works as DLL (#559)"
-    
-    This reverts commit 774f25800e6f19f4b927023c85d1389af322da5e.
-
-diff --git a/include/yaml-cpp/node/detail/node_data.h b/include/yaml-cpp/node/detail/node_data.h
-index 82fb79a..50bcd74 100644
---- a/include/yaml-cpp/node/detail/node_data.h
-+++ b/include/yaml-cpp/node/detail/node_data.h
-@@ -81,7 +81,7 @@ class YAML_CPP_API node_data {
-                     shared_memory_holder pMemory);
- 
-  public:
--  static const std::string& empty_scalar();
-+  static std::string empty_scalar;
- 
-  private:
-   void compute_seq_size() const;
-diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h
-index 7a3deac..b363f86 100644
---- a/include/yaml-cpp/node/impl.h
-+++ b/include/yaml-cpp/node/impl.h
-@@ -166,13 +166,13 @@ inline T Node::as(const S& fallback) const {
- inline const std::string& Node::Scalar() const {
-   if (!m_isValid)
-     throw InvalidNode(m_invalidKey);
--  return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar();
-+  return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar;
- }
- 
- inline const std::string& Node::Tag() const {
-   if (!m_isValid)
-     throw InvalidNode(m_invalidKey);
--  return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar();
-+  return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar;
- }
- 
- inline void Node::SetTag(const std::string& tag) {
-diff --git a/src/node_data.cpp b/src/node_data.cpp
-index 6cfedfc..eba1ae4 100644
---- a/src/node_data.cpp
-+++ b/src/node_data.cpp
-@@ -13,10 +13,7 @@
- namespace YAML {
- namespace detail {
- 
--const std::string& node_data::empty_scalar() {
--  static const std::string svalue;
--  return svalue;
--}
-+std::string node_data::empty_scalar;
- 
- node_data::node_data()
-     : m_isDefined(false),
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-fix-overflows.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-fix-overflows.patch
deleted file mode 100644
index 4c5418db22d3..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-fix-overflows.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-This patch comes from the upstream commit here[1], slightly modified to
-apply to 0.6.3. The pull request[2] mentions fixing CVE-2017-5950,
-CVE-2018-{20573,20574}, and CVE-2019-6285. Note that CVE-2019-6292 appears to
-be a duplicate of CVE-2019-6285 [3].
-
-[1] https://github.com/jbeder/yaml-cpp/commit/4edff1fa5dbfca16fc72d89870841bee89f8ef89
-[2] https://github.com/jbeder/yaml-cpp/pull/807
-[3] https://github.com/jbeder/yaml-cpp/issues/660
-
-diff --git a/include/yaml-cpp/depthguard.h b/include/yaml-cpp/depthguard.h
-new file mode 100644
-index 00000000..8ca61ac6
---- /dev/null
-+++ b/include/yaml-cpp/depthguard.h
-@@ -0,0 +1,77 @@
-+#ifndef DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000
-+#define DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000
-+
-+#if defined(_MSC_VER) ||                                            \
-+    (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
-+     (__GNUC__ >= 4))  // GCC supports "pragma once" correctly since 3.4
-+#pragma once
-+#endif
-+
-+#include "exceptions.h"
-+
-+namespace YAML {
-+
-+/**
-+ * @brief The DeepRecursion class
-+ *  An exception class which is thrown by DepthGuard. Ideally it should be
-+ * a member of DepthGuard. However, DepthGuard is a templated class which means
-+ * that any catch points would then need to know the template parameters. It is
-+ * simpler for clients to not have to know at the catch point what was the
-+ * maximum depth.
-+ */
-+class DeepRecursion : public ParserException {
-+public:
-+  virtual ~DeepRecursion() = default;
-+
-+  DeepRecursion(int depth, const Mark& mark_, const std::string& msg_);
-+
-+  // Returns the recursion depth when the exception was thrown
-+  int depth() const {
-+    return m_depth;
-+  }
-+
-+private:
-+  int m_depth = 0;
-+};
-+
-+/**
-+ * @brief The DepthGuard class
-+ *  DepthGuard takes a reference to an integer. It increments the integer upon
-+ * construction of DepthGuard and decrements the integer upon destruction.
-+ *
-+ * If the integer would be incremented past max_depth, then an exception is
-+ * thrown. This is ideally geared toward guarding against deep recursion.
-+ *
-+ * @param max_depth
-+ *  compile-time configurable maximum depth.
-+ */
-+template <int max_depth = 2000>
-+class DepthGuard final {
-+public:
-+  DepthGuard(int & depth_, const Mark& mark_, const std::string& msg_) : m_depth(depth_) {
-+    ++m_depth;
-+    if ( max_depth <= m_depth ) {
-+        throw DeepRecursion{m_depth, mark_, msg_};
-+    }
-+  }
-+
-+  DepthGuard(const DepthGuard & copy_ctor) = delete;
-+  DepthGuard(DepthGuard && move_ctor) = delete;
-+  DepthGuard & operator=(const DepthGuard & copy_assign) = delete;
-+  DepthGuard & operator=(DepthGuard && move_assign) = delete;
-+
-+  ~DepthGuard() {
-+    --m_depth;
-+  }
-+
-+  int current_depth() const {
-+    return m_depth;
-+  }
-+
-+private:
-+    int & m_depth;
-+};
-+
-+} // namespace YAML
-+
-+#endif // DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000
-diff --git a/src/depthguard.cpp b/src/depthguard.cpp
-new file mode 100644
-index 00000000..b88cd340
---- /dev/null
-+++ b/src/depthguard.cpp
-@@ -0,0 +1,10 @@
-+#include "yaml-cpp/depthguard.h"
-+
-+namespace YAML {
-+
-+DeepRecursion::DeepRecursion(int depth, const Mark& mark_, const std::string& msg_)
-+    : ParserException(mark_, msg_),
-+      m_depth(depth) {
-+}
-+
-+} // namespace YAML
-diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
-index 47e9e047..3e5638be 100644
---- a/src/singledocparser.cpp
-+++ b/src/singledocparser.cpp
-@@ -7,6 +7,7 @@
- #include "singledocparser.h"
- #include "tag.h"
- #include "token.h"
-+#include "yaml-cpp/depthguard.h"
- #include "yaml-cpp/emitterstyle.h"
- #include "yaml-cpp/eventhandler.h"
- #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
-@@ -47,6 +48,8 @@ void SingleDocParser::HandleDocument(EventHandler& eventHandler) {
- }
- 
- void SingleDocParser::HandleNode(EventHandler& eventHandler) {
-+  DepthGuard<2000> depthguard(depth, m_scanner.mark(), ErrorMsg::BAD_FILE);
-+
-   // an empty node *is* a possibility
-   if (m_scanner.empty()) {
-     eventHandler.OnNull(m_scanner.mark(), NullAnchor);
-diff --git a/src/singledocparser.h b/src/singledocparser.h
-index c8cfca9d..f484eb1f 100644
---- a/src/singledocparser.h
-+++ b/src/singledocparser.h
-@@ -15,6 +15,7 @@
- 
- namespace YAML {
- class CollectionStack;
-+template <int> class DepthGuard; // depthguard.h
- class EventHandler;
- class Node;
- class Scanner;
-@@ -55,6 +56,7 @@ class SingleDocParser {
-   anchor_t LookupAnchor(const Mark& mark, const std::string& name) const;
- 
-  private:
-+  int depth = 0;
-   Scanner& m_scanner;
-   const Directives& m_directives;
-   std::unique_ptr<CollectionStack> m_pCollectionStack;
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-gtest.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-gtest.patch
deleted file mode 100644
index 51f2a7b563ff..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-gtest.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 0a669d5..bc8bbdd 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -7,22 +7,7 @@ if(MSVC)
-     set(CMAKE_STATIC_LIBRARY_PREFIX "")
- endif()
- 
--ExternalProject_Add(
--	googletest_project
--	SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0"
--	INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/prefix"
--	CMAKE_ARGS
--		-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
--		-DBUILD_GMOCK=ON
--		-Dgtest_force_shared_crt=ON
--)
--
--add_library(gmock UNKNOWN IMPORTED)
--set_target_properties(gmock PROPERTIES
--    IMPORTED_LOCATION
--    ${PROJECT_BINARY_DIR}/test/prefix/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
--)
--
-+find_package(GTest REQUIRED CONFIG)
- find_package(Threads)
- 
- include_directories(SYSTEM "${PROJECT_BINARY_DIR}/test/prefix/include")
-@@ -56,14 +41,12 @@ set_target_properties(run-tests PROPERTIES
-     CXX_STANDARD_REQUIRED ON
- )
- 
--add_dependencies(run-tests googletest_project)
--
- set_target_properties(run-tests PROPERTIES
-     COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags} ${yaml_test_flags}"
- )
- target_link_libraries(run-tests
-     yaml-cpp
--    gmock
-+    GTest::gmock
-     ${CMAKE_THREAD_LIBS_INIT})
- 
- add_test(yaml-test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/run-tests)
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r3.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r3.ebuild
deleted file mode 100644
index 60efcffd321e..000000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp"
-SRC_URI="https://github.com/jbeder/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/0.6"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# test breaks build
-#RESTRICT="!test? ( test )"
-RESTRICT+="test"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-abi-breakage.patch"
-	"${FILESDIR}/${P}-CVE-2017-11692.patch"
-	"${FILESDIR}/${P}-fix-overflows.patch"
-)
-
-src_prepare() {
-	sed -i \
-		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
-		yaml-cpp.pc.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DYAML_BUILD_SHARED_LIBS=ON
-		-DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
-		-DYAML_CPP_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r4.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r4.ebuild
deleted file mode 100644
index 4992372c5365..000000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp"
-SRC_URI="https://github.com/jbeder/yaml-cpp/archive/${P}.tar.gz"
-S="${WORKDIR}/yaml-cpp-${P}"
-
-LICENSE="MIT"
-SLOT="0/0.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-abi-breakage.patch"
-	"${FILESDIR}/${P}-CVE-2017-11692.patch"
-	"${FILESDIR}/${P}-fix-overflows.patch"
-	"${FILESDIR}/${P}-gtest.patch"
-)
-
-src_prepare() {
-	sed -i \
-		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
-		yaml-cpp.pc.cmake || die
-	rm -r test/gtest-* || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DYAML_BUILD_SHARED_LIBS=ON
-		-DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
-		-DYAML_CPP_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
index 77f6bb3f5c1a..1f26291823b9 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS="cmake"
 inherit cmake-multilib
 
 DESCRIPTION="YAML parser and emitter in C++"