15 files changed, 34 insertions, 428 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index b5207dd09381..c436e72c1c41 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index e27601d298a7..920eb4815a59 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,8 +1,4 @@
 AUX asio-1.30.1-pkgconfig.patch 505 BLAKE2B d5c8d55444a47608f681dfbac9978edebb206b999aa7914b6d056bd18c252f001f58d53b587b2859c66495d6f8c3f74f252ddc9d7c25a8d37a394d843433f722 SHA512 b90f12054921913a6702863a731448e43635871e6fe1cb7baa80e5ad9487501704c634efe25592e661c999cafa61af2a4841add3221db28b1d29290eeea61446
-DIST asio-1-30-1.tar.gz 2842718 BLAKE2B b99f6e1ab03c4da9bc802e04d66b46ac2374f7da9f65dd98dd3da3cf1cf507548ae2645343a63378ab91d665fc6e2efe5c5262f33757e851973534e23291abb1 SHA512 6b5f41479e20500dff6c535d8e3b096e11815784923bb4c0f68f69be59c80d7ad99c7e0380a1de4dd350e6cc6a79315d4645378a9b8d70d9f8d28a17f1cc68af
-DIST asio-1.28.1.tar.bz2 3383257 BLAKE2B 9d98152a6cf8b0e2a807275092b23f6198d8175fd7260499be7561cea2e6723c1a8478107315b7163cdc31d6eecab552550393ab3b1cfb686dcb4157d1e91fe4 SHA512 fadd7748675743ba9110f873bf57f2400a5c9c0dc03c1d6cd7f0988bc70ccbbff6cb6140f5dd236d2d874fc82a6f216406e8892808e915aae5119fe9d95743de
 DIST asio-1.30.2.tar.bz2 3196850 BLAKE2B d902fda2338d9717bb8f2f5d43468c5d0b64591814c3ae3134350650f0dd97bf241287347d324b11d0e6993b1b44373df13305d736df09ad3375ce4976f5bb27 SHA512 2d26cdcfcc0c310e82ab502551b51d70fd95ba4628bd306929e78539299974fc14aa6ba27cf256f1df7a56539cb885012ba02a202ae17bf817ee6311308a795a
