gentoo resync : 24.07.2021

7 files changed, 24 insertions, 301 deletions

diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 414443615a84..9bd7e38ad5ff 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,8 +1,5 @@
-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
+AUX hpx-1.7.0-python.patch 873 BLAKE2B 825d41a28c2e97633d9dfbdb5efd2d2a2d92f7a064c92d709391f672dae7e01b14de8e60b9aed3b6dd72ec07f17ebd78831e35b76c3e57808d58c3d4cf1ffe11 SHA512 ce200541f91642a44a2d5c019e822fe2bc358bf6d9e362b75d2713c651a01aed07a6c46e8ca571d49b805c1bcadd6aa7eb39ad0e65e201d18d02c9884683818b
+DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518
+EBUILD hpx-1.7.0.ebuild 2212 BLAKE2B a576d3f1c6a5ddbe1e6206e0a32ceed4eb11c485e6bc1ed87c34db13dace98239abdf3c473b343885ee66d341d0924eafc518e0f1825d383ea018670019f754c SHA512 b9c1eff106beae95826d1c27d2243b72cb9aef80be2463fa25472a675da8aeb23bd55a306b85a59eea0861f8938482ac1782ac4d831407224f7dbd3ddd6cd72f
+EBUILD hpx-9999.ebuild 2166 BLAKE2B 140771daafdbe48c992eac7c0672112ed738e7f71a8e837e5cf9a329adbd9ff026af6f3cba0e68f318f859500a8675f74d0384882eb2a584ae50c4dea80e08d7 SHA512 177ac7e60273d1b0a7eddb115f2ac5acd40c703bd3899f6dfa4bf69953bd1d8f68dc606615edd1cf9cdb7623f6403521d18bea79d25a2a00b9252df45ce78da2
 MISC metadata.xml 1219 BLAKE2B de2e75ab303cc78d91a327e4887bcb312095757503a93ecd646abbc7e8e44c9d9872768bdc5bdd8200894d904e6306cd6540edf5579a64e686ceed9694701715 SHA512 d696bba0202c159da2a1b887cb66838f1a967a0053ebce6d131dd3dc670a69cf6313ca027a3e2fe9f7c302fbcd1cafb1b3ffe7b057b8d268056640c44b2e3776
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
deleted file mode 100644
index 646084e77294..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 2/3] tests: Remove unused cmake options
-
-This fixes the following warnings:
-
-| * One or more CMake variables were not used by the project:
-| *   BOOST_ROOT
-| *   SETUP_TYPE
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- tests/unit/build/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt
-index 3798549da0a8..7d3bfea1044e 100644
---- a/tests/unit/build/CMakeLists.txt
-+++ b/tests/unit/build/CMakeLists.txt
-@@ -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}
--      -DHPX_DIR=${hpx_dir} -DBOOST_ROOT=${BOOST_ROOT}
-+      -DHPX_DIR=${hpx_dir}
-       ${ADDITIONAL_CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_SAFE}
-       -DCMAKE_BUILD_TYPE=$<CONFIGURATION>
-     VERBATIM
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch b/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
deleted file mode 100644
index 3823bab918bd..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 1de9f65fac6c4b65ff280501d60b9b6dd46c6a8c Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-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:
-
-|/home/kurt/git/hpx/build/docs/sphinx/libs/static_reinit/api.rst:29: WARNING:cpp:identifier reference target not found: HPX_EXPORT_REINITIALIZABLE_STATIC
-
-... and it results in an exception in sphinx:
-
-|Traceback (most recent call last):
-|  File "/usr/lib/python3.7/site-packages/sphinx/cmd/build.py", line 280, in build_main
-|    app.build(args.force_all, filenames)
-|  File "/usr/lib/python3.7/site-packages/sphinx/application.py", line 348, in build
-|    self.builder.build_update()
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 299, in build_update
-|    len(to_build))
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 361, in build
-|    self.write(docnames, list(updated_docnames), method)
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 535, in write
-|    self._write_serial(sorted(docnames))
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 542, in _write_serial
-|    doctree = self.env.get_and_resolve_doctree(docname, self)
-|  File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 539, in get_and_resolve_doctree
-|    self.apply_post_transforms(doctree, docname)
-|  File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 585, in apply_post_transforms
-|    transformer.apply_transforms()
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/__init__.py", line 87, in apply_transforms
-|    super().apply_transforms()
-|  File "/usr/lib/python3.7/site-packages/docutils/transforms/__init__.py", line 171, in apply_transforms
-|    transform.apply(**kwargs)
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 44, in apply
-|    self.run(**kwargs)
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 88, in run
-|    typ, target, node, contnode)
-|  File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7502, in resolve_xref
-|    target, node, contnode)[0]
-|  File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7375, in _resolve_xref_inner
-|    assert parentSymbol  # should be there
-|AssertionError
-
-Actually the macro is not needed. So, just remove it until sphinx is fixed.
-
-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/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_CORE_EXPORT
--#else
--#  define HPX_EXPORT_REINITIALIZABLE_STATIC
--#endif
--// clang-format on
--
- namespace hpx { namespace util {
-     ///////////////////////////////////////////////////////////////////////////
-     //  Provides thread-safe initialization of a single static instance of T.
-@@ -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>
--    struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static;
-+    struct HPX_EXPORT reinitializable_static;
- 
-     //////////////////////////////////////////////////////////////////////////
-     template <typename T, typename Tag, std::size_t N>
--    struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static
-+    struct HPX_EXPORT reinitializable_static
-     {
-     public:
-         HPX_NON_COPYABLE(reinitializable_static);
-@@ -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.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
deleted file mode 100644
index 8a6884a57a1b..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-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/files/hpx-1.6.0-python.patch b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
index 412e7289bc5b..21b7ce3ceeff 100644
--- a/sys-cluster/hpx/files/hpx-1.6.0-python.patch
+++ b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
@@ -1,19 +1,17 @@
 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 1/3] cmake: python: Use standard python interpreter
+Subject: [PATCH 1/4] 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.
 
 Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 ---
- cmake/templates/hpxcxx.in    | 2 +-
- cmake/templates/hpxrun.py.in | 2 +-
+ cmake/templates/hpxcxx.in    |    2 +-
+ cmake/templates/hpxrun.py.in |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in
-index 81f38f89367d..a0fd7837b066 100755
 --- a/cmake/templates/hpxcxx.in
 +++ b/cmake/templates/hpxcxx.in
 @@ -1,4 +1,4 @@
@@ -22,8 +20,6 @@ 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 60e59cc118d9..0c32bba98917 100755
 --- a/cmake/templates/hpxrun.py.in
 +++ b/cmake/templates/hpxrun.py.in
 @@ -1,4 +1,4 @@
@@ -32,6 +28,3 @@ index 60e59cc118d9..0c32bba98917 100755
  #
  # Copyright (c) 2014 Thomas Heller
  #
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/hpx-1.6.0.ebuild b/sys-cluster/hpx/hpx-1.7.0.ebuild
index e5e15ce69bc6..2ab8ea741f30 100644
--- a/sys-cluster/hpx/hpx-1.6.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -19,8 +19,9 @@ HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
 
 SLOT="0"
 LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -29,22 +30,14 @@ REQUIRED_USE="
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-			dev-python/breathe[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? ( ${PYTHON_DEPS} )
 "
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-cpp/asio
 	dev-libs/boost:=
 	sys-apps/hwloc
 	sys-libs/zlib
+	jemalloc? ( dev-libs/jemalloc )
 	mpi? ( virtual/mpi )
 	papi? ( dev-libs/papi )
 	perftools? ( dev-util/google-perftools )
@@ -53,10 +46,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-docs.patch"
 	"${FILESDIR}/${P}-python.patch"
-	"${FILESDIR}/${P}-tests.patch"
 )
 
 hpx_memory_requirement() {
@@ -84,11 +74,11 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DHPX_WITH_EXAMPLES=OFF
-		-DHPX_WITH_DOCUMENTATION=$(usex doc)
+		-DHPX_WITH_DOCUMENTATION=OFF
 		-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
 		-DHPX_WITH_PAPI=$(usex papi)
 		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	if use jemalloc; then
 		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
@@ -105,12 +95,6 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-	use test && cmake_build tests
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake_src_test -j1
 }
 
 src_install() {
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 93a9bd8f1bd3..7f80474d33a5 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -19,8 +19,9 @@ HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
 
 SLOT="0"
 LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -29,22 +30,14 @@ REQUIRED_USE="
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(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}]
-		')
-	)
-	test? ( ${PYTHON_DEPS} )
 "
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-cpp/asio
 	dev-libs/boost:=
 	sys-apps/hwloc
 	sys-libs/zlib
+	jemalloc? ( dev-libs/jemalloc )
 	mpi? ( virtual/mpi )
 	papi? ( dev-libs/papi )
 	perftools? ( dev-util/google-perftools )
@@ -77,11 +70,11 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DHPX_WITH_EXAMPLES=OFF
-		-DHPX_WITH_DOCUMENTATION=$(usex doc)
+		-DHPX_WITH_DOCUMENTATION=OFF
 		-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
 		-DHPX_WITH_PAPI=$(usex papi)
 		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	if use jemalloc; then
 		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
@@ -98,12 +91,6 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-	use test && cmake_build tests
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake_src_test -j1
 }
 
 src_install() {