gentoo resync : 29.06.2020

3 files changed, 82 insertions, 1 deletions

diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index c9df3931e30a..8588e1de67f9 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,7 +1,8 @@
 AUX hpx-1.4.1-boost.patch 1067 BLAKE2B 25002fc609e2d4eef3f8645ecd4aa68ebb7db667fe66e3b33674e175857cbc8b71d8a0c1c86304ceb02df1e7ae7eb06c7a7e21c47d2b7b377fde974dce638416 SHA512 345fa5745f5be2286214d957d6b7d9497d429d8d9628db1d3f0420fdb7df5cefd9e4e06381706b55612b033f29effd085bd68e36122824ef633f23c475a3009d
 AUX hpx-1.4.1-disable-failing-tests.patch 5828 BLAKE2B 2f550b50c8090b5ae88f665c0f862adb20046c7762045917892d435f497691063e9ce56f54aa1ab5b0451dbe9a9a8666c78d7ff6d5593ae7add9d688a87617b0 SHA512 b3b2882bcc3ea7a15ebe04f0f7596608664c21c4383f7e2619b9adf484fc976c6ab5cd820dd0c941af1e2f6000edf2e894ff7aa5f7fd6e0e2e6ec835b58dcbe8
+AUX hpx-1.4.1-placeholder.patch 3760 BLAKE2B da3f34201c7be713f559d1573037fad9b979fea74791dfc3ee14a41245420962bed2dc4dc1a1ee98e5c6e87a66ea89de6c3dac590d83d1cfab102ea0de3707e8 SHA512 7af105e8855cd6ff1160f2fb0400095a1674470b2cf5447cdf3391fcd478bd1c80f35451b30eedd97d46016db74a5dc789cae83b58244163ff2fe5951b693f15
 AUX hpx-1.4.1-python.patch 1095 BLAKE2B e0bf47364e01f96b065af8d3a1e0a23c536f66a56baa71903778528c801dd6ea6d7acf9a3f2acbb580f75d1493752b1c0c30c8ed3c9ee7f71da8c007c93739e3 SHA512 4eee43504e1e60b0ee61fc9d2ea2c61c3b1c7ef00dea38d3b913e7cd8ebbeb9561394ad4680a9b6e9e995a2d3b8478abea9d8221de055f3d810f24db39bf7760
 DIST hpx_1.4.1.tar.gz 4213023 BLAKE2B dc8a9cda3061359ea1bb8eba9ccee60dea308f5425cfe0f18d9003032726962d74d417b8748124c8e6a0b207624093ccf625c82e9e1a71fce8dde74d41d987d2 SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582
-EBUILD hpx-1.4.1.ebuild 2566 BLAKE2B 9546da2933c11e1e6a50cc56149a8fe416df47caa2d911926908409c3f003229f039389ad447ef784400c537c741fe724cb9ae3cce27725f7e089d4e71b8b8ee SHA512 4fea42c1e6c0bce3c5f959dfb2242686fab0002d5ed9bfea57b71aa3ce2354e07820b26a8334fd67232ef252075ffe406f08a5a7990aedecfe21ec763ada1f13
+EBUILD hpx-1.4.1.ebuild 2604 BLAKE2B 6a8fdb61793c2e50ec3891c03e1db3e7a27a8c2cf92a7849790c145b8b2666ae384c7d4e9024ee2d1bc98c4bc581a5dbd1e16412ce7f5770935d54d22c48dbac SHA512 6cc73c8841dec9f3663537c581fd6be8207834dc07a709664bd9ab04574502f76660b6ff42382da573058bca82261e9e41dd0a417975f686ae824abfc6e976de
 EBUILD hpx-9999.ebuild 2440 BLAKE2B 2ad7756b471e832b5b6a7890686ca6c2dfc942bf0ea3ae6e92607b5709dd301d8a5ce121c78155ab730147cf4f767d436f979c9d83934bc5e11ccf1154416710 SHA512 5d683f05438d5e2f08d6872e6955cf8806d72f2f3bdb234b693bec0505263f1330d3bb8f196b104e08342e36e22cf442b2e7b77047c0a5f1715e1e31269bcbcd
 MISC metadata.xml 1189 BLAKE2B a6fedaeaa9c32038109691eb64fd62dd0cf0bc2104710fa49d57a95b09674a23d4e38d03fa2e306734b587a8682c1a7007ed078988226c39f17ccacece740a52 SHA512 eddd398a02bfa3716a373a6cb909a881efd72c11d7e4ce05a722da1fb5d5e464b59999d5bf0de2e608f768d6ceb50ccd64d43e77088c19fa1b28a19b404469da
