gentoo resync : 08.10.2021

19 files changed, 118 insertions, 463 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a99e5b881536..cbd85f3fbc10 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 9fc0818dde7a..2f31c7132a4a 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -5,5 +5,5 @@ DIST asio-1.19.2.tar.bz2 1842597 BLAKE2B b2236c33432984ab660eba4c93be32374bb49f6
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 EBUILD asio-1.17.0.ebuild 1121 BLAKE2B b39f6f2a7060601d146fa3146fc0d487c894cf7ac2a4afb2d6b8370692944853f976b16e70a6e30aa3292f6e5b811a0718b503c6c061b49d63dbe87daac6ed46 SHA512 dd346b7cf8b7ff07ae8ddd387065350d1aefc938bb9dc20ab2c0af7946bb455cb5d1694aa064ca4e601ad477099d4ff96b729de524769510a292577ae27fb40e
 EBUILD asio-1.19.1.ebuild 1128 BLAKE2B 51a905624608b573a9bf246531d1c7d53f0fd685c2b02440b5c9493b2969e7ca418b323c8cf70c9f8caa526412f5f7a2c186520554dfc1d9b562d09f3814e20e SHA512 f08b8c89cd36ca32f6c9f58aa72c68abf9962495a6953f36c7df80f6c149099d0540c1dd26b91188a8e1051ac2380e0a054ced86332e3a659599e74c5b0a6bfa
-EBUILD asio-1.19.2.ebuild 934 BLAKE2B 48f6601869e1d179cf933bcf1ffce15dc721b1a4c1efb2de5ac63383f8e5c5dd6e76bf6097d97e22c7978de221a9310a600efa7f4eaa5b8b1050cbda21fb48e4 SHA512 86879cfb14171880cab4a51cbfe28db7e31e21aaf516f4bde8e6129795bf26ea40463bcee3f9cdc2a6da9fb9ad50a440e19e559976c93719fb462ff022b4d49c
+EBUILD asio-1.19.2.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.19.2.ebuild b/dev-cpp/asio/asio-1.19.2.ebuild
index 24f40dbd2986..0e025f305eee 100644
--- a/dev-cpp/asio/asio-1.19.2.ebuild
+++ b/dev-cpp/asio/asio-1.19.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 9c33f3f9b65a..9bf8ab0fd082 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -4,5 +4,5 @@ AUX benchmark-1.6.0-versioned_docdir.patch 303 BLAKE2B 7cc8c4d61bcbdefaef17cebf1
 DIST benchmark-1.5.6.tar.gz 177911 BLAKE2B ea4e98cb98471b2b8e2371109b96017bc483459dc924deaa1d9770b065de946ea2d69ca36098c27283f15370699f2475448af1e205cfca3d9c64408f08c202a9 SHA512 b3c1fd4407d660456ae51abd7c427460a2c7b029ab6344e21bb61d3ec84e3b60638b7a719655aa04fb9ca639b6371e553e9de18539aca8dd38c361b4c6522538
 DIST benchmark-1.6.0.tar.gz 178527 BLAKE2B b31fdd2a00d80c63102ea81ed9d1392f243e0d6d67ebf7d1e1a3d20cf7702acc68a3ddd3edd6ccbcfe76c01438c492c15f4d0146689587ccf8a3dccd6043ed11 SHA512 83788f64322067cedca4e459dd2b4117a80d3dc480e1ce0a4d9c323827e13cb1969889a6049cd487dc28ecb0ff52c868a73492c738283ee1236e527b0ca8b11d
 EBUILD benchmark-1.5.6.ebuild 796 BLAKE2B 0e64c039c1cf3e9c69515515b91fd5c5b72e7c712f97787a96bc84abec53376ffaecf27ea632614585e7035aa4583ab927405e0acfe69eb7e0e7934cc98c37ba SHA512 6ad73f38dab12b2646fe4e52d3cade4a04ff152591ebeee7e2addc12882fae9b4308b8be4fb80681f34bba73ec6d367000179d31484b4eba35e51033c707ee46
