gentoo resync : 05.03.2021

5 files changed, 136 insertions, 132 deletions

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
+