diff --git a/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch b/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch
new file mode 100644
index 000000000000..94271e6c0eca
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch
@@ -0,0 +1,79 @@
+From 6bdbb6a3ad6ea57c46e9998e9efd46f86f5d5729 Mon Sep 17 00:00:00 2001
+From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
+Date: Tue, 28 Apr 2020 09:52:08 -0500
+Subject: [PATCH] Adding missing using placeholder::_X
+
+- flyby remove unneeded using statements
+
+(cherry picked from commit 1a6882195f9dc8d333ad12898fb88e3ca2931022)
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/performance_counters/registry.cpp                         | 3 ---
+ src/runtime/agas/addressing_service.cpp                       | 3 ++-
+ tests/performance/network/network_storage/network_storage.cpp | 1 -
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/performance_counters/registry.cpp b/src/performance_counters/registry.cpp
+index 34c8d0e71d55..8da91f379a72 100644
+--- a/src/performance_counters/registry.cpp
++++ b/src/performance_counters/registry.cpp
+@@ -378,7 +378,6 @@ namespace hpx { namespace performance_counters
+     counter_status registry::create_raw_counter_value(counter_info const& info,
+         std::int64_t* countervalue, naming::gid_type& id, error_code& ec)
+     {
+-        using util::placeholders::_1;
+         hpx::util::function_nonser<std::int64_t(bool)> func(
+             util::bind_front(wrap_counter, countervalue));
+         return create_raw_counter(info, func, id, ec);
+@@ -401,7 +400,6 @@ namespace hpx { namespace performance_counters
+         hpx::util::function_nonser<std::int64_t()> const& f, naming::gid_type& id,
+         error_code& ec)
+     {
+-        using util::placeholders::_1;
+         hpx::util::function_nonser<std::int64_t(bool)> func(
+             util::bind_front(&wrap_raw_counter, f));
+         return create_raw_counter(info, func, id, ec);
+@@ -465,7 +463,6 @@ namespace hpx { namespace performance_counters
+         hpx::util::function_nonser<std::vector<std::int64_t>()> const& f,
+         naming::gid_type& id, error_code& ec)
+     {
+-        using util::placeholders::_1;
+         hpx::util::function_nonser<std::vector<std::int64_t>(bool)> func(
+             util::bind_front(&wrap_raw_values_counter, f));
+         return create_raw_counter(info, func, id, ec);
+diff --git a/src/runtime/agas/addressing_service.cpp b/src/runtime/agas/addressing_service.cpp
+index f30760c0e05e..b416a28d12d8 100644
+--- a/src/runtime/agas/addressing_service.cpp
++++ b/src/runtime/agas/addressing_service.cpp
+@@ -1864,7 +1864,6 @@ future<hpx::id_type> addressing_service::on_symbol_namespace_event(
+     hpx::future<bool> f =
+         symbol_ns_.on_event(name, call_for_past_events, p.get_id());
+ 
+-    using util::placeholders::_1;
+     return f.then(
+         hpx::launch::sync,
+         util::one_shot(util::bind_back(
+@@ -2356,6 +2355,8 @@ void addressing_service::register_counter_types()
+         util::bind_front(
+             &addressing_service::get_cache_erase_entry_time, this));
+ 
++    using util::placeholders::_1;
++    using util::placeholders::_2;
+     performance_counters::generic_counter_type_data const counter_types[] =
+     {
+         { "/agas/count/cache/entries", performance_counters::counter_raw,
+diff --git a/tests/performance/network/network_storage/network_storage.cpp b/tests/performance/network/network_storage/network_storage.cpp
+index 33fc1a66afa4..dfcffbafb180 100644
+--- a/tests/performance/network/network_storage/network_storage.cpp
++++ b/tests/performance/network/network_storage/network_storage.cpp
+@@ -802,7 +802,6 @@ void test_read(
+                 ++FuturesWaiting[send_rank];
+                 std::lock_guard<hpx::lcos::local::spinlock> lk(FuturesMutex);
+ #endif
+-                using hpx::util::placeholders::_1;
+                 std::size_t buffer_address =
+                     reinterpret_cast<std::size_t>(general_buffer.data());
+                 //
+-- 
+2.26.2
+
diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.4.1.ebuild
index 9a3dc2abc763..964325329bb6 100644
--- a/sys-cluster/hpx/hpx-1.4.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.4.1.ebuild
@@ -55,6 +55,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-boost.patch"
 	"${FILESDIR}/${P}-disable-failing-tests.patch"
+	"${FILESDIR}/${P}-placeholder.patch"
 	"${FILESDIR}/${P}-python.patch"
 )