gentoo resync : 14.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
commit: deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree: 9a48f42594e1a9e6b2020d5535a784314434d7a7 /media-sound
parent: 38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
147 files changed, 1307 insertions, 1769 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index cef3f8057197..2fb826f7c491 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index b7f0f9f40f45..dec774014dbc 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,4 +1,4 @@
 AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
 DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
-EBUILD abcde-2.9.3.ebuild 1836 BLAKE2B df25a24c07c9a13e5c64f19270184f97d978d08640304ea1ff5f66568545e10dabf3dfe0ff24640154af8bab36fc635ac2021e8607056989e77c6b0c3ee44801 SHA512 a8ce354679a46488ca1cada2699c525911efb129ce3979e511ebea279d7896148187a4670a0f170337e083cec52f4a23d254fd5fd23b725042164f925c17a3d1
+EBUILD abcde-2.9.3-r1.ebuild 1840 BLAKE2B 355931c6aa85c0248d575ea5c340f6c51f6d538d8879f79887d960c78e389756e0e0539736c6ee45a7ba3680b74f0bbc931736f897b309e2153ba91a40730cbd SHA512 7f32e77d756653d3dcbbb826aebaab22787d0414c7bdd5bd32722aa9d1492f11397923bb97f544a5d0051819f5eb0555f87e50fccc507bb4cd3564efdf344b53
 MISC metadata.xml 687 BLAKE2B 003c2762435868462c70ea9a6d21e7c50b7db96f10cdf3ee68788d027f92e6e656046dcd070f3054888c473dc0fdc273462f36067c2ebbe48b64fe4a8cfa95cf SHA512 42995ba554653993a07ab04e6ad8f8a50ed2fcf3319869fc54b76480a61fe2c22c1186c39354f9a5920ed4b065cf8ef52fa10e67cfa258199dae6da9db3a9581
diff --git a/media-sound/abcde/abcde-2.9.3.ebuild b/media-sound/abcde/abcde-2.9.3-r1.ebuild
index d68fe4df557c..e33e9553b76b 100644
--- a/media-sound/abcde/abcde-2.9.3.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 			media-video/atomicparsley-wez
 		)
 	)
