gentoo resync : 15.01.2020

8 files changed, 120 insertions, 446 deletions

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index ecfc5d9d5049..550079742438 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,6 +1,6 @@
-AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d27590fc2bff746d2fb8511a75874e3bfbfd5c5563dd642534e904706dd029d057986344c207c900 SHA512 c3e9fbb8f1844d9faa35b318ffebfe6c64672f329ac584a101bf1e3c5736916666e7c100863de7db50f89b8f98b8a2e267e82e4aad457cbbaa875da0322bb0f6
-AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
-AUX sonic-visualiser-3.1.1-qt-5.11.patch 262 BLAKE2B 627bedb71bab01fefa7edaee88f1245f19f312eea257904b2d03202b52c975a546fae73985b5cb9be4b42e97da2f41f28a26c13246f34a8c303b30ada0b276d0 SHA512 60ac4c02507c23fd7ebec556770175ddef3132ae54b0ef3136767c476f86e0c01e518ef2939b2ed6ddc044127f4a7393a800cfe70bfa21c2c103e378c8ea5983
-DIST sonic-visualiser-3.1.1.tar.gz 5304359 BLAKE2B 79c9d1d55ea2ec939fdb7abe656ab81aae72862d139eda4e62037e0231c596cf725b4fd5741216e6413bc25e659798dee3b0e06f55063a9ad73f0d9204f76d84 SHA512 e83efffb62179e67a0e5fd7352f63f5a0210102a7fb38c5ad486479a3749f68a44fec2d1843d1c1ca826ba0004bf421811a270a0a50e3f89f71d956dc7a76ae7
-EBUILD sonic-visualiser-3.1.1.ebuild 2985 BLAKE2B 1f8cbc2238e384063ddd0ee507d16481075e2a8f6532a8520f0da6795eac57fbdd4dbfffb4e6d82140397bdfc15d74a264f0b2c22e05d3c8958699ded1cde878 SHA512 bfec9ac5e08c0b05a2b0c5937f3f1ee72be454744ffc5d4623c7f275ae395368af1916a23638a76c3c5566672ae1f853c96ed857ef362a3f37ade4fb45bd848e
+AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
+AUX sonic-visualiser-4.0.1-qt-deprecated.patch 564 BLAKE2B 4ee5743d4dac92c5cfe7530a5d57c97f8ab875ba95fa3148424bc827c3735f1833203e8e30a3777e0a9219c0404205514ca28ca06874e8a7357794890d607403 SHA512 8af7b53474244aed2c61bff7a1276fe826a1be933b79e5aa1cf5f3af579d5ba374ff9cc2e65f7f4f97d6cd8fd2d28d19915856db6f9e196b35e9ee3280a07421
+AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c17e28676d32c0adf1c479a7f46a28572ec055f1c9bb8331b91497afaf4d241ebff6d2cf81e0eaed725559e SHA512 16a3f2d6adb715bcbc49ddf549f163e06fd1919a2e475d54dbc80d7b4cb8a757bf3124f75e158e53df132bcd9c60ad68da61b2ac0164af62ec1e3bb00415b264
+DIST sonic-visualiser-4.0.1.tar.gz 6649178 BLAKE2B c231833f7cc6228d450600e5cbc6a6db85d0aa784ce67a225bedb1393ca82a99bca492912bbaf8bf87f5fcce48e57facc3f216b057233b53f596ccd71835d174 SHA512 6557d7c90618f7f2c18f8bb0058b8cd74a084f26376999074b9d5f23f04e1548b7e82ccbb73a301fa68c1d2f047810d312e568a85c9c7f3f25da9ec9b00c4220
+EBUILD sonic-visualiser-4.0.1.ebuild 2754 BLAKE2B 3505ea9251477726805a756c7d771f9ec8ec28b6832fddca1638ddfb2c150305cc04e300269f6db4640d6edc44dc17e45cd412fc9c0e47e4734ce64cc08b1013 SHA512 187b031f996b4b6b00fc0c8c64b4a3b42d4937135f6a808a989d872d1ae65df5d5e44002a8d79c627e408bb260e10e0b750127c08d48ddcb305da8383a3d17d3
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/files/notest.patch b/media-sound/sonic-visualiser/files/notest.patch
deleted file mode 100644
index 59b4d04f9336..000000000000
--- a/media-sound/sonic-visualiser/files/notest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: sonic-visualiser-3.0.2/test-svcore-base.pro
-===================================================================
---- sonic-visualiser-3.0.2.orig/test-svcore-base.pro
-+++ sonic-visualiser-3.0.2/test-svcore-base.pro
-@@ -28,6 +28,3 @@ include(svcore/base/test/files.pri)
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
- 
--!win32* {
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-Index: sonic-visualiser-3.0.2/test-svcore-data-fileio.pro
-===================================================================
---- sonic-visualiser-3.0.2.orig/test-svcore-data-fileio.pro
-+++ sonic-visualiser-3.0.2/test-svcore-data-fileio.pro
-@@ -28,6 +28,3 @@ include(svcore/data/fileio/test/files.pr
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
- 
--!win32* {
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-Index: sonic-visualiser-3.0.2/test-svcore-data-model.pro
-===================================================================
---- sonic-visualiser-3.0.2.orig/test-svcore-data-model.pro
-+++ sonic-visualiser-3.0.2/test-svcore-data-model.pro
-@@ -28,6 +28,3 @@ include(svcore/data/model/test/files.pri
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
- 
--!win32* {
--    QMAKE_POST_LINK = ./$${TARGET}
--}
diff --git a/media-sound/sonic-visualiser/files/piper.capnp b/media-sound/sonic-visualiser/files/piper.capnp
deleted file mode 100644
index 6e99ff6849d2..000000000000
--- a/media-sound/sonic-visualiser/files/piper.capnp
+++ /dev/null
@@ -1,364 +0,0 @@
-
-# Piper audio feature extraction: schema for low-level operation
-#
-# This file is formatted to 130 characters width, in order to fit the
-# comments next to the schema definitions.
-#
-# Copyright (c) 2015-2017 Queen Mary, University of London, provided
-# under a BSD-style licence. See the file COPYING for details.
-
-@0xc4b1c6c44c999206;
-
-using Cxx = import "/capnp/c++.capnp";
-$Cxx.namespace("piper");
-
-struct Basic {
-    # Basic metadata common to many Piper structures.
-
-    identifier         @0  :Text;                 # A computer-readable string. Must match the regex /^[a-zA-Z0-9_-]+$/.
-    name               @1  :Text;                 # A short human-readable name or label. Must be present.
-    description        @2  :Text;                 # An optional human-readable descriptive text that may accompany the name.
-}
-
-struct ParameterDescriptor {
-    # Properties of an adjustable parameter. A parameter's value is just a single
-    # float, but the descriptor explains how to interpret and present that value.
-    # A Piper feature extractor has a static list of parameters. The properties of
-    # a given parameter never change, in contrast to output descriptors, which
-    # may have different properties depending on the configuration of the extractor.
-
-    basic              @0  :Basic;                # Basic metadata about the parameter.
-    unit               @1  :Text;                 # Human-recognisable unit of the parameter (e.g. Hz). May be left empty.
-    minValue           @2  :Float32     = 0.0;    # Minimum value. Must be provided.
-    maxValue           @3  :Float32     = 0.0;    # Maximum value. Must be provided.
-    defaultValue       @4  :Float32     = 0.0;    # Default if the parameter is not set to anything else. Must be provided.
-    isQuantized        @5  :Bool        = false;  # True if parameter values are quantized to a particular resolution.
-    quantizeStep       @6  :Float32     = 0.0;    # Quantization resolution, if isQuantized.
-    valueNames         @7  :List(Text)  = [];     # Optional human-readable labels for the values, if isQuantized.
-}
-
-enum SampleType {
-    # How returned features are spaced on the input timeline.
-
-    oneSamplePerStep   @0;                        # Each process input returns a feature aligned with that input's timestamp.
-    fixedSampleRate    @1;                        # Features are equally spaced at a given sample rate.
-    variableSampleRate @2;                        # Features have their own individual timestamps.
-}
-
-struct StaticOutputDescriptor {
-
-    # Properties of an output, that is, a single stream of features
-    # produced in response to process and finish requests. A feature
-    # extractor may have any number of outputs, and it always
-    # calculates and returns features from all of them when
-    # processing; this is useful in cases where more than one feature
-    # can be easily calculated using a single method.
-    # 
-    # This structure contains the properties of an output that are
-    # static, i.e. that do not depend on the parameter values provided
-    # at configuration, excluding the Basic struct parameters like id
-    # and description.  The Basic struct properties are not included
-    # for historical reasons: they were already referenced separately
-    # in the OutputDescriptor and ExtractorStaticData before this
-    # struct was introduced.
-    
-    typeURI            @0  :Text;                 # URI indicating the sort of feature that this output returns (see docs).
-}
-
-struct ConfiguredOutputDescriptor {
-    # Properties of an output, that is, a single stream of features produced
-    # in response to process and finish requests. A feature extractor may
-    # have any number of outputs, and it always calculates and returns features
-    # from all of them when processing; this is useful in cases where more
-    # than one feature can be easily calculated using a single method.
-    # This structure contains the properties of an output that are not static,
-    # i.e. that may depend on the parameter values provided at configuration.
-
-    unit               @0  :Text;                 # Human-recognisable unit of the bin values in output features. May be empty.
-    hasFixedBinCount   @1  :Bool        = false;  # True if this output has an equal number of values in each returned feature.
-    binCount           @2  :Int32       = 0;      # Number of values per feature for this output, if hasFixedBinCount.
-    binNames           @3  :List(Text)  = [];     # Optional human-readable labels for the value bins, if hasFixedBinCount.
-    hasKnownExtents    @4  :Bool        = false;  # True if all feature values fall within the same fixed min/max range.
-    minValue           @5  :Float32     = 0.0;    # Minimum value in range for any value from this output, if hasKnownExtents.
-    maxValue           @6  :Float32     = 0.0;    # Maximum value in range for any value from this output, if hasKnownExtents.
-    isQuantized        @7  :Bool        = false;  # True if feature values are quantized to a particular resolution.
-    quantizeStep       @8  :Float32     = 0.0;    # Quantization resolution, if isQuantized.
-    sampleType         @9  :SampleType;           # How returned features from this output are spaced on the input timeline.
-    sampleRate         @10 :Float32     = 0.0;    # Sample rate (features per second) if sampleType == fixedSampleRate.
-    hasDuration        @11 :Bool        = false;  # True if features returned from this output will have a duration.
-}
-
-struct OutputDescriptor {
-    # All the properties of an output, both static (the basic metadata and static
-    # descriptor) and potentially dependent on configuration parameters (the
-    # configured descriptor).
-
-    basic              @0  :Basic;                # Basic metadata about the output.
-    configured         @1  :ConfiguredOutputDescriptor;    # Properties of the output that may depend on configuration parameters.
-    static             @2  :StaticOutputDescriptor;        # Properties (other than Basic) that do not depend on parameters.
-}
-
-enum InputDomain {
-    # Whether a feature extractor requires time-domain audio input (i.e.
-    # "normal" or "unprocessed" audio samples) or frequency-domain input
-    # (i.e. resulting from windowed, usually overlapping, short-time
-    # Fourier transforms).
-
-    timeDomain         @0;                        # The plugin requires time-domain audio samples as input.
-    frequencyDomain    @1;                        # The plugin requires input to have been pre-processed using windowed STFTs.
-}
-
-struct ExtractorStaticData {
-    # Static properties of a feature extractor. That is, metadata about the
-    # extractor that are the same regardless of how you configure or run it.
-
-    key                @0  :Text;                 # String that "globally" identifies the extractor, used to load it (see docs).
-    basic              @1  :Basic;                # Basic metadata about the extractor.
-    maker              @2  :Text;                 # Human-readable text naming the author or vendor of the extractor.
-    rights             @3  :Text;                 # Human-readable summary of copyright and/or licensing terms for the extractor.
-    version            @4  :Int32;                # Version number of extractor; must increase if new algorithm changes results.
-    category           @5  :List(Text);           # List of general->specific category labels for this extractor (see docs).
-    minChannelCount    @6  :Int32;                # Minimum number of input channels of audio this extractor can accept.
-    maxChannelCount    @7  :Int32;                # Maximum number of input channels of audio this extractor can accept.
-    parameters         @8  :List(ParameterDescriptor);    # List of configurable parameter properties for the feature extractor.
-    programs           @9  :List(Text);           # List of predefined programs. For backward-compatibility, not recommended.
-    inputDomain        @10 :InputDomain;          # Whether the extractor requires time-domain or frequency-domain input audio.
-    basicOutputInfo    @11 :List(Basic);          # Basic metadata about all of the outputs of the extractor.
-
-    struct SOPair {
-        # A mapping between output identifier and static descriptor for
-	# that output.
-	
-        output         @0  :Text;                 # Output id, matching the output's descriptor's basic identifier.
-        static         @1  :StaticOutputDescriptor;
-    }
-
-    staticOutputInfo   @12 :List(SOPair);         # Static descriptors for all outputs that have any static metadata.
-}
-
-struct RealTime {
-    # Time structure. When used as a timestamp, this is relative to "start
-    # of audio".
-    
-    sec                @0  :Int32       = 0;      # Number of seconds.
-    nsec               @1  :Int32       = 0;      # Number of nanoseconds. Must have same sign as sec unless sec == 0.
-}
-
-struct ProcessInput {
-    # Audio and timing input data provided to a process request.
-
-    inputBuffers       @0  :List(List(Float32));  # A single block of audio data (time or frequency domain) for each channel.
-    timestamp          @1  :RealTime;             # Time of start of block (time-domain) or "centre" of it (frequency-domain).
-}
-
-struct Feature {
-    # A single feature calculated and returned from a process or finish request.
-
-    hasTimestamp       @0  :Bool        = false;  # True if feature has a timestamp. Must be true for a variableSampleRate output.
-    timestamp          @1  :RealTime;             # Timestamp of feature, if hasTimestamp.
-    hasDuration        @2  :Bool        = false;  # True if feature has a duration. Must be true if output's hasDuration is true.
-    duration           @3  :RealTime;             # Duration of feature, if hasDuration.
-    label              @4  :Text;                 # Optional human-readable text attached to feature.
-    featureValues      @5  :List(Float32) = [];   # The feature values themselves (of size binCount, if output hasFixedBinCount).
-}
-
-struct FeatureSet {
-    # The set of all features, across all outputs, calculated and returned from
-    # a single process or finish request.
-
-    struct FSPair {
-        # A mapping between output identifier and ordered list of features for
-	# that output.
-	
-        output         @0  :Text;                 # Output id, matching the output's descriptor's basic identifier.
-        features       @1  :List(Feature) = [];   # Features calculated for that output during the current request, in time order.
-    }
-    
-    featurePairs       @0  :List(FSPair);         # The feature lists for all outputs for which any features have been calculated.
-}
-
-struct Framing {
-    # Determines how audio should be split up into individual buffers for input.
-    # If the feature extractor accepts frequency-domain input, then this
-    # applies prior to the STFT transform.
-    #
-    # These values are sometimes mandatory, but in other contexts one or both may
-    # be set to zero to mean "don't care". See documentation for structures that
-    # include a framing field for details.
-    
-    blockSize          @0  :Int32;                # Number of time-domain audio samples per buffer (on each channel).
-    stepSize           @1  :Int32;                # Number of samples to advance between buffers: equals blockSize for no overlap.
-}
-
-struct Configuration {
-    # Bundle of parameter values and other configuration data for a feature-
-    # extraction procedure.
-
-    struct PVPair {
-        # A mapping between parameter identifier and value.
-	
-        parameter      @0  :Text;                 # Parameter id, matching the parameter's descriptor's basic identifier.
-        value          @1  :Float32;              # Value to set parameter to (within constraints given in parameter descriptor).
-    }
-    
-    parameterValues    @0  :List(PVPair);         # Values for all parameters, or at least any that are to change from defaults.
-    currentProgram     @1  :Text;                 # Selection of predefined program. For backward-compatibility, not recommended. 
-    channelCount       @2  :Int32;                # Number of audio channels of input.
-    framing            @3  :Framing;              # Step and block size for framing the input.
-}
-
-enum AdapterFlag {
-    # Flags that may be used when requesting a server to load a feature
-    # extractor, to ask the server to do some of the work of framing and input
-    # conversion instead of leaving it to the client side. These affect the
-    # apparent behaviour of the loaded extractor.
-
-    adaptInputDomain   @0;                        # Input-domain conversion, so the extractor always expects time-domain input.
-    adaptChannelCount  @1;                        # Channel mixing or duplication, so any number of input channels is acceptable. 
-    adaptBufferSize    @2;                        # Framing, so the extractor accepts any blockSize of non-overlapping buffers.
-}
-
-const adaptAllSafe :List(AdapterFlag) =
-    [ adaptInputDomain, adaptChannelCount ];
-    # The set of adapter flags that can always be applied, leaving results unchanged.
-
-const adaptAll :List(AdapterFlag) =
-    [ adaptInputDomain, adaptChannelCount, adaptBufferSize ];
-    # The set of adapter flags that may cause "equivalent" results to be returned (see documentation).
-
-struct ListRequest {
-    # Request a server to provide a list of available feature extractors.
-    
-    from               @0  :List(Text);           # If non-empty, provide only extractors found in the given list of "libraries".
-}
-
-struct ListResponse {
-    # Response to a successful list request.
-    
-    available          @0  :List(ExtractorStaticData);    # List of static data about available feature extractors.
-}
-
-struct LoadRequest {
-    # Request a server to load a feature extractor and return a handle to it.
-    
-    key                @0  :Text;                 # Key as found in the extractor's static data structure.
-    inputSampleRate    @1  :Float32;              # Sample rate for input audio. Properties of the extractor may depend on this.
-    adapterFlags       @2  :List(AdapterFlag);    # Set of optional flags to make any framing and input conversion requests.
-}
-
-struct LoadResponse {
-    # Response to a successful load request.
-    
-    handle             @0  :Int32;                # Handle to be used to refer to the loaded feature extractor in future requests.
-    staticData         @1  :ExtractorStaticData;  # Static data about this feature extractor, identical to that in list response.
-    defaultConfiguration @2  :Configuration;      # Extractor's default parameter values and preferred input framing.
-}
-
-struct ConfigurationRequest {
-    # Request a server to configure a loaded feature extractor and prepare
-    # it for use. This request must be carried out on a feature extractor
-    # before any process request can be made.
-    
-    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
-    configuration      @1  :Configuration;        # Bundle of parameter values to set, and client's preferred input framing.
-}
-
-struct ConfigurationResponse {
-    # Response to a successful configuration request.
-
-    handle             @0  :Int32;                # Handle of extractor, as passed in the configuration request.
-    outputs            @1  :List(OutputDescriptor);       # Full set of properties of all outputs following configuration.
-    framing            @2  :Framing;              # Input framing that must be used for subsequent process requests.
-}
-
-struct ProcessRequest {
-    # Request a server to process a buffer of audio using a loaded and
-    # configured feature extractor.
-
-    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
-    processInput       @1  :ProcessInput;         # Audio in the input domain, with framing as in the configuration response.
-}
-
-struct ProcessResponse {
-    # Response to a successful process request.
-
-    handle             @0  :Int32;                # Handle of extractor, as passed in the process request.
-    features           @1  :FeatureSet;           # All features across all outputs calculated during this process request.
-}
-
-struct FinishRequest {
-    # Request a server to finish processing and unload a loaded feature
-    # extractor. This request may be made at any time -- the extractor does
-    # not have to have been configured or used. The extractor handle cannot
-    # be used again with this server afterwards.
-
-    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
-}
-
-struct FinishResponse {
-    # Response to a successful finish request.
-
-    handle             @0  :Int32;                # Handle of extractor, as passed in the finish request. May not be used again.
-    features           @1  :FeatureSet;           # Features the extractor has calculated now that it knows all input has ended.
-}
-
-struct Error {
-    # Response to any request that fails.
-
-    code               @0  :Int32;                # Error code. 
-    message            @1  :Text;                 # Error message.
-}
-
-struct RpcRequest {
-    # Request bundle for use when using Cap'n Proto serialisation without
-    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
-
-    id :union {
-        # Identifier used solely to associate a response packet with its
-	# originating request. Server does not examine the contents of this,
-	# it just copies the request id structure into the response.
-	
-        number         @0  :Int32;
-        tag            @1  :Text;
-        none           @2  :Void;
-    }
-    
-    request :union {
-        # For more details, see the documentation for the individual
-	# request structures.
-	
-	list           @3  :ListRequest;          # Provide a list of available feature extractors.
-	load           @4  :LoadRequest;          # Load a feature extractor and return a handle to it.
-	configure      @5  :ConfigurationRequest; # Configure a loaded feature extractor, set parameters, and prepare it for use.
-	process        @6  :ProcessRequest;       # Process a single fixed-size buffer of audio and return calculated features.
-	finish         @7  :FinishRequest;        # Get any remaining features and unload the extractor.
-    }
-}
-
-struct RpcResponse {
-    # Response bundle for use when using Cap'n Proto serialisation without
-    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
-
-    id :union {
-        # Identifier used solely to associate a response packet with its
-	# originating request. Server does not examine the contents of this,
-	# it just copies the request id structure into the response.
-	
-        number         @0  :Int32;
-        tag            @1  :Text;
-        none           @2  :Void;
-    }
-
-    response :union {
-        # For more details, see the documentation for the individual
-	# response structures.
-	
-        error          @3  :Error;                # The request (of whatever type) failed.
-	list           @4  :ListResponse;         # List succeeded: here is static data about the requested extractors.
-	load           @5  :LoadResponse;         # Load succeeded: here is a handle for the loaded extractor.
-	configure      @6  :ConfigurationResponse;# Configure succeeded: ready to process, here are values such as block size.
-	process        @7  :ProcessResponse;      # Process succeeded: here are all features calculated from this input block.
-	finish         @8  :FinishResponse;       # Finish succeeded: extractor unloaded, here are all remaining features.
-    }
-}
-
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
deleted file mode 100644
index 5d62677128b4..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug: https://bugs.gentoo.org/664628
-
---- a/svapp/audio/AudioCallbackRecordTarget.cpp
-+++ b/svapp/audio/AudioCallbackRecordTarget.cpp
-@@ -19,6 +19,7 @@
- 
- #include "data/model/WritableWaveFileModel.h"
- 
-+#include <QDateTime>
- #include <QDir>
- #include <QTimer>
- 
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
new file mode 100644
index 000000000000..ec70849915ec
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
@@ -0,0 +1,52 @@
+diff --git a/test-svcore-base.pro b/test-svcore-base.pro
+index 275cb58..636129c 100644
+--- a/test-svcore-base.pro
++++ b/test-svcore-base.pro
+@@ -27,8 +27,3 @@ include(svcore/base/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro
+index 7b53ca1..a2aa3ce 100644
+--- a/test-svcore-data-fileio.pro
++++ b/test-svcore-data-fileio.pro
+@@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro
+index 3b45ac0..d08b14e 100644
+--- a/test-svcore-data-model.pro
++++ b/test-svcore-data-model.pro
+@@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-system.pro b/test-svcore-system.pro
+index 6ef7db7..685c1ba 100644
+--- a/test-svcore-system.pro
++++ b/test-svcore-system.pro
+@@ -27,8 +27,3 @@ include(svcore/system/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
new file mode 100644
index 000000000000..bf0bc76656b6
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
@@ -0,0 +1,22 @@
+diff --git a/checker/src/plugincandidates.cpp b/checker/src/plugincandidates.cpp
+index 2990905..8297253 100644
+--- a/checker/src/plugincandidates.cpp
++++ b/checker/src/plugincandidates.cpp
+@@ -37,7 +37,7 @@
+ 
+ #include <QProcess>
+ #include <QDir>
+-#include <QTime>
++#include <QElapsedTimer>
+ 
+ #if defined(_WIN32)
+ #define PLUGIN_GLOB "*.dll"
+@@ -231,7 +231,7 @@ PluginCandidates::runHelper(vector<string> libraries, string descriptor)
+         process.write("\n", 1);
+     }
+ 
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+     int timeout = 15000; // ms
+ 
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser.xml b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
new file mode 100644
index 000000000000..6daac7430022
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+
+  <mime-type type="application/x-sonicvisualiser">
+    <comment>Sonic Visualiser session file</comment>
+    <generic-icon name="sv-icon"/>
+    <glob pattern="*.sv"/>
+  </mime-type>
+
+  <mime-type type="application/x-sonicvisualiser-layer">
+    <comment>Sonic Visualiser layer file</comment>
+    <generic-icon name="sv-icon"/>
+    <glob pattern="*.svl"/>
+  </mime-type>
+
+</mime-info>
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
index 788100ee4154..f5736dea6a77 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools desktop qmake-utils xdg-utils
+inherit autotools desktop qmake-utils xdg
 
 DESCRIPTION="Music audio files viewer and analiser"
 HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2391/${P}.tar.gz"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2607/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
+IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio"
 
+BDEPEND="
+	dev-qt/qttest:5
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
 RDEPEND="
 	app-arch/bzip2
 	>=dev-libs/capnproto-0.6:=
@@ -36,27 +41,24 @@ RDEPEND="
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	mad? ( media-libs/libmad )
 	ogg? (
 		media-libs/libfishsound
-		>=media-libs/liboggz-1.1.0
+		media-libs/liboggz
 	)
+	opus? ( media-libs/opusfile )
 	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	portaudio? ( >=media-libs/portaudio-19 )
 	pulseaudio? ( media-sound/pulseaudio )
 "
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="|| ( jack pulseaudio portaudio )"
 
 PATCHES=(
-	"${FILESDIR}/notest.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-notest.patch"
+	"${FILESDIR}/${P}-qt-deprecated.patch"
 )
 
 sv_disable_opt() {
@@ -74,6 +76,7 @@ src_prepare() {
 	use mad || sv_disable_opt mad
 	use ogg || sv_disable_opt fishsound
 	use ogg || sv_disable_opt oggz
+	use opus || sv_disable_opt opus
 	use osc || sv_disable_opt liblo
 	use portaudio || sv_disable_opt portaudio
 	use pulseaudio || sv_disable_opt libpulse
@@ -85,14 +88,6 @@ src_prepare() {
 		|| die
 
 	eautoreconf
-
-	# Those need to be regenerated as they must match current capnproto version
-	einfo "Regenerating piper capnproto files"
-	rm -f piper-cpp/vamp-capnp/piper.capnp.* || die
-	mkdir -p piper/capnp || die
-	cp "${FILESDIR}/piper.capnp" piper/capnp/ || die
-	cd piper-cpp || die
-	emake vamp-capnp/piper.capnp.h
 }
 
 src_configure() {
@@ -106,27 +101,25 @@ src_configure() {
 }
 
 src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model ; do
+	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
 		einfo "Running ${i}"
-		./${i} || die
+		HOME="${T}" ./${i} || die
 	done
 }
 
 src_install() {
 	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
 	dodoc README*
+
 	#install samples
 	insinto /usr/share/${PN}/samples
 	doins samples/*
+
 	# desktop entry
 	doicon icons/sv-icon.svg
-	domenu *.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
+	domenu sonic-visualiser.desktop
 
-pkg_postrm() {
-	xdg_desktop_database_update
+	# mime types
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
 }