-EBUILD benchmark-1.6.0.ebuild 894 BLAKE2B 233b874bd7fdef833606eedb7753107cfeeef11c27c70b9b7c5f74682f82423e678546233487a2d0e6c11323dd92e47edef9f266c1d2f334efa1c5ecff6db9d5 SHA512 76e4cf6af0fdc787708751c5e4082fa261fcbbffabeba50f5e84fb1379cca2b2348445b99bc84ca0b75bed17a94fa3fb6f470f469697752ef23a788a82405d5d
+EBUILD benchmark-1.6.0.ebuild 899 BLAKE2B e991b00dbe8ecbcddc4076d594ef430798ac23fc9e2550f6e054499999c03a4eaa6f4e78c1f5a232f4e390bf2137c01f9c4819d5d1c1f5c2946dead2cd33afaf SHA512 8b4b6a16d146cdfd1c70491482e996dffcfae68179f9da2e283055c67fa9bfdde06bb07b3fabb574c704748d4dc8a7efbcd885b33487b8b4f0578e5510273aff
 MISC metadata.xml 468 BLAKE2B 1cccded2d58d45121482aedc04732f83d8e1b034fa34eb037ae2e68922c6394b6ce7ad019cca64b0c2496e4328b124a9f06d9b8bba037e36e6f46f716acee9cf SHA512 c7a6087c885a8587799d32fcba2abdef1bac08eb7f6cb7ec195280b0464c962acdfe92cba1ca137bb049d895962bcbecc97b53818a24b84757263f90c345e094
diff --git a/dev-cpp/benchmark/benchmark-1.6.0.ebuild b/dev-cpp/benchmark/benchmark-1.6.0.ebuild
index 1356d6aa2270..604dda9d01d5 100644
--- a/dev-cpp/benchmark/benchmark-1.6.0.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.6.0.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 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
index 29e1dc89930b..776de02f4595 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1,6 +1,3 @@
-AUX cpp-taskflow-3.0.0-gnuinstalldir.patch 3340 BLAKE2B 2e36ea275ff93b12189e14d9a9e4a7141fb0b183ab68ce8fd76336feee34150a8f36d07bfd0eee41df04654968ae4c8de2e45df0d5de73e7e5b49f36de61a1b8 SHA512 f42539ec5612920112f7e56b7300cdee2efd8c6e93167d410b66bdacd6c827c09220162e6217fb22163ed152a364f68f16c9f255157436cc9086efcfb67ad722
-DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e
 DIST cpp-taskflow-3.2.0.tar.gz 79152157 BLAKE2B 03b4b1cf772c9dec4557a706c7872de95312d4e72ec7dcef1accfd1d5eaf470e60440d75ea0c993ab494ef460dc44639719ea1732fa92c54d64dde31b90b9224 SHA512 e30d95b69f64524c9b06cf7442236998f91b1083818f06439888d78d5a1b988bc952c02fd0ec88114283cbe6c31a7bbfe810a7114998f4b5f60c4cff921bb0fa
