gentoo resync : 05.03.2021

16 files changed, 150 insertions, 588 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index d05bc7443b1d..186f4ed0ad65 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 48be371cbcf8..2a64a22daefc 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,8 +1,8 @@
-AUX hpx-1.5.1-cmake.patch 1131 BLAKE2B 44bd25d11aee1cb1a14856a91ceb8afd3444fa7499c0304fddb9d36eca869cc089c59e9d727f70b1a67b3815731854b3e17f8722f53bb2eafdf23fdab2f5ccc8 SHA512 0451ee280a19701b76bcaf41783b932658bd9c954936dace35f0d833b51ec3e4cf4fca7981091c72486b3470aa03a24630f4a01f243041b6c002c03c5a8fcbd7
-AUX hpx-1.5.1-docs.patch 4416 BLAKE2B 0cfa735ffcf683c21c1739fc3eb435d77e640a4f3b24764a08739b424ee444adda36c4650f65bd7064b7bfafcdf67239fb5573acd6c0a16b205ab3d508171a1c SHA512 df0fe0c9e2d4b934140fc4b277d212d5dd0fb269e0a06a315a6c1c5b90d8aaed7ea6f2ce92b491150ea61ff16f2299537fa55cdca94841c3da1797a4a83ad732
-AUX hpx-1.5.1-python.patch 1095 BLAKE2B 0996bcee3f6c2e28a9cfe2bb3165f241322a77cf8ab21e16fb6048a0d08903dfdce6f0d4109437d6bfa1e0ac13c05b5e4f278f83abb22a909351031f0a46b1b8 SHA512 8c17dbf221e63826ef7a3e95e3cf821f72a781fbd68756e8f7cfcd50c24b790062dd69a8d90ba9654c962a37aa06267e5b2c04f5f7f07a107166e4b16ec04122
-AUX hpx-1.5.1-tests.patch 4719 BLAKE2B ddf491d738137f57e3fed5b6833647984ae3ef432ab6eb214a36523f8887c8966711ac281dbda84bd19eef7dc75f8b9122843e7273e15b9db2b201dd35242303 SHA512 7d23d3cbc572dda2eb00a50a59633f41b622f531c51a734d64f8d00f2168724d36ff07425a3262793e77e5b4dfd38295a33717d56b916f0abd9b003ac1d829c4
-DIST hpx-1.5.1.tar.gz 4576475 BLAKE2B 8702638461f92d9d94d0e2ac4ec32527d995a45f54babcbf08d644d1cac8fa37692fb66f59e221930f7738861b41a93fd0ab64d11c4e46d4e039ff3b0e4fec72 SHA512 ab2603adca8780808b62b55f57a03bf8491b805665831c1c484eeba8e7b306bb3269884c8940ad2fc4c5b0d679c54b1e33bc077cdb7ea6d1cb9a715ff70b9842
-EBUILD hpx-1.5.1.ebuild 2620 BLAKE2B 39aa87029c2d7a56ba29d7af0a1230f88f0ed8faeaa7a07c08c00583a84d4fdedb8e6845d6c482564a7c9ba83b95b0bf0e2f0abb2e44da4133166ccda0cddc53 SHA512 64b4a036e374f7d3632ea73a4ae9dd9772974ae92a0fbeaea21dac6213e92835b4a039bdbbfb1f3f1066895e52f70bfd35f727ba9fecae0a248735c209262725
+AUX hpx-1.6.0-cmake.patch 1135 BLAKE2B f8568002d02a86da600e0efa740f0a73a5e01f8cf8cba925fee727d5ff76e7c5d98961aace52a7d8188c88154b294540d5f4c7ab1d2a888026ce9b2a0ec9e27c SHA512 cf93f71e52fd49ca5d1aaaaa128e69f13e8b3808e5ee3a70bba7ce47b4539e6761a56d6a15a6106e825f8c6a9fec36fb4d43ec221a857091972d1d9b0c900dc0
+AUX hpx-1.6.0-docs.patch 4445 BLAKE2B 82d6288d0743b2d512f37e22dda7f33226e76ace62d96dab4b2d78f95cf80ec8cf247952d1632daabd8acd7d5b5f475103b5f924f11e778c70ae138fb100a2d1 SHA512 bc121d3709312cc510547286d4e25002f87659b4eea8de2f2b3247811c02d04fc2d694d1403164e6942e8e6b8090e622f020d41e0100a5349a6c4330a3725702
+AUX hpx-1.6.0-python.patch 1099 BLAKE2B e38ee7c0a724e521f67f2e018e83739db14476126b4a81dbc474537ef350c47fe9cf14cbc8b8e194067098c88034834f70027df1098006486b2c561564ad9313 SHA512 943fdffc0fce180a69a57819a84eed97a335efdfe939e33834cc3ff6485db22760eee80accf1ec63b59872d2352ca100af4445dae5966f7315a43cd8b7ae0d78
+AUX hpx-1.6.0-tests.patch 4965 BLAKE2B dfbc54a24095ce171657185a3f9ee3c1574bd08647397a6be0e80abd9934548bf03e03fd846813ac2067db28ec2349f8a07f7e203292c7710108af4bdf8aee7d SHA512 765295865ee2d5c581c976a36def227361b26d8dfb3262d21956a954a63122722a4160d5c49168b1dcea1703e60bedc4e7bade5d44bf2fe1a159827327a9b606
+DIST hpx-1.6.0.tar.gz 4596486 BLAKE2B e19d88d70d3dec45536b4f174bc1bae49285bde3db37517381071bec318748913ff239c66f02acb15451dc2f38a7799e9424fc5269851478b33da81654bd6c16 SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc
+EBUILD hpx-1.6.0.ebuild 2613 BLAKE2B d359f8307fa633ce2dd23ead6ebc0280548761c5f44ed9dcfd6520e0312678e831a4ad9b0c506c578a95f621ca10bcf57977027e77e3d45c079b1638bc589451 SHA512 7857998bea3fecaee3014a6c472a043362c3045b66653a14f9e09b2bac3964810ceb300fb06c73dc251fc1d1779dd01efc4255c916467375f5c41d2defb290a8
 EBUILD hpx-9999.ebuild 2479 BLAKE2B b231c4bd3c31aabe377d3eaac23233c6d52e589e08fe332ddacd88919de691e019bd9408ae25683623caf2f03b433f94fa8f1b201975e03e228964df0b0d37d4 SHA512 693efe1598700f659a804f89993a92acaf563cc378ae9c6a1753aa6470493e78767b8c1554bc5bb2eb2b9ebcdd7460aef0372e897c50126f12472b1a33098fdb
 MISC metadata.xml 1189 BLAKE2B a6fedaeaa9c32038109691eb64fd62dd0cf0bc2104710fa49d57a95b09674a23d4e38d03fa2e306734b587a8682c1a7007ed078988226c39f17ccacece740a52 SHA512 eddd398a02bfa3716a373a6cb909a881efd72c11d7e4ce05a722da1fb5d5e464b59999d5bf0de2e608f768d6ceb50ccd64d43e77088c19fa1b28a19b404469da
