gentoo resync : 13.11.2021

3 files changed, 2 insertions, 83 deletions

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 68d95bc13fb2..7cd842e2606c 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,6 +1,4 @@
 AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
-DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
 DIST sonic-visualiser-4.4.tar.gz 6475000 BLAKE2B 37797b5fdcc397530a8b36bb1727bc56be703738505a117c853616eace41344b9526f98602ec872f4baa157cb1e92044bf7e3ef9079fa24b456453542bcf5763 SHA512 a76a6e5fc2381a3e7c89762687176fa60a8b731951438094af0ecd50103f73104a4366eacf731015573f8d5e5f436cf497a3e0e041363d5158d4f546bdd1f7b0
-EBUILD sonic-visualiser-4.3-r1.ebuild 1638 BLAKE2B 24fd029abfaa5de80f6975679db06cd0e3f6b8de17ab7b209bf964f4f2eebee5627bfb44768c0fd676fbd4d8d5009167c2f7fddeabc63c4aca6a98e08a30f263 SHA512 e7ae7fae399d1ad994ae92cd38a6dbaf7e628e6c12a466e448c8536f68902239844bdd6d4313f1028e31feef01abba4021610fc5c2153d83f5541d782e854a42
-EBUILD sonic-visualiser-4.4.ebuild 1854 BLAKE2B 93d4d82f16b81db8e5ed833f2356ef4036f346356d4af41a912c5d8a827efb1e3a7568c855df263129961c1d265bcee4ce1b8071b7f60efd7532fa0b5d636ae0 SHA512 043bba4edf2a8b88cbcff696fe8e3309e5beffe317eedd5cb53c757342404cbfec1b3f8012f33bf96adb2508c4291e82747069a07d87184706a0e7e98f443d88
+EBUILD sonic-visualiser-4.4.ebuild 1853 BLAKE2B d7bb586f099e0ddf8fad350328d5b5db8d6324c62accc1650fe88a45e13e5c552d0f5f7d4363792c7333fbbe56f502c1b703d34866f35ae45ad964b28b6eec90 SHA512 5a9fcad978c8e50522623ee76c78a31ca5a89833fa30030654bcdbaa094f5795abc2e058b4d9700b566cd039be9337fc4b8ce95975a2e84017e14cc585f3f320
 MISC metadata.xml 457 BLAKE2B fee1474516a395ba251de868c533ab4f88ac346a169a71e1513593f0ffa99f3365f0a7d87c24c31e73cf4f06d500b8bafe83f02230e6f24ebf8c0a23b43cd662 SHA512 58c25ca412527ef47411204f5ce579c3731c5b19922c43c13f069dae0c498e63879cc209e1f93e3487a2c32972df8ac45af690b4d470bfea9e497a3b9699c3a7
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.3-r1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3-r1.ebuild
deleted file mode 100644
index 5592a828181e..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson desktop xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser"
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${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
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/capnproto:=
-	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 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-# tests fail without mp3 support
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( jack pulseaudio portaudio )
-	test? ( id3tag mad )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-meson.build.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use id3tag)
-		$(meson_use jack)
-		$(meson_use mad)
-		$(meson_use ogg)
-		$(meson_use opus)
-		$(meson_use osc)
-		$(meson_use portaudio)
-		$(meson_use pulseaudio)
-	)
-	meson_src_configure
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
index cd16b31dbb51..cb1466d782e5 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
@@ -14,7 +14,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="