gentoo resync : 20.06.2021

19 files changed, 21 insertions, 1021 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 685467031602..7daa77e58ea8 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/airtraf/Manifest b/net-wireless/airtraf/Manifest
index 8bc09aee8d70..10506fb14c47 100644
--- a/net-wireless/airtraf/Manifest
+++ b/net-wireless/airtraf/Manifest
@@ -3,5 +3,5 @@ AUX airtraf-1.1-fprintf-format.patch 421 BLAKE2B 8acd7417ded374a9973f52be45ee171
 AUX airtraf-1.1-off-by-one.patch 744 BLAKE2B c2000cc9014cfb02cb65fa6a51e3803c54dc813ef0268ec35fdf3119033438ab5b24e9caa5c0104435deeeedb46c545ada16683ccb638628385aef13647aafb5 SHA512 c19194498b2169a4ac20f20e51ea197bc9c96f5150a730a299375ea8d6babb4e498246fd8faf93d7dc285ca8a21d300a33102b2860868c7b9b02c89bd818c1fb
 AUX airtraf-1.1-sniffd.patch 1699 BLAKE2B b175d5d6b82beb519d4a74c4faabd9967d030a08b0fe18c779ca6cccb34a277e740a861034e0e567278ba2485c842bd2be05f4e64dfc38a3a1af3e14fa2a57a5 SHA512 6906700e625d8c9b78b248d281b19e158610c1d58d1ab23de3526bf3d060b3bdc259ae768b587ff52fdbaf4dd343ccda30517578825b75e65ff11d7fda515a1f
 DIST airtraf-1.1.tar.gz 136241 BLAKE2B 682516c6441efac8699fb15d40b99b50882d1c2d9e3acd344a979df080ca4f5532b0aa3247f37360f78ad2902018f907d6fe3e912b1d7b0df383c3bfe16f61a9 SHA512 7f341abb25e15dbdf510805230ee2f186a7a66d5c1e486bfdb978d3d8534d8b8c2cc1b5e0e323357c65af1eedbcb1da3e3e5f3ac8299db5f203f54b4a868f90b
-EBUILD airtraf-1.1-r4.ebuild 1113 BLAKE2B 222dd45e37a9ebd42741e28e3eb11c6db5e25df54d304cc880e0bc7687fabc050237a3a70b87653a87631818fac5801d1acec21ce23c481b6780df7d0f347715 SHA512 76a8b630ea2b44d63053cbf70a96eddb5a9eec2550d67713ee2a563eeaa4c68bb1cdeb966748c9c73a2f02fd42c2d33fc339bff5c362d77eb81834d1fab1978b
+EBUILD airtraf-1.1-r4.ebuild 1120 BLAKE2B 373a49074417e6759d52e92ff33a65bf843a6cf4cb1f914096e9a29c2158d931d904e3b8a23ab00f8bbebe8207c0e47ab9e898c8714d1bdefff7e18f678c29ae SHA512 203c04117c9c0c9cd1d0caf5946da83b9e8b4abd9865e52917fb72f9108f61d75d4b42d750a27dde978812157f242877b4d6c982a7abea77e24458e554fed5ab
 MISC metadata.xml 684 BLAKE2B 58863082b9d07f5798333fd9ab8e1a7777fe7ce8e0a63a4bbb5f6905b4125547c1248fcfa95027668fba537399330ef4464a3a2681733bb0ba68ede152ac7db7 SHA512 51cdb73af9ffdaba0fb7a8778dd573885fa446def0baa3932925e89357d43fe33af62095d01f1cc51f5135c2cfb09f7044381b080e077c7bae0a3276a231ae33
