gentoo resync : 13.06.2020

6 files changed, 26 insertions, 675 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 73da69406661..c43557d7aff7 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,6 @@
-AUX csete-iio.patch 18603 BLAKE2B 437bc8318e88090012cfc98a1b5910ade54b191abb6cb96ea82ba1974c68682477d7429489546fca21ce19d3b9042d6321146d34c0cf8bf94f591bf8da576a39 SHA512 b8c41a1df12a1a74a4d491e694e89d9de753791a433da4d8451c2b20a3e448312316cf66b8bd7d2c1445d91e483331c4328e0acc738fc0dc61ab98b30d48a14a
-DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
 DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
-EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2205 BLAKE2B 4120f8b37dca5a30a842b6a6d37ce8dd36b04ac8bb55a034b6578bc3fa089962041bdf948ff06e1c8f0004076d8f4e094c9d6e1d8aa04908511f0e49d0c87642 SHA512 6954a1bba9e4f3f5010722e095803c00ff2125d03ba806f255546d655d25eb89ba88c485aeead5cd8505a1cdbee64dab04b521d62f5140b84d912b6a236794d3
-EBUILD gr-osmosdr-0.1.5.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
-EBUILD gr-osmosdr-9999.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
-MISC metadata.xml 1064 BLAKE2B 5f01d598ec69e9f78d594a33487b58242049b020461fbae3e2eaf51d4d894c01c9bc73af28b101bc855e09567c16176d56fbe52b77b7cb719ce2d8ef3f6459a9 SHA512 8f4b7a3cbdf0b0edb3e707cb8c44d5e40e72dc87d36312865647996181c419f4a67c6783110abbdb150264ca9e49cca3264ba39098acf0b05955dff3fdf29072
+DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
+EBUILD gr-osmosdr-0.1.5-r1.ebuild 1926 BLAKE2B a61337ac088431d18e5e2bd04b0bcf8c60b1519e07c0b86a61dbb23e74346796fdf1ff6a16258365f88f2bab3628934fafd8774d728c5f50befb2d68e3f9a5ce SHA512 3ebb20e9c58fd195b6c59d885cd0f4f6cc88af32dabd0cc2da2567eb0aa997cdbf72b616ad375350faa43c87bc3c4baae7dc3160d8e80c468bd47985c7c4383c
+EBUILD gr-osmosdr-0.2.0.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
+EBUILD gr-osmosdr-9999.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
+MISC metadata.xml 965 BLAKE2B 6dbc466abe93e1ffef58f8f07ac4326ced3e9399c86fcb3135c16293065d0c9dfca6584e527b1d60f4fbaee6322ff6ed7a5c5a8ae20c8f985d0488a94352e8ea SHA512 2c744ddfec67ffd438ea76afc037e6ff7480d5349b63e00ac74dff191f33f3f9ecde08ee167b568b64a7dea33d3efbf67be582f1613bd8f8a5e0d29275a8da77
diff --git a/net-wireless/gr-osmosdr/files/csete-iio.patch b/net-wireless/gr-osmosdr/files/csete-iio.patch
deleted file mode 100644
index 678a8599d058..000000000000
--- a/net-wireless/gr-osmosdr/files/csete-iio.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-From 0eaf819be8a40896dfc3d810685a609a867a42e9 Mon Sep 17 00:00:00 2001
-From: Alexandru Csete <oz9aec@gmail.com>
-Date: Mon, 13 Feb 2017 01:05:50 +0100
-Subject: [PATCH] Add PlutoSDR source through gr-iio
-
----
- CMakeLists.txt                      |   1 +
- cmake/Modules/FindGnuradioIIO.cmake |  34 ++++
- cmake/Modules/FindIIO.cmake         |  28 +++
- lib/CMakeLists.txt                  |   8 +
- lib/config.h.in                     |   1 +
- lib/device.cc                       |   8 +
- lib/plutosdr/CMakeLists.txt         |  39 +++++
- lib/plutosdr/plutosdr_source_c.cc   | 262 ++++++++++++++++++++++++++++
- lib/plutosdr/plutosdr_source_c.h    | 105 +++++++++++
- lib/source_impl.cc                  |  18 ++
- 10 files changed, 504 insertions(+)
- create mode 100644 cmake/Modules/FindGnuradioIIO.cmake
- create mode 100644 cmake/Modules/FindIIO.cmake
- create mode 100644 lib/plutosdr/CMakeLists.txt
- create mode 100644 lib/plutosdr/plutosdr_source_c.cc
- create mode 100644 lib/plutosdr/plutosdr_source_c.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 296456d..7871f39 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -159,6 +159,7 @@ endif()
- find_package(GnuradioIQBalance)
- find_package(UHD)
- find_package(GnuradioUHD)
-+find_package(GnuradioIIO)
- find_package(GnuradioFCD)
- find_package(GnuradioFCDPP)
- find_package(LibOsmoSDR)
-diff --git a/cmake/Modules/FindGnuradioIIO.cmake b/cmake/Modules/FindGnuradioIIO.cmake
-new file mode 100644
-index 0000000..d3c011a
---- /dev/null
-+++ b/cmake/Modules/FindGnuradioIIO.cmake
-@@ -0,0 +1,34 @@
-+INCLUDE(FindPkgConfig)
-+PKG_CHECK_MODULES(PC_GNURADIO_IIO gnuradio-iio)
-+
-+FIND_PATH(
-+    GNURADIO_IIO_INCLUDE_DIRS
-+    NAMES gnuradio/iio/api.h
-+    HINTS $ENV{GNURADIO_IIO_DIR}/include
-+        ${PC_GNURADIO_IIO_INCLUDEDIR}
-+    PATHS /usr/local/include
-+          /usr/include
-+)
-+
-+FIND_LIBRARY(
-+    GNURADIO_IIO_LIBRARIES
-+    NAMES gnuradio-iio
-+    HINTS $ENV{GNURADIO_IIO_DIR}/lib
-+        ${PC_GNURADIO_IIO_LIBDIR}
-+    PATHS /usr/local/lib
-+          /usr/local/lib64
-+          /usr/lib
-+          /usr/lib64
-+)
-+
-+if(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+  set(GNURADIO_IIO_FOUND TRUE CACHE INTERNAL "gnuradio-iio found")
-+  message(STATUS "Found gnuradio-iio: ${GNURADIO_IIO_INCLUDE_DIRS}, ${GNURADIO_IIO_LIBRARIES}")
-+else(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+  set(GNURADIO_IIO_FOUND FALSE CACHE INTERNAL "gnuradio-iio found")
-+  message(STATUS "gnuradio-iio not found.")
-+endif(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_IIO DEFAULT_MSG GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
-+MARK_AS_ADVANCED(GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
-diff --git a/cmake/Modules/FindIIO.cmake b/cmake/Modules/FindIIO.cmake
-new file mode 100644
-index 0000000..bb87a4b
---- /dev/null
-+++ b/cmake/Modules/FindIIO.cmake
-@@ -0,0 +1,28 @@
-+########################################################################
-+# Find the IIO userspace library
-+########################################################################
-+
-+INCLUDE(FindPkgConfig)
-+PKG_CHECK_MODULES(PC_IIO iio)
-+
-+FIND_PATH(
-+    IIO_INCLUDE_DIRS
-+    NAMES iio.h
-+    HINTS $ENV{IIO_DIR}/include
-+        ${PC_IIO_INCLUDEDIR}
-+    PATHS /usr/local/include
-+          /usr/include
-+)
-+
-+FIND_LIBRARY(
-+    IIO_LIBRARIES
-+    NAMES iio
-+    HINTS $ENV{IIO_DIR}/lib
-+        ${PC_IIO_LIBDIR}
-+    PATHS /usr/local/lib
-+          /usr/lib
-+)
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(IIO DEFAULT_MSG IIO_LIBRARIES IIO_INCLUDE_DIRS)
-+MARK_AS_ADVANCED(IIO_LIBRARIES IIO_INCLUDE_DIRS)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index c05b8d9..936d84b 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -174,6 +174,14 @@ if(ENABLE_UHD)
- GR_INCLUDE_SUBDIRECTORY(uhd)
- endif(ENABLE_UHD)
- 
-+########################################################################
-+# Setup IIO component
-+########################################################################
-+GR_REGISTER_COMPONENT("IIO Devices" ENABLE_IIO GNURADIO_IIO_FOUND)
-+if(ENABLE_IIO)
-+GR_INCLUDE_SUBDIRECTORY(plutosdr)
-+endif(ENABLE_IIO)
-+
- ########################################################################
- # Setup MiriSDR component
- ########################################################################
-diff --git a/lib/config.h.in b/lib/config.h.in
-index 42e72f1..0fe2731 100644
---- a/lib/config.h.in
-+++ b/lib/config.h.in
-@@ -10,6 +10,7 @@
- #cmakedefine ENABLE_RTL
- #cmakedefine ENABLE_RTL_TCP
- #cmakedefine ENABLE_UHD
-+#cmakedefine ENABLE_IIO
- #cmakedefine ENABLE_MIRI
- #cmakedefine ENABLE_SDRPLAY
- #cmakedefine ENABLE_HACKRF
-diff --git a/lib/device.cc b/lib/device.cc
-index 025a22b..77b271f 100644
---- a/lib/device.cc
-+++ b/lib/device.cc
-@@ -54,6 +54,10 @@
- #include <uhd_source_c.h>
- #endif
- 
-+#ifdef ENABLE_IIO
-+#include <plutosdr_source_c.h>
-+#endif
-+
- #ifdef ENABLE_MIRI
- #include <miri_source_c.h>
- #endif
-@@ -162,6 +166,10 @@ devices_t device::find(const device_t &hint)
-   BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
-     devices.push_back( device_t(dev) );
- #endif
-+#ifdef ENABLE_IIO
-+  BOOST_FOREACH( std::string dev, plutosdr_source_c::get_devices() )
-+    devices.push_back( device_t(dev) );
-+#endif
- #ifdef ENABLE_MIRI
-   BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
-     devices.push_back( device_t(dev) );
-diff --git a/lib/plutosdr/CMakeLists.txt b/lib/plutosdr/CMakeLists.txt
-new file mode 100644
-index 0000000..b335885
---- /dev/null
-+++ b/lib/plutosdr/CMakeLists.txt
-@@ -0,0 +1,39 @@
-+# Copyright 2012 Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Radio
-+#
-+# GNU Radio is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GNU Radio is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Radio; see the file COPYING.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street,
-+# Boston, MA 02110-1301, USA.
-+
-+########################################################################
-+# This file included, use CMake directory variables
-+########################################################################
-+
-+include_directories(
-+    ${CMAKE_CURRENT_SOURCE_DIR}
-+    ${GNURADIO_IIO_INCLUDE_DIRS}
-+    ${IIO_INCLUDE_DIRS}
-+)
-+
-+set(iio_srcs
-+#    ${CMAKE_CURRENT_SOURCE_DIR}/iio_sink_c.cc
-+    ${CMAKE_CURRENT_SOURCE_DIR}/plutosdr_source_c.cc
-+)
-+
-+########################################################################
-+# Append gnuradio-osmosdr library sources
-+########################################################################
-+list(APPEND gr_osmosdr_srcs ${iio_srcs})
-+list(APPEND gr_osmosdr_libs ${GNURADIO_IIO_LIBRARIES} ${IIO_LIBRARIES})
-diff --git a/lib/plutosdr/plutosdr_source_c.cc b/lib/plutosdr/plutosdr_source_c.cc
-new file mode 100644
-index 0000000..009d4b2
---- /dev/null
-+++ b/lib/plutosdr/plutosdr_source_c.cc
-@@ -0,0 +1,262 @@
-+/* -*- c++ -*- */
-+/*
-+ * Copyright 2017 Dimitri Stolnikov <horiz0n@gmx.net>
-+ *
-+ * GNU Radio is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3, or (at your option)
-+ * any later version.
-+ *
-+ * GNU Radio is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with GNU Radio; see the file COPYING.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street,
-+ * Boston, MA 02110-1301, USA.
-+ */
-+#include <boost/assign.hpp>
-+#include <iostream>
-+
-+#include "arg_helpers.h"
-+#include "osmosdr/source.h"
-+#include "plutosdr_source_c.h"
-+
-+using namespace boost::assign;
-+
-+plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args)
-+{
-+  return gnuradio::get_initial_sptr(new plutosdr_source_c(args));
-+}
-+
-+plutosdr_source_c::plutosdr_source_c(const std::string &args) :
-+    gr::hier_block2("plutosdr_source_c",
-+                   gr::io_signature::make(0, 0, 0),
-+                   gr::io_signature::make(1, 1, sizeof(gr_complex)))
-+{
-+  uri = "ip:pluto.local";
-+  frequency = 434000000;
-+  samplerate = 2500000;
-+  decimation = 0;
-+  bandwidth = 2000000;
-+  buffer_size = 0x4000;
-+  quadrature = true;
-+  rfdc = true;
-+  bbdc = true;
-+  gain_auto = false;
-+  gain_value = 50;
-+  filter = "";
-+  filter_auto = true;
-+  _freq_corr = 0.0;
-+
-+  dict_t dict = params_to_dict(args);
-+  if (dict.count("uri"))
-+    uri = boost::lexical_cast< std::string >( dict["uri"] );
-+
-+  std::cerr << "Using PlutoSDR URI = " << uri << std::endl;
-+
-+  _src = gr::iio::pluto_source::make(uri, frequency, samplerate,
-+                                     bandwidth, buffer_size,
-+                                     quadrature, rfdc, bbdc,
-+                                     "manual", gain_value,
-+                                     filter.c_str(), filter_auto);
-+
-+  connect( _src, 0, self(), 0 );
-+}
-+
-+plutosdr_source_c::~plutosdr_source_c()
-+{
-+}
-+
-+std::vector< std::string > plutosdr_source_c::get_devices()
-+{
-+  std::vector< std::string > devices;
-+
-+  std::string args = "plutosdr,label='PlutoSDR'";
-+
-+  devices.push_back( args );
-+
-+  return devices;
-+}
-+
-+std::string plutosdr_source_c::name()
-+{
-+  return "PlutoSDR";
-+}
-+
-+size_t plutosdr_source_c::get_num_channels()
-+{
-+  return output_signature()->max_streams();
-+}
-+
-+osmosdr::meta_range_t plutosdr_source_c::get_sample_rates( void )
-+{
-+  osmosdr::meta_range_t rates;
-+
-+  rates += osmosdr::range_t( 2500000 );
-+  rates += osmosdr::range_t( 5000000 );
-+  rates += osmosdr::range_t( 10000000 );
-+  rates += osmosdr::range_t( 20000000 );
-+
-+  return rates;
-+}
-+
-+double plutosdr_source_c::set_sample_rate( double rate )
-+{
-+  samplerate = (unsigned long) rate;
-+  set_params();
-+
-+  return samplerate;
-+}
-+
-+double plutosdr_source_c::get_sample_rate( void )
-+{
-+  return samplerate;
-+}
-+
-+osmosdr::freq_range_t plutosdr_source_c::get_freq_range( size_t chan )
-+{
-+  osmosdr::freq_range_t range;
-+
-+  range += osmosdr::range_t( 70.0e6, 6000.0e6, 1.0 );
-+
-+  return range;
-+}
-+
-+double plutosdr_source_c::set_center_freq( double freq, size_t chan )
-+{
-+  frequency = (unsigned long long) freq;
-+  set_params();
-+
-+  return freq;
-+}
-+
-+double plutosdr_source_c::get_center_freq( size_t chan )
-+{
-+  return frequency;
-+}
-+
-+double plutosdr_source_c::set_freq_corr( double ppm, size_t chan)
-+{
-+  _freq_corr = ppm;
-+  set_params();
-+
-+  return ppm;
-+}
-+
-+double plutosdr_source_c::get_freq_corr( size_t chan)
-+{
-+  return _freq_corr;
-+}
-+
-+std::vector<std::string> plutosdr_source_c::get_gain_names( size_t chan )
-+{
-+  std::vector< std::string > gains;
-+
-+  gains.push_back( "RF" );
-+
-+  return gains;
-+}
-+
-+osmosdr::gain_range_t plutosdr_source_c::get_gain_range( size_t chan)
-+{
-+  osmosdr::gain_range_t range;
-+  range += osmosdr::range_t( -10, 77, 1 );   // https://wiki.analog.com/resources/tools-software/linux-drivers/iio-transceiver/ad9361#rx_gain_control
-+
-+  return range;
-+}
-+
-+osmosdr::gain_range_t plutosdr_source_c::get_gain_range( const std::string & name,
-+                                                         size_t chan)
-+{
-+  osmosdr::gain_range_t range;
-+
-+  range += osmosdr::range_t( -10, 77, 1 );
-+
-+  return range;
-+}
-+
-+bool plutosdr_source_c::set_gain_mode( bool automatic, size_t chan )
-+{
-+  gain_auto = automatic;
-+  set_params();
-+
-+  return automatic;
-+}
-+
-+bool plutosdr_source_c::get_gain_mode( size_t chan )
-+{
-+  return gain_auto;
-+}
-+
-+double plutosdr_source_c::set_gain( double gain, size_t chan )
-+{
-+  gain_value = gain;
-+  set_params();
-+
-+  return gain;
-+}
-+
-+double plutosdr_source_c::set_gain( double gain, const std::string & name, size_t chan )
-+{
-+  gain_value = gain;
-+  set_params();
-+
-+  return gain;
-+}
-+
-+double plutosdr_source_c::get_gain( size_t chan )
-+{
-+  return gain_value;
-+}
-+
-+double plutosdr_source_c::get_gain( const std::string & name, size_t chan )
-+{
-+  return gain_value;
-+}
-+
-+std::vector< std::string > plutosdr_source_c::get_antennas( size_t chan )
-+{
-+  std::vector< std::string > antennas;
-+
-+  antennas += get_antenna( chan );
-+
-+  return antennas;
-+}
-+
-+std::string plutosdr_source_c::set_antenna( const std::string & antenna, size_t chan )
-+{
-+  return get_antenna( chan );
-+}
-+
-+std::string plutosdr_source_c::get_antenna( size_t chan )
-+{
-+  return "A_BALANCED";
-+}
-+
-+double plutosdr_source_c::set_bandwidth( double bw, size_t chan )
-+{
-+  if (bw == 0.0)
-+    bw = 0.8 * samplerate;  // auto bandwidth
-+
-+  bandwidth = (unsigned long)bw;
-+  set_params();
-+  return bandwidth;
-+}
-+
-+double plutosdr_source_c::get_bandwidth( size_t chan )
-+{
-+  return bandwidth;
-+}
-+
-+void plutosdr_source_c::set_params( void )
-+{
-+  unsigned long long freq = ((double)frequency * (1.0 + _freq_corr * 0.000001));
-+
-+  // FIXME: gain_mode string can be manual / slow_attack / fast_attack / hybrid
-+  _src->set_params( freq, samplerate, bandwidth, quadrature, rfdc, bbdc,
-+                    gain_auto ? "fast_attack" : "manual", gain_value,
-+                    filter.c_str(), filter_auto );
-+}
-diff --git a/lib/plutosdr/plutosdr_source_c.h b/lib/plutosdr/plutosdr_source_c.h
-new file mode 100644
-index 0000000..efac91f
---- /dev/null
-+++ b/lib/plutosdr/plutosdr_source_c.h
-@@ -0,0 +1,105 @@
-+/* -*- c++ -*- */
-+/*
-+ * Copyright 2017 Dimitri Stolnikov <horiz0n@gmx.net>
-+ *
-+ * GNU Radio is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3, or (at your option)
-+ * any later version.
-+ *
-+ * GNU Radio is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with GNU Radio; see the file COPYING.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street,
-+ * Boston, MA 02110-1301, USA.
-+ */
-+#ifndef PLUTOSDR_SOURCE_C_H
-+#define PLUTOSDR_SOURCE_C_H
-+
-+#include <gnuradio/blocks/float_to_complex.h>
-+#include <gnuradio/blocks/short_to_float.h>
-+#include <gnuradio/hier_block2.h>
-+#include <gnuradio/iio/pluto_source.h>
-+
-+#include "source_iface.h"
-+
-+class plutosdr_source_c;
-+
-+typedef boost::shared_ptr< plutosdr_source_c > plutosdr_source_c_sptr;
-+
-+plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args = "");
-+
-+class plutosdr_source_c :
-+    public gr::hier_block2,
-+    public source_iface
-+{
-+private:
-+  friend plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args);
-+
-+  plutosdr_source_c(const std::string &args);
-+
-+public:
-+  ~plutosdr_source_c();
-+
-+  static std::vector< std::string > get_devices();
-+
-+  std::string name();
-+
-+  size_t get_num_channels( void );
-+
-+  osmosdr::meta_range_t get_sample_rates( void );
-+  double set_sample_rate( double rate );
-+  double get_sample_rate( void );
-+
-+  osmosdr::freq_range_t get_freq_range( size_t chan = 0 );
-+  double set_center_freq( double freq, size_t chan = 0 );
-+  double get_center_freq( size_t chan = 0 );
-+
-+  double set_freq_corr( double ppm, size_t chan = 0 );
-+  double get_freq_corr( size_t chan = 0 );
-+
-+  std::vector<std::string> get_gain_names( size_t chan = 0 );
-+  osmosdr::gain_range_t get_gain_range( size_t chan = 0 );
-+  osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 );
-+  bool set_gain_mode( bool automatic, size_t chan = 0 );
-+  bool get_gain_mode( size_t chan = 0 );
-+  double set_gain( double gain, size_t chan = 0 );
-+  double set_gain( double gain, const std::string & name, size_t chan = 0 );
-+  double get_gain( size_t chan = 0 );
-+  double get_gain( const std::string & name, size_t chan = 0 );
-+
-+  std::vector< std::string > get_antennas( size_t chan = 0 );
-+  std::string set_antenna( const std::string & antenna, size_t chan = 0 );
-+  std::string get_antenna( size_t chan = 0 );
-+
-+  double set_bandwidth( double bw, size_t chan = 0 );
-+  double get_bandwidth( size_t chan = 0 );
-+
-+private:
-+
-+  void set_params(void);
-+
-+  gr::iio::pluto_source::sptr       _src;
-+
-+  std::string   uri;
-+  unsigned long long frequency;
-+  unsigned long samplerate;
-+  unsigned long decimation;
-+  unsigned long bandwidth;
-+  unsigned long buffer_size;
-+  bool quadrature;
-+  bool rfdc;
-+  bool bbdc;
-+  bool          gain_auto;
-+  double        gain_value;
-+  std::string   filter;
-+  bool          filter_auto;
-+
-+  double _freq_corr;
-+};
-+
-+#endif // PLUTOSDR_SOURCE_C_H
-diff --git a/lib/source_impl.cc b/lib/source_impl.cc
-index a28f314..2a153bc 100644
---- a/lib/source_impl.cc
-+++ b/lib/source_impl.cc
-@@ -56,6 +56,10 @@
- #include <uhd_source_c.h>
- #endif
- 
-+#ifdef ENABLE_IIO
-+#include <plutosdr_source_c.h>
-+#endif
-+
- #ifdef ENABLE_MIRI
- #include <miri_source_c.h>
- #endif
-@@ -144,6 +148,9 @@ source_impl::source_impl( const std::string &args )
- #ifdef ENABLE_UHD
-   dev_types.push_back("uhd");
- #endif
-+#ifdef ENABLE_IIO
-+  dev_types.push_back("plutosdr");
-+#endif
- #ifdef ENABLE_MIRI
-   dev_types.push_back("miri");
- #endif
-@@ -216,6 +223,10 @@ source_impl::source_impl( const std::string &args )
-     BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
-       dev_list.push_back( dev );
- #endif
-+#ifdef ENABLE_IIO
-+    BOOST_FOREACH( std::string dev, plutosdr_source_c::get_devices() )
-+      dev_list.push_back( dev );
-+#endif
- #ifdef ENABLE_MIRI
-     BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
-       dev_list.push_back( dev );
-@@ -316,6 +327,13 @@ source_impl::source_impl( const std::string &args )
-     }
- #endif
- 
-+#ifdef ENABLE_IIO
-+    if ( dict.count("plutosdr") ) {
-+      plutosdr_source_c_sptr src = make_plutosdr_source_c( arg );
-+      block = src; iface = src.get();
-+    }
-+#endif
-+
- #ifdef ENABLE_MIRI
-     if ( dict.count("miri") ) {
-       miri_source_c_sptr src = make_miri_source_c( arg );
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
index 69775452090e..53e6a3392760 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uh
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.7*:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
index eb6cdd6fe1d5..f77ffadc343b 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -11,51 +11,41 @@ HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
 else
-	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
-	#git clone git://git.osmocom.org/gr-osmosdr.git
-	#cd gr-osmosdr
-	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk
+	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
-	iio? ( net-wireless/gr-iio )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_prepare() {
-	eapply "${FILESDIR}/csete-iio.patch"
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
+		-DENABLE_AIRSPY="$(usex airspy)"
 		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_FCD="$(usex fcd)"
 		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IIO="$(usex iio)"
 		-DENABLE_IQBALANCE="$(usex iqbalance)"
 		-DENABLE_MIRI="$(usex mirisdr)"
 		-DENABLE_PYTHON="$(usex python)"
@@ -74,5 +64,7 @@ src_install() {
 	cmake-utils_src_install
 	if use python; then
 		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 69775452090e..f77ffadc343b 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -19,11 +19,12 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
@@ -33,8 +34,7 @@ RDEPEND="${PYTHON_DEPS}
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -45,7 +45,6 @@ src_configure() {
 		-DENABLE_FILE=ON
 		-DENABLE_AIRSPY="$(usex airspy)"
 		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_FCD="$(usex fcd)"
 		-DENABLE_HACKRF="$(usex hackrf)"
 		-DENABLE_IQBALANCE="$(usex iqbalance)"
 		-DENABLE_MIRI="$(usex mirisdr)"
@@ -65,5 +64,7 @@ src_install() {
 	cmake-utils_src_install
 	if use python; then
 		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index daafe681c99c..68a1bf0f0a5c 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -10,7 +10,6 @@
 	<flag name="bladerf">Build with Nuand BladeRF support</flag>
 	<flag name="fcd">Build with Funcube Dongle support</flag>
 	<flag name="hackrf">Build with Great Scott Gadgets HackRF support</flag>
-	<flag name="iio">Build with Industrial IO support for devices such as Analog Devices Pluto</flag>
 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
 	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
 	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>