gentoo resync : 20.03.2021

5 files changed, 2 insertions, 204 deletions

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 12cb1843f417..8d85d64b595e 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,8 +1,4 @@
-AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
 AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
-AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c17e28676d32c0adf1c479a7f46a28572ec055f1c9bb8331b91497afaf4d241ebff6d2cf81e0eaed725559e SHA512 16a3f2d6adb715bcbc49ddf549f163e06fd1919a2e475d54dbc80d7b4cb8a757bf3124f75e158e53df132bcd9c60ad68da61b2ac0164af62ec1e3bb00415b264
-DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
 DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
-EBUILD sonic-visualiser-4.2.ebuild 2857 BLAKE2B 480517d4a7be070af7e4b70727b66cb7fb6bccfd46fa532b9e1896685f092417b7ef4082019c414181ce551b8dcf7deff66af89acb1e2b27e17e5f2cf4967d4a SHA512 95e5d27ac10caac3752b45a01a75f07131cc0ad70d477b475c57382c1dd4493e7f7db433bf49ce84a30222c5a779f7a0c1f5099c72186561796193f42434750b
-EBUILD sonic-visualiser-4.3.ebuild 1638 BLAKE2B 2df62c42fb0eff4e29d347442b55cbeb75b510383e97732f002acea69123f0f33db43a2e729a9faec3ccc0d91503cf106fc4840b72a589f20d870b62c23a3c9f SHA512 62c7f47e6fdce8db515d519ca91b86f7547870b09d9d1408259f0644bf797e2b30df8a20a51ad3ecb5a3397252f3ea2e4171e191d1b3bbcca2a427f2510d6816
+EBUILD sonic-visualiser-4.3.ebuild 1636 BLAKE2B cc13d00d1562777d328eba6166a73fd8ff13390985140f16ae2e2f1555338198cb76740767fcab2fe9b1065ecf83ae39553bb2219c2135311a13762f33a1a82b SHA512 47067ede6d807f1de837b0312575feed6063d9d2a4077b0f6a5bac7a42ed2777ee5444905dc39e61bdc1389ef840865fb003abcda2b2816fd148306dd187d1a4
 MISC metadata.xml 456 BLAKE2B ea6749af7e2c0905dfa753fdc2c5e9342727599b4550c282db4dd01c564019ba7e02c5116cd256abb99476087b78b085742ff649df7844f82b3efe88c74ea8ad SHA512 95e15aaade8230e877d46a7f7625d7ffaadf1273129e36255f43ca578ee3b878ab78fe39837ba7090f248830cd7bfa47de144ec13ed31f9677f7b65d270a66b0
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
deleted file mode 100644
index ec70849915ec..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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.xml b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
deleted file mode 100644
index 6daac7430022..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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-4.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
deleted file mode 100644
index f76d06d4e8a5..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
+++ /dev/null
@@ -1,130 +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/2755/${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
-	mv icons/sv-icon.svg icons/${PN}.svg
-	doicon -s scalable icons/${PN}.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.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
index 743413b051ab..e1d71cfe2f6c 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${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="