diff --git a/net-wireless/airtraf/airtraf-1.1-r4.ebuild b/net-wireless/airtraf/airtraf-1.1-r4.ebuild
index 267ec5084789..2409649ad21f 100644
--- a/net-wireless/airtraf/airtraf-1.1-r4.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1-r4.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
@@ -15,10 +15,9 @@ RDEPEND="
 	net-libs/libpcap
 	sys-libs/ncurses:=
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-sniffd.patch
 	"${FILESDIR}"/${P}-off-by-one.patch
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 14fe65c930af..b7f82f5420dc 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,8 +1,3 @@
-AUX gnuradio-3.8.2.0-3967.patch 1903 BLAKE2B 7024ab52326b9ff6aa12a924ec527d3c28c4decba669255f7bb099fdb3e21132beb3626af3599e7647e1aa9fbd413fd4391b22bc9c9698fd2727551cc0739497 SHA512 9ea85fc17ae2910c268955097b9e36bd530fce1092451231df6b124f39440b2d03739d98132403d1dccf942346f0cf4a286988d10709d0c64e1fa225daf80a97
-AUX gnuradio-3.8.2.0-lamda-gr-qtgui.patch 11510 BLAKE2B 17154b93d39517cdd0b6607988c60fbc2274644b3b1f0f88fb36f4cb38820365a7c9b1a52ba17f96725d3a1f6596662ebe837f6837a7a67c7d6e8b4b01d2d7ff SHA512 2e2420b65188b88c3b9759cc2feb89c28c9c1cc151ff8555df7cac095f8619445f4594f60fafea6340ae8e3892fe509f66b3f7c8d4bae8bbfd2085ff74f3005c
-AUX gnuradio-3.8.2.0-lamda-gr-uhd.patch 3748 BLAKE2B bfda3afe8dcc5b872a86379d6d3aaad53e57ed10aa394f7b36abbe27e69886fe876f5cb9ba03489f5cb4e0362e782f01bacf9956b3709f21ef0c7841ee2b2e04 SHA512 ea69d44b66b2962327141173d4b66add7885f3ece2302fceb3e5cf294f9502b0e6ac34dd28b9b7ff1b3faa024552be70334629c28e596fc4c621f89fec1c4ab5
-AUX gnuradio-3.8.2.0-lamda-most-components.patch 14122 BLAKE2B 30e63140ced2fdfd9712051ae6d758f2de57511bfdea972364c37d70c1eaf6e41921ad4e14e8f005be53016d8613e1c524b529c7b0e2476afc103edb49cfd946 SHA512 86f5f3ed6856fd183e71af1e6a94bc7e4310842f48a1ae7ed85b79d7a1ff86ebe84027bf24c3dc14a47c28335cc5edc321a7fce1ce24bcb26c0d7432e7aab4f7
-AUX gnuradio-3.8.2.0-lamda-set-msg-handlers.patch 14027 BLAKE2B 5a4a248264df514991343c4eb134c3f3fca2c2e11a5b4eeb63eaa1d0d16a45d87b9a9edebbe30dafeec6488926a7be7ab44d8c15b3c5529000fb488dc7b2dff4 SHA512 6d62d0fc8c06d0df6c046fc69c0280ba1dd2a2f409694c48af67cc6ee72b82d492ef86d10f6d44e4a053f54da187a5dcdc370a82358f2a8595bd37dd8d15eb02
 DIST gnuradio-3.8.3.1.tar.gz 3394001 BLAKE2B 3d1da3b005e03b01c563c1ce4a323cf14917a59eb4e2d6ff1ec36446c3b5b8786ea521976534003c0c8cb7849ab5ba4647fae4ef5794b138da768ac931dd7119 SHA512 f22311274e93a4c150dff5cb617802fa70f18bc259139be0b41fdaee5d9b95781743f906d6e3833601afe5de2b0476e0daac8f3bc9ea22932a90c875bfe79204
 EBUILD gnuradio-3.8.3.1.ebuild 6115 BLAKE2B 95a4129cea2b525222a8cd998765337798aceb7cdf513ddea9d79a69287bb5b9d022121d9e19cc644515616de7f64828a93654ed4e42a39a6ac623a2f416e70a SHA512 00f69d0d140312ae462b26d7deddabd262c9958f76308f3c32b2cd27d418fcb1527cc969af5cf3c0ff6124fd5ce5021c8175b687c1f1881deff4265a872b7135
 EBUILD gnuradio-9999.ebuild 5975 BLAKE2B 76f3be3c1c87c7dee97d43ff546f7b589c3986ba085c62e6a5e43e3d9c88f1927195f7714f90d98f55059e2332d67ef522cd2f7629a402d4cb392a3d7038259c SHA512 1dc35be323b616167438dc4c78d6db9c82736de84ea68b4a9a6e7b4168d2b258ba9e0a15b74b079178c532e62dee5dfae0bc2d826b69cb9a5d2c70fdff675bbc
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch
deleted file mode 100644
index bee81049e24e..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cbcb968358fad56f3646619b258f18b0e6693a07 Mon Sep 17 00:00:00 2001
-From: Jeff Long <willcode4@gmail.com>
-Date: Wed, 25 Nov 2020 09:44:55 -0500
-Subject: [PATCH 1/2] Boost placeholder scope required (using
- boost::placeholders)
-
----
- gnuradio-runtime/include/gnuradio/basic_block.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
-index 1d31e2e9b8..0aace8f38d 100644
---- a/gnuradio-runtime/include/gnuradio/basic_block.h
-+++ b/gnuradio-runtime/include/gnuradio/basic_block.h
-@@ -41,7 +41,7 @@
- #include <gnuradio/rpcregisterhelpers.h>
- 
- namespace gr {
--
-+using namespace boost::placeholders;
- /*!
-  * \brief The abstract base class for all signal processing blocks.
-  * \ingroup internal
-
-From 951b16756934f28bc3da4b3c442651b2fbe79b05 Mon Sep 17 00:00:00 2001
-From: Jeff Long <willcode4@gmail.com>
-Date: Wed, 25 Nov 2020 11:05:56 -0500
-Subject: [PATCH 2/2] boost bind: make placeholder namespace conditional on
- boost version
-
----
- gnuradio-runtime/include/gnuradio/basic_block.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
-index 0aace8f38d..c57c1cf553 100644
---- a/gnuradio-runtime/include/gnuradio/basic_block.h
-+++ b/gnuradio-runtime/include/gnuradio/basic_block.h
-@@ -33,6 +33,9 @@
- #include <boost/foreach.hpp>
- #include <boost/function.hpp>
- #include <boost/thread/condition_variable.hpp>
-+#if (BOOST_VERSION >= 106000)
-+#include <boost/bind/bind.hpp>
-+#endif
- #include <deque>
- #include <iostream>
- #include <map>
-@@ -41,7 +44,9 @@
- #include <gnuradio/rpcregisterhelpers.h>
- 
- namespace gr {
-+#if (BOOST_VERSION >= 106000)
- using namespace boost::placeholders;
-+#endif
- /*!
-  * \brief The abstract base class for all signal processing blocks.
-  * \ingroup internal
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch
deleted file mode 100644
index 0057b38836ce..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From faa5e19e15f77a0ba5e7f854df6517c280034369 Mon Sep 17 00:00:00 2001
-From: Johannes Demel <demel@ant.uni-bremen.de>
-Date: Sat, 9 May 2020 15:28:58 +0200
-Subject: [PATCH] msg_handler: Use lambdas in gr-qtgui
-
-gr-qtgui uses lambdas instead of `boost::bind` to register message
-handlers now. This component makes quite heavy use of message handlers.
----
- gr-qtgui/lib/const_sink_c_impl.cc       | 3 +--
- gr-qtgui/lib/edit_box_msg_impl.cc       | 2 +-
- gr-qtgui/lib/freq_sink_c_impl.cc        | 6 +++---
- gr-qtgui/lib/freq_sink_f_impl.cc        | 6 +++---
- gr-qtgui/lib/histogram_sink_f_impl.cc   | 3 +--
- gr-qtgui/lib/sink_c_impl.cc             | 2 +-
- gr-qtgui/lib/sink_f_impl.cc             | 2 +-
- gr-qtgui/lib/time_raster_sink_b_impl.cc | 3 +--
- gr-qtgui/lib/time_raster_sink_f_impl.cc | 3 +--
- gr-qtgui/lib/time_sink_c_impl.cc        | 2 +-
- gr-qtgui/lib/time_sink_f_impl.cc        | 2 +-
- gr-qtgui/lib/waterfall_sink_c_impl.cc   | 9 +++------
- gr-qtgui/lib/waterfall_sink_f_impl.cc   | 9 +++------
- 13 files changed, 21 insertions(+), 31 deletions(-)
-
-diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc
-index 852f6ee109..e4b01907f1 100644
---- a/gr-qtgui/lib/const_sink_c_impl.cc
-+++ b/gr-qtgui/lib/const_sink_c_impl.cc
-@@ -69,8 +69,7 @@ const_sink_c_impl::const_sink_c_impl(int size,
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"),
--                    boost::bind(&const_sink_c_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- 
-     for (int i = 0; i < d_nconnections; i++) {
-         d_residbufs_real.push_back(
-diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc
-index 8713aa820e..04f860785a 100644
---- a/gr-qtgui/lib/edit_box_msg_impl.cc
-+++ b/gr-qtgui/lib/edit_box_msg_impl.cc
-@@ -158,7 +158,7 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type,
-     message_port_register_out(d_port);
-     message_port_register_in(pmt::mp("val"));
- 
--    set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1));
-+    set_msg_handler(pmt::mp("val"), [this](pmt::pmt_t msg) { this->set_value(msg); });
- }
- 
- edit_box_msg_impl::~edit_box_msg_impl()
-diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
-index 3a34df6ec6..137bccc3c3 100644
---- a/gr-qtgui/lib/freq_sink_c_impl.cc
-+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
-@@ -82,17 +82,17 @@ freq_sink_c_impl::freq_sink_c_impl(int fftsize,
- 
-     // setup bw input port
-     message_port_register_in(d_port_bw);
--    set_msg_handler(d_port_bw, boost::bind(&freq_sink_c_impl::handle_set_bw, this, _1));
-+    set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); });
- 
-     // setup output message port to post frequency when display is
-     // double-clicked
-     message_port_register_out(d_port);
-     message_port_register_in(d_port);
--    set_msg_handler(d_port, boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1));
-+    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_c_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- 
-     d_main_gui = NULL;
- 
-diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
-index c14bfc31fd..0b1757c03c 100644
---- a/gr-qtgui/lib/freq_sink_f_impl.cc
-+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
-@@ -82,17 +82,17 @@ freq_sink_f_impl::freq_sink_f_impl(int fftsize,
- 
-     // setup bw input port
-     message_port_register_in(d_port_bw);
--    set_msg_handler(d_port_bw, boost::bind(&freq_sink_f_impl::handle_set_bw, this, _1));
-+    set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); });
- 
-     // setup output message port to post frequency when display is
-     // double-clicked
-     message_port_register_out(d_port);
-     message_port_register_in(d_port);
--    set_msg_handler(d_port, boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1));
-+    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_f_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- 
-     d_main_gui = NULL;
- 
-diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc
-index d16de932ca..fd357bf40a 100644
---- a/gr-qtgui/lib/histogram_sink_f_impl.cc
-+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
-@@ -81,8 +81,7 @@ histogram_sink_f_impl::histogram_sink_f_impl(int size,
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"),
--                    boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- 
-     // +1 for the PDU buffer
-     for (int i = 0; i < d_nconnections + 1; i++) {
-diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
-index d3feb9d16c..8f7ff36ba2 100644
---- a/gr-qtgui/lib/sink_c_impl.cc
-+++ b/gr-qtgui/lib/sink_c_impl.cc
-@@ -96,7 +96,7 @@ sink_c_impl::sink_c_impl(int fftsize,
-     // double-clicked
-     message_port_register_out(d_port);
-     message_port_register_in(d_port);
--    set_msg_handler(d_port, boost::bind(&sink_c_impl::handle_set_freq, this, _1));
-+    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
- 
-     d_main_gui = NULL;
- 
-diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
-index 418b630b78..0b1eccad12 100644
---- a/gr-qtgui/lib/sink_f_impl.cc
-+++ b/gr-qtgui/lib/sink_f_impl.cc
-@@ -95,7 +95,7 @@ sink_f_impl::sink_f_impl(int fftsize,
-     // double-clicked
-     message_port_register_out(d_port);
-     message_port_register_in(d_port);
--    set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1));
-+    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
- 
-     d_main_gui = NULL;
- 
-diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc
-index 045c216b00..063ed09d0c 100644
---- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
-+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
-@@ -83,8 +83,7 @@ time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate,
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"),
--                    boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- 
-     d_scale = 1.0f;
- 
-diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc
-index d186f319da..df94d217bd 100644
---- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
-+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
-@@ -83,8 +83,7 @@ time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate,
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"),
--                    boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- 
-     d_icols = static_cast<int>(ceil(d_cols));
-     d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment());
-diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
-index b73a1c1ad3..26dc5d2e32 100644
---- a/gr-qtgui/lib/time_sink_c_impl.cc
-+++ b/gr-qtgui/lib/time_sink_c_impl.cc
-@@ -80,7 +80,7 @@ time_sink_c_impl::time_sink_c_impl(int size,
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- 
-     // +2 for the PDU message buffers
-     for (unsigned int n = 0; n < d_nconnections + 2; n++) {
-diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
-index df13998d75..8f41d02143 100644
---- a/gr-qtgui/lib/time_sink_f_impl.cc
-+++ b/gr-qtgui/lib/time_sink_f_impl.cc
-@@ -80,7 +80,7 @@ time_sink_f_impl::time_sink_f_impl(int size,
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- 
-     // +1 for the PDU buffer
-     for (unsigned int n = 0; n < d_nconnections + 1; n++) {
-diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc
-index fcf2ed98bc..20cebbcbda 100644
---- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
-+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
-@@ -117,20 +117,17 @@ waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize,
- 
-     // setup bw input port
-     message_port_register_in(d_port_bw);
--    set_msg_handler(d_port_bw,
--                    boost::bind(&waterfall_sink_c_impl::handle_set_bw, this, _1));
-+    set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); });
- 
-     // setup output message port to post frequency when display is
-     // double-clicked
-     message_port_register_out(d_port);
-     message_port_register_in(d_port);
--    set_msg_handler(d_port,
--                    boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1));
-+    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"),
--                    boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- }
- 
- waterfall_sink_c_impl::~waterfall_sink_c_impl()
-diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc
-index aa1037a472..4ba6427f08 100644
---- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
-+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
-@@ -115,20 +115,17 @@ waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize,
- 
-     // setup bw input port
-     message_port_register_in(d_port_bw);
--    set_msg_handler(d_port_bw,
--                    boost::bind(&waterfall_sink_f_impl::handle_set_bw, this, _1));
-+    set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); });
- 
-     // setup output message port to post frequency when display is
-     // double-clicked
-     message_port_register_out(d_port);
-     message_port_register_in(d_port);
--    set_msg_handler(d_port,
--                    boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1));
-+    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
- 
-     // setup PDU handling input port
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"),
--                    boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
- }
- 
- waterfall_sink_f_impl::~waterfall_sink_f_impl()
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch
deleted file mode 100644
index 56787372af0c..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 591c2c16355eb065ff3f51f23d9d6026be188132 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Sat, 22 Aug 2020 14:06:22 +0200
-Subject: [PATCH] msg_handler: Use lambdas in gr-uhd
-
----
- gr-uhd/lib/amsg_source_impl.cc |  3 +--
- gr-uhd/lib/usrp_block_impl.cc  | 10 ++++++----
- gr-uhd/lib/usrp_block_impl.h   |  1 -
- gr-uhd/lib/usrp_source_impl.cc |  6 ++++--
- 4 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/gr-uhd/lib/amsg_source_impl.cc b/gr-uhd/lib/amsg_source_impl.cc
-index 46d47a5826..e1de62e028 100644
---- a/gr-uhd/lib/amsg_source_impl.cc
-+++ b/gr-uhd/lib/amsg_source_impl.cc
-@@ -22,7 +22,6 @@
- 
- #include "amsg_source_impl.h"
- #include "gr_uhd_common.h"
--#include <boost/bind.hpp>
- 
- namespace gr {
- namespace uhd {
-@@ -44,7 +43,7 @@ amsg_source_impl::amsg_source_impl(const ::uhd::device_addr_t& device_addr,
-     : _msgq(msgq), _running(true)
- {
-     _dev = ::uhd::usrp::multi_usrp::make(device_addr);
--    _amsg_thread = gr::thread::thread(boost::bind(&amsg_source_impl::recv_loop, this));
-+    _amsg_thread = gr::thread::thread([this]() { this->recv_loop(); });
- }
- 
- amsg_source_impl::~amsg_source_impl()
-diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
-index e5e1dd9161..8344809837 100644
---- a/gr-uhd/lib/usrp_block_impl.cc
-+++ b/gr-uhd/lib/usrp_block_impl.cc
-@@ -21,7 +21,7 @@
-  */
- 
- #include "usrp_block_impl.h"
--#include <boost/make_shared.hpp>
-+#include <functional>
- 
- using namespace gr::uhd;
- 
-@@ -139,10 +139,11 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr,
-     set_msg_handler(pmt::mp("command"),
-                     [this](pmt::pmt_t msg) { this->msg_handler_command(msg); });
- 
--// cuz we lazy:
-+    // because we're highly efficient and adverse to work
-+    namespace ph = std::placeholders;
- #define REGISTER_CMD_HANDLER(key, _handler) \
--    register_msg_cmd_handler(key,           \
--                             boost::bind(&usrp_block_impl::_handler, this, _1, _2, _3))
-+    register_msg_cmd_handler(               \
-+        key, std::bind(&usrp_block_impl::_handler, this, ph::_1, ph::_2, ph::_3))
-     // Register default command handlers:
-     REGISTER_CMD_HANDLER(cmd_freq_key(), _cmd_handler_freq);
-     REGISTER_CMD_HANDLER(cmd_gain_key(), _cmd_handler_gain);
-@@ -153,6 +154,7 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr,
-     REGISTER_CMD_HANDLER(cmd_rate_key(), _cmd_handler_rate);
-     REGISTER_CMD_HANDLER(cmd_bandwidth_key(), _cmd_handler_bw);
-     REGISTER_CMD_HANDLER(cmd_antenna_key(), _cmd_handler_antenna);
-+#undef REGISTER_CMD_HANDLER
- }
- 
- usrp_block_impl::~usrp_block_impl()
-diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h
-index 1dbc3813bd..479b7dcd65 100644
---- a/gr-uhd/lib/usrp_block_impl.h
-+++ b/gr-uhd/lib/usrp_block_impl.h
-@@ -26,7 +26,6 @@
- #include <gnuradio/uhd/usrp_block.h>
- #include <pmt/pmt.h>
- #include <uhd/usrp/multi_usrp.hpp>
--#include <boost/bind.hpp>
- #include <boost/dynamic_bitset.hpp>
- 
- 
-diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc
-index a2ff0821bd..1e8ef020ab 100644
---- a/gr-uhd/lib/usrp_source_impl.cc
-+++ b/gr-uhd/lib/usrp_source_impl.cc
-@@ -57,8 +57,10 @@ usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t& device_addr,
- 
-     _samp_rate = this->get_samp_rate();
-     _samps_per_packet = 1;
--    register_msg_cmd_handler(cmd_tag_key(),
--                             boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1));
-+    register_msg_cmd_handler(
-+        cmd_tag_key(), [this](const pmt::pmt_t& val, int chan, const pmt::pmt_t& msg) {
-+            this->_cmd_handler_tag(val);
-+        });
- }
- 
- usrp_source_impl::~usrp_source_impl() {}
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch
deleted file mode 100644
index ea687a7ed876..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From c6e3632952bd3e86e4d8437d7619e7fececb524e Mon Sep 17 00:00:00 2001
-From: Johannes Demel <demel@ant.uni-bremen.de>
-Date: Sat, 9 May 2020 15:14:37 +0200
-Subject: [PATCH] msg_handler: Use lambdas in most components
-
-With this commit, all components except gr-qtgui use lambdas instead of
-`boost::bind` to register msg handlers.
----
- gr-digital/lib/chunks_to_symbols_impl.cc         |  6 ++----
- gr-digital/lib/constellation_receiver_cb_impl.cc | 10 ++++------
- gr-digital/lib/costas_loop_cc_impl.cc            |  2 +-
- gr-digital/lib/crc32_async_bb_impl.cc            |  4 ++--
- gr-digital/lib/header_payload_demux_impl.cc      |  5 ++---
- gr-digital/lib/protocol_formatter_async_impl.cc  |  3 +--
- gr-fec/lib/async_decoder_impl.cc                 |  5 ++---
- gr-fec/lib/async_encoder_impl.cc                 |  5 ++---
- gr-fec/lib/depuncture_bb_impl.cc                 |  2 +-
- gr-fec/lib/puncture_bb_impl.cc                   |  2 +-
- gr-fec/lib/puncture_ff_impl.cc                   |  2 +-
- gr-filter/lib/freq_xlating_fir_filter_impl.cc    |  8 ++------
- gr-filter/lib/mmse_resampler_cc_impl.cc          |  2 +-
- gr-filter/lib/mmse_resampler_ff_impl.cc          |  2 +-
- gr-uhd/lib/usrp_block_impl.cc                    |  2 +-
- gr-zeromq/lib/pub_msg_sink_impl.cc               |  2 +-
- gr-zeromq/lib/push_msg_sink_impl.cc              |  2 +-
- 17 files changed, 26 insertions(+), 38 deletions(-)
-
-diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc
-index 26d590a66e..c2cc99b0c8 100644
---- a/gr-digital/lib/chunks_to_symbols_impl.cc
-+++ b/gr-digital/lib/chunks_to_symbols_impl.cc
-@@ -51,10 +51,8 @@ chunks_to_symbols_impl<IN_T, OUT_T>::chunks_to_symbols_impl(
-       d_symbol_table(symbol_table)
- {
-     this->message_port_register_in(pmt::mp("set_symbol_table"));
--    this->set_msg_handler(
--        pmt::mp("set_symbol_table"),
--        boost::bind(
--            &chunks_to_symbols_impl<IN_T, OUT_T>::handle_set_symbol_table, this, _1));
-+    this->set_msg_handler(pmt::mp("set_symbol_table"),
-+                          [this](pmt::pmt_t msg) { this->handle_set_symbol_table(msg); });
- }
- 
- template <class IN_T, class OUT_T>
-diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc
-index 7fb7559d5e..1c160ff1bb 100644
---- a/gr-digital/lib/constellation_receiver_cb_impl.cc
-+++ b/gr-digital/lib/constellation_receiver_cb_impl.cc
-@@ -61,14 +61,12 @@ constellation_receiver_cb_impl::constellation_receiver_cb_impl(
-             "This receiver only works with constellations of dimension 1.");
- 
-     message_port_register_in(pmt::mp("set_constellation"));
--    set_msg_handler(
--        pmt::mp("set_constellation"),
--        boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, this, _1));
-+    set_msg_handler(pmt::mp("set_constellation"),
-+                    [this](pmt::pmt_t msg) { this->handle_set_constellation(msg); });
- 
-     message_port_register_in(pmt::mp("rotate_phase"));
--    set_msg_handler(
--        pmt::mp("rotate_phase"),
--        boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, this, _1));
-+    set_msg_handler(pmt::mp("rotate_phase"),
-+                    [this](pmt::pmt_t msg) { this->handle_rotate_phase(msg); });
- }
- 
- constellation_receiver_cb_impl::~constellation_receiver_cb_impl() {}
-diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc
-index c3b30834eb..b1a0e67caa 100644
---- a/gr-digital/lib/costas_loop_cc_impl.cc
-+++ b/gr-digital/lib/costas_loop_cc_impl.cc
-@@ -82,7 +82,7 @@ costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order, bool use_snr)
- 
-     message_port_register_in(pmt::mp("noise"));
-     set_msg_handler(pmt::mp("noise"),
--                    boost::bind(&costas_loop_cc_impl::handle_set_noise, this, _1));
-+                    [this](pmt::pmt_t msg) { this->handle_set_noise(msg); });
- }
- 
- costas_loop_cc_impl::~costas_loop_cc_impl() {}
-diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc
-index bffbb2a737..230decc2ae 100644
---- a/gr-digital/lib/crc32_async_bb_impl.cc
-+++ b/gr-digital/lib/crc32_async_bb_impl.cc
-@@ -48,9 +48,9 @@ crc32_async_bb_impl::crc32_async_bb_impl(bool check)
-     message_port_register_out(d_out_port);
- 
-     if (check)
--        set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this, _1));
-+        set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->check(msg); });
-     else
--        set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this, _1));
-+        set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->calc(msg); });
- }
- 
- crc32_async_bb_impl::~crc32_async_bb_impl() {}
-diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc
-index 98c805fb20..5dc65f422b 100644
---- a/gr-digital/lib/header_payload_demux_impl.cc
-+++ b/gr-digital/lib/header_payload_demux_impl.cc
-@@ -150,9 +150,8 @@ header_payload_demux_impl::header_payload_demux_impl(
-     }
-     set_tag_propagation_policy(TPP_DONT);
-     message_port_register_in(msg_port_id());
--    set_msg_handler(
--        msg_port_id(),
--        boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1));
-+    set_msg_handler(msg_port_id(),
-+                    [this](pmt::pmt_t msg) { this->parse_header_data_msg(msg); });
-     for (size_t i = 0; i < special_tags.size(); i++) {
-         d_special_tags.push_back(pmt::string_to_symbol(special_tags[i]));
-         d_special_tags_last_value.push_back(pmt::PMT_NIL);
-diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc
-index 84b693745d..08e324ecfb 100644
---- a/gr-digital/lib/protocol_formatter_async_impl.cc
-+++ b/gr-digital/lib/protocol_formatter_async_impl.cc
-@@ -54,8 +54,7 @@ protocol_formatter_async_impl::protocol_formatter_async_impl(
-     message_port_register_out(d_hdr_port);
-     message_port_register_out(d_pld_port);
- 
--    set_msg_handler(d_in_port,
--                    boost::bind(&protocol_formatter_async_impl::append, this, _1));
-+    set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->append(msg); });
- }
- 
- protocol_formatter_async_impl::~protocol_formatter_async_impl() {}
-diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc
-index e7a668c832..c907b297a5 100644
---- a/gr-fec/lib/async_decoder_impl.cc
-+++ b/gr-fec/lib/async_decoder_impl.cc
-@@ -64,11 +64,10 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder,
- 
-     if (d_packed) {
-         d_pack = new blocks::kernel::pack_k_bits(8);
--        set_msg_handler(d_in_port,
--                        boost::bind(&async_decoder_impl::decode_packed, this, _1));
-+        set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->decode_packed(msg); });
-     } else {
-         set_msg_handler(d_in_port,
--                        boost::bind(&async_decoder_impl::decode_unpacked, this, _1));
-+                        [this](pmt::pmt_t msg) { this->decode_unpacked(msg); });
-     }
- 
-     // The maximum frame size is set by the initial frame size of the decoder.
-diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc
-index 811d55601f..2e8fd62d12 100644
---- a/gr-fec/lib/async_encoder_impl.cc
-+++ b/gr-fec/lib/async_encoder_impl.cc
-@@ -63,8 +63,7 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder,
-     message_port_register_out(d_out_port);
- 
-     if (d_packed) {
--        set_msg_handler(d_in_port,
--                        boost::bind(&async_encoder_impl::encode_packed, this, _1));
-+        set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->encode_packed(msg); });
- 
-         d_unpack = new blocks::kernel::unpack_k_bits(8);
- 
-@@ -74,7 +73,7 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder,
- 
-     } else {
-         set_msg_handler(d_in_port,
--                        boost::bind(&async_encoder_impl::encode_unpacked, this, _1));
-+                        [this](pmt::pmt_t msg) { this->encode_unpacked(msg); });
-     }
- 
-     if (d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) {
-diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc
-index 27d00bb5bb..59ed44dd8a 100644
---- a/gr-fec/lib/depuncture_bb_impl.cc
-+++ b/gr-fec/lib/depuncture_bb_impl.cc
-@@ -74,7 +74,7 @@ depuncture_bb_impl::depuncture_bb_impl(int puncsize, int puncpat, int delay, cha
-     set_fixed_rate(true);
-     set_relative_rate((uint64_t)d_puncsize, (uint64_t)(d_puncsize - d_puncholes));
-     set_output_multiple(d_puncsize);
--    // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, _1));
-+    // set_msg_handler(<portname>, [this](pmt::pmt_t msg) { this->catch_msg(msg); });
- }
- 
- depuncture_bb_impl::~depuncture_bb_impl() {}
-diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc
-index a365d6a69f..1f328c2214 100644
---- a/gr-fec/lib/puncture_bb_impl.cc
-+++ b/gr-fec/lib/puncture_bb_impl.cc
-@@ -72,7 +72,7 @@ puncture_bb_impl::puncture_bb_impl(int puncsize, int puncpat, int delay)
-     set_fixed_rate(true);
-     set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize);
-     set_output_multiple(d_puncsize - d_puncholes);
--    // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, this, _1));
-+    // set_msg_handler(<portname>, [this](pmt::pmt_t msg) { this->catch_msg(msg); });
- }
- 
- puncture_bb_impl::~puncture_bb_impl() {}
-diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc
-index c95288d691..31c686ea4c 100644
---- a/gr-fec/lib/puncture_ff_impl.cc
-+++ b/gr-fec/lib/puncture_ff_impl.cc
-@@ -72,7 +72,7 @@ puncture_ff_impl::puncture_ff_impl(int puncsize, int puncpat, int delay)
-     set_fixed_rate(true);
-     set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize);
-     set_output_multiple(d_puncsize - d_puncholes);
--    // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, this, _1));
-+    // set_msg_handler(<portname>, [this](pmt::pmt_t msg) { this->catch_msg(msg); });
- }
- 
- puncture_ff_impl::~puncture_ff_impl() {}
-diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.cc b/gr-filter/lib/freq_xlating_fir_filter_impl.cc
-index 8ddc967ba1..1050fb82a5 100644
---- a/gr-filter/lib/freq_xlating_fir_filter_impl.cc
-+++ b/gr-filter/lib/freq_xlating_fir_filter_impl.cc
-@@ -67,12 +67,8 @@ freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::freq_xlating_fir_filter_impl(
-     this->build_composite_fir();
- 
-     this->message_port_register_in(pmt::mp("freq"));
--    this->set_msg_handler(
--        pmt::mp("freq"),
--        boost::bind(
--            &freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::handle_set_center_freq,
--            this,
--            _1));
-+    this->set_msg_handler(pmt::mp("freq"),
-+                          [this](pmt::pmt_t msg) { this->handle_set_center_freq(msg); });
- }
- 
- template <class IN_T, class OUT_T, class TAP_T>
-diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc
-index 59f9eacfab..9ca62082ce 100644
---- a/gr-filter/lib/mmse_resampler_cc_impl.cc
-+++ b/gr-filter/lib/mmse_resampler_cc_impl.cc
-@@ -53,7 +53,7 @@ mmse_resampler_cc_impl::mmse_resampler_cc_impl(float phase_shift, float resamp_r
-     set_inverse_relative_rate(d_mu_inc);
-     message_port_register_in(pmt::intern("msg_in"));
-     set_msg_handler(pmt::intern("msg_in"),
--                    boost::bind(&mmse_resampler_cc_impl::handle_msg, this, _1));
-+                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
- }
- 
- mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; }
-diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc
-index 342d9f7678..312a6a8755 100644
---- a/gr-filter/lib/mmse_resampler_ff_impl.cc
-+++ b/gr-filter/lib/mmse_resampler_ff_impl.cc
-@@ -54,7 +54,7 @@ mmse_resampler_ff_impl::mmse_resampler_ff_impl(float phase_shift, float resamp_r
- 
-     message_port_register_in(pmt::intern("msg_in"));
-     set_msg_handler(pmt::intern("msg_in"),
--                    boost::bind(&mmse_resampler_ff_impl::handle_msg, this, _1));
-+                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
- }
- 
- mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; }
-diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
-index 4f030159ff..e5e1dd9161 100644
---- a/gr-uhd/lib/usrp_block_impl.cc
-+++ b/gr-uhd/lib/usrp_block_impl.cc
-@@ -137,7 +137,7 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr,
-     // Set up message ports:
-     message_port_register_in(pmt::mp("command"));
-     set_msg_handler(pmt::mp("command"),
--                    boost::bind(&usrp_block_impl::msg_handler_command, this, _1));
-+                    [this](pmt::pmt_t msg) { this->msg_handler_command(msg); });
- 
- // cuz we lazy:
- #define REGISTER_CMD_HANDLER(key, _handler) \
-diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc
-index b5da7421ef..3973b8f835 100644
---- a/gr-zeromq/lib/pub_msg_sink_impl.cc
-+++ b/gr-zeromq/lib/pub_msg_sink_impl.cc
-@@ -62,7 +62,7 @@ pub_msg_sink_impl::pub_msg_sink_impl(char* address, int timeout, bool bind)
-     }
- 
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"), boost::bind(&pub_msg_sink_impl::handler, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handler(msg); });
- }
- 
- pub_msg_sink_impl::~pub_msg_sink_impl()
-diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc
-index 4140781ab9..fee734753b 100644
---- a/gr-zeromq/lib/push_msg_sink_impl.cc
-+++ b/gr-zeromq/lib/push_msg_sink_impl.cc
-@@ -62,7 +62,7 @@ push_msg_sink_impl::push_msg_sink_impl(char* address, int timeout, bool bind)
-     }
- 
-     message_port_register_in(pmt::mp("in"));
--    set_msg_handler(pmt::mp("in"), boost::bind(&push_msg_sink_impl::handler, this, _1));
-+    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handler(msg); });
- }
- 
- push_msg_sink_impl::~push_msg_sink_impl()
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch
deleted file mode 100644
index 2d91fe2cce26..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From 7c841011f9316d4aae068b444c995829e09278d7 Mon Sep 17 00:00:00 2001
-From: Johannes Demel <demel@ant.uni-bremen.de>
-Date: Sat, 9 May 2020 14:25:32 +0200
-Subject: [PATCH] msg_handler: Use lambdas to set msg handlers
-
-With this commit, all calls to `set_msg_handler` in `gr-blocks` use
-lambdas. This helps to use `std::function` instead of `boost::function`.
----
- gnuradio-runtime/lib/block.cc                       | 3 +--
- gr-blocks/lib/copy_impl.cc                          | 2 +-
- gr-blocks/lib/message_debug_impl.cc                 | 6 +++---
- gr-blocks/lib/message_strobe_impl.cc                | 3 +--
- gr-blocks/lib/message_strobe_random_impl.cc         | 3 +--
- gr-blocks/lib/multiply_matrix_impl.cc               | 7 ++-----
- gr-blocks/lib/mute_impl.cc                          | 2 +-
- gr-blocks/lib/nop_impl.cc                           | 3 +--
- gr-blocks/lib/pdu_filter_impl.cc                    | 2 +-
- gr-blocks/lib/pdu_remove_impl.cc                    | 2 +-
- gr-blocks/lib/pdu_set_impl.cc                       | 3 ++-
- gr-blocks/lib/random_pdu_impl.cc                    | 2 +-
- gr-blocks/lib/repeat_impl.cc                        | 2 +-
- gr-blocks/lib/socket_pdu_impl.cc                    | 8 ++++----
- gr-blocks/lib/tagged_stream_multiply_length_impl.cc | 5 ++---
- gr-blocks/lib/tuntap_pdu_impl.cc                    | 2 +-
- 16 files changed, 24 insertions(+), 31 deletions(-)
-
-diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
-index 5914283908..beec8c470c 100644
---- a/gnuradio-runtime/lib/block.cc
-+++ b/gnuradio-runtime/lib/block.cc
-@@ -61,9 +61,8 @@ block::block(const std::string& name,
- {
-     global_block_registry.register_primitive(alias(), this);
-     message_port_register_in(d_system_port);
--    set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1));
--
-     configure_default_loggers(d_logger, d_debug_logger, symbol_name());
-+    set_msg_handler(d_system_port, [this](pmt::pmt_t msg) { this->system_handler(msg); });
- }
- 
- block::~block() { global_block_registry.unregister_primitive(symbol_name()); }
-diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc
-index c377e57b1e..4c97d07a76 100644
---- a/gr-blocks/lib/copy_impl.cc
-+++ b/gr-blocks/lib/copy_impl.cc
-@@ -44,7 +44,7 @@ copy_impl::copy_impl(size_t itemsize)
-       d_enabled(true)
- {
-     message_port_register_in(pmt::mp("en"));
--    set_msg_handler(pmt::mp("en"), boost::bind(&copy_impl::handle_enable, this, _1));
-+    set_msg_handler(pmt::mp("en"), [this](pmt::pmt_t msg) { this->handle_enable(msg); });
- }
- 
- copy_impl::~copy_impl() {}
-diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc
-index a8c84aa509..719fbd818a 100644
---- a/gr-blocks/lib/message_debug_impl.cc
-+++ b/gr-blocks/lib/message_debug_impl.cc
-@@ -90,14 +90,14 @@ message_debug_impl::message_debug_impl()
-     : block("message_debug", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0))
- {
-     message_port_register_in(pmt::mp("print"));
--    set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1));
-+    set_msg_handler(pmt::mp("print"), [this](pmt::pmt_t msg) { this->print(msg); });
- 
-     message_port_register_in(pmt::mp("store"));
--    set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1));
-+    set_msg_handler(pmt::mp("store"), [this](pmt::pmt_t msg) { this->store(msg); });
- 
-     message_port_register_in(pmt::mp("print_pdu"));
-     set_msg_handler(pmt::mp("print_pdu"),
--                    boost::bind(&message_debug_impl::print_pdu, this, _1));
-+                    [this](pmt::pmt_t msg) { this->print_pdu(msg); });
- }
- 
- message_debug_impl::~message_debug_impl() {}
-diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc
-index 038eeae5a1..67a95be8f2 100644
---- a/gr-blocks/lib/message_strobe_impl.cc
-+++ b/gr-blocks/lib/message_strobe_impl.cc
-@@ -53,8 +53,7 @@ message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, long period_ms)
-     message_port_register_out(d_port);
- 
-     message_port_register_in(pmt::mp("set_msg"));
--    set_msg_handler(pmt::mp("set_msg"),
--                    boost::bind(&message_strobe_impl::set_msg, this, _1));
-+    set_msg_handler(pmt::mp("set_msg"), [this](pmt::pmt_t msg) { this->set_msg(msg); });
- }
- 
- message_strobe_impl::~message_strobe_impl() {}
-diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc
-index 0ab5d6adc7..1b8deca952 100644
---- a/gr-blocks/lib/message_strobe_random_impl.cc
-+++ b/gr-blocks/lib/message_strobe_random_impl.cc
-@@ -74,8 +74,7 @@ message_strobe_random_impl::message_strobe_random_impl(
-         new gr::thread::thread(boost::bind(&message_strobe_random_impl::run, this)));
- 
-     message_port_register_in(pmt::mp("set_msg"));
--    set_msg_handler(pmt::mp("set_msg"),
--                    boost::bind(&message_strobe_random_impl::set_msg, this, _1));
-+    set_msg_handler(pmt::mp("set_msg"), [this](pmt::pmt_t msg) { this->set_msg(msg); });
- }
- 
- long message_strobe_random_impl::next_delay()
-diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc
-index e1b9c746c6..03e7894536 100644
---- a/gr-blocks/lib/multiply_matrix_impl.cc
-+++ b/gr-blocks/lib/multiply_matrix_impl.cc
-@@ -235,9 +235,7 @@ multiply_matrix_impl<gr_complex>::multiply_matrix_impl(
- 
-     pmt::pmt_t port_name = pmt::string_to_symbol("set_A");
-     message_port_register_in(port_name);
--    set_msg_handler(
--        port_name,
--        boost::bind(&multiply_matrix_impl<gr_complex>::msg_handler_A, this, _1));
-+    set_msg_handler(port_name, [this](pmt::pmt_t msg) { this->msg_handler_A(msg); });
- }
- 
- template <>
-@@ -256,8 +254,7 @@ multiply_matrix_impl<float>::multiply_matrix_impl(
- 
-     pmt::pmt_t port_name = pmt::string_to_symbol("set_A");
-     message_port_register_in(port_name);
--    set_msg_handler(port_name,
--                    boost::bind(&multiply_matrix_impl<float>::msg_handler_A, this, _1));
-+    set_msg_handler(port_name, [this](pmt::pmt_t msg) { this->msg_handler_A(msg); });
- }
- 
- 
-diff --git a/gr-blocks/lib/mute_impl.cc b/gr-blocks/lib/mute_impl.cc
-index bd65ce2075..c9a1d200c8 100644
---- a/gr-blocks/lib/mute_impl.cc
-+++ b/gr-blocks/lib/mute_impl.cc
-@@ -48,7 +48,7 @@ mute_impl<T>::mute_impl(bool mute)
- {
-     this->message_port_register_in(pmt::intern("set_mute"));
-     this->set_msg_handler(pmt::intern("set_mute"),
--                          boost::bind(&mute_impl<T>::set_mute_pmt, this, _1));
-+                          [this](pmt::pmt_t msg) { this->set_mute_pmt(msg); });
- }
- 
- template <class T>
-diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc
-index db216d97a4..4e1e887f42 100644
---- a/gr-blocks/lib/nop_impl.cc
-+++ b/gr-blocks/lib/nop_impl.cc
-@@ -26,7 +26,6 @@
- 
- #include "nop_impl.h"
- #include <gnuradio/io_signature.h>
--#include <boost/bind.hpp>
- 
- namespace gr {
- namespace blocks {
-@@ -45,7 +44,7 @@ nop_impl::nop_impl(size_t sizeof_stream_item)
-     // Arrange to have count_received_msgs called when messages are received.
-     message_port_register_in(pmt::mp("port"));
-     set_msg_handler(pmt::mp("port"),
--                    boost::bind(&nop_impl::count_received_msgs, this, _1));
-+                    [this](pmt::pmt_t msg) { this->count_received_msgs(msg); });
- }
- 
- nop_impl::~nop_impl() {}
-diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc
-index b0748eec02..760027a78c 100644
---- a/gr-blocks/lib/pdu_filter_impl.cc
-+++ b/gr-blocks/lib/pdu_filter_impl.cc
-@@ -45,7 +45,7 @@ pdu_filter_impl::pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert)
-     message_port_register_out(pdu::pdu_port_id());
-     message_port_register_in(pdu::pdu_port_id());
-     set_msg_handler(pdu::pdu_port_id(),
--                    boost::bind(&pdu_filter_impl::handle_msg, this, _1));
-+                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
- }
- 
- void pdu_filter_impl::handle_msg(pmt::pmt_t pdu)
-diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc
-index 19cc4dc76a..58277ca0d0 100644
---- a/gr-blocks/lib/pdu_remove_impl.cc
-+++ b/gr-blocks/lib/pdu_remove_impl.cc
-@@ -43,7 +43,7 @@ pdu_remove_impl::pdu_remove_impl(pmt::pmt_t k)
-     message_port_register_out(pdu::pdu_port_id());
-     message_port_register_in(pdu::pdu_port_id());
-     set_msg_handler(pdu::pdu_port_id(),
--                    boost::bind(&pdu_remove_impl::handle_msg, this, _1));
-+                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
- }
- 
- void pdu_remove_impl::handle_msg(pmt::pmt_t pdu)
-diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc
-index 40fbc3cd83..61f1bb1284 100644
---- a/gr-blocks/lib/pdu_set_impl.cc
-+++ b/gr-blocks/lib/pdu_set_impl.cc
-@@ -43,7 +43,8 @@ pdu_set_impl::pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v)
- {
-     message_port_register_out(pdu::pdu_port_id());
-     message_port_register_in(pdu::pdu_port_id());
--    set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1));
-+    set_msg_handler(pdu::pdu_port_id(),
-+                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
- }
- 
- void pdu_set_impl::handle_msg(pmt::pmt_t pdu)
-diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc
-index 75d825aefa..5207a779d6 100644
---- a/gr-blocks/lib/random_pdu_impl.cc
-+++ b/gr-blocks/lib/random_pdu_impl.cc
-@@ -53,7 +53,7 @@ random_pdu_impl::random_pdu_impl(int min_items,
-     message_port_register_out(pdu::pdu_port_id());
-     message_port_register_in(pmt::mp("generate"));
-     set_msg_handler(pmt::mp("generate"),
--                    boost::bind(&random_pdu_impl::generate_pdu, this, _1));
-+                    [this](pmt::pmt_t msg) { this->generate_pdu(msg); });
-     if (length_modulo < 1)
-         throw std::runtime_error("length_module must be >= 1");
-     if (max_items < length_modulo)
-diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc
-index 189fbc8948..7262b11a2e 100644
---- a/gr-blocks/lib/repeat_impl.cc
-+++ b/gr-blocks/lib/repeat_impl.cc
-@@ -45,7 +45,7 @@ repeat_impl::repeat_impl(size_t itemsize, int interp)
- {
-     message_port_register_in(pmt::mp("interpolation"));
-     set_msg_handler(pmt::mp("interpolation"),
--                    boost::bind(&repeat_impl::msg_set_interpolation, this, _1));
-+                    [this](pmt::pmt_t msg) { this->msg_set_interpolation(msg); });
- }
- 
- void repeat_impl::msg_set_interpolation(pmt::pmt_t msg)
-diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
-index df69f07ad2..edf572e76c 100644
---- a/gr-blocks/lib/socket_pdu_impl.cc
-+++ b/gr-blocks/lib/socket_pdu_impl.cc
-@@ -101,7 +101,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
-         start_tcp_accept();
- 
-         set_msg_handler(pdu::pdu_port_id(),
--                        boost::bind(&socket_pdu_impl::tcp_server_send, this, _1));
-+                        [this](pmt::pmt_t msg) { this->tcp_server_send(msg); });
-     } else if (type == "TCP_CLIENT") {
-         boost::system::error_code error = boost::asio::error::host_not_found;
-         d_tcp_socket.reset(new boost::asio::ip::tcp::socket(d_io_service));
-@@ -111,7 +111,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
-         d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay));
- 
-         set_msg_handler(pdu::pdu_port_id(),
--                        boost::bind(&socket_pdu_impl::tcp_client_send, this, _1));
-+                        [this](pmt::pmt_t msg) { this->tcp_client_send(msg); });
- 
-         d_tcp_socket->async_read_some(
-             boost::asio::buffer(d_rxbuf),
-@@ -131,7 +131,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
-                         boost::asio::placeholders::bytes_transferred));
- 
-         set_msg_handler(pdu::pdu_port_id(),
--                        boost::bind(&socket_pdu_impl::udp_send, this, _1));
-+                        [this](pmt::pmt_t msg) { this->udp_send(msg); });
-     } else if (type == "UDP_CLIENT") {
-         d_udp_socket.reset(
-             new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint));
-@@ -144,7 +144,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
-                         boost::asio::placeholders::bytes_transferred));
- 
-         set_msg_handler(pdu::pdu_port_id(),
--                        boost::bind(&socket_pdu_impl::udp_send, this, _1));
-+                        [this](pmt::pmt_t msg) { this->udp_send(msg); });
-     } else
-         throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type");
- 
-diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
-index 30f4c46dc6..2266c01fe3 100644
---- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
-+++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
-@@ -49,9 +49,8 @@ tagged_stream_multiply_length_impl::tagged_stream_multiply_length_impl(
-     set_tag_propagation_policy(TPP_DONT);
-     set_relative_rate(1, 1);
-     message_port_register_in(pmt::intern("set_scalar"));
--    set_msg_handler(
--        pmt::intern("set_scalar"),
--        boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1));
-+    set_msg_handler(pmt::intern("set_scalar"),
-+                    [this](pmt::pmt_t msg) { this->set_scalar_pmt(msg); });
- }
- 
- tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl() {}
-diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc
-index 4343ae1dc3..19742235d9 100644
---- a/gr-blocks/lib/tuntap_pdu_impl.cc
-+++ b/gr-blocks/lib/tuntap_pdu_impl.cc
-@@ -96,7 +96,7 @@ tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU, bool istunflag)
- 
-     // set up input message port
-     message_port_register_in(pdu::pdu_port_id());
--    set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1));
-+    set_msg_handler(pdu::pdu_port_id(), [this](pmt::pmt_t msg) { this->send(msg); });
- }
- 
- int tuntap_pdu_impl::tun_alloc(char* dev, int flags)
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 7b7f8951ee9c..55b9a521665b 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -5,7 +5,7 @@ AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 B
 AUX hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch 3839 BLAKE2B 943ccc90d23c60eef15a336108d14e74909ecb782f772145ee48d049806c289c42867999e489fdfc0795846bf41a756303e6da81f4624d26043c618b8485cf43 SHA512 88608529763a6fd9e8cb1e9c9a35630dc2e311a260e023e2a69002d0db700d5f58fc7723a00433b4ea895b92c371cf1db221f38742490b4ed9b4b049892b65e1
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
-EBUILD hostapd-2.9-r3.ebuild 7504 BLAKE2B 7d74aaa531264ff0d04fa19a17e19633dd1b72e95289bc3bb812924583da12d7da4d9b00adf155995f9dcb3a9c46917363f816b1f6e9b9daadbb8ef138797c3d SHA512 0dd1ab1500f4983b080ddd79d899092e998ae9a111c469be554a27747c7f896ccfba148385f90e72660d1949fb2f46117733b44bd0005684110edec1058b8938
-EBUILD hostapd-2.9-r4.ebuild 7667 BLAKE2B 7f7268cbfc7a67f41a4e11fa136066a45b14fff697cb89e7bae58624351a086bbb412f59f2a375fd04e05d47db0b68bda5ff77c55b3a53092f345c6b95157d0e SHA512 c5a8f6854bd6cafd30e7cad6f97a8f5de15afc214ddf6d54dff5c4f375f702d73a7a2c95a7b3aa13b8498b1bb3526fa95c253e2e0751f20fc3379bb12cb26020
-EBUILD hostapd-9999.ebuild 7128 BLAKE2B ddb2bbe4264737d17b92d23a1011274449d93ada1917dc231f403498955081bcd8cb942513589e60d0402a6d50257d2a924bc7ae269e669fef4dce2f28c23214 SHA512 6725675b1c839bb0bc5f9a0335d48372f01792a9520ba1e0af531cabbba4a314f0b469cadabc439c69751afd558fa14a85e8253ca53ca0c7c3531ce53b36d6a8
+EBUILD hostapd-2.9-r5.ebuild 7507 BLAKE2B e4f59090b02c811636bffded01f16787f179546cce6ed1e8f30d1afc798df2a7d03a9980ba78bbd28a1785f8f8c62b84855bfa80f95fe715c42fd0c495509d41 SHA512 e45d5829086d715b6f37ae8172d91eadde5eccb254b106b106660090afacb5cba2bcebd2935f75f338f13926920028bc306a9f142d3e6932b6366d83bc75f18e
+EBUILD hostapd-2.9-r6.ebuild 7668 BLAKE2B 850449adc50b774fab0a83168d60bccfa151475d568486ac3a3919f459294430350845a6c017d9043ff667ebe3504bf1c0ec321466e99f9d6f5b2fe733d03bdf SHA512 371df5efad77ba41e582b0fbf4e36b00473aed82b9b3ab826f73c7d50b92444d4787d00273e4648a58c774403bbf0415fd49f626fffd0153c28c2a825bb39d38
+EBUILD hostapd-9999.ebuild 7131 BLAKE2B 953e76d26152cb3ebe8e4373be3991e157ab9deefc5046bff8bab64f463cd77ca0337170bd260683187591ae2d8d634da05af7e0055fe54deed4e3b97b526e4b SHA512 d8a86ec5088ba920dbc0e61bfb39ad4cee4d8e812ae9f218a9ea2d90a4705d3616fab70df2b44823717d7532f754f21c3aaeca54e0450b526e1b1006c27ba986
 MISC metadata.xml 1016 BLAKE2B 2582e31954d531776cdd315747006e1744c9a9f61faf6c73f251f8174d92e061a9dadb71152b9f666e210fe5478a5fe351bcd109b2804d94dfc268fc53004939 SHA512 27b8f32edde034f776c1538fd8e223f6963ab2a0bd760a9a3d5a3a08dd2c8549e990bfcaf5f197be47c4b92897ed13f07b111dec609a56c4268c1a659e493df1
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r5.ebuild
index 174b3dd6157a..0e37a7314136 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r5.ebuild
@@ -32,7 +32,7 @@ IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
 	internal-tls? ( dev-libs/libtommath )