-EBUILD asio-1.28.1.ebuild 1286 BLAKE2B db9b0ef86a8433b1ee0e1fb751717b5251965293e33d0acf245c58000a9054884ea9c40cf9d2067c8e8fd83334decd017979f908778cc5125d3451633aca15d6 SHA512 7006dd621b1100aeb26022a4c09f94db4599931ae5518242e2a2b91196d48cf2ad7d7b14f1716cc70308da436bde2395730663be97496ad5a019dd70d3cbbf59
-EBUILD asio-1.30.1.ebuild 1089 BLAKE2B 7633d01a99d4e2aaf5e58bfab9d5e96a6565b4a259ee106072e79e68d9c7a5731a91689e08651d3fbc45699549df07e1dbd408be96c8eeaf79ec6ff2c78c81a0 SHA512 22e126155245e4581041b151da10409a25ca2adc2b94c331ffde6e572c700d7d0cc778aef716bf95845464af109ce59b5f190e6273a10dece1ca02054fa0c060
 EBUILD asio-1.30.2.ebuild 1230 BLAKE2B e5eb0ea0cfd08f955c58be83e780e8afac0627ea53acce55e15875172ddf63055e5c158845f13b9efd2f4fad7d09a39d82cc9d2a104dea2d3e839268e86903fc SHA512 b68d686f881d4a6d8aba6d7cfef391648102a9765da3d9ca9728be1f6e430b9d835f05b71d8375a794125e124ea6dacb0f725d60aa8e2d32a0114f68a827fb04
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.28.1.ebuild b/dev-cpp/asio/asio-1.28.1.ebuild
deleted file mode 100644
index d0dd31b2e4c3..000000000000
--- a/dev-cpp/asio/asio-1.28.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/boost
-		dev-libs/openssl
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_configure() {
-	# By default it puts .pc to libdir
-	econf --with-pkgconfigdir="${EPREFIX}/usr/share/pkgconfig"
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-
-		# Make links to the example .cpp files work
-		# https://bugs.gentoo.org/828648
-		if use doc; then
-			dosym ../examples /usr/share/doc/${PF}/src/examples
-		fi
-	fi
-}
diff --git a/dev-cpp/asio/asio-1.30.1.ebuild b/dev-cpp/asio/asio-1.30.1.ebuild
deleted file mode 100644
index 1ce3605ab0aa..000000000000
--- a/dev-cpp/asio/asio-1.30.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-${PV//./-}.tar.gz"
-S="${WORKDIR}/asio-asio-${PV//./-}/asio"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/boost
-		dev-libs/openssl
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/asio-1.30.1-pkgconfig.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/cctz/Manifest b/dev-cpp/cctz/Manifest
index 046dfd99c128..a416cb6fb0b4 100644
--- a/dev-cpp/cctz/Manifest
+++ b/dev-cpp/cctz/Manifest
@@ -1,5 +1,3 @@
-DIST cctz-2.3_p20230228.tar.gz 218332 BLAKE2B c29f2acf12d73387faf0087ef94b8624b5eefa2cf3136e0003e59a6a89b8a73f6de97f1962031ca1b1b1f4f6e888a363314aa1e160ad54c618189ad4a7d8f60e SHA512 ab6a103a6073a8169cd08587d2415dcab6c6e6c005b4b67fb69cc718b8b73a1331c5782b27aa4924aa5bdedc1563e31aa3ac76196078c50a13773d35d8df993b
 DIST cctz-2.4.tar.gz 222831 BLAKE2B c232b27cbfe5e45b6e1c51dd13c9a35c4a2e84b5d3e65ba6b4afb7683cac967a3b409382664a55d58ac67e53a1cf3dec9d97ecd59c5e2180c0eae4f71462fe33 SHA512 6d50fe5263b66f93bc3f9aee0da395352d0e95187e6a761afd1b82a461c127823fe93e06139e9d8989f24875b70de3058aab6e66639b408c7930f117e1815e5e
-EBUILD cctz-2.3_p20230228.ebuild 660 BLAKE2B d18673cb0a17df2ea1c190dcfa582dcc897aca3905fc26fc78d978373fc9b04d78ff22f467b2506de1f4dc85663e72ca272dd4c9b4b16a9807077c84a9e4868c SHA512 eea3dcd221f1613180003b22d0b39ea1a7218e1365f35757de2a8c45c51ded5e033f56b37e0563efb261eab509f7de3ff0f934d2762a6e0e582024698f2f8af1
 EBUILD cctz-2.4.ebuild 609 BLAKE2B dfe3184e5f809c5beeebf658468af95b3c9e336bf57602653e60c269946c678557eda1e6d839298c71dd3a97aee5bd64d72e860d654f1ba1c1bd7bef2dafa0d3 SHA512 714c0a7d9c450d1b0a4c7f102e864e630401c6cdaa18877b9625a25098fd63905afef7e4ac3c17cef867f6749518ee38a43f87c80eddd25182ce789d42f51e73
 MISC metadata.xml 512 BLAKE2B 77ff30bded40acd62952b195d6a079ca2e490aa17a02dd83e777a7e5fe87a70dfbac9da7107447bd0dcee19dc9ed7bca3169e165ab1ce7c18d45d2403b9dfd5d SHA512 1cfa31b17ac83e5e60494d85726e9a44d0d090d9d7e0ab351e7a939ff7db63b6ab960a1d18f4750b29933c5b079890be90aea3945be6b4b406fa7e27df2ca067
diff --git a/dev-cpp/cctz/cctz-2.3_p20230228.ebuild b/dev-cpp/cctz/cctz-2.3_p20230228.ebuild
deleted file mode 100644
index 448b7f921122..000000000000
--- a/dev-cpp/cctz/cctz-2.3_p20230228.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ library for dealing with time zones and time conversion"
-HOMEPAGE="https://github.com/google/cctz"
-MY_COMMIT="3803b96130934f48b1fc1d47c5da5f542949c4b0"
-SRC_URI="https://github.com/google/cctz/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_BENCHMARK=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index a7becbde7553..eb9374690096 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,7 +1,9 @@
 DIST rapidfuzz-cpp-3.2.0.gh.tar.gz 311140 BLAKE2B 334626f70a94d81168f24f64c2cf1fb0062581478cbc9b7506cf289c1f4a4007a0129918eb588584c4bf6ec33580ca7e85fe91725f9ddc8cd54f4e874551b381 SHA512 cf306fc4a6c0b6fc1a1c3b0b235aa54588bd87a5d07f96c1bc9711a08159ca71580b5958e66e8b4358d34e522041934903079aabe6e5a450cece7d6db6edcbe0
 DIST rapidfuzz-cpp-3.3.0.gh.tar.gz 314124 BLAKE2B 6a8d10dbd627adce2c00e02394265ec6001f5f16ee11a8948972f42e85f5ae2f2ebc50a11338659f29dd826f6988577bc4bcbd1e69e3b54545263e7c715db970 SHA512 acc61e294e3aa60f6076e0795622d0cff095bf3f141954587a7934f63a85f3ea08ba8af1accea445d3a990f9214ebd50f8f12a4d0ada88f1cc4b620c374ce153
 DIST rapidfuzz-cpp-3.3.1.gh.tar.gz 314391 BLAKE2B 27a8f0eed9a26a3d3342f9efc3ca5e9f6bbdec8bebdf99cf2ebb14659b68106e588fe7d2e6e3ce5f0caaae7070d83915c210111889d1a2315780c2dd32419b6f SHA512 c4b34d45b11f71db0cb5ce781b5fe9e81dde7809e9b17aa37138a862afca2b8a15631bf289e592f1fb9f012450c871b2b967353a6f0996783fa59b8ac6521e74
+DIST rapidfuzz-cpp-3.3.2.gh.tar.gz 314657 BLAKE2B edfc758e9cec932bd704a07c1f05d896b3c6df1f5599c11bf731e01156091cf3702b6266427e58cf656b8903748cebfa5d7801aa202976d635a03af40849d32a SHA512 4befcf9a22e2f478a93fb3e8f6a1b954071c707ee339f2d0a0e0367d24eb35670213b98e48d0d3956f50e4c7554ce326e4dd64470d706afafe4d2252f216ea48
 EBUILD rapidfuzz-cpp-3.2.0.ebuild 631 BLAKE2B 3b8991683cd168d55a6065ac7fb63569334ddd0adbb4289e382e07a4b56b8a711b7fb0403d66326377c2fc8c28f246efc8c97af967533df051a747a8cd685039 SHA512 3975cade4b3935c348e04d477f027e9644e3ed53a7a521ac7f8f32416a5158fd0ff17bd3e1cc7b2fdc312b028f0a2e7d6a421ea6abeda2231715d64eab25e86f
 EBUILD rapidfuzz-cpp-3.3.0.ebuild 639 BLAKE2B 3b47accddfd33040e5f4f79d067dc4be3058168fd5e88f7bbc89c80363f0930dd6e57a81a016640d5f04d693f3c84587765c1a55230c57916478d55451e6417e SHA512 db191807bc66ff3cf543d9e03beadd2a8a6db4e379ee85439c6e7630531037441ed558c3caf6ffdd65dcaafeb46e45caa348b37690802f8baf88c51b286acb1c
 EBUILD rapidfuzz-cpp-3.3.1.ebuild 632 BLAKE2B b4051390ebdb0e39fbcd90696dba329de88490ba97a084622866128003a67c349f16da87c060c470b7aa6962e5650eae612b68f460467c02703a37b300a754d5 SHA512 3efe2a9791089edd16802341af61501438091620f1dd2726ba21138c83fec4b5a0b715f53e405baf23b49c71ee321a4e2a58a1505d229c6997811e2205b97992
+EBUILD rapidfuzz-cpp-3.3.2.ebuild 638 BLAKE2B 0dff042eec1c4db882f5c7aaae6dabb1d6f525ca41ed1b3631bcd86f0d6cc16836765c2d66412c565feb0fb50a06dbec6e834d11acc7bf86fedff3caedfea75e SHA512 5bedb9c61f1db3a8b8afa8bbd499ab6f8b1966c041ff55f1a1bd9bbe00a768d79bb37a8725c36a168f60ad8febd4cca85c03701ad2a3062f170e2f9856b88f32
 MISC metadata.xml 336 BLAKE2B e425e950b6a0524afb6b996f846fdda73310168d6415a67570ac01a75a2c9335b4f5785bda271a2cf88bf5d7e3708582d958d1fa658d12f36fc5455df9763573 SHA512 868c16a2c2b178fa38e65568aeacf5b96a8d4ebf4521094a0da106194de0acefd017d5f7c827d89a9711c6b80d5603a01d9e15ba9b167c55954f3d653ccc6ed5
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.2.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.2.ebuild
new file mode 100644
index 000000000000..d86bd803fa44
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/rapidfuzz/rapidfuzz-cpp/"
+SRC_URI="
+	https://github.com/rapidfuzz/rapidfuzz-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-2
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
index b02b3d8f07bb..d0e05b5aee94 100644
--- a/dev-cpp/sol2/Manifest
+++ b/dev-cpp/sol2/Manifest
@@ -6,5 +6,4 @@ AUX sol2-3.3.0-werror.patch 854 BLAKE2B 4ba8febe3e225a904501a61d0bf7bb5a8539b1c8
 AUX sol2-3.3.1-fix-emplace.patch 660 BLAKE2B b36439910c10c2bb3c86d5911c3aaf20906e411d7fddc40ad2c201c685cf8feea4c49e4e5835396c4d6d1447ea672b55e2f55e7291e74d0eb7f4add9bab7e91f SHA512 3563d2d272bb5d281c4d9875b5ec0cc94548adc0b3ca58f648a20e26e0d180fbb0b35e21d3b6a0ca51808b4744aff4796ef599c6cd17bcc44697e20ff951fb61
 DIST sol2-3.3.1.tar.gz 8453954 BLAKE2B f9fced4f001a5f681598e45bf74cdf064f655c950be5b91789d2bf66c0180b5048610d3d4416c024a07db11d41fceaee786800c5ca1412811cbc1a449a894a9e SHA512 4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd
 EBUILD sol2-3.3.1-r1.ebuild 1404 BLAKE2B f4b7ca3ba02f29728b5ecf0ddcaec5722d07a185ce780812456b3ba0a9a69ed92062622ddf9245ff2b8f834a9f5a2597f89fd6d24bcdc342ecd3ee9b5d77c39f SHA512 69792db4cce41f83202a82dfe1b938ae6fcc5d82a2c42a6dcab9488396c03b3f7aa46f0b641541ed0eeefcda069922b146575165d411f53e2a1366058d6ddb6f
-EBUILD sol2-3.3.1.ebuild 1360 BLAKE2B a0a619ce293f9c658142ba6cac3a28da9359ca658391be51ac7049a8e65e81a2a805654426601bc9503c389efa2e00a11163e66a382d8bb9017baf6ecdef332d SHA512 de9b08a6c6c557f2acc702b3aea402a9c094f441e79ffa8f13a1f05cfbb844c3420b901e17a98d23480047956d65d7435fd7548fa765736138a61510bbb7ee3c
 MISC metadata.xml 594 BLAKE2B 911a1123a653118d9c19c3ff1a42a979a696d034500eda29a18c72e6f89bcc2f7c4d28977c76a40f61b79649c3f4aa63439cda96311e2cdd2bc9495ad1a85db1 SHA512 5c8252373ee8bdefe9b2863df048616beec0d00dcf1cd7845302721f78158db48729d9ab412dbcf4bed49130518acd2071ca3e5880488a882117ec5728e26b9a
diff --git a/dev-cpp/sol2/sol2-3.3.1.ebuild b/dev-cpp/sol2/sol2-3.3.1.ebuild
deleted file mode 100644
index 585aae692d6f..000000000000
--- a/dev-cpp/sol2/sol2-3.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-inherit cmake lua
-
-DESCRIPTION="Header-only C++ <-> Lua API wrapper"
-HOMEPAGE="https://github.com/ThePhD/sol2"
-SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	${LUA_DEPS}
-	test? (
-		>=dev-cpp/catch-3
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/sol2-3.3.0-werror.patch
-	"${FILESDIR}"/sol2-3.2.2-luajit-pkgconf.patch
-	"${FILESDIR}"/sol2-3.3.0-catch-depend.patch
-	"${FILESDIR}"/sol2-3.3.0-cmake-dir.patch
-	"${FILESDIR}"/sol2-3.3.0-dont-install-tests.patch
-)
-
-src_configure() {
-	sol2_configure_wrapper() {
-		local mycmakeargs=(
-			-DSOL2_BUILD_LUA=no
-			-DSOL2_TESTS=$(usex test)
-			-DSOL2_LUA_VERSION="${ELUA}"
-		)
-		cmake_src_configure
-	}
-	lua_foreach_impl sol2_configure_wrapper
-}
-
-src_compile() {
-	lua_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	sol2_test_wrapper() {
-		if [[ ${ELUA} == luajit ]]; then
-			einfo "Skipping test due to https://github.com/ThePhD/sol2/issues/1221"
-		else
-			cmake_src_test
-		fi
-	}
-	lua_foreach_impl sol2_test_wrapper
-}
-
-src_install() {
-	lua_foreach_impl cmake_src_install
-}
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index ac5c6276e45e..f9158d465a33 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,11 +1,6 @@
-AUX yaml-cpp-0.7.0-cmake-paths.patch 4037 BLAKE2B d8582bd324d159114545619de88fd4fa469cb6aac6fd0047309366760b33a216841e2103e8023d1167bb648b32fcd2905d7be21a9b703e3edda0b4eba8f512b1 SHA512 c9059db39ab4faa3864c3b58c60e1c8b840aaef48c10bee30677f8e5feed97c24b19070ca4907df89332c317af82190f552db64b91406ebe169392561ae14488
-AUX yaml-cpp-0.7.0-gtest.patch 1081 BLAKE2B 7fe415662ce9eb205f6f1c42df9885ae5817bf0a7aa7e8e7abd296338b0fb0fe6c31733ad57fdc6d97b566fd82f494b604ad250860bf9d06cf6cbc9901ad9bf6 SHA512 1c97aaae36205e810b76c610bb334888d044391eed96b653c186b64822bf38e4ab4aef29acad418c9063d4752c665a0dddcdbef87fdd855c0a416950c52ac443
-AUX yaml-cpp-0.7.0-install-paths.patch 1062 BLAKE2B c76f9f34e7f20954a2f2f0582f5d124ec22af2c91dccc19b4c7891b19d14bc2aff7d61f93b20a606c58397c70f9db2f35f10c6645869253a5bedd50d9e65eaa1 SHA512 9d14416fdb8111027324ffeae3856590348f9497444ecae7a2091d3211e17fe61fdd66932b98c119cf54551c551aa8f6a698a2c5a97cb559cf6e3a54f25e07cb
 AUX yaml-cpp-0.8.0-gcc13.patch 2242 BLAKE2B 8b5b99e86a578310dd020237a82150dd0ae47dc009cff2f423ec6248c77635384c6e4ff0620a446858ec12223ea3148a006a76fd9c5a02c28cf29c0969b19dfd SHA512 429ca92104b6203695970e7bc79ed452c0dd6a02b98beb2e640a89184d10f1daedf10a5f7697942036317225c52a054c0916bfe1c54635b34b83721f72a31f6d
 AUX yaml-cpp-0.8.0-gtest.patch 954 BLAKE2B 916365624688a62d2fa1f5dcbe62e65c872439efd8172a9898457797ce857003c31d8de082fe87ee9a47027f4021bc87ded88e7d4e40ed87e2da2a2333cc6d62 SHA512 781451e4477c22f059bb22b59b253bc2c2d4c0668bb00b44867d79a6d0e87f95abcfa11d35bcbf0e7aacc94b9185dfbef814018d7a58df00d93cd13ca0df8edc
 AUX yaml-cpp-0.8.0-include-cstdint.patch 1090 BLAKE2B 0415488b047454dfbbf962b6e1f135c277e7c4b1cce30b76045c611d3cee9dcf6f701c8ff290ff3943442dd1d3c7ec8d5547328a91dbced7d93530d4dcb9703f SHA512 1e376b6ba5b4f5673271bb0790768ca8512efe44d821940c7bc58539d08f118bc30ebaa64a137bf7ba77987f6c5596706dcf99a9b4a58199aa0e4f7aa2969b52
-DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B 69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368 SHA512 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
 DIST yaml-cpp-0.8.0.gh.tar.gz 1017151 BLAKE2B 5fd3eaec06bc04215afd2aa14ae8cd35f829f700f104931a51dbd8bb22e4e87f5cd5f2f975d3a2f464226d7165d3d106aa17bc7eab8a812c2545d2212011cf11 SHA512 aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e
-EBUILD yaml-cpp-0.7.0-r2.ebuild 857 BLAKE2B 63735ee4c253e6b04cf7c2c9b0725cf4aad80564eca30ca2e80360e8fa4d1263d95af7260cfa49c182d1109b13dd1ef5e754d1e6967f6414d9745ecf683b71b9 SHA512 7308409215a0e874fe4d2a2a6b8a8ccbfba8b4617a3852d50d40ca70cd2394fde8c1b8e1224136018aa043aecf3dbb6bc515e1ac90517c448c904a6315944249
 EBUILD yaml-cpp-0.8.0.ebuild 886 BLAKE2B 3201a330fa6b5de80fbc96216b38ff4f52a38ba64ca652d0c002a750c8f343d6b518d19b8f621a56c5d8a95378ebb78306050a7da5072030110d7c52feb66755 SHA512 f9f2ae48d5fc6f5a2338a1582999e7db9c9cb1a2cb22880db1b5f845e1ca36e29a17353732f0fa64057d773e211a53215097d905be947998209066033d422e74
 MISC metadata.xml 484 BLAKE2B e973aef681bed7de47725bab49d2acfe809ad73c97eea709bec9d5bb9d720f89bc222ff77f09b90780b2a14d6a094f9ddd24a4f15d6ad88b94060d240c5836d8 SHA512 612604d3b0c2edd157c4a55ae22d92e174cdcbc17532de7f2888b9579b4b028da2214e6d756864dfffdeca129f32e5db2241308d326c6ff21044f48bf2d87d73
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
deleted file mode 100644
index 5ad9e46dbcb2..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From d5d68286cdd983f99f88b6141a3c34d3bf633d98 Mon Sep 17 00:00:00 2001
-From: Felix Schwitzer <flx107809@gmail.com>
-Date: Fri, 1 Apr 2022 05:26:47 +0200
-Subject: [PATCH] Fix CMake export files (#1077)
-
-After configuring the file `yaml-cpp-config.cmake.in`, the result ends up with
-empty variables.  (see also the discussion in #774).
-
-Rework this file and the call to `configure_package_config_file` according the
-cmake documentation
-(https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file)
-to overcome this issue and allow a simple `find_package` after install.
-
-As there was some discussion about the place where to install the
-`yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into
-an extra variable to make it easier changing this location in the future.
-
-Also untabify CMakeLists.txt in some places to align with the other code parts in this file.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,10 +127,16 @@ set_target_properties(yaml-cpp PROPERTIES
-   PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
-   DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
- 
-+# FIXME(felix2012): A more common place for the cmake export would be
-+# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
-+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+set(EXPORT_TARGETS yaml-cpp)
- configure_package_config_file(
-   "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
-   "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
--  INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+  INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}"
-+  PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR)
-+unset(EXPORT_TARGETS)
- 
- write_basic_package_version_file(
-   "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-@@ -139,30 +145,31 @@ write_basic_package_version_file(
- configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY)
- 
- if (YAML_CPP_INSTALL)
--	install(TARGETS yaml-cpp
-+  install(TARGETS yaml-cpp
-     EXPORT yaml-cpp-targets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--	install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
-+  install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
-     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
--		FILES_MATCHING PATTERN "*.h")
-+                FILES_MATCHING PATTERN "*.h")
-   install(EXPORT yaml-cpp-targets
--    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
--	install(FILES
--		"${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
--		"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
--    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+    DESTINATION "${CONFIG_EXPORT_DIR}")
-+  install(FILES
-+      "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
-+      "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-+    DESTINATION "${CONFIG_EXPORT_DIR}")
-   install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
-     DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
- endif()
-+unset(CONFIG_EXPORT_DIR)
- 
- if(YAML_CPP_BUILD_TESTS)
--	add_subdirectory(test)
-+  add_subdirectory(test)
- endif()
- 
- if(YAML_CPP_BUILD_TOOLS)
--	add_subdirectory(util)
-+  add_subdirectory(util)
- endif()
- 
- if (YAML_CPP_CLANG_FORMAT_EXE)
---- a/yaml-cpp-config.cmake.in
-+++ b/yaml-cpp-config.cmake.in
-@@ -3,12 +3,14 @@
- #  YAML_CPP_INCLUDE_DIR - include directory
- #  YAML_CPP_LIBRARIES    - libraries to link against
- 
--# Compute paths
--get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
--set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@")
-+@PACKAGE_INIT@
-+
-+set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
- 
- # Our library dependencies (contains definitions for IMPORTED targets)
--include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake")
-+include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake)
- 
- # These are IMPORTED targets created by yaml-cpp-targets.cmake
- set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@")
-+
-+check_required_components(@EXPORT_TARGETS@)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
deleted file mode 100644
index bd05fccca373..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 30fbefe6102da12e8d4d132aa4af2e24bfda9bfb Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Sat, 17 Sep 2022 12:25:24 +0300
-Subject: [PATCH] Use external gtest dependency
-
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -1,15 +1,10 @@
- find_package(Threads REQUIRED)
-+find_package(GTest REQUIRED CONFIG)
- 
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
- set(BUILD_MOCK ON CACHE BOOL "" FORCE)
- set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
- 
--add_subdirectory(
--  "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0"
--  "${CMAKE_CURRENT_BINARY_DIR}/prefix")
--
--include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include")
--
- set(test-new-api-pattern "new-api/*.cpp")
- set(test-source-pattern "*.cpp" "integration/*.cpp" "node/*.cpp")
- if (CMAKE_VERSION VERSION_GREATER 3.11)
-@@ -38,7 +33,7 @@ target_link_libraries(yaml-cpp-tests
-   PRIVATE
-     Threads::Threads
-     yaml-cpp
--    gmock)
-+    GTest::gmock)
- 
- set_property(TARGET yaml-cpp-tests PROPERTY CXX_STANDARD_REQUIRED ON)
- if (NOT DEFINED CMAKE_CXX_STANDARD)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch
deleted file mode 100644
index 622c0d7f148f..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f5b5ba19ece906252cfc90b7cd51035e21c7118 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Sat, 17 Sep 2022 12:07:46 +0300
-Subject: [PATCH] Fix pkg-config file install destination
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,7 +129,7 @@ set_target_properties(yaml-cpp PROPERTIES
- 
- # FIXME(felix2012): A more common place for the cmake export would be
- # `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
--set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp")
- set(EXPORT_TARGETS yaml-cpp)
- configure_package_config_file(
-   "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
-@@ -160,7 +160,7 @@ if (YAML_CPP_INSTALL)
-       "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-     DESTINATION "${CONFIG_EXPORT_DIR}")
-   install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
--    DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- endif()
- unset(CONFIG_EXPORT_DIR)
- 
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild
deleted file mode 100644
index 91e20995e963..000000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.7"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gtest.patch"
-	"${FILESDIR}/${P}-cmake-paths.patch"
-	"${FILESDIR}/${P}-install-paths.patch"
-)
-
-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
-}