diff --git a/sys-cluster/hpx/files/hpx-1.5.1-tests.patch b/sys-cluster/hpx/files/hpx-1.5.1-tests.patch
deleted file mode 100644
index 4a930eb0c0c7..000000000000
--- a/sys-cluster/hpx/files/hpx-1.5.1-tests.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From e623c902bc57f85b3d1b09e58b75fb01898b409e Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Fri, 18 Sep 2020 08:32:01 +0200
-Subject: [PATCH] tests: Disable failing tests
-
-Within portage the following tests fail:
-
-|99% tests passed, 5 tests failed out of 920
-|
-|Total Test time (real) = 1069.51 sec
-|
-|The following tests FAILED:
-|        299 - tests.unit.modules.async_mpi.mpi_ring_async_executor (Failed)
-|        351 - tests.unit.modules.compute.numa_allocator (Failed)
-|        492 - tests.regressions.modules.performance_counters.dynamic_counters_loaded_1508 (Failed)
-|        919 - tests.unit.parcelset.distributed.mpi.put_parcels_with_coalescing (Failed)
-|        920 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed)
-
-Disable them.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- libs/async_mpi/tests/unit/CMakeLists.txt           |  2 +-
- libs/compute/tests/unit/CMakeLists.txt             |  2 +-
- .../tests/regressions/CMakeLists.txt               |  4 +---
- .../segmented_algorithms/tests/unit/CMakeLists.txt |  2 +-
- tests/unit/parcelset/CMakeLists.txt                | 14 +++++++-------
- 5 files changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/libs/async_mpi/tests/unit/CMakeLists.txt b/libs/async_mpi/tests/unit/CMakeLists.txt
-index 30e6de80fa01..d78490089f02 100644
---- a/libs/async_mpi/tests/unit/CMakeLists.txt
-+++ b/libs/async_mpi/tests/unit/CMakeLists.txt
-@@ -4,7 +4,7 @@
- # Distributed under the Boost Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
--set(tests mpi_ring_async_executor)
-+# set(tests mpi_ring_async_executor)
- 
- set(mpi_ring_async_executor_PARAMETERS THREADS_PER_LOCALITY 4 LOCALITIES 2
-                                        RUNWRAPPER mpi
-diff --git a/libs/compute/tests/unit/CMakeLists.txt b/libs/compute/tests/unit/CMakeLists.txt
-index c7c43c91ef08..349483642d33 100644
---- a/libs/compute/tests/unit/CMakeLists.txt
-+++ b/libs/compute/tests/unit/CMakeLists.txt
-@@ -8,7 +8,7 @@
- set(tests block_allocator)
- 
- if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
--  set(tests ${tests} numa_allocator)
-+  # set(tests ${tests} numa_allocator)
- endif()
- 
- # NB. threads = -2 = threads = 'cores' NB. threads = -1 = threads = 'all'
-diff --git a/libs/performance_counters/tests/regressions/CMakeLists.txt b/libs/performance_counters/tests/regressions/CMakeLists.txt
-index adf982876e21..406b2edf1837 100644
---- a/libs/performance_counters/tests/regressions/CMakeLists.txt
-+++ b/libs/performance_counters/tests/regressions/CMakeLists.txt
-@@ -5,9 +5,7 @@
- # Distributed under the Boost Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
--set(tests discover_counters_1787 dynamic_counters_loaded_1508 statistics_2666
--          uptime_1737
--)
-+set(tests discover_counters_1787 statistics_2666 uptime_1737)
- 
- set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
- 
-diff --git a/libs/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/segmented_algorithms/tests/unit/CMakeLists.txt
-index 6dba64d19fc4..ccaa56b1a0ea 100644
---- a/libs/segmented_algorithms/tests/unit/CMakeLists.txt
-+++ b/libs/segmented_algorithms/tests/unit/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(tests
-     partitioned_vector_adjacent_difference1
-     partitioned_vector_adjacent_difference2
-     partitioned_vector_adjacent_find1
--    partitioned_vector_adjacent_find2
-+    # partitioned_vector_adjacent_find2
-     partitioned_vector_all_of1
-     partitioned_vector_all_of2
-     partitioned_vector_any_of1
-diff --git a/tests/unit/parcelset/CMakeLists.txt b/tests/unit/parcelset/CMakeLists.txt
-index 1981e2baf8cd..b374292ceee7 100644
---- a/tests/unit/parcelset/CMakeLists.txt
-+++ b/tests/unit/parcelset/CMakeLists.txt
-@@ -12,13 +12,13 @@ set(put_parcels_PARAMETERS LOCALITIES 2)
- set(put_parcels_FLAGS DEPENDENCIES iostreams_component)
- set(set_parcel_write_handler_PARAMETERS LOCALITIES 2)
- 
--if(HPX_WITH_PARCEL_COALESCING)
--  set(tests ${tests} put_parcels_with_coalescing)
--  set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
--  set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
--                                        parcel_coalescing
--  )
--endif()
-+# if(HPX_WITH_PARCEL_COALESCING)
-+#   set(tests ${tests} put_parcels_with_coalescing)
-+#   set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
-+#   set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
-+#                                         parcel_coalescing
-+#   )
-+# endif()
- 
- if(HPX_WITH_COMPRESSION_BZIP2
-    OR HPX_WITH_COMPRESSION_ZLIB
--- 
-2.26.2
-
diff --git a/sys-cluster/hpx/files/hpx-1.5.1-cmake.patch b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
index ab31178bbe6d..646084e77294 100644
--- a/sys-cluster/hpx/files/hpx-1.5.1-cmake.patch
+++ b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
@@ -1,7 +1,7 @@
-From 8bee06baabf24c4b8f48766dba5c76d1979c8ea6 Mon Sep 17 00:00:00 2001
+From 240f55e4bc57215e26fc0b0ae0ac0eca2eb93d65 Mon Sep 17 00:00:00 2001
 From: Kurt Kanzenbach <kurt@kmk-computers.de>
 Date: Sat, 19 Sep 2020 13:19:42 +0200
-Subject: [PATCH] tests: Remove unused cmake options
+Subject: [PATCH 2/3] tests: Remove unused cmake options
 
 This fixes the following warnings:
 
@@ -15,10 +15,10 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt
-index a4db8d4c927f..43bb766aced5 100644
+index 3798549da0a8..7d3bfea1044e 100644
 --- a/tests/unit/build/CMakeLists.txt
 +++ b/tests/unit/build/CMakeLists.txt
-@@ -57,7 +57,7 @@ function(create_cmake_test name using_install_dir hpx_dir setup_type test_dir)
+@@ -54,7 +54,7 @@ function(create_cmake_test name using_install_dir hpx_dir setup_type test_dir)
      ${name}.make_configure
      COMMAND
        "${CMAKE_COMMAND}" -E chdir "${build_dir}" "${CMAKE_COMMAND}" ${test_dir}
@@ -28,5 +28,5 @@ index a4db8d4c927f..43bb766aced5 100644
        -DCMAKE_BUILD_TYPE=$<CONFIGURATION>
      VERBATIM
 -- 
-2.26.2
+2.30.1
 
diff --git a/sys-cluster/hpx/files/hpx-1.5.1-docs.patch b/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
index a9978ea29550..3823bab918bd 100644
--- a/sys-cluster/hpx/files/hpx-1.5.1-docs.patch
+++ b/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
@@ -1,7 +1,7 @@
-From 785ade96043ab6fff85646a841996ccf6dfd0b62 Mon Sep 17 00:00:00 2001
+From 1de9f65fac6c4b65ff280501d60b9b6dd46c6a8c Mon Sep 17 00:00:00 2001
 From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Wed, 28 Oct 2020 18:37:31 +0100
-Subject: [PATCH] static_reinit: Remove export macro
+Date: Mon, 22 Feb 2021 20:36:14 +0100
+Subject: [PATCH 3/3] static_reinit: Remove export macro
 
 This macro leads to doc generation fail:
 
@@ -47,17 +47,17 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  .../hpx/static_reinit/reinitializable_static.hpp   | 14 ++------------
  1 file changed, 2 insertions(+), 12 deletions(-)
 
-diff --git a/libs/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp b/libs/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-index 08980b9e269e..3c99400b9553 100644
---- a/libs/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-+++ b/libs/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-@@ -17,14 +17,6 @@
+diff --git a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
+index 51ccbf2481b2..b8661d1c84cb 100644
+--- a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
++++ b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
+@@ -18,14 +18,6 @@
  #include <mutex>
  #include <type_traits>
  
 -// clang-format off
 -#if !defined(HPX_WINDOWS)
--#  define HPX_EXPORT_REINITIALIZABLE_STATIC HPX_EXPORT
+-#  define HPX_EXPORT_REINITIALIZABLE_STATIC HPX_CORE_EXPORT
 -#else
 -#  define HPX_EXPORT_REINITIALIZABLE_STATIC
 -#endif
@@ -66,7 +66,7 @@ index 08980b9e269e..3c99400b9553 100644
  namespace hpx { namespace util {
      ///////////////////////////////////////////////////////////////////////////
      //  Provides thread-safe initialization of a single static instance of T.
-@@ -39,11 +31,11 @@ namespace hpx { namespace util {
+@@ -40,11 +32,11 @@ namespace hpx { namespace util {
      //  functions used by the HPX runtime system to reinitialize the held data
      //  structures.
      template <typename T, typename Tag = T, std::size_t N = 1>
@@ -80,12 +80,12 @@ index 08980b9e269e..3c99400b9553 100644
      {
      public:
          HPX_NON_COPYABLE(reinitializable_static);
-@@ -157,5 +149,3 @@ namespace hpx { namespace util {
+@@ -160,5 +152,3 @@ namespace hpx { namespace util {
      template <typename T, typename Tag, std::size_t N>
      std::once_flag reinitializable_static<T, Tag, N>::constructed_;
  }}    // namespace hpx::util
 -
 -#undef HPX_EXPORT_REINITIALIZABLE_STATIC
 -- 
-2.26.2
+2.30.1
 
diff --git a/sys-cluster/hpx/files/hpx-1.5.1-python.patch b/sys-cluster/hpx/files/hpx-1.6.0-python.patch
index 51e225e8f5bc..412e7289bc5b 100644
--- a/sys-cluster/hpx/files/hpx-1.5.1-python.patch
+++ b/sys-cluster/hpx/files/hpx-1.6.0-python.patch
@@ -1,7 +1,7 @@
-From 0d250c5747f3a80ddda6f5bf298cead9048d1c28 Mon Sep 17 00:00:00 2001
+From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
 From: Kurt Kanzenbach <kurt@kmk-computers.de>
 Date: Tue, 17 Mar 2020 16:20:35 +0100
-Subject: [PATCH] cmake: python: Use standard python interpreter
+Subject: [PATCH 1/3] cmake: python: Use standard python interpreter
 
 These scripts are needed during build and run time. So, use a python interpreter
 which works for both cases.
@@ -23,7 +23,7 @@ index 81f38f89367d..a0fd7837b066 100755
  # Copyright (c) 2014 Steven R. Brandt
  #
 diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in
-index 44a79e7cbffb..d4ab6020485e 100755
+index 60e59cc118d9..0c32bba98917 100755
 --- a/cmake/templates/hpxrun.py.in
 +++ b/cmake/templates/hpxrun.py.in
 @@ -1,4 +1,4 @@
@@ -33,5 +33,5 @@ index 44a79e7cbffb..d4ab6020485e 100755
  # Copyright (c) 2014 Thomas Heller
  #
 -- 
-2.26.2
+2.30.1
 
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch b/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
new file mode 100644
index 000000000000..8a6884a57a1b
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
@@ -0,0 +1,115 @@
+From e350546da5caee062684548b6727f4cb67981b7e Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Fri, 26 Feb 2021 18:28:14 +0100
+Subject: [PATCH] test: Disable failing tests
+
+The following tests fail within portage:
+
+|199 - tests.unit.modules.async_mpi.mpi_ring_async_executor (Timeout)
+|250 - tests.unit.modules.compute.numa_allocator (Failed)
+|268 - tests.regressions.modules.performance_counters.dynamic_counters_loaded_1508 (Failed)
+|318 - tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector_adjacent_find2
+|967 - tests.unit.parcelset.distributed.mpi.put_parcels_with_coalescing (Timeout)
+|968 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed)
+
+Disable them.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ libs/full/async_mpi/tests/unit/CMakeLists.txt      |  2 +-
+ libs/full/compute/tests/unit/CMakeLists.txt        |  6 +++---
+ .../tests/regressions/CMakeLists.txt               |  8 ++++----
+ .../segmented_algorithms/tests/unit/CMakeLists.txt |  2 +-
+ tests/unit/parcelset/CMakeLists.txt                | 14 +++++++-------
+ 5 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/libs/full/async_mpi/tests/unit/CMakeLists.txt b/libs/full/async_mpi/tests/unit/CMakeLists.txt
+index 8f2d77fc3567..9cd7d39597b3 100644
+--- a/libs/full/async_mpi/tests/unit/CMakeLists.txt
++++ b/libs/full/async_mpi/tests/unit/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ # Distributed under the Boost Software License, Version 1.0. (See accompanying
+ # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ 
+-set(tests mpi_ring_async_executor)
++# set(tests mpi_ring_async_executor)
+ 
+ set(mpi_ring_async_executor_PARAMETERS THREADS_PER_LOCALITY 4 LOCALITIES 2
+                                        RUNWRAPPER mpi
+diff --git a/libs/full/compute/tests/unit/CMakeLists.txt b/libs/full/compute/tests/unit/CMakeLists.txt
+index 7c700d5ae639..c655772234b8 100644
+--- a/libs/full/compute/tests/unit/CMakeLists.txt
++++ b/libs/full/compute/tests/unit/CMakeLists.txt
+@@ -7,9 +7,9 @@
+ 
+ set(tests block_allocator)
+ 
+-if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
+-  set(tests ${tests} numa_allocator)
+-endif()
++# if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
++#   set(tests ${tests} numa_allocator)
++# endif()
+ 
+ # NB. threads = -2 = threads = 'cores' NB. threads = -1 = threads = 'all'
+ set(numa_allocator_PARAMETERS
+diff --git a/libs/full/performance_counters/tests/regressions/CMakeLists.txt b/libs/full/performance_counters/tests/regressions/CMakeLists.txt
+index 9939ef701e3b..f0647b27a2dc 100644
+--- a/libs/full/performance_counters/tests/regressions/CMakeLists.txt
++++ b/libs/full/performance_counters/tests/regressions/CMakeLists.txt
+@@ -7,10 +7,10 @@
+ 
+ set(tests discover_counters_1787 statistics_2666 uptime_1737)
+ 
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+-  set(tests ${tests} dynamic_counters_loaded_1508)
+-  set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
+-endif()
++# if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++#   set(tests ${tests} dynamic_counters_loaded_1508)
++#   set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
++# endif()
+ 
+ foreach(test ${tests})
+   set(sources ${test}.cpp)
+diff --git a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
+index 7cfd7e596de5..b35c1de7ac94 100644
+--- a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
++++ b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(tests
+     partitioned_vector_adjacent_difference1
+     partitioned_vector_adjacent_difference2
+     partitioned_vector_adjacent_find1
+-    partitioned_vector_adjacent_find2
++    # partitioned_vector_adjacent_find2
+     partitioned_vector_all_of1
+     partitioned_vector_all_of2
+     partitioned_vector_any_of1
+diff --git a/tests/unit/parcelset/CMakeLists.txt b/tests/unit/parcelset/CMakeLists.txt
+index 1981e2baf8cd..b374292ceee7 100644
+--- a/tests/unit/parcelset/CMakeLists.txt
++++ b/tests/unit/parcelset/CMakeLists.txt
+@@ -12,13 +12,13 @@ set(put_parcels_PARAMETERS LOCALITIES 2)
+ set(put_parcels_FLAGS DEPENDENCIES iostreams_component)
+ set(set_parcel_write_handler_PARAMETERS LOCALITIES 2)
+ 
+-if(HPX_WITH_PARCEL_COALESCING)
+-  set(tests ${tests} put_parcels_with_coalescing)
+-  set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
+-  set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
+-                                        parcel_coalescing
+-  )
+-endif()
++# if(HPX_WITH_PARCEL_COALESCING)
++#   set(tests ${tests} put_parcels_with_coalescing)
++#   set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
++#   set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
++#                                         parcel_coalescing
++#   )
++# endif()
+ 
+ if(HPX_WITH_COMPRESSION_BZIP2
+    OR HPX_WITH_COMPRESSION_ZLIB
+-- 
+2.30.1
+
diff --git a/sys-cluster/hpx/hpx-1.5.1.ebuild b/sys-cluster/hpx/hpx-1.6.0.ebuild
index 81e5f374f8d1..e5e15ce69bc6 100644
--- a/sys-cluster/hpx/hpx-1.5.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.6.0.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
@@ -35,7 +35,7 @@ BDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
 			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/breathe-4.22[${PYTHON_MULTI_USEDEP}]
+			dev-python/breathe[${PYTHON_MULTI_USEDEP}]
 		')
 	)
 	test? ( ${PYTHON_DEPS} )
diff --git a/sys-cluster/lmod/Manifest b/sys-cluster/lmod/Manifest
index f93e0d274c07..75aaca81fee1 100644
--- a/sys-cluster/lmod/Manifest
+++ b/sys-cluster/lmod/Manifest
@@ -2,6 +2,6 @@ AUX 99lmod 22 BLAKE2B 6a470f0e5796f21f10e10161ee1fdb4fb3d794a9261bee9887c9e2d179
 AUX lmod-8.4.19-no-libsandbox.patch 374 BLAKE2B f4bf516a737f73cb547bd07933d2839748259bef017b740b2cb3e5e5fbba6909e932d3211edb1ba48fd16545ecfd7f3a2239046f5478bfad68f9d7ccdb296307 SHA512 9b5b5300588dda23efd82f8d55373be6f69289efad42260a721eb68dfc01475a8f18a9bba8eead8fe66724b8a8df0d75a4c6a85d51e0d3011cc1435cb8f148b6
 AUX module.1-8.4.20 7580 BLAKE2B 6b4f8f721178326a4124bb9c907d4dc0e7c1b7251c724af2826aa3f495af4702f0c9a8cbb06847fec5d44f525cd463b4f0ec898a6cd3074d11c3195ede191af5 SHA512 cfc9eb011f5e5fb2a40b9dfe71e6a888f573e17a55d0d34fe529dbb887ff7932e17c0172663c95dfbd00b67f883608921ae7bb19d352b6d9ce8207d13ca13c8b
 DIST lmod-8.4.20.tar.gz 19889342 BLAKE2B aef498ec8dd2b87aca02d66f394418aba4a81d1fec4684750e59d48d06bad16db7a24290920e40290ecba8a4bc65c7dbe5c23be28654db79433f41164fa4aaf6 SHA512 9749e34e7ad75531c87770b73fd20dab16c89c24e1a2d01e58f09f8510ffc8f896dfa7eab9dab26fe4d6d14ba04d331f98e08e92e0943aede9fe5131af038970
-EBUILD lmod-8.4.20.ebuild 3461 BLAKE2B 9a910a8259e7bf2717bae198b46b17c60515c3a47c18cb34997cabd9557042ce6efc6a67794e2594dacc0075b0396c2eff12a09f6b567576b834f91d829442e5 SHA512 4e5f23859aa0736850cdee4147b6dec91e104ecf84af99b1397007aedd45998fe392353121043b543923a859a7cefed07eff9b8eb8e1e06824a31f0774318e60
-EBUILD lmod-9999.ebuild 3461 BLAKE2B 9a910a8259e7bf2717bae198b46b17c60515c3a47c18cb34997cabd9557042ce6efc6a67794e2594dacc0075b0396c2eff12a09f6b567576b834f91d829442e5 SHA512 4e5f23859aa0736850cdee4147b6dec91e104ecf84af99b1397007aedd45998fe392353121043b543923a859a7cefed07eff9b8eb8e1e06824a31f0774318e60
+EBUILD lmod-8.4.20.ebuild 3326 BLAKE2B 593228c6c7e2d21d7dda637f56ce99eae93bda463f2bc30f3e47f2dbf980a71c85543fd6095b085966ad1a43db6710a0ea09dfebe3824bd4ea1beda613d65c30 SHA512 f9e5d7ba6b9efa892db1470b1c0d2a5cc6986fad945d497d8645f1d54667621d98a9a893dca0de597bb1559ec8fb4cd10f51da10979b87b77a530883ff2ccf4d
+EBUILD lmod-9999.ebuild 3326 BLAKE2B 593228c6c7e2d21d7dda637f56ce99eae93bda463f2bc30f3e47f2dbf980a71c85543fd6095b085966ad1a43db6710a0ea09dfebe3824bd4ea1beda613d65c30 SHA512 f9e5d7ba6b9efa892db1470b1c0d2a5cc6986fad945d497d8645f1d54667621d98a9a893dca0de597bb1559ec8fb4cd10f51da10979b87b77a530883ff2ccf4d
 MISC metadata.xml 1067 BLAKE2B f520242500e560deee88ce53601d1dfaa929e8228344ea89f0d08242b58e44b280e9b6b3a396f787d231f5f6062336f770512ca2430d8ff8d64ae10a1198ee67 SHA512 6425f204b774beb6aaed3be55d279eaee61f12ea0ace2a9b083a533b92421704b64eea37fd00575147050636ef16fa07ebaf5df2d96a2101c8821d360c4d24ba
diff --git a/sys-cluster/lmod/lmod-8.4.20.ebuild b/sys-cluster/lmod/lmod-8.4.20.ebuild
index f41314789e9a..4cbf6b21b9b0 100644
--- a/sys-cluster/lmod/lmod-8.4.20.ebuild
+++ b/sys-cluster/lmod/lmod-8.4.20.ebuild
@@ -116,9 +116,6 @@ src_install() {
 	# not a real man page
 	rm -r "${ED}"/usr/share/Lmod/share/man || die
 	doenvd "${FILESDIR}"/99lmod
-	insinto /etc/profile.d
-	newins "${ED}"/usr/share/Lmod/init/profile lmod.sh
-	newins "${ED}"/usr/share/Lmod/init/profile.fish lmod.fish
 	keepdir /etc/modulefiles
 	keepdir /etc/lmod_cache
 }
diff --git a/sys-cluster/lmod/lmod-9999.ebuild b/sys-cluster/lmod/lmod-9999.ebuild
index f41314789e9a..4cbf6b21b9b0 100644
--- a/sys-cluster/lmod/lmod-9999.ebuild
+++ b/sys-cluster/lmod/lmod-9999.ebuild
@@ -116,9 +116,6 @@ src_install() {
 	# not a real man page
 	rm -r "${ED}"/usr/share/Lmod/share/man || die
 	doenvd "${FILESDIR}"/99lmod
-	insinto /etc/profile.d
-	newins "${ED}"/usr/share/Lmod/init/profile lmod.sh
-	newins "${ED}"/usr/share/Lmod/init/profile.fish lmod.fish
 	keepdir /etc/modulefiles
 	keepdir /etc/lmod_cache
 }
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 2b57fd8da96f..80f1beb0e9d4 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,20 +3,14 @@ AUX nova-sudoers 78 BLAKE2B d2df2db0a2905e3a6aec56dc70afab046933d675715c9c16f0e9
 AUX nova.initd 747 BLAKE2B 2a20a632fcb66001e68f4d70fa11ba179db9b06a6f412115d7b89a7ac8cff0f897fc224e44e74f80f6b1ddfb7d44c8b399fc442ca2bc3b904a418d0765c240bd SHA512 938300464971847b0d14eb0e54c6443d0041a46d39b276642479cb3d0d9370480f7eb7aa8c20512609c5bf4f6fc54438b451ac4986ad7c93ef8ee5b966c7f2a3
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
-DIST nova-21.1.1.tar.gz 9300545 BLAKE2B 757e7da69a10da73f7786e71e81ffc126304f8bff65910d3cb7ee8bf8fddc70490451b8173ac1a26e0b256e6cf54f4292617481c5fc7394e727ad2da20ed4607 SHA512 c44f0ca3b689cf3a3f364654bbdc8d4a425c702506be2d4e2d00002baf3395b5212807f1cc696488602d642c3565a7a84a407357d3621028c39e844c2ac4c466
 DIST nova-21.1.2.tar.gz 9306569 BLAKE2B 7b4a0d1a0b7432b027ffe3674ffa3db7ba75724342e1c5de833ed35bc03998057c05cc2e02383433440cda2c19d7a079f65d0d26c60061cd78cbb4d97af93695 SHA512 66dde411c7661d63b9a2104faf0e9dd82979579b9662083f2eb0b597aff960731c27ef1966995fc7eefc48c7d47d746982e995be76e844daa0512a2f8e38cf9c
-DIST nova-22.0.1.tar.gz 9254552 BLAKE2B b676ef872a9c14331860cd907a74c30f41dfb64908af9ac9e93bbc966a43daf1b3ef74d8a9e80e6f50ac25713a65a0082a02ecb276731ea3ea704dad210d6e7e SHA512 002b4fac8807b0a993e281fe6438b3e1db5cba31f12b2570c3bfd7cc495a5334668db4cc75a66f11186a8f0409f84e47e9e8b38220a1b3af762e543481ab0b7c
 DIST nova-22.1.0.tar.gz 9267366 BLAKE2B 0e10b22f5a149eb59b600545f2d2ac91366e13b2d94ca4781358bc6008b569e9f0791eed8f62cf204339b48a970ef47808a94bc4605ac1d1868c4be2fc7db0e0 SHA512 fb5353abd0b2e90f0903ab45690526ed6e0294d3d0a09ffc4acfda022fb0c170be20da406e71a8b303efaef0174ca273ff44dcae79bfc33ffd51e910f0d20fee
 DIST nova.conf.sample-2020.1.9999 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-2020.2.9999 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
-DIST nova.conf.sample-21.1.1 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-21.1.2 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
-DIST nova.conf.sample-22.0.1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
 DIST nova.conf.sample-22.1.0 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
 EBUILD nova-2020.1.9999.ebuild 7633 BLAKE2B 7a9a900405589b3356673cee3a0d465e075b53fab5fcf84ddeaed587d11438bbcc838e3edb6409cc0e9cf6585d195b106a803bba5d950103b24018a047bbba49 SHA512 425b6951ad85c0e3e8e4600d670ba8f090469cf5f017693a4639a2cb27fc66b21aa75dc110d48d4623bd4f2aa612f85f20308b83677331bb8c1b348bb9af036c
 EBUILD nova-2020.2.9999.ebuild 7498 BLAKE2B 45329d98d262f46b12e79aea2a256372c43824577b5b45620195fef5ce9899a14c8b29e09acb7769c43ace5986aead38b87f9304420666ab5a185229b7b131dd SHA512 ff46e10838353976449927878edc096abc33287156721e17989dbb9ffcf5e1238dedd61000fc81e712e865d63414848ed8345ff11095ee8c7d300b37ba764111
-EBUILD nova-21.1.1.ebuild 7656 BLAKE2B 9715cf99a2213416d7bb6f2fcb4971b179948eb5da5c50d1b50256a6b17c040020fd398e574b55dac8353f3e3f2ced4c3841d9812661106e7df9ad3b46098b4d SHA512 49a1ccf6ec51b414031d8bdba6ed3246cabe265f9e2fe2ac7b09708abdde16eced12e5c8c1b7d37cbda0928e0492d6c7824b8309b28e4be2e440bdb7b16e50f5
-EBUILD nova-21.1.2.ebuild 7658 BLAKE2B cf41045236d69ca97f2e1b7c46cc5f49148d2ccb379b2fa09acab28ff3ee8b4d19040f247596f0bcd16ae649335096de615581e2f35fcc9ffe6915bf677a3274 SHA512 7584dbfcbb9334d940d9de0db02e85579a6987b142b73dc9e68d7dbac9646be827d25de99d53c0f64fcfa9b1dcfcb48068e97f6807d1bb9e1a99a77fee92ce3e
-EBUILD nova-22.0.1.ebuild 7496 BLAKE2B 9490d2b6faba72c8526f18aade9833abc81c0650ceb203b73ea0dfcd8f216a79af31b8b6c4196183140380d9a014e27084c2f77d1ebdeda5e0bea2c6df3b5115 SHA512 2b7e5a1fe04830b860fd6e0aa95324501ece938c7059fefb93dc2d4c21b8f0fcd7b87a01346d5823ba5a092540a1b86a40fbdd483b7c3a8c8553fbf6af2d37b3
-EBUILD nova-22.1.0.ebuild 7498 BLAKE2B 45329d98d262f46b12e79aea2a256372c43824577b5b45620195fef5ce9899a14c8b29e09acb7769c43ace5986aead38b87f9304420666ab5a185229b7b131dd SHA512 ff46e10838353976449927878edc096abc33287156721e17989dbb9ffcf5e1238dedd61000fc81e712e865d63414848ed8345ff11095ee8c7d300b37ba764111
+EBUILD nova-21.1.2.ebuild 7656 BLAKE2B fbb21b099a2915db0e1dedfdd8df335e76a385f16ce225c52142df8d9698c5a06379c431dee7cd7150e60995108f26209bf857dfcb3d26e5d15dbb8cfac689c0 SHA512 616cd46aa311db68013730afa9b33d671008bcf6b3c680fe73743db565434d5df3d32c231826347494a49251db555d358fd968b2a0426428d3e1b35b3c978d75
+EBUILD nova-22.1.0.ebuild 7496 BLAKE2B 9490d2b6faba72c8526f18aade9833abc81c0650ceb203b73ea0dfcd8f216a79af31b8b6c4196183140380d9a014e27084c2f77d1ebdeda5e0bea2c6df3b5115 SHA512 2b7e5a1fe04830b860fd6e0aa95324501ece938c7059fefb93dc2d4c21b8f0fcd7b87a01346d5823ba5a092540a1b86a40fbdd483b7c3a8c8553fbf6af2d37b3
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-21.1.1.ebuild b/sys-cluster/nova/nova-21.1.1.ebuild
deleted file mode 100644
index 0c8937f383c8..000000000000
--- a/sys-cluster/nova/nova-21.1.1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1 eutils linux-info multilib udev
-
-DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	app-emulation/spice-html5
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)
-	acct-user/nova
-	acct-group/nova"
-
-#PATCHES=(
-#	"${FILESDIR}/filename"
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/compute.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-	rm -r "${ED}/usr/etc"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-21.1.2.ebuild b/sys-cluster/nova/nova-21.1.2.ebuild
index 6e90915fb659..5577a24d9e88 100644
--- a/sys-cluster/nova/nova-21.1.2.ebuild
+++ b/sys-cluster/nova/nova-21.1.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/nova/nova-22.0.1.ebuild b/sys-cluster/nova/nova-22.0.1.ebuild
deleted file mode 100644
index c79122d7ce8e..000000000000
--- a/sys-cluster/nova/nova-22.0.1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 eutils linux-info multilib udev
-
-DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	app-emulation/spice-html5
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)
-	acct-user/nova
-	acct-group/nova"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/compute.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-	rm -r "${ED}/usr/etc"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-22.1.0.ebuild b/sys-cluster/nova/nova-22.1.0.ebuild
index 1469e1f90d46..c79122d7ce8e 100644
--- a/sys-cluster/nova/nova-22.1.0.ebuild
+++ b/sys-cluster/nova/nova-22.1.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"