-	!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
index 4130241a64ce..8ff2cbb99abe 100644
--- a/net-wireless/hostapd/hostapd-2.9-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
@@ -23,7 +23,7 @@ else
 	fi
 
 	# Never stabilize snapshot ebuilds please
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
 fi
 
 LICENSE="BSD"
@@ -32,7 +32,7 @@ IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
 	internal-tls? ( dev-libs/libtommath )
-	!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 6149f90b94e0..b9116b4cb252 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -32,7 +32,7 @@ IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
 	internal-tls? ( dev-libs/libtommath )
-	!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
diff --git a/net-wireless/rtl_433/Manifest b/net-wireless/rtl_433/Manifest
index e5f40de7a2d5..baa93b986d69 100644
--- a/net-wireless/rtl_433/Manifest
+++ b/net-wireless/rtl_433/Manifest
@@ -1,4 +1,4 @@
-DIST rtl_433-20.02_p20200922.tar.gz 841774 BLAKE2B 4a3c060c85233a85e951eff5fb210cc4ec5529a6cc868782fdbf7b3dad7372dcd7d428776c539d25105b9cfdf5f260bc031bbd5435eb2658e73b8b275f2040ee SHA512 fe0a26b14df97c679968536b5b3dfe41e5f8c6e0af00265461b4e1bf6312dd71cc1b1ccf2f5f78bc4d67b5f2effb17a88b743dc38db4a0a73f9f5b756868dba4
-EBUILD rtl_433-20.02_p20200922.ebuild 1066 BLAKE2B bd8342dc5d380b8d053c7f384cf9f48a9c0fdd963adb7850ca92791dc5b8302b6f62955e421ca5e7bc836ea9ff5c2a4a6d7da4ed5f999e48dd0a8582097ed6c5 SHA512 e87ca04c5c5cc37484b38927d21523c99b435a7cf3724dada0aaf43af7a31b57e8765178d195b700cee013cca5faf1b61286f8367c72dc88f018faed10e23b81
+DIST rtl_433-21.05.tar.gz 841774 BLAKE2B 4a3c060c85233a85e951eff5fb210cc4ec5529a6cc868782fdbf7b3dad7372dcd7d428776c539d25105b9cfdf5f260bc031bbd5435eb2658e73b8b275f2040ee SHA512 fe0a26b14df97c679968536b5b3dfe41e5f8c6e0af00265461b4e1bf6312dd71cc1b1ccf2f5f78bc4d67b5f2effb17a88b743dc38db4a0a73f9f5b756868dba4
+EBUILD rtl_433-21.05.ebuild 1066 BLAKE2B bd8342dc5d380b8d053c7f384cf9f48a9c0fdd963adb7850ca92791dc5b8302b6f62955e421ca5e7bc836ea9ff5c2a4a6d7da4ed5f999e48dd0a8582097ed6c5 SHA512 e87ca04c5c5cc37484b38927d21523c99b435a7cf3724dada0aaf43af7a31b57e8765178d195b700cee013cca5faf1b61286f8367c72dc88f018faed10e23b81
 EBUILD rtl_433-9999.ebuild 1066 BLAKE2B bd8342dc5d380b8d053c7f384cf9f48a9c0fdd963adb7850ca92791dc5b8302b6f62955e421ca5e7bc836ea9ff5c2a4a6d7da4ed5f999e48dd0a8582097ed6c5 SHA512 e87ca04c5c5cc37484b38927d21523c99b435a7cf3724dada0aaf43af7a31b57e8765178d195b700cee013cca5faf1b61286f8367c72dc88f018faed10e23b81
 MISC metadata.xml 483 BLAKE2B 9e8acd25e8e0234d628267907ac17b9613349d9263a2b59dee400cb6a0fa202e4e9373dbb65fb05fd53ca03ac2734b8bec78d3dfecac652d401fa79508d2cff4 SHA512 a040362e74c0d7f41185d0d4d45d2e3055151090276d77647f47d41031487d8648fdc727fb61b283cf415737ed9fd0bd1753c594138582866e67b662b0c78222