-EBUILD cpp-taskflow-3.0.0.ebuild 692 BLAKE2B 403c306382a21a930d1de638ae95fca69ea983a3a69eb530e35b0e89a4905b16cc2bd639df2bcfdbba6d04f855d2eb178faebbe2411ea443b66d2aa78ef7c68f SHA512 2ab540db996797b44c9fbf64a6a84f7cdf33b51243f822f4b4b0a42511ccb603fecaae63253b990701324e47824e572d1c448c22328653abf22afc59cc716d01
 EBUILD cpp-taskflow-3.2.0.ebuild 640 BLAKE2B d3b0cb72bb472fb33746ebaf30b754a8892ef1c0607009a5c0adc0a8700d1102a8597ad21950bb454d75c073c19f0e4906db89b2e82d3dde62096646c8a42ebd SHA512 12d15a698591a04705f905593e722030e61a932910e5f4833a653815894893eb239eb0ff46b15163138ea356396e035256fb448f8045ba53b6e7a4ae1d632a7e
 MISC metadata.xml 663 BLAKE2B d9364c3cb5391e8b95488f7016d1dcf51400970c8ea0737549c91ca3ec4ac1132c3c34d76bc2aaefe80dbef2887ae28e150d8d396d297c19fc2d45b7f827417e SHA512 054c5840f22ed9ecb67c85a7ca78898ab7897de5bb254ab61a602ec1031e92cde398525c9c97c59d0b66a57f3fab5f8acb0efa511c958a6754dcf7f2c0c77359
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
deleted file mode 100644
index ee708046e377..000000000000
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Modern C++ Parallel Task Programming"
-HOMEPAGE="https://cpp-taskflow.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${P}-gnuinstalldir.patch )
-
-S="${WORKDIR}/taskflow-${PV}"
-HTML_DOCS=( docs/. )
-
-src_configure() {
-	# TODO: enable CUDA via USE flag
-	local mycmakeargs=(
-		-DTF_BUILD_CUDA=OFF
-		-DTF_BUILD_EXAMPLES=$(usex examples)
-		-DTF_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch
deleted file mode 100644
index 8e974f2f8269..000000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://github.com/taskflow/taskflow/pull/280
-Author: David Seifert <soap@gentoo.org>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,6 +29,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
- # Include additional language check
- include(CheckLanguage)
- 
-+# Adhere to GNU conventions
-+include(GNUInstallDirs)
-+
- # Compiler vendors
- ## g++
- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-@@ -244,6 +247,8 @@ message(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR})
- message(STATUS "CMAKE_CURRENT_LIST_DIR: " ${CMAKE_CURRENT_LIST_DIR})
- message(STATUS "CMAKE_EXE_LINKER_FLAGS: " ${CMAKE_EXE_LINKER_FLAGS})
- message(STATUS "CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX})
-+message(STATUS "CMAKE_INSTALL_FULL_INCLUDEDIR: " ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-+message(STATUS "CMAKE_INSTALL_FULL_LIBDIR: " ${CMAKE_INSTALL_FULL_LIBDIR})
- message(STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH})
- message(STATUS "CMAKE_PREFIX_PATH: " ${CMAKE_PREFIX_PATH})
- message(STATUS "TF_BUILD_BENCHMARKS: " ${TF_BUILD_BENCHMARKS})
-@@ -252,8 +257,6 @@ message(STATUS "TF_BUILD_SYCL: " ${TF_BUILD_SYCL})
- message(STATUS "TF_BUILD_TESTS: " ${TF_BUILD_TESTS})
- message(STATUS "TF_BUILD_EXAMPLES: " ${TF_BUILD_EXAMPLES})
- message(STATUS "TF_BUILD_PROFILER: " ${TF_BUILD_PROFILER})
--message(STATUS "TF_INC_INSTALL_DIR: " ${TF_INC_INSTALL_DIR})
--message(STATUS "TF_LIB_INSTALL_DIR: " ${TF_LIB_INSTALL_DIR})
- message(STATUS "TF_UTEST_DIR: " ${TF_UTEST_DIR})
- message(STATUS "TF_EXAMPLE_DIR: " ${TF_EXAMPLE_DIR})
- message(STATUS "TF_BENCHMARK_DIR: " ${TF_BENCHMARK_DIR})
-@@ -334,7 +337,7 @@ endif(TF_BUILD_BENCHMARKS)
- # -----------------------------------------------------------------------------
- 
- # install header
--install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${TF_INC_INSTALL_DIR})
-+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- # export target
- set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME ${PROJECT_NAME})
-@@ -350,7 +353,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
- install(
-   EXPORT ${PROJECT_NAME}Targets 
-   NAMESPACE ${PROJECT_NAME}:: 
--  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
- )
- 
- # set up config
-@@ -359,8 +362,8 @@ include(CMakePackageConfigHelpers)
- configure_package_config_file(
-   ${PROJECT_NAME}Config.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
--  PATH_VARS TF_INC_INSTALL_DIR
-+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR
- )
- 
- write_basic_package_version_file(
-@@ -371,6 +374,6 @@ write_basic_package_version_file(
- install(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-         ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
-+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
- )
- 
---- a/TaskflowConfig.cmake.in
-+++ b/TaskflowConfig.cmake.in
-@@ -1,6 +1,6 @@
- @PACKAGE_INIT@
- 
--set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_TF_INC_INSTALL_DIR@")
-+set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
- 
- include(CMakeFindDependencyMacro)
- find_dependency(Threads)
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 0d6d6fe90cc2..69d1b775f76d 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -2,6 +2,8 @@ AUX eigen-3.3.7-gentoo-cmake.patch 910 BLAKE2B 9cad2b9c54fb1299dfe45f9a94a427d1c
 AUX eigen-3.3.9-max-macro.patch 476 BLAKE2B aa2e810a7be5a934a8bf5844b7e24633ab8f6b6a58388d6d9cb9b4b925f68311443f79cb3f94c8c50adc14f2165530c43b735abc4aa21340868d9330c1e9b4fa SHA512 ad8d10c90136188ffda547b8d8781e9d26bc43d1dba7e9c3ff12f8a73725d1b331dd47bccdd331f998a0b03251eb2e3373a8cb39284f82c4bc63a5a703f21a46
 DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
 DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
+DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
 EBUILD eigen-3.3.7-r1.ebuild 2252 BLAKE2B f4e7a4c7e9f8cabe363eea903e82c073408f6143dc1bda05041c9a30f4a8d3f4f2aa63c7238949414f5a4d289799cc675df56a6cc6f8c968128cfb0149a3168d SHA512 09be623abde6bde8dd2dac1ce9f431e9c501f8336e8faacb2f03da71bfa81f6dd9cd984246f46873b3e81401977f35c4ebfb6ffd35705f740798c6d7e36cc09e
-EBUILD eigen-3.3.9.ebuild 2511 BLAKE2B 73e4adea64bb9e5ea42c5bac4bec3f11ec23b70c6a982dcee71d66773df27af25581f326ff9aefdb458dcd0995f2ac9169920bc6cb598b293d80847c8e5f88f3 SHA512 6207c91ee544e41f6a820ec1b5fc4367f7c9db179ab711d282fad95d078a8923acbb1135b9d4a20a7858fd223e0976f368bcf9fafa2a50fd06f2993a9a0eedf7
+EBUILD eigen-3.3.9.ebuild 2510 BLAKE2B 5a6792afa7132411ad9980ee7f8be71776f73991e7f3328595a29712d71491b9f433f033b9c422054a472a90b3e7555a5a4debd42fed7a704c15c36062efe2a1 SHA512 86e5e560bb26edd70469c0ccc372e51acdf8971c58ed7b9838744bd7ead54227d4cf801c8605348f6c37bf9edff4a0f6fa6b209cdc408249c9e4d8745b6375c3
+EBUILD eigen-3.4.0-r1.ebuild 2485 BLAKE2B f5e853aee207aa58d200ce4eed78512439ffc90f86a525764d87f8f137e2161212cb16525dfd503ddf005fc116262042b7a0683c3c361bc33aadbb2b1fcdc9e9 SHA512 dc7a7d8e6f94c4b00b21503533f366886d935d5e196f50729c7f24ee6ff6a6c1e7f966915af87b0d956baba805e92da5ac8babb9e722473ca4b4dacdc8cd9269
 MISC metadata.xml 887 BLAKE2B f6d225ff8a5b80f64b8e326962953b412526a0706c5dd7d9724d813a0e903d4d689f6a03249d33f1302c7575688e3246987bce6438163bb3130e7fee020cf9ed SHA512 a779ec093ee5008f881c07d3c3c9ea730a3393f8f9b6f1dde036b215ce30a006317d5f765df66f424491269179980cf3433061f693d902f5ac2e3341b4166ac8
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild
index 8637aa3d83cf..6d4b9b345248 100644
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..8bd4d5d66425
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="test"
+inherit cmake cuda fortran-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="https://eigen.tuxfamily.org/index.php?title=Main_Page"
+SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
+
+# Tests failing again because of compiler issues
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( virtual/pkgconfig )
+"
+DEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc[sparse]
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		sci-libs/umfpack
+		virtual/opengl
+	)
+"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+PATCHES=(
+	#"${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
+	"${FILESDIR}"/${PN}-3.3.9-max-macro.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	cmake_comment_add_subdirectory demos
+
+	if ! use test; then
+		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
+			-i CMakeLists.txt || die
+	fi
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	use test && mycmakeargs+=(
+		# the OpenGL testsuite is extremely brittle, bug #712808
+		-DEIGEN_TEST_NO_OPENGL=ON
+		# the cholmod tests are broken and always fail
+		-DCMAKE_DISABLE_FIND_PACKAGE_Cholmod=ON
+		-DEIGEN_TEST_CXX11=ON
+		-DEIGEN_TEST_NOQT=ON
+		-DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+		-DEIGEN_TEST_CUDA=$(usex cuda)
+		-DEIGEN_TEST_OPENMP=$(usex openmp)
+		-DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
+		-DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+	if use test; then
+		cmake_src_compile blas
+		cmake_src_compile buildtests
+
+		# tests generate random data, which
+		# obviously fails for some seeds
+		export EIGEN_SEED=712808
+	fi
+}
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index e3eab5bfbf69..61ce75a78be9 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,5 +1,5 @@
 AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc33314fa15b0bdf78baf6672915befe2c14c695681701975dfb3d6572b2254596789dc1cc2010db2bd391e1d26f17a3a83d6c3aa96a9252a0fd1ea3d5 SHA512 406f1f6e900b0fe2c042cb6d219f20586058e1e7e1af38ffa7059f0d5e6b24cebb7b034237d154d9669a9a860497a36b3c7a0308a0698af23bb07cb29cf38851
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
-EBUILD gtest-1.10.0_p20200702.ebuild 1833 BLAKE2B d3026680ee0a28027bb92568448a376bb78f2cbb7e30e312c5a03540dcebc9c8e4513d349cda0e45b3768fc896d02b020175958636fd7815028a57763de2ed1b SHA512 5f0e167e4e503bc776c6cdd242c458b861c520a5ec46ee0349b2a9dc52a4d1fcc9ad65534933e7553c615308ebf0af8780b4354ec297a42c74987bdd0ec16d4f
-EBUILD gtest-9999.ebuild 1705 BLAKE2B 5d6cdc2e1a62ea1cd40a10831c5d28a25ca05242f7e115f9e99d2a2c2b72c4b931b9d820cec0974c895dcac5a07b8d230b59565cdb4077bec3f5329dfcae54bb SHA512 c28e333fe5731d07830f6c19f7a6e91f78f6e1e39a91d6ad4af024d034a00dc1ae0fe94cea00b4f6eb6d58e330d55dd5b53ce46a3ca3e92896e31849b24c59ef
+EBUILD gtest-1.10.0_p20200702.ebuild 1833 BLAKE2B 68116cb37b4f39dc0c8d2b1d7132c905c207a04b22af6c3c921882f877b85eeb0c6d734905ad4da1837abc5fa952340c666072fe3d25ad5a190f5587f80e4a6d SHA512 cbd8d53c88e299235cff7c7e1517b40d8a1ce03dd099511357677797a3826b82edd011153314e2518e87a15ef0cbf5bd7331081f981f6621695d4c4f5051a3e2
+EBUILD gtest-9999.ebuild 1705 BLAKE2B ac5f3a1f3b3c2c3ca4f06fa59d0f03dabfef0acd1f9d7e8cd8001f1a8e7c498f283a5c1de5958db3b28a8dd19492e716e7ef4dc484752de05dde89bb398f37c0 SHA512 1a0b1964b068bb26e3f7d14699a23f67e08c29f0e90e861fb58192ccf8707c176ce9c6cf79fccd621d700b571dd19537c6103eb8de342acbb101554d49aff5e0
 MISC metadata.xml 566 BLAKE2B 9500d2b76c2ab413e2113a67dc071ef02e3520e2db4996c04205f0d97ac3cc1b2a5f412da27460e9446920765a76507b85aed5d6f2c01a3399ffe095549a4c44 SHA512 abe19d395e258cdb2dca0510cb8d2b4acbc0ea907493672442c1343d9b68a748c244c2ac10044a4e1c659c5bd1e89159fad8ba267fd1d0643447f5d2691aa92a
diff --git a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
index efe1b03a4710..58067c7a096b 100644
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index f91f4c8758d5..43e102b84c64 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 9fd9fbedb489..860716f5e2b2 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,8 +1,4 @@
 AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
-DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
-DIST tbb-2020.2.tar.gz 2637172 BLAKE2B 6b6e65732d3971f7374058513004ca3cfc3855b83c0a2dde59d50e08c26ff220470e31db86f4ab9f009c7e02e454a00a348730e63c829aa8d217320f7879cfc9 SHA512 6d7412fa6ce12d27736af3c8942c5ab5ea6945dd3ca93f309535c0dba3ff757d6507a5ffc3bcd73e6fdcda043cdedfa657631b25ae86fbf221d0f1d66a85b48f
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
-EBUILD tbb-2019.8.ebuild 3212 BLAKE2B 89073e2f92898de3ede7e4843fefb76b42453ed8c028e0b25821b375b7df0de2125e5ca1435d072ec36f1fbc3c900e709252da4741aa27a8103782d79487018c SHA512 56c50fa1857cb67b76349fdc2d488f17daf7329083f58dee8cd0e7859e943974cde7e5d089990676da78dce2040738de245ea6d4b58656a287463bc1060b1ed1
-EBUILD tbb-2020.2.ebuild 3390 BLAKE2B 93447f24b6b315e583b30e59c601cbd1c211882265305f80ee4154715a36069b164f3c932c597a31ac56a2a1dbc860586e82505a854ac27fa9a9261cc70a7a42 SHA512 5475c1d334a76a3ee8eb97ce83bd50d1155d14f7cbc7edb2996f999f4b9fee07a0f695cec35cb9ca9b4127e346cf291ad715aa73056732a65c44d5207b05f254
 EBUILD tbb-2020.3.ebuild 3391 BLAKE2B 518fa0a1a5ffc1b572b9366880f2e6a204e46f1751c923a76bd5cc96c69ad9bbc673bc89e23b9d46ef0c94e271d12001d0398d7e641d80a60d03fdaefa0789a5 SHA512 727e6797c6afc06f55359974add2b0578bcafa10b276bd603a8d6dc39adfe175cf89ee6c080d8543b4919bb9349adc812a4e3f39a5dcba68730acae30cc7be32
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/tbb-2019.8.ebuild b/dev-cpp/tbb/tbb-2019.8.ebuild
deleted file mode 100644
index da66dd2bd839..000000000000
--- a/dev-cpp/tbb/tbb-2019.8.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal multilib toolchain-funcs
-
-PV1="$(ver_cut 1)"
-PV2="$(ver_cut 2)"
-MY_PV="${PV1}_U${PV2}"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( CHANGES README README.md doc/Release_Notes.txt )
-
-src_prepare() {
-	default
-
-	find include -name \*.html -delete || die
-
-	# Give it a soname on FreeBSD
-	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
-	# Set proper versionning on FreeBSD
-	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
-
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-multilib_src_configure() {
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc || die
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc || die
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-}
-
-local_src_compile() {
-	cd "${S}"
-
-	local comp arch
-
-	case ${MULTILIB_ABI_FLAG} in
-		abi_x86_64) arch=x86_64 ;;
-		abi_x86_32) arch=ia32 ;;
-#		abi_ppc_64) arch=ppc64 ;;
-#		abi_ppc_32) arch=ppc32 ;;
-	esac
-
-	case "$(tc-getCXX)" in
-		*clang*) comp="clang" ;;
-		*g++*) comp="gcc" ;;
-		*ic*c) comp="icc" ;;
-		*) die "compiler $(tc-getCXX) not supported by build system" ;;
-	esac
-
-	CXX="$(tc-getCXX)" \
-	CC="$(tc-getCC)" \
-	AS="$(tc-getAS)" \
-	arch=${arch} \
-	CPLUS_FLAGS="${CXXFLAGS}" \
-	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
-}
-
-multilib_src_compile() {
-	local_src_compile tbb tbbmalloc
-}
-
-multilib_src_test() {
-	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
-	local_src_compile -j1 test
-}
-
-multilib_src_install() {
-	local bt
-	local buildtypes
-	if use debug ; then
-		buildtypes="release debug"
-	else
-		buildtypes="release"
-	fi
-	for bt in ${buildtypes}; do
-		cd "${BUILD_DIR}_${bt}" || die
-		local l
-		for l in $(find . -name lib\*$(get_libname \*)); do
-			dolib.so ${l}
-			local bl=$(basename ${l})
-			dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
-		done
-	done
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-}
-
-multilib_src_install_all() {
-	doheader -r include/*
-
-	einstalldocs
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-cpp/tbb/tbb-2020.2.ebuild b/dev-cpp/tbb/tbb-2020.2.ebuild
deleted file mode 100644
index 3e132d1c71b7..000000000000
--- a/dev-cpp/tbb/tbb-2020.2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal multilib toolchain-funcs
-
-PV1="$(ver_cut 1)"
-PV2="$(ver_cut 2)"
-MY_PV="${PV1}_U${PV2}"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/oneTBB-${MY_PV}"
-
-DOCS=( CHANGES README README.md doc/Release_Notes.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-2020.1-makefile-debug.patch )
-
-src_prepare() {
-	default
-
-	find include -name \*.html -delete || die
-
-	# Give it a soname on FreeBSD
-	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
-	# Set proper versionning on FreeBSD
-	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
-
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-multilib_src_configure() {
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc || die
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc || die
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-}
-
-local_src_compile() {
-	cd "${S}"
-
-	local comp arch
-	local bt buildtypes
-
-	case ${MULTILIB_ABI_FLAG} in
-		abi_x86_64) arch=x86_64 ;;
-		abi_x86_32) arch=ia32 ;;
-#		abi_ppc_64) arch=ppc64 ;;
-#		abi_ppc_32) arch=ppc32 ;;
-	esac
-
-	case "$(tc-getCXX)" in
-		*clang*) comp="clang" ;;
-		*g++*) comp="gcc" ;;
-		*ic*c) comp="icc" ;;
-		*) die "compiler $(tc-getCXX) not supported by build system" ;;
-	esac
-
-	if use debug ; then
-		buildtypes="release debug"
-	else
-		buildtypes="release"
-	fi
-
-	for bt in ${buildtypes}; do
-		CXX="$(tc-getCXX)" \
-		CC="$(tc-getCC)" \
-		AS="$(tc-getAS)" \
-		arch=${arch} \
-		CPLUS_FLAGS="${CXXFLAGS}" \
-		emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=${bt} $@
-	done
-}
-
-multilib_src_compile() {
-	local_src_compile tbb tbbmalloc
-}
-
-multilib_src_test() {
-	local_src_compile test
-}
-
-multilib_src_install() {
-	local bt
-	local buildtypes
-	if use debug ; then
-		buildtypes="release debug"
-	else
-		buildtypes="release"
-	fi
-	for bt in ${buildtypes}; do
-		cd "${BUILD_DIR}_${bt}" || die
-		local l
-		for l in $(find . -name lib\*$(get_libname \*)); do
-			dolib.so ${l}
-			local bl=$(basename ${l})
-			dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
-		done
-	done
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-}
-
-multilib_src_install_all() {
-	doheader -r include/*
-
-	einstalldocs
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index 83f3c5a52cd7..f1c08acbdf3a 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -1,7 +1,5 @@
 AUX tree-2.81-gcc11.patch 933 BLAKE2B c3b1afcd9325e9b452eb5b9279e4542d9f82f7d8de7060efbabecb302c2c064e5a5891533449e33f75c45078b2bc8c5fc7f7e3e8f204118345a02afa5a32b5c6 SHA512 43ec3975ecbd4b38105a2c4980da8ca0b19a5075bb6eaa5cae313c4f2eb5b8d44118dc55b778c5f973bc5ad69236bb94086cf1c72e8d9a9198ad25c14a8b5fa1
 AUX tree-2.81-test.patch 550 BLAKE2B fe73799591f7f0c65d2f031792bc87b2d85bc143bf4adb35e04db712ef95a5ba0e15d8256aec28a0ac95d2306fa45de41d1a8dc5d53629d38ede35fe87cef256 SHA512 a859891662a1093f517f43a6ea14a4e1f7d81988d0fe83253554bea83bfdecde0b51ed05795d0d6f0b3494a7cde6db56a8304397ea5ad9fb2d446647f4301514
-DIST tree-2.81.tar.gz 1167128 BLAKE2B ea92724b16fc7ea8a5f0036f5a7a57d000d66b332b4ba46139463f707f95922f38b1d4d56a6d2fca0a3c4ece8f11e28bbf4aa6bec5c5a7bc59ccaa36a01413d6 SHA512 85e910fdb19ffd03ae79302a95ebffdb44725fd9f291a61d6912f743b54fe9b3d1c863e00c7e75d238f428946809e42c7ae6379b1051688fb06ee6c6d761d294
 DIST tree-3.17.tar.gz 1178425 BLAKE2B f59239b861c0495c48036d0fffa49370d4cd78a94bfc35348bbbe0232a3c1221293a23366a6289429adabcb00b21292288ce085fa54f74dc204537c95c5b7c37 SHA512 af11f693c13dd37dddf016751c0f975c21d7a5ad405879e18fbe5387400ee1fcfb42942ee8888efffcb0c985d7875f2698591139aeb18b4809e83e225a743112
-EBUILD tree-2.81.ebuild 811 BLAKE2B 2b55073288c7c192ad70c07289cfb950d0f5b5a50d6374e6ca456ba3b62ce1fa0aaad4430d0479492978622e4d6efde76c33c8b1371ceea2441a2e07866190fe SHA512 3e6f39990b5457f9e55078b1625be939a05c33ad7fd40cdb7b64d726ba0b5ed183fcd9ee029d3a12498309529874b10a2b5fd228821e48299c05d1cd4ab8f003
 EBUILD tree-3.17.ebuild 743 BLAKE2B ee1f494c9b7a0b29c220135e3304e638e45e820718967582814de04e66626ec8dbb6c132fb4e739c4b7cdc49f89f9398da9516fa3900ec8bedeb5a3cc3491c08 SHA512 4d45fa7d72cf2aba431d8fb4560dbae9608b0f6152433c2844af683b767495bbcec666b11bb967b48ce178ed2f28bf11cba2d4699fe31f8dd30b1ae4f67d1a9b
 MISC metadata.xml 620 BLAKE2B 30c1a3c6c5416691c41fa2d587d80e76e72a7c349cc7e57afc723caddb6874cb849cf0db5943a12373253383845b649b522bc1abce65d036fc4757120b3524cc SHA512 ec64c3f8832072c5bac618a3990c6b488be2b6da98514d6ca508c620817c9c7ad40479c96168c7ab0078169f72f68a8e52131fb7b4786b281865e50c9a612e1a
diff --git a/dev-cpp/tree/tree-2.81.ebuild b/dev-cpp/tree/tree-2.81.ebuild
deleted file mode 100644
index 8bf33d70b234..000000000000
--- a/dev-cpp/tree/tree-2.81.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An STL-like tree class"
-HOMEPAGE="http://www.aei.mpg.de/~peekas/tree/"
-SRC_URI="http://www.aei.mpg.de/~peekas/tree/${P}.tar.gz"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-gcc11.patch
-)
-
-src_configure() {
-	tc-export CXX
-}
-
-src_install() {
-	doheader tree.hh tree_util.hh
-	dodoc tree_example.cc
-
-	if use doc; then
-		dodoc ../doc/treefig.*
-		rm ../doc/treefig.* || die
-
-		docinto html
-		rm ../doc/{doxygen_tree.config,favicon.ico,tree.tex} || die
-		dodoc -r ../doc/.
-	fi
-	docompress -x /usr/share/doc/${PF}
-}