gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /media-sound
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
82 files changed, 557 insertions, 1257 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c94c7292541d..b2fadacfa627 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
deleted file mode 100644
index 495b64576e5a..000000000000
--- a/media-sound/adplay/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX adplay-1.7-fix-c++14.patch 615 BLAKE2B d6e3a8f50257a7c6dcf3d058c7637645f7ff2cb0812998aefc0d912cc46c38244eb532820374ddf7fa4b2e80b37729b16149f116311ebd1238183c068ee101a3 SHA512 aa18046f09493ae98ea2bfa6b2f3b39a4ccc8e24c5dbf584a90765b8962dbc6b037100844d0ad63b57e1ff60e78b45cc02dc10c9ca374d661d6caa87abfcd5ec
-DIST adplay-1.7.tar.bz2 264340 BLAKE2B ea9231c66a8233ee1d026bccd073440cbbc0e8868469aee33ec0e18c7d893fa24dd20bb4fe960f908db0666e7ee5c6a4afd14051b851b011418796cc0cc2c939 SHA512 854a9bee1057d3a42308d9149e74a8abae0b6bdfda5e1466086df9d6aeed4bbc92a045bca02917fc699b43195572b39c6316ddf56ee3441add1a01d6cbbdfcbe
-DIST adplay-1.8.tar.bz2 333582 BLAKE2B e5d0e3baf3f37adb1a2f42eee368fbbcb3947b0c651415b60d5f1d648d004789eae0ef75b7e6ac8ad9f90ac9941332e713e36555167648a40a871659083d1b59 SHA512 6a82b10fa73ad9317303da03d2fcb1fa97772d850f3f78f53c554b9daaa9ae5d04bc2f0a1b1d25fd5d3a1eab073641d6fa0589070721612987d57762f03363c7
-EBUILD adplay-1.7.ebuild 749 BLAKE2B 10c474d7f9f47f00ca55b3cd32568c5387156671f64943cbde06f98dd7694417e26ab3801fa1627b6cad0a5d7e730a1bf18646f26f0225ee48363ab18c9a3b9c SHA512 b54d9e6672fbe0cd86fe86fc33bda8159e016c9a8d06198b4a0dd0a42dd2651ebfe13421e16de3d655c89ae2d319cd0309c2faddec12bb3102a2ad832a2a4a56
-EBUILD adplay-1.8.ebuild 725 BLAKE2B debd4c46c2a3c24ad521160601133526de195480c9d2e19f9f45763a313250ee8d0cb292b41f09a734f8afbdd5ae481c11bed0d32a10d27ede1495895f07e1ef SHA512 76eb8711f41e7a83e18e35d923fd66751fdf7949184b37e865c0949ca8f3e7808b4fc0bb146052541842387494c7fe8393d42228c0cef4a48a254ce310bc1498
-MISC metadata.xml 387 BLAKE2B e8dec98b4529ad29a4254bd8bb45b79264ec513b5d5b6368fa00c6755842835e84cd7b709ff884abe892656ee38d1c2640a884b9936876fb5b01ae3371c9e41e SHA512 98c5710d7d8677c0e6152d5ab7ca43b835aa6a8718352047c3424907e390662d714a6083a80cfc6b502c8d504d666deadeb20a917d8ace168411247e531d8af4
diff --git a/media-sound/adplay/adplay-1.7.ebuild b/media-sound/adplay/adplay-1.7.ebuild
deleted file mode 100644
index f74ad97918ce..000000000000
--- a/media-sound/adplay/adplay-1.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A console player for AdLib music"
-HOMEPAGE="http://adplug.sourceforge.net"
-SRC_URI="mirror://sourceforge/adplug/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa ao oss sdl"
-
-RDEPEND=">=media-libs/adplug-2.2.1
-	dev-cpp/libbinio
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/${PN}-1.7-fix-c++14.patch" )
-
-src_configure() {
-	econf \
-		--disable-output-esound \
-		$(use_enable alsa output-alsa) \
-		$(use_enable ao output-ao) \
-		$(use_enable oss output-oss) \
-		$(use_enable sdl output-sdl)
-}
diff --git a/media-sound/adplay/adplay-1.8.ebuild b/media-sound/adplay/adplay-1.8.ebuild
deleted file mode 100644
index 8803bc8d8db7..000000000000
--- a/media-sound/adplay/adplay-1.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A console player for AdLib music"
-HOMEPAGE="https://adplug.github.io/"
-SRC_URI="https://github.com/adplug/adplay-unix/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa ao oss sdl"
-
-RDEPEND=">=media-libs/adplug-2.2.1
-	dev-cpp/libbinio
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-output-esound \
-		$(use_enable alsa output-alsa) \
-		$(use_enable ao output-ao) \
-		$(use_enable oss output-oss) \
-		$(use_enable sdl output-sdl)
-}
diff --git a/media-sound/adplay/files/adplay-1.7-fix-c++14.patch b/media-sound/adplay/files/adplay-1.7-fix-c++14.patch
deleted file mode 100644
index aedbbc0ab1c5..000000000000
--- a/media-sound/adplay/files/adplay-1.7-fix-c++14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 48dcaa87ff91369eb41998abd72e226fe138b528 Mon Sep 17 00:00:00 2001
-From: Adam Nielsen <malvineous@shikadi.net>
-Date: Sun, 22 May 2016 08:49:47 +1000
-Subject: [PATCH] Cast -1 to unsigned int to prevent compiler error
-
----
- src/adplay.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/adplay.cc b/src/adplay.cc
-index d73ec25..da00730 100644
---- a/src/adplay.cc
-+++ b/src/adplay.cc
-@@ -90,7 +90,7 @@ static struct {
-   1, 16, 0,  // Else default to mono (until stereo w/ single OPL is fixed)
- #endif
-   MSG_NOTE,
--  -1,
-+  (unsigned int)-1,
-   NULL,
-   NULL,
-   true, false, false, false,
diff --git a/media-sound/adplay/metadata.xml b/media-sound/adplay/metadata.xml
deleted file mode 100644
index dc329baaf1bf..000000000000
--- a/media-sound/adplay/metadata.xml
+++ /dev/null
@@ -1,12 +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">adplug</remote-id>
-		<remote-id type="github">adplug/adplay-unix</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 9fb45bbf5b97..b2144f67422f 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,8 +1,6 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
-DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd249e58992e5b403e8948b0fa81c4b3b86cc4872f4dcb7a0fadf9cb313043201549b10f3a36d546911bba18fe9fc3602 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87
-DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75cb6838c407586b52144963350d51271fb500e627e152d05d1c586c337c70fc839072094e0492a0a1b160d6876ccedeb SHA512 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
-EBUILD alsa-tools-1.1.0.ebuild 3514 BLAKE2B d09bcfda8c4e23b3b6d2173b6746c7ea365bc3fba71041e951d4ea7fbbf93fa351575fcc8a36536e902d11b133bed105b3759ddda2d1fbc3bedfc7d5297604d6 SHA512 7a546874ee434f2e1dd5f3081c85f1b520f5ac4ee831eff5dfc9e06f0a2e127bbad50dc76fbcf2b6b7061e669967bf015084bcd1404663e2143cde4342d8b275
-EBUILD alsa-tools-1.1.6.ebuild 3570 BLAKE2B 37af853b08488ec46c2a37e85f141b7d075f95e7760a52ca963f976ab287d674b0e3c68669bf51c0b4e6a11cee5ca08e97cd4a789057e24b196aaa3c412666f7 SHA512 4cec10ed150d1173af1ef02282956b24d0956c6348d8f874c16ad57512e17284934f3e2eec0f4247aa2a902b0a0153ca6fda931a47047573d0237e23b1588185
+DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
 EBUILD alsa-tools-1.1.7.ebuild 3581 BLAKE2B 035b54207bb68d596a46839a88c4a98917b5608b00c8d339f3b3bd33bafb8367fbfe3c9d54e36ee7de7255edb3bb578346755cbc36ca29f8db8eac2eeb51cf13 SHA512 656dda1b0ae6557f288403d8fef28b5d9b726b4d1c4d925fdeba30915f10a982e1215b0e60de4e16d0912f2eba8bc24586b22eae1e7127ef69f013a5ef48c9ea
+EBUILD alsa-tools-1.2.2.ebuild 3400 BLAKE2B 23ac8aa2d756d4dbb742e155c136629cdb94433bf5638a29277c3c255b75bc6d828e074731ea5cd46b062910f5bf62a9ed86d716823d127bdb098fda1e49844f SHA512 cc7fc7f29fda79e94ad86f0e7491a5d3054cd6340ffd04efb056bbc2bbee052e132165e9c84124b4b2664c0024287030af145fe8f54d1697b7e1178299467015
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
deleted file mode 100644
index 3d691d2667b0..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="amd64 ~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
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
-
-COMMON_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
-		x11-libs/gtk+:2
-		x11-libs/gtk+:3
-		)" #468294
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( media-fonts/font-misc-misc )" #456114
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
-
-	if use gtk; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
-		use alsa_cards_ice1712 && \
-			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
-			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
-		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-	fi
-
-	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
-	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
-	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
-	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
-	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
-
-	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
-	fi
-
-	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/envy24control-config-dir.patch
-
-	epatch_user
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_configure() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		case "${f}" in
-			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2
-				;;
-			* )
-				econf
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		emake
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		# Install the main stuff
-		cd "${S}/${f}"
-		# hotplugdir is for usx2yloader/Makefile.am
-		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
-
-		# Install the text documentation
-		local doc
-		for doc in README TODO ChangeLog AUTHORS; do
-			if [[ -f "${doc}" ]]; then
-				mv "${doc}" "${doc}.$(basename ${f})" || die
-				dodoc "${doc}.$(basename ${f})"
-			fi
-		done
-	done
-
-	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	prune_libtool_files
-}
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.2.ebuild
index da3b3042ca05..2bed3f3f96d6 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools flag-o-matic gnome2-utils xdg-utils
+EAPI=7
+inherit autotools flag-o-matic xdg
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="https://alsa-project.org/"
@@ -10,14 +10,14 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 ~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
 alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
 
-COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
+DEPEND=">=media-libs/alsa-lib-${PV}
 	>=dev-python/pyalsa-1.0.26
 	fltk? ( >=x11-libs/fltk-1.3.0:1 )
 	gtk? (
@@ -25,10 +25,11 @@ COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
 		x11-libs/gtk+:2
 		x11-libs/gtk+:3
 	)" #468294
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gtk? ( media-fonts/font-misc-misc )" #456114
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/envy24control-config-dir.patch
@@ -146,15 +147,5 @@ src_install() {
 	done
 
 	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index cf3a2eea2c6d..d75bd91ffd90 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,18 +1,10 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
-AUX alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch 9191 BLAKE2B 964557f65786fd53c15e9047e1d65d63610f1a120dee71e1ec4ce1e6828d6a7b5cd140a5ad1f49d1ddc39592a2286829ee23ee76ca08a8f5ef6a7e04ff6203a9 SHA512 9969883807bfbe1638b8cf676cb1ec2160b33007af8e7cb0c6289064995c9bbc16a249c18b25dea2c5b10732471f101e7b824bb8c7b4eb080f0482706acd12b5
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
-AUX alsasound.initd-r6 2189 BLAKE2B f0c4b5b51aae15f5d841b4e2ea8ce6a0631f92868a12b481798c484f6eff54bf8de0352c8c8b01c58d6164ab8de25bbfebb619f87bebb9c50c00610b67eed2e8 SHA512 960e6eff97174004abeb8d36d68c01a9f67e589174743928bb63dc37390f9868551e5b7e11c8386db67889c3d518f5ff4564b258dfee5e3317c164bc52aac04e
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
-DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
-DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
-DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b705daa7bd38e6d5e8835a21a9aefeca2fb1a7444c5709516ace0eecdfd5b410b5b24008abebb7ca917763108637bbcca SHA512 f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9
-DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da338208bfa646fc2a46d38f2d1d937b55b90acc5f75bb630aa288dee458c9f555a5727990c5cd7a59b627cb1ecf1e2c SHA512 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970
 DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec
-EBUILD alsa-utils-1.1.2.ebuild 2215 BLAKE2B b677f9d46e0a4a0a4b112fd3cb4def0f8fb64c30b653cd17e293ebd899eaf8b68fccf7a755017029e159443578c514174d4abd48f3e7b98115ff7af7fe78ce6a SHA512 c5d16a95c08491eeba7107f66e9fd51c4e03a3ac768fa8f6b3de584632cef5ea0c2b8c3651e16a64f3c4f54685a2c4ff54068dd4f531d8dba1d21fde82516c07
-EBUILD alsa-utils-1.1.6.ebuild 2268 BLAKE2B 417f204910822421e8e40d388bd3563d1cbc25af2c4e9e55350498a3edce81524d222ec59bb0b13a42b04c4a0a40c6062e2eb7b9f3dfae8d78dcf1f55c4d9b04 SHA512 48f8112139924aa6c2a3f721afcef746c624c9084659d6b96714131eea16039882f34ef8de8d91715820cb73722eb04f031ffcc05a83c44eeb39b9d88424715b
-EBUILD alsa-utils-1.1.8.ebuild 2339 BLAKE2B 63652717e76d9f002ad9458908a08c3e5cd7d06ea9352dc7626b3cfd38c20bce9937517995281154f5a753f801a4b63458f28fd7af9c311b9e003446b07bf57c SHA512 530c27b7a606be234f9af020a68ad2fb61ece525f136e33a2c54b775156ca30aea335c8c9e6fbf0fa185d9f285c9070b38133d65a8b37eb4eaa5ff1eee5ea0f5
-EBUILD alsa-utils-1.1.9.ebuild 2423 BLAKE2B 27a87cd73011e680060fa04173aaff943b6b7674a0b937588c6421ae2f25bdd5ac1b37a15ec5a80a5d1ece1548275c6892e12a79564a8e3953aaa8ab596ee676 SHA512 38c1fd5cd8463d2cf4dabd3b509ff2270ad33f0c6fc3afba73560563767c8432baaf03bb315876f54ea0c2ebc6dbff23b8ae90599ac2f4cb1d8088f2d72711e2
-EBUILD alsa-utils-1.2.1.ebuild 2338 BLAKE2B c78c4be518e14b70caed6f39ad6a0e18ab8c22048719300c67bc07eeec932899894020057ce1adb58e23b83fb111f87d1de56a2769c65b9ffa12acd2c8b13d38 SHA512 7557b5c7ed077f977d5a5e9bb8e4f3a862a037872e011d574f641aea3c22693e4bb19e9371382bab5d71eaf837d609c15d6496f81a749e1df1bb5f805da21b6b
+DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
+EBUILD alsa-utils-1.2.1.ebuild 2336 BLAKE2B 404f5bc2b620c326b0551c7dac868aa4a390db9700b6ce1db0656552097af3f66192a2db83136c6293c7633784932186260d5441b633144c52402c2501f1cf1d SHA512 8e0d04c00d0933ec7ba4a5c264ec6eacf254c38b717b1bea36fbbd94d716fbed194a6732b860c7c7efee9788fee12fea22c8bf98766b90b9fe3432c3aff55238
+EBUILD alsa-utils-1.2.2.ebuild 2345 BLAKE2B 2fbcf540ef9b7892ad1f87f1b2ced6c2d9993174b1b83e5ece2b2d6feb0bd1f2455e6cf7518179f5cf278c99821b3d6e7d04b4fa9abe5f9aa63c4bc054fc2135 SHA512 6dab5aa079badb0dc7ba7572414aeca79dde991523544bc8954a9f802807d60cf2be1070a06a73478ae7786aacf7798a3af854e578bb1c517f2f399fd54d178b
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
deleted file mode 100644
index ced234f3433c..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable bat) \
-		$(use_enable libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
-		${myconf}
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
deleted file mode 100644
index 757dbfdfeb79..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_configure() {
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
deleted file mode 100644
index 23a733a8a7b8..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh ~sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
index c06211c22447..3b5d439a2f69 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.1.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
index 280d4466e121..564a4e6888fc 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.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=7
@@ -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 ~sh sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
@@ -25,7 +25,6 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-	"${FILESDIR}"/${P}-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
 )
 
 src_configure() {
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch b/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
deleted file mode 100644
index 654358399737..000000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From fbb222c9bccb407750cea61e3bb6285cb8c1b330 Mon Sep 17 00:00:00 2001
-From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-Date: Sun, 28 Jul 2019 13:48:50 +0900
-Subject: [PATCH] axfer: test: fix invalid comparison of 64 bit storage in
- ILP32 data type
-
-In system V ABIs with ILP32 data model, bit shift for '1ul' can brings
-undefined behaviour when the calculation result is over 32 bit width.
-
-This commit fixes the bug.
-
-Reported-by: Rolf Eike Beer <eike@sf-mail.de>
-Reference: https://bugs.gentoo.org/681652
-Reference: https://github.com/alsa-project/alsa-utils/issues/23
-Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- axfer/test/container-test.c | 142 ++++++++++++++++++------------------
- axfer/test/generator.c      |   4 +-
- axfer/test/mapper-test.c    |  24 +++---
- 3 files changed, 85 insertions(+), 85 deletions(-)
-
-diff --git a/axfer/test/container-test.c b/axfer/test/container-test.c
-index 0e2e6e9..9b30ae3 100644
---- a/axfer/test/container-test.c
-+++ b/axfer/test/container-test.c
-@@ -172,82 +172,82 @@ int main(int argc, const char *argv[])
- {
- 	static const uint64_t sample_format_masks[] = {
- 		[CONTAINER_FORMAT_RIFF_WAVE] =
--			(1ul << SND_PCM_FORMAT_U8) |
--			(1ul << SND_PCM_FORMAT_S16_LE) |
--			(1ul << SND_PCM_FORMAT_S16_BE) |
--			(1ul << SND_PCM_FORMAT_S24_LE) |
--			(1ul << SND_PCM_FORMAT_S24_BE) |
--			(1ul << SND_PCM_FORMAT_S32_LE) |
--			(1ul << SND_PCM_FORMAT_S32_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_BE) |
--			(1ul << SND_PCM_FORMAT_MU_LAW) |
--			(1ul << SND_PCM_FORMAT_A_LAW) |
--			(1ul << SND_PCM_FORMAT_S24_3LE) |
--			(1ul << SND_PCM_FORMAT_S24_3BE) |
--			(1ul << SND_PCM_FORMAT_S20_3LE) |
--			(1ul << SND_PCM_FORMAT_S20_3BE) |
--			(1ul << SND_PCM_FORMAT_S18_3LE) |
--			(1ul << SND_PCM_FORMAT_S18_3BE),
-+			(1ull << SND_PCM_FORMAT_U8) |
-+			(1ull << SND_PCM_FORMAT_S16_LE) |
-+			(1ull << SND_PCM_FORMAT_S16_BE) |
-+			(1ull << SND_PCM_FORMAT_S24_LE) |
-+			(1ull << SND_PCM_FORMAT_S24_BE) |
-+			(1ull << SND_PCM_FORMAT_S32_LE) |
-+			(1ull << SND_PCM_FORMAT_S32_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_BE) |
-+			(1ull << SND_PCM_FORMAT_MU_LAW) |
-+			(1ull << SND_PCM_FORMAT_A_LAW) |
-+			(1ull << SND_PCM_FORMAT_S24_3LE) |
-+			(1ull << SND_PCM_FORMAT_S24_3BE) |
-+			(1ull << SND_PCM_FORMAT_S20_3LE) |
-+			(1ull << SND_PCM_FORMAT_S20_3BE) |
-+			(1ull << SND_PCM_FORMAT_S18_3LE) |
-+			(1ull << SND_PCM_FORMAT_S18_3BE),
- 		[CONTAINER_FORMAT_AU] =
--			(1ul << SND_PCM_FORMAT_S8) |
--			(1ul << SND_PCM_FORMAT_S16_BE) |
--			(1ul << SND_PCM_FORMAT_S32_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_BE) |
--			(1ul << SND_PCM_FORMAT_MU_LAW) |
--			(1ul << SND_PCM_FORMAT_A_LAW),
-+			(1ull << SND_PCM_FORMAT_S8) |
-+			(1ull << SND_PCM_FORMAT_S16_BE) |
-+			(1ull << SND_PCM_FORMAT_S32_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_BE) |
-+			(1ull << SND_PCM_FORMAT_MU_LAW) |
-+			(1ull << SND_PCM_FORMAT_A_LAW),
- 		[CONTAINER_FORMAT_VOC] =
--			(1ul << SND_PCM_FORMAT_U8) |
--			(1ul << SND_PCM_FORMAT_S16_LE) |
--			(1ul << SND_PCM_FORMAT_MU_LAW) |
--			(1ul << SND_PCM_FORMAT_A_LAW),
-+			(1ull << SND_PCM_FORMAT_U8) |
-+			(1ull << SND_PCM_FORMAT_S16_LE) |
-+			(1ull << SND_PCM_FORMAT_MU_LAW) |
-+			(1ull << SND_PCM_FORMAT_A_LAW),
- 		[CONTAINER_FORMAT_RAW] =
--			(1ul << SND_PCM_FORMAT_S8) |
--			(1ul << SND_PCM_FORMAT_U8) |
--			(1ul << SND_PCM_FORMAT_S16_LE) |
--			(1ul << SND_PCM_FORMAT_S16_BE) |
--			(1ul << SND_PCM_FORMAT_U16_LE) |
--			(1ul << SND_PCM_FORMAT_U16_BE) |
--			(1ul << SND_PCM_FORMAT_S24_LE) |
--			(1ul << SND_PCM_FORMAT_S24_BE) |
--			(1ul << SND_PCM_FORMAT_U24_LE) |
--			(1ul << SND_PCM_FORMAT_U24_BE) |
--			(1ul << SND_PCM_FORMAT_S32_LE) |
--			(1ul << SND_PCM_FORMAT_S32_BE) |
--			(1ul << SND_PCM_FORMAT_U32_LE) |
--			(1ul << SND_PCM_FORMAT_U32_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_BE) |
--			(1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) |
--			(1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) |
--			(1ul << SND_PCM_FORMAT_MU_LAW) |
--			(1ul << SND_PCM_FORMAT_A_LAW) |
--			(1ul << SND_PCM_FORMAT_S24_3LE) |
--			(1ul << SND_PCM_FORMAT_S24_3BE) |
--			(1ul << SND_PCM_FORMAT_U24_3LE) |
--			(1ul << SND_PCM_FORMAT_U24_3BE) |
--			(1ul << SND_PCM_FORMAT_S20_3LE) |
--			(1ul << SND_PCM_FORMAT_S20_3BE) |
--			(1ul << SND_PCM_FORMAT_U20_3LE) |
--			(1ul << SND_PCM_FORMAT_U20_3BE) |
--			(1ul << SND_PCM_FORMAT_S18_3LE) |
--			(1ul << SND_PCM_FORMAT_S18_3BE) |
--			(1ul << SND_PCM_FORMAT_U18_3LE) |
--			(1ul << SND_PCM_FORMAT_U18_3BE) |
--			(1ul << SND_PCM_FORMAT_DSD_U8) |
--			(1ul << SND_PCM_FORMAT_DSD_U16_LE) |
--			(1ul << SND_PCM_FORMAT_DSD_U32_LE) |
--			(1ul << SND_PCM_FORMAT_DSD_U16_BE) |
--			(1ul << SND_PCM_FORMAT_DSD_U32_BE),
-+			(1ull << SND_PCM_FORMAT_S8) |
-+			(1ull << SND_PCM_FORMAT_U8) |
-+			(1ull << SND_PCM_FORMAT_S16_LE) |
-+			(1ull << SND_PCM_FORMAT_S16_BE) |
-+			(1ull << SND_PCM_FORMAT_U16_LE) |
-+			(1ull << SND_PCM_FORMAT_U16_BE) |
-+			(1ull << SND_PCM_FORMAT_S24_LE) |
-+			(1ull << SND_PCM_FORMAT_S24_BE) |
-+			(1ull << SND_PCM_FORMAT_U24_LE) |
-+			(1ull << SND_PCM_FORMAT_U24_BE) |
-+			(1ull << SND_PCM_FORMAT_S32_LE) |
-+			(1ull << SND_PCM_FORMAT_S32_BE) |
-+			(1ull << SND_PCM_FORMAT_U32_LE) |
-+			(1ull << SND_PCM_FORMAT_U32_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_BE) |
-+			(1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) |
-+			(1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) |
-+			(1ull << SND_PCM_FORMAT_MU_LAW) |
-+			(1ull << SND_PCM_FORMAT_A_LAW) |
-+			(1ull << SND_PCM_FORMAT_S24_3LE) |
-+			(1ull << SND_PCM_FORMAT_S24_3BE) |
-+			(1ull << SND_PCM_FORMAT_U24_3LE) |
-+			(1ull << SND_PCM_FORMAT_U24_3BE) |
-+			(1ull << SND_PCM_FORMAT_S20_3LE) |
-+			(1ull << SND_PCM_FORMAT_S20_3BE) |
-+			(1ull << SND_PCM_FORMAT_U20_3LE) |
-+			(1ull << SND_PCM_FORMAT_U20_3BE) |
-+			(1ull << SND_PCM_FORMAT_S18_3LE) |
-+			(1ull << SND_PCM_FORMAT_S18_3BE) |
-+			(1ull << SND_PCM_FORMAT_U18_3LE) |
-+			(1ull << SND_PCM_FORMAT_U18_3BE) |
-+			(1ull << SND_PCM_FORMAT_DSD_U8) |
-+			(1ull << SND_PCM_FORMAT_DSD_U16_LE) |
-+			(1ull << SND_PCM_FORMAT_DSD_U32_LE) |
-+			(1ull << SND_PCM_FORMAT_DSD_U16_BE) |
-+			(1ull << SND_PCM_FORMAT_DSD_U32_BE),
- 	};
- 	static const uint64_t access_mask =
--		(1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
--		(1ul << SND_PCM_ACCESS_RW_INTERLEAVED);
-+		(1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
-+		(1ull << SND_PCM_ACCESS_RW_INTERLEAVED);
- 	struct test_generator gen = {0};
- 	struct container_trial *trial;
- 	int i;
-diff --git a/axfer/test/generator.c b/axfer/test/generator.c
-index cdea2c9..bde8c5f 100644
---- a/axfer/test/generator.c
-+++ b/axfer/test/generator.c
-@@ -220,7 +220,7 @@ static int test_sample_format(struct test_generator *gen,
- 	int err = 0;
- 
- 	for (i = 0; i <= SND_PCM_FORMAT_LAST; ++i) {
--		if (!((1ul << i) & gen->sample_format_mask))
-+		if (!((1ull << i) & gen->sample_format_mask))
- 			continue;
- 
- 		err = test_samples_per_frame(gen, access, i);
-@@ -237,7 +237,7 @@ static int test_access(struct test_generator *gen)
- 	int err = 0;
- 
- 	for (i = 0; i <= SND_PCM_ACCESS_LAST; ++i) {
--		if (!((1ul << i) & gen->access_mask))
-+		if (!((1ull << i) & gen->access_mask))
- 			continue;
- 
- 		err = test_sample_format(gen, i);
-diff --git a/axfer/test/mapper-test.c b/axfer/test/mapper-test.c
-index 6b24d54..f0376c7 100644
---- a/axfer/test/mapper-test.c
-+++ b/axfer/test/mapper-test.c
-@@ -396,13 +396,13 @@ int main(int argc, const char *argv[])
- {
- 	// Test 8/16/18/20/24/32/64 bytes per sample.
- 	static const uint64_t sample_format_mask =
--			(1ul << SND_PCM_FORMAT_U8) |
--			(1ul << SND_PCM_FORMAT_S16_LE) |
--			(1ul << SND_PCM_FORMAT_S18_3LE) |
--			(1ul << SND_PCM_FORMAT_S20_3LE) |
--			(1ul << SND_PCM_FORMAT_S24_LE) |
--			(1ul << SND_PCM_FORMAT_S32_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_LE);
-+			(1ull << SND_PCM_FORMAT_U8) |
-+			(1ull << SND_PCM_FORMAT_S16_LE) |
-+			(1ull << SND_PCM_FORMAT_S18_3LE) |
-+			(1ull << SND_PCM_FORMAT_S20_3LE) |
-+			(1ull << SND_PCM_FORMAT_S24_LE) |
-+			(1ull << SND_PCM_FORMAT_S32_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_LE);
- 	uint64_t access_mask;
- 	struct test_generator gen = {0};
- 	struct mapper_trial *trial;
-@@ -451,13 +451,13 @@ int main(int argc, const char *argv[])
- 			goto end;
- 		}
- 
--		access_mask = 1ul << access;
-+		access_mask = 1ull << access;
- 		verbose = true;
- 	} else {
--		access_mask = (1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
--			      (1ul << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) |
--			      (1ul << SND_PCM_ACCESS_RW_INTERLEAVED) |
--			      (1ul << SND_PCM_ACCESS_RW_NONINTERLEAVED);
-+		access_mask = (1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
-+			      (1ull << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) |
-+			      (1ull << SND_PCM_ACCESS_RW_INTERLEAVED) |
-+			      (1ull << SND_PCM_ACCESS_RW_NONINTERLEAVED);
- 		verbose = false;
- 	}
- 
--- 
-2.21.0
-
diff --git a/media-sound/alsa-utils/files/alsasound.initd-r6 b/media-sound/alsa-utils/files/alsasound.initd-r6
deleted file mode 100644
index f80a3518f3e2..000000000000
--- a/media-sound/alsa-utils/files/alsasound.initd-r6
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-alsastatedir=/var/lib/alsa
-alsascrdir=/etc/alsa.d
-alsahomedir=/var/run/alsasound
-
-extra_commands="save restore"
-
-depend() {
-	need localmount
-	after bootmisc modules isapnp coldplug hotplug
-}
-
-restore() {
-	ebegin "Restoring Mixer Levels"
-
-	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
-
-	if [ ! -r "${alsastatedir}/asound.state" ] ; then
-		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
-		eend 0
-		return 0
-	fi
-
-	local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
-	local CARDNUM
-	for cardnum in ${cards}; do
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
-			|| ewarn "Errors while restoring defaults, ignoring"
-	done
-
-	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
-		[ -e "${ossfile}" ] || continue
-		# We use cat because I'm not sure if cp works properly on /proc
-		local procfile=${ossfile##${alsastatedir}/oss}
-		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
-		if [ -e /proc/asound/"${procfile}"/oss ] ; then
-		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
-		fi
-	done
-
-	eend 0
-}
-
-save() {
-	ebegin "Storing ALSA Mixer Levels"
-
-	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
-
-	mkdir -p "${alsastatedir}"
-	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
-		eerror "Error saving levels."
-		eend 1
-		return 1
-	fi
-
-	for ossfile in /proc/asound/card*/pcm*/oss; do
-		[ -e "${ossfile}" ] || continue
-		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
-		device="$(echo "${device}" | sed -e 's,/,_,g')"
-		mkdir -p "${alsastatedir}/oss/"
-		cp "${ossfile}" "${alsastatedir}/oss/${device}"
-	done
-
-	eend 0
-}
-
-start() {
-	if [ "${RESTORE_ON_START}" = "yes" ]; then
-		restore
-	fi
-
-	return 0
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ]; then
-		save
-	fi
-	return 0
-}
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index d340f815bd18..dc8cabba5513 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,5 @@
 AUX ardour-4.x-revision-naming.patch 1107 BLAKE2B 18378f1cbc3bb7871ed599dd03c963e7d808796477838b84e9a1010bf31d175edcbba62dc076a37ff3cdf20868f32fc42c2fb2a687616be27a0ecf00b97afc3e SHA512 f9c742345b4f89bc0cabc7a7fe86c4084c99f962c3b3770a0e14b259fa4ca9a3f2cdac35c3b9214816f895fd083befab16e38d2b753cbe6ab94ca7da7b251580
 DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
-EBUILD ardour-5.12.ebuild 3970 BLAKE2B 80446da4371cd5bf16c543fbe04705c4b9dc256a5ad51097eaf325a3fa61e13d4a06dcbcf34e3a85e85ff81ab9db3dba51d0a873fa3ca3cfdc5314efa8b7e9d5 SHA512 c006f09a6c8100426752e10ec939fd80c8a80e131b1e04e7b7b6ac4543f3bc4efd620a29fca90c9152fa3bc7400811c1097d5103eff1a66731c42c78f89129dd
-EBUILD ardour-9999.ebuild 3970 BLAKE2B fc0e2d3093beec249597597d8318bdf5f4255b7bfcc3a49002ea662b4a8980188dfd00172feb950619efd4ccac94371c88b3aadced603bbfe1e41037efc89319 SHA512 2bfb8447939ee661667bad4f1ca6fb7c4522fd05e52e5dc5cef531cb22b65dfaf8f40a6bc69348571caaba94e35e597060e4b33e946a486bb1e56485209618aa
+EBUILD ardour-5.12.ebuild 3971 BLAKE2B 0e7ecec34a2879fb5682071e645b2716e68bc2d6507220289eaa202626e750d6f266fb3ec9bdfd1beca259e8fb7aa54da4e858c263d68a9b5a592d9b50815529 SHA512 481b26d1425242e0b739fbe2c79ed0a01acf16cf032229acdd5f1da607858c986384c03cda8aa1aa9e19dd1e77343c88a93ce93bdc08d0dc50c34b041bb3d827
+EBUILD ardour-9999.ebuild 3971 BLAKE2B 6b3e1317abe184ed7a784eebf2d6f9eba30bd4afc07a029feb9cfc09c1945a5b822f2a054f7ec485657d3de365d594b2f8518090d8f94dae418bfee89732dbc0 SHA512 636d94e92ae57d35ad9b702537e4fd4602a9f05f02d8bf7cb3d1398c24f56b2d0bd762ebb148e836daeef6425cbb7ceb9b47d56a3da41274358a7fa82c8ac798
 MISC metadata.xml 347 BLAKE2B 055877000b928bdbc38be9fec8b34e2b5ad6b0c9533e59406bfa6ebdc81fcb2990cfebe577f920f110aa57bc8e20a26f896f4ce8e5ab949177727905656119c3 SHA512 30f231423671c8c1a0911b9591a6239431d55860679c45452b430ce974defafeaa86e8a0f5b950e6176fccb986259780f3a13fa73df0e03c4a5f7e5e60cbcb63
diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild
index d671a3a3432e..fbd2949eff59 100644
--- a/media-sound/ardour/ardour-5.12.ebuild
+++ b/media-sound/ardour/ardour-5.12.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
@@ -75,7 +75,7 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare(){
+src_prepare() {
 	eapply_user
 	if ! [[ ${PV} == *9999* ]]; then
 		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 302741278d66..45dddecc7e5a 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-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=6
@@ -75,7 +75,7 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare(){
+src_prepare() {
 	eapply_user
 	if ! [[ ${PV} == *9999* ]]; then
 		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
diff --git a/media-sound/bplay/Manifest b/media-sound/bplay/Manifest
index 912a669b9fea..1c2f267419e9 100644
--- a/media-sound/bplay/Manifest
+++ b/media-sound/bplay/Manifest
@@ -1,3 +1,3 @@
 DIST bplay-0.991.tar.gz 18920 BLAKE2B b5a749db4d67c82361d2f1c2fd4fb209c959e782071516c739d6711dc069ee8ed925b7310b819eeca6bca381176ee22c8efdf183a5c624a00282a19e75e2e29a SHA512 95f1dbecf97aa9ca96c56220a96873ba3895b61e70b6873665fd054617a9d46b9fb973115efc906116d477db4a665a13c8d50157f6bfb6581d080ec27c853971
-EBUILD bplay-0.991.ebuild 625 BLAKE2B 9ef05c979bd1a30ca403ccef50a6eb062ce83dad49cbbbb20ec50788745ff40d0e5aec7673b3b6a2ad5033ca0529534baf1bc395d5cc3459372f82096d27e7c7 SHA512 6214f618e87570592c2134f01ae0ac2c0f4615fe98a9c41f3b94c73df98e604e15b634c9688a6825cb76927cbf893c3d4aad401433754d74d96523ba9b75c956
+EBUILD bplay-0.991.ebuild 624 BLAKE2B 0c9d29753aa6143f6e3e27318e9e6769302d11542213983eedaf7838a97c0f0c4456eb7bc1f52723118ddc753fe5902a02d0f64fdda8a510b942af4757b1488e SHA512 3840854bc7e54667b5dd27797dfdb8d4bb8e70fa1257b2d587b7f60cac0179e4d9f598f398cbd7140c36842fd99b9a15ed43f6d5898897a293742b3a9366abe9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/bplay/bplay-0.991.ebuild b/media-sound/bplay/bplay-0.991.ebuild
index 0fe9c8a2443a..e4fbbb9e3c7a 100644
--- a/media-sound/bplay/bplay-0.991.ebuild
+++ b/media-sound/bplay/bplay-0.991.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
@@ -20,7 +20,7 @@ src_compile() {
 		CC="$(tc-getCC)" bplay
 }
 
-src_install () {
+src_install() {
 	newbin bplay bplay-bin
 	dosym bplay-bin /usr/bin/brec
 	doman brec.1
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index a8b9e542e0de..1774ed129407 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,5 +1,7 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 AUX cantata-2.3.3-solidlite-static.patch 994 BLAKE2B 66b4a6a0325f0f7cb4f3886bca68c88e45aee4eb08947f422f07d7e43b585d6d3661f92152dcdb2c0fb243978fe3fd203bf14d88cfd7b472031e87f8d83430d4 SHA512 395b9d8968c2be12561ac595c99cd821296722598d33916328823137538d174f9dd2953146eee24263cc8f0485e3e1627eab678890ea6b5c6141472e4ae9aaeb
 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
+DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01 SHA512 9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439
 EBUILD cantata-2.3.3-r1.ebuild 3122 BLAKE2B 703fc71f6ae30d6667849d33e9f1e1500c9fa518f036541816ec0cdb7a4b1ff830c7887efb238dd377440ffaab2f5cf5a66b313f6639500cb4b34985772e2320 SHA512 aa1d225b9d6abb1161171e33cab208afaed48f0fe361e7bce9a401010740beaaaa7c9ee7b3b1c36bb98cdadb1d9c8a805bd8c8b8d1f8e10de486d3e1a31ce4cb
+EBUILD cantata-2.4.1.ebuild 3067 BLAKE2B 9d29921cac1df1acb6848ac4c4d28fd03b35df1b1c9b7d7a1a0fc75a42883cab742a36c2aeaa1005529b83cbd8750e39ecb6c8efdba34e6e0c1c420ab6f864e1 SHA512 a9b9c30a03a12584b4b7a7f3de25a0cf2f4b79a0702b71736f60b6ac3e0e31ef642dc55e0200a014033e408032dc004ccb457f473a165e215bbc5df648b273cd
 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
new file mode 100644
index 000000000000..3a8db8b4bd5a
--- /dev/null
+++ b/media-sound/cantata/cantata-2.4.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
+inherit cmake l10n qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128
+		media-sound/mpg123
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	streaming? ( dev-qt/qtmultimedia:5 )
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		udisks? ( sys-fs/udisks:2 )
+	)
+	zeroconf? ( net-dns/avahi )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl[ithreads]
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	has_version media-sound/mpd || \
+		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
+
+	if ! has_version app-misc/media-player-info; then
+		elog "Install app-misc/media-player-info to enable identification"
+		elog "and querying of portable media players"
+	fi
+}
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index e28d7b18e62c..df28655ea0ac 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -1,5 +1,5 @@
 AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 BLAKE2B e02182d5035b863bb194bfcb1cfd84d78b7e75c89fd973f22c1fd79281923a76237159c974eeba40799128fa45a81548c827e3d2ae32f50ea6153d7040f31d5b SHA512 dd116c7e30ad94680fa355a765e8a39e8bb85ffb59d886e2c7ed6e77e6fd5c440c4db2490d5505042c5b57d06df8a14951a06f38348ff390832b39bfa1f47f53
 AUX cvoicecontrol-0.9_alpha-tinfo.patch 561 BLAKE2B 5e67fdd31e96e10e005e03ffcb44e886b78086cc22705721b4efe26dc382d18de46ddf55f3d38beda4d9f45a54c4aa4877b6eddfe2df9dbff1dedfefdbb81c60 SHA512 e6616a1880be116aaf6ad00378ec434fee530bed56c7c11492f1ad3903c3302239599f49e7adcfbc884f59053639f3d73a937ceb5763bac24cd12a48ef4ee5a3
 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 BLAKE2B 162557e9e85ee3e15142a1603a70a23d8e55f6180c006660c020c476aab45d37de3c66df8ebb1ac78ae7c5ddd79912a45dc4b29297899dfc8a0a4b5a67ede9f8 SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187
-EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 839 BLAKE2B 6a41b6a4091a632239d9c7466bb8418de7066f11efce8b59fb09cd88e670bc39bb1d7303cc14a4745e3b16dcbed16369c87cc38f850da345d36f3ef98dd550e7 SHA512 48269c53ce900570274cb4b58f440f19f9c09f47ed7b121aed077e7428122cb18b62ebc851f8a34181f12ee7dece4bd3494afcda60e3d34cbc94a6f76f5b121c
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 838 BLAKE2B ba19c65df0d3a7e4fb74a2d9467ec94a258d10b8d147d8c6d01ae491737ffce61a26fd78ff2c2b1a1f7a6d068a322a00896bdb4b6728d9fd7de978eb3208e46d SHA512 69b890eb0a16ddf8737e39d9fa1e419eaeab3ededb6bcd71e689fa964ac859e27037831bc7bba738783cdd4241f77a1efa9a9ead1b8d29b8f5f23a7e753fa18d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
index e62b1944af1d..0b0363c94bcb 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-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
@@ -37,7 +37,7 @@ src_prepare() {
 		-i Makefile.in || die
 }
 
-src_install () {
+src_install() {
 	HTML_DOCS=( cvoicecontrol/docs/en/*.html )
 	default
 }
diff --git a/media-sound/dvda-author/Manifest b/media-sound/dvda-author/Manifest
index 3217baecce20..aabcf89db97d 100644
--- a/media-sound/dvda-author/Manifest
+++ b/media-sound/dvda-author/Manifest
@@ -1,3 +1,3 @@
 DIST dvda-author-10.06-300.tar.gz 828028 BLAKE2B bb1000024a4879989980246443c2ac7a7f795140b7c6165422793829c927c16fa8603c3a44a2f08e6e677e21871bffca6a5c330878688bcffa1b0fa2862290f0 SHA512 619215e5e9ac4a3e55d2bef0222a931412946f129927f1042807ee25541d64609a5a9189c843fdc30d34bb0e41e0779d821d8c32a16cf89c6227d9925ea07024
-EBUILD dvda-author-10.06-r1.ebuild 1309 BLAKE2B 1086ab574cd1f546cd9ce5a22a28b9dafad8195a30bfebfc35aecd28d7a43a435338eba6ddadb23d779047b698f8338a717c10e7461a8509e0528e8726a79ac8 SHA512 cc67b275e3c5764b04ac68d2cdd27eb19f8f8e4791cbcdb0a2eaefc642c952686a7683332f430ddb3a5226b328366f4ee4c689ef92792695434f9fe9ff8588dd
+EBUILD dvda-author-10.06-r1.ebuild 1272 BLAKE2B 1218f54db522eea1d3201d3193be825a191cce16fff72cee21db3be77a2fadca0c776872af57477e71cee26303eeffeb3e1dfa780c093c8e334238fe84acb02f SHA512 386b340c4bc8b999ea78d0e084ea9b70cb45126959ea58a2616a7de5db64c081a569ab6af6408455e9d2db1c5f3535e4ed6cf661eaafc46dfe8eb2f818f72890
 MISC metadata.xml 332 BLAKE2B 1501e697062fd49d3cdce60850f04ffbb77f94c547751b9f8f3075cd598cc0dfb291638d8f5f1c356911f78fa3a285eff8cd2acc326fe16cee821682f150bab2 SHA512 85c9b13baabe446a5c74613084fb53f83071219d872dccef40b946c2f36c4df4f0cbc1e964779fe9c989d8081c483d82c10ad454e5d225b00361a851b5e0400c
diff --git a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
index 57af4246a3b6..965f73db2aae 100644
--- a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
+++ b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -33,7 +33,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--with-config=/etc \
 		$(use_with debug debug full)
 }
diff --git a/media-sound/ezstream/Manifest b/media-sound/ezstream/Manifest
index 6b1b9818b5fb..a0dcca66be66 100644
--- a/media-sound/ezstream/Manifest
+++ b/media-sound/ezstream/Manifest
@@ -1,5 +1,5 @@
 AUX ezstream.confd 60 BLAKE2B 2b2d8a1bbfd6fbd4a196dc8eecc07939b9c85b6a6ffa0f138a51e6cab1a29080aae7a91bcbf4b628c6786612ea87da20fac01f1c118e965ef672f845b19372b9 SHA512 09f178f665d8677e3c75055028f975b98310fb2017ac0d69ae40b6417134ecec40ac90493fb861e1c46a2473fdd87bc088955032e62ddfbb8e201b306066d9c3
 AUX ezstream.initd 633 BLAKE2B 32536c9fd48d9d1a77c8ba829b9aba135ca3339aed91f36f6bc90d2e89610a4d1eba0588d5dd90f7aa7b83f8f4737276178fc8cbae3b7db0cab4141e46106ea6 SHA512 684b56d3f828ce518d5fa1d5d9be64ef4b1d591fd0bed75d9842cc8d2ed79c8aab500d22465e02c60b8be5f1662462ff3a4b19a789ac807d290113cf29f6efd3
 DIST ezstream-0.6.0.tar.gz 250448 BLAKE2B 18449d90e51a6880c6acf3d99fd449f666de811dec5dc964102d87b7d1d08dab01e3d9d8d959f4a456ba695464693fec3d990115cc6b6513fcde02c937dab1c1 SHA512 d6b621db85a0d56dcc54a8b7a0136c25342ec507f04ab397a53f46a74e85e94806e17d0a0a59e66096b5c0d97b7f98eaba95a50c1ca6c8d82aed11b854d0d33d
-EBUILD ezstream-0.6.0-r1.ebuild 913 BLAKE2B 7208b4025b27a80c7dac99539349b134b3d6a6a4541b16d6378114d773edab79e8c620dfb7ade1f5c274f33d42defd02a8c1dd3b9fb2fddc9d5adc7abbdd41a5 SHA512 14ce2e86599df973e9a8d720ea730b4503bac63dce677d1b63b05d57ba03524ebff7b0a1c066daa1d81a14b22ce4357145b166a2ca96c7acea950ad14217003b
+EBUILD ezstream-0.6.0-r1.ebuild 853 BLAKE2B 00216751b06da021b95d447b1dbb27928a9c600d59b6e3d11d799d0ecd80f268856a2610381a4241a68cef2fd63979063badb18e93455bd9511a86e737532c9c SHA512 e5017e8f55b565254ef131d44d3d1ae29c67036db7e907f7b3b46941a35cdbe37f0cede92543e70e1014a08938529e4449a816fe7bf9b0e9b7b790ec092c9eca
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
index 59af61c756cb..ddde77ac0d51 100644
--- a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
+++ b/media-sound/ezstream/ezstream-0.6.0-r1.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
@@ -22,11 +22,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	local docdir=/usr/share/doc/${PF}
-
 	econf \
-		--docdir=${docdir} \
-		--enable-examplesdir=${docdir}/examples \
+		--enable-examplesdir='$(docdir)/examples' \
 		$(use_with taglib taglib "/usr")
 }
 
diff --git a/media-sound/glmix/Manifest b/media-sound/glmix/Manifest
deleted file mode 100644
index 7be72baf3c33..000000000000
--- a/media-sound/glmix/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glmix-0.3.tar.gz 17500 BLAKE2B 25fc1cf3a1bbdbade37a7996472b59b538a218c0f136204b6b71617ffb93f1182ebbb8be5fade6ca5859d5318c9b0f4168ad84881d23ac14ccd42b1673252d99 SHA512 158136d67f53834c34500ba88f9d4c8c7c6928878497bbf63db127c900b89d649ebed3baee129d597f46c955184efb9d8ff30676e0430968eb4e057fa2e4bb45
-EBUILD glmix-0.3.ebuild 823 BLAKE2B 3cc630a1fbdbe167e58e4149d05542b5108d46f53b26efd0fe2dc9c5650f8897c2ef71a64f424673fb0128b68bd4c76313315f069de986f0e30de2b7c86cdbed SHA512 69552e21f38bbe83a71a8f76759b89b3b77812f86771b9d8f5ac90253a5d11acd38f917127bd2e65e579fa6e80879ce9fd92fb2373f19327ca7eb5a4aa3c4bb7
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/glmix/glmix-0.3.ebuild b/media-sound/glmix/glmix-0.3.ebuild
deleted file mode 100644
index e25af6abda64..000000000000
--- a/media-sound/glmix/glmix-0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="3D widget for mixing up to eight JACK audio streams down to stereo"
-HOMEPAGE="https://devel.tlrmx.org/audio"
-SRC_URI="https://devel.tlrmx.org/audio/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~ppc sparc x86"
-
-RDEPEND="
-	media-sound/jack-audio-connection-kit
-	x11-libs/gtk+:2
-	>=x11-libs/gtkglext-1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	local libs="gtk+-2.0 gtkglext-1.0 jack pango"
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} $(pkg-config --cflags ${libs})" \
-		LDFLAGS="-lm ${LDFLAGS} $(pkg-config --libs ${libs})"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README TODO
-	make_desktop_entry ${PN} "GL Mixer"
-}
diff --git a/media-sound/glmix/metadata.xml b/media-sound/glmix/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/glmix/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index baf9f3ddf26b..61892aff31eb 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0.ebuild 2057 BLAKE2B a2476f44b9ea1d2c09ac7f5a3cf2cf7d9ffdd0f3a5ddf98b7d4accd1782dde0bbe0aa85da1b4994267917a3a9a75a4437026b8268a85ffdf4fccdbb76e190a62 SHA512 5cdff4314afc30661d9606663856c233e9f98ab429c786d7a30c95fe347ab38bd6e349af5a2f8b45515a44e0226201ca9ee51605bf1149039ee92f90a26b0da7
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 1982 BLAKE2B 8d33fdd81d3c1522f88cf1dda30c59d0efc403449a89e33424a2c27aa726ab22eff06fd1b9c895991312c4928d3a4f373ce3c5d019cbb7cb7347dcb250449ae6 SHA512 99b5e371d3cf1aca71e090838cea7b775e0ba5200e57e98686cb1dc688108a7c206acb97fed76825d415fa293ed3348e07d07e821d53785b217d952dbf76b327
 MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index b094cc5955cd..e48b7b6831bd 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit flag-o-matic eutils multilib multilib-minimal
+inherit flag-o-matic eutils multilib-minimal
 
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://www.jackaudio.org"
@@ -57,8 +57,6 @@ multilib_src_configure() {
 		--disable-firewire \
 		$(use_enable cpu_flags_x86_sse sse) \
 		--with-html-dir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--libdir=/usr/$(get_libdir) \
 		${myconf}
 
 	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 7ef3bf2cb288..d8542ffaede1 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -5,7 +5,7 @@ AUX lilypond-2.19.80-fontforge-version.patch 503 BLAKE2B ff0565562e2156aa833d0de
 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
 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
-EBUILD lilypond-2.18.2-r3.ebuild 3237 BLAKE2B 9c807f8323bccb3028722ccb304ce5e01d8f834ad6b2dd1dbbc3ce04c489eb79ff3079fe21f3c58098ad5c65a2d7f264d63b394b958e80272723033f4f8b5023 SHA512 a2da2457646c7d66e1e60e524fdf6266b8ac0137127497441eafac97ef72be9506447e57a60a6047f0afe40a65e08ff9c958e90fadb64581e953386bee989283
-EBUILD lilypond-2.19.83.ebuild 3406 BLAKE2B b0ed0ba400e95d803ffd044f7fcb40776160e6c38e73a24fca5c16266b366ef5a9630d13d9ab0ecd8752652ab74ffad9b58b10ce638bcf3af0141539adfd34c1 SHA512 a6514369ebed270015e76f922621381922cbe75547f700f9b467a6e68387df7a23b9aaea2ac4b141f1615811a9d1e568b905f431ef8c5500dd00664b459424f1
-EBUILD lilypond-9999.ebuild 3184 BLAKE2B 09e0131554f1e0f09acc44f3cfd8b499255bd82d5dfe98a3e2ccf033eef9328ff3377d5d7200e97d03f64249a35498e16a59c0fb755bfb2bc3caff5c0898b2d1 SHA512 f776955a209691270c2d1b32e326d5989ab21823b015a1bfa223e3c6050a12cd64eee72098ce11a06ea290fe38c25c5da8e478ae0ae00e7874bf9092413aaa93
+EBUILD lilypond-2.18.2-r3.ebuild 3236 BLAKE2B 599f2759e037577b9178ecd57f94e3d0f75c1556e7b4d02cf7959536726758dbe88b2aad35933f12f177b4e83229ac67ebaac668a3cfff535702b5dae09dd04b SHA512 788ea6f20f63795a05f205a10c1fed07a1afabfb8a321f0788216a54e92804d0254efdf74cf397f88cd96e566f98d6174eb30cd4ddeeb1c70920e1f177fadb26
+EBUILD lilypond-2.19.83.ebuild 3405 BLAKE2B 0409cf9038b396d0ee6df6cc65c7f5a9fdddd40f533cd4a7b76adf8ba9e65d4ca8e0d7bf3f831f94f2e681011cd7f8427eb105fd1b8759b50c0838a4f4b4febf SHA512 90d9a385992975fd9fa228bbfe886560711594b1a5c53d71d0291f842631fabe7e957db28ae8417d323f7c7f9aacaeb5eedd3cb25321413878c15b62b8c947a0
+EBUILD lilypond-9999.ebuild 3183 BLAKE2B b4f8f4c469bb9d7c58fb43e77558283b3cdf798dd69924d65256bb884d81a00976c13f60cdfc44d4a7b9d8dff6bb4e162fc600af35a4a2a67fec79733c7c95c1 SHA512 c5278d9c71db036499619fcc981b412657ee0e730654066809bae4231fca0237759c149f6bcbafaaf88e57b0d631b2c073a82c6ff55b19f2c84add02b26bedef
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
index 3b4e393116a6..610f8b27f2ca 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
@@ -114,7 +114,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
 
 	# remove elisp files since they are in the wrong directory
diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild
index 5ce7a0932403..8b1f709e6002 100644
--- a/media-sound/lilypond/lilypond-2.19.83.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.83.ebuild
@@ -122,7 +122,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
 
 	# remove elisp files since they are in the wrong directory
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index dc5446cf20c3..82cfb3b7c714 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -117,7 +117,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
 
 	# remove elisp files since they are in the wrong directory
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index b4367540dee1..32343ee236f6 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.20.tar.xz 486920 BLAKE2B b4ce120935dbdd6392ff9b6ffa8acc6cceba33953d6595163cb0774adfeef9ca901f00d19101367d43d7edd3b8ebdfb15c43179de5780a0c56c825bc60ec9e72 SHA512 a5e17135a0d7ab3cc074c3fac49e76c22358d704e1b7bd5e2d554b426d9872947625c37d490f2859841b53d3c6d38e934efd8b1cf5a75b4fc76a2c5fbdf8fb82
+DIST lollypop-1.2.22.tar.xz 492964 BLAKE2B b113d5e19ec63a5535c86e2347b49c3fe4f56dabdfc4c7943ce956931580cdd92e96cb35c5c45c84d75f2d599e78c93caa195216a1a754f764254e4b73ccb531 SHA512 0161be7d6d2a10db57679c4c230ab9832ab34ce7074fc9e215a56a0dcc64fe17b3b8367c271209a75096b327dd6b793be2f54fb3904e3c98a26b1cd2aa88962b
 EBUILD lollypop-1.1.4.16.ebuild 1402 BLAKE2B 5481a031876dea76a7591479fc79cf6af819ac55c0cbb8a1fab2ffa6dcee1efa24f72fb6b3e51e6f6184de2f2a31aeb92b93323e8a0cb51396b540708f75a985 SHA512 31f72c147a4c921475bff48dab39bc4adeed3df559775138ed378d0cba64b965af88c8d985cc7b35b0bb9e101d2c06ca5a54d03bb3291db101551911e8772f03
-EBUILD lollypop-1.2.20.ebuild 1412 BLAKE2B c03cd05b49b172b9e77bd5163f4c32196dd7444e215cd6a212a9c6546ed428e62c54da1aef6d7f6a62af2e4f070601129a8bb08207dc27326616f87af2d36f65 SHA512 12e8b9d2261e40eb26dddfdd51bb7ac459249d555f710405e7f233257f3e5dabcee12cd30b25a44f9396008ab523d8896fe270bb97f5d2e8036de2098f76578d
+EBUILD lollypop-1.2.22.ebuild 1412 BLAKE2B c03cd05b49b172b9e77bd5163f4c32196dd7444e215cd6a212a9c6546ed428e62c54da1aef6d7f6a62af2e4f070601129a8bb08207dc27326616f87af2d36f65 SHA512 12e8b9d2261e40eb26dddfdd51bb7ac459249d555f710405e7f233257f3e5dabcee12cd30b25a44f9396008ab523d8896fe270bb97f5d2e8036de2098f76578d
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.20.ebuild b/media-sound/lollypop/lollypop-1.2.22.ebuild
index 0134d5693e9e..0134d5693e9e 100644
--- a/media-sound/lollypop/lollypop-1.2.20.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.22.ebuild
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index b56bd9a4733e..3f6d0c142f75 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,9 +1,7 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54
-DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab SHA512 c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35 SHA512 dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395
-EBUILD mixxx-2.1.8.ebuild 3001 BLAKE2B e1812e508163883035ad68d507c9b186646fd8d49801cef7948dbeb3b6c3b4312285ad71ec8dd85966ce875f2706d3ee31f6233689327600f23a13eaafbda37d SHA512 858f7b5f84d9a95f48541da198d89691dae24267a3efc4846ec950602d4106a4f46df9387ca97fc6305c85fdd8b492bad48a57029f267c22b6700ad6a8351d61
-EBUILD mixxx-2.2.3-r2.ebuild 3203 BLAKE2B 7bc97937b988caf9ce95bb2208aa06529100d160c8cfd677436c9fa7d66a82cc6123baf10ad87e2d41cd9f0284709a418ca3b2667bb5ce2294e8a3a54458c692 SHA512 fa9711cababfd0861c47f07717a02455d0ebbbb9a1b30dcc4be288733c042efb863c6e201a570fa18aabc2647c0e9084a0989c2e002115ab2e8d370577821506
+EBUILD mixxx-2.2.3-r2.ebuild 3202 BLAKE2B 5e21aa4910d3e136b6123ddb231a7a536db9239b7297d77e929a20bc7ace77de4c8da7809e41c94507b3f663d78a64b0cf4f0fa0717fd3d02539865c1b3fdc96 SHA512 e085cf38879c384701e37cd8ea73e63396a00bbfde371b7eaf326623b09e54078337ba5ead1ad3db1e7c850c2c5353f2262ce277d0b8b9aef29175a8dd356125
 EBUILD mixxx-9999.ebuild 3167 BLAKE2B a043a02cd144dd31758d1dfdbf81f4aff60b1ede13f1e28bb95dac7a392dd9e6307e120cd1924d78a2116996e95a2b03fe24f4fc539da2cd22e609dfc2528f1c SHA512 92daebabad0d42cf176244f2a863f4a32724d8f62b5c6cb8a17a6304231dee27db576dedff3b1f0cb8c0ac5f9d393bd7c61d75f83f052c70500c4202b32c4027
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-2.1.8.ebuild b/media-sound/mixxx/mixxx-2.1.8.ebuild
deleted file mode 100644
index 5604a69b447d..000000000000
--- a/media-sound/mixxx/mixxx-2.1.8.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic scons-utils toolchain-funcs
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
-else
-	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
-
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib:2
-	dev-libs/protobuf:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
-	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
-	media-libs/portmidi
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	sys-power/upower
-	virtual/libusb:1
-	virtual/opengl
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	hid? ( dev-libs/hidapi )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	opus? (	media-libs/opusfile )
-	shout? ( media-libs/libshout )
-	wavpack? ( media-sound/wavpack )
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-)
-
-src_prepare() {
-	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
-
-	default
-}
-
-src_configure() {
-	local myoptimize=0
-
-	# Required for >=qt-5.7.0 (bug #590690)
-	append-cxxflags -std=c++11
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		opus="$(usex opus 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
-	)
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-		install_root="${ED%/}"/usr install
-
-	dodoc README Mixxx-Manual.pdf
-}
diff --git a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
index 62efd69ed3ab..a985c3d324ae 100644
--- a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
@@ -14,7 +14,7 @@ else
 	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 4f7266f38b28..0b9aba9b4b29 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 2149 BLAKE2B 1bdcd4988453729a3853231f4793d7bea4d4410a8475d10bf8d937b80a32a7e3ad109404f81b6d2668d12a6e6b82399e9f79a78e9ac22218cd243ec127c4581d SHA512 1b5e5c88210a03e18dfe3db760da9568891c56aba598a72f1820a2ee64e634715fc3c1565009ad694cafc30349a533d3860f2d9dd13ec97948cfd2ece3c1dfcf
-EBUILD moc-2.6_alpha3.ebuild 2312 BLAKE2B fa11ad0922ae8e5df286782ac864330049a1422bb12284914c6cf38d68414e2b6d1e4efbb310d10035b2a0bf13f8cd45dd91bf325d94337108affca5e8e0299c SHA512 de24aa473b74617b8124f009522416cc77d99c8d0dcea7b94d4e5134321bb9c9130e02ec5951f4fde150ad5376751042a48d6b42ec28f9bca48862ba6e6825cc
+EBUILD moc-2.5.2.ebuild 2105 BLAKE2B 5dc4c12ddb11b45380d0b6460f2dfa6c1d4a0108ef2edb9a05c1f32472767bab82ff3701475f50966b0d9480f4c33bf4aab5d035e1bce5c35fc59e8dbac77374 SHA512 bd95d117cba09f4647190bec08c285dd5c50b0d2316042c914770a34601e64e697bf171f7a3916e35925e5126550ce958f3ac217be3765bf8059a7a1dd1a302c
+EBUILD moc-2.6_alpha3.ebuild 2268 BLAKE2B 3e900e6e723c054cd40d9f8046da7e2e94f5b8a27529c72ccf0feade63870e414bd282290b471e5473f4498268794a0b9f909c70b4a893b232ff72eeb40d7f4d SHA512 118b6ea884c823b9d9db624daec1e52adfb663c9bfff80d07ac2c8a0f5d465841e1acb6f5f7e0acfb966667c2531ee4173f51f91a179a61030f3f10f1d9dbb55
 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.ebuild
index 920e1caa471f..339165d14fad 100644
--- a/media-sound/moc/moc-2.5.2.ebuild
+++ b/media-sound/moc/moc-2.5.2.ebuild
@@ -46,7 +46,6 @@ S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable debug)
 		$(use_enable cache)
 		$(use_with oss)
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index 15f4735b5c5f..0c8e6e51c1a2 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -61,7 +61,6 @@ PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
 
 src_configure() {
 	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--without-rcc
 		$(use_enable debug)
 		$(use_enable cache)
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index 16a765e5eae9..985acf62ebab 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,3 +1,3 @@
 DIST mp3splt-2.6.2.tar.gz 260901 BLAKE2B 49b45f53fd1a646993aadb6c18fb0cf7530b61f3ab5ddcf7bf220a6cdbde9844dfa048f22c10c1c89ceff2a5f77744b17c70e1aae7120300c606316b0a48eb0a SHA512 c1cbdc905d4f19e8e20afeadf02a2967049d86e69613312c8855e03afc5b190a569ac63f970171384853961cbe6bf248fae47e5116c4fe9deb7a0787f299918b
-EBUILD mp3splt-2.6.2.ebuild 703 BLAKE2B 81261a50ba599c0fa1e76b3119f62e85fcde4ccd4facc3250d79a3138bd7af30d4142d1fdfee6cb554d27484cf017f5c592ec87012810414b3d94353ac09c8ef SHA512 1bac8625fa0eb3ca28512776cd19ebcb06765dd09fb9c1aefad4c645b85435148a34c0863df9882fcdae04dfd16cda343a80f195a3844ff45741c833b73a74e6
+EBUILD mp3splt-2.6.2.ebuild 669 BLAKE2B 9778869a1ecbf45101d6526a6c3e2098ea1226a468bcb201764a55fc362c6d48c580b94f5827317c4f42f996f1b66758f6fd2e8c8f49535f9d4063234801946d SHA512 0233436979878c9689724e98697f136ab838eea00bd498f641fa910bbd7e654cf4b053473946c9be891ae060c614c81dc785ed3952f1cfc40eb8961d1194c38c
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
index bc6a080f81eb..70287bb74e75 100644
--- a/media-sound/mp3splt/mp3splt-2.6.2.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -22,8 +22,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	econf \
 		--enable-oggsplt_symlink \
-		$(use_enable flac flacsplt_symlink) \
-		--disable-dependency-tracking
+		$(use_enable flac flacsplt_symlink)
 }
 
 src_install() {
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 4ff7f86d61dc..9bafe627f9fc 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,6 +3,8 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.21.18.tar.xz 676084 BLAKE2B f55ea278da4b50bf24da476ed9e3ff50a8130215702fb5c4a0accdbfeb00ed734983034ce6ee0542623e42d488555b1c709acefbba026f0e01f17f25f749b833 SHA512 68b4d9dc4be8454d7ef92df2a7b42513dc2d97bfd6b11ba99bce6709fc58ccbeab05419863bacb7a3427f1325bc88da74f9f4b48206222349085f02d0135e1a8
 DIST mpd-0.21.19.tar.xz 676020 BLAKE2B 295dd9067b8517739334fa09d4afc95f1167f291441bc34c4e5c4177bda66ef60eb3f4184f9192242faf64997b05d1c0a13736d1d6a3f343317271acc24a0e70 SHA512 50609b104b84b37dbb297fb40e8f4b352f13de7be5791b8d48c3af3459bfa0f0f88d1d37dcbb0d2409aaee881bca7a7bf6f871b82418ddade19829b02a2bde6a
+DIST mpd-0.21.20.tar.xz 676396 BLAKE2B e87d844ac0b20f10df7d2306d1c76f76ead84f5e61acb51f60d62847b1fb4f2ada66b20e0a36d87eaf70289027139e4beb80ea8ef7637b1cdb656c9635adb720 SHA512 9dd49190ba4c85014d24e88cdb02a4649e8fb687a49fc9ea019f23725eda483980008e9abebf0ad3960bd310b693c56999699d7c7ddee3ca18e9b2aa6d5a2176
 EBUILD mpd-0.21.18-r1.ebuild 8066 BLAKE2B c4e60bfb097f6aa97503bba0c7d86e33eceb1e0b87c88ea293a948ff59937b1311d350e429ed2e2c21a41141d9a2a148a16b83eda9a2f8be9c114281a579d5de SHA512 904cef84394f2b315cab7b9b354514286c19217d4525aed7c3f3e7ca8cec372e610dbaf2a81780dbaf0e7aecf10c00f63a5a2f2185de49e5164415a28c2a716b
 EBUILD mpd-0.21.19-r1.ebuild 8068 BLAKE2B 5c4a14d78ac4b26adcbcee75f664adc52e1706987c173157e75947a9b736c24ece135f851fdbd82c0f4acc653517b66335139522ae25e5fe7b0ea2dbce226a5d SHA512 fa9d4080a221fa1d253c4b63377786abdb40f148f39720d7d30c29c44496a4830fb9f07f8ac336630114ae430fadbcda9c76d872d1bc45c9836789a7589cf0c2
+EBUILD mpd-0.21.20.ebuild 8068 BLAKE2B 5c4a14d78ac4b26adcbcee75f664adc52e1706987c173157e75947a9b736c24ece135f851fdbd82c0f4acc653517b66335139522ae25e5fe7b0ea2dbce226a5d SHA512 fa9d4080a221fa1d253c4b63377786abdb40f148f39720d7d30c29c44496a4830fb9f07f8ac336630114ae430fadbcda9c76d872d1bc45c9836789a7589cf0c2
 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
new file mode 100644
index 000000000000..8ef1c4dc8826
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.20.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~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
+	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
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index b8d8023bd4b0..eb982ba62058 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,4 +1,4 @@
 AUX musique-1.5-unbundle-qtsingleapplication.patch 273 BLAKE2B f2150b1d54201e8d7bd64675dfc5a73a1c74abcea9c34d45f52f4d414f56c6b26d97a8c12f1d4823b5272fa32ea866b6c1d1c8052f8304a46823504203a207ed SHA512 d51389a43c5045c453aa516da4da6d50e2d7fb2b064e40df5cd3ff50469a414bf0ec4d44c716be8b83b8bbf1944f72474b3b917dfcd661eef25c2b7298440641
 DIST musique-1.5.tar.gz 377072 BLAKE2B 839b6096bd70171f807cd4177c2374f20089e1a8f22e59fb76d251c743cb3b9b8c86eb81131d15c6291bae1020df7380ae007689a23b67529978de9ee08ed1c2 SHA512 ea4ba84e6b1a69acf054c8ca001afcf3f0e9b17f3557209da649662b2940777babac454a5d4fa0a210e2e15c58bcf4cdfc8757f92b677d46217e3400fcbdc12e
-EBUILD musique-1.5-r1.ebuild 1008 BLAKE2B 1436385c1bdd0ea054a8efe83c9c85896a7b9f35868ac4b77becb1ff5a72f06a51f667abb38f89d4ff4bbc85c79ccc00c057eaea3753f7d8e381ffc58bf81c1f SHA512 5a2a7a4d0e891e64d9b87dd0f65ba8439db3df0bbe0709336fac0090cbb9742301606bc1b2cda8716fd8a4ce307d4da85a4eccef661f4c6fd189c65bb787dff3
+EBUILD musique-1.5-r1.ebuild 1004 BLAKE2B 054a7d68036433332dc55b156885a200f67366046f4fb9ea21d534b3bbc4bd9653fcd978650bc704e79dfb8d1fe37e64a1b50df4c7888e8c78fd4ce183b53ccd SHA512 b21bb68ad00b536fc2805fe675dc2ef5dbb604b164c960d69b8db75c051108b896796ca3392cb92f56242a254f0241a3e035613188fbe2377966da8394cb32ac
 MISC metadata.xml 333 BLAKE2B f4794f441a21ea4bab3f70e58bf10828861815424d33768ff8068ba57b955c07d5fa2596e092ba4582fea3730105eb397d9c94b9994e452fb042e4b92022da92 SHA512 b2dc7bd4588fd80bc4bcce0e80102d4522d9dd2a946807ef25ff294e96621da948bead8d8bf0db19b9b65cb8d3934fee69e1f73ef57c3eda3ea429928766a897
diff --git a/media-sound/musique/musique-1.5-r1.ebuild b/media-sound/musique/musique-1.5-r1.ebuild
index ca570e5a5bfe..9e7f3e33e4cf 100644
--- a/media-sound/musique/musique-1.5-r1.ebuild
+++ b/media-sound/musique/musique-1.5-r1.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"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}"
 DOCS=( CHANGES TODO )
 PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
 
-src_prepare () {
+src_prepare() {
 	rm -r src/qtsingleapplication || die
 	default
 }
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index f5c5ff6d6aad..2614d5ef61b0 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,6 @@
 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 1484 BLAKE2B ebb49156491a56f7b3f93d179dade700d9126d7164594a00d4b83aceb3dcc4ee07b5b581cf05baa40244bd9853264ab6e0169896c2d02b26f07f1b646e50b0a8 SHA512 e088ef7294d8fd9b336d26e23c143f72ee3f2c28c8ee6428ff9f3b490b9a9b6c4a443964deed9a43168a0b34c08aa26063f72e8bd77ba44db7fd690997d734e6
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1413 BLAKE2B 100048adbf185185be605735a14d959124433dbcd01a7874904519695ed1f1fe63884a55dcf48b5c0d840acbe0c03ac613dce32c7eaf953bbcd3475aa170ab89 SHA512 19cee21635371ddcc287802f0b61f5117c45aeaf7b59585ac0d389fb02edd793fdb80b346e022d26063abb86babaa32e4daaa962b6ed29bccdfbe709e186f962
-EBUILD ncmpcpp-9999.ebuild 1391 BLAKE2B bb70ae4ce0ffa9d9234b76f57ce1a5ef638c2fef6b1efca502c8dc92191748ce52f98b80043362861fd51475d8c6b14344e37d8b70a25f2053ee93f607b5ecf7 SHA512 c073659170e5cf5c554c7f3ed8fb9b101d4275af1ec6eb3eb38e295ee2e1e8023aef5a6d5c9f79d8734d994765933b5413ee47d2a53403d8c65077c746f0ce8a
+EBUILD ncmpcpp-0.7.7.ebuild 1450 BLAKE2B 45829e75e7e25ba59a1661a4bfe71c5f97ee08030e30de5a51cbbd999a9efe3f928e343e5178f07ac43a7cab74648608050c9bd3fe34d4ddfbd11da24499e947 SHA512 5f1426092301d579c44881cd09ea0a1d41d6f194627cafef2d411c5b1baf41530f140599d741b3d642e9c4344310f9216d110540ebda9c009c8ef434418c43aa
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1379 BLAKE2B 8e5907d0ae467b3d64fe5c9266487d1fb9296bb7a9a62bf34ac00309a51c7dbaf927cce2e00a7490fb8fec03d81723e95452c8fb15c48509135abaa643e35d08 SHA512 53e607419c55667499124e66389b8c8e436290e23118bd175a3e5d73db6a2891bf360e11219eff862a0e0cc53f35d98eab2da4a7d40561b432d5fa80347ed730
+EBUILD ncmpcpp-9999.ebuild 1357 BLAKE2B 3215c3e2f2dee61ffbfd6c8ef01f534593f2701b50b4d2beec557532626923b5cf9d68ea7205afede9fca1e51d445919510845b3d66d8b7ff2ffb47e970e9bba SHA512 d388f8371a7e4afdfb2130ff5f6405c86896391a609545b76d6dcbe0a9006aeced45a6c15012aab49efe1f8e4150d99aed85e43977e704f282e1364c03f20f00
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index 05a8aed52ab8..ec608f309a9d 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -44,7 +44,6 @@ src_configure() {
 		$(use_with curl) \
 		$(use_with taglib) \
 		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF} \
 		--enable-unicode
 }
 
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index e67aa622354d..9731b864cd96 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -41,8 +41,7 @@ src_configure() {
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
 		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
+		$(use_with visualizer fftw)
 }
 
 src_install() {
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 5074e7460063..0be8bf6df0b4 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-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
@@ -44,8 +44,7 @@ src_configure() {
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
 		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
+		$(use_with visualizer fftw)
 }
 
 src_install() {
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 3fe9cc2c3cda..f4b92a44d14e 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 EBUILD pavucontrol-3.0.ebuild 871 BLAKE2B 3a137fd6ab316730a519663bb163599146fa721bf4c1336f0dceb236c2b038bbe74effa3d3f31a5283a52acce3539e5264ffe1dbec17b2ae83e8d7b019a89625 SHA512 c820a7ac52a7b8f95d860a6349aa0e453ee9e3c54330ca3cb0f23e5fce2f790aca1d503b691db274a3494abb7639c07d92d9c71adc2ac7c410e3bf30611401eb
-EBUILD pavucontrol-4.0.ebuild 886 BLAKE2B 768219367cca2f1abb75253bbfa1884281679ff179d1ed657af1da52844c2e549ac8f1b14d564be81e70b3c27fd856d879274481f416a5a7620b52a053433143 SHA512 32a7d8ff5122547819100a120c559621e97234e4ccf1251933bc44361be159d517da2ffb9b2b1755530f9e1574819659068622eb21f12113ec20a39aa138d96b
+EBUILD pavucontrol-4.0.ebuild 854 BLAKE2B 98d893b52f48860f6cf73360750be57d4215cfc78b623d7ee9b1782dd56d0c14833b0169e55c241469f0ed7018e7ce213462ef9c572722935774dd4557828409 SHA512 1df30060cbab2c3ae4e9efad9a52f28ea6fe3f0205c120766d9acc8d25d2e199ba501b02520b22674b3ec12364fe2304089a2b2caff26723d61ea86d1805520f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index 182d6ce2c562..3a675042aecb 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.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
@@ -33,7 +33,6 @@ src_configure() {
 	append-cxxflags -std=c++11 #567216
 	local myeconfargs=(
 		--disable-lynx
-		--docdir=/usr/share/doc/${PF}
 		$(use_enable nls)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 49225993ba51..1f79f0843e76 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,4 @@
-DIST pulseeffects-4.6.8.tar.gz 1882449 BLAKE2B 57a93eeb32304628efb51473912a70485e054ef50e9e9aec9731ba761dd7809ce0a8c3838fc74a04c6a29537bf182a74c6e6715c722ce76670c8be71dc4a5608 SHA512 672204ad90534ad45228b3473902eb8489c8306c7850f2b2a6f983aa89955529fb5381d6a7d703de94dcd658ffd5b560cce17291a0b23654b225ebd301659e74
 DIST pulseeffects-4.7.1.tar.gz 1995518 BLAKE2B 81a0e53875278c5264cc306b81d299b0d016f806f7f142fddceb8aef8798b4f64163f05d72f44ae147195b871b59ed9dce52bba8b98597362e9f154336daff7a SHA512 19a84986ff49d832147697ed81e793f6f7b22600b4b928cf9efe7db0ed455181547d21b3216d47e4d0ae495ef420ce8392cbef0d1edef0d9d5130a1ad2d89c8f
-EBUILD pulseeffects-4.6.8.ebuild 1855 BLAKE2B feb368814eb1124176505d2db6589d1177afe8dc09c8c4f44baddd24984c4f41c89b1e77c3159e7c9eeff4379c3a77e23e409ba1d85ec6a116dd713f9adff1e6 SHA512 c3a45f3c2ae1d3ac82b58110c1529f596e1c367bf66efa5692702e877d11af596da62bb20fb20a69ebb4e0edc6120f8652b801ad6eb43e40238d4297dd630691
-EBUILD pulseeffects-4.7.1.ebuild 1855 BLAKE2B 3ce08ef12ba740a6fcec74ff2e252439c842effdca8c626a8de1dba87ea18d9d494a2133bb267ab9d8c4866d64d1f583e31d74c45ca35887dcaec742d82c1198 SHA512 8853016ce534dad13c4a8193a557f9c060579a33b231e3b11d67ee33479e8491ac9760cb6b49aa86352bb3763655baecd4fc1aa950a3c6c0cd6a79b7482f38c3
-EBUILD pulseeffects-9999.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
-MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
+EBUILD pulseeffects-4.7.1.ebuild 1857 BLAKE2B 271656e30d1a20cee60afb5668bb8219db529a6a3ac2892bba566c17001fecce23390ffd85b6586b166a865a274a2066662a7ef385b8ae3d9cc6ce94dadacdae SHA512 4df711ddadacd9a4e35a0c6543e705b2b0fa516efc11d3ac2569ca45fe1c39538f7f4d5425b8a19969b20d95bea248d91cdc16f4413eee3db2724632d14434df
+EBUILD pulseeffects-9999.ebuild 1859 BLAKE2B 7f39b2cdbd52af31357a17ffe3743b60156ddcec2638ce7d298148a14f464238d485eb0fca2aba2171e02c21fd4c6c09ea69acc0104d4779cc912fc0638c6ebc SHA512 d341a24bce7fff28e53cc58132bf10a15bf48e396bd43d0b9bf4fbd8f01b3f8dbd1a5a98ba04bfdafdaa9dd00ef6416b125851acdf2116d8b44db19abb329b12
+MISC metadata.xml 1017 BLAKE2B 82b1cecefd2a2bd6016097e750f8806f6be9e3380b2091aeb1121c250108b974ff3df38494f7136af05c3463eb78acad2a273e0abce431f92c63aca981031d84 SHA512 7f45f2f28593397f78d9b08363fc8757e6e0cae075dc7a1c80eb546666f479b1fc20d20e440937305c87a2d02a081da9ad19403f02114d5f282e65ddc38bc66d
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index 4f7f3990a2bb..e771c2411142 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -17,7 +17,7 @@
 		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
 	</use>
 	<longdescription lang="en">
-		Audio effects for Pulseaudio applications
+		GUI to manage audio effects for Pulseaudio applications, giving full control over the effects order to the user.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">wwmm/pulseeffects</remote-id>
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild
deleted file mode 100644
index 32e5898ad2d0..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
index 0d88d4c03230..867b66803cf3 100644
--- a/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
@@ -59,13 +59,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-pkg_postinst(){
+pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_schemas_update
 	gnome2_icon_cache_update
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	gnome2_gconf_uninstall
 	gnome2_schemas_update
 	gnome2_icon_cache_update
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index ab95a499cd73..e883396899bb 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-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
@@ -59,13 +59,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-pkg_postinst(){
+pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_schemas_update
 	gnome2_icon_cache_update
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	gnome2_gconf_uninstall
 	gnome2_schemas_update
 	gnome2_icon_cache_update
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index fd2abaf36481..0a01453a8fc3 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,5 +1,5 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
 DIST qsynth-0.6.0.tar.gz 316308 BLAKE2B d414c73d5baf3be1563c45390735de964c79774a4d7cc37ff4bc609a7fa4d291a5b0cba7f3b8ed52649c50325a3ba2fba7baad3943122cc76a98aa6cfdf2cb0f SHA512 34e15d283f403ec6633fef911285dc2d4d4b2c5a0cd3614bd38feefbf68cff5fd8e296f47d1bcd527658b8a9dab212106aa63ca71ea60cf49f8126adb7d28591
-EBUILD qsynth-0.6.0.ebuild 1395 BLAKE2B 90c4b832fe74a7540eaea0910aefe50238ff9cef3bac5feeb6365bc5ff3378710eb33f665bf1e07cd4d1db6b3a3cdfc246407cf142e120e39c7f6d32426433d8 SHA512 bea5867750df5fde2892cfd40a81e940c1505d51ec414be7cb7e691320bea76826264542e9f42b838a5c9133129bc2bc18c8e3d57910ff08ea8f93c413eef170
-EBUILD qsynth-9999.ebuild 1445 BLAKE2B 300936cbdee4140ada6df996741f2eb73850de8784e9f2eab596b16cdcae614d5cad3f448cdb32d405ebb7504b5db4ce1f4ee592c57940dbc553bfadb4c1051b SHA512 58da89e2efd524f4b522a136cba6ec536bc04ff0cd2fbdc30fcba0a4bc8757887b2749bd22432740d1f1bcd87da32032449aa698d578402cf557f9c3e4e55a2c
+EBUILD qsynth-0.6.0.ebuild 1394 BLAKE2B 30f5874938401b92a150b5676dae7ab2005d5c7d6ff59e5c888c17e307f5a5e7c33df68390ab3831b1599d9b0d73556eebea77644d0d79ceed25d0048866c36e SHA512 205f48bca8f7c6803b60eee6cf5601b4de47095f1ec2beea19a1abd9a0dd70fb1af4d887b0fefce9af2f2cb1140d6ada7b27742c64c2d2d23b2d51b98b8c6bdc
+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.0.ebuild b/media-sound/qsynth/qsynth-0.6.0.ebuild
index e26a5f1d04b4..afd6bb7009c6 100644
--- a/media-sound/qsynth/qsynth-0.6.0.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.0.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
@@ -39,7 +39,7 @@ src_configure() {
 	eqmake5 ${PN}.pro -o ${PN}.mak
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
 	einstalldocs
 
diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index 327a19853a99..b8f87dedef2b 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-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
@@ -45,7 +45,7 @@ src_configure() {
 	eqmake5 ${PN}.pro -o ${PN}.mak
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
 	einstalldocs
 
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index edaad9236b1c..425a7bb77f8b 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,6 +1,4 @@
 AUX qtractor-0.9.4-dont-compress-manpages.patch 801 BLAKE2B 27ee7fd8711b87e8e8b32e3f40ed37c890c072e9d071d2011041af7b4d9bd1c1763f6b0f8326ee3a9e6a780f6abf418d52f8bcc894490adddcac05ef973eb86b SHA512 bd78649eb6f0616a4129d5851c997cc3fa233a86d9b7f98f5685b0999bfd25d536b38b539a9a7b2589d709004bd63042c41eae35fcdaa78167f071b0b8a2e5b9
-DIST qtractor-0.9.11.tar.gz 1849813 BLAKE2B 747916fe45285b00c837af5868ebdaa6b9bf5812b8fa58c4bfbd8662c5519106cbb0a9708121f3391ca4f45bf0af0715994ad8400edf01fa8bd0dcec848aa438 SHA512 8c6cb7ce5f5b5162c4a233aa733f0cb8424f4f84a91546fbbe7af35d534ffc3db6a583712d8ca906adc7edd5e92d28cce6927b340ec4750eafe14500eb8dd8c6
 DIST qtractor-0.9.12.tar.gz 1893356 BLAKE2B 221062e1557fbfa209a3a55b3eaa8c80a5026886d33bb1c27de2fa410f0ab301bf3323cb7b451e2b326d26c9de9904e19578c02f602aed681fa9100b6124842e SHA512 cdd7414e2b287272164e3876603f4b051f22399e14aeb61c0e8d30a159a146d0028d36463400a239630cb31ba66bcd96302fb522fd8304342e533fd9d420cb2d
-EBUILD qtractor-0.9.11.ebuild 1549 BLAKE2B 57a9324b495f76c3be5672c7c958b4fb4128fd4125957c445cb55b52bd9c6e277bd31f3af2f2bca9ecbf05d4dedb7b1aa4133da32740ef7776c6d4a8dcc836ea SHA512 ca3efe3ec38521ed21ecf02447f68e505a383deb3ccb8aed12f2f29e922b4f25117742f7752743a1ee97fe58197a03427bc862f2c22901d1d9e813cbf288f9d5
-EBUILD qtractor-0.9.12.ebuild 1551 BLAKE2B 18d426bd732e69b3a35130bfd4731181b2db1b6ad0a24097ae77ed1cb66cb903a347fc78352685868cd7f2e9811c6aa2256a4df34150e627b1283262fdce479a SHA512 4a41922e0811640752ecc953c004c2a41bfd827f724e8d63d7a7872dc470c8a9ebbd63d87eea93d768de7e5166d3bc0ce5e910230d38e2e36cba6e2030d4f2cf
+EBUILD qtractor-0.9.12.ebuild 1549 BLAKE2B 57a9324b495f76c3be5672c7c958b4fb4128fd4125957c445cb55b52bd9c6e277bd31f3af2f2bca9ecbf05d4dedb7b1aa4133da32740ef7776c6d4a8dcc836ea SHA512 ca3efe3ec38521ed21ecf02447f68e505a383deb3ccb8aed12f2f29e922b4f25117742f7752743a1ee97fe58197a03427bc862f2c22901d1d9e813cbf288f9d5
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/qtractor-0.9.11.ebuild b/media-sound/qtractor/qtractor-0.9.11.ebuild
deleted file mode 100644
index 1a712fa3ce0b..000000000000
--- a/media-sound/qtractor/qtractor-0.9.11.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.12.ebuild b/media-sound/qtractor/qtractor-0.9.12.ebuild
index ac61f7e78965..1a712fa3ce0b 100644
--- a/media-sound/qtractor/qtractor-0.9.12.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.12.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/rexima/Manifest b/media-sound/rexima/Manifest
index bad619637bcb..ed942576bbf2 100644
--- a/media-sound/rexima/Manifest
+++ b/media-sound/rexima/Manifest
@@ -1,3 +1,3 @@
 DIST rexima-1.4.tar.gz 15903 BLAKE2B 9852560036ef58a2e22974bca153d24ab07735fe5c679b3e4bd6a8a22c81a246fa28b0d52034736952faa599a0a8f4a73f34dcfa8cfb8df079148fa82bbf995b SHA512 6a4c70fd2f61446a2e79a3a22218d443f7ae4df9928b73c66f8d4d2f592d50c57f5fe53875bf975a8ffb6d9d8f99bc99d083ced2714b7623bef06229f8e37fd6
-EBUILD rexima-1.4-r1.ebuild 692 BLAKE2B 68c8dd35b774203a9dae83b0a9598001ed0c4490eb282d1f5cc8c20286faa61e5a3f2e83f0112cfde01390e94bc2e75d26da84ef6120229ec070fd5b80709b7b SHA512 2b55e8243b1eae5402b3ed88c68717cdc1c3ae12c7482e45959497bdda97a8a89b5d3f1932b8bc07333b5b712cbef9ca4bf25433109dc5e942c60b3312cb6422
+EBUILD rexima-1.4-r1.ebuild 688 BLAKE2B a8c9f5b9bfedb05860b42597aac9a12a6dbdf9ff612b9aee25cddf8911b616664fcc65813bc012f4b44e9e228deb9136b60c0624b20ebdf47302c63805a68d6a SHA512 92b8944b62b761b78f28a428c70d733ae9695fa88d121a1d5c4b9f0c27bd28fea4bb17ecb4a6185950fd31d77062651f2180cfa1918d5a9a8c668066651b4868
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/rexima/rexima-1.4-r1.ebuild b/media-sound/rexima/rexima-1.4-r1.ebuild
index cd78692ee670..60fcf194acd7 100644
--- a/media-sound/rexima/rexima-1.4-r1.ebuild
+++ b/media-sound/rexima/rexima-1.4-r1.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
@@ -27,7 +27,7 @@ src_configure() {
 	_EOF_
 }
 
-src_install () {
+src_install() {
 	dobin rexima
 
 	einstalldocs
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
index bfc23c906170..0d4393d24d1e 100644
--- a/media-sound/rip/Manifest
+++ b/media-sound/rip/Manifest
@@ -1,3 +1,3 @@
 DIST rip-1.07.tar.gz 110261 BLAKE2B 93ef85bf4b50e577180d343f033e6f8765ebe7f17992626b8f7e6ecac13be692edf5bab79fbe0a17b9dd64dbc19886323bc769be6edafcb8e133f58888ea80d8 SHA512 4a89b945cb917d07459f1765bd6e19bb20b84d45e762b01a25374e0a80fced79996440ab85e01fc2fb1bf87175eb9407745294e3099b396d2e4dfc6ee652cc87
-EBUILD rip-1.07.ebuild 587 BLAKE2B b25757f97b0de37394e47107c3008a93417f5384e12e0c2f7b646727b8b02302614926986a5ed645ce7291bfcca50e414f0d172611c984df8bd3fec33873f891 SHA512 0c52db348bc19086c0ff0322cd22de188d4e85e6d02442f15a253dbbbcc8e147e302ef2ff960f65f921cf82a0313b91393f658de92eea0309fd7215cd1053e27
+EBUILD rip-1.07.ebuild 586 BLAKE2B ef942642a67323892f4d7bd46b7479595b2048af67c470cddc5d94ed48938fdc7e636a92f01eea2247b080ec6e80c8c7332253e067a1ff922afb76499b2200a6 SHA512 f780ebb27c807191742239963efd6de4a41e31359d0579e9acf2dfbe42edc8ada543d85e2fdfcff310007a3795d916deed0d99b0ba60c2a6ff6ea0cac39d4107
 MISC metadata.xml 326 BLAKE2B 14293ba2c8d9da5e7eef3dff49ec33c4f7c816d2df9b75ecf0f1d5dc6adc8f88028fba7bde542f4b5439890d1c225555a4b3243a2d88433a825851ba2a123003 SHA512 9be190109b6b10f56e73609510a59a349a3f4c2e841eb64fabcbbcb35535047f8806fc33a3ebaffd8ead47b1c1057e93e435b9db79ba4eef9e16e6325846c13e
diff --git a/media-sound/rip/rip-1.07.ebuild b/media-sound/rip/rip-1.07.ebuild
index e1f22280db1f..68ad2fb0382c 100644
--- a/media-sound/rip/rip-1.07.ebuild
+++ b/media-sound/rip/rip-1.07.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
@@ -18,7 +18,7 @@ RDEPEND="media-sound/cdparanoia
 	>=dev-perl/MP3-Info-0.91
 	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )"
 
-src_install () {
+src_install() {
 	dobin rip
 	einstalldocs
 }
diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest
index 29073a75fb54..511763d30ca9 100644
--- a/media-sound/snd/Manifest
+++ b/media-sound/snd/Manifest
@@ -1,5 +1,5 @@
 AUX snd-17.4-portaudio.patch 2154 BLAKE2B 3d6d6edd400aef4bd809e49021f0d42523db263dc9bb0626074ae32c4c3172c66181caaab141c754b8d04436d920dc7e104300a11bccf29f251052571c52e462 SHA512 01f7d7f3bd315a8b372d81e2f5a96b9f1cd100eb4afe62a57c5b0422740892b80d504ab2774190814fde04849bc097817262f7bc96bda1f90a08f544caa439ce
 AUX snd-17.4-undefined-oss_sample_types.patch 372 BLAKE2B 5bd87e2e8c953ab4dd3799295b6a425d1775572605b66eb4fb7e2927e45e8b1b6780a08c370fab7c197e3354eea33d87b4503aca5dbfb92a1150f786fb0cd810 SHA512 3b6a64eea622d77389edf754450a6ef1a5036b1ef0c5e02f7c84c4aa150fd0c30dd3e7855126dbbce1582a9ff1e02ddc2abfb5e7636feb71713e08c7b1bc0478
 DIST snd-17.4.tar.gz 15096338 BLAKE2B ca054977caacd2ea4c1b14f50c31d3b4cc6b206a58529ee5537ec80e51acb72c1b8baad6db9729270fe07067c097f16e630e1f7a81521ac0532f5b5689fb963c SHA512 cbbc546fe4a3ef758c5372edbdae4db29457c559eafa08854819917e153ce850f5ab302da68dee826f99c26f10769aae8c6df6ea8434614f084f21d0dbbc5c88
-EBUILD snd-17.4-r1.ebuild 2576 BLAKE2B 9882830b74e0b5d29bd38da4446168114164c1c5eadb4172b745eb53259d8f11f4b5be09d38639760335054620ebe27053abb1cd1ccc39ff85bb1fec346deaa8 SHA512 086f2929ea23a8fdaf7c282718d88de13d22fd34987d18c7c964458717526f282420d250925e5328c5c8d3b4785288b893dad31996fb615c54f3dcc61944b5b9
+EBUILD snd-17.4-r1.ebuild 2575 BLAKE2B 5286e4def4852851df004d95a1812ea788826d5497e8af9fe80d1890446b0792b419eef059a9c11241c70d49ad5592bcbdca064fcd04e485692f04a58edc4ac5 SHA512 fa1d43235e5b04d0ad12cedf022a1d0f4daa48a4687b75fefe277b6238c942c70c88de89702d0ecb21d013a02500d8cb65a9df6d14d76b8b3fe53368daef80e0
 MISC metadata.xml 344 BLAKE2B 213ec3b7c1d98fa3cd1c9942f2f97b1dade37731a00b74257ae0ed6cd8f3fcef7b136a48fef0c195903fa240d46b811d238728d947f4daec29df1b8089ec0969 SHA512 42144ef636272ad14dee0131dd1181ddb6635aaecec547b1d4eb3e66ef00eebfbbd8a551ce33f041fe44fb2e1758fd46c24b5961f5a148e90d94c6825fd37c87
diff --git a/media-sound/snd/snd-17.4-r1.ebuild b/media-sound/snd/snd-17.4-r1.ebuild
index 294872469b89..90c2fce54b92 100644
--- a/media-sound/snd/snd-17.4-r1.ebuild
+++ b/media-sound/snd/snd-17.4-r1.ebuild
@@ -100,7 +100,7 @@ src_compile() {
 	done
 }
 
-src_install () {
+src_install() {
 	dobin snd sndplay sndinfo
 
 	if use ruby ; then
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index a6e3f95d15c6..374e0278736b 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,4 +1,6 @@
 AUX sonata-1.6.2.1-mpd18-compat.patch 820 BLAKE2B 473334fdd3f3b72352dbc2a35c842765cd8140c1ec65e905f50c48c234f13fd26c85267cae5db9e497d55229c1896feffb301d70df7a298dfc8a6bf1d09ae31d SHA512 b0d904edbb9d6e92408402d3b25b5e2dad452767d3030c2608335a86dd7242c135b121293a2f73b92a77a260d44806ffec99b309f4b394f558cd5f8ab318ac66
 DIST sonata-1.6.2.1.tar.bz2 314333 BLAKE2B a2d7f6f8b5fe4b774136c70e7a354a8b8d948f44e876e3d59b0a216cb482de6c9b5a38b1332347136466965bd0551a03ba53f9e554c969ce901e880fa691496e SHA512 8022b69380714e9c3c685c61d0f1e62be087fc2cbd77a55f32008edea53411f8493d416bd0a446ccb52b4b5603ba9f4a00b655af485d739932dc06af69345c27
+DIST sonata-1.7_beta1_p20200212.tar.gz 2259353 BLAKE2B 78befe6896d75033649e4f7333bc1487cc7462a66564860d93b4770cb7e86a6cc4656377b6e13defb07591b0a81cbd22653f01c5e9f20d75fcbf28a84551f7fb SHA512 bdff3ee3ec4d94a18604409efbca398f94633a510780f33d449921b69787521ad5d68285aa0fe7252191c1227435c42cf60bca0fe7764e1a8b3d887ff4be4ae6
 EBUILD sonata-1.6.2.1-r2.ebuild 913 BLAKE2B 846840b1896d13d3510498331c3e1c4663c6b0a013288c3eb6103a905a67c4b5299519f3eb2fde92dd8fa24b011588e02e6606993c7b82d4dafd03b25209123a SHA512 fb8abb6c69d16cb5a36f688a5b41473abf8a72acec5c70ea6395d178bb9f0962198d8c8bad94f697c2356876816077c96c1e78f3eebef9c47dec604cd79a4276
+EBUILD sonata-1.7_beta1_p20200212.ebuild 999 BLAKE2B 6905b1562510c4ef4211cbfbd086546509f8fcbc3fc04de146136d7aa62818e6f6b55892caaf8477143d9af4ec1ec4fa4eb885072c6af4c44197379bf2af784d SHA512 e24184f82bbed8404eb0a0d70c5c12ae3a2593f86f44389226c83b6e827d159aff6ef5e627e0f5a681e0964c889319c9dfe54fc6d87edaff83afb0648f3df12e
 MISC metadata.xml 554 BLAKE2B eb83a90fb0ad69e577369c4446edcdb2c1cc240958038fa776a61bce22d40fec23d0f4b1678b51edcec3110604fd7b5f273d67857ac9037dc93d82ca2fd7f708 SHA512 de93bd7c5f5425a2ee0d2179a2b3f4591d8507ba1caa9c5c2b133cc5888a94565d7b60af9890c114a3908797324475543659f54a78f23bdf884e98cc49fb7c7e
diff --git a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
new file mode 100644
index 000000000000..3f5b02394145
--- /dev/null
+++ b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=0c807e593f7571a654ad055cb126652d7f3a698d
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL="true"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit desktop distutils-r1
+
+DESCRIPTION="Elegant GTK+ music client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.nongnu.org/sonata/"
+SRC_URI="https://github.com/multani/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus taglib"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
+		taglib? ( dev-python/tagpy[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_install() {
+	distutils-r1_src_install
+	doicon -s 128 sonata/pixmaps/sonata.png
+	rm -r "${D}"/usr/share/sonata || die
+}
diff --git a/media-sound/vimpc/Manifest b/media-sound/vimpc/Manifest
index c902fa19d2ea..f11c30489d22 100644
--- a/media-sound/vimpc/Manifest
+++ b/media-sound/vimpc/Manifest
@@ -1,6 +1,6 @@
 AUX vimpc-0.09.2-boost.patch 8262 BLAKE2B 4f35c6bf2a5b2d9072a2cba699fe8175af60f5c18d61fd57fdc497e06dd9260eacb41a29af5db6003f40b0b1e7f28a2fed4abe532b64aabd9f7265eab035bf6e SHA512 f1680f0f63277fdc0b57af24558e3715de656f39fdad00ed218c32542bbbe0a63f891b75802709275d4b0e7bac086ed5ea74cded4c37cbfc5c34586c067abac1
 DIST vimpc-0.09.2.tar.gz 452593 BLAKE2B b6cbeab32318e723d7be114255fba7360fa2608d03bde6b2186d47b1cb8e74b4369d0d2b1d683cf5668232bf4581e9acb79d726308b18ff0d82122aa979f81a1 SHA512 456e2d2c0510273c071b24c2dd8f90b73d40a0b02565c00ea986a78f1231cb26fb053ce5b0d1476647c813b84684e400c21948086299e445ffd651c2af46d4c9
-EBUILD vimpc-0.09.2-r1.ebuild 931 BLAKE2B eeb8e9c338a42a1f247133d95a362570344c9b79936e285e8841ca99bb61f961a283697865c671cc248d4c15c8aef0cf959d0b43b882635b143f93478e71153e SHA512 bce0cd6ebba0787917c000f1109f7dbb9573c84cd8da1806559d10ebe001fefbb87af4e5788d4fbb6127771bb12a7069aaa0ce59dcdf36a850c543fb0855faaf
-EBUILD vimpc-0.09.2.ebuild 878 BLAKE2B d4ccf06603dbf9756365d0eb891ede9cc8cd016e0301aa91c8fc8dfaeb278dfd9f364ff8360977e3ebe1145817b6c15c1fb4d978057fce48e113e2ab8457bbbd SHA512 6141c686b413ad5ac72b24ae8565da33d5a0836434d0df660495b3f5729bf4b1f700b98afb992efa0f6a2f2d443f44a2927ef998b0c002d0e8db06ff110d15e2
-EBUILD vimpc-9999.ebuild 837 BLAKE2B ce8588b8b69918c68d359d5fbc87fca0aee34652c92637dd01e7c753660e718126a10c228886c02f36863aff4a7bcb675107201bb3ff72972261041706f4cf42 SHA512 b3fe1c3768151d09a0a42257c507662da01387dfdb7fcb0d251fc845e0cfc3a085edeaf592c323825cfa0637d4f2e1a40c8ee03b7fe90ca50c9a7657d9165766
+EBUILD vimpc-0.09.2-r1.ebuild 885 BLAKE2B 70ed5ae0615f2bdd0e7288265c7b54e23d8f88a9aec7215c2bb898be831c0fd7bded48e47e37a07c99486e4bd34260daf4b105542a8506b2a1544df04dd518c2 SHA512 dab75c696f12296cb199f4f630fbc11a1045f060e3fbe2c9c1c24a3592c751abf6c65da70204b046df19b1ee3dfdf334940ff399d69080f297fe9c464cf17c0e
+EBUILD vimpc-0.09.2.ebuild 832 BLAKE2B e550304f0f7a0d6e306bcc5843f13d3d13d69231142e7a034c9167836d6b130b6bcea9b16575fa5932b7d98bfad414c96ff42895df1730d98a4e12a3de76ceb0 SHA512 822a40efa7211b268b9bb91f780027c24c94d892e8757df5e242222377d3a277b3b77b9613f2c5479856bfea1075f83043a90a801f6956aff6fa52fedbe7e398
+EBUILD vimpc-9999.ebuild 791 BLAKE2B 12cb3bf53815fe9e688e6e8cf85283fa48419aa1baa2f61df71163bcc2591f18845e428a0db66456eb3e4718e874ee78f3261ff6dab92756a704a40b808956ee SHA512 bec3d1fd2a27e6196902e23b8827d41c391aee5c6bc68b838b68fd650553ec2739d26d167ec015ca0c14b377dab7905b7a44acd1aeb8f7b2d77c6c4165c1db54
 MISC metadata.xml 523 BLAKE2B 110214d23c67c2e0b6255e8472feb6678d3ade52e55232d50067d228fadaddb90f0662db7eb1d036b59d963356b321a9b4ed829cc1860ad7208ac4c5e74f50ea SHA512 88dc39c9a62b9234604d95256ab3c94fa33a98c4df3d3e8583d9692d45ac416995faa2249431ddbf9c8edb31cce77474d2c4572215dec4c3551f02d315d732df
diff --git a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild
index 0250e3c5969d..427022a706f2 100644
--- a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild
+++ b/media-sound/vimpc/vimpc-0.09.2-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
@@ -31,8 +31,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable boost) \
-		$(use_enable taglib) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable taglib)
 }
 
 src_install() {
diff --git a/media-sound/vimpc/vimpc-0.09.2.ebuild b/media-sound/vimpc/vimpc-0.09.2.ebuild
index a8dc8d3d4878..e6968fffae96 100644
--- a/media-sound/vimpc/vimpc-0.09.2.ebuild
+++ b/media-sound/vimpc/vimpc-0.09.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
@@ -31,8 +31,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable boost) \
-		$(use_enable taglib) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable taglib)
 }
 
 src_install() {
diff --git a/media-sound/vimpc/vimpc-9999.ebuild b/media-sound/vimpc/vimpc-9999.ebuild
index c019bc106184..5d7ee52d0a6e 100644
--- a/media-sound/vimpc/vimpc-9999.ebuild
+++ b/media-sound/vimpc/vimpc-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
@@ -30,8 +30,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable boost) \
-		$(use_enable taglib) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable taglib)
 }
 
 src_install() {
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /media-sound
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)