-	aiff? ( virtual/ffmpeg )
+	aiff? ( media-video/ffmpeg )
 	cdr? ( virtual/cdrtools )
 	flac? ( media-libs/flac )
 	id3tag? (
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index a4e0cef9841c..1ba4a8d39cd7 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -2,5 +2,5 @@ AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
 EBUILD alsa-tools-1.1.7.ebuild 3582 BLAKE2B 11ac1868daffdd46fa1b2773d30df9e8549a25da2fc7758ae1ae300951a259622819ea5b09074ed41d9349344afd1b07c871498f403ceaaf4554390e4ffa8f31 SHA512 f2f631c6b3d9b11df7cc7a1fdb89f3453fd51771a4b2a6237a922887ad462e83b9739dc38ca48c42f039b855b3df48b36c30cd49f6b9f3904c35234cc37fb180
-EBUILD alsa-tools-1.2.2.ebuild 3400 BLAKE2B 23ac8aa2d756d4dbb742e155c136629cdb94433bf5638a29277c3c255b75bc6d828e074731ea5cd46b062910f5bf62a9ed86d716823d127bdb098fda1e49844f SHA512 cc7fc7f29fda79e94ad86f0e7491a5d3054cd6340ffd04efb056bbc2bbee052e132165e9c84124b4b2664c0024287030af145fe8f54d1697b7e1178299467015
+EBUILD alsa-tools-1.2.2-r1.ebuild 3406 BLAKE2B 96ba11cb4d70c6231b0a1b41251969b343276ae6b6678a260b1b38c8c2ecfde681e2f6a97f1ed7b4032d234748d98e3f1858d282008d9d3e9b075de0042765a5 SHA512 4036014c982680d69f5d337f597d79d5e42ba4fb1ae88abfd866f996cc4b042dfc6f04621697c22b1990918491734ff4eb5eb15d3b18312ea182a92ea85e7d5b
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.2.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
index 2bed3f3f96d6..6b7a409f24e1 100644
--- a/media-sound/alsa-tools/alsa-tools-1.2.2.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic xdg
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
@@ -10,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
@@ -21,7 +22,7 @@ DEPEND=">=media-libs/alsa-lib-${PV}
 	>=dev-python/pyalsa-1.0.26
 	fltk? ( >=x11-libs/fltk-1.3.0:1 )
 	gtk? (
-		>=dev-python/pygtk-2
+		dev-libs/gobject-introspection
 		x11-libs/gtk+:2
 		x11-libs/gtk+:3
 	)" #468294
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 2319e934d4ce..0fb9c63629e8 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -6,5 +6,5 @@ AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b76
 DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
 EBUILD alsa-utils-1.2.1.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
-EBUILD alsa-utils-1.2.2.ebuild 2341 BLAKE2B d3634b987e5fe5917a2f5e336ef9603a141fc67b1e7a89d258ffaa7c04d5b674613f7232d8d6b1f00f687a0471ab8bdeb28e7e2eb4164a9f9e5b098cac614b43 SHA512 73cf0447b2e8e97e8d53d518a37a637ae939e6a9640a198847bc7be8e60d13e690ea5ba53691f837cf8e981fdd7b542fc4577f6fafb598285361cb46677ba9c8
+EBUILD alsa-utils-1.2.2.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
index 24b8ba3949fe..13b172c0891b 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 9b432374db7f..566f8f809274 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,5 +1,9 @@
 AUX apulse 488 BLAKE2B 20231c1041e1658e993ecc5f0dbd37f1d7e718aa5095b0bcb18b6c78639da5da29d5aa72fe77c774598d199e8284cceaab9fdb9aa07cf734957fb1c2d8d617c0 SHA512 2b1ebb3d574af2469f50a42e324b3367b5e08d3de00076620ce2133226d544ab2507e6d752ff3ed427319978ab5e1a0e73189368666a5c7f5ed61f1294417228
+AUX check-key-before-remove.patch 1888 BLAKE2B d8bee7f8acac213396d18d44740703746653a57d300c8d86967e83c24b73aca7d8ba5e91e38d7c3683d40c2a520cacb29210e2c1d739bf4b0403199beb9bda81 SHA512 e7edf75cdddc94a433ce387853cc59cfa40ef7fbdc955357141f42133bf9bde4e6528078d75c7d58001ab07dcaf209b0437a92445d770f6cd08f9b919e97caa4
+AUX man.patch 1054 BLAKE2B 37228832250f1c1e06edf79d00a4a4d7d5433f2d9b28ebb10eacb54bcfb7478d9ef64459e87f7f43a94be0b194eba024cde60175fc324ef6dad7a4ef9e2c1db3 SHA512 c2b05dd8c42f79994ae3be5df5ac495e95bfbc14355423faa75b23863418bad4bbc33524e2b86abc9e346678256c1ff454c160ebb5e09f48d466ef99cdfa407c
 AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6171e29546af97c374765bed081cdf13827add3d02e5cdb6b30adccaae03318c102dba4cff65 SHA512 f1f743d049c120f3c8d6d1387577b53e9637881d9d5e007c55b4e42feca21b170ee24146c5fb0cc050c3eb1c26659dc6363e673710ae08c76f2844306a1ca01d
 DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
+DIST apulse-0.1.13.tar.gz 117369 BLAKE2B 8cf527daf21420a72e46968a3b07ab61029f404a2b6574ac1f08dd40528f3e6e4baf7e38f5914b0c89252e16eec5e8f3722be51e5a61b6a71c683e994740b4bf SHA512 366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007
 EBUILD apulse-0.1.12-r4.ebuild 1449 BLAKE2B a906511d311d43c9c45f8f292c02b98add6e3d74d7fc9402a4ec9a6629ce70cdb839a98a5a23179ccdb8e821fc3016cabdb5679f4a2ddb4c0de02efd6202e8a3 SHA512 2b865a68d87ee96c614f92263936c3d9f0a183a603af84b8b46f306173b06ddd86a553b3f1c05fa8a860c2fe3582e0f650c14f29d2530b138e0ace95bf60bccc
+EBUILD apulse-0.1.13.ebuild 1465 BLAKE2B 53e5ea4d1bfa14dd98da82ba1698772549a67bb71f0eae716b23f27f92cdbee4a6a67ae65b2f424ae619e056723b4d5acf7769bf9387c265548739dfe39b1608 SHA512 3975a19bbdba965bea60b6c83f7bb4e64d3cbc13eb78894ad439c31ae7835444cbdbdd951468af26a3ea8822b2beadd45f90f0a20f96f50f53ace44136c86d7e
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.13.ebuild b/media-sound/apulse/apulse-0.1.13.ebuild
new file mode 100644
index 000000000000..6641e6bb6c88
--- /dev/null
+++ b/media-sound/apulse/apulse-0.1.13.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit multilib cmake-multilib
+
+DESCRIPTION="PulseAudio emulation for ALSA"
+HOMEPAGE="https://github.com/i-rinat/apulse"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug sdk test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	sdk? ( !media-sound/pulseaudio ) "
+RDEPEND="${DEPEND}
+	!!media-plugins/alsa-plugins[pulseaudio]"
+
+PATCHES=(
+	"${FILESDIR}/sdk.patch"
+	"${FILESDIR}/check-key-before-remove.patch"
+	"${FILESDIR}/man.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use sdk; then
+		# Ensure all relevant libdirs are added, to support all ABIs
+		DIRS=
+		_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
+		multilib_foreach_abi _add_dir
+		sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DINSTALL_SDK=$(usex sdk)"
+		"-DLOG_TO_STDERR=$(usex debug)"
+		"-DWITH_TRACE=$(usex debug)"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	if ! use sdk; then
+		_install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; }
+		multilib_foreach_abi _install_wrapper
+		dobin "${T}/apulse"
+	fi
+	einstalldocs
+}
diff --git a/media-sound/apulse/files/check-key-before-remove.patch b/media-sound/apulse/files/check-key-before-remove.patch
new file mode 100644
index 000000000000..28fe0fc0d168
--- /dev/null
+++ b/media-sound/apulse/files/check-key-before-remove.patch
@@ -0,0 +1,54 @@
+From bf146f0d711ce3e48cdc8ba772039d843d590b47 Mon Sep 17 00:00:00 2001
+From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
+Date: Sun, 20 Oct 2019 05:09:29 +0200
+Subject: [PATCH] stream: Check the key before invoking g_hash_table_remove
+
+Turns out that I hit a bug where pa_stream_unref would
+call g_hash_table_remove with a NULL key.
+
+Thanks for the lightweight and smooth error handling from
+Glib, g_hash_table_remove generated an ABORT call, crashing
+some Unity3D games I was trying to start.
+Now, you also CANNOT call g_hash_table_lookup with a NULL
+key. That also generate a crash... Ugh...
+
+So, yeah, we first check that the key is not 0, then check
+if the key is actually inside the Hash table and THEN remove
+it.
+
+Note, here's my ~/.asoundrc, just in case :
+defaults.pcm.!card Audio
+defaults.ctl.!card Audio
+
+Audio being :
+card 3: Audio [DigiHug USB Audio], device 0: USB Audio [USB Audio]
+  Subdevices: 0/1
+  Subdevice #0: subdevice #0
+card 3: Audio [DigiHug USB Audio], device 1: USB Audio [USB Audio #1]
+  Subdevices: 1/1
+  Subdevice #0: subdevice #0
+
+I'm using a FiiO device for sound output.
+
+Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
+---
+ src/apulse-stream.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/apulse-stream.c b/src/apulse-stream.c
+index 84b18bb..1de4885 100644
+--- a/src/apulse-stream.c
++++ b/src/apulse-stream.c
+@@ -1019,7 +1019,11 @@ pa_stream_unref(pa_stream *s)
+ 
+     s->ref_cnt--;
+     if (s->ref_cnt == 0) {
+-        g_hash_table_remove(s->c->streams_ht, GINT_TO_POINTER(s->idx));
++        GHashTable * __restrict const streams_ht =
++            s->c->streams_ht;
++        void const * key = GINT_TO_POINTER(s->idx);
++        if (key && g_hash_table_lookup(streams_ht, key))
++            g_hash_table_remove(streams_ht, key);
+         ringbuffer_free(s->rb);
+         free(s->peek_buffer);
+         free(s->write_buffer);
diff --git a/media-sound/apulse/files/man.patch b/media-sound/apulse/files/man.patch
new file mode 100644
index 000000000000..a26e32d8b9c0
--- /dev/null
+++ b/media-sound/apulse/files/man.patch
@@ -0,0 +1,30 @@
+From 2c2bf366599d957837acbdf54eb300526fc125a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
+Date: Tue, 5 May 2020 14:24:52 -0300
+Subject: [PATCH] Add ENVIRONMENT to man-page.
+
+---
+ man/apulse.1 | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/man/apulse.1 b/man/apulse.1
+index cd67cf3..df75c60 100644
+--- a/man/apulse.1
++++ b/man/apulse.1
+@@ -36,6 +36,16 @@ compatibility layer between OSS programs and \fBALSA\fR, \fBapulse\fR was
+ designed to be compatibility layer between PulseAudio applications and
+ \fBALSA\fR.
+ 
++.SH ENVIRONMENT
++
++The following environment variables can be used to configure the devices used
++by \fBapulse\fR. Try \fIhw:0,0\fR, \fIplughw:0,0\fR and the like.
++Refer to the ALSA user guide for a full list of device names.
++
++\fIAPULSE_CAPTURE_DEVICE\fR: Can be used to configure the capture device.
++
++\fIAPULSE_PLAYBACK_DEVICE\fR: Can be used to configure the playback device.
++
+ .SH RETURN VALUE
+ 
+ \fBapulse\fR is a simple shell wrapper script that calls \fBexec\fR on the
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 050d6d1d9e87..0f7a454cce46 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,5 +1,5 @@
 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
-EBUILD aqualung-1.0-r2.ebuild 2474 BLAKE2B f1c14d90aa54b2312d04296666cbc1e319ed39db869af0cf580f41a440dc157fb4413328aafd016bafc6ac954e4c84e0746d34a1eb815ac7502ad8ca47a9a1fc SHA512 b70e2166296131222298abee45a2e4972fe7c8264a8111dbf2a6cfedb7706b0bcc73014c306302d3e9dc8697983b1e2a8fb09631abe576815bf82fb5a36d5aa5
-EBUILD aqualung-1.0-r3.ebuild 2479 BLAKE2B 82fc4bd1295ba6a5cdd9e0c2216994470bb1c76f1b61eef8e1f2e8ec26ab9d7d51930a07041dc0b29c63a4f310fafe4336f46a8ee0e4ae08a5ce42a65d2aad45 SHA512 710d5891e7b6be0d20ff4194ea5a6629f8f7038a32022519a4caa9b1b4c3181b24de36f6e4bef60c03eda8e5a7b8e499caeb528aeaecde23d2570a060a506ac9
+EBUILD aqualung-1.0-r2.ebuild 2416 BLAKE2B b9ae5b18dcb07968ca9378c725e84fbae5b162003ed00ad07520ad8ec235df0aea7a3352f06e2dbb768f9a568431deea078e2e1e0603f59a0c72bcecb1ae0469 SHA512 dda2dd55f4ab1f37e28bc4c98d4b96ac2995706d01b9c8669e9c21a216ae5807643583666ea39ae306afe2e8960420b148a638c2341b96626b2d1b0897f5f85a
+EBUILD aqualung-1.0-r3.ebuild 2424 BLAKE2B 8e211b6894db8e772c3638081283e79de4c3a68decb5b9a790b71b1544efadefdae322b9ef0d8229f285832c517fa82eeb7e5ea31004366d8c5932bf50a63b42 SHA512 a9ab98b9238f35292291326ae1a685acc4c0dbb5a20244e70b3e49071ee2dcb55069236714a8c2c04492c68ef2c14d75efb3944fe6ae94349d8c68c13410977d
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild b/media-sound/aqualung/aqualung-1.0-r2.ebuild
index efd8ec6f8015..ce1efdd48678 100644
--- a/media-sound/aqualung/aqualung-1.0-r2.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
 
@@ -26,10 +26,7 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	cdda? ( dev-libs/libcdio-paranoia )
 	cddb? ( media-libs/libcddb )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	flac? ( media-libs/flac )
 	ifp? ( media-libs/libifp )
 	jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild b/media-sound/aqualung/aqualung-1.0-r3.ebuild
index 975f08e2a444..707083c856a2 100644
--- a/media-sound/aqualung/aqualung-1.0-r3.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
 
@@ -30,10 +30,7 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	cdda? ( dev-libs/libcdio-paranoia )
 	cddb? ( media-libs/libcddb )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	flac? ( media-libs/flac )
 	ifp? ( media-libs/libifp )
 	jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 0059b6330e5c..9108b28651e4 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,7 +1,7 @@
 DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
-DIST audacious-4.0.2.tar.bz2 576407 BLAKE2B 001d185db59e38f686c78964b759f851481bc4c7fcddb521fde9bd985095fa32bacb6f1bcea167a91616af4fca412d75cf63dfe0cd3b19ee396e36e211b1a94e SHA512 3f541000c874f2d026f2a4c23f1f98486aae9450c6dc8d7597f742b21d701883b31bbc5620bf23408ce0da397fdf414dffe37a778eb70df5a553a854f2435b99
+DIST audacious-4.0.3.tar.bz2 577512 BLAKE2B 55d660398330a4b15c9074f7ac4c4b4ed50e550d7b7481f0e21d02fa9e1a73da175ded8ab65b0e112aee8bc62a8c817f6c5a8e75ef16c88a9f4193d94e2d8a18 SHA512 e09ae26f43d7a6b610df9ece90f77b912b98c5e4e9a3b5168df26e177ffac3f66a74bff503f398c271228198467c7b3b6797d1671979559c4e1cfb13b12549cd
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-3.10.1.ebuild 1795 BLAKE2B bcea95295deb3f1b069c44441c7aa27e2a4136084acaa5b821909f48d43fd669cfecd28034d5d94f57d757075f4f8c24e637e919a2fdff29a5bfa76a67abd752 SHA512 6b4b29e2d61adf73eb9e610cf68ac6581ae0434e34a4aab71d3e56e3dc85a77857b3f68b3a8f66f674b62c4588983dc9166fbff6e70050e9aa851f0713b0556d
-EBUILD audacious-4.0.2.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+EBUILD audacious-4.0.3.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
 EBUILD audacious-9999.ebuild 1831 BLAKE2B 0686555744115d856c466cc1177b200e5e66f54c39b1ebd76ed9ce86ac29f0bde9cdf51f14cf4b968cb7d607107b836bbfcdebf279776b5694073e0ede6aec50 SHA512 4b3ae117d67cffc3464cbe5f533abed8d1d3ad2e94165c2422ec0450411ab7c40cb81073f223a387c3a2e2c1316cd1496a3f4ef77737ecd6e84ce7ffc462cf72
 MISC metadata.xml 514 BLAKE2B 6ca503bd16bd79e7a453a6eca5c74802c2b078b3cefa4cf886fac391feb2a11db4398a462502cd4f10dcb2c5ffc60f30e51ab348761118cb1a446c8d865b9145 SHA512 6c8d823ff6be4d914e79193e20fa3dca4948f3945b5c6e6977e72f3d6dee3a8ba01ddc06d3a1a7231c5cf3b585d4f655703cd6df8f3c21d326c91db2edda5107
diff --git a/media-sound/audacious/audacious-4.0.2.ebuild b/media-sound/audacious/audacious-4.0.3.ebuild
index 13924b39fcb0..13924b39fcb0 100644
--- a/media-sound/audacious/audacious-4.0.2.ebuild
+++ b/media-sound/audacious/audacious-4.0.3.ebuild
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 8b169465397e..9ed0e456eee4 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -4,13 +4,14 @@ AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492
 AUX audacity-2.3.2-Fix-building-without-midi.patch 1845 BLAKE2B 482cf34d9a43d7fcd9b9104ad5e5a0a5ebe5b744cbc9cd9f2e267e591c822781acf601c355665a0bdb95ee94a758eac72fe4d74b6f9f72cb48b40c7f0cd0a2ac SHA512 d2fcf0c57a7c9a13a15daf6c901430e114193c0cdf395fbacaaf10be6717a6c74dcb1284ede3d12eca1c418f2948483f84fc75c78e80176531c3adbfbbeeae31
 AUX audacity-2.3.2-fix_building_against_system_portaudio.patch 1991 BLAKE2B 2e9609542728d3d5c80471d95a49f3051c061a3a06290820db90a0cad346c759c666ae66a36c26b7005f727f73049c40423fbb2c86c6492f0b89023c80972bf1 SHA512 7b7612249ec7f1eb765fd40b15b89e90fe7e251cd6a49d54643c43e8e2ab6e319b5a49c8432abe6d2440a610a306c6553538835a018ecb0c832aab88cc3f033a
 AUX audacity-2.3.3-Fix-building-against-system-portaudio.patch 1952 BLAKE2B 9a5ef294d55dfe226175d2fdd8b23a9a4e6b3e963c26b9d4d8b430054dba5c39c6ae97f911b720dc53af5173c6a639275dd119c5292f53164e749782fa8f1e46 SHA512 ff85a33922bed3a626dd82c71406d81ac59c36dc45e5d2164662aabcd14a859479304cf684b9f64d0b110a9a1a82042b130c21e820ebd4c917fd9094c0737ed2
+AUX audacity-2.3.3-fno-common.patch 2232 BLAKE2B eeaa5452a3da08bb4ba22965ad9a3ce77b838e9177d4cc53c630865bd91dfd1d348dcd4128b20f875e9a50d9ec19fb6e371cf28bf059072437480f71c7225f1a SHA512 3f534101b6194b4f557b88cdf96ae91cc3e2c86ef387ba5ccc33aa192212074eb018de9dd2d459518133baf9f46c1c8d499d74ae00b593a26b904ac3d288a700
 DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802 SHA512 a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
 DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846 SHA512 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44 SHA512 5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
 DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84 SHA512 2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
-EBUILD audacity-2.2.2.ebuild 3343 BLAKE2B 11ad65e95ea0a16b6434017246b0b5063c13df6821a856bcc4116de082f5a673394480a1a15e63065ccded4d8bdea786eb7988dc747440b11d5fbb6fb4504601 SHA512 80136688f1ef9a75424f24bdb98ccfbb8ad7c1dfdabd7a8ede9c4ba837de7039c2109e92fe7b1e13e5e0fa05e6f39af109bc779b20dc04af0ee96b93ba3af660
-EBUILD audacity-2.3.2.ebuild 3308 BLAKE2B 26a4dbfbfa65f793da903e9856925df8f5cfa3dab66f2af941862152769a591c1a1943f2375e4120548b7bbc31c09db1d0fa02209e8e989c4444551e7ac61170 SHA512 1635af065e989252de42db1cd9089d4584b7e4691b4bcb6541657e57abaefef13decc48f4aabee759b02b8471f5c93842336ce7abb77db66edc224b202c77f1f
-EBUILD audacity-2.3.3.ebuild 3242 BLAKE2B ac795176b5622e555db732d45e7d77c0ec5190485707c8b80c773ed0eecb9a879b67de566eb3670126780e26b3a17c99bdd972ddc25727965d970c6ee4dedfc5 SHA512 e2bced43a4be7f9464598065acc70b6c9017987999240063fcc12206b8783719b3c609965bdf3c23f0e7b42d0f5fabcfe612c1169183deead060ac75f5bba393
+EBUILD audacity-2.2.2.ebuild 3289 BLAKE2B ff93b28d787c0b5d25b0f87f0fae06960cf74e8e4a730e396cd7005be47267c7056a7df4c674effdfdd10a07ab71e6ff9b212069b169fa03e4f18bdbd1731456 SHA512 cdec097cb4416242580921bb3bf128b7532a79b096cee81c1b8fc5375a6020fb922e8f63bc7cf96f21fcab9f92df22d543ff0630a87d064df8952cae2895394b
+EBUILD audacity-2.3.2.ebuild 3254 BLAKE2B 7ee66453862ceb01265f240daad2eb197f0cc9ec1d6f138e79ab377c318c958c67eb9cb5c2cc46d0d92797d833f13c9b15e53599018d0171021288bab5976e0f SHA512 856e6846a7339ac05e9437953456702bc4505aa6826be9a231e4b3ad9ab045ce5a3ef5c16473195d02988dd20fd3d348a9be3c9f643fc41dc3f20a1c923e1bd6
+EBUILD audacity-2.3.3.ebuild 3232 BLAKE2B 4b0a5cb513a911a615ec96c6816c910b171da04390ed89ab76c7d7498e53342044dd206c446873c47a2f1a5b0233a92cb0d57c26f28a2684a3a9fa3020572211 SHA512 671e750ca235b472ccb95c8d0d6ae2417d10311bf6b7321e323e547ecf21e7d578e04840e032e3afaacdf8cf20976961143a8100795cae1c2b36aa1b5ce3a02b
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index d9ca1cb53029..414cf0f7772c 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
 	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
 
 RESTRICT="test"
@@ -29,10 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
 	media-libs/soxr
 	x11-libs/wxGTK:3.0[X]
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
 	flac? ( >=media-libs/flac-1.3.1[cxx] )
 	id3tag? ( media-libs/libid3tag )
 	jack? ( virtual/jack )
diff --git a/media-sound/audacity/audacity-2.3.2.ebuild b/media-sound/audacity/audacity-2.3.2.ebuild
index 1f561978a5fe..a3ac1df60e7e 100644
--- a/media-sound/audacity/audacity-2.3.2.ebuild
+++ b/media-sound/audacity/audacity-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
 	+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
 
 RESTRICT="test"
@@ -29,10 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
 	media-libs/soxr
 	x11-libs/wxGTK:3.0[X]
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
 	flac? ( >=media-libs/flac-1.3.1[cxx] )
 	id3tag? ( media-libs/libid3tag )
 	jack? ( virtual/jack )
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild
index d6f6c12ec16c..0418e4cc8654 100644
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
 	+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
 
 RESTRICT="test"
@@ -30,10 +30,7 @@ RDEPEND="dev-libs/expat
 	media-libs/soxr
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
 	flac? ( >=media-libs/flac-1.3.1[cxx] )
 	id3tag? ( media-libs/libid3tag )
 	jack? ( virtual/jack )
@@ -58,6 +55,7 @@ BDEPEND="app-arch/unzip
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+	"${FILESDIR}"/${PN}-2.3.3-fno-common.patch
 )
 
 src_prepare() {
diff --git a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
new file mode 100644
index 000000000000..5b922638aa5c
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
@@ -0,0 +1,62 @@
+From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
+From: Leland Lucius <github@homerow.net>
+Date: Mon, 16 Dec 2019 00:59:33 -0600
+Subject: [PATCH] Misc changes to get new Nyquist to build
+
+[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d]
+---
+ lib-src/libnyquist/nyquist/cmt/cmtio.h   | 4 ++--
+ lib-src/libnyquist/nyquist/cmt/userio.c  | 4 ++++
+ lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++---
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+index 3e50ad957..232862b50 100644
+--- a/lib-src/libnyquist/nyquist/cmt/cmtio.h
++++ b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+@@ -1,7 +1,7 @@
+ #define NOCHAR -2
+ 
+-int IOinputfd;
+-int IOnochar;
++extern int IOinputfd;
++extern int IOnochar;
+ 
+ int IOsetup(int inputfd);
+ int IOcleanup(void);
+diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c b/lib-src/libnyquist/nyquist/cmt/userio.c
+index f442376c5..a33ac98c9 100644
+--- a/lib-src/libnyquist/nyquist/cmt/userio.c
++++ b/lib-src/libnyquist/nyquist/cmt/userio.c
+@@ -153,6 +153,10 @@ extern int debug;
+ #include "xlisp.h"
+ #endif
+ 
++int     IOinputfd;      /* input file descriptor (usually 0) */
++
++int     IOnochar;       /* Value to be returned by IOgetchar()
++                           where there is no input to be had */
+ 
+ /****************************************************************************
+ *
+diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c b/lib-src/libnyquist/nyquist/sys/unix/io.c
+index 21b2abed8..f3e499c0d 100644
+--- a/lib-src/libnyquist/nyquist/sys/unix/io.c
++++ b/lib-src/libnyquist/nyquist/sys/unix/io.c
+@@ -16,10 +16,10 @@
+ #include <sgtty.h>
+ #include "cext.h"
+ 
+-int     IOinputfd;      /* input file descriptor (usually 0) */
++extern int     IOinputfd;      /* input file descriptor (usually 0) */
+ 
+-int     IOnochar;       /* Value to be returned by IOgetchar()
+-                   where there is no input to be had */
++extern int     IOnochar;       /* Value to be returned by IOgetchar()
++                                  where there is no input to be had */
+ 
+ static  struct sgttyb IOoldmodes, IOcurrentmodes;
+                 /* Initial and current tty modes */
+-- 
+2.24.1
+
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index df559afbd3b6..e8c2ba3e7392 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,4 +1,4 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01 SHA512 9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439
-EBUILD cantata-2.4.1.ebuild 3071 BLAKE2B 84487d366feb1570a0b3ed27613988ff19d8c40e2743af2d08b67eacc57fdbbe4a953bd7ca584718a0dce7931439cb3d5773cc2476cb5a2bc3eeda50983b6116 SHA512 0004a8415f587415c5fbb2f5c59bbb6c069dd2a4697d8c8a3fbb1f8ae661565535db64da25bade171ae84db28d4d53d2bf2b0490821803eedb253b7e0e152469
+EBUILD cantata-2.4.1.ebuild 3020 BLAKE2B 090c658ea3a956a1bf37508d79a36fb607233f81f8861b01812292c8c760ad2c24ffb76ac56ee87bc56997c99a65c6d4762641c023776e7453571db185014b93 SHA512 5801447e3346cece5c6494cf1c3ba20a55f53a73efef8e4658f95184611ac015f4b0b671b706d0bdec1d1c4f1f93dd7e96415c0ecd147a99eb49fdf521dd4b75
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.4.1.ebuild b/media-sound/cantata/cantata-2.4.1.ebuild
index 830330e2fe15..22ab01578b8b 100644
--- a/media-sound/cantata/cantata-2.4.1.ebuild
+++ b/media-sound/cantata/cantata-2.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )
 	cdda? ( udisks || ( cddb musicbrainz ) )
@@ -46,8 +46,7 @@ COMMON_DEPEND="
 	replaygain? (
 		media-libs/libebur128
 		media-sound/mpg123
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
+		media-video/ffmpeg:0=
 	)
 	streaming? ( dev-qt/qtmultimedia:5 )
 	taglib? (
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 195090a84251..0ceeed1418ff 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,6 +1,5 @@
+AUX cdparanoia-missing-sys_types_h.patch 876 BLAKE2B 4624baa06a6d9c4d233104267b35e90431c56405398f985292980dd416809fc8f015e7bd8b3575bb4fd4fe0fa03c1167e0c849a9d30523e1fc1b6e8c31b0993b SHA512 a124c74e7ecfc0238d7e5581063d51fd7aa18df6dae5709fe38662c33f0c9dd0706cbd834681d09f84f2ee2aa0914662740754d181f448b593288382eab68627
 DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a8fb5af8add5c77b93b3cf219b1dd19d1317d0bf0197c9bf1cc2217b37c08ab1ff576982a0408d2c0adf6be79f25e35e0b36c SHA512 48ef57334f48d8b7449ea5ca361666d1a618529bf2e78182026fa09a94cd55865d18f4925369bf9de2c251d9420c0edfae17eb8726c157bb6eafd8b4fd410a5a
-DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r6.ebuild 1323 BLAKE2B 7039ec3499379d3fd07b16e7be2b458ba26490fcf7ffb0ecdb5343fa950f9d7b3453badfc8d3d44c9e325d277078b0fbda92624d09e77f29f9cbfa5c51e1f54e SHA512 c517ae7d58d9002a7555683e5e542cb789dda97b5f87a9f1b5fc5ed46455674e2a0f38623cdfc99382275d5e829f43e88a81c08259e7254832383f64dee25523
-EBUILD cdparanoia-3.10.2-r7.ebuild 1376 BLAKE2B 7cf085efd9bce55b06494d855ccd80716b5d65b14eb072ee36227c83208ed3cb9883591fa95a7165d03657bf3d55c006be1198c6055d86f8b950949422261d2f SHA512 6e2a6819c01365537e908f879bbaefd298efc7a81afa543d2ba59b3543cf21a8660710b2a255ff5a1cec94ab8739a351bcda00ef8f51401501552a9356f4c118
+EBUILD cdparanoia-3.10.2-r7.ebuild 1439 BLAKE2B f381f68873658497ec66917e288b906094f393f8b9a868c781d92e7b193f847195e67c7a16c3bdedbb72ba4cdf7321e19538905d5b6df31b91e8bfb1ce714fcf SHA512 57b0c6e44eb66ade975a7d027e0017a303a24de702ef1ebe0682f59f895a9d87475963010ba86667b8196f8f660a5db8d67a12cdba7bbf3b8d351161cea9715b
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
deleted file mode 100644
index a4aec2530532..000000000000
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils libtool toolchain-funcs versionator multilib-minimal
-
-MY_P=${PN}-III-$(get_version_component_range 2-3)
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.xiph.org/paranoia"
-SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
-	https://dev.gentoo.org/~ssuominen/${MY_P}-patches-2.tbz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-eselect/eselect-cdparanoia"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
-
-	mv configure.guess config.guess
-	mv configure.sub config.sub
-
-	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
-
-	eautoconf
-	elibtoolize
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	tc-export AR CC RANLIB
-	econf
-}
-
-multilib_src_compile() {
-	emake OPT="${CFLAGS} -I${S}/interface"
-	use static-libs && emake lib OPT="${CFLAGS} -I${S}/interface"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/${PN}{,-paranoia}
-}
-
-pkg_postinst() {
-	eselect ${PN} update ifunset
-}
-
-pkg_postrm() {
-	eselect ${PN} update ifunset
-}
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
index 38d07ee8cf0f..afbbe92e3f8d 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,6 +27,8 @@ src_prepare() {
 	# Patches from previus patchset + Fedora + Debian
 	eapply "${WORKDIR}"/patches/*.patch
 
+	eapply "${FILESDIR}"/${PN}-missing-sys_types_h.patch #713740
+
 	mv configure.guess config.guess
 	mv configure.sub config.sub
 
diff --git a/media-sound/cdparanoia/files/cdparanoia-missing-sys_types_h.patch b/media-sound/cdparanoia/files/cdparanoia-missing-sys_types_h.patch
new file mode 100644
index 000000000000..010ed4a844cc
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-missing-sys_types_h.patch
@@ -0,0 +1,24 @@
+diff -Naur cdparanoia-III-10.2.orig/interface/utils.h cdparanoia-III-10.2/interface/utils.h
+--- cdparanoia-III-10.2.orig/interface/utils.h	2008-08-14 06:56:20.000000000 -0700
++++ cdparanoia-III-10.2/interface/utils.h	2016-05-30 14:35:57.071615252 -0700
+@@ -3,6 +3,8 @@
+ #include <errno.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ /* I wonder how many alignment issues this is gonna trip in the
+    future...  it shouldn't trip any...  I guess we'll find out :) */
+ 
+diff -Naur cdparanoia-III-10.2.orig/utils.h cdparanoia-III-10.2/utils.h
+--- cdparanoia-III-10.2.orig/utils.h	2008-08-22 02:39:06.000000000 -0700
++++ cdparanoia-III-10.2/utils.h	2016-05-30 14:35:33.101409747 -0700
+@@ -4,6 +4,8 @@
+ #include <errno.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ extern long buffering_write(int outf, char *buffer, long num);
+ extern int buffering_close(int fd);
+ 
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 6d07e03b54e2..bcb97c05e107 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,8 +1,4 @@
-DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
-DIST clementine-1.3.1_p20191004.tar.gz 8528437 BLAKE2B 11c7bd7ac4ad4cdc75e2c5e54651832c1aa31448341230917df973227fcb1cd659309bb361f0b62a12dc38ce48e1f25697742df478650f4c10996938a7093acf SHA512 eb755d47f2e518c4e1bb28596e6554184d9fb6bab594e2f16b73c0bdecaa7c19692d368e9ec6a91e5012b786368eb7d3b2d051db11f3b5934233ba3e5b488679
 DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
-EBUILD clementine-1.3.1_p20190127.ebuild 5027 BLAKE2B 5b9fb6dbbf5b57be7c610e882afc7f5e0bbfebc164b66d471092475106ce9b11e2dafb12d3f383320fa41c0c411c8cceb9644a940e4947b024d48ffab6bf2705 SHA512 1c85a20de5367dae202e44ae93845b5333e89c72f135a180c3f25c8218eb122209a8076a6f72266b242f619ad1c45cd5ac06102f37d0b7b8be90641b85403299
-EBUILD clementine-1.3.1_p20191004.ebuild 4597 BLAKE2B 92e229aa5164fff33e1f099eca0d92dc235b72798a28b524e1588b66e0693fbc1f0050fdc59a454f90eeafcca5fcd0f2625f06c9b391c01cbae3b190b2875537 SHA512 8166d382f4be0047e6423f5f9105a40aed4d617565f3fd019356774ab320a9aa346fef67ec722d673719c238e68f2083f7d57cf271bb2a690b732fe4d89777b3
-EBUILD clementine-1.4.0_rc1.ebuild 4836 BLAKE2B 41a40559ed037a1f8988ebd9ddad0c566c9146c271b83a27b5eec18b697af8b49e19f278137b33a169ea5058ea4013ee1a6a489f80c59ac2a12156bd13a1411c SHA512 1efcd27eede95c2864d7ca41e2437b2c3c345c41468eb8b0be095f5b949714a2e5bad0b4d6d4664601e3da8d3d49dd1f234a9805143445643c67ffbaf7f3c82c
+EBUILD clementine-1.4.0_rc1.ebuild 4835 BLAKE2B 865cd095256be584f75a9851c43450c8791383b94342ce42d2655c15ca0302a61b9c9b1e92632072c6e55fa5b809624ced9f0aeef7e63bcd538a52470de4a33e SHA512 618f2486fc215718c812a99a9063e600124734b75ac7de0bfc8f4f21923d634af4106d4d7c730573594812fc6b90c4dfca1d66b36f3d309a83e02200f7c1caa6
 EBUILD clementine-9999.ebuild 4820 BLAKE2B 2fe724b22cc8b7b60e6b71a82fc39c9975e722690905b223f19d910f35ddcd238987dfd5a6cebc63169ee952cd1214e68e1e11768ff281b0ae230a11d0eaf373 SHA512 969c6a71948ce2d59b3074fbe481853ef269168f59a1f9dc74cc1f4cf1508b6c6b726f0b64e4f8c55fdbab14f6c3201064be4033aa4641afd9b1fa53f621a495
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
deleted file mode 100644
index a2bb0b39fd2e..000000000000
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-MY_P="${P/_}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_BRANCH="qt5"
-	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	inherit git-r3
-else
-	COMMIT=610566d25271c67d1625fd62041f6a27435b0a9d
-	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-inherit cmake flag-o-matic l10n virtualx xdg
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-BDEPEND="
-	>=dev-cpp/gtest-1.8.0
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/crypto++:=[asm]
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	projectm? (
-		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0:=
-		virtual/opengl
-	)
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
-	seafile? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN^}-${COMMIT}"
-
-DOCS=( Changelog README.md )
-
-src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory tests
-	fi
-
-	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="cryptopp"
-		-DCRYPTOPP_FOUND=ON
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_DEVICEKIT=OFF
-		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(l10n_get_locales)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_SEAFILE="$(usex seafile)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/clementine/clementine-1.3.1_p20191004.ebuild b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
deleted file mode 100644
index 4e52840045fa..000000000000
--- a/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-MY_P="${P/_}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_BRANCH="qt5"
-	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	inherit git-r3
-else
-	COMMIT=664c5a31f9cf519af5a4c3adcb30dbbc73d037d6
-	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN^}-${COMMIT}"
-fi
-inherit cmake flag-o-matic l10n virtualx xdg
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-BDEPEND="
-	>=dev-cpp/gtest-1.8.0
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/crypto++:=[asm]
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	projectm? (
-		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0:=
-		virtual/opengl
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
-	seafile? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-"
-
-RESTRICT="test"
-
-DOCS=( Changelog README.md )
-
-src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory tests
-	fi
-
-	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="cryptopp"
-		-DCRYPTOPP_FOUND=ON
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_DEVICEKIT=OFF
-		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(l10n_get_locales)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_SEAFILE="$(usex seafile)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index df13da4343c5..7ee8c3edfb6d 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -23,7 +23,7 @@ else
 	else
 		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
diff --git a/media-sound/galan/Manifest b/media-sound/galan/Manifest
deleted file mode 100644
index c722e1694999..000000000000
--- a/media-sound/galan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST galan-0.3.0_beta7.tar.gz 1138937 BLAKE2B 6f132a7371890d95f15bb06862d50ac556009ec778c536fd0da978ce6e6118c53ef81ed43cf62bd593253164aef526a3f9440ddd505a78f08bf16b72adce1772 SHA512 86ef525785c77c068146ea2cc4992091ad623bc43fde3603b00d9e8ef4583c0ecf60d061ab47386eb67dc7ef269a4631cdeb19317f3eeebf2fb2fc82c5b825a8
-EBUILD galan-0.3.0_beta7.ebuild 1031 BLAKE2B f908321cd1b7ba46989f220a3a257d3e30bc1f337a05539d27f4aecd70af8d3ee71bf6206ab876f8209064ca5f99fd69a9a1e3efa9f410bf2395044753ecd438 SHA512 e5e2d2ef20f85982fc7c3e33ebc4b5db3a54b22b85685f8e68f5e991c42092886a70f8e4bce4fe08f95b85f71f1dfdbebd2319bb5d70352c65a4b858ce108658
-MISC metadata.xml 328 BLAKE2B b628739d94ad742582e586d759f3a39ee4280cc63eb9f0ec8a009f46b029cecbe153b299f582380b230d54839aec9b7a8afde4a199db773b3969fca91eeed45d SHA512 3f4ada42f2d3b5ada8158c07eaa57170369e9cae6d410d4d6c2320d5c4189712a218095375c1052f72aeebf3140581f6203d773fa2df43d0da79b7a216bb3b12
diff --git a/media-sound/galan/galan-0.3.0_beta7.ebuild b/media-sound/galan/galan-0.3.0_beta7.ebuild
deleted file mode 100644
index 1ab365fd9a33..000000000000
--- a/media-sound/galan/galan-0.3.0_beta7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="gAlan - Graphical Audio Language"
-HOMEPAGE="http://galan.sourceforge.net/"
-SRC_URI="mirror://sourceforge/galan/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa jack opengl vorbis"
-
-RDEPEND="
-	media-libs/liblrdf:=
-	media-libs/ladspa-sdk
-	media-libs/audiofile:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:2.1=
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib:= )
-	jack? ( virtual/jack )
-	opengl? (
-		x11-libs/gtkglarea:2=
-		virtual/glu
-	)
-	vorbis? ( media-sound/vorbis-tools )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	rm README.w32 || die
-}
-
-src_configure() {
-	# Use lrdf.pc to get -I/usr/include/raptor2 (lrdf.h -> raptor.h)
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags lrdf)
-	econf --disable-static
-}
-
-src_install() {
-	default
-	dodoc NOTES
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/galan/metadata.xml b/media-sound/galan/metadata.xml
deleted file mode 100644
index 8fa20f159a4d..000000000000
--- a/media-sound/galan/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">galan</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index e68f5b31151f..f305d9432cc6 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-music-3.32.2.tar.xz 1391112 BLAKE2B ec64d48bcc137c69df77d9d9fadb3fa5c1809850e7a434d501cf6fd680500e57a4e6946ab591db9b715e728f0274f37b659afce53fd9213b3cf74f329f4373f3 SHA512 633748dcb5cf839f29059fd9bdd5283c455a4157d6c004168d9ef80352b83be3db547377034d0d78af0b6a84fec6fb941888bd53aa14c8bf51da880f04170a23
-DIST gnome-music-3.34.4.tar.xz 1412396 BLAKE2B 44899422b9a16de48b1435f139ff49f96a9d9e078354f2449ca551deac30b9b4d201e9dadcca700a44a170a6552559b8f06e80c6f248a37aba676dfe64cb7f4c SHA512 7d0450e63a890f10f825892a502b6fe5fbbae389b38e9487a768c50e632c82b89b29263cca2eef07abde429ebdcd1e140ec81ed748cdb643e94c2892f8e5d871
 DIST gnome-music-3.34.5.tar.xz 1415240 BLAKE2B 3545541171b023da116ebee5d28a2b69b6b45677cde26c833ea0992ba9bc41d4792375dbf3617105da53f0e98d21576e166980e896527a60d47c92690b343a27 SHA512 c4f3c8cd7e8a6d24d3766672acfe3abc340d0cd305ba0d3d0a87c02b5a5f9e8c47bee9d8284e76ad28c51eeebe56e3163f4e5c34c89e294801d0047b8476f80f
-EBUILD gnome-music-3.32.2-r1.ebuild 2010 BLAKE2B b3b123804ae70083bd1196e164edee687a1c3142db14426b60b34417af6a042e86975e3a08f659b92c8683e5dc6f0a3a66dcce804894ec0827748ab1590baca2 SHA512 901c7210a21a1b6702a8513250b83946810e547529536ffceae88cb66e95a29012e058333d75c55c56c01375d8bd940983c2a157e47c3f5f63d75fda3c84f83a
-EBUILD gnome-music-3.34.4.ebuild 2035 BLAKE2B c6fe49d24527a9fb61a3c3e166164a86ec5598a54247275e9e145c1da15c2679bd7ef2f0af6601fab44b793859e719df78536f326f40b725eea9a79a2bb38c58 SHA512 0c7e7a9a847e7c79aba6a50205b9fbf7df8d9d8bb0b7741303765c61684b66def80fdeaf379ce96592819a765ea3e3ba24c09aad1061706cc00fcd075a4b2de6
 EBUILD gnome-music-3.34.5.ebuild 2033 BLAKE2B f6c46beb2c44f23ce20f49d46ed9783ee8c2f157fc7e067947914e943bbeaa0c4e2233ee7f3f94f76e57b1193a09d8e74efc5987da26c87d1050c6dc07070006 SHA512 7f85851e01d6be1cf7c51893ad1135f8e0ce1760e56c6b7e5ac0a136f091723267110bb70f0dfb16f3618048b97ba6be08e85e5a11b8debfb6d4d8c4c31d7791
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild b/media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild
deleted file mode 100644
index e461ee6710e5..000000000000
--- a/media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="${PYTHON_DEPS}
-	net-libs/gnome-online-accounts[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.23.1:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-1.99.1:=[introspection(+)]
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.4:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.8:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		>=app-misc/tracker-miners-1.99.1[gstreamer]
-		>=app-misc/tracker-miners-1.99.1[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-3.34.4.ebuild b/media-sound/gnome-music/gnome-music-3.34.4.ebuild
deleted file mode 100644
index fde8cf288529..000000000000
--- a/media-sound/gnome-music/gnome-music-3.34.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	net-libs/gnome-online-accounts[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.7:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-2.2.0:=[introspection(+)]
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.9:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.9:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		>=app-misc/tracker-miners-2.2.0[gstreamer]
-		>=app-misc/tracker-miners-2.2.0[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index b1ee399ef750..e79d7eaac75e 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-sound-recorder-3.28.2.tar.xz 454216 BLAKE2B 9f9a5a7c0a5a34c2a5ba00ed6d83736a0facb2dd7ffbe86b9c482e7bc50b282f9e20a8800591238e74a45c3c8eb2adf27c66dea59d0551d87c8997b2ef53d24c SHA512 1f4022d96d636391d4973bdc1285286a61a28107b9f875e66b4b2def767b4f2900ba2fe4b92166b1cdb61dc0b5afe65c0f81ffa7304aa38c1f510108dcd8b70f
 DIST gnome-sound-recorder-3.34.0.tar.xz 133808 BLAKE2B 2e8b83eb58776324717fcbeb8e0383ef3370e394f26978b1367bff22eaef3d9143eef65cd5c678bc25a67b32ed8d1c9e838ce63b0e2868f2ddb88805a5c43c5c SHA512 cb28f1f93f78cae5cc98750f937f60abb326065cdbbb1ee48146daceb9e34f03bc9bf4d78b7a149e579654673b9879fb249fd5a370a19764f01961c565b901ee
-EBUILD gnome-sound-recorder-3.28.2.ebuild 1080 BLAKE2B 1a0f4da7e721c2d71a04d9058d479567e4387cd973c0b9bc94987831997a1b5dec408afb563b7aa01cb31f821c7222dce482ab3df4caa7e84035f2005cb95d23 SHA512 b9d90776b7a38e7f6944097a2cda69124da6c82d3eb2a0c0aa537c7360987d5d0314c922f4477affa8549209200c5659154873d391a3733184aa1a255b2172a7
 EBUILD gnome-sound-recorder-3.34.0.ebuild 910 BLAKE2B ce3df51e9fddb710d0aadc855b5fcb8616f533b3d5d09c0279c70e306dce3314f874cf1b62588b7dafec0c3720aba3eb9e90ac47ecf156d4b1cec8572f5633f3 SHA512 dfe6bcb55c39c6af5f42c88eb0989899b1df6d61d7357635f80d75d5eabe54669efa5d1312f41d72553cca37c0ad0cd442bab7ac835643b9da397fb2b0cc68fd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
deleted file mode 100644
index 285fecc6e10e..000000000000
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Simple sound recorder"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/gjs
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/gobject-introspection-1.31.6
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection,ogg]
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-flac:1.0
-	media-plugins/gst-plugins-pulse:1.0
-
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index 728a83c8ea2f..e4cc93024194 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -1,5 +1,5 @@
 AUX guayadeque-0.4.5_p20170110-missing-aui-component.patch 404 BLAKE2B 9c17048796afe328fb136808c2cb88f8f9a7cada5a4f6cd8a01c0a398e8b93cc0d6158792097cf88e600beebd6105bd9036e9aa3ddf8da16878e7d5f82746ea2 SHA512 539fac802c3e91217f4eb6c5adf456f7e5bc2d53e1103cf54255514b0793e3ed17de84048ea31c5a03ea6121fae01ef712339dcc8e269d678e1272f757976029
 DIST guayadeque-0.4.5_p20170110.tar.gz 2070855 BLAKE2B a8783a61df636e3ddf1473ba20450c89eeb977e06491e840743e7b8a7aa1a7515138ecf8f6c92a27f0c762363ef12c094927192b254ae238196ac6d967fd84d1 SHA512 57215ba47574fba615b33d72f45279c3726035bea38746f7d927a39866fb3fa8a3fb1dbd13fe672c7daba16a2131fbf4b89afed6a3bf8d9a584e5112d926f518
-EBUILD guayadeque-0.4.5_p20170110.ebuild 2167 BLAKE2B 9702c317ad2759ae5aafca6c3970b546230e83ba95c543a4245d01b4b2d2c5a1330308712312bf3ac229630af00712b35dc571922071221e472025abd75c8a31 SHA512 648cfe48ef60e37dc943662fa106c18e720dfe6e390bea6f0f3f0ad383b85d03e5b3e702cbe1554425786e3771545b475b6c13ed0285f9d17eb93151accad669
-EBUILD guayadeque-9999.ebuild 2428 BLAKE2B e92ecaf16b437f552a7eb7e48671dab5cb660163b399b5e14a0e293f7b28e7ef25d20dc5995fcfa64c5157b794a031f7cb46fc5ad9c36cc63d258503aa9bd6c2 SHA512 0d4f6f4887a010455a0fc5c80eb76495c1bbd8e7352f810e23d004eb767d8701f153279e2f7d202ec8ce304f2abaed73a1fb2ec7746de53a3276a00946030b3f
+EBUILD guayadeque-0.4.5_p20170110.ebuild 2182 BLAKE2B 6e02dbb44ed8f2398d6d6b57445d94ce93bac4c436d2af6989bba927fc15a59ef15549baa5b9da0808e6c065d0b8a242f781483725de1a5b4c18f8f95e68f3db SHA512 54002b40efa9f39f0a05b8393e94c0a7ba83334de9cd29da64f781ee2f6950d75110df549dd6de99c2fc8dedc18cc8f5bfe01f849448b57551db94f3af71fd58
+EBUILD guayadeque-9999.ebuild 2440 BLAKE2B ac2b9b91dc51f8a7cc64de614501d8642a93d9c436adf9f6fdff6c81f90a57258691a2389d65d589769ff0921d65a8f0deb96434faed57895effbd86a53e89ee SHA512 58233ea61e43d035cfc9e9c7985cc407151d6b6cf594a07d983216d2d4c5bcda7600d77f160119ec5348467cea26126c549b025dfce8bd4c66f672e9ee417fe5
 MISC metadata.xml 410 BLAKE2B d61d13faa8d5bb87bf8ef99b6841a4a05091db82d5961c69d5d922782d091639aff1919f843a92da39ee7181dcd1a8d94d63b83b9c80f1c17cc6c55fc79bf985 SHA512 826a540e373fdbe9027eb0bf9f66a6e7fd61c1b355a5b0cdbc00e2517e3b2e1b23224e6f0bc6025553c49135f4851422ff2055a2c681c9d42fa11f2fab905f3c
diff --git a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
index 72dbae26c334..f1108d2d6bec 100644
--- a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
+++ b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/anonbeat/${PN}/archive/9fec4f7b85095fa2d9f8e4d39c0cf
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="ayatana ipod +minimal"
+IUSE="appindicator ipod +minimal"
 
 # No test available, Making src_test fail
 RESTRICT="test"
@@ -40,7 +40,7 @@ RDEPEND="
 	net-misc/curl
 	sys-apps/dbus
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	ayatana? ( >=dev-libs/libindicate-0.7 )
+	appindicator? ( >=dev-libs/libindicate-0.7 )
 	ipod? ( media-libs/libgpod )
 	!minimal? ( ${GST_DEPS} )"
 DEPEND="${RDEPEND}
@@ -76,7 +76,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_IPOD=$(usex ipod)
-		-DENABLE_LIBINDICATE=$(usex ayatana)
+		-DENABLE_LIBINDICATE=$(usex appindicator)
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-sound/guayadeque/guayadeque-9999.ebuild b/media-sound/guayadeque/guayadeque-9999.ebuild
index 992be8f8b790..25a7b4f27ea7 100644
--- a/media-sound/guayadeque/guayadeque-9999.ebuild
+++ b/media-sound/guayadeque/guayadeque-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ayatana ipod +minimal"
+IUSE="appindicator ipod +minimal"
 
 # No test available, Making src_test fail
 RESTRICT="test"
@@ -51,7 +51,7 @@ RDEPEND="
 	net-misc/curl
 	sys-apps/dbus
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	ayatana? ( >=dev-libs/libindicate-0.7 )
+	appindicator? ( >=dev-libs/libindicate-0.7 )
 	ipod? ( media-libs/libgpod )
 	!minimal? ( ${GST_DEPS} )"
 DEPEND="${RDEPEND}
@@ -91,7 +91,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_IPOD=$(usex ipod)
-		-DENABLE_LIBINDICATE=$(usex ayatana)
+		-DENABLE_LIBINDICATE=$(usex appindicator)
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 66a081ef1064..c2efd5071071 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,4 +1,4 @@
 DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
 EBUILD guitarix-0.39.0.ebuild 1724 BLAKE2B 301bebf30887e39b61a443ab11edd7ab25a37234b51c10dabbc9b9e085d2c7befbc5fda8087c9e3a2a74a6784bce58e20f5ab69493a19762f4143b3511ae9e9f SHA512 aa28471e55303d706a80b34db6a785bc98e7a922196311b89053b6827a0333fd96223bcad7cb60d511ac04060ba5251295d0f4d3b5c6c2516dc344a71b35e78b
-EBUILD guitarix-9999.ebuild 1739 BLAKE2B 852d66f82f19f896a39b2353a6421ac2de9b8ac4887554dd35c9f585ace40e11809d1fee8f6a1f9a2d1377bc1754c35be27875f7f58bc40a319dd2c9155fb3c6 SHA512 bd525153a675570d3d08922cb8434c8dedfdca76ba4be39296488d06ddabd90ac943b840c3544aef05181e4e5b2fe016cb2452393944afeee5261758fded390a
+EBUILD guitarix-9999.ebuild 1760 BLAKE2B 0ee278c75d56864fb52a4b7841b04ca72c92382915b87c55dcb341a7065f34dc8b931b29bd394a87829d269032e1fac2fec04e1c5968a9f35275ae401a99b74c SHA512 09a4a0c05a8210a355113045c6ee06fc2d059a2e9d28428933a935a9b0739d3671c3e2d25d72b41db436854db0d51dcc48be733ca8efb15fb16d9266083f2da6
 MISC metadata.xml 595 BLAKE2B 22b392d194412eb045a3892e77a79f809215cdfc7e7afa42da59284f88975bd6d789a5a8e215c1137093266ba19e0be463d7b51b7b6506ff38f8591fd7b5cefb SHA512 5ccc8bcc15cf8fd7a5a4e18cb805765d6cc1b735c08b3194f3b4bc20d94e4d00d1db4fb9869bd58c82bcd39951d7421647811f61f7add2733e6719e6b5d78c3d
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index a459bbec550b..a9962b2bb430 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ REQUIRED_USE="|| ( lv2 standalone )"
 COMMON_DEPEND="dev-cpp/eigen:3
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
+	dev-lang/sassc
 	dev-libs/glib:2
 	>=media-libs/libsndfile-1.0.17
 	>=media-libs/zita-convolver-3:=
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 224c98c1333b..29fe2b195159 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,9 +1,6 @@
-AUX hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42
 AUX hydrogen-1.0.0_beta2-gnuinstalldirs.patch 2045 BLAKE2B 17c2fdf5e7cf5762db0c86bbe40f7edc58d428eadfe1e910e126d727faeb5dc04089a8a5cce0deefc2b3c4dba22dbe0fba9dc7ab2d3cb3585c4bf24e0947fa36 SHA512 c2556a65dab28977cb2a0fe20818b9b5c2bf6852fb8300721e212c9dc6fdcf32e10ee0d5b2efe9116a1621573e5d0f2eb999f68dd937235e19fe9c71b2bd51c3
 AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
-DIST hydrogen-1.0.0_beta1_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
-DIST hydrogen-1.0.0_beta2.tar.gz 11375853 BLAKE2B a7b5e8f0fa675a9869d84cad922f8d9119c88983e80c278dced2d03140619f4d8f70eb132319fd75be0a130cbd65a247dc4a8176a09b4c0a678d0f02385aa5aa SHA512 e87b57fb52a1ff00ef0d011321ad721902df5d1d31f3136d702498b9b5b3580cc7df43c0d7f4cecf55fd96957caf9c44a400eddb3bef07d7fe2cfda85ca1e00e
-EBUILD hydrogen-1.0.0_beta1_pre20180301-r1.ebuild 1934 BLAKE2B 8172be96edf774b338efd5e2dc80188a0cd54e766904e735f933b6dbb9dfbd999ba79c0e0cfae92eeda9960ebe548f18fde45fe0c05b4209fd70f42c03bf8d8e SHA512 dddae4c23e7dd7854431c3085bfb7dbb811bdd180592db03196500933a8924235d4a54b45d7cf1e9a6ca831377eb9310763d71349e1c00daf0bb6911368326aa
-EBUILD hydrogen-1.0.0_beta2.ebuild 2022 BLAKE2B dd894e38ae3a1267356666dddc25035e434534f5af0aa3b7faeb995a3020487ff80fa9310f43a524f03f066453c8ea0c762e822a8091b483d3b0eb7e5a4cee91 SHA512 06eb247ce12836dc5c5fa9d4845ec3b2fd124d03a185145929cb2044ef4392468e2b080cdd69bc3b042a99b3862adc1a4fa92e2af3777d81be703bb3d3246fb0
-EBUILD hydrogen-9999.ebuild 2022 BLAKE2B dd894e38ae3a1267356666dddc25035e434534f5af0aa3b7faeb995a3020487ff80fa9310f43a524f03f066453c8ea0c762e822a8091b483d3b0eb7e5a4cee91 SHA512 06eb247ce12836dc5c5fa9d4845ec3b2fd124d03a185145929cb2044ef4392468e2b080cdd69bc3b042a99b3862adc1a4fa92e2af3777d81be703bb3d3246fb0
+DIST hydrogen-1.0.0_beta2.tar.gz 11375652 BLAKE2B 9eaf07d69060e74478dd130722450264a463135dbfb05486ec853c684f09fcbae2537e3a7b032ed831e7103ccba3a3ba7c6866d2fde241464ab11465f8ad9ea9 SHA512 8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242
+EBUILD hydrogen-1.0.0_beta2.ebuild 2062 BLAKE2B 0289014d76351d56ba5c00631b8d403e1a8fb6bbb61a7aceb507e086e85907d074d9470b72a49cb43e2bbae43fac6f13fe79bd1a5efcdb77a13d9c06aa40c78a SHA512 4a007b1a2535b0f8774958646e9f362b3f0ce1bdcf536d94f52509cc0bfdf893c733095e8c07fb342243fa039815d68a28143cc8d421c01a0499670517a25613
+EBUILD hydrogen-9999.ebuild 2047 BLAKE2B 51d1cec2bbb952555e0f76a9be02d4f9cbb5ba8abb3f4ffa835b07ba5b829a82cac91289076710daf1d6e2c780a5d52c247bfeba35b7d2fdb83370b701af54e9 SHA512 fe85e1e03b10ad11b8076166ec66cf803216e496116f127f5cad63e6ed2db6258dd1bf38d05934fb0b4df756aa524b20833b2e64793d2ff6d799bc6be931c81e
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
deleted file mode 100644
index 59a5486e2cad..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 1 Jan 2018 11:52:18 +0100
-Subject: [PATCH] Use GNUInstallDirs
-
-Fixes multiarch and deprecated man dir location.
----
- CMakeLists.txt            | 14 ++++++++------
- src/cli/CMakeLists.txt    |  2 +-
- src/core/CMakeLists.txt   |  6 +++---
- src/gui/CMakeLists.txt    |  2 +-
- src/player/CMakeLists.txt |  2 +-
- 5 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 96dbf47a..2caab298 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,6 +30,8 @@ ELSE()
- 	SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
- ENDIF(VERSION_SUFFIX)
- 
-+include(GNUInstallDirs)
-+
- SET(LIBSNDFILE_VERSION_PREV "1.0.17")
- 
- #
-@@ -150,7 +152,7 @@ ELSE(MINGW)
- 
- #Installation paths
- # TODO remove data from path
--SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
-+SET(SYS_DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen/data")
- # TODO remove data from path, could be .config/hydrogen
- SET(USR_DATA_PATH ".hydrogen/data")
- 
-@@ -358,10 +360,10 @@ ELSE()
- 	INSTALL(DIRECTORY data DESTINATION ${SYS_DATA_PATH}/.. PATTERN ".git" EXCLUDE)
- ENDIF()
- IF(NOT MINGW AND NOT APPLE)
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
- ENDIF()
- 
- #
-diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
---- a/src/cli/CMakeLists.txt
-+++ b/src/cli/CMakeLists.txt
-@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
- 
- ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
- #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
- 
- INSTALL(TARGETS hydrogen-core-${VERSION}
--    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
--    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     # do not copy directory hierarchy
-     #PUBLIC_HEADER DESTINATION include/hydrogen
- )
- 
- IF(NOT APPLE AND NOT WIN32)
-     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
--    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
- ENDIF()
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen
- qt5_use_modules(hydrogen Widgets)
- ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
---- a/src/player/CMakeLists.txt
-+++ b/src/player/CMakeLists.txt
-@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
- 
- ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
--- 
-2.15.1
-
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild
deleted file mode 100644
index d0e4dc0c6437..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f
-inherit cmake-utils vcs-snapshot xdg-utils
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
index 29b288106e02..b86b1ac0cdda 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS=""
+	KEYWORDS="amd64 ppc ppc64 x86"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
@@ -26,6 +26,7 @@ IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
 REQUIRED_USE="lash? ( alsa )"
 
 BDEPEND="
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 29b288106e02..9ca42ba68d70 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -26,6 +26,7 @@ IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
 REQUIRED_USE="lash? ( alsa )"
 
 BDEPEND="
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 2d00a1be79da..1ecb2bdd402b 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,6 +1,4 @@
-DIST jack2-1.9.13.tar.gz 6485870 BLAKE2B 7acc0a1389af133dafa7368b4285c2a06607d84015601f2d8afbd63a9a08f40210f8206f2febbd0e5cc651513a59419e1d948a56163d2074c4b77da5edd84a52 SHA512 dd83a6535cf92a3c45b5ed31edda5f1cb4a6c1db2ac683d4ea709e226bc30d55b366ce80ee543dfaa600f871079f3754e9314124093e230dc7deeceb828de8aa
 DIST jack2-1.9.14.tar.gz 6495043 BLAKE2B 9ace1cef2c15c2894831c79bb8d73637df27a21462f654e04b7fb8fc05731e6df898aaefc343a9be4799bcd70576aa7397f2d48b7d2530b682f62463ce3d4a07 SHA512 ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd
-EBUILD jack2-1.9.13-r2.ebuild 2352 BLAKE2B cd6d0f708dedb11076593c3cfb1d72fce2458a6b27d1723c09a9dee0637eb3a46b641c38adea4752d82c22db37b22cf5565e2ecf8d133cff876a1b3c48bd7437 SHA512 d29b1395590deb9c92f9be42574cc235cc0d36edd8165c0097965e43fde8116796d3304384451f26bbcde90eeb346befd8e50f912d0e4bcd5c6e0aa2779c98be
-EBUILD jack2-1.9.14.ebuild 2367 BLAKE2B 98cf784ada1279bcb044626547538dcf02ef5380a09fffa4c8a019c8534ab3cbc642cfd272a9acd70a696aef66961529506ae95d22093c0c3566be31bbe22da0 SHA512 d286e247105b9b68142b97009c31a84ff3d841c9120d17273f61ea5ef21bfd4f450ced9079d5859aef64289ef509bb185cbb1beb8ce6fc76cecd14e1d7734d7f
+EBUILD jack2-1.9.14.ebuild 2365 BLAKE2B 74db2267ceac7e74f31685257150300fcd797e8b0bbc95e985285ae51d33c025d87ae232996301e13e41db6ab0bb1b4171114cea5653a72807aa0d5f3c491b63 SHA512 fef8b7107cc6009d88406cb8c55982364cfe5dca6daa41186474cbd63b91b633556fe5f349bcb686ca8791835993aba30f4af89bf60a5f9e043f6822b706d692
 EBUILD jack2-9999.ebuild 2405 BLAKE2B b7596a88181d71921c48b5e72542fc454cde1d94f3694304bb9f8edc6a920ba9e21a0b8be9ff47924ef16311cfaddca8ce7d6b9b30676ccdea55eb6dd5459776 SHA512 afc96552b9592ac158259fd1b107317040102f8609d138638009df9307cddf6b10223a9d382b51ddbcac31d5a03fe8093be584d5b483e5761909fb980fdc9d9b
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.13-r2.ebuild b/media-sound/jack2/jack2-1.9.13-r2.ebuild
deleted file mode 100644
index ee3545f515bb..000000000000
--- a/media-sound/jack2/jack2-1.9.13-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.14.ebuild b/media-sound/jack2/jack2-1.9.14.ebuild
index 102ddcea6a7e..82190f07ebaf 100644
--- a/media-sound/jack2/jack2-1.9.14.ebuild
+++ b/media-sound/jack2/jack2-1.9.14.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 094a4b2b6414..3c99955c9193 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 DIST kid3-3.8.2.tar.gz 2218360 BLAKE2B 26b1c0bffa6972f085538323b8836917ed4384aec5c0374bd0dbec35a150ad62912c6fd08e94fe66bfaa43928619a73a41286baa28edac2eb3da4ae8dc7aa0e9 SHA512 323806ed9af067760403d2e8c6262222640f40e76819fa31a96e34fd4e0e745dbe3c9e516540df71022d3deb03499b8529c436e7a1fda254c56b5425aa993ecf
-EBUILD kid3-3.8.2.ebuild 1762 BLAKE2B 23517d00c3fc2f141dca78d2528bd08529270531e91d5fa7ca00d95be5335779e8192174afcf41f021aab7148b994f424be7b9cf3a659ae1480091d4a28b5aa0 SHA512 8a856b599b8864b3ce947fe45d3cf8367a481edbc9cd5fbe733e246addc727036c2fa2f9b31244ed2be1b127706f950a184801775cad176899d2308d2ffdf525
+DIST kid3-3.8.3.tar.gz 3091795 BLAKE2B 245009d074c4b0734ee9fd39eb796e2679c416915e03773ca4f6fe7d570e17fefc73eaaaa03f4c42a3d81c2f2c4778b500bc8dfdff0a0cf07293d39571b8ab9f SHA512 5381c76b032e30b4a6382d160406f5ed75915c0e23bed62b3070dd875a1c812f907a7ecae833b82753fd2372f96d460b17a879ca9043c3786109074391199a5a
+EBUILD kid3-3.8.2-r1.ebuild 1766 BLAKE2B b8407b370472b539a3150aa9ca0c726da25635dca41852a09e47b374ba64533d73a2b09b949c205dc05650fe9949b3d0bf68744b1d6e97d1a37d20ea18bbae1a SHA512 18f1e7c11b5cff32cd49c7e70821288e85613f64279127104af80c99974df0b685af771a3c678a1e1b471d1ceada84e421655cd9e63938886a8099af81076ccb
+EBUILD kid3-3.8.3.ebuild 1761 BLAKE2B e300726d3a49a489bcd7136e708d2098a4065a57dd01dd0912a2f27530ea0dcbb039db97368df7008f0855823568d68a1ab3c1d65cc0b536b48f1f1ce9ca303b SHA512 3108889b713f895f3b2ef863a10944ec1925ff950bc7d85976cf4276e377602b99ccd5b6de47ea639175bf906c28f041eb9c4e0501381a5683b66bbe88fdece0
 MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
diff --git a/media-sound/kid3/kid3-3.8.2.ebuild b/media-sound/kid3/kid3-3.8.2-r1.ebuild
index e1eed069495b..515d09aff193 100644
--- a/media-sound/kid3/kid3-3.8.2.ebuild
+++ b/media-sound/kid3/kid3-3.8.2-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	sys-libs/readline:0=
 	acoustid? (
 		media-libs/chromaprint
-		virtual/ffmpeg
+		media-video/ffmpeg
 	)
 	flac? (
 		media-libs/flac[cxx]
diff --git a/media-sound/kid3/kid3-3.8.3.ebuild b/media-sound/kid3/kid3-3.8.3.ebuild
new file mode 100644
index 000000000000..fea30cf58c3f
--- /dev/null
+++ b/media-sound/kid3/kid3-3.8.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake xdg
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		media-video/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpris? ( dev-qt/qtdbus:5 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}
+	!media-sound/kid3:4
+"
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index 7921f139346b..48f71dade91f 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -1,5 +1,5 @@
 AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d68ac5160e962e0178637a3406221019c07d4a4035aa4baba00c4d883c005f6190f92cd81888277531ed232c41 SHA512 15d5fadd81f5dcb837ac4f91d62b99834fd192a508d5df9647df994b65807fc3de25eaceccad9b39535dc56abb83feb2f48109cf46d95d1ddb68a8212d096ad3
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
-EBUILD klick-0.12.2-r2.ebuild 1078 BLAKE2B e7812de5895b73e71231bdda83ec8ecefaaa72e4f2e06709cc3c40538d0ba656e3cba1267586653cb56bd91bad16cc1fc5e738aa310189a44f2d5b3a4832067c SHA512 2a235742ca754c90e371b13e8d911c7c1f808a40b2356eacab5f1591306feee4dc743b0771182fda1c0e1254af17c5f2de98dbddd0204f13e430e79d109ecefa
+EBUILD klick-0.12.2-r2.ebuild 1084 BLAKE2B 8d78d32718673cb47523a38cf0e90b2bb27a00fc193e6194f344badbac3518807f059537eba3e84e3413f42f5d3c9081316ed616359a886a80db503203be45f5 SHA512 08cb6f2a977eb7dc5e7f707947c2562bbfe5070bb14c3d847e17e576f9b58275d2626823fa3f5c084d4442f5fe0ae13823cfe881dec5ea58257e275ce8fd6038
 MISC metadata.xml 515 BLAKE2B 2a74e5109388a6bf402aeb0a96682b562a53d50aaec99a52163cc3b6744eafdd8be790af99399871af1d87c20afebc80d900304769303301f26b30df2551441b SHA512 fe2a6ca368b2aa748ba1064bbe484849a502a43f7616456c966fd011999ea73aa607c5ffe8cdb1e53e4400c8276fe3e732733f55b0f0143e140cecffaba8522a
diff --git a/media-sound/klick/klick-0.12.2-r2.ebuild b/media-sound/klick/klick-0.12.2-r2.ebuild
index 2cb01450f33a..578c9bd794d7 100644
--- a/media-sound/klick/klick-0.12.2-r2.ebuild
+++ b/media-sound/klick/klick-0.12.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 90da9fd742f6..82fa98eeb851 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,11 +1,10 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
-AUX lilypond-2.17.2-tex-docs.patch 608 BLAKE2B 7cf73d59a6ebadbc34952c199ba1085e6fcebafebe613b041dc8d16fae051380e051d72a2617bcc96fe382de55bfcf4e06d14c4cdd9cc1ac6a9c44a60f49ef68 SHA512 fe22e649e12ba1aacf05dab14b1820d636d58dce252832331577935db2c0e565b3ec6073c6bec11a05a4c1254ddd1495252e6b3e41623e290363eb124e7fa6c1
-AUX lilypond-2.18.2-fontforge.patch 924 BLAKE2B 5f128e65357033c2b2ae33d5f00cccd7237b59354342d33f958170e5f22d904a47aeb18dcb12b7f7c8846d3689ed7d39459b4995c99834603dc22f3b2c893fda SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f
 AUX lilypond-2.19.80-fontforge-version.patch 503 BLAKE2B ff0565562e2156aa833d0de1fda31cce3901999c6fc1f5ec05fcc1dad5a60b4df4823eb9e5e809e4bfd863eef7088627e8dbab38fc1b2fe10152d9c26965c934 SHA512 0098b5f7fae77bd39f08397b460efc43bed8ea90feb2afd5349cb3459209720111bba657ca04be9781d5ad2731476887b6a9414690842d455e22f3c9ed6faeed
 AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
-DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
+AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
-EBUILD lilypond-2.18.2-r3.ebuild 3236 BLAKE2B 599f2759e037577b9178ecd57f94e3d0f75c1556e7b4d02cf7959536726758dbe88b2aad35933f12f177b4e83229ac67ebaac668a3cfff535702b5dae09dd04b SHA512 788ea6f20f63795a05f205a10c1fed07a1afabfb8a321f0788216a54e92804d0254efdf74cf397f88cd96e566f98d6174eb30cd4ddeeb1c70920e1f177fadb26
+DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75
 EBUILD lilypond-2.19.83.ebuild 3405 BLAKE2B 0409cf9038b396d0ee6df6cc65c7f5a9fdddd40f533cd4a7b76adf8ba9e65d4ca8e0d7bf3f831f94f2e681011cd7f8427eb105fd1b8759b50c0838a4f4b4febf SHA512 90d9a385992975fd9fa228bbfe886560711594b1a5c53d71d0291f842631fabe7e957db28ae8417d323f7c7f9aacaeb5eedd3cb25321413878c15b62b8c947a0
-EBUILD lilypond-9999.ebuild 3148 BLAKE2B 71097cedd0f9cbcec0502f42b1e99faef8cc9adad06e4ff1f05acf71fe8cd0c0860464c285e983a39aad2b21477eaa04b28dc8c571121fe0b402936f8da727bd SHA512 6d0bbdd0f665578fbf98d18e2872a3db365bd76ba8c4400283f0e5af20b141336acf9d965f92d5dc56388959a3b7d6e7fa2bda1fbcd2dab5db3da76c5a162320
+EBUILD lilypond-2.21.1.ebuild 3215 BLAKE2B 9e3e76fff187953f7549583cfaece5e8355bdd95495a64745807ad0500a056b6faa0846c4632bb08406748876d857db6ed652164beca89cd2aaf2345d34ab172 SHA512 5a1a37f3cc74638ecf3ebeb0694acec52bc68b74873ff276fb92682c504188bba8954cf4153e3b9326bed628b06d5f213df0972b3b091a529e4c4b1257f8c745
+EBUILD lilypond-9999.ebuild 3223 BLAKE2B 5026b74a5129cd1482e8b033be13141c7d832445d228cb0b7042732b7b73a0705ed7cd014ff32eaa5e7282b70d22ec5f7d337673702f58d9859014e6669e0404 SHA512 9b5ba89e24ac4c26141de4330b94d7514f789d591ca2217f2b7ecb6e04ef55195534a49931bc7ec1e307507c70026e145a1b0e1925fbe746ac9f7ca0bbac9b91
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch b/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch
deleted file mode 100644
index 9e0d7082c0d8..000000000000
--- a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lilypond-2.17.2/GNUmakefile.in
-+++ lilypond-2.17.2/GNUmakefile.in
-@@ -5,7 +5,7 @@
- SUBDIRS = python scripts \
- 	flower lily \
- 	mf ly \
--	tex ps scm \
-+	ps scm \
- 	po \
- 	elisp vim \
- 	input \
-@@ -14,7 +14,7 @@
- 
- ## this convoluted construction is necessary, since we don't know the
- ## value of DOCUMENTATION here.
--documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
-+documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation tex)
- 
- SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
- README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \
diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
deleted file mode 100644
index cfd3295b3948..000000000000
--- a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001
-From: Masamichi Hosoda <trueroad@trueroad.jp>
-Date: Sat, 22 Aug 2015 21:20:17 +0900
-Subject: [PATCH] Fix fontforge version detection
-
-Newer fontforge shows git hash in `fontforge --version`.
-In that case, configure script
-might recognize it as date (version).
----
- aclocal.m4 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 48d0b77..0037c58 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
- 
-     if test -z "$_ver"; then
-         ## If empty, try date [fontforge]
--        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
-+        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
-+	    | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
- 	    | head -n 1 \
- 	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
-     fi
--- 
-2.6.2
-
diff --git a/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch
new file mode 100644
index 000000000000..cdd49584900e
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch
@@ -0,0 +1,10 @@
+--- lilypond-2.19.49.orig/lily/pango-font.cc	2016-10-16 07:16:18.000000000 -0400
++++ lilypond-2.19.49.new/lily/pango-font.cc	2016-10-29 22:39:02.921622080 -0400
+@@ -317,7 +317,7 @@
+   pango_fc_font_unlock_face (fcfont);
+   pango_glyph_string_free (pgs);
+   pgs = 0;
+-  PangoFontDescription *descr = pango_font_describe (pa->font);
++  PangoFontDescription *descr = pango_context_get_font_description (context_);
+   Real size = pango_font_description_get_size (descr)
+               / (Real (PANGO_SCALE));
diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild
index 610f8b27f2ca..216a4d458766 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.1.ebuild
@@ -1,57 +1,67 @@
 # 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 elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
+else
+	MAIN_VER=$(ver_cut 1-2)
+	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
 DESCRIPTION="GNU Music Typesetter"
-SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
 HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86"
-LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs profile vim-syntax"
+IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	virtual/pkgconfig
+"
 RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
-	<dev-scheme/guile-2.0:12
-	media-fonts/urw-fonts
+	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+	media-fonts/tex-gyre
 	media-libs/fontconfig
 	media-libs/freetype:2
 	>=x11-libs/pango-1.12.3
 	emacs? ( >=app-editors/emacs-23.1:* )
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	app-text/t1utils
 	dev-lang/perl
 	dev-libs/kpathsea
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
-	virtual/pkgconfig
 	media-gfx/fontforge[png]
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/make"
+	sys-devel/gettext"
 
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
-	"${FILESDIR}"/${P}-fontforge.patch
+	"${FILESDIR}"/${P}-fix-font-size.patch
 )
 
-DOCS=( AUTHORS.txt NEWS.txt README.txt )
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
 
 pkg_setup() {
 	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
@@ -66,7 +76,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${PATCHES[@]}"
+	default
 
 	if ! use vim-syntax ; then
 		sed -i 's/vim//' GNUmakefile.in || die
@@ -75,18 +85,9 @@ src_prepare() {
 	# respect CFLAGS
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die
-	done
-
-	# respect AR
-	sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
-
 	# remove bundled texinfo file (fixes bug #448560)
 	rm tex/texinfo.tex || die
 
-	eapply_user
-
 	eautoreconf
 
 	xdg_environment_reset #586592
@@ -96,13 +97,16 @@ src_configure() {
 	# documentation generation currently not supported since it requires a newer
 	# version of texi2html than is currently in the tree
 
-	econf \
-		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
-		--disable-documentation \
-		--disable-optimising \
-		--disable-pipe \
-		$(use_enable debug debugging) \
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
 		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 545b867b9356..6d4c51473a1f 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 PYTHON_COMPAT=( python3_{6,7,8} )
+
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
 if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
 else
-	SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz"
+	MAIN_VER=$(ver_cut 1-2)
+	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
@@ -19,41 +20,45 @@ HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-IUSE="debug emacs profile vim-syntax"
+IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-2:12[deprecated,regex]
+BDEPEND="
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
 	media-fonts/tex-gyre
 	media-libs/fontconfig
 	media-libs/freetype:2
 	>=x11-libs/pango-1.12.3
 	emacs? ( >=app-editors/emacs-23.1:* )
-"
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	app-text/t1utils
 	dev-lang/perl
 	dev-libs/kpathsea
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
-	virtual/pkgconfig
 	media-gfx/fontforge[png]
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/make
-"
+	sys-devel/gettext"
 
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
 )
 
 DOCS=( DEDICATION HACKING README.txt ROADMAP )
@@ -80,9 +85,6 @@ src_prepare() {
 	# respect CFLAGS
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
-	# respect AR
-	sed -i "s:^AR=ar:AR=$(tc-getAR):" flower/GNUmakefile || die
-
 	# remove bundled texinfo file (fixes bug #448560)
 	rm tex/texinfo.tex || die
 
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index cebf49508185..ef3bb8b13866 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.1.4.16.tar.xz 455312 BLAKE2B 358fae45a4332c10ba59d65d09ae51f28fb7fc026e137289c47951536753796e0b7efa9f3713bccde68e6260f79b1132eb00357be8c53fba04f3c827e97851cf SHA512 08b8ec7c1fbe5f1b8f95f95677012eeb9bd83951ee320470a0da852e0a446818e48ede7de045f6d7b98dff8be139fa69d780dbf03e65904c773f8ec1493f9915
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
-EBUILD lollypop-1.1.4.16.ebuild 1405 BLAKE2B e0916a5cb5c30307ad7ca43117d626bc75d619efa9d0589f601d02a5289b4e3c192445c5c039f4a4964ba3a7336461749763fcb894d39af79e81ba271b0f248b SHA512 1bd607bf528289ec104ca40940259ae1b90cde149db8bd4732fdc8b736b597f0c827c2c8dfa4881dd1ce40378a205a500b105897c5ca0ac4c0185d704f1d5389
-EBUILD lollypop-1.2.35.ebuild 1532 BLAKE2B e507220017bbf63ed978b6f7f4725f3867f2d8e5a7ac8e2104e489b2b3a563aeafdb5fb89edd16e1cafd4d2fc3afdf7b1a9e26e5613e6f666c90ba4543e9c2a5 SHA512 9a2785cd94b10b005c7238431a0ae56d305dde1dfda27c98c56c3d676d97ef21678cba3bc41888f8bc29d1a9b0316f6a4d4d7a624bf854b493f5dd42b7f5d5d8
+EBUILD lollypop-1.1.4.16.ebuild 1405 BLAKE2B 01ff4079b0a7d7be7dda9273e2b0b3a335fac6ad68560bd7c903df035866a8acf7bcda0f16e14ea4a3344bc5b70b6c3717760ca218d184a186a9ffecc1f0b844 SHA512 aa21d9d77195f47af8c65a0c2495bdf39c65f435953f8ee11e86000ea90e96df8212d13ec70d429ac09d6c54dcacb0d6a2a756baee9a2b39962002b0c2bddae7
+EBUILD lollypop-1.2.35.ebuild 1536 BLAKE2B 73a2964d3a5aa5352837049559106be7039faadb36a7e295c7be7662b6e6e8664de0c52cf0a10935d0d4007437f8a3fd039fc81262feff16043725d7ee793248 SHA512 544de09bc397676739e39f3896240f1a073120f3852c425a270c5f69ddf31795ff398e8abca43305ce9f9021f9d87a6dad930e094874a67208403af9ef571dce
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.1.4.16.ebuild b/media-sound/lollypop/lollypop-1.1.4.16.ebuild
index 0cc5c6539ef4..36a208574657 100644
--- a/media-sound/lollypop/lollypop-1.1.4.16.ebuild
+++ b/media-sound/lollypop/lollypop-1.1.4.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_7 )
 PYTHON_REQ_USE="sqlite"
 HASH="6b4e4e7a2c17f0770c1e2b3354ae5a3a"
 inherit python-r1 gnome2-utils meson xdg-utils
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 06db306eb32f..74dea9a1f853 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 gnome2-utils meson xdg-utils
 
diff --git a/media-sound/lxmusic/Manifest b/media-sound/lxmusic/Manifest
index 0cf6729b1ae7..481032407b17 100644
--- a/media-sound/lxmusic/Manifest
+++ b/media-sound/lxmusic/Manifest
@@ -1,3 +1,3 @@
 DIST lxmusic-0.4.7.tar.xz 180300 BLAKE2B c07552be481eb901ced81078b6d264207957ccbb67a1c6e2a03ee1419fd1e0fae16542d81ce4529b9e7e4f667571e0e44c243c090ccccde45e9374b268957ca0 SHA512 e1e6a7e2306b24dfd5864df88db47c07656d43a1901212b1d6b6edec8addf866b31ebae46bca572e88801620016c6fab9860f5ed44d6086f24494e2eb2737216
 EBUILD lxmusic-0.4.7.ebuild 437 BLAKE2B 58abbbd8c3cbf56dd674d470cd2284e25f62682be9a9c1911de28192edaeaf2860c90a74f907cd7c55cd7cffa07ddcdd60f6f287b2bdaf50060236e192fa76d4 SHA512 f032e61061fc2101b7148d32b4c51a5f52113ac5f1d9e457d12c822015086a90350f1747de3a7ede41fc0192f241f37aeb45c9fa94a3fd873e7a784526e3c4e2
-MISC metadata.xml 475 BLAKE2B 4a670375f0f0a075a538f366284484beddb58c046ed798c5e27cb8388dbe9257f5de40a289971634686eeb872a9842bf7903d21ac744982dc86b3856abe72ab2 SHA512 865b540d371034b95368f62edb2f2b302b594b621bc23f4e66a50cb3d8e518c59fe4846af0379d4f0387a0d725654bdd77396e7e06810ac472d4b6c165faa5f1
+MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/media-sound/lxmusic/metadata.xml b/media-sound/lxmusic/metadata.xml
index c80f5eab13d7..fd5647d2ee41 100644
--- a/media-sound/lxmusic/metadata.xml
+++ b/media-sound/lxmusic/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>lxde@gentoo.org</email>
-		<name>Gentoo LXDE Project</name>
-	</maintainer>
-	<longdescription>LXMusic is a simple GUI XMMS2 client with minimal functionality. It can do nothing more than playing music files.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">lxde</remote-id>
-	</upstream>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">lxde</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 0b9aba9b4b29..b379f286146c 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,6 +1,6 @@
 AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392eededdae662d7ead518fa4301e1c7d231acfd4a7fd3053d807611737add6a1746ec119e400a1f199 SHA512 c29db5f40e7a206fcdb05958c0dc3a479f3e9d0ebd02703c26049162b8cc7d88875f508f29eee387270c96cb381ea93366498faa79d62bf21686e24a1142f608
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
-EBUILD moc-2.5.2.ebuild 2105 BLAKE2B 5dc4c12ddb11b45380d0b6460f2dfa6c1d4a0108ef2edb9a05c1f32472767bab82ff3701475f50966b0d9480f4c33bf4aab5d035e1bce5c35fc59e8dbac77374 SHA512 bd95d117cba09f4647190bec08c285dd5c50b0d2316042c914770a34601e64e697bf171f7a3916e35925e5126550ce958f3ac217be3765bf8059a7a1dd1a302c
-EBUILD moc-2.6_alpha3.ebuild 2268 BLAKE2B 3e900e6e723c054cd40d9f8046da7e2e94f5b8a27529c72ccf0feade63870e414bd282290b471e5473f4498268794a0b9f909c70b4a893b232ff72eeb40d7f4d SHA512 118b6ea884c823b9d9db624daec1e52adfb663c9bfff80d07ac2c8a0f5d465841e1acb6f5f7e0acfb966667c2531ee4173f51f91a179a61030f3f10f1d9dbb55
+EBUILD moc-2.5.2-r1.ebuild 2109 BLAKE2B a24ab48ca76fe6a1d062bd2d7e875daad0b833e73687a6c328d21c89f4857fc270f0fb57f79e6554253b6d2ce2ce8ada2d8970f3a325840a5681f89276be9dd4 SHA512 d7b1a37f2a5b162c8637af93a5da4a39e7080904054eb7d6cc3433521a43447b2d670137af09b74d19fa98b8cd647f83045a21bdad5692f81adb898523d0a667
+EBUILD moc-2.6_alpha3-r1.ebuild 2279 BLAKE2B e82260010c115fbbb05d81c3f26da8fd7b1854af7533da00ccfc296b65ac41345671176b65eab3ea75c3c4bb5fe7fbe4c38abec0e551995ccc1c3c314adcc705 SHA512 cd106235b1017286763f06e0623cc339dce44e10002d5266d15ab4eecc90874be673de805038739a761df396af3fc8b1daf8685e36bc0543df6c00b628b361b4
 MISC metadata.xml 532 BLAKE2B 79a7280e9bb412be2a57f13259d34ff2d2501bd3a34bc74c6fe5ce2529842dae5f199a674224b0b13883af8536fea947e98c6054c3039141a60dbc436ad4a5e2 SHA512 62746eb7250465ef0099c8b9c8e906e932d1bb5c9ac41b1a0192ee3cd4fa79698342b6fac2e7646d65197ebc9f7a504ab733eb2b889b7e84d1a8a9fadfc2ac57
diff --git a/media-sound/moc/moc-2.5.2.ebuild b/media-sound/moc/moc-2.5.2-r1.ebuild
index 339165d14fad..c3a79d27a2c9 100644
--- a/media-sound/moc/moc-2.5.2.ebuild
+++ b/media-sound/moc/moc-2.5.2-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/libltdl-2:0
 	alsa? ( media-libs/alsa-lib )
 	cache? ( >=sys-libs/db-4:= )
 	curl? ( net-misc/curl )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	flac? ( media-libs/flac )
 	jack? ( media-sound/jack-audio-connection-kit )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3-r1.ebuild
index 0c8e6e51c1a2..1b9556070eea 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	cache? ( >=sys-libs/db-4.1:= )
 	curl? ( >=net-misc/curl-7.15.1 )
-	ffmpeg? ( >=virtual/ffmpeg-9 )
+	ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 )
 	flac? ( >=media-libs/flac-1.1.3 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.4 )
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 1f39d2f77668..42273913fb9d 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,8 +5,8 @@ DIST mpd-0.21.20.tar.xz 676396 BLAKE2B e87d844ac0b20f10df7d2306d1c76f76ead84f5e6
 DIST mpd-0.21.21.tar.xz 676668 BLAKE2B 83964784db4a7372344853ebf2e9c966e23ac293c06304a8aa6f927ec8ea38d2749d88670f1c5e380953bb8b777b4b0f2c5e8a98d7eb3cf1bae50b5e11549150 SHA512 1780a24f341dec1cbc3d9170cc2fc8249081cac8f677ff17df15fc959787cf43d30696eefba9b8a44824da14eee3d58e2ee78b34db1335c0a182b4c2a89e6b3a
 DIST mpd-0.21.22.tar.xz 679244 BLAKE2B d2d76662d1f249b138d3a173cdf712eafcebf91e819b70f2cbc6ccb36ca4bc1f2319972548445789d8861345af5e18ea82f071cd7874a7380bbdda85cf834b73 SHA512 051d97500d8224fe4769a667a58c7915eebcca809e9345a30881f99d7c33d99907d9cc0258c0a5fd20f10609edbeb6da16941099ac3c033762ceb4b116e4df04
 DIST mpd-0.21.23.tar.xz 680060 BLAKE2B 5c7b4a69ff5960b171d715560aa7a6b0712a7fd3758e1561e5aea957c5d13164d92bee0ed262b70ea7e91d73c16412840078603c95d50959cc06d9aa4a981022 SHA512 155f606cd6ddce3e74d745a0f1479776d9f73b4cd250604072a863e28ea72d1ff1a7eafeae44cada7b16042251065634376eaa1a211b503e2f874c72dbcdecf0
-EBUILD mpd-0.21.20.ebuild 8056 BLAKE2B 48fff6cdcc18bc6ec1d2c5d95581e523857a632ff447b2e422c6acab8917af45f698d1e3b2b78456076dee6b56f48588f7dd1971a105219ea6938f366abdba24 SHA512 b90a1e4f7d4bc85223ce338699d423ccf46a94f9b1d3172e6d8379ee218b6858fe9cf8f31325d4580093c21bfee7873d1888ff50e54975d14e1a7555d3659aea
-EBUILD mpd-0.21.21.ebuild 8058 BLAKE2B bcd02da8d2815f0226b0a12af2ecf059e6b19633110234ab6c86c4149f3a3a3bfb709eb839ce6ec96f210032e78be7e9bfdef9285d2381281df1d982886535a1 SHA512 98088d506f8943ac1722a26773929193432b7d1e3aa5a02cf0c459065dab2dc4b0fc9e14e8a03caf7b5bf06bece5e3cbe2660200bc6d52228b4ea8980b30ed25
-EBUILD mpd-0.21.22.ebuild 8058 BLAKE2B bcd02da8d2815f0226b0a12af2ecf059e6b19633110234ab6c86c4149f3a3a3bfb709eb839ce6ec96f210032e78be7e9bfdef9285d2381281df1d982886535a1 SHA512 98088d506f8943ac1722a26773929193432b7d1e3aa5a02cf0c459065dab2dc4b0fc9e14e8a03caf7b5bf06bece5e3cbe2660200bc6d52228b4ea8980b30ed25
-EBUILD mpd-0.21.23.ebuild 8058 BLAKE2B bcd02da8d2815f0226b0a12af2ecf059e6b19633110234ab6c86c4149f3a3a3bfb709eb839ce6ec96f210032e78be7e9bfdef9285d2381281df1d982886535a1 SHA512 98088d506f8943ac1722a26773929193432b7d1e3aa5a02cf0c459065dab2dc4b0fc9e14e8a03caf7b5bf06bece5e3cbe2660200bc6d52228b4ea8980b30ed25
+EBUILD mpd-0.21.20.ebuild 7999 BLAKE2B a6df6fef0c69a49ebf6d6f62e28e8e1c4c4fc1b018bb2117662e7d41fe76a7ec802a893694ae1cf11ea7d6d410d42828551a2a61ac7778cf59ffa5813a867fdc SHA512 d2fc65b3e08da812d18c2c80621db7c27fc60b6e5a7e6a00d1de32d6ebe349ea9ab399e904cc9b91c903631d4d4a8d7534495f2d5e05f6a9761d72e93bfd7b20
+EBUILD mpd-0.21.21.ebuild 8001 BLAKE2B 81c39c4402fc11fa7b967431d3c9b6852fbb2e89326da2b266bc0b1213d0d7dfcdca961b82faba100f35ea6bd5556b9fed132a75aaacd3aebd0e55847607c396 SHA512 431ff3b81d538d8215f541947f6c78903849c047c869ada9596f25dde83004097ec9146cabc909f3d154ae9b3239ad39b304033bcbf10d4da162f56a94bed8b9
+EBUILD mpd-0.21.22.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee
+EBUILD mpd-0.21.23.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee
 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/mpd-0.21.20.ebuild b/media-sound/mpd/mpd-0.21.20.ebuild
index 540d4c5ec34f..2506310f4d80 100644
--- a/media-sound/mpd/mpd-0.21.20.ebuild
+++ b/media-sound/mpd/mpd-0.21.20.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
 	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
 	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
@@ -56,12 +56,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	expat? ( dev-libs/expat )
 	faad? ( media-libs/faad2 )
-
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-
+	ffmpeg? ( media-video/ffmpeg:0= )
 	flac? ( media-libs/flac )
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
diff --git a/media-sound/mpd/mpd-0.21.21.ebuild b/media-sound/mpd/mpd-0.21.21.ebuild
index 731ab04c695d..3be6a9778270 100644
--- a/media-sound/mpd/mpd-0.21.21.ebuild
+++ b/media-sound/mpd/mpd-0.21.21.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
 	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
 	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
@@ -56,12 +56,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	expat? ( dev-libs/expat )
 	faad? ( media-libs/faad2 )
-
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-
+	ffmpeg?	( media-video/ffmpeg:0= )
 	flac? ( media-libs/flac )
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
diff --git a/media-sound/mpd/mpd-0.21.22.ebuild b/media-sound/mpd/mpd-0.21.22.ebuild
index 731ab04c695d..e1d6b01c903b 100644
--- a/media-sound/mpd/mpd-0.21.22.ebuild
+++ b/media-sound/mpd/mpd-0.21.22.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
 	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
 	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
@@ -56,12 +56,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	expat? ( dev-libs/expat )
 	faad? ( media-libs/faad2 )
-
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-
+	ffmpeg? ( media-video/ffmpeg:0= )
 	flac? ( media-libs/flac )
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
diff --git a/media-sound/mpd/mpd-0.21.23.ebuild b/media-sound/mpd/mpd-0.21.23.ebuild
index 731ab04c695d..e1d6b01c903b 100644
--- a/media-sound/mpd/mpd-0.21.23.ebuild
+++ b/media-sound/mpd/mpd-0.21.23.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
 	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
 	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
@@ -56,12 +56,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	expat? ( dev-libs/expat )
 	faad? ( media-libs/faad2 )
-
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-
+	ffmpeg? ( media-video/ffmpeg:0= )
 	flac? ( media-libs/flac )
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index f8b38b57c997..7f7f2b634662 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,4 +1,4 @@
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
-EBUILD mps-youtube-0.2.8-r1.ebuild 684 BLAKE2B 485b39f0956bdffe2f9b2c25add43109e7fb2ba465b7a47bdb9fc84316c3464e12c9acf70b7015d971c0a76447f2c88b7e7878297dad641d96158b2a85f53ad4 SHA512 49084753b453935c218e0a74f6d498d45589730044a11c42269e3b2ca7ca4b12a8aede492cbabf58d06abd3893056f05bb9d4d46dcb86ac617ea784406fa83b9
-EBUILD mps-youtube-9999.ebuild 684 BLAKE2B 485b39f0956bdffe2f9b2c25add43109e7fb2ba465b7a47bdb9fc84316c3464e12c9acf70b7015d971c0a76447f2c88b7e7878297dad641d96158b2a85f53ad4 SHA512 49084753b453935c218e0a74f6d498d45589730044a11c42269e3b2ca7ca4b12a8aede492cbabf58d06abd3893056f05bb9d4d46dcb86ac617ea784406fa83b9
+EBUILD mps-youtube-0.2.8-r2.ebuild 688 BLAKE2B d8b3c0780b6360c1fae2fdb16e04f2f6d9b1bd6736b9b71799518fc1baa5e69e4da46ee87ff2a68e68035562c0a1481e52be43cd4827a291def5fa011e6775c1 SHA512 dda34f58bc3ff174a67a21d5935e6f891bfc3cb10468879d43542106275e230febc578684253d7d63ad4986d317c4662918f1992813596fa5f6149b4ded7e1f4
+EBUILD mps-youtube-9999.ebuild 688 BLAKE2B d8b3c0780b6360c1fae2fdb16e04f2f6d9b1bd6736b9b71799518fc1baa5e69e4da46ee87ff2a68e68035562c0a1481e52be43cd4827a291def5fa011e6775c1 SHA512 dda34f58bc3ff174a67a21d5935e6f891bfc3cb10468879d43542106275e230febc578684253d7d63ad4986d317c4662918f1992813596fa5f6149b4ded7e1f4
 MISC metadata.xml 390 BLAKE2B a451cde37ad9b1809005675d0dc8233c760f0ee1678474d60c74990a4ef07da572947498a0da14577072a4f14e57da7b008251ff551f4bcb9ee966957344bf83 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8-r1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild
index a86ede03c873..a98b41c7a2fc 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8-r1.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild
@@ -22,6 +22,6 @@ SLOT="0"
 
 RDEPEND="
 	dev-python/pafy[${PYTHON_USEDEP}]
-	virtual/ffmpeg
+	media-video/ffmpeg
 	|| ( media-video/mpv media-video/mplayer )
 "
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index a86ede03c873..a98b41c7a2fc 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -22,6 +22,6 @@ SLOT="0"
 
 RDEPEND="
 	dev-python/pafy[${PYTHON_USEDEP}]
-	virtual/ffmpeg
+	media-video/ffmpeg
 	|| ( media-video/mpv media-video/mplayer )
 "
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index e1df233164a4..178eb7f664ec 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,4 +1,6 @@
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
+DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc
 EBUILD mumble-1.3.0.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
+EBUILD mumble-1.3.1_rc1.ebuild 3786 BLAKE2B 2ec4700d67e5c7f33687147b3771b47d8cdae0279122d2fcfd003b8fec29227ce9c9c56e00344af332d9758474b7c53a1d97971af179c1b905dcf0fed6d97d64 SHA512 2d59f8fe221997fc0f1bd5157f2a5eb55f4e4de5ee2bc33510ee39cfb69a0a42b35e507142cb2fff0c5e429606fd190264a6bd2a218201be7a934b1d5faf2978
 EBUILD mumble-9999.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1_rc1.ebuild
new file mode 100644
index 000000000000..69f5d7055e0d
--- /dev/null
+++ b/media-sound/mumble/mumble-1.3.1_rc1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib-build qmake-utils xdg
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	g15? ( app-misc/g15daemon )
+	jack? ( virtual/jack )
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
+	libressl? ( dev-libs/libressl )
+	opus? ( >=media-libs/opus-1.0.1 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+# NB: qmake does not support multilib but it's fine to configure
+# for the native ABI here
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myuse: No use option given"
+		use ${1} || echo no-${1}
+	}
+
+	local conf_add=(
+		bundled-celt
+		no-bundled-opus
+		no-bundled-speex
+		no-embed-qt-translations
+		no-server
+		no-update
+		$(myuse alsa)
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse g15)
+		$(usex jack '' no-jackaudio)
+		$(myuse opus)
+		$(myuse oss)
+		$(myuse portaudio)
+		$(myuse pulseaudio)
+		$(myuse rnnoise)
+		$(usex speech '' no-speechd)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	use pch || conf_add+=( no-pch )
+
+	eqmake5 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add[*]}" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+multilib_src_compile() {
+	local emake_args=(
+		# place libmumble* in a subdirectory
+		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
+		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
+	)
+	# build only overlay library for other ABIs
+	multilib_is_native_abi || emake_args+=( -C overlay_gl )
+	emake "${emake_args[@]}"
+	emake clean
+}
+
+src_compile() {
+	multilib_foreach_abi multilib_src_compile
+}
+
+multilib_src_install() {
+	local dir=$(usex debug debug release)
+	dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
+	if multilib_is_native_abi; then
+		dobin "${dir}"/mumble
+		dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
+	fi
+}
+
+src_install() {
+	multilib_foreach_abi multilib_src_install
+
+	newdoc README.Linux README
+	dodoc CHANGES
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	doicon -s scalable icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index a6114b69b068..e46dd7da2fb6 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -3,6 +3,8 @@ AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e3
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
+DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc
 EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
+EBUILD murmur-1.3.1_rc1.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.1_rc1.ebuild b/media-sound/murmur/murmur-1.3.1_rc1.ebuild
new file mode 100644
index 000000000000..17d28a117c43
--- /dev/null
+++ b/media-sound/murmur/murmur-1.3.1_rc1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils systemd readme.gentoo-r1
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' )
+else
+	MY_PN="mumble"
+	if [[ "${PV}" == *_pre* ]] ; then
+		MY_P="${MY_PN}-${PV}"
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+		S="${WORKDIR}/${MY_P}"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${MY_PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_PN}-${PV/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	>=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	|| (
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsql:5[mysql]
+	)
+	dev-qt/qtxml:5
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dbus? ( dev-qt/qtdbus:5 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+"
+BDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	virtual/pkgconfig
+"
+
+if [[ "${PV}" == *9999 ]] ; then
+	# Required for the mkini.sh script which calls perl multiple times
+	BDEPEND+="
+		dev-lang/perl
+	"
+fi
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == *9999 ]] ; then
+		pushd scripts &>/dev/null || die
+		./mkini.sh || die
+		popd &>/dev/null || die
+	fi
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+
+	# Adjust systemd service file to our config location #689208
+	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-i scripts/${PN}.service || die
+}
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myconf: No use flag given."
+		use ${1} || echo "no-${1}"
+	}
+	local conf_add=(
+		no-client
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse ice)
+		$(myuse pch)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	eqmake5 main.pro -recursive \
+		CONFIG+="${conf_add[*]}"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc -r scripts/server
+	docompress -x /usr/share/doc/${PF}/scripts
+
+	local dir="$(usex debug debug release)"
+	dobin "${dir}"/murmurd
+
+	local etcdir="/etc/murmur"
+	insinto ${etcdir}
+	newins scripts/${PN}.ini.system ${PN}.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	systemd_dounit scripts/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur ${etcdir}/murmur.ini
+	fperms 640 ${etcdir}/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index a23cf9e453be..3202ebe25c1f 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,7 @@
+AUX ncmpcpp-0.8.2-gcc10.patch 717 BLAKE2B 3edd29e89df2665b44e5b065aeca18c610c6ec1f4c7bd3d0f5f70af51103d40e1f42302277a6bc8013e0c26b17d1d7aa4fc868f9f96a3163cd7affd29aa4c634 SHA512 99298d813391c03fc70ab16ffe8dd57c6151b87f4cd84f25a1747691d8f9f41e5f647b59c0d2ca25808acb995c7df6c99f386a4cc1f3f133b722731ef99a8a3b
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-EBUILD ncmpcpp-0.7.7.ebuild 1446 BLAKE2B 64c094cc6dd32e8a3f3891930167b6350a128ef90ed84bae6aa74eabb160406f76022f8461c6d9f40489da7deb786eb175ce444016dbd55daf12779b8630e231 SHA512 75ba9a04434ac5fa5f477d6d7f905e9350f48cc1aa9543a6085677200dec0b319d078896e18407a8e76c9af1f92db7a81cb760391a76470a5781b0ed285aec56
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1374 BLAKE2B d9dd250d0b1e9cd0fbdabb08a483b6a429e8415d0e46a567109f35745715a33e2ba1b614a5a67f8128d25e825a03f48e4538c9d0ff54300b6f865f0f6baebc37 SHA512 66cec70e2d9a8e8868f6f1d02cf31afa76e4b983b13c3a7a604dbc27e8d8f1e4006a941ea7c849e982c5c8eea5e52e2a866ebb75175c2655b1453faf3b195870
+EBUILD ncmpcpp-0.7.7.ebuild 1551 BLAKE2B 3c260345afbed013eeaa72410ef8aedc9c6723668a9c819ef013002d5c71dfeffa09f9449a32875b9c3fb167d6ed61fc589c3a40fbc5488167a6ea8f54957f1a SHA512 6f476a29df5e9930e355ff59590213d030ae51f67ed71da3d12061e355e3b1b41bd9c9fb8e0baa7f765bf76547a068544cf9d107f16bc6240c79219dd66a57cc
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1471 BLAKE2B 6d58c5e6902c7ff4a8bbcc7c1a29e411b4cdca1dbc46beec56c00e90b1ec2c7b27acb3e62a8212f9703021895ae605176212b0eb4b89d1624763a301f5d1ec63 SHA512 89e4e9140d8103bbe26910202714d34f9dce1a0053b52c7f58a709589b63bc2ab739a2396169feb9e2b71cbf776f5ef0bfcb6f5c2e618bce668118c2fb2cc7f3
 EBUILD ncmpcpp-9999.ebuild 1357 BLAKE2B 3215c3e2f2dee61ffbfd6c8ef01f534593f2701b50b4d2beec557532626923b5cf9d68ea7205afede9fca1e51d445919510845b3d66d8b7ff2ffb47e970e9bba SHA512 d388f8371a7e4afdfb2130ff5f6405c86896391a609545b76d6dcbe0a9006aeced45a6c15012aab49efe1f8e4150d99aed85e43977e704f282e1364c03f20f00
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
new file mode 100644
index 000000000000..466abceecfe8
--- /dev/null
+++ b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
@@ -0,0 +1,26 @@
+From 399e0f47008b487df3505476c959b4f42d8bc1b1 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sat, 9 May 2020 14:31:52 +0200
+Subject: [PATCH] Fix build with GCC 10 by adding missing include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following error:
+./mpdpp.h:438:15: error: ‘runtime_error’ is not a member of ‘std’
+---
+ src/mpdpp.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mpdpp.h b/src/mpdpp.h
+index a2bb79eb..abd3666c 100644
+--- a/src/mpdpp.h
++++ b/src/mpdpp.h
+@@ -25,6 +25,7 @@
+ #include <exception>
+ #include <random>
+ #include <set>
++#include <stdexcept>
+ #include <vector>
+ 
+ #include <mpd/client.h>
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index 6ca6ada7832f..1593220f2047 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://rybczak.net/ncmpcpp/"
@@ -24,10 +24,11 @@ RDEPEND="
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# https://github.com/ncmpcpp/ncmpcpp/pull/385
+PATCHES=( "${FILESDIR}/${PN}-0.8.2-gcc10.patch" )
 
 src_prepare() {
 	default
@@ -56,7 +57,7 @@ src_install() {
 pkg_postinst() {
 	echo
 	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${EROOT}/usr/share/doc/${PF}"
 	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
 	elog "as user configuration files."
 	echo
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index 55b91f7c614f..5b38962ff92b 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -23,10 +23,11 @@ RDEPEND="
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# https://github.com/ncmpcpp/ncmpcpp/pull/385
+PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
 
 src_prepare() {
 	default
@@ -53,7 +54,7 @@ src_install() {
 pkg_postinst() {
 	echo
 	elog "Example configuration files have been installed at"
-	elog "${ROOT}/usr/share/doc/${PF}"
+	elog "${EROOT}/usr/share/doc/${PF}"
 	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
 	elog "as user configuration files."
 	echo
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 5818222dce8f..d7e7d3e7f150 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1,6 +1,6 @@
 DIST pianobar-2019.01.25.tar.bz2 48340 BLAKE2B 09078b0fdf43baab99c343a86d5f1c1e0ee7ab39e2af20e7cdde6c21320a74d82ed9bc02e821b02ab045329944aa7d273d637c80bcb0ce96692281dc2e1a0568 SHA512 bfcec235ff01e40a2f650166a29020276b43b241008fd5eb8b84944744b1ce6262cf3be140354404c9410b88d6910e4bcf77b4de787742a7898bbc8511fef0f6
 DIST pianobar-2019.02.14.tar.bz2 48396 BLAKE2B 3b25cdbd086efdb4c5f3239b9c47af6c6f647929573dd8fda93a569252dcace34654fc9460bc0cc9925057bb56a10912788a9aedaba8f217dfc2f9eae9718275 SHA512 00491118ed46df4871e8d019e7139d0779d07d03ab4c8a2312f024613a8b849430bb7c23339a021604023f2c5234015fdbd5d7078caf8cf6d690d03e7c648755
-EBUILD pianobar-2019.01.25.ebuild 1071 BLAKE2B 4d1a529708ac10f91a1b50601e166bca7ee22edae65d7b7da8bd63f12afa018af10c731f02dde9649600dd4918e2596d274979e8ebf94cf5c8ef5f342efd5fb3 SHA512 c08cceff3ca128defb7cb96da8b302576b05717a7576529886176676f8b7ef01228b82fbe97c4bdaeb9c883dd1165221be3b4b7965034950cd93becc662de2f4
-EBUILD pianobar-2019.02.14.ebuild 1073 BLAKE2B 5d28f29d27cf29d32cedba2d8e1eea1cac17a7aa7181aa82d7cdfdf2dc866730baeb343cd4e4c3189e87dc900c77940876bfc665948c8f45d854de8adec82157 SHA512 95b6254277503f6920356d7b48aff0644a4441ae32bcfbeff35092ed56d4507fa7f3d4bea2e8cdf6b2d3e163435701f4a1b9cbb4e7b7998ab55893a1cf3c684c
-EBUILD pianobar-9999.ebuild 1073 BLAKE2B 5d28f29d27cf29d32cedba2d8e1eea1cac17a7aa7181aa82d7cdfdf2dc866730baeb343cd4e4c3189e87dc900c77940876bfc665948c8f45d854de8adec82157 SHA512 95b6254277503f6920356d7b48aff0644a4441ae32bcfbeff35092ed56d4507fa7f3d4bea2e8cdf6b2d3e163435701f4a1b9cbb4e7b7998ab55893a1cf3c684c
+EBUILD pianobar-2019.01.25.ebuild 1015 BLAKE2B 63d7be43743ef0758239c939c03ccb4ac4b3adcec06515bd34e55e62f0372a4de8d6090685b32130fd7d2a454a5380fa8c69b5ac33eb8c5eb1b809972dba79a7 SHA512 02705089829c265c0da59411f8490fcd5ba9a263173c28df2f7947d9111ed49484d551a28b160ddcd7ba7d5fbc9f23d6771453bc5a19236726c0b081f0da92f0
+EBUILD pianobar-2019.02.14.ebuild 1017 BLAKE2B 7441a958a2593150d5e456582dfe96afec1ec542d7311e671bdaf0911fa5798ece36f8fa77552f5fd07cdff384f9c29348ccbeee2cbc05d2f1293501f47b43fd SHA512 298018f09620bbbe022371f41cbd5d47056efbee0583b65c8dc3391543270ef7934cd43be18d3af14c5407465fcb777c8ce9e755cc9d37cde7d5496188884033
+EBUILD pianobar-9999.ebuild 1017 BLAKE2B 7441a958a2593150d5e456582dfe96afec1ec542d7311e671bdaf0911fa5798ece36f8fa77552f5fd07cdff384f9c29348ccbeee2cbc05d2f1293501f47b43fd SHA512 298018f09620bbbe022371f41cbd5d47056efbee0583b65c8dc3391543270ef7934cd43be18d3af14c5407465fcb777c8ce9e755cc9d37cde7d5496188884033
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/pianobar/pianobar-2019.01.25.ebuild b/media-sound/pianobar/pianobar-2019.01.25.ebuild
index 60e77da71e62..dd49bf04b5f2 100644
--- a/media-sound/pianobar/pianobar-2019.01.25.ebuild
+++ b/media-sound/pianobar/pianobar-2019.01.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,14 +17,13 @@ HOMEPAGE="https://6xq.net/pianobar/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="libav static-libs"
+IUSE="static-libs"
 
 RDEPEND="media-libs/libao
 	net-misc/curl
 	dev-libs/libgcrypt:0=
 	dev-libs/json-c:=
-	libav? ( >=media-video/libav-12:0= )
-	!libav? ( >=media-video/ffmpeg-3.1:0= )
+	>=media-video/ffmpeg-3.1:0=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/media-sound/pianobar/pianobar-2019.02.14.ebuild b/media-sound/pianobar/pianobar-2019.02.14.ebuild
index dff31a20e216..5a3320ef9da6 100644
--- a/media-sound/pianobar/pianobar-2019.02.14.ebuild
+++ b/media-sound/pianobar/pianobar-2019.02.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,14 +17,13 @@ HOMEPAGE="https://6xq.net/pianobar/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="libav static-libs"
+IUSE="static-libs"
 
 RDEPEND="media-libs/libao
 	net-misc/curl
 	dev-libs/libgcrypt:0=
 	dev-libs/json-c:=
-	libav? ( >=media-video/libav-12:0= )
-	!libav? ( >=media-video/ffmpeg-3.1:0= )
+	>=media-video/ffmpeg-3.1:0=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index dff31a20e216..5a3320ef9da6 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,14 +17,13 @@ HOMEPAGE="https://6xq.net/pianobar/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="libav static-libs"
+IUSE="static-libs"
 
 RDEPEND="media-libs/libao
 	net-misc/curl
 	dev-libs/libgcrypt:0=
 	dev-libs/json-c:=
-	libav? ( >=media-video/libav-12:0= )
-	!libav? ( >=media-video/ffmpeg-3.1:0= )
+	>=media-video/ffmpeg-3.1:0=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index 474ef80a3793..a3cde6c571a8 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,5 +1,5 @@
-AUX pithos-1.3.1-dont-try-to-update-icon-cache.patch 584 BLAKE2B 9127f728cd0da41a490fdcaa3c781d9137099507192f9301e6237d7f3b833ccce81429efcf8aaa67c04945cf0af16d47829582968b7d72850446c7ced93fd3cf SHA512 cc30b733388a9dea61ea4ab23c4291c11656a117e0f9aa98e3b286b6698ec38242154da21af9dc840bc697a34a1e604f86e489a2c5d6fcb76ac6f3e1bef750e5
-DIST pithos-1.3.1.tar.gz 119658 BLAKE2B 0d6e1c4e48a4beb1082f8788d4e016371660667dbe32ee925aa4b904f60a25e6664a94cefbc62dd9323a6e69338c03fc4080517e842102fd6eeca144f568c984 SHA512 c06715516992e4aa8bb3b200035ee10ef8dcec9491d32af0fb3f4e176d0ad5313a437f228747d5d716a29d2fe5b93ddd3704aa4fe674ce3be5a17eaad13b0da4
-EBUILD pithos-1.3.1.ebuild 2028 BLAKE2B 983a55b505b4e58e32f99eefd1fb4fe34496e15591bc7280ca2f43e6384ebcb4be54c8d3d1dfe0879f0099b35f8406dc33d1febcc136bf4fd4edeb3cbce258d6 SHA512 0129b8ed80200daab5d416e62bafc06e982dc8d33623cd4d30645817cbc7cdc3a2b46d6595ad15ccb96056d8463bf55446890c72c60e019630cba84d15b0eb4c
-EBUILD pithos-9999.ebuild 2023 BLAKE2B e1118278c43d6b560320e480fd022f5c3f54545064bcdc956f12e8af06b1466415bcd4d07799d992488f642c94b9f1976cdeb6eaaa3cea49272f19ed3129476b SHA512 531975652ccd1c80e44ed7ba4b34cfa4a03944baad2048493dfe035a13afc7de7de26231008cba1fc53c20d534f5cd5e8ef202553ca12d3a2fd87ee93011c2e9
+AUX pithos-1.5.0-py38.patch 1815 BLAKE2B b47a5efd83f41562919d9bfbaf97f714c30ec2aa6e92bcced871326ca84a060c3ad5c128d7974f3084e9eb045db7a434d53aa766775decad5ed58823ff7be22f SHA512 40174e33251b11f8c95099ad01b7ab482026a76ee625f12a5a68e38abe8d081fd265e5bc0939dbfc27e3650cbaac18085a215663cefb2a23417ab437fbadbde0
+AUX pithos-1.5.0-tests.patch 730 BLAKE2B fbd1613c2c3e38a6acefd215e35babd9a6f41aac6fdb492b51e0d1285eac3b2441f3323206282acd8c72bb33dcd9b80c5a8d0fd53e478df9445f6d42ae4392ae SHA512 a50e0929f9a19cca0e2d7e888d5ac228ba820ff58c7d71e08b57f92394e7913bf9bf02e5ae2de736df4b69621c913b07bf6baf14ecc9aaee3e5df921965d70ea
+DIST pithos-1.5.0.tar.gz 123047 BLAKE2B 6f93a41bdda6c3e9baf4d71248748d4e798f9426377fcdf5dded0bdbfec92278f98c215fe818b4d1fc5378d47275539d3a559f7b9d9d8c920f5218431b77c3b3 SHA512 eec2d2fa2fec7f87decc5934d4e1c2f8e11754cb1e042e749be102b27353811a6868636b51b8b9f88ad6f649a12347b82da98d81a476ad3b610ef1049155b657
+EBUILD pithos-1.5.0.ebuild 1748 BLAKE2B e7a105ba97fe29b780600c56876a8e2baade6bd754f835bf5e02b0118a5fe345c4925046b085de97bcbdc0ba821cbfca892efe79f75c07d6dcb043a712f2937a SHA512 a890310b7bc53195f2e7beaf8b5c31a7a128039990fe5afa3ba544e129ab7fc000d3d7dd8bffd77a4320e68a2264446a145fbdcb281156af2a97e9e3e3526805
 MISC metadata.xml 418 BLAKE2B a438f3fc8d1df9e7dcdd099f5fce71bdf2423b5f030ef7c73c747cdc88a9de543321a825c1c4674ce3fe5659b71ee643c3e561d7237de2e290dafd6ac4583bef SHA512 2a0e965854663d1ae76b17729ced051a6571016e989fbf1605f41ddbac699e99e51a03dca7b171d829635725f920bfc13c5885110d3694878a425660201ff651
diff --git a/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch b/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch
deleted file mode 100644
index 5e1b5da91c9a..000000000000
--- a/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 0c5e1cb..b413774 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -85,13 +85,11 @@ ubuntu_light_DATA = data/icons/ubuntu-mono-light/16x16/apps/io.github.Pithos-tra
- ubuntu_darkdir = $(datadir)/icons/ubuntu-mono-dark/16x16/apps
- ubuntu_dark_DATA = data/icons/ubuntu-mono-dark/16x16/apps/io.github.Pithos-tray.svg
- 
--UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor || :
--
- install-data-hook:
--	$(UPDATE_ICON_CACHE);
-+	:;
- 
- uninstall-hook:
--	$(UPDATE_ICON_CACHE);
-+	:;
- 
- BUILT_SOURCES = pithos.gresource
- SUBDIRS = po
diff --git a/media-sound/pithos/files/pithos-1.5.0-py38.patch b/media-sound/pithos/files/pithos-1.5.0-py38.patch
new file mode 100644
index 000000000000..dd4327a0d3fd
--- /dev/null
+++ b/media-sound/pithos/files/pithos-1.5.0-py38.patch
@@ -0,0 +1,41 @@
+commit 3a23742614058b4bc97d71e1bb826e19891f0d24
+Author: JasonLG1979 <jasonlevigray3@gmail.com>
+Date:   Sun Mar 22 20:50:53 2020 -0500
+
+    Quiet SyntaxWarning: "is" with a literal in Python 3.8
+
+diff --git a/pithos/SearchDialog.py b/pithos/SearchDialog.py
+index d8eec14..fcc9004 100644
+--- a/pithos/SearchDialog.py
++++ b/pithos/SearchDialog.py
+@@ -61,11 +61,11 @@ class SearchDialog(Gtk.Dialog):
+                 return
+ 
+             for i in results:
+-                if i.resultType is 'song':
++                if i.resultType == 'song':
+                     mk = '<b>{}</b> by {}'.format(html.escape(i.title), html.escape(i.artist))
+-                elif i.resultType is 'artist':
++                elif i.resultType == 'artist':
+                     mk = '<b>{}</b> (artist)'.format(html.escape(i.name))
+-                elif i.resultType is 'genre':
++                elif i.resultType == 'genre':
+                     mk = '<b>{}</b> (genre)'.format(html.escape(i.stationName))
+                 self.model.append((i, mk))
+             self.treeview.show()
+diff --git a/pithos/StationsDialog.py b/pithos/StationsDialog.py
+index a2b51b2..43cdcb6 100644
+--- a/pithos/StationsDialog.py
++++ b/pithos/StationsDialog.py
+@@ -201,9 +201,9 @@ class StationsDialog(Gtk.Dialog):
+     def add_station_cb(self, dialog, response):
+         result = dialog.result
+         if result is not None:
+-            if result.resultType is 'song':
++            if result.resultType == 'song':
+                 description = '{} by {}'.format(html.escape(result.title), html.escape(result.artist))
+-            elif result.resultType is 'artist':
++            elif result.resultType == 'artist':
+                 description = html.escape(result.name)
+             else:
+                 description = html.escape(result.stationName)
diff --git a/media-sound/pithos/files/pithos-1.5.0-tests.patch b/media-sound/pithos/files/pithos-1.5.0-tests.patch
new file mode 100644
index 000000000000..cab7639772ef
--- /dev/null
+++ b/media-sound/pithos/files/pithos-1.5.0-tests.patch
@@ -0,0 +1,23 @@
+diff --git a/data/meson.build b/data/meson.build
+index efac217..d08796a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -41,12 +41,12 @@ pithos_appstream = i18n.merge_file(
+ 
+ pithos_settings = gnome.compile_schemas()
+ 
+-appstream_util = find_program('appstream-util', required: false)
+-if appstream_util.found()
+-  test('Validate appstream file', appstream_util,
+-    args: ['validate', pithos_appstream]
+-  )
+-endif
++#appstream_util = find_program('appstream-util', required: false)
++#if appstream_util.found()
++#  test('Validate appstream file', appstream_util,
++#    args: ['validate', pithos_appstream]
++#  )
++#endif
+ 
+ desktop_utils = find_program('desktop-file-validate', required: false)
+ if desktop_utils.found()
diff --git a/media-sound/pithos/pithos-1.3.1.ebuild b/media-sound/pithos/pithos-1.3.1.ebuild
deleted file mode 100644
index 102dfd5bf500..000000000000
--- a/media-sound/pithos/pithos-1.3.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit autotools gnome2-utils python-r1
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Pandora.com client for the GNOME desktop"
-HOMEPAGE="https://pithos.github.io/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify appindicator +keybinder"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/pylast[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
-	dev-libs/appstream-glib[introspection]
-	x11-libs/pango[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
-	>=x11-libs/gtk+-3.14:3[introspection]
-	x11-themes/gnome-icon-theme-symbolic
-	libnotify? ( x11-libs/libnotify[introspection] )
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	keybinder? ( dev-libs/keybinder:3[introspection] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.1-dont-try-to-update-icon-cache.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	python_copy_sources
-}
-
-pithos_src_configure() {
-	pushd "${BUILD_DIR}" || die
-	econf UPDATE_ICON_CACHE=":"
-	popd || die
-}
-
-src_configure() {
-	python_foreach_impl pithos_src_configure
-}
-
-pithos_src_compile() {
-	pushd "${BUILD_DIR}" || die
-	emake
-	popd || die
-}
-
-src_compile() {
-	python_foreach_impl pithos_src_compile
-}
-
-pithos_src_install() {
-	pushd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" install
-	python_doscript "${D}"/usr/bin/pithos
-	popd || die
-}
-
-src_install() {
-	python_foreach_impl pithos_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/media-sound/pithos/pithos-1.5.0.ebuild b/media-sound/pithos/pithos-1.5.0.ebuild
new file mode 100644
index 000000000000..11ebd44dac4c
--- /dev/null
+++ b/media-sound/pithos/pithos-1.5.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit meson gnome2-utils virtualx python-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="https://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="appindicator +keybinder libnotify test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	app-crypt/libsecret[introspection]
+	dev-libs/appstream-glib[introspection]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pylast[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-libs/glib:2
+		dev-util/desktop-file-utils
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pithos-1.5.0-py38.patch"
+
+	# comment out tests that need internet
+	"${FILESDIR}/pithos-1.5.0-tests.patch"
+)
+
+src_configure() {
+	python_foreach_impl meson_src_configure
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	virtx python_foreach_impl meson_src_test
+}
+
+src_install() {
+	python_foreach_impl meson_src_install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/media-sound/pithos/pithos-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
deleted file mode 100644
index 1f2906dd601c..000000000000
--- a/media-sound/pithos/pithos-9999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit autotools gnome2-utils python-r1
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Pandora.com client for the GNOME desktop"
-HOMEPAGE="https://pithos.github.io/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="libnotify appindicator +keybinder"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/pylast[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
-	dev-libs/appstream-glib[introspection]
-	x11-libs/pango[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
-	>=x11-libs/gtk+-3.14:3[introspection]
-	x11-themes/gnome-icon-theme-symbolic
-	libnotify? ( x11-libs/libnotify[introspection] )
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	keybinder? ( dev-libs/keybinder:3[introspection] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.1-dont-try-to-update-icon-cache.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	python_copy_sources
-}
-
-pithos_src_configure() {
-	pushd "${BUILD_DIR}" || die
-	econf UPDATE_ICON_CACHE=":"
-	popd || die
-}
-
-src_configure() {
-	python_foreach_impl pithos_src_configure
-}
-
-pithos_src_compile() {
-	pushd "${BUILD_DIR}" || die
-	emake
-	popd || die
-}
-
-src_compile() {
-	python_foreach_impl pithos_src_compile
-}
-
-pithos_src_install() {
-	pushd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" install
-	python_doscript "${D}"/usr/bin/pithos
-	popd || die
-}
-
-src_install() {
-	python_foreach_impl pithos_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index 3f5293fc89fa..ba7cdebf44b7 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpeg29.patch 684 BLAKE2B 06808e146419469de9f3d4a98db52e45c284779677b9f7525d108afbf485fb804a8bdf45909fbc53c19546dc6b56ae308348a1616f94af269c9cd1407bb134bd SHA512 3de805c7e4808863ca4fa9fa7c450ce1db6222a69ef6e43016e2d7d687a5461beda75869b3bd5ad6266f00948ce94ff63b15c9fa97104303a56300e0aa2cb475
 DIST potamus-16.tar.gz 144874 BLAKE2B ca18b2a6e948a913f652383a81a9e637265c7cf78126846c6824fe12f8a34ab2902ade69366e036b00da61604780e340671a68588b52576c0e5827f07b1b7ba8 SHA512 e4c87d4166d958d200edc13835c57c894b0803b243fd79fb211480a217a33ca34fbd451622842efc47c0ed1b79bcd0fa4f0258f129f70678f14c373234b1b32d
-EBUILD potamus-16.ebuild 1272 BLAKE2B 4070417acd64772b087e88db609a97762176404f263c60dd919c2348cde4fda3e0cfefd18714061aff376bdd2c1b546555a46bf4c9e95be141940b72c9b86061 SHA512 48b6b50e09ba733c0f12e25d716dc4f34ac97f8882ce62a0dca924fb257fcf293d3338b5d20b4a5b5e7309f269e75a017b3c34b66ecb46c33cfa2466985f6d4c
+EBUILD potamus-16.ebuild 1219 BLAKE2B 4b78720ea2840ab4c0fffbb2ccd4c669780c179b606aa3d6accd0ef9904021cae87d69284b8ef83a032facf41fe8d6714ad4ac90f310ad958de50b397fca8d06 SHA512 b3b0ca291ec6b9cdf89038ac779e64f61d714b87f2a84fcbfa06e10f9eebb11d9fc7920af475d9d2147a99c014d6a1865d12680579d0973aff4bf6151010af8c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/potamus/potamus-16.ebuild b/media-sound/potamus/potamus-16.ebuild
index 8a71e5f23935..fe984ebe363a 100644
--- a/media-sound/potamus/potamus-16.ebuild
+++ b/media-sound/potamus/potamus-16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://offog.org/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ao audiofile flac jack libav mad modplug opus vorbis"
+IUSE="+ao audiofile flac jack mad modplug opus vorbis"
 
 RDEPEND="
 	x11-libs/gtk+:2
@@ -21,8 +21,7 @@ RDEPEND="
 	audiofile? ( media-libs/audiofile )
 	flac? ( media-libs/flac )
 	jack? ( media-sound/jack-audio-connection-kit )
-	libav? ( media-video/libav:= )
-	!libav? ( >=media-video/ffmpeg-2.8:0= )
+	>=media-video/ffmpeg-2.8:0=
 	mad? ( media-libs/libmad )
 	modplug? ( media-libs/libmodplug )
 	opus? ( media-libs/opusfile )
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index 7a743e4373f7..e8b5a03f6674 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,5 +1,5 @@
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-modules-bt-1.3.tar.gz 85802 BLAKE2B ea7e5141d07c1d3b19372cbae2aa9a5b6049509a12bb2470f47f231f85cc66ef4a74e70bdc91d3554d57e9c26b64129f87b2a3a55e16fbf0c6fe1b5ce7721074 SHA512 094c4205c1c71326efd42053a1bc9f131633c9e28fde177f1c08a290395864b76b8f60f79ffec2fbb8445186aa5c85aafabc47908fd302beb5b278ebcac98558
-EBUILD pulseaudio-modules-bt-1.3-r1.ebuild 2260 BLAKE2B 80a0482c671988a498f4988f6f8d078a69dd5d7b124951ca5952f52fb1b7bf546b02d5b93750d5c4fe0328db45e86daa54b3902bd8aa2de4a2e710c83816e1b0 SHA512 f9f309cfde4d6afde934ec2a032c08af684090048a28ff57d19caf6fcc0646453ac6a64f26c3f36a6cd752d7219c8be6d7ab0fdfeb168913f5285fc1f098516a
-EBUILD pulseaudio-modules-bt-9999.ebuild 2129 BLAKE2B e9dc4ad7b297a96ce866c3d02c326ee91e9c77b76921a149a749411b4625f53d202a30d8a79129ac75e0a6e20064c4793a53f7de1b178b8a04531627066681e9 SHA512 c6adbb85a715afc3d2241562ed0f87e4790d280556c7407dd9971df28e77b05189b78edbae2016226b63ffab261da45bbec021f6349d111988b102e019a6a8bd
+EBUILD pulseaudio-modules-bt-1.3-r2.ebuild 2228 BLAKE2B 8c21f34108dfcc888e92784ea0d8e648214b1ba3abf78265e9ed501d03fcdb473a0543c5c93c02028e5d00c36b654e237fc9ce5d362b13f1933e2ef6f25802a3 SHA512 65166145c85b9337d75e3b1cb1ea75cd68945aa0859d092a6373b9dd610de641ecfe92abd9182949e11f8d4027b0487458e85f91178b76c47c81e6df890df411
+EBUILD pulseaudio-modules-bt-9999.ebuild 2097 BLAKE2B 4a441e062fbb3dadc239f9e258e7882cd2650a86ca893b9ea54e10f4ac5926ad15ad113ca712e950710d352691c9fd0cf92356ed539a64b8ab9945391ce4afea SHA512 3fb96278f148298f3c959b7d80c7e5436a8466931f66850efa7ee2d23c4e7b0db3b3a6706fa4c1f652354c56671026fa9d79cd8cb8261c1dcfe61d6410befe3a
 MISC metadata.xml 766 BLAKE2B 3fc16e24b2ecb5212c32ada629f2e8c19c91921333db4de169f0848b6bc63b2001c8e68d7c82765e064f8ecbed10e25bc926ea7c598c09d88d5e474df63ab9bb SHA512 c14a460ddba2b09ecddd6a5f12ca8a888b22bac2b9f606249d466473bde3e6ae5c64ee899e74c5ca10c3708d9a39874dfcbbce84c3ccc383c274ac8cfbde43bc
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r2.ebuild
index 22faf22ec86d..f46c7072e9c9 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit cmake-utils readme.gentoo-r1
 
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth (alongside SBC and native+ofono headset)"
+DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
 HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
 
 PULSE_VER="13.0"
@@ -20,7 +20,7 @@ IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
 
 DEPEND="
 	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	media-libs/sbc
 	ldac? ( media-libs/libldac )
 	>=net-wireless/bluez-5
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
index 8b8e74ca04f7..4847cdac7273 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit git-r3 cmake-utils readme.gentoo-r1
 
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth (alongside SBC and native+ofono headset)"
+DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
 HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/EHfive/${PN}"
@@ -21,7 +21,7 @@ IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
 
 DEPEND="
 	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	media-libs/sbc
 	ldac? ( media-libs/libldac )
 	>=net-wireless/bluez-5
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 09dd8b51ce54..866858164f38 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,5 +4,5 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0.ebuild 11562 BLAKE2B ecdb653b3a1f904250c4bdc46ded78e7121baa5355bb0696539f24b1bacc4e64e99f904b0fd3bce55808ecdf41bdf1cb7fe3d4e6fa294cbdb15f0a89f00f7679 SHA512 d4479012eee509cdae9f1d7ff51c09c95b19bd5f0605ed47ce71d6e27e7976cf45342d100af275048cbe39f4f0e9438b76ad3f13cacc6bfefc09fbcfc14896f6
+EBUILD pulseaudio-13.0.ebuild 11530 BLAKE2B 1bf048493de5cb266627873059c8d8f49652c04c9670595790462c52b4426d5ac61ff85112f9739de3f5ee64219eadfb4abe9c3fe7f4ae8584c8e413a15b17ea SHA512 874a0011e1e19f986e4490640f0b4c062c6f54e6f182749f9065b42ffcec7712e078b47f8078763dd050c6ed8bb543aa2f2108e72502f1816518b65288383c9b
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index 1d49d517b5ba..d1ed1d05bf32 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
@@ -99,7 +99,7 @@ DEPEND="${RDEPEND}
 	)
 	dev-libs/libatomic_ops
 	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	system-wide? ( dev-util/unifdef )
 	>=sys-devel/gettext-0.19.3
 "
 # This is a PDEPEND to avoid a circular dep
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 5ccbb72d9812..c21364bfd9c4 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,4 +1,4 @@
 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
-EBUILD pulseeffects-4.7.2.ebuild 1857 BLAKE2B 271656e30d1a20cee60afb5668bb8219db529a6a3ac2892bba566c17001fecce23390ffd85b6586b166a865a274a2066662a7ef385b8ae3d9cc6ce94dadacdae SHA512 4df711ddadacd9a4e35a0c6543e705b2b0fa516efc11d3ac2569ca45fe1c39538f7f4d5425b8a19969b20d95bea248d91cdc16f4413eee3db2724632d14434df
-EBUILD pulseeffects-9999.ebuild 1859 BLAKE2B 7f39b2cdbd52af31357a17ffe3743b60156ddcec2638ce7d298148a14f464238d485eb0fca2aba2171e02c21fd4c6c09ea69acc0104d4779cc912fc0638c6ebc SHA512 d341a24bce7fff28e53cc58132bf10a15bf48e396bd43d0b9bf4fbd8f01b3f8dbd1a5a98ba04bfdafdaa9dd00ef6416b125851acdf2116d8b44db19abb329b12
+EBUILD pulseeffects-4.7.2.ebuild 1851 BLAKE2B f9fd9fedea74089ac7b084329c0c2aa2aaf199ca0ad03b43e48a48922b1f32a7c20cbdfb0cdff88a4ff633cd7f264f5881119852a6a937ec8a7856c76b038804 SHA512 c9411d3498ec572cd7aa6e01a0511a689b9dceb78ee778bc44b27bc4011b073c945b0a050adc98312937fdf70f318735cc6cf41c4aa5b162d41232e9969254a1
+EBUILD pulseeffects-9999.ebuild 1853 BLAKE2B 39c86df9a5b0d56ed0ecf183bf47a7bc28ba4a7f89233249483ea9d49de0b3ff9982f33732b030f810317955f7fcc4fdbec53e8d0675abb42b293d0ddef956f5 SHA512 22100898b102036d3e8359430cac32b6256e97dfdb0284a144c5b89fe7415871da96d349da8724d8be7b70f107c3a6570b2070db242a806b177ece2ec2d00e6b
 MISC metadata.xml 1017 BLAKE2B 82b1cecefd2a2bd6016097e750f8806f6be9e3380b2091aeb1121c250108b974ff3df38494f7136af05c3463eb78acad2a273e0abce431f92c63aca981031d84 SHA512 7f45f2f28593397f78d9b08363fc8757e6e0cae075dc7a1c80eb546666f479b1fc20d20e440937305c87a2d02a081da9ad19403f02114d5f282e65ddc38bc66d
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.2.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.2.ebuild
index 867b66803cf3..112dd9a47361 100644
--- a/media-sound/pulseeffects/pulseeffects-4.7.2.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.7.2.ebuild
@@ -62,11 +62,11 @@ BDEPEND="
 pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_schemas_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	gnome2_gconf_uninstall
 	gnome2_schemas_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index e883396899bb..4ebaa69f9547 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -62,11 +62,11 @@ BDEPEND="
 pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_schemas_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	gnome2_gconf_uninstall
 	gnome2_schemas_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 65cc7f879df4..182a0f2cae77 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,6 +1,4 @@
-DIST qjackctl-0.6.1.tar.gz 955985 BLAKE2B 410acd6ae5b1ff57e63002a2e780dd848b86eabf49916dded8d0f3a877c32668fc6f8643ec853a4805d5cb5dff4fcec1fae782b5d4fa01f45f05978ae7ece045 SHA512 f803cfca1b0f01d08bba0d61c169def928c5b0b5619f7212b4b2aacdc499a88e0def64ad0752f12131b1768e0357d81fb92e0a20151602c1442d90b904b123a2
 DIST qjackctl-0.6.2.tar.gz 1027742 BLAKE2B d2db9e0496223844e3cb289aa8c4ae136011ad36578f3526fd54b44344606e14885d7272bd8e333035b2c908216e60ce2bfe7698c4c8395fd3b017da6b64f03f SHA512 a05f514d749b4f2344c7f0d57a2a0dd1ac6a97f35d0227827e78d3bd7abfbddc3201e2fc7e23f878cd318e408f169a4006a150dc0e43101086e9ba32004e5520
-EBUILD qjackctl-0.6.1.ebuild 1172 BLAKE2B f1a1d7d36f6924fe71d346fd9fc7de7be4fd91b00dd420b6b47b62bbeefcf0ad6f021fcbc9d8e0885437da30df8fef84dd684f1168c132f3dfdc655d3e23b701 SHA512 c3e57d66a72d86db0d02e916e057a0338306f00b03ed1475245811e59d20117a991662e83d9e69bb50ef424928e25f6865adcd5de0aca638255c26bacbcc783b
-EBUILD qjackctl-0.6.2.ebuild 1174 BLAKE2B 5414b4dce71be14d30212e3f512c710cbb354a340442a345ebab4e43b29f421782bb89e6cbdcfdaf98858ad75e626e1e20c7c1349783402aedd80344336068fc SHA512 3af1c9366fb4ad9fce5b9702d6ba11933c2c8b68e9e80b8d9c566d1e15c6df199aadd9156d4ef55b22900ffe4bff31f7c40aba42cebe20235cb11af355f72e49
+EBUILD qjackctl-0.6.2.ebuild 1172 BLAKE2B f1a1d7d36f6924fe71d346fd9fc7de7be4fd91b00dd420b6b47b62bbeefcf0ad6f021fcbc9d8e0885437da30df8fef84dd684f1168c132f3dfdc655d3e23b701 SHA512 c3e57d66a72d86db0d02e916e057a0338306f00b03ed1475245811e59d20117a991662e83d9e69bb50ef424928e25f6865adcd5de0aca638255c26bacbcc783b
 EBUILD qjackctl-9999.ebuild 1226 BLAKE2B 4c340d964561fa9c34635d02220a7139882283ab5cd9a8b4ce0e0f799aea6c0116d2f2d3482f1febb234f7044c63a0dddd8b63da064238f4013f0e81c0f9f0b4 SHA512 f9f277ec117e06a8c1ef8f2210e6943c62141367c1328eb68d25af401749c180d84b4e54b4a8cb027d985415f93698bf6c7e6ad0d422d00107fdbcefdffc90da
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.6.1.ebuild b/media-sound/qjackctl/qjackctl-0.6.1.ebuild
deleted file mode 100644
index f8c94e1fdd3a..000000000000
--- a/media-sound/qjackctl/qjackctl-0.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-	app-arch/gzip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio) \
-		--enable-jack-version
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz"
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qjackctl/qjackctl-0.6.2.ebuild b/media-sound/qjackctl/qjackctl-0.6.2.ebuild
index 0f3e4c1a7218..f8c94e1fdd3a 100644
--- a/media-sound/qjackctl/qjackctl-0.6.2.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="alsa dbus debug portaudio"
 
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 97bafbef0ecc..4f2cb113e45f 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,8 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
-DIST qmmp-1.3.5.tar.bz2 1248522 BLAKE2B f59b948fc2805b376784cef429693bf2d70ba21af8699959a31b74e2c4aad2499927b48f4e5ae6166c9d9f35132418717dff8f3f9d9d447af411d97700932236 SHA512 fbf4173e6dcd78e02ee52e53d80f4477bd840047f96ef8c0bd23f56eec5efa11ac52cc458cfeae65b46cda357b986ba30e1ec4e06d35f4f96cab9a915095d735
-DIST qmmp-1.3.6.tar.bz2 1250131 BLAKE2B ddcce7f55dddfb667c2a2005172c5b8de2f11babb8cd18114099416c1c916048e525262fb25c5e994d0b21b4fa23a308be973bf4cb731e64ee300849700a7d70 SHA512 83600b3116a62200d6751b4c6a526cd0af842b943d8d2979e16803ad788ee826a52a25ac0736f337a8fa739affcba361e6cfd1947c5135aef963d128dcb7e3b9
-EBUILD qmmp-1.3.2-r1.ebuild 4257 BLAKE2B d5b73b6d30e1b01f5a113079b9510852e9f5c83ea4dc7f40f7918adaea36fb27ae7a2f8341e34ca6f4d25b07056c22ac27082c64d21d20c64dd6a44bda1256c4 SHA512 36dbde290c0d57d2481bb79b3f4ae24bc743a01e614ab77c6443a4af82cba716fef9ad9146c6f4d27270658d2d26a13dfc77777e8c565f8d2871758a168d176f
-EBUILD qmmp-1.3.5-r1.ebuild 4231 BLAKE2B 4e016f2ceba435464481b9a8e3efbaa36eaf7f8430cd7367e0aa9a60327848328992ee60abac06a45c847c1945617be4e7ef6355849180d57da73b27319987e3 SHA512 088d02e2695a4d69138d861dc0ed8a38d74ef5c40881bbc4068ecacc190e9912908fffeedbda9277b9b02f6c0582344a8b6d49b2a2607167e55ac54c940cf06f
-EBUILD qmmp-1.3.6-r1.ebuild 4231 BLAKE2B 4e016f2ceba435464481b9a8e3efbaa36eaf7f8430cd7367e0aa9a60327848328992ee60abac06a45c847c1945617be4e7ef6355849180d57da73b27319987e3 SHA512 088d02e2695a4d69138d861dc0ed8a38d74ef5c40881bbc4068ecacc190e9912908fffeedbda9277b9b02f6c0582344a8b6d49b2a2607167e55ac54c940cf06f
-EBUILD qmmp-9999.ebuild 4231 BLAKE2B 4e016f2ceba435464481b9a8e3efbaa36eaf7f8430cd7367e0aa9a60327848328992ee60abac06a45c847c1945617be4e7ef6355849180d57da73b27319987e3 SHA512 088d02e2695a4d69138d861dc0ed8a38d74ef5c40881bbc4068ecacc190e9912908fffeedbda9277b9b02f6c0582344a8b6d49b2a2607167e55ac54c940cf06f
+DIST qmmp-1.3.7.tar.bz2 1250192 BLAKE2B bb94234beefbe44606d8db8cc95bd712b4c766d498c1de0549414b728fd9eb88e238bcffde9a3bd74e75adf106b6bf4fcb120547a83892c0bca8da17bf18f2ee SHA512 a67185fcdc7419c8542e64fd54eea3302dcf44c5d8d0c3b739ce3115b00811733234807460d39585ee57b7e105a52285ee3aafa9f24d86d2af09e881ebf2e068
+DIST qmmp-1.4.0.tar.bz2 1293438 BLAKE2B 9da3a00a31dd0ad03f3405dbae65f55d7b4fbde2a3a030d2cbe8d11ac9b5660754e519aff19431dada792f2ebb02e40fa05e177ad6bedc37e3aa5d7e2a441642 SHA512 b4ae764c223e1ce28477e86493ba409429e191ff51ef11d9b7c4fa356f90e5ff7e390bc8d1dcaf7779b231d59bf668d64000ea196b4020a7255eeb009706643d
+EBUILD qmmp-1.3.2-r1.ebuild 4203 BLAKE2B b2ef63f7fc9f580b9acba8fbb91ceb243a701c23813cbf827a9304700fcc1c2ec2f2ac60d842d55280ee6cef61615f7ed9d19521d7494ee7703e951164f4fa62 SHA512 261846c7d2a4ec4a0d2f10b2aec542deac3ef6f6fc11b606fe880e9c2ff3c0416c6f9e44d0a8e712e7f87e0252ce09bae6f13ec60bbd5f63eb20a01055690046
+EBUILD qmmp-1.3.7.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
+EBUILD qmmp-1.4.0.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
+EBUILD qmmp-9999.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
index 56dd403d4ac0..f11837f77b72 100644
--- a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -51,10 +51,7 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
 	jack? (
diff --git a/media-sound/qmmp/qmmp-1.3.6-r1.ebuild b/media-sound/qmmp/qmmp-1.3.7.ebuild
index 1cb8b262455d..4c02d12db02d 100644
--- a/media-sound/qmmp/qmmp-1.3.6-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.7.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
 	jack? (
diff --git a/media-sound/qmmp/qmmp-1.3.5-r1.ebuild b/media-sound/qmmp/qmmp-1.4.0.ebuild
index 1cb8b262455d..4c02d12db02d 100644
--- a/media-sound/qmmp/qmmp-1.3.5-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.4.0.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
 	jack? (
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 1cb8b262455d..4c02d12db02d 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
 	jack? (
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 4e0e03f030c9..3cff203ab486 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,7 +1,5 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.6.1.tar.gz 337277 BLAKE2B c0f160bc4a1db84a53fb96fe66212b335a07736f6659514a61a20e9d23a95e50bee5818443035095e262f45a38d09b59aff10062cfc121c75a20e2b57a488aef SHA512 597ec51f2f2bc45e717dd6e039d10ace3540c6e7332832cbd36a16fb05b88248a59e5ba107369c8bd66d29060c31d0daef13f4967794e2f7b55c85a64dcd6e0c
 DIST qsynth-0.6.2.tar.gz 383146 BLAKE2B 6e93a1d16dc57ce5cc180932eec049cbd62eb64d6667cbfc748c474fe2b751273ff50a94a5497f1d268e2d413831095bea92a2f086b417625f02fecf1bc6ec9d SHA512 6e6f5dc64c39ab18ad1a9e791376e0dcf6eea4882986b1723a5a2f7c53309ce166d443a198c62b33ac31ed3fc17100c3a4f8e3b1e474b70afcec0ffa7f1ffc08
-EBUILD qsynth-0.6.1.ebuild 1394 BLAKE2B 30f5874938401b92a150b5676dae7ab2005d5c7d6ff59e5c888c17e307f5a5e7c33df68390ab3831b1599d9b0d73556eebea77644d0d79ceed25d0048866c36e SHA512 205f48bca8f7c6803b60eee6cf5601b4de47095f1ec2beea19a1abd9a0dd70fb1af4d887b0fefce9af2f2cb1140d6ada7b27742c64c2d2d23b2d51b98b8c6bdc
-EBUILD qsynth-0.6.2.ebuild 1404 BLAKE2B cbca6d0987a24e3582205d1ef20c085a8c25624df2e64a3d31d8004910bdd3e2967cc332317ecc67b6608697db0751c35bf511b0483e2b52aa77f4d69a6d40e2 SHA512 a7cbd00ab28659b37d3ff33b81313ec34bd938a5ffcb102059b0dae9697329d87383bed02eddc8c21d5e54169488d736405257fa9f7f3e7d8a2f0e78825dd4e8
+EBUILD qsynth-0.6.2.ebuild 1400 BLAKE2B a1cb77b898f94ed280c1ba061bd6af65e7819fbcd204b1c52f6ed712f4b8b997eb1049c692a1b72c8a620eb4dcc118d44d8e42931a9adfab4f0bbab17bb6cf20 SHA512 cc3fa6b94b342d42541cb9b01aacaf349dee2cd9c73fab482c0ee8d78de5cb3dbecd2ca2924c7f6790ab565143690b324352a0bc1e19ca339252f9dec4e83f75
 EBUILD qsynth-9999.ebuild 1444 BLAKE2B 73fe5bb7f1217e209e80faeea59a0d250e49ab51b37bd3597650f3e68b3a84d8f4d1920a959a2a53bef6165175abed55d6ed6015d80b01028892503f82f4fdd4 SHA512 818faed6786b0369fa96d42493c9f99e27f0db9e45d7bfa709a95ff02f99e4712955e98316f19b14a2c309486f71c102db75b7b688c529f6c9ec50711dfb8fc9
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.6.1.ebuild b/media-sound/qsynth/qsynth-0.6.1.ebuild
deleted file mode 100644
index afd6bb7009c6..000000000000
--- a/media-sound/qsynth/qsynth-0.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qsynth/qsynth-0.6.2.ebuild b/media-sound/qsynth/qsynth-0.6.2.ebuild
index 8cf21bfa2aae..c820943f1db3 100644
--- a/media-sound/qsynth/qsynth-0.6.2.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index e3774372ee90..b042a9d94001 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,7 +1,4 @@
 AUX qtractor-0.9.13-dont-compress-manpages.patch 515 BLAKE2B edaa13a27776997913b9f2049d4c607dc622ae721ab03b3265b9e9c2729aac5796c43c8730d61cd1996a246a6752ab99041bbcccac0e3fa5879864c20499d43f SHA512 3a49c5e175e7b64ff0a2d1a791c59a38b44b0f7116d068fe2877e3fd1636259288becda9cb922150a8166ef7df116df6ec34783a750ff4aec3e276d681c05a0a
-AUX qtractor-0.9.4-dont-compress-manpages.patch 801 BLAKE2B 27ee7fd8711b87e8e8b32e3f40ed37c890c072e9d071d2011041af7b4d9bd1c1763f6b0f8326ee3a9e6a780f6abf418d52f8bcc894490adddcac05ef973eb86b SHA512 bd78649eb6f0616a4129d5851c997cc3fa233a86d9b7f98f5685b0999bfd25d536b38b539a9a7b2589d709004bd63042c41eae35fcdaa78167f071b0b8a2e5b9
-DIST qtractor-0.9.12.tar.gz 1893356 BLAKE2B 221062e1557fbfa209a3a55b3eaa8c80a5026886d33bb1c27de2fa410f0ab301bf3323cb7b451e2b326d26c9de9904e19578c02f602aed681fa9100b6124842e SHA512 cdd7414e2b287272164e3876603f4b051f22399e14aeb61c0e8d30a159a146d0028d36463400a239630cb31ba66bcd96302fb522fd8304342e533fd9d420cb2d
 DIST qtractor-0.9.13.tar.gz 1923166 BLAKE2B 2c380c169eb34d7acfd7e4d2594dcaae51fc268fd1ce4a0112752333852b1fd633161a089f451347d14ff1fb06a9971cbc6d9f9f00437a88c4673befe1e11bd3 SHA512 9344a992d315e024aaf4d1e7277665e26085667077835cad0f75682bf2a474877808dbe244680e7fe3a2dd81184c8962d22a58d84ac24402afada2dabcd2b8d4
-EBUILD qtractor-0.9.12.ebuild 1549 BLAKE2B 57a9324b495f76c3be5672c7c958b4fb4128fd4125957c445cb55b52bd9c6e277bd31f3af2f2bca9ecbf05d4dedb7b1aa4133da32740ef7776c6d4a8dcc836ea SHA512 ca3efe3ec38521ed21ecf02447f68e505a383deb3ccb8aed12f2f29e922b4f25117742f7752743a1ee97fe58197a03427bc862f2c22901d1d9e813cbf288f9d5
-EBUILD qtractor-0.9.13.ebuild 1547 BLAKE2B 96f976ae7dbfd2063277d6bf63b73c425a386f5394c6f446ea49218ef69e7d8b62a9170851cc4100c63ecc015d876ef582c2b6d03cb6db85b217bad19c04b263 SHA512 839f7d51c0e9c8648a1dcced994128cbe99ab8be1edaafb6a0f6f06ff67d8082ad1c2c0b570978149529507d8e1edeee6244f487556789a31d0814d3214473a8
+EBUILD qtractor-0.9.13.ebuild 1545 BLAKE2B 0d644eb5ee0de071a1c9ad0e614557399d7ced7f895a48f1f312279a331bdbc9093e93c81ff4c187585dfdc6c77da4741c102b463bebf2eaf0dc9047e12e48dd SHA512 c1476707f35b119671865fecfefdd936c12e9e99050c2c1b247b0a373dfad29520bf8815d9dee027bec6a7e65721122e88620127490faa38ffc95a629beccca9
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/files/qtractor-0.9.4-dont-compress-manpages.patch b/media-sound/qtractor/files/qtractor-0.9.4-dont-compress-manpages.patch
deleted file mode 100644
index aecc2af3f0d7..000000000000
--- a/media-sound/qtractor/files/qtractor-0.9.4-dont-compress-manpages.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cca686b7c058d8ddda94bfa96043d39cce92fe42 Mon Sep 17 00:00:00 2001
-From: Simon van der Veldt <simon.vanderveldt@gmail.com>
-Date: Sun, 10 Feb 2019 16:04:40 +0100
-Subject: [PATCH] Makefile: Don't compress man pages
-
----
- Makefile.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 1364d1ef..a0908aab 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -346,7 +346,6 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
--- 
-2.19.2
-
diff --git a/media-sound/qtractor/qtractor-0.9.12.ebuild b/media-sound/qtractor/qtractor-0.9.12.ebuild
deleted file mode 100644
index 1a712fa3ce0b..000000000000
--- a/media-sound/qtractor/qtractor-0.9.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	>=media-libs/lilv-0.16.0
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.4-dont-compress-manpages.patch"
-)
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--enable-ladspa \
-		--enable-lilv \
-		$(use_enable debug) \
-		$(use_enable aubio libaubio) \
-		$(use_enable dssi) \
-		$(use_enable libsamplerate) \
-		$(use_enable mad libmad) \
-		$(use_enable osc liblo) \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable zlib libz)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
diff --git a/media-sound/qtractor/qtractor-0.9.13.ebuild b/media-sound/qtractor/qtractor-0.9.13.ebuild
index bc0c143c3e97..174c125ccf79 100644
--- a/media-sound/qtractor/qtractor-0.9.13.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 7db9f15dcb0e..4575f81dc12f 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,3 +1,3 @@
 DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
-EBUILD schismtracker-20180810.ebuild 1561 BLAKE2B 1e8699600df0cecc68537ac7d8f55ab8b853ca60c1e50639e7489b35a39e5714947e5e25b41016cf68ca40761128d2865a5d6fa7f6a661bb95cfa48a2726f3d6 SHA512 0cc68fa66cbfeab295863b2637706ef1e6ecdbfa1c438bb3d77f44c58e91eaad24aa6da16a2fcaaa0069c73cbc9c41772aa2fe0adc5b6ebde2877819860f6521
+EBUILD schismtracker-20180810-r1.ebuild 1538 BLAKE2B 45094033db089d5f2b3927596a1c45fa9df319134eb1a7f33daf531d320eeb98431e6732b353985339f543c1c49231131c44739a2d9b2defdef2124e1bdeda26 SHA512 35b7d9ced817c661d9fa3f226f9a35ebab418221af4af7dfb393ea92801e36b2a63c23e3761ff005a0fa5e5e75a271b09b6c45c16f5d7fd73c04d6daaa05341e
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/schismtracker/schismtracker-20180810.ebuild b/media-sound/schismtracker/schismtracker-20180810-r1.ebuild
index 4744ab0d1e18..5c18d760c9f3 100644
--- a/media-sound/schismtracker/schismtracker-20180810.ebuild
+++ b/media-sound/schismtracker/schismtracker-20180810-r1.ebuild
@@ -20,7 +20,6 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXv
-	x11-libs/libXxf86misc
 "
 DEPEND="${RDEPEND}
 	virtual/os-headers
diff --git a/media-sound/spek/Manifest b/media-sound/spek/Manifest
index 0d118f537fb7..0a91d897ecf3 100644
--- a/media-sound/spek/Manifest
+++ b/media-sound/spek/Manifest
@@ -4,5 +4,5 @@ AUX spek-0.8.3-ffmpeg3.patch 1253 BLAKE2B 8111886d4e8fe3a6c7e942c617dbaecc16cf11
 AUX spek-0.8.3-replace-gnu+11-with-c++11.patch 248 BLAKE2B 90872d7bec32e44f4a792fc9c76ee38eb8c9406b1063dd217a8dc97794589a382eed1b34639e849382011f921ccb3b83032700277dd7a4bcb7b09659f14a46f4 SHA512 5bb0ac9970656a03d0c7ab7ddbde59660a0b443ffda59bf3a0e9897d8705f0b49211b8fec52f218c25aa7764d646eb47c489eb7b992bc6f32c7f82382e8d17b3
 AUX spek-0.8.3-stdlib.patch 472 BLAKE2B 3007ae0f366b366b67c3168e9e33cb18a72632e68886f8fcab428cde126c82fb84d7fc7d9b81fd0d8f77f81da49bcfdefd140d31afde4063a0b169d837d658e6 SHA512 d42906e7fbb0707fb8eefc3e3cc19a18c28f4af9b56995cdfa486fd3fab92c11cc313bc3b76fd115e99ada892e3191ff80f33020b0c4cc56fb26a0540b526ea4
 DIST spek-0.8.3.tar.gz 1349573 BLAKE2B ce783c319741c43f27462caf9dcd27e71f4c8fbc9d3a3d2ac0b977189cca4cf8ed14f258958bbf59532c4cae97562fa20819222ae68567e9e607f243a2777000 SHA512 a4b54746316d295574bc963e650728b23b3730ee6bcc8d78b043a5678baac70a0e859870120de2b0e6a17059e9e3757075f4691e2abde98c083afc393e93e17c
-EBUILD spek-0.8.3-r1.ebuild 1146 BLAKE2B 6b2894d1a7768c605297da03a96a9345aa1b865c57f13220f9357d7bd0c1dd36e00b8fb5e58a256286930e00fc45324a9bb522f3b70d459689329f609780fbca SHA512 82acede7bcd11c44d2c86eb9c92e6c75780f99e34db96c928e99f216c218085fd99bb03b06063b320a9cb7fc7832f5371fd9f0f8513fd696c237d26afdcf16d6
+EBUILD spek-0.8.3-r1.ebuild 1086 BLAKE2B 208de5a0476cc3ddeb9a97738700553826347907d709b68209be24e589c713249f5ccc8ea02d0754b9b869680dd46b780545fa2c36ec4f812c1c46209c4f69a3 SHA512 ab10d7964daaae4dda7e3d5e5f84ab81eae3312d0c646301857adc0a521b99b3cb6a34036546c081e20d2d771f66104452e856981ae42c49fff4dc7d6467335a
 MISC metadata.xml 293 BLAKE2B fab72d60cfe06b97698b72a5c6949612f92696a41a1a32077e2d0e544a51c82d8429c0d823f6dc2fbb0ae17dc04a0a8471c2ffc202f1eaf5fbac18004ce1a509 SHA512 737aac30952de1d589f19e6e9643b7ccfff0773b07322efda37e6d18c5dfd4e6845bc938ab2faa605633610a62340f561eb67a5b011562caf153b8bd9f3b603f
diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild b/media-sound/spek/spek-0.8.3-r1.ebuild
index 8c09e95c5562..4c60f5cbe8a1 100644
--- a/media-sound/spek/spek-0.8.3-r1.ebuild
+++ b/media-sound/spek/spek-0.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,11 +13,9 @@ SRC_URI="https://github.com/alexkay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libav"
 
 RDEPEND="
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:0= )
+	media-video/ffmpeg:0=
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 "
 DEPEND="${RDEPEND}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 6eac0bfe7885..b33c78329392 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
-DIST strawberry-0.6.8.tar.xz 9303276 BLAKE2B 852696846d0ce4632fc95482742ca244eda10462577c77d1bc333b3a5dcd0d5e51f6cdaaae0f8c791d2b72c86783a7a183dbde22157b522ff78e25041af73cfb SHA512 1e6ec4802188007b8624705af3ab1a4f48016a174762696e73c3fd23f0d16e88225a72962049819869237f25e630cf6f2cbefa31cec1fe15e415b9aa46e6631d
+DIST strawberry-0.6.10.tar.xz 9283932 BLAKE2B 0625f5b821bc56877b0f0185e8368017d10cf1da9a587e0446b2b6b6130da02022010d6b713c1f74f77af8c14589f900d060b3f1799f65ddaf0609a255acf5c4 SHA512 2495df4b7fafa2c0dfd87aa9ca37372782275db333241c334433a40f8c2e6400e79943a406ac553e8b657d3633d9e59de265088359b9589354b8e9d3d06d3637
 DIST strawberry-0.6.9.tar.xz 9230916 BLAKE2B 39affd38e0df906847d2d26be888d6b3cf2434a160901fb6af2d9dac50cdf9ca128cbe6719f62664174c15bf6e97166d8d97f75dbe78b7e56db71921fe1791bd SHA512 c794800034107e65b2a5e879a284f8ba008605ed8e21cfa5e35cf2e2de86a754142f04673859b3dff32e4a798a8ea675f8db85bdb0b1e09a12bbcf8ea71eb666
-EBUILD strawberry-0.6.8.ebuild 2827 BLAKE2B 73b82b1519762a8199eebdd02250ed34f544b94ada718bdf027154637fecfdc5807868888d93636c23798a1a583d0a97af17e04c5bd89dbf2466bae4f99e9661 SHA512 4a546a1227c3fab5bc7cedd6a1de97382ba233bd8ed9ab79ce77103aea7d088de8a622dd5cebc1d0521351eca458ef14bd4ce9f434875943446ce36f17d41229
+EBUILD strawberry-0.6.10.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6
 EBUILD strawberry-0.6.9.ebuild 2827 BLAKE2B 73b82b1519762a8199eebdd02250ed34f544b94ada718bdf027154637fecfdc5807868888d93636c23798a1a583d0a97af17e04c5bd89dbf2466bae4f99e9661 SHA512 4a546a1227c3fab5bc7cedd6a1de97382ba233bd8ed9ab79ce77103aea7d088de8a622dd5cebc1d0521351eca458ef14bd4ce9f434875943446ce36f17d41229
-EBUILD strawberry-9999.ebuild 2827 BLAKE2B 73b82b1519762a8199eebdd02250ed34f544b94ada718bdf027154637fecfdc5807868888d93636c23798a1a583d0a97af17e04c5bd89dbf2466bae4f99e9661 SHA512 4a546a1227c3fab5bc7cedd6a1de97382ba233bd8ed9ab79ce77103aea7d088de8a622dd5cebc1d0521351eca458ef14bd4ce9f434875943446ce36f17d41229
+EBUILD strawberry-9999.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6
 MISC metadata.xml 448 BLAKE2B b29c1b35e64c59667f04698cb2d1c039fc7557aa7ad99fb1a8625b68d960b0e7af62e016aaf1ec68d5c44c77126f71047b046164c29a0e80d49cdcda0973ca6d SHA512 2c5af38b8518b1de981bae14422bf5931b76831c0b52b1fce29e187d9ceb25a947d8d0f7db1e7844e90ec14657cc8ab484726b31c89667e89d9fcfb6d2e7dfe7
diff --git a/media-sound/strawberry/strawberry-0.6.8.ebuild b/media-sound/strawberry/strawberry-0.6.10.ebuild
index 88653335f0ad..54ca03a40f5c 100644
--- a/media-sound/strawberry/strawberry-0.6.8.ebuild
+++ b/media-sound/strawberry/strawberry-0.6.10.ebuild
@@ -98,6 +98,7 @@ src_configure() {
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
+		-DUSE_SYSTEM_TAGLIB=ON
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 88653335f0ad..54ca03a40f5c 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -98,6 +98,7 @@ src_configure() {
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
+		-DUSE_SYSTEM_TAGLIB=ON
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/subsonic-bin/Manifest b/media-sound/subsonic-bin/Manifest
index 24ed30c3314e..0167c8aa3109 100644
--- a/media-sound/subsonic-bin/Manifest
+++ b/media-sound/subsonic-bin/Manifest
@@ -1,5 +1,5 @@
 AUX subsonic.confd 420 BLAKE2B e7e1b0b6bd33ec62924a015036f3197581749ed74e07359f8ceca68fb6aceb8c63b80e0d195e28345f1f22ff84c826cc5ed362dec75c5c6c36f97fb6de036279 SHA512 2e79c5a6fb12d0b8d4c5107175da8ca65bcc10e42c385b056ba5c5bb4c98c7d9995c391a5bddd726237a1f13bf37d1cbdc48f7fa7b9d3dd1e3aab20a212b00be
 AUX subsonic.initd 1194 BLAKE2B 018257ead2e8c620715404b3ba91ecce53913b7aa554670d1af495b2e1d17abf4ef5b140c62ada2eba0f01589bb43d08320c81c6c93f55f5510b8bcefb02dcff SHA512 7e99eaf2663d346d42e883f3501017e4da565f7b07ef390e370e097d13f4fd039ddccaa761562c2f43c28dbf3ad5c355dbfcef7b4e67ecccf3cd31819c86b14b
 DIST subsonic-5.2.1-standalone.tar.gz 43671795 BLAKE2B 2cf2ff67aaac7dd2ce405d832bfbd1f7dd0a87f4e5698092048891778ebbcac35e70c535a1e2af012655bc49e555ffdcbcfaffea62ad16cd987458e0d30a0135 SHA512 1251b77cfbee80224d3e332945fecec981c79b27c129cb47f5880a82344db15d1f8d17b11dd272a4ad3d9794f4e3055d4a59826623d543b676de73fe1c83b936
-EBUILD subsonic-bin-5.2.1-r1.ebuild 1400 BLAKE2B 893e1d34ca807db0d02b9c54668275c78b52b9bcbec52758f5cff4a38544a2875bfb5202b60b97484797c33c9fde206db15076bc27d0540b0b72feeef76d0cc1 SHA512 6b11a68226344537b38591f5a5778af950021bcafbc3cecc3e9a376df9b327bc8dc1ebfb1a6f970026cd1fd238884ce4f2c2e0528c057551b64ee6836222a855
+EBUILD subsonic-bin-5.2.1-r2.ebuild 1401 BLAKE2B ce5e2c13d283c34a40750451b0953a9eea865e9e8def57debe674ed7dd15db0ce620856312c8b789c92f59f478c9d3492adea0fcb355fa040f65a2978b8a748b SHA512 8525043fa0a9f94f8a360133cbe4dbe5f9d709f22605a068dcd330afe11b7adc53ef0aa7067c3eaef890ea18270beb9c08d3b0006905cf357eca8e4c5c9b1b44
 MISC metadata.xml 325 BLAKE2B 031eefbb5a58dcfdeca52016a4db3ffee06a097db0604cf95079f00e5897f13f25b12d6e9d5cb7d6e25bda3a41a230fa98d40d18c6a4acc5eaffe69423d25529 SHA512 f6fe0547df26e6c4f94b6b1e915a51731fa3d6f565c71adc64f2fc3d858dc67d4664e46fbb654fa982bf0ba5915d673e0891f20aabfaadc84c0df2c44df46865
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
index 7c7c9f760f5d..1fe06db06e55 100644
--- a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ IUSE="ffmpeg lame selinux"
 DEPEND=""
 RDEPEND="virtual/jre
 	lame? ( media-sound/lame )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	selinux? ( sec-policy/selinux-subsonic )"
 
 S="${WORKDIR}/"
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index af56ff8dcb9e..9583214c25f7 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,8 +1,8 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.3.2.run 95632176 BLAKE2B b1a418e6af6c364050a532063b3129e27d03ac36ec325ab5f2044896f5eae02fb4a251e71b23bc125d41f169aa35d8dde340b333a67b845ebaca7faefa49fe70 SHA512 1dd8912120ba0e9e84849fd793d54aee56e98396f6228a4bcec5c79485b9902398eeefb8f276abd46bbe627e7bd3c8fc5d740d05807342f837ac226f475510d7
-DIST TeamSpeak3-Client-linux_amd64-3.5.2.run 97442376 BLAKE2B 45d187b5dcf702edd6e651d82183611731e73c9d40c0e97209f29ea8b705339b3a0e67e3d78237a5dbd818da90b7716e407ecc00c5e8f3419d42b32dc16870ea SHA512 5b9263e11a346e572635a944e5be97fa0e2872d52403eb6b3a742e33be3e4d7c7524cb33b87da46a30ad36df76ee7655369540254a14df7ed6e12cbf9de98b15
+DIST TeamSpeak3-Client-linux_amd64-3.5.3.run 97454216 BLAKE2B 228542b7b5169bd4bc86f320f7d9b4e099d088db9bb5c944b7b1e9d029b8c505a50447468fb02bb2b5e34c0f3a4e088a1af2bab466a7ec71e128541fabe9b562 SHA512 8b0ea835b179596ec16c092790383691650f6cb92b97d4ab2012872edc2f4d82e0b3a3ea4551651c4824703b9ef01ba9c95a50ee262d5f279151d780dc3faef6
 DIST TeamSpeak3-Client-linux_x86-3.3.2.run 94323084 BLAKE2B f3b0317e8cbc7143d9814a52c8a8c9cd04aa012a40172aca59e6d4db956a19ae5752bffa102f06e34ad0dd5b211082e00ca06056c05a4a2dbbd8adfd76a0c0e7 SHA512 56b7b231ffa5195418823da435fd4daef2cbdbc653d3cfd328f60881a1370b9dd6f99479e9093216d0768ddb04bdd6c6cf1a7019d836abd89806518eeee23496
-DIST TeamSpeak3-Client-linux_x86-3.5.2.run 95930692 BLAKE2B 6180e8f9f554665700e2a8401f773e6994e5806870b1fcfafac015fac8e2d993a45cd7797e9d65e52f4172af68c2e4a155c9214956f5dceeb32be8013cac9825 SHA512 17357f570b47325568f86cfebda94eb2c8987d9c0b3f931680de3fe2e1ba256f3035883c1237ba066e8fe89affc495cc7560cf8bf5b6dacd389943d5c6b298f6
+DIST TeamSpeak3-Client-linux_x86-3.5.3.run 95939656 BLAKE2B 5aec52b4461d45cd19947e3f87729a40bca23bc78d45565bad59a1f11b437e253f0bf073ad32ca1a43396b8bcf47794d0efb0673ec0b7314e3dd5c2a0dcdb140 SHA512 54a6d7ad03a357a78be71710e7878b9b5c0a54d175bf4242a35ba82df1abfa692dc4d4c921099677c5d163caf18b68db73a87b8637b216ef5c72eaa25b6deab7
 EBUILD teamspeak-client-3.3.2-r1.ebuild 2535 BLAKE2B 41d4f8d3565b4d6801b1619adc2c32b120f33ba8d7b3b0ce1206371c93797d29da7849d0c100c4d8d85d144e759e88db0488def3a65668a7a5d8c5b235f19414 SHA512 ef5f3594fc6c8ebf6febb80b3fc3bfda2b45a4d6b318e4640f5c0ffe4450412a3081c9fa2836547da1fab4d51f2ea000472038a6ed6048529d6410bb737ba963
-EBUILD teamspeak-client-3.5.2.ebuild 2884 BLAKE2B 2341c038f6dead7ab1e309c13bc5d99d3cc20a96f6feb6ac76c1a7ba0da8b4d97ea2071087ddb212cce24daa669e95a3a61de69c57830bc83411687f75f6de1e SHA512 e03383cc17feaee129e86a291c42c5674739ae806a7bdd6d2d49f73236dedb71763e9e668a7f65bc5a0eaf5ef18b183ab2bf585e7d4bef36ac65d2789f88bce2
+EBUILD teamspeak-client-3.5.3.ebuild 2884 BLAKE2B 2341c038f6dead7ab1e309c13bc5d99d3cc20a96f6feb6ac76c1a7ba0da8b4d97ea2071087ddb212cce24daa669e95a3a61de69c57830bc83411687f75f6de1e SHA512 e03383cc17feaee129e86a291c42c5674739ae806a7bdd6d2d49f73236dedb71763e9e668a7f65bc5a0eaf5ef18b183ab2bf585e7d4bef36ac65d2789f88bce2
 MISC metadata.xml 637 BLAKE2B 996d3156ecf21c789e3a7017d7922f7fae257722021bc4ff968ec3c9863df61f9631fe83e3482781f78ede7b91f2138b4510473d8654063347037031812758fe SHA512 934068091ef8dce4652021965a99d50c4df0a426a7a1d1f26adeca776a73e7f1150d976bf44b704905aa0877d8844dd5d53bfa71279f5126e00dec924f3afc5f
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.2.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild
index 8a98c0de7a5b..8a98c0de7a5b 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.2.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 9c1aaaac0477..7e04b031da1c 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,5 +1,6 @@
 AUX tomahawk-0.9.0_pre20181030-cmakepolicy.patch 926 BLAKE2B 8af469b6186e57db674dc5acaec6032bf43c15d91b5db9a9bf30f617c47b74486149a50774c76eb69bf89157e1ee8eed0d449b9d107e4f8e7e376f9d9d4f9d29 SHA512 7d0c98a6f1708d156ab643439faf3f469fa21a106f618dc1b8b7c569a2f65a9c929670bc1aa679eebf1116e615fd832593116f84e3abe5fff3d91450e1455f21
 AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
+AUX tomahawk-0.9.0_pre20181030-qt-5.15.patch 4668 BLAKE2B 40c40daa9079f1695234dff83102087ab3eaa26ef6b084df36fc2040e9f23d69296a452e3d263a6e7fd902c78f62f2ae12a15ae181b8ff8848e4db0542df3462 SHA512 e5dbef2b9cf042576565ca16fd278778847af1657bf22d9c27cb177b5ba20fbc492f6769cc661657dbfc23bbfde66399f42a657c2fbea2c91d87216b921da8bd
 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
-EBUILD tomahawk-0.9.0_pre20181030.ebuild 1782 BLAKE2B 0bf943a9e5eacbb90e01f4986870e1c55fe53aa88e9e94213aaa66f6a512cafe3f5d7118821bfb519eed421c9ebf0c972e03f4e11e72145f5a51ddee137112ed SHA512 7c9ac54104f2f81f356785957c2b92e369b031109469d5800b8288fd297a3787f12a5b3159d966076440e8f8c7a4b6371f66a646fc9b43d00fad8a2c58b48ef1
+EBUILD tomahawk-0.9.0_pre20181030.ebuild 1835 BLAKE2B 077307ceebcaeb6c3db3c5b1b2534528435dd6a5f58e94fdd4777546cec9bcebd095fe659d3096ee380ee7539faa5f06ba1fd227fbb56f5bbc0a24f9e72380b0 SHA512 780432d7b50209b140281db8329b4cdfa9409e87285fbbb57e66c1881f5816e498579713abbc29c6864538945a05abcbd2e55971c2b1a70429424e4219c27b35
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
new file mode 100644
index 000000000000..f07b746a03f7
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
@@ -0,0 +1,140 @@
+From 4fb44c931be648d61ef3c8d10426b34de1b2a53b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 8 May 2020 23:55:43 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath)
+
+---
+ src/libtomahawk/utils/AnimatedSpinner.cpp               | 1 +
+ src/libtomahawk/utils/TomahawkUtilsGui.cpp              | 1 +
+ src/libtomahawk/widgets/DropDownButton.cpp              | 2 ++
+ src/libtomahawk/widgets/HoverControls.cpp               | 1 +
+ src/libtomahawk/widgets/SourceTreePopupDialog.cpp       | 1 +
+ src/libtomahawk/widgets/searchlineedit/SearchButton.cpp | 9 +++++----
+ src/tomahawk/widgets/AccountsPopupWidget.cpp            | 1 +
+ src/tomahawk/widgets/SlideSwitchButton.cpp              | 1 +
+ src/tomahawk/widgets/SocialWidget.cpp                   | 3 ++-
+ 9 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/libtomahawk/utils/AnimatedSpinner.cpp b/src/libtomahawk/utils/AnimatedSpinner.cpp
+index b4778cbe9..a705cfaa2 100644
+--- a/src/libtomahawk/utils/AnimatedSpinner.cpp
++++ b/src/libtomahawk/utils/AnimatedSpinner.cpp
+@@ -28,6 +28,7 @@
+ #include <QApplication>
+ #include <QHideEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QShowEvent>
+ 
+diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+index b35799723..d2733d4a7 100644
+--- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
++++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <QLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QBitmap>
+ #include <QPalette>
+diff --git a/src/libtomahawk/widgets/DropDownButton.cpp b/src/libtomahawk/widgets/DropDownButton.cpp
+index 74aa344d1..106e8b882 100644
+--- a/src/libtomahawk/widgets/DropDownButton.cpp
++++ b/src/libtomahawk/widgets/DropDownButton.cpp
+@@ -19,6 +19,8 @@
+ #include "DropDownButton.h"
+ 
+ #include <QMouseEvent>
++#include <QPaintEvent>
++#include <QPainterPath>
+ 
+ #include "Artist.h"
+ #include "Album.h"
+diff --git a/src/libtomahawk/widgets/HoverControls.cpp b/src/libtomahawk/widgets/HoverControls.cpp
+index 3e31bf236..0b6b20aa8 100644
+--- a/src/libtomahawk/widgets/HoverControls.cpp
++++ b/src/libtomahawk/widgets/HoverControls.cpp
+@@ -27,6 +27,7 @@
+ #include <QPixmap>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ using namespace Tomahawk;
+ 
+diff --git a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+index 807eb354a..1379c9c53 100644
+--- a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
++++ b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+@@ -22,6 +22,7 @@
+ #include <QApplication>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDialogButtonBox>
+ #include <QVBoxLayout>
+ #include <QHBoxLayout>
+diff --git a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
+index 1d9f1c4bd..97c5406f2 100644
+--- a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
++++ b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
+@@ -19,10 +19,11 @@
+ 
+ #include "SearchButton.h"
+ 
+-#include <qcompleter.h>
+-#include <qevent.h>
+-#include <qlineedit.h>
+-#include <qpainter.h>
++#include <QCompleter>
++#include <QEvent>
++#include <QLineEdit>
++#include <QPainter>
++#include <QPainterPath>
+ 
+ SearchButton::SearchButton(QWidget *parent)
+     : QAbstractButton(parent)
+diff --git a/src/tomahawk/widgets/AccountsPopupWidget.cpp b/src/tomahawk/widgets/AccountsPopupWidget.cpp
+index cb5739b97..ffd5dcaa1 100644
+--- a/src/tomahawk/widgets/AccountsPopupWidget.cpp
++++ b/src/tomahawk/widgets/AccountsPopupWidget.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QVBoxLayout>
+ 
+diff --git a/src/tomahawk/widgets/SlideSwitchButton.cpp b/src/tomahawk/widgets/SlideSwitchButton.cpp
+index 3c61b4987..103562e00 100644
+--- a/src/tomahawk/widgets/SlideSwitchButton.cpp
++++ b/src/tomahawk/widgets/SlideSwitchButton.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPropertyAnimation>
+ #include <QStyleOptionButton>
+ #include <QPixmap>
+diff --git a/src/tomahawk/widgets/SocialWidget.cpp b/src/tomahawk/widgets/SocialWidget.cpp
+index f0901279d..b43f44c5d 100644
+--- a/src/tomahawk/widgets/SocialWidget.cpp
++++ b/src/tomahawk/widgets/SocialWidget.cpp
+@@ -29,8 +29,9 @@
+ #include "Source.h"
+ #include "Track.h"
+ 
+-#include <QPainter>
+ #include <QDialog>
++#include <QPainter>
++#include <QPainterPath>
+ #include <QPropertyAnimation>
+ 
+ #define ARROW_HEIGHT 6
+-- 
+2.26.2
+
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index fca16414dfb9..e3e201984d00 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Multi-source social music player"
 HOMEPAGE="https://github.com/tomahawk-player/tomahawk"
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="telepathy xmpp"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -44,7 +47,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/designer:5
-	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 "
 RDEPEND="${COMMON_DEPEND}
@@ -56,6 +58,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-warning.patch"
 	"${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
+	"${FILESDIR}/${P}-qt-5.15.patch" # pending upstream
 )
 
 src_configure() {
@@ -70,7 +73,7 @@ src_configure() {
 
 	[[ ${PV} != *9999* ]] && mycmakeargs+=( -DBUILD_RELEASE=ON )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 9cfbd0e7157b..fce1e35755b9 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -10,6 +10,6 @@ AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd0
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r5.ebuild 7807 BLAKE2B 7226cdca97888fc127daa09523d28254f891ca164d3a536121f1ff03b5cfd5eb1413e7a6c32d6c8c3b57431aff3c6b9ae8ed0251f9a9271086d17f133cf330a9 SHA512 2ac2878fac8d408723a932370fbad67fb80e52e24377da52ebd419a2bcf2ff198661745baa8a973a28dc36f2b58eea90c0802bc8ffe047833abdabc13e307bcb
-EBUILD xmms2-0.8_p20161122-r7.ebuild 8165 BLAKE2B bbc7b4da88dde76b360e50e24cba271d9873b1f1b3932456754ff82975f3336569f787f1388a63c67f81a3fbaf5064e14669ce249818d50a5a2c392067f5360f SHA512 d75f76538907d9712d187b8c0356545d914e6d6c546c06a0a9fe3670649d4b55916cf30fec65fe9991bde6d97fd6110eb31fd982540ffe9b5f2b76578045c1b4
+EBUILD xmms2-0.8_p20161122-r6.ebuild 7815 BLAKE2B 5f60d7c75e3f1e0db53c469889fbd934bba8d0be498a9276f2012afcb79a555f9f8eb9276accbf6c708b6d55b622811128bc507655576f3989fd203c516d3601 SHA512 e59b7e71e352cf7652cf9fea7b7eb4b9a13c89e8a0f7085b3fbd3e3df5dadcb9d8a6206b00a686f4d628c3cd5e7af1d3de6cfe73de14ff86e437c97573196f4b
+EBUILD xmms2-0.8_p20161122-r8.ebuild 8170 BLAKE2B 3e5e02ad808b681fda322ca7bb0875b87f35f928dc3ee5cc554de40104600fa68036aae7e2cdb45d320ec402aefac6ffc1c1d6cd67c6ef741bf662d718c2348b SHA512 08f48db27dda98828970be93b6d68c8d45d2b6fe8b7681ec3f52747d4885efb18d131a8bdd3f111b4add507878569c38c9a89d14a5f14ccaabcf6bb25e138b43
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild
index 02abc016bbf9..02e40789baa4 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild
@@ -36,7 +36,7 @@ RDEPEND="server? (
 			>=media-libs/libdiscid-0.1.1
 			>=media-sound/cdparanoia-3.9.8 )
 		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( virtual/ffmpeg )
+		ffmpeg? ( media-video/ffmpeg )
 		flac? ( media-libs/flac )
 		fluidsynth? ( media-sound/fluidsynth )
 		ices? ( media-libs/libogg
@@ -44,7 +44,7 @@ RDEPEND="server? (
 			media-libs/libvorbis )
 		jack? ( virtual/jack )
 		mac? ( media-sound/mac )
-		mms? ( virtual/ffmpeg
+		mms? ( media-video/ffmpeg
 			>=media-libs/libmms-0.3 )
 		modplug? ( media-libs/libmodplug )
 		mad? ( media-libs/libmad )
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r7.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
index 88101be578c0..76112766d786 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r7.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2
 LICENSE="GPL-2 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
 
 IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
 jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
@@ -38,7 +38,7 @@ RDEPEND="server? (
 			>=media-libs/libdiscid-0.1.1
 			>=media-sound/cdparanoia-3.9.8 )
 		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( virtual/ffmpeg )
+		ffmpeg? ( media-video/ffmpeg )
 		flac? ( media-libs/flac )
 		fluidsynth? ( media-sound/fluidsynth )
 		ices? ( media-libs/libogg
@@ -46,7 +46,7 @@ RDEPEND="server? (
 			media-libs/libvorbis )
 		jack? ( virtual/jack )
 		mac? ( media-sound/mac )
-		mms? ( virtual/ffmpeg
+		mms? ( media-video/ffmpeg
 			>=media-libs/libmms-0.3 )
 		modplug? ( media-libs/libmodplug )
 		mad? ( media-libs/libmad )
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
index 541633c94912..75f2c93b3a51 100644
--- a/media-sound/xnoise/Manifest
+++ b/media-sound/xnoise/Manifest
@@ -1,4 +1,4 @@
 AUX xnoise-0.2.21-QA-fix-desktop-file.patch 1054 BLAKE2B b5d218b4657a440407e8a4fd83e553959abdf2c92979fe1fcd27499fa8f5eeea46f97b41d3eb98f158ee5cb085b94be13b84dacac8afe9afd9e71e71c3993466 SHA512 b8849ae122ee54c47c5d703cddfa86f0abb141fe997f1a37d5a3692bb3d5cddc0a86cc57865f4535cc5787863914fc38ce32762d2a1058646ed5b4f4226ec06b
 DIST xnoise-0.2.21.tar.gz 3222030 BLAKE2B c58561f4e042ccf7d7fdeb271801ccc2d447138cf5c1afb2f8f0bb098135d957aa289799e59f2c96a76a01ccfeeb9574d87f0d987b1e3ace9d22a3ced8ec88b9 SHA512 e25f42795638a5b93f1922f1c761b0bdaf754414dfa0f7172407e0d10514c52844d0dc3146a32f93e6107a0b5bb0f8e9e5d098954e9659f28177c56f607d9851
-EBUILD xnoise-0.2.21.ebuild 1376 BLAKE2B a56406977f172b7e9c41cff403d714036060cfe74313738e451c9414215f38241d0ed54063037014d1fa7ef63bb7a8c00d326a2760ac7313188f863bb9eeee63 SHA512 40108cc0ee2d95740788081030bfdef0227852c60393181d8e109b167cd14e13cd5225b1240c06fbcc9b2927f15ed1e199d7806c4196e60016b4f66d028dbce7
+EBUILD xnoise-0.2.21.ebuild 1378 BLAKE2B 1136d83a77a7bc821e39e67458ecf841166ef9fa4eafebadb8f84f75888f5cc6fabe4dd4b6ba37094ed8ec2dedbc1bfb3b188d81d10f209fc657bd8563be2662 SHA512 b5dd4842a699ad44ab2d5cf8c58c20efb6011b67407f79ab00b708e0860509d5e5bfdbb93b10d0b9f03b590051bc25beb0f83a741ebd174a5dcd4b9c279fad83
 MISC metadata.xml 507 BLAKE2B 45efdf6c0fab90d05dfcc0f601d2de99bce91a80539b6a50a5bfdaf2d64f6f808843f90817144efa6c6dc5f47ebd9427d4fdcf283e1189fd814bd1e72d20c395 SHA512 06e64ff5b075eb264ebfea8d77a95cdcf901e08df501abcdf4383dca64314185abc0d539df5d306e83bc4e26488ae8182cbd5c21cb39cf8314d70f070463b446
diff --git a/media-sound/xnoise/xnoise-0.2.21.ebuild b/media-sound/xnoise/xnoise-0.2.21.ebuild
index facda46f48f5..b91eefbc5398 100644
--- a/media-sound/xnoise/xnoise-0.2.21.ebuild
+++ b/media-sound/xnoise/xnoise-0.2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.bitbucket.org/shuerhaaken/${PN}/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="ayatana +lastfm +lyrics"
+IUSE="appindicator +lastfm +lyrics"
 
 RDEPEND="
 	dev-db/sqlite:3=
@@ -25,7 +25,7 @@ RDEPEND="
 	x11-libs/cairo:=
 	x11-libs/gtk+:3
 	x11-libs/libX11
-	ayatana? ( dev-libs/libappindicator:3= )
+	appindicator? ( dev-libs/libappindicator:3= )
 	lastfm? ( net-libs/libsoup:2.4= )
 	lyrics? (
 		net-libs/libsoup:2.4=
@@ -45,7 +45,7 @@ src_configure() {
 		--enable-mediakeys \
 		--enable-mpris \
 		--enable-soundmenu2 \
-		$(use_enable ayatana appindicator) \
+		$(use_enable appindicator) \
 		$(use_enable lastfm) \
 		$(use_enable lyrics lyricwiki) \
 		$(use_enable lyrics chartlyrics) \
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 21a3ace3644c..1a093fe03dc3 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,4 +1,4 @@
 AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2
 DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015
-EBUILD xwax-1.6.ebuild 2013 BLAKE2B 35fcc442e492915c638bcafdb8aa37aa36eb8ad8ccb0e041ced1d29ca1b9b1f5c91754964bbd3cff11ae1ee94fa99eca75de4a6bbc6068df12df256fbcd7ff28 SHA512 4f66c73398a5d969d762aee2875454071383263e2d68c9cc8425e493acc495df805d3b76695432ef2bb1eedb7e7eaff09f85526ee9de73cbab92a2fbac5be06d
+EBUILD xwax-1.6-r1.ebuild 2017 BLAKE2B a1f9f5f24da4ea048258726735124962e479fe049e33156657a9a29674d7416e1ad495f3b211522a5c6032d14a2b9519c2a74654f88fb23bc00e4544e539d49a SHA512 dfdb53177359f6f5a02c5a6ee1f776ce6f7cdcbc8f2bafb60cc552fcccefc3c7c6083af0982ab19113b4981c2995c29763847ece04490d68c3f6dc0c366b75ac
 MISC metadata.xml 803 BLAKE2B fe59d8229f2f7189451f99e0f4da36fbc0f2b39f04d152f927b7f6822fdb9160c570daa82c6d7d8e85dd0c9bac44e50f759334e9c5a547b224f52ea0cdb2bb84 SHA512 9d15deede88ee114e0ade78665996cfaf09443f8629b08415ae0bd1c486ff6a239567056aacde2d49883066d4d8dc3690a397d170effbfe5e4aa5cf7d24cbca8
diff --git a/media-sound/xwax/xwax-1.6.ebuild b/media-sound/xwax/xwax-1.6-r1.ebuild
index fe9164967149..174693166a4c 100644
--- a/media-sound/xwax/xwax-1.6.ebuild
+++ b/media-sound/xwax/xwax-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ DEPEND="
 	sys-libs/pam
 	alsa? ( media-libs/alsa-lib )
 	cdda? ( media-sound/cdparanoia )
-	fallback? ( virtual/ffmpeg )
+	fallback? ( media-video/ffmpeg )
 	jack? ( media-sound/jack-audio-connection-kit )
 	mp3? ( media-sound/mpg123 )
 "
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 8bb93109bceb..a1d3f32750a7 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,5 @@
 DIST yoshimi-1.7.0.1.tar.gz 9987526 BLAKE2B e1793b0515fce39a62288f61fda0028c1683080c276b451f2cc67edd617ed2d25d408d3571ac56e8a7d6a4fd537719ba517b4faef969810520fc8af3aee013de SHA512 d403ca3f54a0c8eb27a1f4ea3bf90ab0fd8041b864259c94b0970b24b50b79fc84ea623af2981a1b00e65ebdd3f9ceeb0b5f04c64f62e5694aa55b31bb8390ce
-EBUILD yoshimi-1.7.0.1.ebuild 1032 BLAKE2B 61e247d835af7733a1bfa0d8e7a2a3011c5c2c7b6384c0ca5613992a769492b7aee994af3208378fd465f0580984504b990b87a02dbfb7154e120ee9fe05b0d4 SHA512 7224d8385a5feb36ec7dfbf62ee6b2b8f4bac15139174ac0766008c5c89c4c650d720d7553848da18f3c7ac3d181c6adf423208ee887d02e8df2f32ce5ffe2a7
+DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
+EBUILD yoshimi-1.7.0.1.ebuild 1030 BLAKE2B e286e7db79f8595f94e0c26b0ca2e94f3a943b52e3f4279fce98761066b37749e8b896df65cf99bac91447bd1fa1d2c28cf3ad552b331daef08b179ae1e14bae SHA512 f1227911ac91c486653db9ee7dcb882d0217aec1cd42eb159dad628aedf99d9bafd61ad293dd20c40c26c731d37ea2940ebbbfb979c4420790daa6ce15616116
+EBUILD yoshimi-1.7.1.ebuild 1032 BLAKE2B 61e247d835af7733a1bfa0d8e7a2a3011c5c2c7b6384c0ca5613992a769492b7aee994af3208378fd465f0580984504b990b87a02dbfb7154e120ee9fe05b0d4 SHA512 7224d8385a5feb36ec7dfbf62ee6b2b8f4bac15139174ac0766008c5c89c4c650d720d7553848da18f3c7ac3d181c6adf423208ee887d02e8df2f32ce5ffe2a7
 MISC metadata.xml 1650 BLAKE2B 1581b61fd8129d530dd164a50aa38a9621d947cd42b1a6c0c41924e7539c44f38c30f2e91d440a094b878c2f5db720c71de4df93f378061e0db2063419477021 SHA512 eec6c334d5c7ad11741c6318cea8374d2b46b2700372b1eebed66e1808a819794029d0d13306b8b5d7df3d7830569f8f76188dfb502eb1df4f668f1c21e4d152
diff --git a/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
index e4c00e99a9c0..d9faf9344bfe 100644
--- a/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/yoshimi/yoshimi-1.7.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1.ebuild
new file mode 100644
index 000000000000..e4c00e99a9c0
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg flag-o-matic
+
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>=dev-libs/mxml-2.5
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/jack
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_USE_DIR="${WORKDIR}/${P}/src"
+
+DOCS=( Changelog README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
+}
+
+src_configure() {
+	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
+	cmake_src_configure
+}
+src_install() {
+	cmake_src_install
+	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
commit	deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree	9a48f42594e1a9e6b2020d5535a784314434d7a7 /media-sound
parent	38423c67c8a23f6a1bc42038193182e2da3116eb (diff)