gentoo resync : 25.11.2020

6 files changed, 2 insertions, 322 deletions

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 97a346583cef..06cd0a7c6f1a 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,11 +1,5 @@
 AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
-AUX sonic-visualiser-4.0.1-qt-5.15-fix.patch 951 BLAKE2B 0148b2a825891b74664dd84819d274ad979b1ce4ed6f5f2d6c2a1f1d496123545f1cc7dec79bdb5145da441143be5ed88366ce00756e1c22f05a7945df7639e1 SHA512 57d5f55524612fbc2da7ff3a671fa9cc6fb66097111feb57e72b2fc254173947813644b95fe983faf411359db694d540f177a13b310b45930cb5769c318a483d
-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
-DIST sonic-visualiser-4.1.tar.gz 6535840 BLAKE2B b3afdb2026405148e2efb217e960a4e70fd8efbe3779c6cc3671b17a808f12e288efb89bbd5200da9ccfc8bdbd0c684d555f7394aab8e67d2963fd84f967da0c SHA512 57edfc52ddbc9198a6608460a8f4e4fc2a382588f2881b7ea99cc738d7944d66c942f24218a303fb20eaa698ee365f29006c985f2385afd7f5c27fec5a241adb
 DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
-EBUILD sonic-visualiser-4.0.1.ebuild 2790 BLAKE2B 776c2cf8fed6e68128ac5fa07adf129ae0ba0c4f44f3f37052d182029ab8744822266c8374654534201659089cd8e50b82d1cadec917314ab3c4afe26e77f477 SHA512 5ed5e4b90396c22c1d0e78bbb7efdedf3158f890dd23751a15d3bc04abebeb0df898e9fb751c3a2a20596b53a85a45deaf578411a2453bdff394b1b3eb176bef
-EBUILD sonic-visualiser-4.1.ebuild 2810 BLAKE2B c8cb7230027051bd096808dace111ef7ed9e4406bc9bd073c760f727290b3c80d1e436a8a250a92964a220920433aaa02cd42f577e7b63eb7c88d8dfeb71092f SHA512 dc85adec230e2a02006950d5c11ecdd4539b306561f54db9d5af45cc6858cb7309497b8024876d489295502e00376181700298404c50a8713287424df658d547
-EBUILD sonic-visualiser-4.2.ebuild 2859 BLAKE2B 76421cc79cc6e836fdd46023e2e2dda070086d5c211e1f13a1c7e19217e82e578644eb1e7d292131d2295157fbc18629e6323e06734ed4da035bd4957057deac SHA512 39ec9900d7d59e04b7b78229b108c782f1f9ecd960043c83a0d5c0451d9d1679f297d982e515f6b4e0515265671b8bd1ec15509c51ae4c68fed027797047b9c9
+EBUILD sonic-visualiser-4.2.ebuild 2857 BLAKE2B 480517d4a7be070af7e4b70727b66cb7fb6bccfd46fa532b9e1896685f092417b7ef4082019c414181ce551b8dcf7deff66af89acb1e2b27e17e5f2cf4967d4a SHA512 95e5d27ac10caac3752b45a01a75f07131cc0ad70d477b475c57382c1dd4493e7f7db433bf49ce84a30222c5a779f7a0c1f5099c72186561796193f42434750b
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
deleted file mode 100644
index 007df8ecbb67..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7ebbdfd514c70ab500c8079a11b8ed91d086fe5a Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Sat, 6 Jun 2020 11:09:16 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-
----
- svgui/layer/WaveformLayer.cpp | 1 +
- svgui/view/Overview.cpp       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/svgui/layer/WaveformLayer.cpp b/svgui/layer/WaveformLayer.cpp
-index 8499ba3..07b5b3c 100644
---- a/svgui/layer/WaveformLayer.cpp
-+++ b/svgui/layer/WaveformLayer.cpp
-@@ -27,6 +27,7 @@
- #include "data/model/WaveformOversampler.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QTextStream>
- 
-diff --git a/svgui/view/Overview.cpp b/svgui/view/Overview.cpp
-index 7e4248a..449ba63 100644
---- a/svgui/view/Overview.cpp
-+++ b/svgui/view/Overview.cpp
-@@ -20,6 +20,7 @@
- 
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <iostream>
- 
- //#define DEBUG_OVERVIEW 1
--- 
-2.26.2
-
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
deleted file mode 100644
index bf0bc76656b6..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/sonic-visualiser-4.0.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
deleted file mode 100644
index 9e65f200e3ff..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/2607/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-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:=
-	dev-libs/serd
-	dev-libs/sord
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib
-	media-libs/dssi
-	media-libs/ladspa-sdk
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/rubberband
-	media-libs/speex
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libfishsound
-		media-libs/liboggz
-	)
-	opus? ( media-libs/opusfile )
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-notest.patch"
-	"${FILESDIR}/${P}-qt-deprecated.patch"
-	"${FILESDIR}/${P}-qt-5.15-fix.patch"
-)
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	default
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	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
-
-	# capnproto 0.7 requires c++14 now
-	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
-		-i configure.ac \
-		-i */configure.ac \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-	sed -e 's/std=gnu++11/std=gnu++14/g' \
-		-i Makefile.* \
-		-i checker/Makefile.* \
-		|| die
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
-		einfo "Running ${i}"
-		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 sonic-visualiser.desktop
-
-	# mime types
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild
deleted file mode 100644
index 3279c15e7c9f..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/2717/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
-
-BDEPEND="
-	dev-qt/qttest:5
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	>=dev-libs/capnproto-0.6:=
-	dev-libs/serd
-	dev-libs/sord
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib
-	media-libs/dssi
-	media-libs/ladspa-sdk
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/rubberband
-	media-libs/speex
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libfishsound
-		media-libs/liboggz
-	)
-	opus? ( media-libs/opusfile )
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-# tests fail without mp3 support
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( jack pulseaudio portaudio )
-	test? ( id3tag mad )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-notest.patch"
-)
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	default
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	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
-
-	# capnproto 0.7 requires c++14 now
-	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
-		-i configure.ac \
-		-i */configure.ac \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-	sed -e 's/std=gnu++11/std=gnu++14/g' \
-		-i Makefile.* \
-		-i checker/Makefile.* \
-		|| die
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
-		einfo "Running ${i}"
-		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 sonic-visualiser.desktop
-
-	# mime types
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
index 5c7e308417d2..f76d06d4e8a5 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
 
 BDEPEND="