diff --git a/net-wireless/rtl_433/rtl_433-20.02_p20200922.ebuild b/net-wireless/rtl_433/rtl_433-21.05.ebuild
index 5aa379a4bcba..5aa379a4bcba 100644
--- a/net-wireless/rtl_433/rtl_433-20.02_p20200922.ebuild
+++ b/net-wireless/rtl_433/rtl_433-21.05.ebuild
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 2c541417573f..0f900bf38e09 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -14,7 +14,7 @@ AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e1
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
 DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 284fdeaf6328c35b1f5e88075c62c3b008ec2c400b0cc163a59d9cf8d7c356c3e58f8798e5bade102259d2e5be2ed298b63a0001d0a4ab71d90604a8ee8bf274 SHA512 80e4950ddc99d1134a29a3e5a39767c756f7c9f9f283749e688db3435184631f0384b78954f926724ceff86c96d05b4fb042160265e9d00f976a96e864b7ecc5
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8
-EBUILD wpa_supplicant-2.9-r2.ebuild 12057 BLAKE2B 0a322c75b7a2628af450929b846d61f18fc2c833523ab137a29f88e34fe3c66104c5c3bad737b7cba126f386ae232a3dc5478b787fdf4b13a9bad299778da0b7 SHA512 470dc00cf15c7bc4d6ee9e5cceef45e839e4e745b0c2e6daed07e99b8fdc9f5526a1ef468ca1de243de7cba3c875a8722aa0fba9725b84fe365dba7c7822389d
-EBUILD wpa_supplicant-2.9-r3.ebuild 12430 BLAKE2B 1ce08a4999af69aee576f856c8eb7a05ff4ab273c7dd628fe37203c6d563cc1939c094eb01389e26edb1ca1b12408cefbc007cbae96140b66cc2a3a0af33744d SHA512 09c50ecd3280ef185d55c6a91fa5788f54c3bfa0ee3c0e1143b075fc215003dea3095dadb38b9bf0912c5431cdb65710241e3553fb791c5292333136393f8fbf
-EBUILD wpa_supplicant-9999.ebuild 11934 BLAKE2B 92cee24388350fefc91478b101c5ab030a258ef0a6856142c73914013ccb10ded4626c2c4284898c0745a280b792d423a2072b47c2324d7e6368b11a3737a194 SHA512 912a56f0a4c2f551b5597055ab7a79e22ad70aead8ad4e58efacca117dcd4a9ce33b050452786633886b184b0ca1eebd9b43b2cc8a406d8cc6c781caaf496f35
+EBUILD wpa_supplicant-2.9-r4.ebuild 12060 BLAKE2B 8843c2e43a7b0dee34d5b5e02488ca23b16a4876f69112fc18f8d46c8c86ecc1cef522fd7e157ab60a93d54a9b5603ea6a65f2ebac9fdcfb5da32b9c45f6ec35 SHA512 ddbdf6269775a13c726f727b0df4f1049f890165bedd4072ab031c00cde051964c62a7e6265acfab439fdf256f968a543bba825359e893bacf1e4d44b6c232b9
+EBUILD wpa_supplicant-2.9-r5.ebuild 12431 BLAKE2B c48105b7ace65a61052c4fdaeb52581293110c0e398f8a62a49d35b3d1318e7acb78aea30fe021462b5b5881c8719125aa40c8cd0054c82f3c9a791c7d083edb SHA512 b7637a632ba4c6f5348a433ecc11f114d5fd72bb553e7c947d242a92375277495e6acf25ef24769e25f5d37d5d2e2b5472e6f4d443d6bd9056d694fee3ddf3ca
+EBUILD wpa_supplicant-9999.ebuild 11937 BLAKE2B 84da7a822329af8fe9ae8450e410afc117e3e1fee0d59fc709099a26ab91c226b23f2f027a0249bede0036cf2c777952b5576e9192c97ab3ad889c1f39cecf9d SHA512 ed05581681fc9616038a737b4b07d89f64e1fd1b776a3c9cfb81baf6e910083dd2a0ff69f925c68598b9e025230111dfbaa17c85154d947637386c6623cce232
 MISC metadata.xml 1676 BLAKE2B f58705c6f4646675662468a497d1b0dbd7bb2c6870cd1b93b2fe186824da40c120e64b767acc470c2ddbf055af57d56f6d3d739267c5ff165d9c26a0969d3ec2 SHA512 fb5a6c37dd832b8af73b209e677735e583353a5542b24e9df1cda698bcec3702d10aa47cc4efbfb8df67122ad3dc6ad4c8ca6440579df68f67ff9f64e483852c
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
index 95e04bf79861..f3b138d121f2 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	>=dev-libs/openssl-1.0.2k:0=[bindist=]
+	>=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
 	dbus? ( sys-apps/dbus )
 	kernel_linux? (
 		dev-libs/libnl:3
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index 84b17a276725..e7289d218724 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2"
 fi
@@ -31,7 +31,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	>=dev-libs/openssl-1.0.2k:0=[bindist=]
+	>=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
 	dbus? ( sys-apps/dbus )
 	kernel_linux? (
 		dev-libs/libnl:3
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index f4d4302d5eec..97cde554f0db 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	>=dev-libs/openssl-1.0.2k:0=[bindist=]
+	>=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
 	dbus? ( sys-apps/dbus )
 	kernel_linux? (
 		dev-libs/libnl:3